From 9d7800f55a21f299f7991eea5a7124902bd5eee0 Mon Sep 17 00:00:00 2001
From: Auto Gen <johndo@microsoft.com>
Date: Wed, 16 Oct 2024 15:51:50 -0700
Subject: [PATCH 1/5] Release DTDL v4

---
 DTDL/v2/DTDL.Specification.v2.md              |    16 +-
 DTDL/v2/DTDL.iotcentral.v2.md                 |    26 +-
 DTDL/v2/DTDL.v2.md                            |    18 +-
 DTDL/v2/metamodel/DTDL.v2.ModelElements.json  |     4 +-
 ...owance-ClassArrayOptionalPropertiesV2.json |    20 +-
 ...wance-ClassArrayPropertyCommentDtmiV2.json |     8 +-
 ...e-ClassArrayPropertyDescriptionDtmiV2.json |     8 +-
 ...e-ClassArrayPropertyDisplayNameDtmiV2.json |     8 +-
 ...ClassArrayPropertyElementSchemaDtmiV2.json |     4 +-
 ...wance-ClassArrayPropertyInvalidDtmiV2.json |     6 +-
 ...ssArrayPropertyIrrelevantDtmiOrTermV2.json |    12 +-
 ...ce-ClassArrayPropertyNotDtmiNorTermV2.json |     6 +-
 ...nce-ClassArrayPropertyUndefinedTermV2.json |     6 +-
 ...lassArrayTypeIncludesNotDtmiNorTermV2.json |     4 +-
 ...ClassArrayTypeIncludesUndefinedTermV2.json |     4 +-
 ...ance-ClassCommandOptionalPropertiesV2.json |    36 +-
 ...assCommandPayloadOptionalPropertiesV2.json |    52 +-
 ...ssCommandPayloadPropertyCommentDtmiV2.json |    10 +-
 ...mmandPayloadPropertyDescriptionDtmiV2.json |    10 +-
 ...mmandPayloadPropertyDisplayNameDtmiV2.json |    10 +-
 ...ssCommandPayloadPropertyInvalidDtmiV2.json |     8 +-
 ...PayloadPropertyIrrelevantDtmiOrTermV2.json |    16 +-
 ...ClassCommandPayloadPropertyNameDtmiV2.json |     8 +-
 ...ommandPayloadPropertyNotDtmiNorTermV2.json |     8 +-
 ...assCommandPayloadPropertySchemaDtmiV2.json |     8 +-
 ...CommandPayloadPropertyUndefinedTermV2.json |     8 +-
 ...ndPayloadTypeIncludesNotDtmiNorTermV2.json |     8 +-
 ...andPayloadTypeIncludesUndefinedTermV2.json |     8 +-
 ...ClassCommandPropertyCommandTypeDtmiV2.json |     4 +-
 ...nce-ClassCommandPropertyCommentDtmiV2.json |     6 +-
 ...ClassCommandPropertyDescriptionDtmiV2.json |     6 +-
 ...ClassCommandPropertyDisplayNameDtmiV2.json |     6 +-
 ...nce-ClassCommandPropertyInvalidDtmiV2.json |     4 +-
 ...CommandPropertyIrrelevantDtmiOrTermV2.json |     8 +-
 ...owance-ClassCommandPropertyNameDtmiV2.json |     4 +-
 ...-ClassCommandPropertyNotDtmiNorTermV2.json |     4 +-
 ...nce-ClassCommandPropertyRequestDtmiV2.json |     8 +-
 ...ce-ClassCommandPropertyResponseDtmiV2.json |     8 +-
 ...e-ClassCommandPropertyUndefinedTermV2.json |     4 +-
 ...ssCommandTypeIncludesNotDtmiNorTermV2.json |     4 +-
 ...assCommandTypeIncludesUndefinedTermV2.json |     4 +-
 ...ce-ClassComponentOptionalPropertiesV2.json |    34 +-
 ...e-ClassComponentPropertyCommentDtmiV2.json |     8 +-
 ...assComponentPropertyDescriptionDtmiV2.json |     8 +-
 ...assComponentPropertyDisplayNameDtmiV2.json |     8 +-
 ...e-ClassComponentPropertyInvalidDtmiV2.json |     6 +-
 ...mponentPropertyIrrelevantDtmiOrTermV2.json |    12 +-
 ...ance-ClassComponentPropertyNameDtmiV2.json |     6 +-
 ...lassComponentPropertyNotDtmiNorTermV2.json |     6 +-
 ...ce-ClassComponentPropertySchemaDtmiV2.json |     6 +-
 ...ClassComponentPropertyUndefinedTermV2.json |     6 +-
 ...ComponentTypeIncludesNotDtmiNorTermV2.json |     6 +-
 ...sComponentTypeIncludesUndefinedTermV2.json |     6 +-
 ...lowance-ClassEnumOptionalPropertiesV2.json |    40 +-
 ...owance-ClassEnumPropertyCommentDtmiV2.json |    10 +-
 ...ce-ClassEnumPropertyDescriptionDtmiV2.json |    10 +-
 ...ce-ClassEnumPropertyDisplayNameDtmiV2.json |    10 +-
 ...nce-ClassEnumPropertyEnumValuesDtmiV2.json |     8 +-
 ...owance-ClassEnumPropertyInvalidDtmiV2.json |     8 +-
 ...assEnumPropertyIrrelevantDtmiOrTermV2.json |    16 +-
 ...nce-ClassEnumPropertyNotDtmiNorTermV2.json |     8 +-
 ...ance-ClassEnumPropertyUndefinedTermV2.json |     8 +-
 ...ce-ClassEnumPropertyValueSchemaDtmiV2.json |     8 +-
 ...ClassEnumTypeIncludesNotDtmiNorTermV2.json |     8 +-
 ...-ClassEnumTypeIncludesUndefinedTermV2.json |     8 +-
 ...ce-ClassEnumValueOptionalPropertiesV2.json |    48 +-
 ...e-ClassEnumValuePropertyCommentDtmiV2.json |    10 +-
 ...assEnumValuePropertyDescriptionDtmiV2.json |    10 +-
 ...assEnumValuePropertyDisplayNameDtmiV2.json |    10 +-
 ...ClassEnumValuePropertyEnumValueDtmiV2.json |     8 +-
 ...e-ClassEnumValuePropertyInvalidDtmiV2.json |     8 +-
 ...umValuePropertyIrrelevantDtmiOrTermV2.json |    16 +-
 ...ance-ClassEnumValuePropertyNameDtmiV2.json |     8 +-
 ...lassEnumValuePropertyNotDtmiNorTermV2.json |     8 +-
 ...ClassEnumValuePropertyUndefinedTermV2.json |     8 +-
 ...EnumValueTypeIncludesNotDtmiNorTermV2.json |     8 +-
 ...sEnumValueTypeIncludesUndefinedTermV2.json |     8 +-
 ...owance-ClassFieldOptionalPropertiesV2.json |    48 +-
 ...wance-ClassFieldPropertyCommentDtmiV2.json |     8 +-
 ...e-ClassFieldPropertyDescriptionDtmiV2.json |     8 +-
 ...e-ClassFieldPropertyDisplayNameDtmiV2.json |     8 +-
 ...wance-ClassFieldPropertyInvalidDtmiV2.json |     6 +-
 ...ssFieldPropertyIrrelevantDtmiOrTermV2.json |    12 +-
 ...llowance-ClassFieldPropertyNameDtmiV2.json |     8 +-
 ...ce-ClassFieldPropertyNotDtmiNorTermV2.json |     6 +-
 ...owance-ClassFieldPropertySchemaDtmiV2.json |     8 +-
 ...nce-ClassFieldPropertyUndefinedTermV2.json |     6 +-
 ...lassFieldTypeIncludesNotDtmiNorTermV2.json |     6 +-
 ...ClassFieldTypeIncludesUndefinedTermV2.json |     6 +-
 ...ce-ClassInterfaceOptionalPropertiesV2.json |    16 +-
 ...e-ClassInterfacePropertyCommentDtmiV2.json |     4 +-
 ...-ClassInterfacePropertyContentsDtmiV2.json |     4 +-
 ...assInterfacePropertyDescriptionDtmiV2.json |     4 +-
 ...assInterfacePropertyDisplayNameDtmiV2.json |     4 +-
 ...e-ClassInterfacePropertyExtendsDtmiV2.json |     4 +-
 ...e-ClassInterfacePropertyInvalidDtmiV2.json |     2 +-
 ...terfacePropertyIrrelevantDtmiOrTermV2.json |     4 +-
 ...lassInterfacePropertyNotDtmiNorTermV2.json |     2 +-
 ...e-ClassInterfacePropertySchemasDtmiV2.json |     6 +-
 ...ClassInterfacePropertyUndefinedTermV2.json |     2 +-
 ...InterfaceTypeIncludesNotDtmiNorTermV2.json |     2 +-
 ...sInterfaceTypeIncludesUndefinedTermV2.json |     2 +-
 ...wance-ClassMapKeyOptionalPropertiesV2.json |    60 +-
 ...ance-ClassMapKeyPropertyCommentDtmiV2.json |    10 +-
 ...-ClassMapKeyPropertyDescriptionDtmiV2.json |    10 +-
 ...-ClassMapKeyPropertyDisplayNameDtmiV2.json |    10 +-
 ...ance-ClassMapKeyPropertyInvalidDtmiV2.json |     8 +-
 ...sMapKeyPropertyIrrelevantDtmiOrTermV2.json |    16 +-
 ...lowance-ClassMapKeyPropertyNameDtmiV2.json |    10 +-
 ...e-ClassMapKeyPropertyNotDtmiNorTermV2.json |     8 +-
 ...wance-ClassMapKeyPropertySchemaDtmiV2.json |    10 +-
 ...ce-ClassMapKeyPropertyUndefinedTermV2.json |     8 +-
 ...assMapKeyTypeIncludesNotDtmiNorTermV2.json |     8 +-
 ...lassMapKeyTypeIncludesUndefinedTermV2.json |     8 +-
 ...llowance-ClassMapOptionalPropertiesV2.json |    50 +-
 ...lowance-ClassMapPropertyCommentDtmiV2.json |    12 +-
 ...nce-ClassMapPropertyDescriptionDtmiV2.json |    12 +-
 ...nce-ClassMapPropertyDisplayNameDtmiV2.json |    12 +-
 ...lowance-ClassMapPropertyInvalidDtmiV2.json |    10 +-
 ...lassMapPropertyIrrelevantDtmiOrTermV2.json |    20 +-
 ...llowance-ClassMapPropertyMapKeyDtmiV2.json |    10 +-
 ...owance-ClassMapPropertyMapValueDtmiV2.json |    10 +-
 ...ance-ClassMapPropertyNotDtmiNorTermV2.json |    10 +-
 ...wance-ClassMapPropertyUndefinedTermV2.json |    10 +-
 ...-ClassMapTypeIncludesNotDtmiNorTermV2.json |    10 +-
 ...e-ClassMapTypeIncludesUndefinedTermV2.json |    10 +-
 ...nce-ClassMapValueOptionalPropertiesV2.json |    48 +-
 ...ce-ClassMapValuePropertyCommentDtmiV2.json |    12 +-
 ...lassMapValuePropertyDescriptionDtmiV2.json |    12 +-
 ...lassMapValuePropertyDisplayNameDtmiV2.json |    12 +-
 ...ce-ClassMapValuePropertyInvalidDtmiV2.json |    10 +-
 ...apValuePropertyIrrelevantDtmiOrTermV2.json |    20 +-
 ...wance-ClassMapValuePropertyNameDtmiV2.json |     8 +-
 ...ClassMapValuePropertyNotDtmiNorTermV2.json |    10 +-
 ...nce-ClassMapValuePropertySchemaDtmiV2.json |     8 +-
 ...-ClassMapValuePropertyUndefinedTermV2.json |    10 +-
 ...sMapValueTypeIncludesNotDtmiNorTermV2.json |    10 +-
 ...ssMapValueTypeIncludesUndefinedTermV2.json |    10 +-
 ...wance-ClassObjectOptionalPropertiesV2.json |    40 +-
 ...ance-ClassObjectPropertyCommentDtmiV2.json |    10 +-
 ...-ClassObjectPropertyDescriptionDtmiV2.json |    10 +-
 ...-ClassObjectPropertyDisplayNameDtmiV2.json |    10 +-
 ...wance-ClassObjectPropertyFieldsDtmiV2.json |     8 +-
 ...ance-ClassObjectPropertyInvalidDtmiV2.json |     8 +-
 ...sObjectPropertyIrrelevantDtmiOrTermV2.json |    16 +-
 ...e-ClassObjectPropertyNotDtmiNorTermV2.json |     8 +-
 ...ce-ClassObjectPropertyUndefinedTermV2.json |     8 +-
 ...assObjectTypeIncludesNotDtmiNorTermV2.json |     8 +-
 ...lassObjectTypeIncludesUndefinedTermV2.json |     8 +-
 ...nce-ClassPropertyCotypePropertyDtmiV2.json |     8 +-
 ...nce-ClassPropertyOptionalPropertiesV2.json |    40 +-
 ...ce-ClassPropertyPropertyCommentDtmiV2.json |     8 +-
 ...lassPropertyPropertyDescriptionDtmiV2.json |     8 +-
 ...lassPropertyPropertyDisplayNameDtmiV2.json |     8 +-
 ...ce-ClassPropertyPropertyInvalidDtmiV2.json |     6 +-
 ...ropertyPropertyIrrelevantDtmiOrTermV2.json |    12 +-
 ...wance-ClassPropertyPropertyNameDtmiV2.json |     6 +-
 ...ClassPropertyPropertyNotDtmiNorTermV2.json |     6 +-
 ...nce-ClassPropertyPropertySchemaDtmiV2.json |     6 +-
 ...-ClassPropertyPropertyUndefinedTermV2.json |     6 +-
 ...e-ClassPropertyPropertyWritableDtmiV2.json |     6 +-
 ...sPropertyTypeIncludesNotDtmiNorTermV2.json |     6 +-
 ...assPropertyTypeIncludesSemanticTypeV2.json |    12 +-
 ...ssPropertyTypeIncludesUndefinedTermV2.json |     6 +-
 ...ClassRelationshipOptionalPropertiesV2.json |    44 +-
 ...lassRelationshipPropertyCommentDtmiV2.json |     6 +-
 ...RelationshipPropertyDescriptionDtmiV2.json |     6 +-
 ...RelationshipPropertyDisplayNameDtmiV2.json |     6 +-
 ...lassRelationshipPropertyInvalidDtmiV2.json |     4 +-
 ...ionshipPropertyIrrelevantDtmiOrTermV2.json |     8 +-
 ...tionshipPropertyMaxMultiplicityDtmiV2.json |     4 +-
 ...tionshipPropertyMinMultiplicityDtmiV2.json |     4 +-
 ...e-ClassRelationshipPropertyNameDtmiV2.json |     4 +-
 ...sRelationshipPropertyNotDtmiNorTermV2.json |     4 +-
 ...sRelationshipPropertyPropertiesDtmiV2.json |     6 +-
 ...ClassRelationshipPropertyTargetDtmiV2.json |     6 +-
 ...ssRelationshipPropertyUndefinedTermV2.json |     4 +-
 ...assRelationshipPropertyWritableDtmiV2.json |     4 +-
 ...ationshipTypeIncludesNotDtmiNorTermV2.json |     4 +-
 ...lationshipTypeIncludesUndefinedTermV2.json |     4 +-
 ...ce-ClassTelemetryCotypePropertyDtmiV2.json |     8 +-
 ...ce-ClassTelemetryOptionalPropertiesV2.json |    24 +-
 ...e-ClassTelemetryPropertyCommentDtmiV2.json |     8 +-
 ...assTelemetryPropertyDescriptionDtmiV2.json |     8 +-
 ...assTelemetryPropertyDisplayNameDtmiV2.json |     8 +-
 ...e-ClassTelemetryPropertyInvalidDtmiV2.json |     6 +-
 ...lemetryPropertyIrrelevantDtmiOrTermV2.json |    12 +-
 ...ance-ClassTelemetryPropertyNameDtmiV2.json |     4 +-
 ...lassTelemetryPropertyNotDtmiNorTermV2.json |     6 +-
 ...ce-ClassTelemetryPropertySchemaDtmiV2.json |     4 +-
 ...ClassTelemetryPropertyUndefinedTermV2.json |     6 +-
 ...TelemetryTypeIncludesNotDtmiNorTermV2.json |     4 +-
 ...ssTelemetryTypeIncludesSemanticTypeV2.json |    12 +-
 ...sTelemetryTypeIncludesUndefinedTermV2.json |     4 +-
 ...ertyElementSchemaDependentReferenceV2.json |     8 +-
 ...rayTypeIncludesIrrelevantDtmiOrTermV2.json |    16 +-
 ...oadPropertySchemaDependentReferenceV2.json |    16 +-
 ...oadTypeIncludesIrrelevantDtmiOrTermV2.json |    32 +-
 ...ndPropertyRequestDependentReferenceV2.json |    12 +-
 ...dPropertyResponseDependentReferenceV2.json |    12 +-
 ...andTypeIncludesIrrelevantDtmiOrTermV2.json |    16 +-
 ...entPropertySchemaDependentReferenceV2.json |    12 +-
 ...entTypeIncludesIrrelevantDtmiOrTermV2.json |    24 +-
 ...ropertyEnumValuesDependentReferenceV2.json |     8 +-
 ...numTypeIncludesIrrelevantDtmiOrTermV2.json |    32 +-
 ...lueTypeIncludesIrrelevantDtmiOrTermV2.json |    32 +-
 ...eldPropertySchemaDependentReferenceV2.json |    12 +-
 ...eldTypeIncludesIrrelevantDtmiOrTermV2.json |    24 +-
 ...ePropertyContentsDependentReferenceV2.json |     8 +-
 ...cePropertyExtendsDependentReferenceV2.json |     8 +-
 ...cePropertySchemasDependentReferenceV2.json |     8 +-
 ...aceTypeIncludesIrrelevantDtmiOrTermV2.json |     8 +-
 ...KeyTypeIncludesIrrelevantDtmiOrTermV2.json |    32 +-
 ...MapPropertyMapKeyDependentReferenceV2.json |    16 +-
 ...pPropertyMapValueDependentReferenceV2.json |    12 +-
 ...MapTypeIncludesIrrelevantDtmiOrTermV2.json |    40 +-
 ...luePropertySchemaDependentReferenceV2.json |    16 +-
 ...lueTypeIncludesIrrelevantDtmiOrTermV2.json |    40 +-
 ...ectPropertyFieldsDependentReferenceV2.json |     8 +-
 ...ectTypeIncludesIrrelevantDtmiOrTermV2.json |    32 +-
 ...rtyPropertySchemaDependentReferenceV2.json |    12 +-
 ...rtyTypeIncludesIrrelevantDtmiOrTermV2.json |    24 +-
 ...ropertyPropertiesDependentReferenceV2.json |    12 +-
 ...hipTypeIncludesIrrelevantDtmiOrTermV2.json |    16 +-
 ...tryPropertySchemaDependentReferenceV2.json |    12 +-
 ...tryTypeIncludesIrrelevantDtmiOrTermV2.json |    16 +-
 ...mendation-ClassArrayInvalidKeywordsV2.json |    18 +-
 ...ation-ClassArrayPropertyCommentTermV2.json |    16 +-
 ...n-ClassArrayPropertyDescriptionTermV2.json |    16 +-
 ...n-ClassArrayPropertyDisplayNameTermV2.json |    16 +-
 ...opertyElementSchemaPreferTermToDtmiV2.json |    16 +-
 ...ClassArrayPropertyElementSchemaTermV2.json |     8 +-
 ...on-ClassArrayTypeDuplicatesMaterialV2.json |     8 +-
 ...n-ClassArrayTypeIncludesTermAndDtmiV2.json |     4 +-
 ...tion-ClassArrayTypePreferTermToDtmiV2.json |     8 +-
 ...ndation-ClassCommandInvalidKeywordsV2.json |    12 +-
 ...-ClassCommandPayloadInvalidKeywordsV2.json |    24 +-
 ...ssCommandPayloadPropertyCommentTermV2.json |    20 +-
 ...mmandPayloadPropertyDescriptionTermV2.json |    20 +-
 ...mmandPayloadPropertyDisplayNameTermV2.json |    20 +-
 ...ClassCommandPayloadPropertyNameTermV2.json |    16 +-
 ...yloadPropertySchemaPreferTermToDtmiV2.json |    24 +-
 ...assCommandPayloadPropertySchemaTermV2.json |    16 +-
 ...ommandPayloadTypeDuplicatesMaterialV2.json |    16 +-
 ...mmandPayloadTypeIncludesTermAndDtmiV2.json |     8 +-
 ...sCommandPayloadTypePreferTermToDtmiV2.json |    16 +-
 ...ommandPropertyCommandTypeDeprecatedV2.json |     4 +-
 ...ClassCommandPropertyCommandTypeTermV2.json |     8 +-
 ...ion-ClassCommandPropertyCommentTermV2.json |    12 +-
 ...ClassCommandPropertyDescriptionTermV2.json |    12 +-
 ...ClassCommandPropertyDisplayNameTermV2.json |    12 +-
 ...dation-ClassCommandPropertyNameTermV2.json |     8 +-
 ...ion-ClassCommandPropertyRequestTermV2.json |    16 +-
 ...on-ClassCommandPropertyResponseTermV2.json |    16 +-
 ...-ClassCommandTypeDuplicatesMaterialV2.json |     8 +-
 ...ClassCommandTypeIncludesTermAndDtmiV2.json |     4 +-
 ...on-ClassCommandTypePreferTermToDtmiV2.json |     8 +-
 ...ation-ClassComponentInvalidKeywordsV2.json |    18 +-
 ...n-ClassComponentPropertyCommentTermV2.json |    16 +-
 ...assComponentPropertyDescriptionTermV2.json |    16 +-
 ...assComponentPropertyDisplayNameTermV2.json |    16 +-
 ...tion-ClassComponentPropertyNameTermV2.json |    12 +-
 ...on-ClassComponentPropertySchemaTermV2.json |    12 +-
 ...lassComponentTypeDuplicatesMaterialV2.json |    12 +-
 ...assComponentTypeIncludesTermAndDtmiV2.json |     6 +-
 ...-ClassComponentTypePreferTermToDtmiV2.json |    12 +-
 ...mmendation-ClassEnumInvalidKeywordsV2.json |    24 +-
 ...dation-ClassEnumPropertyCommentTermV2.json |    20 +-
 ...on-ClassEnumPropertyDescriptionTermV2.json |    20 +-
 ...on-ClassEnumPropertyDisplayNameTermV2.json |    20 +-
 ...ion-ClassEnumPropertyEnumValuesTermV2.json |    16 +-
 ...on-ClassEnumPropertyValueSchemaTermV2.json |    16 +-
 ...ValueSchemaValueIntegerPreferToDtmiV2.json |    12 +-
 ...yValueSchemaValueStringPreferToDtmiV2.json |    12 +-
 ...ion-ClassEnumTypeDuplicatesMaterialV2.json |    16 +-
 ...on-ClassEnumTypeIncludesTermAndDtmiV2.json |     8 +-
 ...ation-ClassEnumTypePreferTermToDtmiV2.json |    16 +-
 ...ation-ClassEnumValueInvalidKeywordsV2.json |    24 +-
 ...n-ClassEnumValuePropertyCommentTermV2.json |    20 +-
 ...assEnumValuePropertyDescriptionTermV2.json |    20 +-
 ...assEnumValuePropertyDisplayNameTermV2.json |    20 +-
 ...ClassEnumValuePropertyEnumValueTermV2.json |    16 +-
 ...tion-ClassEnumValuePropertyNameTermV2.json |    16 +-
 ...lassEnumValueTypeDuplicatesMaterialV2.json |    16 +-
 ...assEnumValueTypeIncludesTermAndDtmiV2.json |     8 +-
 ...-ClassEnumValueTypePreferTermToDtmiV2.json |    16 +-
 ...mendation-ClassFieldInvalidKeywordsV2.json |    18 +-
 ...ation-ClassFieldPropertyCommentTermV2.json |    16 +-
 ...n-ClassFieldPropertyDescriptionTermV2.json |    16 +-
 ...n-ClassFieldPropertyDisplayNameTermV2.json |    16 +-
 ...endation-ClassFieldPropertyNameTermV2.json |    16 +-
 ...FieldPropertySchemaPreferTermToDtmiV2.json |    24 +-
 ...dation-ClassFieldPropertySchemaTermV2.json |    16 +-
 ...on-ClassFieldTypeDuplicatesMaterialV2.json |    12 +-
 ...n-ClassFieldTypeIncludesTermAndDtmiV2.json |     6 +-
 ...tion-ClassFieldTypePreferTermToDtmiV2.json |    12 +-
 ...ation-ClassInterfaceInvalidKeywordsV2.json |     6 +-
 ...n-ClassInterfacePropertyCommentTermV2.json |     8 +-
 ...-ClassInterfacePropertyContentsTermV2.json |     8 +-
 ...assInterfacePropertyDescriptionTermV2.json |     8 +-
 ...assInterfacePropertyDisplayNameTermV2.json |     8 +-
 ...n-ClassInterfacePropertyExtendsTermV2.json |     8 +-
 ...n-ClassInterfacePropertySchemasTermV2.json |    12 +-
 ...lassInterfaceTypeDuplicatesMaterialV2.json |     4 +-
 ...assInterfaceTypeIncludesTermAndDtmiV2.json |     2 +-
 ...-ClassInterfaceTypePreferTermToDtmiV2.json |     4 +-
 ...ommendation-ClassMapInvalidKeywordsV2.json |    30 +-
 ...endation-ClassMapKeyInvalidKeywordsV2.json |    24 +-
 ...tion-ClassMapKeyPropertyCommentTermV2.json |    20 +-
 ...-ClassMapKeyPropertyDescriptionTermV2.json |    20 +-
 ...-ClassMapKeyPropertyDisplayNameTermV2.json |    20 +-
 ...ndation-ClassMapKeyPropertyNameTermV2.json |    20 +-
 ...ation-ClassMapKeyPropertySchemaTermV2.json |    20 +-
 ...opertySchemaValueStringPreferToDtmiV2.json |    20 +-
 ...n-ClassMapKeyTypeDuplicatesMaterialV2.json |    16 +-
 ...-ClassMapKeyTypeIncludesTermAndDtmiV2.json |     8 +-
 ...ion-ClassMapKeyTypePreferTermToDtmiV2.json |    16 +-
 ...ndation-ClassMapPropertyCommentTermV2.json |    24 +-
 ...ion-ClassMapPropertyDescriptionTermV2.json |    24 +-
 ...ion-ClassMapPropertyDisplayNameTermV2.json |    24 +-
 ...endation-ClassMapPropertyMapKeyTermV2.json |    20 +-
 ...dation-ClassMapPropertyMapValueTermV2.json |    20 +-
 ...tion-ClassMapTypeDuplicatesMaterialV2.json |    20 +-
 ...ion-ClassMapTypeIncludesTermAndDtmiV2.json |    10 +-
 ...dation-ClassMapTypePreferTermToDtmiV2.json |    20 +-
 ...dation-ClassMapValueInvalidKeywordsV2.json |    30 +-
 ...on-ClassMapValuePropertyCommentTermV2.json |    24 +-
 ...lassMapValuePropertyDescriptionTermV2.json |    24 +-
 ...lassMapValuePropertyDisplayNameTermV2.json |    24 +-
 ...ation-ClassMapValuePropertyNameTermV2.json |    16 +-
 ...ValuePropertySchemaPreferTermToDtmiV2.json |    32 +-
 ...ion-ClassMapValuePropertySchemaTermV2.json |    16 +-
 ...ClassMapValueTypeDuplicatesMaterialV2.json |    20 +-
 ...lassMapValueTypeIncludesTermAndDtmiV2.json |    10 +-
 ...n-ClassMapValueTypePreferTermToDtmiV2.json |    20 +-
 ...endation-ClassObjectInvalidKeywordsV2.json |    24 +-
 ...tion-ClassObjectPropertyCommentTermV2.json |    20 +-
 ...-ClassObjectPropertyDescriptionTermV2.json |    20 +-
 ...-ClassObjectPropertyDisplayNameTermV2.json |    20 +-
 ...ation-ClassObjectPropertyFieldsTermV2.json |    16 +-
 ...n-ClassObjectTypeDuplicatesMaterialV2.json |    16 +-
 ...-ClassObjectTypeIncludesTermAndDtmiV2.json |     8 +-
 ...ion-ClassObjectTypePreferTermToDtmiV2.json |    16 +-
 ...ion-ClassPropertyCotypePropertyTermV2.json |     8 +-
 ...CotypePropertyValuePreferTermToDtmiV2.json |    16 +-
 ...ClassPropertyDuplicateSemanticTypesV2.json |    12 +-
 ...dation-ClassPropertyInvalidKeywordsV2.json |    18 +-
 ...on-ClassPropertyPropertyCommentTermV2.json |    16 +-
 ...lassPropertyPropertyDescriptionTermV2.json |    16 +-
 ...lassPropertyPropertyDisplayNameTermV2.json |    16 +-
 ...ation-ClassPropertyPropertyNameTermV2.json |    12 +-
 ...pertyPropertySchemaPreferTermToDtmiV2.json |     8 +-
 ...ion-ClassPropertyPropertySchemaTermV2.json |    12 +-
 ...n-ClassPropertyPropertyWritableTermV2.json |    12 +-
 ...ropertySemanticTypePreferTermToDtmiV2.json |    12 +-
 ...lassPropertySemanticTypeTermAndDtmiV2.json |     6 +-
 ...ClassPropertyTypeDuplicatesMaterialV2.json |    12 +-
 ...lassPropertyTypeIncludesTermAndDtmiV2.json |     6 +-
 ...n-ClassPropertyTypePreferTermToDtmiV2.json |    12 +-
 ...on-ClassRelationshipInvalidKeywordsV2.json |    12 +-
 ...lassRelationshipPropertyCommentTermV2.json |    12 +-
 ...RelationshipPropertyDescriptionTermV2.json |    12 +-
 ...RelationshipPropertyDisplayNameTermV2.json |    12 +-
 ...tionshipPropertyMaxMultiplicityTermV2.json |     8 +-
 ...tionshipPropertyMinMultiplicityTermV2.json |     8 +-
 ...n-ClassRelationshipPropertyNameTermV2.json |     8 +-
 ...sRelationshipPropertyPropertiesTermV2.json |    12 +-
 ...ClassRelationshipPropertyTargetTermV2.json |    12 +-
 ...assRelationshipPropertyWritableTermV2.json |     8 +-
 ...sRelationshipTypeDuplicatesMaterialV2.json |     8 +-
 ...RelationshipTypeIncludesTermAndDtmiV2.json |     4 +-
 ...assRelationshipTypePreferTermToDtmiV2.json |     8 +-
 ...on-ClassTelemetryCotypePropertyTermV2.json |     8 +-
 ...CotypePropertyValuePreferTermToDtmiV2.json |    16 +-
 ...lassTelemetryDuplicateSemanticTypesV2.json |    12 +-
 ...ation-ClassTelemetryInvalidKeywordsV2.json |    18 +-
 ...n-ClassTelemetryPropertyCommentTermV2.json |    16 +-
 ...assTelemetryPropertyDescriptionTermV2.json |    16 +-
 ...assTelemetryPropertyDisplayNameTermV2.json |    16 +-
 ...tion-ClassTelemetryPropertyNameTermV2.json |     8 +-
 ...metryPropertySchemaPreferTermToDtmiV2.json |    16 +-
 ...on-ClassTelemetryPropertySchemaTermV2.json |     8 +-
 ...lemetrySemanticTypePreferTermToDtmiV2.json |    12 +-
 ...assTelemetrySemanticTypeTermAndDtmiV2.json |     6 +-
 ...lassTelemetryTypeDuplicatesMaterialV2.json |     8 +-
 ...assTelemetryTypeIncludesTermAndDtmiV2.json |     4 +-
 ...-ClassTelemetryTypePreferTermToDtmiV2.json |     8 +-
 ...quirement-ClassArrayContextConformsV2.json |   120 +-
 .../Requirement-ClassArrayGraphKeywordV2.json |    12 +-
 .../Requirement-ClassArrayIdDuplicateV2.json  |    20 +-
 .../Requirement-ClassArrayIdIsDtmiV2.json     |   232 +-
 .../Requirement-ClassArrayIdNotArrayV2.json   |    32 +-
 .../Requirement-ClassArrayIdRequiredV2.json   |    20 +-
 ...opertiesElementSchemaSchemaMaxDepthV2.json |    12 +-
 ...iesElementSchemaSchemaSelfReferenceV2.json |    47 +
 ...assArrayPropertyCommentStringLengthV2.json |    18 +-
 ...ent-ClassArrayPropertyCommentStringV2.json |   126 +-
 ...lassArrayPropertyCommentTermAndDtmiV2.json |    20 +-
 ...sArrayPropertyDescriptionLangStringV2.json |   144 +-
 ...rrayPropertyDescriptionStringLengthV2.json |    18 +-
 ...ArrayPropertyDescriptionTermAndDtmiV2.json |    20 +-
 ...sArrayPropertyDisplayNameLangStringV2.json |   144 +-
 ...rrayPropertyDisplayNameStringLengthV2.json |    18 +-
 ...ArrayPropertyDisplayNameTermAndDtmiV2.json |    20 +-
 ...ssArrayPropertyElementSchemaElementV2.json |   233 +-
 ...rayPropertyElementSchemaTermAndDtmiV2.json |     8 +-
 ...ropertyElementSchemaTypeConformanceV2.json |   214 +-
 ...assArrayPropertyFormallyInvalidDtmiV2.json |    12 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV2.json |    24 +-
 ...ArrayPropertyFormallyNotDtmiNorTermV2.json |    12 +-
 ...sArrayPropertyFormallyUndefinedTermV2.json |    12 +-
 ...rement-ClassArrayRequiredPropertiesV2.json |    16 +-
 ...t-ClassArrayTypeIncludesInvalidDtmiV2.json |     8 +-
 ...ment-ClassArrayTypeIncludesMaterialV2.json |    32 +-
 ...irement-ClassArrayTypeStringOrArrayV2.json |    64 +-
 ...irement-ClassCommandContextConformsV2.json |   148 +-
 ...equirement-ClassCommandGraphKeywordV2.json |     8 +-
 ...Requirement-ClassCommandIdDuplicateV2.json |    16 +-
 .../Requirement-ClassCommandIdIsDtmiV2.json   |   232 +-
 .../Requirement-ClassCommandIdNotArrayV2.json |    32 +-
 ...-ClassCommandPayloadContextConformsV2.json |   212 +-
 ...ent-ClassCommandPayloadGraphKeywordV2.json |    16 +-
 ...ment-ClassCommandPayloadIdDuplicateV2.json |    28 +-
 ...irement-ClassCommandPayloadIdIsDtmiV2.json |   464 +-
 ...ement-ClassCommandPayloadIdNotArrayV2.json |    64 +-
 ...dPayloadPropertyCommentStringLengthV2.json |    24 +-
 ...CommandPayloadPropertyCommentStringV2.json |   168 +-
 ...ndPayloadPropertyCommentTermAndDtmiV2.json |    24 +-
 ...ayloadPropertyDescriptionLangStringV2.json |   192 +-
 ...loadPropertyDescriptionStringLengthV2.json |    24 +-
 ...yloadPropertyDescriptionTermAndDtmiV2.json |    24 +-
 ...ayloadPropertyDisplayNameLangStringV2.json |   192 +-
 ...loadPropertyDisplayNameStringLengthV2.json |    24 +-
 ...yloadPropertyDisplayNameTermAndDtmiV2.json |    24 +-
 ...dPayloadPropertyFormallyInvalidDtmiV2.json |    16 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV2.json |    32 +-
 ...yloadPropertyFormallyNotDtmiNorTermV2.json |    16 +-
 ...ayloadPropertyFormallyUndefinedTermV2.json |    16 +-
 ...ssCommandPayloadPropertyNamePatternV2.json |   150 +-
 ...mandPayloadPropertyNameStringLengthV2.json |    18 +-
 ...assCommandPayloadPropertyNameStringV2.json |   132 +-
 ...mmandPayloadPropertyNameTermAndDtmiV2.json |    20 +-
 ...CommandPayloadPropertySchemaElementV2.json |   321 +-
 ...andPayloadPropertySchemaTermAndDtmiV2.json |    20 +-
 ...ayloadPropertySchemaTypeConformanceV2.json |   292 +-
 ...assCommandPayloadRequiredPropertiesV2.json |    24 +-
 ...mmandPayloadTypeIncludesInvalidDtmiV2.json |    16 +-
 ...sCommandPayloadTypeIncludesMaterialV2.json |    64 +-
 ...lassCommandPayloadTypeStringOrArrayV2.json |   128 +-
 ...ndPropertyCommandTypeSpecificValuesV2.json |   404 +-
 ...mmandPropertyCommandTypeTermAndDtmiV2.json |     8 +-
 ...sCommandPropertyCommentStringLengthV2.json |    12 +-
 ...t-ClassCommandPropertyCommentStringV2.json |    84 +-
 ...ssCommandPropertyCommentTermAndDtmiV2.json |    16 +-
 ...ommandPropertyDescriptionLangStringV2.json |    96 +-
 ...mandPropertyDescriptionStringLengthV2.json |    12 +-
 ...mmandPropertyDescriptionTermAndDtmiV2.json |    16 +-
 ...ommandPropertyDisplayNameLangStringV2.json |    96 +-
 ...mandPropertyDisplayNameStringLengthV2.json |    12 +-
 ...mmandPropertyDisplayNameTermAndDtmiV2.json |    16 +-
 ...sCommandPropertyFormallyInvalidDtmiV2.json |     8 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV2.json |    16 +-
 ...mmandPropertyFormallyNotDtmiNorTermV2.json |     8 +-
 ...ommandPropertyFormallyUndefinedTermV2.json |     8 +-
 ...ent-ClassCommandPropertyNamePatternV2.json |    50 +-
 ...lassCommandPropertyNameStringLengthV2.json |     6 +-
 ...ment-ClassCommandPropertyNameStringV2.json |    44 +-
 ...ClassCommandPropertyNameTermAndDtmiV2.json |    12 +-
 ...rtyNameUniqueAmongInterfaceContentsV2.json |     6 +-
 ...-ClassCommandPropertyRequestElementV2.json |   167 +-
 ...ssCommandPropertyRequestTermAndDtmiV2.json |    24 +-
 ...mmandPropertyRequestTypeConformanceV2.json |   270 +-
 ...ClassCommandPropertyResponseElementV2.json |   167 +-
 ...sCommandPropertyResponseTermAndDtmiV2.json |    24 +-
 ...mandPropertyResponseTypeConformanceV2.json |   270 +-
 ...ment-ClassCommandRequiredPropertiesV2.json |    12 +-
 ...ClassCommandTypeIncludesInvalidDtmiV2.json |     8 +-
 ...nt-ClassCommandTypeIncludesMaterialV2.json |    32 +-
 ...ement-ClassCommandTypeStringOrArrayV2.json |    64 +-
 ...ement-ClassComponentContextConformsV2.json |   184 +-
 ...uirement-ClassComponentGraphKeywordV2.json |    12 +-
 ...quirement-ClassComponentIdDuplicateV2.json |    20 +-
 .../Requirement-ClassComponentIdIsDtmiV2.json |   348 +-
 ...equirement-ClassComponentIdNotArrayV2.json |    48 +-
 ...rtiesSchemaContentsExcludeComponentV2.json |    24 +-
 ...omponentPropertyCommentStringLengthV2.json |    18 +-
 ...ClassComponentPropertyCommentStringV2.json |   126 +-
 ...ComponentPropertyCommentTermAndDtmiV2.json |    20 +-
 ...ponentPropertyDescriptionLangStringV2.json |   144 +-
 ...nentPropertyDescriptionStringLengthV2.json |    18 +-
 ...onentPropertyDescriptionTermAndDtmiV2.json |    20 +-
 ...ponentPropertyDisplayNameLangStringV2.json |   144 +-
 ...nentPropertyDisplayNameStringLengthV2.json |    18 +-
 ...onentPropertyDisplayNameTermAndDtmiV2.json |    20 +-
 ...omponentPropertyFormallyInvalidDtmiV2.json |    12 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV2.json |    24 +-
 ...onentPropertyFormallyNotDtmiNorTermV2.json |    12 +-
 ...ponentPropertyFormallyUndefinedTermV2.json |    12 +-
 ...t-ClassComponentPropertyNamePatternV2.json |   100 +-
 ...ssComponentPropertyNameStringLengthV2.json |    12 +-
 ...nt-ClassComponentPropertyNameStringV2.json |    88 +-
 ...assComponentPropertyNameTermAndDtmiV2.json |    16 +-
 ...rtyNameUniqueAmongInterfaceContentsV2.json |    18 +-
 ...ClassComponentPropertySchemaElementV2.json |   129 +-
 ...sComponentPropertySchemaTermAndDtmiV2.json |    16 +-
 ...ponentPropertySchemaTypeConformanceV2.json |   274 +-
 ...nt-ClassComponentRequiredPropertiesV2.json |    28 +-
 ...assComponentTypeIncludesInvalidDtmiV2.json |    12 +-
 ...-ClassComponentTypeIncludesMaterialV2.json |    48 +-
 ...ent-ClassComponentTypeStringOrArrayV2.json |    96 +-
 ...equirement-ClassEnumContextConformsV2.json |   188 +-
 .../Requirement-ClassEnumGraphKeywordV2.json  |    16 +-
 .../Requirement-ClassEnumIdDuplicateV2.json   |    24 +-
 .../spec/Requirement-ClassEnumIdIsDtmiV2.json |   348 +-
 .../Requirement-ClassEnumIdNotArrayV2.json    |    48 +-
 .../Requirement-ClassEnumIdRequiredV2.json    |    28 +-
 ...lassEnumPropertyCommentStringLengthV2.json |    24 +-
 ...ment-ClassEnumPropertyCommentStringV2.json |   168 +-
 ...ClassEnumPropertyCommentTermAndDtmiV2.json |    24 +-
 ...ssEnumPropertyDescriptionLangStringV2.json |   192 +-
 ...EnumPropertyDescriptionStringLengthV2.json |    24 +-
 ...sEnumPropertyDescriptionTermAndDtmiV2.json |    24 +-
 ...ssEnumPropertyDisplayNameLangStringV2.json |   192 +-
 ...EnumPropertyDisplayNameStringLengthV2.json |    24 +-
 ...sEnumPropertyDisplayNameTermAndDtmiV2.json |    24 +-
 ...-ClassEnumPropertyEnumValuesElementV2.json |   139 +-
 ...ClassEnumPropertyEnumValuesMaxCountV2.json |   752 +-
 ...ClassEnumPropertyEnumValuesMinCountV2.json |    16 +-
 ...ssEnumPropertyEnumValuesTermAndDtmiV2.json |    24 +-
 ...umPropertyEnumValuesTypeConformanceV2.json |   270 +-
 ...lassEnumPropertyFormallyInvalidDtmiV2.json |    16 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV2.json |    32 +-
 ...sEnumPropertyFormallyNotDtmiNorTermV2.json |    16 +-
 ...ssEnumPropertyFormallyUndefinedTermV2.json |    16 +-
 ...umPropertyValueSchemaSpecificValuesV2.json |   792 +-
 ...sEnumPropertyValueSchemaTermAndDtmiV2.json |    16 +-
 ...irement-ClassEnumRequiredPropertiesV2.json |    40 +-
 ...nt-ClassEnumTypeIncludesInvalidDtmiV2.json |    16 +-
 ...ement-ClassEnumTypeIncludesMaterialV2.json |    64 +-
 ...uirement-ClassEnumTypeStringOrArrayV2.json |   128 +-
 ...ement-ClassEnumValueContextConformsV2.json |   184 +-
 ...uirement-ClassEnumValueGraphKeywordV2.json |    16 +-
 ...quirement-ClassEnumValueIdDuplicateV2.json |    28 +-
 .../Requirement-ClassEnumValueIdIsDtmiV2.json |   464 +-
 ...equirement-ClassEnumValueIdNotArrayV2.json |    64 +-
 ...numValuePropertyCommentStringLengthV2.json |    24 +-
 ...ClassEnumValuePropertyCommentStringV2.json |   168 +-
 ...EnumValuePropertyCommentTermAndDtmiV2.json |    24 +-
 ...mValuePropertyDescriptionLangStringV2.json |   192 +-
 ...aluePropertyDescriptionStringLengthV2.json |    24 +-
 ...ValuePropertyDescriptionTermAndDtmiV2.json |    24 +-
 ...mValuePropertyDisplayNameLangStringV2.json |   192 +-
 ...aluePropertyDisplayNameStringLengthV2.json |    24 +-
 ...ValuePropertyDisplayNameTermAndDtmiV2.json |    24 +-
 ...ssEnumValuePropertyEnumValueIntegerV2.json |   132 +-
 ...assEnumValuePropertyEnumValueStringV2.json |   132 +-
 ...umValuePropertyEnumValueTermAndDtmiV2.json |    20 +-
 ...yEnumValueUniqueAmongEnumEnumValuesV2.json |    48 +-
 ...numValuePropertyFormallyInvalidDtmiV2.json |    16 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV2.json |    32 +-
 ...ValuePropertyFormallyNotDtmiNorTermV2.json |    16 +-
 ...mValuePropertyFormallyUndefinedTermV2.json |    16 +-
 ...t-ClassEnumValuePropertyNamePatternV2.json |   150 +-
 ...ssEnumValuePropertyNameStringLengthV2.json |    18 +-
 ...nt-ClassEnumValuePropertyNameStringV2.json |   132 +-
 ...assEnumValuePropertyNameTermAndDtmiV2.json |    20 +-
 ...opertyNameUniqueAmongEnumEnumValuesV2.json |    24 +-
 ...nt-ClassEnumValueRequiredPropertiesV2.json |    24 +-
 ...assEnumValueTypeIncludesInvalidDtmiV2.json |    16 +-
 ...-ClassEnumValueTypeIncludesMaterialV2.json |    64 +-
 ...ent-ClassEnumValueTypeStringOrArrayV2.json |   128 +-
 ...quirement-ClassFieldContextConformsV2.json |   172 +-
 .../Requirement-ClassFieldGraphKeywordV2.json |    12 +-
 .../Requirement-ClassFieldIdDuplicateV2.json  |    24 +-
 .../Requirement-ClassFieldIdIsDtmiV2.json     |   348 +-
 .../Requirement-ClassFieldIdNotArrayV2.json   |    48 +-
 ...assFieldPropertyCommentStringLengthV2.json |    18 +-
 ...ent-ClassFieldPropertyCommentStringV2.json |   126 +-
 ...lassFieldPropertyCommentTermAndDtmiV2.json |    20 +-
 ...sFieldPropertyDescriptionLangStringV2.json |   144 +-
 ...ieldPropertyDescriptionStringLengthV2.json |    18 +-
 ...FieldPropertyDescriptionTermAndDtmiV2.json |    20 +-
 ...sFieldPropertyDisplayNameLangStringV2.json |   144 +-
 ...ieldPropertyDisplayNameStringLengthV2.json |    18 +-
 ...FieldPropertyDisplayNameTermAndDtmiV2.json |    20 +-
 ...assFieldPropertyFormallyInvalidDtmiV2.json |    12 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV2.json |    24 +-
 ...FieldPropertyFormallyNotDtmiNorTermV2.json |    12 +-
 ...sFieldPropertyFormallyUndefinedTermV2.json |    12 +-
 ...ement-ClassFieldPropertyNamePatternV2.json |   150 +-
 ...-ClassFieldPropertyNameStringLengthV2.json |    18 +-
 ...rement-ClassFieldPropertyNameStringV2.json |   132 +-
 ...t-ClassFieldPropertyNameTermAndDtmiV2.json |    20 +-
 ...PropertyNameUniqueAmongObjectFieldsV2.json |    24 +-
 ...ent-ClassFieldPropertySchemaElementV2.json |   311 +-
 ...ClassFieldPropertySchemaTermAndDtmiV2.json |    20 +-
 ...sFieldPropertySchemaTypeConformanceV2.json |   292 +-
 ...rement-ClassFieldRequiredPropertiesV2.json |    24 +-
 ...t-ClassFieldTypeIncludesInvalidDtmiV2.json |    12 +-
 ...ment-ClassFieldTypeIncludesMaterialV2.json |    48 +-
 ...irement-ClassFieldTypeStringOrArrayV2.json |    96 +-
 ...ent-ClassInterfaceContextAtTopLevelV2.json |     6 +-
 ...ement-ClassInterfaceContextConformsV2.json |   112 +-
 ...t-ClassInterfaceContextDtdlTopLevelV2.json |    10 +-
 ...uirement-ClassInterfaceGraphKeywordV2.json |     4 +-
 ...quirement-ClassInterfaceIdDuplicateV2.json |     8 +-
 ...sInterfacePropertiesExtendsMaxDepthV2.json |    70 +-
 ...rfacePropertiesExtendsSelfReferenceV2.json |    39 +
 ...nterfacePropertyCommentStringLengthV2.json |     6 +-
 ...ClassInterfacePropertyCommentStringV2.json |    42 +-
 ...InterfacePropertyCommentTermAndDtmiV2.json |    12 +-
 ...assInterfacePropertyContentsElementV2.json |    97 +-
 ...ssInterfacePropertyContentsMaxCountV2.json |  2170 +--
 ...nterfacePropertyContentsTermAndDtmiV2.json |    12 +-
 ...facePropertyContentsTypeConformanceV2.json |   156 +-
 ...erfacePropertyDescriptionLangStringV2.json |    48 +-
 ...facePropertyDescriptionStringLengthV2.json |     6 +-
 ...rfacePropertyDescriptionTermAndDtmiV2.json |    12 +-
 ...erfacePropertyDisplayNameLangStringV2.json |    48 +-
 ...facePropertyDisplayNameStringLengthV2.json |     6 +-
 ...rfacePropertyDisplayNameTermAndDtmiV2.json |    12 +-
 ...lassInterfacePropertyExtendsElementV2.json |    89 +-
 ...assInterfacePropertyExtendsMaxCountV2.json |    22 +-
 ...InterfacePropertyExtendsTermAndDtmiV2.json |    12 +-
 ...rfacePropertyExtendsTypeConformanceV2.json |   184 +-
 ...nterfacePropertyFormallyInvalidDtmiV2.json |     4 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV2.json |     8 +-
 ...rfacePropertyFormallyNotDtmiNorTermV2.json |     4 +-
 ...erfacePropertyFormallyUndefinedTermV2.json |     4 +-
 ...lassInterfacePropertySchemasElementV2.json |    89 +-
 ...InterfacePropertySchemasTermAndDtmiV2.json |    20 +-
 ...rfacePropertySchemasTypeConformanceV2.json |   188 +-
 ...nt-ClassInterfaceRequiredPropertiesV2.json |     8 +-
 ...assInterfaceTypeIncludesInvalidDtmiV2.json |     4 +-
 ...-ClassInterfaceTypeIncludesMaterialV2.json |    16 +-
 ...ent-ClassInterfaceTypeStringOrArrayV2.json |    32 +-
 ...Requirement-ClassMapContextConformsV2.json |   218 +-
 .../Requirement-ClassMapGraphKeywordV2.json   |    20 +-
 .../Requirement-ClassMapIdDuplicateV2.json    |    28 +-
 .../spec/Requirement-ClassMapIdIsDtmiV2.json  |   464 +-
 .../Requirement-ClassMapIdNotArrayV2.json     |    64 +-
 .../Requirement-ClassMapIdRequiredV2.json     |    36 +-
 ...uirement-ClassMapKeyContextConformsV2.json |   208 +-
 ...Requirement-ClassMapKeyGraphKeywordV2.json |    16 +-
 .../Requirement-ClassMapKeyIdDuplicateV2.json |    28 +-
 .../Requirement-ClassMapKeyIdIsDtmiV2.json    |   464 +-
 .../Requirement-ClassMapKeyIdNotArrayV2.json  |    64 +-
 ...ssMapKeyPropertyCommentStringLengthV2.json |    24 +-
 ...nt-ClassMapKeyPropertyCommentStringV2.json |   168 +-
 ...assMapKeyPropertyCommentTermAndDtmiV2.json |    24 +-
 ...MapKeyPropertyDescriptionLangStringV2.json |   192 +-
 ...pKeyPropertyDescriptionStringLengthV2.json |    24 +-
 ...apKeyPropertyDescriptionTermAndDtmiV2.json |    24 +-
 ...MapKeyPropertyDisplayNameLangStringV2.json |   192 +-
 ...pKeyPropertyDisplayNameStringLengthV2.json |    24 +-
 ...apKeyPropertyDisplayNameTermAndDtmiV2.json |    24 +-
 ...ssMapKeyPropertyFormallyInvalidDtmiV2.json |    16 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV2.json |    32 +-
 ...apKeyPropertyFormallyNotDtmiNorTermV2.json |    16 +-
 ...MapKeyPropertyFormallyUndefinedTermV2.json |    16 +-
 ...ment-ClassMapKeyPropertyNamePatternV2.json |   200 +-
 ...ClassMapKeyPropertyNameStringLengthV2.json |    24 +-
 ...ement-ClassMapKeyPropertyNameStringV2.json |   176 +-
 ...-ClassMapKeyPropertyNameTermAndDtmiV2.json |    24 +-
 ...sMapKeyPropertySchemaSpecificValuesV2.json |  1000 +-
 ...lassMapKeyPropertySchemaTermAndDtmiV2.json |    20 +-
 ...ement-ClassMapKeyRequiredPropertiesV2.json |    36 +-
 ...-ClassMapKeyTypeIncludesInvalidDtmiV2.json |    16 +-
 ...ent-ClassMapKeyTypeIncludesMaterialV2.json |    64 +-
 ...rement-ClassMapKeyTypeStringOrArrayV2.json |   128 +-
 ...opertiesElementSchemaSchemaMaxDepthV2.json |    80 +-
 ...iesElementSchemaSchemaSelfReferenceV2.json |    61 +
 ...ClassMapPropertyCommentStringLengthV2.json |    30 +-
 ...ement-ClassMapPropertyCommentStringV2.json |   210 +-
 ...-ClassMapPropertyCommentTermAndDtmiV2.json |    28 +-
 ...assMapPropertyDescriptionLangStringV2.json |   240 +-
 ...sMapPropertyDescriptionStringLengthV2.json |    30 +-
 ...ssMapPropertyDescriptionTermAndDtmiV2.json |    28 +-
 ...assMapPropertyDisplayNameLangStringV2.json |   240 +-
 ...sMapPropertyDisplayNameStringLengthV2.json |    30 +-
 ...ssMapPropertyDisplayNameTermAndDtmiV2.json |    28 +-
 ...ClassMapPropertyFormallyInvalidDtmiV2.json |    20 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV2.json |    40 +-
 ...ssMapPropertyFormallyNotDtmiNorTermV2.json |    20 +-
 ...assMapPropertyFormallyUndefinedTermV2.json |    20 +-
 ...ement-ClassMapPropertyMapKeyElementV2.json |   189 +-
 ...t-ClassMapPropertyMapKeyTermAndDtmiV2.json |    24 +-
 ...assMapPropertyMapKeyTypeConformanceV2.json |   388 +-
 ...ent-ClassMapPropertyMapValueElementV2.json |   185 +-
 ...ClassMapPropertyMapValueTermAndDtmiV2.json |    28 +-
 ...sMapPropertyMapValueTypeConformanceV2.json |   328 +-
 ...uirement-ClassMapRequiredPropertiesV2.json |    48 +-
 ...ent-ClassMapTypeIncludesInvalidDtmiV2.json |    20 +-
 ...rement-ClassMapTypeIncludesMaterialV2.json |    80 +-
 ...quirement-ClassMapTypeStringOrArrayV2.json |   160 +-
 ...rement-ClassMapValueContextConformsV2.json |   190 +-
 ...quirement-ClassMapValueGraphKeywordV2.json |    20 +-
 ...equirement-ClassMapValueIdDuplicateV2.json |    32 +-
 .../Requirement-ClassMapValueIdIsDtmiV2.json  |   580 +-
 ...Requirement-ClassMapValueIdNotArrayV2.json |    80 +-
 ...MapValuePropertyCommentStringLengthV2.json |    30 +-
 ...-ClassMapValuePropertyCommentStringV2.json |   210 +-
 ...sMapValuePropertyCommentTermAndDtmiV2.json |    28 +-
 ...pValuePropertyDescriptionLangStringV2.json |   240 +-
 ...aluePropertyDescriptionStringLengthV2.json |    30 +-
 ...ValuePropertyDescriptionTermAndDtmiV2.json |    28 +-
 ...pValuePropertyDisplayNameLangStringV2.json |   240 +-
 ...aluePropertyDisplayNameStringLengthV2.json |    30 +-
 ...ValuePropertyDisplayNameTermAndDtmiV2.json |    28 +-
 ...MapValuePropertyFormallyInvalidDtmiV2.json |    20 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV2.json |    40 +-
 ...ValuePropertyFormallyNotDtmiNorTermV2.json |    20 +-
 ...pValuePropertyFormallyUndefinedTermV2.json |    20 +-
 ...nt-ClassMapValuePropertyNamePatternV2.json |   150 +-
 ...assMapValuePropertyNameStringLengthV2.json |    18 +-
 ...ent-ClassMapValuePropertyNameStringV2.json |   132 +-
 ...lassMapValuePropertyNameTermAndDtmiV2.json |    20 +-
 ...-ClassMapValuePropertySchemaElementV2.json |   391 +-
 ...ssMapValuePropertySchemaTermAndDtmiV2.json |    16 +-
 ...pValuePropertySchemaTypeConformanceV2.json |   318 +-
 ...ent-ClassMapValueRequiredPropertiesV2.json |    28 +-
 ...lassMapValueTypeIncludesInvalidDtmiV2.json |    20 +-
 ...t-ClassMapValueTypeIncludesMaterialV2.json |    80 +-
 ...ment-ClassMapValueTypeStringOrArrayV2.json |   160 +-
 ...uirement-ClassObjectContextConformsV2.json |   186 +-
 ...Requirement-ClassObjectGraphKeywordV2.json |    16 +-
 .../Requirement-ClassObjectIdDuplicateV2.json |    24 +-
 .../Requirement-ClassObjectIdIsDtmiV2.json    |   348 +-
 .../Requirement-ClassObjectIdNotArrayV2.json  |    48 +-
 .../Requirement-ClassObjectIdRequiredV2.json  |    28 +-
 ...opertiesElementSchemaSchemaMaxDepthV2.json |    46 +-
 ...iesElementSchemaSchemaSelfReferenceV2.json |    53 +
 ...ssObjectPropertyCommentStringLengthV2.json |    24 +-
 ...nt-ClassObjectPropertyCommentStringV2.json |   168 +-
 ...assObjectPropertyCommentTermAndDtmiV2.json |    24 +-
 ...ObjectPropertyDescriptionLangStringV2.json |   192 +-
 ...jectPropertyDescriptionStringLengthV2.json |    24 +-
 ...bjectPropertyDescriptionTermAndDtmiV2.json |    24 +-
 ...ObjectPropertyDisplayNameLangStringV2.json |   192 +-
 ...jectPropertyDisplayNameStringLengthV2.json |    24 +-
 ...bjectPropertyDisplayNameTermAndDtmiV2.json |    24 +-
 ...nt-ClassObjectPropertyFieldsElementV2.json |   137 +-
 ...t-ClassObjectPropertyFieldsMaxCountV2.json |   268 +-
 ...t-ClassObjectPropertyFieldsMinCountV2.json |    16 +-
 ...lassObjectPropertyFieldsTermAndDtmiV2.json |    24 +-
 ...ObjectPropertyFieldsTypeConformanceV2.json |   270 +-
 ...ssObjectPropertyFormallyInvalidDtmiV2.json |    16 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV2.json |    32 +-
 ...bjectPropertyFormallyNotDtmiNorTermV2.json |    16 +-
 ...ObjectPropertyFormallyUndefinedTermV2.json |    16 +-
 ...ement-ClassObjectRequiredPropertiesV2.json |    24 +-
 ...-ClassObjectTypeIncludesInvalidDtmiV2.json |    16 +-
 ...ent-ClassObjectTypeIncludesMaterialV2.json |    64 +-
 ...rement-ClassObjectTypeStringOrArrayV2.json |   128 +-
 ...rement-ClassPropertyContextConformsV2.json |   178 +-
 ...-ClassPropertyCotypePropertyPresentV2.json |   192 +-
 ...ssPropertyCotypePropertyTermAndDtmiV2.json |     8 +-
 ...ropertyCotypePropertyValueFromTableV2.json |    96 +-
 ...rtyCotypePropertyValueMatchesCotypeV2.json |    48 +-
 ...tyCotypeRequiresPropertySchemaValueV2.json |   288 +-
 ...quirement-ClassPropertyGraphKeywordV2.json |    12 +-
 ...equirement-ClassPropertyIdDuplicateV2.json |    20 +-
 .../Requirement-ClassPropertyIdIsDtmiV2.json  |   348 +-
 ...Requirement-ClassPropertyIdNotArrayV2.json |    48 +-
 ...-ClassPropertyMultipleSemanticTypesV2.json |    36 +-
 ...opertiesSchemaExcludeArrayImplicantV2.json |    12 +-
 ...ropertyPropertiesSchemaExcludeArrayV2.json |    12 +-
 ...PropertyPropertyCommentStringLengthV2.json |    18 +-
 ...-ClassPropertyPropertyCommentStringV2.json |   126 +-
 ...sPropertyPropertyCommentTermAndDtmiV2.json |    20 +-
 ...opertyPropertyDescriptionLangStringV2.json |   144 +-
 ...ertyPropertyDescriptionStringLengthV2.json |    18 +-
 ...pertyPropertyDescriptionTermAndDtmiV2.json |    20 +-
 ...opertyPropertyDisplayNameLangStringV2.json |   144 +-
 ...ertyPropertyDisplayNameStringLengthV2.json |    18 +-
 ...pertyPropertyDisplayNameTermAndDtmiV2.json |    20 +-
 ...PropertyPropertyFormallyInvalidDtmiV2.json |    12 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV2.json |    24 +-
 ...pertyPropertyFormallyNotDtmiNorTermV2.json |    12 +-
 ...opertyPropertyFormallyUndefinedTermV2.json |    12 +-
 ...nt-ClassPropertyPropertyNamePatternV2.json |   100 +-
 ...assPropertyPropertyNameStringLengthV2.json |    12 +-
 ...ent-ClassPropertyPropertyNameStringV2.json |    88 +-
 ...lassPropertyPropertyNameTermAndDtmiV2.json |    16 +-
 ...rtyNameUniqueAmongInterfaceContentsV2.json |    18 +-
 ...meUniqueAmongRelationshipPropertiesV2.json |    24 +-
 ...-ClassPropertyPropertySchemaElementV2.json |   227 +-
 ...pertyPropertySchemaImpliedExclusionV2.json |    16 +-
 ...ssPropertyPropertySchemaTermAndDtmiV2.json |    16 +-
 ...opertyPropertySchemaTypeConformanceV2.json |   248 +-
 ...lassPropertyPropertyWritableBooleanV2.json |   150 +-
 ...PropertyPropertyWritableTermAndDtmiV2.json |    12 +-
 ...ent-ClassPropertyRequiredPropertiesV2.json |    28 +-
 ...lassPropertyTypeIncludesInvalidDtmiV2.json |    12 +-
 ...t-ClassPropertyTypeIncludesMaterialV2.json |    48 +-
 ...ment-ClassPropertyTypeStringOrArrayV2.json |    96 +-
 ...nt-ClassRelationshipContextConformsV2.json |   148 +-
 ...ement-ClassRelationshipGraphKeywordV2.json |     8 +-
 ...rement-ClassRelationshipIdDuplicateV2.json |    16 +-
 ...quirement-ClassRelationshipIdIsDtmiV2.json |   232 +-
 ...irement-ClassRelationshipIdNotArrayV2.json |    32 +-
 ...tionshipPropertyCommentStringLengthV2.json |    12 +-
 ...ssRelationshipPropertyCommentStringV2.json |    84 +-
 ...ationshipPropertyCommentTermAndDtmiV2.json |    16 +-
 ...onshipPropertyDescriptionLangStringV2.json |    96 +-
 ...shipPropertyDescriptionStringLengthV2.json |    12 +-
 ...nshipPropertyDescriptionTermAndDtmiV2.json |    16 +-
 ...onshipPropertyDisplayNameLangStringV2.json |    96 +-
 ...shipPropertyDisplayNameStringLengthV2.json |    12 +-
 ...nshipPropertyDisplayNameTermAndDtmiV2.json |    16 +-
 ...tionshipPropertyFormallyInvalidDtmiV2.json |     8 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV2.json |    16 +-
 ...nshipPropertyFormallyNotDtmiNorTermV2.json |     8 +-
 ...onshipPropertyFormallyUndefinedTermV2.json |     8 +-
 ...nshipPropertyMaxMultiplicityIntegerV2.json |    84 +-
 ...shipPropertyMaxMultiplicityMaxValueV2.json |    12 +-
 ...shipPropertyMaxMultiplicityMinValueV2.json |    12 +-
 ...pPropertyMaxMultiplicityTermAndDtmiV2.json |     8 +-
 ...ipPropertyMinMultiplicityExactValueV2.json |    20 +-
 ...nshipPropertyMinMultiplicityIntegerV2.json |    84 +-
 ...pPropertyMinMultiplicityTermAndDtmiV2.json |     8 +-
 ...lassRelationshipPropertyNamePatternV2.json |    50 +-
 ...elationshipPropertyNameStringLengthV2.json |     6 +-
 ...ClassRelationshipPropertyNameStringV2.json |    44 +-
 ...RelationshipPropertyNameTermAndDtmiV2.json |    12 +-
 ...rtyNameUniqueAmongInterfaceContentsV2.json |     6 +-
 ...lationshipPropertyPropertiesElementV2.json |   141 +-
 ...ationshipPropertyPropertiesMaxCountV2.json |  1816 +--
 ...onshipPropertyPropertiesTermAndDtmiV2.json |    16 +-
 ...ipPropertyPropertiesTypeConformanceV2.json |   240 +-
 ...assRelationshipPropertyTargetIsDtmiV2.json |   244 +-
 ...lationshipPropertyTargetTermAndDtmiV2.json |    16 +-
 ...RelationshipPropertyWritableBooleanV2.json |   100 +-
 ...tionshipPropertyWritableTermAndDtmiV2.json |     8 +-
 ...ClassRelationshipRequiredPropertiesV2.json |    12 +-
 ...RelationshipTypeIncludesInvalidDtmiV2.json |     8 +-
 ...assRelationshipTypeIncludesMaterialV2.json |    32 +-
 ...-ClassRelationshipTypeStringOrArrayV2.json |    64 +-
 ...ement-ClassTelemetryContextConformsV2.json |   150 +-
 ...ClassTelemetryCotypePropertyPresentV2.json |   192 +-
 ...sTelemetryCotypePropertyTermAndDtmiV2.json |     8 +-
 ...lemetryCotypePropertyValueFromTableV2.json |    96 +-
 ...tryCotypePropertyValueMatchesCotypeV2.json |    48 +-
 ...ryCotypeRequiresPropertySchemaValueV2.json |   288 +-
 ...uirement-ClassTelemetryGraphKeywordV2.json |    12 +-
 ...quirement-ClassTelemetryIdDuplicateV2.json |    20 +-
 .../Requirement-ClassTelemetryIdIsDtmiV2.json |   348 +-
 ...equirement-ClassTelemetryIdNotArrayV2.json |    48 +-
 ...ClassTelemetryMultipleSemanticTypesV2.json |    36 +-
 ...elemetryPropertyCommentStringLengthV2.json |    18 +-
 ...ClassTelemetryPropertyCommentStringV2.json |   126 +-
 ...TelemetryPropertyCommentTermAndDtmiV2.json |    20 +-
 ...emetryPropertyDescriptionLangStringV2.json |   144 +-
 ...etryPropertyDescriptionStringLengthV2.json |    18 +-
 ...metryPropertyDescriptionTermAndDtmiV2.json |    20 +-
 ...emetryPropertyDisplayNameLangStringV2.json |   144 +-
 ...etryPropertyDisplayNameStringLengthV2.json |    18 +-
 ...metryPropertyDisplayNameTermAndDtmiV2.json |    20 +-
 ...elemetryPropertyFormallyInvalidDtmiV2.json |    12 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV2.json |    24 +-
 ...metryPropertyFormallyNotDtmiNorTermV2.json |    12 +-
 ...emetryPropertyFormallyUndefinedTermV2.json |    12 +-
 ...t-ClassTelemetryPropertyNamePatternV2.json |    50 +-
 ...ssTelemetryPropertyNameStringLengthV2.json |     6 +-
 ...nt-ClassTelemetryPropertyNameStringV2.json |    44 +-
 ...assTelemetryPropertyNameTermAndDtmiV2.json |    12 +-
 ...rtyNameUniqueAmongInterfaceContentsV2.json |     6 +-
 ...ClassTelemetryPropertySchemaElementV2.json |   243 +-
 ...sTelemetryPropertySchemaTermAndDtmiV2.json |     8 +-
 ...emetryPropertySchemaTypeConformanceV2.json |   214 +-
 ...nt-ClassTelemetryRequiredPropertiesV2.json |    20 +-
 ...assTelemetryTypeIncludesInvalidDtmiV2.json |     8 +-
 ...-ClassTelemetryTypeIncludesMaterialV2.json |    32 +-
 ...ent-ClassTelemetryTypeStringOrArrayV2.json |    64 +-
 .../Requirement-TopLevelDtdlContextV2.json    |    33 +
 DTDL/v3/DTDL.Extensions.md                    |   110 +-
 DTDL/v3/DTDL.Specification.v3.md              |   103 +-
 DTDL/v3/DTDL.annotation.v1.md                 |    13 +-
 DTDL/v3/DTDL.historization.v1.md              |    11 +-
 DTDL/v3/DTDL.mqtt.v1.md                       |    11 +-
 DTDL/v3/DTDL.overriding.v1.md                 |    26 +-
 DTDL/v3/DTDL.quantitativeTypes.v1.md          |     9 +-
 DTDL/v3/DTDL.v3.md                            |    17 +-
 DTDL/v3/metamodel/DTDL.v3.ModelElements.json  |     4 +-
 ...owance-ClassArrayOptionalPropertiesV3.json |    20 +-
 ...wance-ClassArrayPropertyCommentDtmiV3.json |     8 +-
 ...e-ClassArrayPropertyDescriptionDtmiV3.json |     8 +-
 ...e-ClassArrayPropertyDisplayNameDtmiV3.json |     8 +-
 ...ClassArrayPropertyElementSchemaDtmiV3.json |     4 +-
 ...ance-ClassCommandOptionalPropertiesV3.json |    36 +-
 ...ClassCommandPropertyCommandTypeDtmiV3.json |     4 +-
 ...nce-ClassCommandPropertyCommentDtmiV3.json |     6 +-
 ...ClassCommandPropertyDescriptionDtmiV3.json |     6 +-
 ...ClassCommandPropertyDisplayNameDtmiV3.json |     6 +-
 ...owance-ClassCommandPropertyNameDtmiV3.json |     4 +-
 ...nce-ClassCommandPropertyRequestDtmiV3.json |     8 +-
 ...ce-ClassCommandPropertyResponseDtmiV3.json |     8 +-
 ...assCommandRequestOptionalPropertiesV3.json |    52 +-
 ...ssCommandRequestPropertyCommentDtmiV3.json |     8 +-
 ...mmandRequestPropertyDescriptionDtmiV3.json |     8 +-
 ...mmandRequestPropertyDisplayNameDtmiV3.json |     8 +-
 ...ClassCommandRequestPropertyNameDtmiV3.json |     8 +-
 ...assCommandRequestPropertySchemaDtmiV3.json |     8 +-
 ...ssCommandResponseOptionalPropertiesV3.json |    52 +-
 ...sCommandResponsePropertyCommentDtmiV3.json |    10 +-
 ...mandResponsePropertyDescriptionDtmiV3.json |    10 +-
 ...mandResponsePropertyDisplayNameDtmiV3.json |    10 +-
 ...lassCommandResponsePropertyNameDtmiV3.json |     6 +-
 ...ssCommandResponsePropertySchemaDtmiV3.json |     8 +-
 ...ce-ClassComponentOptionalPropertiesV3.json |    34 +-
 ...e-ClassComponentPropertyCommentDtmiV3.json |     8 +-
 ...assComponentPropertyDescriptionDtmiV3.json |     8 +-
 ...assComponentPropertyDisplayNameDtmiV3.json |     8 +-
 ...ance-ClassComponentPropertyNameDtmiV3.json |     6 +-
 ...ce-ClassComponentPropertySchemaDtmiV3.json |     6 +-
 ...lowance-ClassEnumOptionalPropertiesV3.json |    24 +-
 ...owance-ClassEnumPropertyCommentDtmiV3.json |     6 +-
 ...ce-ClassEnumPropertyDescriptionDtmiV3.json |     6 +-
 ...ce-ClassEnumPropertyDisplayNameDtmiV3.json |     6 +-
 ...nce-ClassEnumPropertyEnumValuesDtmiV3.json |     8 +-
 ...ce-ClassEnumPropertyValueSchemaDtmiV3.json |     4 +-
 ...ce-ClassEnumValueOptionalPropertiesV3.json |    48 +-
 ...e-ClassEnumValuePropertyCommentDtmiV3.json |    10 +-
 ...assEnumValuePropertyDescriptionDtmiV3.json |    10 +-
 ...assEnumValuePropertyDisplayNameDtmiV3.json |    10 +-
 ...ClassEnumValuePropertyEnumValueDtmiV3.json |     8 +-
 ...ance-ClassEnumValuePropertyNameDtmiV3.json |     8 +-
 ...owance-ClassFieldOptionalPropertiesV3.json |    48 +-
 ...wance-ClassFieldPropertyCommentDtmiV3.json |    10 +-
 ...e-ClassFieldPropertyDescriptionDtmiV3.json |    10 +-
 ...e-ClassFieldPropertyDisplayNameDtmiV3.json |    10 +-
 ...llowance-ClassFieldPropertyNameDtmiV3.json |     8 +-
 ...owance-ClassFieldPropertySchemaDtmiV3.json |     8 +-
 ...ce-ClassInterfaceOptionalPropertiesV3.json |    16 +-
 ...e-ClassInterfacePropertyCommentDtmiV3.json |     4 +-
 ...-ClassInterfacePropertyContentsDtmiV3.json |     4 +-
 ...assInterfacePropertyDescriptionDtmiV3.json |     4 +-
 ...assInterfacePropertyDisplayNameDtmiV3.json |     4 +-
 ...e-ClassInterfacePropertyExtendsDtmiV3.json |     4 +-
 ...e-ClassInterfacePropertySchemasDtmiV3.json |     4 +-
 ...wance-ClassMapKeyOptionalPropertiesV3.json |    60 +-
 ...ance-ClassMapKeyPropertyCommentDtmiV3.json |    12 +-
 ...-ClassMapKeyPropertyDescriptionDtmiV3.json |    12 +-
 ...-ClassMapKeyPropertyDisplayNameDtmiV3.json |    12 +-
 ...lowance-ClassMapKeyPropertyNameDtmiV3.json |    10 +-
 ...wance-ClassMapKeyPropertySchemaDtmiV3.json |    10 +-
 ...llowance-ClassMapOptionalPropertiesV3.json |    50 +-
 ...lowance-ClassMapPropertyCommentDtmiV3.json |    12 +-
 ...nce-ClassMapPropertyDescriptionDtmiV3.json |    12 +-
 ...nce-ClassMapPropertyDisplayNameDtmiV3.json |    12 +-
 ...llowance-ClassMapPropertyMapKeyDtmiV3.json |    10 +-
 ...owance-ClassMapPropertyMapValueDtmiV3.json |    10 +-
 ...nce-ClassMapValueOptionalPropertiesV3.json |    48 +-
 ...ce-ClassMapValuePropertyCommentDtmiV3.json |    12 +-
 ...lassMapValuePropertyDescriptionDtmiV3.json |    12 +-
 ...lassMapValuePropertyDisplayNameDtmiV3.json |    12 +-
 ...wance-ClassMapValuePropertyNameDtmiV3.json |    10 +-
 ...nce-ClassMapValuePropertySchemaDtmiV3.json |     8 +-
 ...wance-ClassObjectOptionalPropertiesV3.json |    24 +-
 ...ance-ClassObjectPropertyCommentDtmiV3.json |     6 +-
 ...-ClassObjectPropertyDescriptionDtmiV3.json |     6 +-
 ...-ClassObjectPropertyDisplayNameDtmiV3.json |     6 +-
 ...wance-ClassObjectPropertyFieldsDtmiV3.json |     8 +-
 ...nce-ClassPropertyOptionalPropertiesV3.json |    40 +-
 ...ce-ClassPropertyPropertyCommentDtmiV3.json |     8 +-
 ...lassPropertyPropertyDescriptionDtmiV3.json |     8 +-
 ...lassPropertyPropertyDisplayNameDtmiV3.json |     8 +-
 ...wance-ClassPropertyPropertyNameDtmiV3.json |     6 +-
 ...nce-ClassPropertyPropertySchemaDtmiV3.json |     6 +-
 ...e-ClassPropertyPropertyWritableDtmiV3.json |     6 +-
 ...ClassRelationshipOptionalPropertiesV3.json |    44 +-
 ...lassRelationshipPropertyCommentDtmiV3.json |     6 +-
 ...RelationshipPropertyDescriptionDtmiV3.json |     6 +-
 ...RelationshipPropertyDisplayNameDtmiV3.json |     6 +-
 ...tionshipPropertyMaxMultiplicityDtmiV3.json |     6 +-
 ...tionshipPropertyMinMultiplicityDtmiV3.json |     4 +-
 ...e-ClassRelationshipPropertyNameDtmiV3.json |     4 +-
 ...sRelationshipPropertyPropertiesDtmiV3.json |     6 +-
 ...ClassRelationshipPropertyTargetDtmiV3.json |     6 +-
 ...assRelationshipPropertyWritableDtmiV3.json |     4 +-
 ...ce-ClassTelemetryOptionalPropertiesV3.json |    34 +-
 ...e-ClassTelemetryPropertyCommentDtmiV3.json |     8 +-
 ...assTelemetryPropertyDescriptionDtmiV3.json |     8 +-
 ...assTelemetryPropertyDisplayNameDtmiV3.json |     8 +-
 ...ance-ClassTelemetryPropertyNameDtmiV3.json |     4 +-
 ...ce-ClassTelemetryPropertySchemaDtmiV3.json |     6 +-
 ...ertyElementSchemaDependentReferenceV3.json |     8 +-
 ...ssArrayPropertyIrrelevantDtmiOrTermV3.json |    24 +-
 ...ion-ClassArrayPropertyUndefinedTermV3.json |    12 +-
 ...rayTypeIncludesIrrelevantDtmiOrTermV3.json |    16 +-
 ...ClassArrayTypeIncludesUndefinedTermV3.json |     8 +-
 ...CommandPropertyIrrelevantDtmiOrTermV3.json |    16 +-
 ...ndPropertyRequestDependentReferenceV3.json |    12 +-
 ...dPropertyResponseDependentReferenceV3.json |    12 +-
 ...n-ClassCommandPropertyUndefinedTermV3.json |     8 +-
 ...RequestPropertyIrrelevantDtmiOrTermV3.json |    24 +-
 ...estPropertySchemaDependentReferenceV3.json |    16 +-
 ...CommandRequestPropertyUndefinedTermV3.json |    12 +-
 ...estTypeIncludesIrrelevantDtmiOrTermV3.json |    24 +-
 ...andRequestTypeIncludesUndefinedTermV3.json |    12 +-
 ...esponsePropertyIrrelevantDtmiOrTermV3.json |    32 +-
 ...nsePropertySchemaDependentReferenceV3.json |    16 +-
 ...ommandResponsePropertyUndefinedTermV3.json |    16 +-
 ...nseTypeIncludesIrrelevantDtmiOrTermV3.json |    32 +-
 ...ndResponseTypeIncludesUndefinedTermV3.json |    16 +-
 ...andTypeIncludesIrrelevantDtmiOrTermV3.json |    16 +-
 ...assCommandTypeIncludesUndefinedTermV3.json |     8 +-
 ...mponentPropertyIrrelevantDtmiOrTermV3.json |    24 +-
 ...entPropertySchemaDependentReferenceV3.json |    12 +-
 ...ClassComponentPropertyUndefinedTermV3.json |    12 +-
 ...entTypeIncludesIrrelevantDtmiOrTermV3.json |    24 +-
 ...sComponentTypeIncludesUndefinedTermV3.json |    12 +-
 ...ropertyEnumValuesDependentReferenceV3.json |     8 +-
 ...assEnumPropertyIrrelevantDtmiOrTermV3.json |    16 +-
 ...tion-ClassEnumPropertyUndefinedTermV3.json |     8 +-
 ...numTypeIncludesIrrelevantDtmiOrTermV3.json |    16 +-
 ...-ClassEnumTypeIncludesUndefinedTermV3.json |     8 +-
 ...umValuePropertyIrrelevantDtmiOrTermV3.json |    32 +-
 ...ClassEnumValuePropertyUndefinedTermV3.json |    16 +-
 ...lueTypeIncludesIrrelevantDtmiOrTermV3.json |    32 +-
 ...sEnumValueTypeIncludesUndefinedTermV3.json |    16 +-
 ...ssFieldPropertyIrrelevantDtmiOrTermV3.json |    32 +-
 ...eldPropertySchemaDependentReferenceV3.json |    12 +-
 ...ion-ClassFieldPropertyUndefinedTermV3.json |    16 +-
 ...eldTypeIncludesIrrelevantDtmiOrTermV3.json |    32 +-
 ...ClassFieldTypeIncludesUndefinedTermV3.json |    16 +-
 ...ePropertyContentsDependentReferenceV3.json |     8 +-
 ...cePropertyExtendsDependentReferenceV3.json |     8 +-
 ...terfacePropertyIrrelevantDtmiOrTermV3.json |     8 +-
 ...cePropertySchemasDependentReferenceV3.json |     8 +-
 ...ClassInterfacePropertyUndefinedTermV3.json |     4 +-
 ...aceTypeIncludesIrrelevantDtmiOrTermV3.json |     8 +-
 ...sInterfaceTypeIncludesUndefinedTermV3.json |     4 +-
 ...sMapKeyPropertyIrrelevantDtmiOrTermV3.json |    40 +-
 ...on-ClassMapKeyPropertyUndefinedTermV3.json |    20 +-
 ...KeyTypeIncludesIrrelevantDtmiOrTermV3.json |    40 +-
 ...lassMapKeyTypeIncludesUndefinedTermV3.json |    20 +-
 ...lassMapPropertyIrrelevantDtmiOrTermV3.json |    40 +-
 ...MapPropertyMapKeyDependentReferenceV3.json |    16 +-
 ...pPropertyMapValueDependentReferenceV3.json |    12 +-
 ...etion-ClassMapPropertyUndefinedTermV3.json |    20 +-
 ...MapTypeIncludesIrrelevantDtmiOrTermV3.json |    32 +-
 ...n-ClassMapTypeIncludesUndefinedTermV3.json |    16 +-
 ...apValuePropertyIrrelevantDtmiOrTermV3.json |    40 +-
 ...luePropertySchemaDependentReferenceV3.json |    16 +-
 ...-ClassMapValuePropertyUndefinedTermV3.json |    20 +-
 ...lueTypeIncludesIrrelevantDtmiOrTermV3.json |    40 +-
 ...ssMapValueTypeIncludesUndefinedTermV3.json |    20 +-
 ...ectPropertyFieldsDependentReferenceV3.json |     8 +-
 ...sObjectPropertyIrrelevantDtmiOrTermV3.json |    16 +-
 ...on-ClassObjectPropertyUndefinedTermV3.json |     8 +-
 ...ectTypeIncludesIrrelevantDtmiOrTermV3.json |    16 +-
 ...lassObjectTypeIncludesUndefinedTermV3.json |     8 +-
 ...ropertyPropertyIrrelevantDtmiOrTermV3.json |    24 +-
 ...rtyPropertySchemaDependentReferenceV3.json |    12 +-
 ...-ClassPropertyPropertyUndefinedTermV3.json |    12 +-
 ...rtyTypeIncludesIrrelevantDtmiOrTermV3.json |    24 +-
 ...ssPropertyTypeIncludesUndefinedTermV3.json |    12 +-
 ...ionshipPropertyIrrelevantDtmiOrTermV3.json |    16 +-
 ...ropertyPropertiesDependentReferenceV3.json |    12 +-
 ...ssRelationshipPropertyUndefinedTermV3.json |     8 +-
 ...hipTypeIncludesIrrelevantDtmiOrTermV3.json |    16 +-
 ...lationshipTypeIncludesUndefinedTermV3.json |     8 +-
 ...lemetryPropertyIrrelevantDtmiOrTermV3.json |    24 +-
 ...tryPropertySchemaDependentReferenceV3.json |    12 +-
 ...ClassTelemetryPropertyUndefinedTermV3.json |    12 +-
 ...tryTypeIncludesIrrelevantDtmiOrTermV3.json |    16 +-
 ...sTelemetryTypeIncludesUndefinedTermV3.json |     8 +-
 ...ation-ClassArrayPropertyCommentTermV3.json |    16 +-
 ...n-ClassArrayPropertyDescriptionTermV3.json |    16 +-
 ...n-ClassArrayPropertyDisplayNameTermV3.json |    16 +-
 ...opertyElementSchemaPreferTermToDtmiV3.json |    16 +-
 ...ClassArrayPropertyElementSchemaTermV3.json |     8 +-
 ...on-ClassArrayTypeDuplicatesMaterialV3.json |     8 +-
 ...n-ClassArrayTypeIncludesTermAndDtmiV3.json |     4 +-
 ...tion-ClassArrayTypePreferTermToDtmiV3.json |     8 +-
 ...ommandPropertyCommandTypeDeprecatedV3.json |     4 +-
 ...ClassCommandPropertyCommandTypeTermV3.json |     8 +-
 ...ion-ClassCommandPropertyCommentTermV3.json |    12 +-
 ...ClassCommandPropertyDescriptionTermV3.json |    12 +-
 ...ClassCommandPropertyDisplayNameTermV3.json |    12 +-
 ...dation-ClassCommandPropertyNameTermV3.json |     8 +-
 ...ion-ClassCommandPropertyRequestTermV3.json |    16 +-
 ...on-ClassCommandPropertyResponseTermV3.json |    16 +-
 ...ssCommandRequestPropertyCommentTermV3.json |    16 +-
 ...mmandRequestPropertyDescriptionTermV3.json |    16 +-
 ...mmandRequestPropertyDisplayNameTermV3.json |    16 +-
 ...ClassCommandRequestPropertyNameTermV3.json |    16 +-
 ...questPropertySchemaPreferTermToDtmiV3.json |    24 +-
 ...assCommandRequestPropertySchemaTermV3.json |    16 +-
 ...ommandRequestTypeDuplicatesMaterialV3.json |    12 +-
 ...mmandRequestTypeIncludesTermAndDtmiV3.json |     6 +-
 ...sCommandRequestTypePreferTermToDtmiV3.json |    12 +-
 ...sCommandResponsePropertyCommentTermV3.json |    20 +-
 ...mandResponsePropertyDescriptionTermV3.json |    20 +-
 ...mandResponsePropertyDisplayNameTermV3.json |    20 +-
 ...lassCommandResponsePropertyNameTermV3.json |    12 +-
 ...ponsePropertySchemaPreferTermToDtmiV3.json |    24 +-
 ...ssCommandResponsePropertySchemaTermV3.json |    16 +-
 ...mmandResponseTypeDuplicatesMaterialV3.json |    16 +-
 ...mandResponseTypeIncludesTermAndDtmiV3.json |     8 +-
 ...CommandResponseTypePreferTermToDtmiV3.json |    16 +-
 ...-ClassCommandTypeDuplicatesMaterialV3.json |     8 +-
 ...ClassCommandTypeIncludesTermAndDtmiV3.json |     4 +-
 ...on-ClassCommandTypePreferTermToDtmiV3.json |     8 +-
 ...n-ClassComponentPropertyCommentTermV3.json |    16 +-
 ...assComponentPropertyDescriptionTermV3.json |    16 +-
 ...assComponentPropertyDisplayNameTermV3.json |    16 +-
 ...tion-ClassComponentPropertyNameTermV3.json |    12 +-
 ...on-ClassComponentPropertySchemaTermV3.json |    12 +-
 ...lassComponentTypeDuplicatesMaterialV3.json |    12 +-
 ...assComponentTypeIncludesTermAndDtmiV3.json |     6 +-
 ...-ClassComponentTypePreferTermToDtmiV3.json |    12 +-
 ...dation-ClassEnumPropertyCommentTermV3.json |    12 +-
 ...on-ClassEnumPropertyDescriptionTermV3.json |    12 +-
 ...on-ClassEnumPropertyDisplayNameTermV3.json |    12 +-
 ...ion-ClassEnumPropertyEnumValuesTermV3.json |    16 +-
 ...on-ClassEnumPropertyValueSchemaTermV3.json |     8 +-
 ...ValueSchemaValueIntegerPreferToDtmiV3.json |    12 +-
 ...yValueSchemaValueStringPreferToDtmiV3.json |    16 +-
 ...ion-ClassEnumTypeDuplicatesMaterialV3.json |     8 +-
 ...on-ClassEnumTypeIncludesTermAndDtmiV3.json |     4 +-
 ...ation-ClassEnumTypePreferTermToDtmiV3.json |     8 +-
 ...n-ClassEnumValuePropertyCommentTermV3.json |    20 +-
 ...assEnumValuePropertyDescriptionTermV3.json |    20 +-
 ...assEnumValuePropertyDisplayNameTermV3.json |    20 +-
 ...ClassEnumValuePropertyEnumValueTermV3.json |    16 +-
 ...tion-ClassEnumValuePropertyNameTermV3.json |    16 +-
 ...lassEnumValueTypeDuplicatesMaterialV3.json |    16 +-
 ...assEnumValueTypeIncludesTermAndDtmiV3.json |     8 +-
 ...-ClassEnumValueTypePreferTermToDtmiV3.json |    16 +-
 ...ation-ClassFieldPropertyCommentTermV3.json |    20 +-
 ...n-ClassFieldPropertyDescriptionTermV3.json |    20 +-
 ...n-ClassFieldPropertyDisplayNameTermV3.json |    20 +-
 ...endation-ClassFieldPropertyNameTermV3.json |    16 +-
 ...FieldPropertySchemaPreferTermToDtmiV3.json |    24 +-
 ...dation-ClassFieldPropertySchemaTermV3.json |    16 +-
 ...on-ClassFieldTypeDuplicatesMaterialV3.json |    16 +-
 ...n-ClassFieldTypeIncludesTermAndDtmiV3.json |     8 +-
 ...tion-ClassFieldTypePreferTermToDtmiV3.json |    16 +-
 ...n-ClassInterfacePropertyCommentTermV3.json |     8 +-
 ...-ClassInterfacePropertyContentsTermV3.json |     8 +-
 ...assInterfacePropertyDescriptionTermV3.json |     8 +-
 ...assInterfacePropertyDisplayNameTermV3.json |     8 +-
 ...n-ClassInterfacePropertyExtendsTermV3.json |     8 +-
 ...n-ClassInterfacePropertySchemasTermV3.json |     8 +-
 ...lassInterfaceTypeDuplicatesMaterialV3.json |     4 +-
 ...assInterfaceTypeIncludesTermAndDtmiV3.json |     2 +-
 ...-ClassInterfaceTypePreferTermToDtmiV3.json |     4 +-
 ...tion-ClassMapKeyPropertyCommentTermV3.json |    24 +-
 ...-ClassMapKeyPropertyDescriptionTermV3.json |    24 +-
 ...-ClassMapKeyPropertyDisplayNameTermV3.json |    24 +-
 ...ndation-ClassMapKeyPropertyNameTermV3.json |    20 +-
 ...ation-ClassMapKeyPropertySchemaTermV3.json |    20 +-
 ...opertySchemaValueStringPreferToDtmiV3.json |    20 +-
 ...n-ClassMapKeyTypeDuplicatesMaterialV3.json |    20 +-
 ...-ClassMapKeyTypeIncludesTermAndDtmiV3.json |    10 +-
 ...ion-ClassMapKeyTypePreferTermToDtmiV3.json |    20 +-
 ...ndation-ClassMapPropertyCommentTermV3.json |    24 +-
 ...ion-ClassMapPropertyDescriptionTermV3.json |    24 +-
 ...ion-ClassMapPropertyDisplayNameTermV3.json |    24 +-
 ...endation-ClassMapPropertyMapKeyTermV3.json |    20 +-
 ...dation-ClassMapPropertyMapValueTermV3.json |    20 +-
 ...tion-ClassMapTypeDuplicatesMaterialV3.json |    16 +-
 ...ion-ClassMapTypeIncludesTermAndDtmiV3.json |     8 +-
 ...dation-ClassMapTypePreferTermToDtmiV3.json |    16 +-
 ...on-ClassMapValuePropertyCommentTermV3.json |    24 +-
 ...lassMapValuePropertyDescriptionTermV3.json |    24 +-
 ...lassMapValuePropertyDisplayNameTermV3.json |    24 +-
 ...ation-ClassMapValuePropertyNameTermV3.json |    20 +-
 ...ValuePropertySchemaPreferTermToDtmiV3.json |    32 +-
 ...ion-ClassMapValuePropertySchemaTermV3.json |    16 +-
 ...ClassMapValueTypeDuplicatesMaterialV3.json |    20 +-
 ...lassMapValueTypeIncludesTermAndDtmiV3.json |    10 +-
 ...n-ClassMapValueTypePreferTermToDtmiV3.json |    20 +-
 ...tion-ClassObjectPropertyCommentTermV3.json |    12 +-
 ...-ClassObjectPropertyDescriptionTermV3.json |    12 +-
 ...-ClassObjectPropertyDisplayNameTermV3.json |    12 +-
 ...ation-ClassObjectPropertyFieldsTermV3.json |    16 +-
 ...n-ClassObjectTypeDuplicatesMaterialV3.json |     8 +-
 ...-ClassObjectTypeIncludesTermAndDtmiV3.json |     4 +-
 ...ion-ClassObjectTypePreferTermToDtmiV3.json |     8 +-
 ...on-ClassPropertyPropertyCommentTermV3.json |    16 +-
 ...lassPropertyPropertyDescriptionTermV3.json |    16 +-
 ...lassPropertyPropertyDisplayNameTermV3.json |    16 +-
 ...ation-ClassPropertyPropertyNameTermV3.json |    12 +-
 ...pertyPropertySchemaPreferTermToDtmiV3.json |    16 +-
 ...ion-ClassPropertyPropertySchemaTermV3.json |    12 +-
 ...n-ClassPropertyPropertyWritableTermV3.json |    12 +-
 ...ClassPropertyTypeDuplicatesMaterialV3.json |    12 +-
 ...lassPropertyTypeIncludesTermAndDtmiV3.json |     6 +-
 ...n-ClassPropertyTypePreferTermToDtmiV3.json |    12 +-
 ...lassRelationshipPropertyCommentTermV3.json |    12 +-
 ...RelationshipPropertyDescriptionTermV3.json |    12 +-
 ...RelationshipPropertyDisplayNameTermV3.json |    12 +-
 ...tionshipPropertyMaxMultiplicityTermV3.json |    12 +-
 ...tionshipPropertyMinMultiplicityTermV3.json |     8 +-
 ...n-ClassRelationshipPropertyNameTermV3.json |     8 +-
 ...sRelationshipPropertyPropertiesTermV3.json |    12 +-
 ...ClassRelationshipPropertyTargetTermV3.json |    12 +-
 ...assRelationshipPropertyWritableTermV3.json |     8 +-
 ...sRelationshipTypeDuplicatesMaterialV3.json |     8 +-
 ...RelationshipTypeIncludesTermAndDtmiV3.json |     4 +-
 ...assRelationshipTypePreferTermToDtmiV3.json |     8 +-
 ...n-ClassTelemetryPropertyCommentTermV3.json |    16 +-
 ...assTelemetryPropertyDescriptionTermV3.json |    16 +-
 ...assTelemetryPropertyDisplayNameTermV3.json |    16 +-
 ...tion-ClassTelemetryPropertyNameTermV3.json |     8 +-
 ...metryPropertySchemaPreferTermToDtmiV3.json |    16 +-
 ...on-ClassTelemetryPropertySchemaTermV3.json |    12 +-
 ...lassTelemetryTypeDuplicatesMaterialV3.json |     8 +-
 ...assTelemetryTypeIncludesTermAndDtmiV3.json |     4 +-
 ...-ClassTelemetryTypePreferTermToDtmiV3.json |     8 +-
 ...quirement-ClassArrayContextConformsV3.json |   120 +-
 .../Requirement-ClassArrayIdDuplicateV3.json  |    20 +-
 .../Requirement-ClassArrayIdIsDtmiV3.json     |   220 +-
 .../Requirement-ClassArrayIdNotArrayV3.json   |    56 +-
 .../Requirement-ClassArrayIdRequiredV3.json   |    20 +-
 ...quirement-ClassArrayInvalidKeywordsV3.json |    48 +-
 ...opertiesElementSchemaSchemaMaxDepthV3.json |    12 +-
 ...iesElementSchemaSchemaSelfReferenceV3.json |    47 +
 ...assArrayPropertyCommentStringLengthV3.json |    18 +-
 ...ent-ClassArrayPropertyCommentStringV3.json |   126 +-
 ...lassArrayPropertyCommentTermAndDtmiV3.json |    20 +-
 ...sArrayPropertyDescriptionLangStringV3.json |   144 +-
 ...rrayPropertyDescriptionStringLengthV3.json |    18 +-
 ...ArrayPropertyDescriptionTermAndDtmiV3.json |    20 +-
 ...sArrayPropertyDisplayNameLangStringV3.json |   144 +-
 ...rrayPropertyDisplayNameStringLengthV3.json |    18 +-
 ...ArrayPropertyDisplayNameTermAndDtmiV3.json |    20 +-
 ...ssArrayPropertyElementSchemaElementV3.json |   199 +-
 ...rayPropertyElementSchemaTermAndDtmiV3.json |     8 +-
 ...ropertyElementSchemaTypeConformanceV3.json |   224 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV3.json |    24 +-
 ...sArrayPropertyFormallyUndefinedTermV3.json |    12 +-
 ...ement-ClassArrayPropertyInvalidDtmiV3.json |    12 +-
 ...nt-ClassArrayPropertyNotDtmiNorTermV3.json |    12 +-
 ...rement-ClassArrayRequiredPropertiesV3.json |    16 +-
 ...t-ClassArrayTypeIncludesInvalidDtmiV3.json |     8 +-
 ...ment-ClassArrayTypeIncludesMaterialV3.json |    32 +-
 ...lassArrayTypeIncludesNotDtmiNorTermV3.json |     8 +-
 ...irement-ClassArrayTypeStringOrArrayV3.json |    64 +-
 ...irement-ClassCommandContextConformsV3.json |   148 +-
 ...Requirement-ClassCommandIdDuplicateV3.json |    16 +-
 .../Requirement-ClassCommandIdIsDtmiV3.json   |   220 +-
 .../Requirement-ClassCommandIdNotArrayV3.json |    56 +-
 ...irement-ClassCommandInvalidKeywordsV3.json |    32 +-
 ...ndPropertyCommandTypeSpecificValuesV3.json |   372 +-
 ...mmandPropertyCommandTypeTermAndDtmiV3.json |     8 +-
 ...sCommandPropertyCommentStringLengthV3.json |    12 +-
 ...t-ClassCommandPropertyCommentStringV3.json |    84 +-
 ...ssCommandPropertyCommentTermAndDtmiV3.json |    16 +-
 ...ommandPropertyDescriptionLangStringV3.json |    96 +-
 ...mandPropertyDescriptionStringLengthV3.json |    12 +-
 ...mmandPropertyDescriptionTermAndDtmiV3.json |    16 +-
 ...ommandPropertyDisplayNameLangStringV3.json |    96 +-
 ...mandPropertyDisplayNameStringLengthV3.json |    12 +-
 ...mmandPropertyDisplayNameTermAndDtmiV3.json |    16 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV3.json |    16 +-
 ...ommandPropertyFormallyUndefinedTermV3.json |     8 +-
 ...ent-ClassCommandPropertyInvalidDtmiV3.json |     8 +-
 ...ent-ClassCommandPropertyNamePatternV3.json |    50 +-
 ...lassCommandPropertyNameStringLengthV3.json |     6 +-
 ...ment-ClassCommandPropertyNameStringV3.json |    44 +-
 ...ClassCommandPropertyNameTermAndDtmiV3.json |    12 +-
 ...rtyNameUniqueAmongInterfaceContentsV3.json |    18 +-
 ...-ClassCommandPropertyNotDtmiNorTermV3.json |     8 +-
 ...-ClassCommandPropertyRequestElementV3.json |   157 +-
 ...ssCommandPropertyRequestTermAndDtmiV3.json |    24 +-
 ...mmandPropertyRequestTypeConformanceV3.json |   274 +-
 ...ClassCommandPropertyResponseElementV3.json |   157 +-
 ...sCommandPropertyResponseTermAndDtmiV3.json |    24 +-
 ...mandPropertyResponseTypeConformanceV3.json |   274 +-
 ...-ClassCommandRequestContextConformsV3.json |   202 +-
 ...ment-ClassCommandRequestIdDuplicateV3.json |    24 +-
 ...irement-ClassCommandRequestIdIsDtmiV3.json |   330 +-
 ...ement-ClassCommandRequestIdNotArrayV3.json |    84 +-
 ...-ClassCommandRequestInvalidKeywordsV3.json |    48 +-
 ...dRequestPropertyCommentStringLengthV3.json |    18 +-
 ...CommandRequestPropertyCommentStringV3.json |   126 +-
 ...ndRequestPropertyCommentTermAndDtmiV3.json |    20 +-
 ...equestPropertyDescriptionLangStringV3.json |   144 +-
 ...uestPropertyDescriptionStringLengthV3.json |    18 +-
 ...questPropertyDescriptionTermAndDtmiV3.json |    20 +-
 ...equestPropertyDisplayNameLangStringV3.json |   144 +-
 ...uestPropertyDisplayNameStringLengthV3.json |    18 +-
 ...questPropertyDisplayNameTermAndDtmiV3.json |    20 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV3.json |    24 +-
 ...equestPropertyFormallyUndefinedTermV3.json |    12 +-
 ...ssCommandRequestPropertyInvalidDtmiV3.json |    12 +-
 ...ssCommandRequestPropertyNamePatternV3.json |   150 +-
 ...mandRequestPropertyNameStringLengthV3.json |    18 +-
 ...assCommandRequestPropertyNameStringV3.json |   132 +-
 ...mmandRequestPropertyNameTermAndDtmiV3.json |    20 +-
 ...ommandRequestPropertyNotDtmiNorTermV3.json |    12 +-
 ...CommandRequestPropertySchemaElementV3.json |   297 +-
 ...andRequestPropertySchemaTermAndDtmiV3.json |    20 +-
 ...equestPropertySchemaTypeConformanceV3.json |   308 +-
 ...assCommandRequestRequiredPropertiesV3.json |    24 +-
 ...mmandRequestTypeIncludesInvalidDtmiV3.json |    12 +-
 ...sCommandRequestTypeIncludesMaterialV3.json |    48 +-
 ...ndRequestTypeIncludesNotDtmiNorTermV3.json |    12 +-
 ...lassCommandRequestTypeStringOrArrayV3.json |    96 +-
 ...ment-ClassCommandRequiredPropertiesV3.json |    12 +-
 ...ClassCommandResponseContextConformsV3.json |   212 +-
 ...ent-ClassCommandResponseIdDuplicateV3.json |    28 +-
 ...rement-ClassCommandResponseIdIsDtmiV3.json |   440 +-
 ...ment-ClassCommandResponseIdNotArrayV3.json |   112 +-
 ...ClassCommandResponseInvalidKeywordsV3.json |    64 +-
 ...ResponsePropertyCommentStringLengthV3.json |    24 +-
 ...ommandResponsePropertyCommentStringV3.json |   168 +-
 ...dResponsePropertyCommentTermAndDtmiV3.json |    24 +-
 ...sponsePropertyDescriptionLangStringV3.json |   192 +-
 ...onsePropertyDescriptionStringLengthV3.json |    24 +-
 ...ponsePropertyDescriptionTermAndDtmiV3.json |    24 +-
 ...sponsePropertyDisplayNameLangStringV3.json |   192 +-
 ...onsePropertyDisplayNameStringLengthV3.json |    24 +-
 ...ponsePropertyDisplayNameTermAndDtmiV3.json |    24 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV3.json |    32 +-
 ...sponsePropertyFormallyUndefinedTermV3.json |    16 +-
 ...sCommandResponsePropertyInvalidDtmiV3.json |    16 +-
 ...sCommandResponsePropertyNamePatternV3.json |   100 +-
 ...andResponsePropertyNameStringLengthV3.json |    12 +-
 ...ssCommandResponsePropertyNameStringV3.json |    88 +-
 ...mandResponsePropertyNameTermAndDtmiV3.json |    16 +-
 ...mmandResponsePropertyNotDtmiNorTermV3.json |    16 +-
 ...ommandResponsePropertySchemaElementV3.json |   287 +-
 ...ndResponsePropertySchemaTermAndDtmiV3.json |    20 +-
 ...sponsePropertySchemaTypeConformanceV3.json |   308 +-
 ...ssCommandResponseRequiredPropertiesV3.json |    20 +-
 ...mandResponseTypeIncludesInvalidDtmiV3.json |    16 +-
 ...CommandResponseTypeIncludesMaterialV3.json |    64 +-
 ...dResponseTypeIncludesNotDtmiNorTermV3.json |    16 +-
 ...assCommandResponseTypeStringOrArrayV3.json |   128 +-
 ...ClassCommandTypeIncludesInvalidDtmiV3.json |     8 +-
 ...nt-ClassCommandTypeIncludesMaterialV3.json |    32 +-
 ...ssCommandTypeIncludesNotDtmiNorTermV3.json |     8 +-
 ...ement-ClassCommandTypeStringOrArrayV3.json |    64 +-
 ...ement-ClassComponentContextConformsV3.json |   184 +-
 ...quirement-ClassComponentIdDuplicateV3.json |    20 +-
 .../Requirement-ClassComponentIdIsDtmiV3.json |   330 +-
 ...equirement-ClassComponentIdNotArrayV3.json |    84 +-
 ...ement-ClassComponentInvalidKeywordsV3.json |    48 +-
 ...rtiesSchemaContentsExcludeComponentV3.json |    24 +-
 ...omponentPropertyCommentStringLengthV3.json |    18 +-
 ...ClassComponentPropertyCommentStringV3.json |   126 +-
 ...ComponentPropertyCommentTermAndDtmiV3.json |    20 +-
 ...ponentPropertyDescriptionLangStringV3.json |   144 +-
 ...nentPropertyDescriptionStringLengthV3.json |    18 +-
 ...onentPropertyDescriptionTermAndDtmiV3.json |    20 +-
 ...ponentPropertyDisplayNameLangStringV3.json |   144 +-
 ...nentPropertyDisplayNameStringLengthV3.json |    18 +-
 ...onentPropertyDisplayNameTermAndDtmiV3.json |    20 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV3.json |    24 +-
 ...ponentPropertyFormallyUndefinedTermV3.json |    12 +-
 ...t-ClassComponentPropertyInvalidDtmiV3.json |    12 +-
 ...t-ClassComponentPropertyNamePatternV3.json |   100 +-
 ...ssComponentPropertyNameStringLengthV3.json |    12 +-
 ...nt-ClassComponentPropertyNameStringV3.json |    88 +-
 ...assComponentPropertyNameTermAndDtmiV3.json |    16 +-
 ...rtyNameUniqueAmongInterfaceContentsV3.json |    30 +-
 ...lassComponentPropertyNotDtmiNorTermV3.json |    12 +-
 ...ClassComponentPropertySchemaElementV3.json |   121 +-
 ...sComponentPropertySchemaTermAndDtmiV3.json |    16 +-
 ...ponentPropertySchemaTypeConformanceV3.json |   278 +-
 ...nt-ClassComponentRequiredPropertiesV3.json |    28 +-
 ...assComponentTypeIncludesInvalidDtmiV3.json |    12 +-
 ...-ClassComponentTypeIncludesMaterialV3.json |    48 +-
 ...ComponentTypeIncludesNotDtmiNorTermV3.json |    12 +-
 ...ent-ClassComponentTypeStringOrArrayV3.json |    96 +-
 ...equirement-ClassEnumContextConformsV3.json |   120 +-
 .../Requirement-ClassEnumIdDuplicateV3.json   |    16 +-
 .../spec/Requirement-ClassEnumIdIsDtmiV3.json |   110 +-
 .../Requirement-ClassEnumIdNotArrayV3.json    |    28 +-
 .../Requirement-ClassEnumIdRequiredV3.json    |    12 +-
 ...equirement-ClassEnumInvalidKeywordsV3.json |    32 +-
 ...lassEnumPropertyCommentStringLengthV3.json |    12 +-
 ...ment-ClassEnumPropertyCommentStringV3.json |    84 +-
 ...ClassEnumPropertyCommentTermAndDtmiV3.json |    16 +-
 ...ssEnumPropertyDescriptionLangStringV3.json |    96 +-
 ...EnumPropertyDescriptionStringLengthV3.json |    12 +-
 ...sEnumPropertyDescriptionTermAndDtmiV3.json |    16 +-
 ...ssEnumPropertyDisplayNameLangStringV3.json |    96 +-
 ...EnumPropertyDisplayNameStringLengthV3.json |    12 +-
 ...sEnumPropertyDisplayNameTermAndDtmiV3.json |    16 +-
 ...-ClassEnumPropertyEnumValuesElementV3.json |   135 +-
 ...ssEnumPropertyEnumValuesTermAndDtmiV3.json |    24 +-
 ...umPropertyEnumValuesTypeConformanceV3.json |   274 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV3.json |    16 +-
 ...ssEnumPropertyFormallyUndefinedTermV3.json |     8 +-
 ...rement-ClassEnumPropertyInvalidDtmiV3.json |     8 +-
 ...ent-ClassEnumPropertyNotDtmiNorTermV3.json |     8 +-
 ...umPropertyValueSchemaSpecificValuesV3.json |   412 +-
 ...sEnumPropertyValueSchemaTermAndDtmiV3.json |     8 +-
 ...irement-ClassEnumRequiredPropertiesV3.json |    16 +-
 ...nt-ClassEnumTypeIncludesInvalidDtmiV3.json |     8 +-
 ...ement-ClassEnumTypeIncludesMaterialV3.json |    32 +-
 ...ClassEnumTypeIncludesNotDtmiNorTermV3.json |     8 +-
 ...uirement-ClassEnumTypeStringOrArrayV3.json |    64 +-
 ...ement-ClassEnumValueContextConformsV3.json |   184 +-
 ...quirement-ClassEnumValueIdDuplicateV3.json |    28 +-
 .../Requirement-ClassEnumValueIdIsDtmiV3.json |   440 +-
 ...equirement-ClassEnumValueIdNotArrayV3.json |   112 +-
 ...ement-ClassEnumValueInvalidKeywordsV3.json |    64 +-
 ...numValuePropertyCommentStringLengthV3.json |    24 +-
 ...ClassEnumValuePropertyCommentStringV3.json |   168 +-
 ...EnumValuePropertyCommentTermAndDtmiV3.json |    24 +-
 ...mValuePropertyDescriptionLangStringV3.json |   192 +-
 ...aluePropertyDescriptionStringLengthV3.json |    24 +-
 ...ValuePropertyDescriptionTermAndDtmiV3.json |    24 +-
 ...mValuePropertyDisplayNameLangStringV3.json |   192 +-
 ...aluePropertyDisplayNameStringLengthV3.json |    24 +-
 ...ValuePropertyDisplayNameTermAndDtmiV3.json |    24 +-
 ...ssEnumValuePropertyEnumValueIntegerV3.json |   132 +-
 ...assEnumValuePropertyEnumValueStringV3.json |   132 +-
 ...umValuePropertyEnumValueTermAndDtmiV3.json |    20 +-
 ...yEnumValueUniqueAmongEnumEnumValuesV3.json |    60 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV3.json |    32 +-
 ...mValuePropertyFormallyUndefinedTermV3.json |    16 +-
 ...t-ClassEnumValuePropertyInvalidDtmiV3.json |    16 +-
 ...t-ClassEnumValuePropertyNamePatternV3.json |   150 +-
 ...ssEnumValuePropertyNameStringLengthV3.json |    18 +-
 ...nt-ClassEnumValuePropertyNameStringV3.json |   132 +-
 ...assEnumValuePropertyNameTermAndDtmiV3.json |    20 +-
 ...opertyNameUniqueAmongEnumEnumValuesV3.json |    36 +-
 ...lassEnumValuePropertyNotDtmiNorTermV3.json |    16 +-
 ...nt-ClassEnumValueRequiredPropertiesV3.json |    24 +-
 ...assEnumValueTypeIncludesInvalidDtmiV3.json |    16 +-
 ...-ClassEnumValueTypeIncludesMaterialV3.json |    64 +-
 ...EnumValueTypeIncludesNotDtmiNorTermV3.json |    16 +-
 ...ent-ClassEnumValueTypeStringOrArrayV3.json |   128 +-
 ...quirement-ClassFieldContextConformsV3.json |   182 +-
 .../Requirement-ClassFieldIdDuplicateV3.json  |    28 +-
 .../Requirement-ClassFieldIdIsDtmiV3.json     |   440 +-
 .../Requirement-ClassFieldIdNotArrayV3.json   |   112 +-
 ...quirement-ClassFieldInvalidKeywordsV3.json |    64 +-
 ...assFieldPropertyCommentStringLengthV3.json |    24 +-
 ...ent-ClassFieldPropertyCommentStringV3.json |   168 +-
 ...lassFieldPropertyCommentTermAndDtmiV3.json |    24 +-
 ...sFieldPropertyDescriptionLangStringV3.json |   192 +-
 ...ieldPropertyDescriptionStringLengthV3.json |    24 +-
 ...FieldPropertyDescriptionTermAndDtmiV3.json |    24 +-
 ...sFieldPropertyDisplayNameLangStringV3.json |   192 +-
 ...ieldPropertyDisplayNameStringLengthV3.json |    24 +-
 ...FieldPropertyDisplayNameTermAndDtmiV3.json |    24 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV3.json |    32 +-
 ...sFieldPropertyFormallyUndefinedTermV3.json |    16 +-
 ...ement-ClassFieldPropertyInvalidDtmiV3.json |    16 +-
 ...ement-ClassFieldPropertyNamePatternV3.json |   150 +-
 ...-ClassFieldPropertyNameStringLengthV3.json |    18 +-
 ...rement-ClassFieldPropertyNameStringV3.json |   132 +-
 ...t-ClassFieldPropertyNameTermAndDtmiV3.json |    20 +-
 ...PropertyNameUniqueAmongObjectFieldsV3.json |    36 +-
 ...nt-ClassFieldPropertyNotDtmiNorTermV3.json |    16 +-
 ...ent-ClassFieldPropertySchemaElementV3.json |   289 +-
 ...ClassFieldPropertySchemaTermAndDtmiV3.json |    20 +-
 ...sFieldPropertySchemaTypeConformanceV3.json |   308 +-
 ...rement-ClassFieldRequiredPropertiesV3.json |    24 +-
 ...t-ClassFieldTypeIncludesInvalidDtmiV3.json |    16 +-
 ...ment-ClassFieldTypeIncludesMaterialV3.json |    64 +-
 ...lassFieldTypeIncludesNotDtmiNorTermV3.json |    16 +-
 ...irement-ClassFieldTypeStringOrArrayV3.json |   128 +-
 ...ent-ClassInterfaceContextAtTopLevelV3.json |     6 +-
 ...ement-ClassInterfaceContextConformsV3.json |   112 +-
 ...t-ClassInterfaceContextDtdlTopLevelV3.json |    10 +-
 ...quirement-ClassInterfaceIdDuplicateV3.json |     8 +-
 ...ement-ClassInterfaceInvalidKeywordsV3.json |    16 +-
 ...sInterfacePropertiesExtendsMaxCountV3.json |  6154 ++++----
 ...sInterfacePropertiesExtendsMaxDepthV3.json |    70 +-
 ...rfacePropertiesExtendsSelfReferenceV3.json |    39 +
 ...nterfacePropertyCommentStringLengthV3.json |     6 +-
 ...ClassInterfacePropertyCommentStringV3.json |    42 +-
 ...InterfacePropertyCommentTermAndDtmiV3.json |    12 +-
 ...assInterfacePropertyContentsElementV3.json |    89 +-
 ...nterfacePropertyContentsTermAndDtmiV3.json |    12 +-
 ...facePropertyContentsTypeConformanceV3.json |   184 +-
 ...erfacePropertyDescriptionLangStringV3.json |    48 +-
 ...facePropertyDescriptionStringLengthV3.json |     6 +-
 ...rfacePropertyDescriptionTermAndDtmiV3.json |    12 +-
 ...erfacePropertyDisplayNameLangStringV3.json |    48 +-
 ...facePropertyDisplayNameStringLengthV3.json |     6 +-
 ...rfacePropertyDisplayNameTermAndDtmiV3.json |    12 +-
 ...lassInterfacePropertyExtendsElementV3.json |    83 +-
 ...InterfacePropertyExtendsTermAndDtmiV3.json |    12 +-
 ...rfacePropertyExtendsTypeConformanceV3.json |   216 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV3.json |     8 +-
 ...erfacePropertyFormallyUndefinedTermV3.json |     4 +-
 ...t-ClassInterfacePropertyInvalidDtmiV3.json |     4 +-
 ...lassInterfacePropertyNotDtmiNorTermV3.json |     4 +-
 ...lassInterfacePropertySchemasElementV3.json |    91 +-
 ...InterfacePropertySchemasTermAndDtmiV3.json |    12 +-
 ...rfacePropertySchemasTypeConformanceV3.json |   168 +-
 ...nt-ClassInterfaceRequiredPropertiesV3.json |     8 +-
 ...assInterfaceTypeIncludesInvalidDtmiV3.json |     4 +-
 ...-ClassInterfaceTypeIncludesMaterialV3.json |    16 +-
 ...InterfaceTypeIncludesNotDtmiNorTermV3.json |     4 +-
 ...ent-ClassInterfaceTypeStringOrArrayV3.json |    32 +-
 ...Requirement-ClassMapContextConformsV3.json |   218 +-
 .../Requirement-ClassMapIdDuplicateV3.json    |    28 +-
 .../spec/Requirement-ClassMapIdIsDtmiV3.json  |   440 +-
 .../Requirement-ClassMapIdNotArrayV3.json     |   112 +-
 .../Requirement-ClassMapIdRequiredV3.json     |    36 +-
 ...Requirement-ClassMapInvalidKeywordsV3.json |    80 +-
 ...uirement-ClassMapKeyContextConformsV3.json |   218 +-
 .../Requirement-ClassMapKeyIdDuplicateV3.json |    32 +-
 .../Requirement-ClassMapKeyIdIsDtmiV3.json    |   550 +-
 .../Requirement-ClassMapKeyIdNotArrayV3.json  |   140 +-
 ...uirement-ClassMapKeyInvalidKeywordsV3.json |    80 +-
 ...ssMapKeyPropertyCommentStringLengthV3.json |    30 +-
 ...nt-ClassMapKeyPropertyCommentStringV3.json |   210 +-
 ...assMapKeyPropertyCommentTermAndDtmiV3.json |    28 +-
 ...MapKeyPropertyDescriptionLangStringV3.json |   240 +-
 ...pKeyPropertyDescriptionStringLengthV3.json |    30 +-
 ...apKeyPropertyDescriptionTermAndDtmiV3.json |    28 +-
 ...MapKeyPropertyDisplayNameLangStringV3.json |   240 +-
 ...pKeyPropertyDisplayNameStringLengthV3.json |    30 +-
 ...apKeyPropertyDisplayNameTermAndDtmiV3.json |    28 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV3.json |    40 +-
 ...MapKeyPropertyFormallyUndefinedTermV3.json |    20 +-
 ...ment-ClassMapKeyPropertyInvalidDtmiV3.json |    20 +-
 ...ment-ClassMapKeyPropertyNamePatternV3.json |   200 +-
 ...ClassMapKeyPropertyNameStringLengthV3.json |    24 +-
 ...ement-ClassMapKeyPropertyNameStringV3.json |   176 +-
 ...-ClassMapKeyPropertyNameTermAndDtmiV3.json |    24 +-
 ...t-ClassMapKeyPropertyNotDtmiNorTermV3.json |    20 +-
 ...sMapKeyPropertySchemaSpecificValuesV3.json |   920 +-
 ...lassMapKeyPropertySchemaTermAndDtmiV3.json |    20 +-
 ...ement-ClassMapKeyRequiredPropertiesV3.json |    36 +-
 ...-ClassMapKeyTypeIncludesInvalidDtmiV3.json |    20 +-
 ...ent-ClassMapKeyTypeIncludesMaterialV3.json |    80 +-
 ...assMapKeyTypeIncludesNotDtmiNorTermV3.json |    20 +-
 ...rement-ClassMapKeyTypeStringOrArrayV3.json |   160 +-
 ...opertiesElementSchemaSchemaMaxDepthV3.json |    80 +-
 ...iesElementSchemaSchemaSelfReferenceV3.json |    61 +
 ...ClassMapPropertyCommentStringLengthV3.json |    30 +-
 ...ement-ClassMapPropertyCommentStringV3.json |   210 +-
 ...-ClassMapPropertyCommentTermAndDtmiV3.json |    28 +-
 ...assMapPropertyDescriptionLangStringV3.json |   240 +-
 ...sMapPropertyDescriptionStringLengthV3.json |    30 +-
 ...ssMapPropertyDescriptionTermAndDtmiV3.json |    28 +-
 ...assMapPropertyDisplayNameLangStringV3.json |   240 +-
 ...sMapPropertyDisplayNameStringLengthV3.json |    30 +-
 ...ssMapPropertyDisplayNameTermAndDtmiV3.json |    28 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV3.json |    40 +-
 ...assMapPropertyFormallyUndefinedTermV3.json |    20 +-
 ...irement-ClassMapPropertyInvalidDtmiV3.json |    20 +-
 ...ement-ClassMapPropertyMapKeyElementV3.json |   171 +-
 ...t-ClassMapPropertyMapKeyTermAndDtmiV3.json |    24 +-
 ...assMapPropertyMapKeyTypeConformanceV3.json |   400 +-
 ...ent-ClassMapPropertyMapValueElementV3.json |   185 +-
 ...ClassMapPropertyMapValueTermAndDtmiV3.json |    28 +-
 ...sMapPropertyMapValueTypeConformanceV3.json |   336 +-
 ...ment-ClassMapPropertyNotDtmiNorTermV3.json |    20 +-
 ...uirement-ClassMapRequiredPropertiesV3.json |    40 +-
 ...ent-ClassMapTypeIncludesInvalidDtmiV3.json |    16 +-
 ...rement-ClassMapTypeIncludesMaterialV3.json |    64 +-
 ...-ClassMapTypeIncludesNotDtmiNorTermV3.json |    16 +-
 ...quirement-ClassMapTypeStringOrArrayV3.json |   128 +-
 ...rement-ClassMapValueContextConformsV3.json |   190 +-
 ...equirement-ClassMapValueIdDuplicateV3.json |    32 +-
 .../Requirement-ClassMapValueIdIsDtmiV3.json  |   550 +-
 ...Requirement-ClassMapValueIdNotArrayV3.json |   140 +-
 ...rement-ClassMapValueInvalidKeywordsV3.json |    80 +-
 ...MapValuePropertyCommentStringLengthV3.json |    30 +-
 ...-ClassMapValuePropertyCommentStringV3.json |   210 +-
 ...sMapValuePropertyCommentTermAndDtmiV3.json |    28 +-
 ...pValuePropertyDescriptionLangStringV3.json |   240 +-
 ...aluePropertyDescriptionStringLengthV3.json |    30 +-
 ...ValuePropertyDescriptionTermAndDtmiV3.json |    28 +-
 ...pValuePropertyDisplayNameLangStringV3.json |   240 +-
 ...aluePropertyDisplayNameStringLengthV3.json |    30 +-
 ...ValuePropertyDisplayNameTermAndDtmiV3.json |    28 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV3.json |    40 +-
 ...pValuePropertyFormallyUndefinedTermV3.json |    20 +-
 ...nt-ClassMapValuePropertyInvalidDtmiV3.json |    20 +-
 ...nt-ClassMapValuePropertyNamePatternV3.json |   200 +-
 ...assMapValuePropertyNameStringLengthV3.json |    24 +-
 ...ent-ClassMapValuePropertyNameStringV3.json |   176 +-
 ...lassMapValuePropertyNameTermAndDtmiV3.json |    24 +-
 ...ClassMapValuePropertyNotDtmiNorTermV3.json |    20 +-
 ...-ClassMapValuePropertySchemaElementV3.json |   359 +-
 ...ssMapValuePropertySchemaTermAndDtmiV3.json |    16 +-
 ...pValuePropertySchemaTypeConformanceV3.json |   336 +-
 ...ent-ClassMapValueRequiredPropertiesV3.json |    32 +-
 ...lassMapValueTypeIncludesInvalidDtmiV3.json |    20 +-
 ...t-ClassMapValueTypeIncludesMaterialV3.json |    80 +-
 ...sMapValueTypeIncludesNotDtmiNorTermV3.json |    20 +-
 ...ment-ClassMapValueTypeStringOrArrayV3.json |   160 +-
 ...uirement-ClassObjectContextConformsV3.json |   118 +-
 .../Requirement-ClassObjectIdDuplicateV3.json |    16 +-
 .../Requirement-ClassObjectIdIsDtmiV3.json    |   110 +-
 .../Requirement-ClassObjectIdNotArrayV3.json  |    28 +-
 .../Requirement-ClassObjectIdRequiredV3.json  |    12 +-
 ...uirement-ClassObjectInvalidKeywordsV3.json |    32 +-
 ...opertiesElementSchemaSchemaMaxDepthV3.json |    46 +-
 ...iesElementSchemaSchemaSelfReferenceV3.json |    53 +
 ...ssObjectPropertyCommentStringLengthV3.json |    12 +-
 ...nt-ClassObjectPropertyCommentStringV3.json |    84 +-
 ...assObjectPropertyCommentTermAndDtmiV3.json |    16 +-
 ...ObjectPropertyDescriptionLangStringV3.json |    96 +-
 ...jectPropertyDescriptionStringLengthV3.json |    12 +-
 ...bjectPropertyDescriptionTermAndDtmiV3.json |    16 +-
 ...ObjectPropertyDisplayNameLangStringV3.json |    96 +-
 ...jectPropertyDisplayNameStringLengthV3.json |    12 +-
 ...bjectPropertyDisplayNameTermAndDtmiV3.json |    16 +-
 ...nt-ClassObjectPropertyFieldsElementV3.json |   133 +-
 ...lassObjectPropertyFieldsTermAndDtmiV3.json |    24 +-
 ...ObjectPropertyFieldsTypeConformanceV3.json |   274 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV3.json |    16 +-
 ...ObjectPropertyFormallyUndefinedTermV3.json |     8 +-
 ...ment-ClassObjectPropertyInvalidDtmiV3.json |     8 +-
 ...t-ClassObjectPropertyNotDtmiNorTermV3.json |     8 +-
 ...ement-ClassObjectRequiredPropertiesV3.json |     8 +-
 ...-ClassObjectTypeIncludesInvalidDtmiV3.json |     8 +-
 ...ent-ClassObjectTypeIncludesMaterialV3.json |    32 +-
 ...assObjectTypeIncludesNotDtmiNorTermV3.json |     8 +-
 ...rement-ClassObjectTypeStringOrArrayV3.json |    64 +-
 ...rement-ClassPropertyContextConformsV3.json |   178 +-
 ...equirement-ClassPropertyIdDuplicateV3.json |    20 +-
 .../Requirement-ClassPropertyIdIsDtmiV3.json  |   330 +-
 ...Requirement-ClassPropertyIdNotArrayV3.json |    84 +-
 ...rement-ClassPropertyInvalidKeywordsV3.json |    48 +-
 ...PropertyPropertyCommentStringLengthV3.json |    18 +-
 ...-ClassPropertyPropertyCommentStringV3.json |   126 +-
 ...sPropertyPropertyCommentTermAndDtmiV3.json |    20 +-
 ...opertyPropertyDescriptionLangStringV3.json |   144 +-
 ...ertyPropertyDescriptionStringLengthV3.json |    18 +-
 ...pertyPropertyDescriptionTermAndDtmiV3.json |    20 +-
 ...opertyPropertyDisplayNameLangStringV3.json |   144 +-
 ...ertyPropertyDisplayNameStringLengthV3.json |    18 +-
 ...pertyPropertyDisplayNameTermAndDtmiV3.json |    20 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV3.json |    24 +-
 ...opertyPropertyFormallyUndefinedTermV3.json |    12 +-
 ...nt-ClassPropertyPropertyInvalidDtmiV3.json |    12 +-
 ...nt-ClassPropertyPropertyNamePatternV3.json |   100 +-
 ...assPropertyPropertyNameStringLengthV3.json |    12 +-
 ...ent-ClassPropertyPropertyNameStringV3.json |    88 +-
 ...lassPropertyPropertyNameTermAndDtmiV3.json |    16 +-
 ...rtyNameUniqueAmongInterfaceContentsV3.json |    30 +-
 ...meUniqueAmongRelationshipPropertiesV3.json |    36 +-
 ...ClassPropertyPropertyNotDtmiNorTermV3.json |    12 +-
 ...-ClassPropertyPropertySchemaElementV3.json |   221 +-
 ...ssPropertyPropertySchemaTermAndDtmiV3.json |    16 +-
 ...opertyPropertySchemaTypeConformanceV3.json |   252 +-
 ...lassPropertyPropertyWritableBooleanV3.json |   150 +-
 ...PropertyPropertyWritableTermAndDtmiV3.json |    12 +-
 ...ent-ClassPropertyRequiredPropertiesV3.json |    28 +-
 ...lassPropertyTypeIncludesInvalidDtmiV3.json |    12 +-
 ...t-ClassPropertyTypeIncludesMaterialV3.json |    48 +-
 ...sPropertyTypeIncludesNotDtmiNorTermV3.json |    12 +-
 ...ment-ClassPropertyTypeStringOrArrayV3.json |    96 +-
 ...nt-ClassRelationshipContextConformsV3.json |   148 +-
 ...rement-ClassRelationshipIdDuplicateV3.json |    16 +-
 ...quirement-ClassRelationshipIdIsDtmiV3.json |   220 +-
 ...irement-ClassRelationshipIdNotArrayV3.json |    56 +-
 ...nt-ClassRelationshipInvalidKeywordsV3.json |    32 +-
 ...tionshipPropertyCommentStringLengthV3.json |    12 +-
 ...ssRelationshipPropertyCommentStringV3.json |    84 +-
 ...ationshipPropertyCommentTermAndDtmiV3.json |    16 +-
 ...onshipPropertyDescriptionLangStringV3.json |    96 +-
 ...shipPropertyDescriptionStringLengthV3.json |    12 +-
 ...nshipPropertyDescriptionTermAndDtmiV3.json |    16 +-
 ...onshipPropertyDisplayNameLangStringV3.json |    96 +-
 ...shipPropertyDisplayNameStringLengthV3.json |    12 +-
 ...nshipPropertyDisplayNameTermAndDtmiV3.json |    16 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV3.json |    16 +-
 ...onshipPropertyFormallyUndefinedTermV3.json |     8 +-
 ...lassRelationshipPropertyInvalidDtmiV3.json |     8 +-
 ...nshipPropertyMaxMultiplicityIntegerV3.json |    84 +-
 ...shipPropertyMaxMultiplicityMinValueV3.json |    12 +-
 ...pPropertyMaxMultiplicityTermAndDtmiV3.json |    16 +-
 ...ipPropertyMinMultiplicityExactValueV3.json |    20 +-
 ...nshipPropertyMinMultiplicityIntegerV3.json |    84 +-
 ...pPropertyMinMultiplicityTermAndDtmiV3.json |     8 +-
 ...lassRelationshipPropertyNamePatternV3.json |    50 +-
 ...elationshipPropertyNameStringLengthV3.json |     6 +-
 ...ClassRelationshipPropertyNameStringV3.json |    44 +-
 ...RelationshipPropertyNameTermAndDtmiV3.json |    12 +-
 ...rtyNameUniqueAmongInterfaceContentsV3.json |    18 +-
 ...sRelationshipPropertyNotDtmiNorTermV3.json |     8 +-
 ...lationshipPropertyPropertiesElementV3.json |   129 +-
 ...onshipPropertyPropertiesTermAndDtmiV3.json |    16 +-
 ...ipPropertyPropertiesTypeConformanceV3.json |   244 +-
 ...assRelationshipPropertyTargetIsDtmiV3.json |   244 +-
 ...lationshipPropertyTargetTermAndDtmiV3.json |    16 +-
 ...RelationshipPropertyWritableBooleanV3.json |   100 +-
 ...tionshipPropertyWritableTermAndDtmiV3.json |     8 +-
 ...ClassRelationshipRequiredPropertiesV3.json |    12 +-
 ...RelationshipTypeIncludesInvalidDtmiV3.json |     8 +-
 ...assRelationshipTypeIncludesMaterialV3.json |    32 +-
 ...ationshipTypeIncludesNotDtmiNorTermV3.json |     8 +-
 ...-ClassRelationshipTypeStringOrArrayV3.json |    64 +-
 ...ement-ClassTelemetryContextConformsV3.json |   178 +-
 ...quirement-ClassTelemetryIdDuplicateV3.json |    20 +-
 .../Requirement-ClassTelemetryIdIsDtmiV3.json |   330 +-
 ...equirement-ClassTelemetryIdNotArrayV3.json |    84 +-
 ...ement-ClassTelemetryInvalidKeywordsV3.json |    48 +-
 ...elemetryPropertyCommentStringLengthV3.json |    18 +-
 ...ClassTelemetryPropertyCommentStringV3.json |   126 +-
 ...TelemetryPropertyCommentTermAndDtmiV3.json |    20 +-
 ...emetryPropertyDescriptionLangStringV3.json |   144 +-
 ...etryPropertyDescriptionStringLengthV3.json |    18 +-
 ...metryPropertyDescriptionTermAndDtmiV3.json |    20 +-
 ...emetryPropertyDisplayNameLangStringV3.json |   144 +-
 ...etryPropertyDisplayNameStringLengthV3.json |    18 +-
 ...metryPropertyDisplayNameTermAndDtmiV3.json |    20 +-
 ...ropertyFormallyIrrelevantDtmiOrTermV3.json |    24 +-
 ...emetryPropertyFormallyUndefinedTermV3.json |    12 +-
 ...t-ClassTelemetryPropertyInvalidDtmiV3.json |    12 +-
 ...t-ClassTelemetryPropertyNamePatternV3.json |    50 +-
 ...ssTelemetryPropertyNameStringLengthV3.json |     6 +-
 ...nt-ClassTelemetryPropertyNameStringV3.json |    44 +-
 ...assTelemetryPropertyNameTermAndDtmiV3.json |    12 +-
 ...rtyNameUniqueAmongInterfaceContentsV3.json |    18 +-
 ...lassTelemetryPropertyNotDtmiNorTermV3.json |    12 +-
 ...ClassTelemetryPropertySchemaElementV3.json |   211 +-
 ...sTelemetryPropertySchemaTermAndDtmiV3.json |    16 +-
 ...emetryPropertySchemaTypeConformanceV3.json |   252 +-
 ...nt-ClassTelemetryRequiredPropertiesV3.json |    20 +-
 ...assTelemetryTypeIncludesInvalidDtmiV3.json |     8 +-
 ...-ClassTelemetryTypeIncludesMaterialV3.json |    32 +-
 ...TelemetryTypeIncludesNotDtmiNorTermV3.json |     8 +-
 ...ent-ClassTelemetryTypeStringOrArrayV3.json |    64 +-
 .../Requirement-ContextArrayAllStringsV3.json |   231 +
 ...quirement-ContextStringOrArrayQuantV3.json |   204 -
 .../Requirement-TopLevelDtdlContextV3.json    |    33 +
 DTDL/v4/DTDL.Extensions.md                    |   166 +
 DTDL/v4/DTDL.Specification.v4.md              |  2200 +++
 DTDL/v4/DTDL.annotation.v2.md                 |   156 +
 DTDL/v4/DTDL.historization.v2.md              |    81 +
 DTDL/v4/DTDL.mqtt.v2.md                       |   344 +
 DTDL/v4/DTDL.overriding.v2.md                 |   154 +
 DTDL/v4/DTDL.quantitativeTypes.v2.md          |   193 +
 DTDL/v4/DTDL.requirement.v1.md                |    97 +
 DTDL/v4/DTDL.v4.md                            |  1054 ++
 ...eatureExtension.annotation.v2.context.json |     4 +
 ...ureExtension.historization.v2.context.json |     3 +
 ...DTDL.FeatureExtension.mqtt.v2.context.json |    16 +
 ...eatureExtension.overriding.v2.context.json |     4 +
 ...xtension.quantitativeTypes.v2.context.json |   400 +
 ...atureExtension.requirement.v1.context.json |     3 +
 DTDL/v4/context/DTDL.v4.context.json          |   265 +
 ...tureExtension.annotation.v2.RDF-SHACL.json |    58 +
 ...eExtension.historization.v2.RDF-SHACL.json |    26 +
 ...DL.FeatureExtension.mqtt.v2.RDF-SHACL.json |   189 +
 ...tureExtension.overriding.v2.RDF-SHACL.json |    76 +
 ...tension.quantitativeTypes.v2.Elements.json |  3098 ++++
 ...ension.quantitativeTypes.v2.RDF-SHACL.json |   794 +
 ...ureExtension.requirement.v1.RDF-SHACL.json |    24 +
 DTDL/v4/metamodel/DTDL.v4.ModelElements.json  |   201 +
 DTDL/v4/metamodel/DTDL.v4.ModelRDF-SHACL.json |  1276 ++
 ...owance-ClassArrayOptionalPropertiesV4.json |    99 +
 ...iesElementSchemaSchemaSelfReferenceV4.json |    24 +
 ...wance-ClassArrayPropertyCommentDtmiV4.json |    21 +
 ...e-ClassArrayPropertyDescriptionDtmiV4.json |    23 +
 ...e-ClassArrayPropertyDisplayNameDtmiV4.json |    23 +
 ...ClassArrayPropertyElementSchemaDtmiV4.json |    20 +
 ...ance-ClassCommandOptionalPropertiesV4.json |   147 +
 ...ClassCommandPropertyCommandTypeDtmiV4.json |    20 +
 ...nce-ClassCommandPropertyCommentDtmiV4.json |    20 +
 ...ClassCommandPropertyDescriptionDtmiV4.json |    22 +
 ...ClassCommandPropertyDisplayNameDtmiV4.json |    22 +
 ...owance-ClassCommandPropertyNameDtmiV4.json |    19 +
 ...nce-ClassCommandPropertyRequestDtmiV4.json |    23 +
 ...ce-ClassCommandPropertyResponseDtmiV4.json |    23 +
 ...assCommandRequestOptionalPropertiesV4.json |   158 +
 ...ssCommandRequestPropertyCommentDtmiV4.json |    24 +
 ...mmandRequestPropertyDescriptionDtmiV4.json |    26 +
 ...mmandRequestPropertyDisplayNameDtmiV4.json |    26 +
 ...ClassCommandRequestPropertyNameDtmiV4.json |    23 +
 ...sCommandRequestPropertyNullableDtmiV4.json |    24 +
 ...assCommandRequestPropertySchemaDtmiV4.json |    23 +
 ...ssCommandResponseOptionalPropertiesV4.json |   158 +
 ...sCommandResponsePropertyCommentDtmiV4.json |    24 +
 ...mandResponsePropertyDescriptionDtmiV4.json |    26 +
 ...mandResponsePropertyDisplayNameDtmiV4.json |    26 +
 ...lassCommandResponsePropertyNameDtmiV4.json |    23 +
 ...CommandResponsePropertyNullableDtmiV4.json |    24 +
 ...ssCommandResponsePropertySchemaDtmiV4.json |    23 +
 ...ce-ClassComponentOptionalPropertiesV4.json |   116 +
 ...e-ClassComponentPropertyCommentDtmiV4.json |    24 +
 ...assComponentPropertyDescriptionDtmiV4.json |    26 +
 ...assComponentPropertyDisplayNameDtmiV4.json |    26 +
 ...ance-ClassComponentPropertyNameDtmiV4.json |    23 +
 ...ce-ClassComponentPropertySchemaDtmiV4.json |    23 +
 ...lowance-ClassEnumOptionalPropertiesV4.json |   117 +
 ...owance-ClassEnumPropertyCommentDtmiV4.json |    21 +
 ...ce-ClassEnumPropertyDescriptionDtmiV4.json |    23 +
 ...ce-ClassEnumPropertyDisplayNameDtmiV4.json |    23 +
 ...nce-ClassEnumPropertyEnumValuesDtmiV4.json |    26 +
 ...ce-ClassEnumPropertyValueSchemaDtmiV4.json |    20 +
 ...ce-ClassEnumValueOptionalPropertiesV4.json |   141 +
 ...e-ClassEnumValuePropertyCommentDtmiV4.json |    25 +
 ...assEnumValuePropertyDescriptionDtmiV4.json |    27 +
 ...assEnumValuePropertyDisplayNameDtmiV4.json |    27 +
 ...ClassEnumValuePropertyEnumValueDtmiV4.json |    24 +
 ...ance-ClassEnumValuePropertyNameDtmiV4.json |    24 +
 ...owance-ClassFieldOptionalPropertiesV4.json |   135 +
 ...wance-ClassFieldPropertyCommentDtmiV4.json |    24 +
 ...e-ClassFieldPropertyDescriptionDtmiV4.json |    26 +
 ...e-ClassFieldPropertyDisplayNameDtmiV4.json |    26 +
 ...llowance-ClassFieldPropertyNameDtmiV4.json |    23 +
 ...owance-ClassFieldPropertySchemaDtmiV4.json |    23 +
 ...ce-ClassInterfaceOptionalPropertiesV4.json |    98 +
 ...e-ClassInterfacePropertyCommentDtmiV4.json |    16 +
 ...-ClassInterfacePropertyContentsDtmiV4.json |    21 +
 ...assInterfacePropertyDescriptionDtmiV4.json |    18 +
 ...assInterfacePropertyDisplayNameDtmiV4.json |    18 +
 ...e-ClassInterfacePropertyExtendsDtmiV4.json |    21 +
 ...e-ClassInterfacePropertySchemasDtmiV4.json |    22 +
 ...wance-ClassMapKeyOptionalPropertiesV4.json |   159 +
 ...ance-ClassMapKeyPropertyCommentDtmiV4.json |    28 +
 ...-ClassMapKeyPropertyDescriptionDtmiV4.json |    30 +
 ...-ClassMapKeyPropertyDisplayNameDtmiV4.json |    30 +
 ...lowance-ClassMapKeyPropertyNameDtmiV4.json |    27 +
 ...wance-ClassMapKeyPropertySchemaDtmiV4.json |    27 +
 ...llowance-ClassMapOptionalPropertiesV4.json |   134 +
 ...iesElementSchemaSchemaSelfReferenceV4.json |    31 +
 ...lowance-ClassMapPropertyCommentDtmiV4.json |    28 +
 ...nce-ClassMapPropertyDescriptionDtmiV4.json |    30 +
 ...nce-ClassMapPropertyDisplayNameDtmiV4.json |    30 +
 ...llowance-ClassMapPropertyMapKeyDtmiV4.json |    27 +
 ...owance-ClassMapPropertyMapValueDtmiV4.json |    27 +
 ...nce-ClassMapValueOptionalPropertiesV4.json |   159 +
 ...ce-ClassMapValuePropertyCommentDtmiV4.json |    28 +
 ...lassMapValuePropertyDescriptionDtmiV4.json |    30 +
 ...lassMapValuePropertyDisplayNameDtmiV4.json |    30 +
 ...wance-ClassMapValuePropertyNameDtmiV4.json |    27 +
 ...nce-ClassMapValuePropertySchemaDtmiV4.json |    27 +
 ...wance-ClassObjectOptionalPropertiesV4.json |   111 +
 ...iesElementSchemaSchemaSelfReferenceV4.json |    27 +
 ...ance-ClassObjectPropertyCommentDtmiV4.json |    20 +
 ...-ClassObjectPropertyDescriptionDtmiV4.json |    22 +
 ...-ClassObjectPropertyDisplayNameDtmiV4.json |    22 +
 ...wance-ClassObjectPropertyFieldsDtmiV4.json |    25 +
 ...nce-ClassPropertyOptionalPropertiesV4.json |   119 +
 ...ce-ClassPropertyPropertyCommentDtmiV4.json |    21 +
 ...lassPropertyPropertyDescriptionDtmiV4.json |    23 +
 ...lassPropertyPropertyDisplayNameDtmiV4.json |    23 +
 ...wance-ClassPropertyPropertyNameDtmiV4.json |    20 +
 ...nce-ClassPropertyPropertySchemaDtmiV4.json |    20 +
 ...e-ClassPropertyPropertyWritableDtmiV4.json |    21 +
 ...ClassRelationshipOptionalPropertiesV4.json |   181 +
 ...lassRelationshipPropertyCommentDtmiV4.json |    20 +
 ...RelationshipPropertyDescriptionDtmiV4.json |    22 +
 ...RelationshipPropertyDisplayNameDtmiV4.json |    22 +
 ...tionshipPropertyMaxMultiplicityDtmiV4.json |    20 +
 ...tionshipPropertyMinMultiplicityDtmiV4.json |    20 +
 ...e-ClassRelationshipPropertyNameDtmiV4.json |    19 +
 ...sRelationshipPropertyPropertiesDtmiV4.json |    26 +
 ...ClassRelationshipPropertyTargetDtmiV4.json |    20 +
 ...assRelationshipPropertyWritableDtmiV4.json |    20 +
 ...ce-ClassTelemetryOptionalPropertiesV4.json |   101 +
 ...e-ClassTelemetryPropertyCommentDtmiV4.json |    21 +
 ...assTelemetryPropertyDescriptionDtmiV4.json |    23 +
 ...assTelemetryPropertyDisplayNameDtmiV4.json |    23 +
 ...ance-ClassTelemetryPropertyNameDtmiV4.json |    20 +
 ...ce-ClassTelemetryPropertySchemaDtmiV4.json |    20 +
 .../Allowance-ValueGeospatialSchemaV4.json    |    46 +
 .../Allowance-ValuePrimitiveSchemaV4.json     |    46 +
 ...ertyElementSchemaDependentReferenceV4.json |    56 +
 ...ssArrayPropertyIrrelevantDtmiOrTermV4.json |    92 +
 ...ion-ClassArrayPropertyUndefinedTermV4.json |    47 +
 ...rayTypeIncludesIrrelevantDtmiOrTermV4.json |    88 +
 ...ClassArrayTypeIncludesUndefinedTermV4.json |    45 +
 ...CommandPropertyIrrelevantDtmiOrTermV4.json |    88 +
 ...ndPropertyRequestDependentReferenceV4.json |    58 +
 ...dPropertyResponseDependentReferenceV4.json |    58 +
 ...n-ClassCommandPropertyUndefinedTermV4.json |    45 +
 ...RequestPropertyIrrelevantDtmiOrTermV4.json |   108 +
 ...estPropertySchemaDependentReferenceV4.json |    64 +
 ...CommandRequestPropertyUndefinedTermV4.json |    55 +
 ...estTypeIncludesIrrelevantDtmiOrTermV4.json |   104 +
 ...andRequestTypeIncludesUndefinedTermV4.json |    53 +
 ...esponsePropertyIrrelevantDtmiOrTermV4.json |   108 +
 ...nsePropertySchemaDependentReferenceV4.json |    64 +
 ...ommandResponsePropertyUndefinedTermV4.json |    55 +
 ...nseTypeIncludesIrrelevantDtmiOrTermV4.json |   104 +
 ...ndResponseTypeIncludesUndefinedTermV4.json |    53 +
 ...andTypeIncludesIrrelevantDtmiOrTermV4.json |    84 +
 ...assCommandTypeIncludesUndefinedTermV4.json |    43 +
 ...mponentPropertyIrrelevantDtmiOrTermV4.json |   104 +
 ...entPropertySchemaDependentReferenceV4.json |    58 +
 ...ClassComponentPropertyUndefinedTermV4.json |    53 +
 ...entTypeIncludesIrrelevantDtmiOrTermV4.json |   100 +
 ...sComponentTypeIncludesUndefinedTermV4.json |    51 +
 ...ropertyEnumValuesDependentReferenceV4.json |    58 +
 ...assEnumPropertyIrrelevantDtmiOrTermV4.json |    92 +
 ...tion-ClassEnumPropertyUndefinedTermV4.json |    47 +
 ...numTypeIncludesIrrelevantDtmiOrTermV4.json |    88 +
 ...-ClassEnumTypeIncludesUndefinedTermV4.json |    45 +
 ...umValuePropertyIrrelevantDtmiOrTermV4.json |   112 +
 ...ClassEnumValuePropertyUndefinedTermV4.json |    57 +
 ...lueTypeIncludesIrrelevantDtmiOrTermV4.json |   108 +
 ...sEnumValueTypeIncludesUndefinedTermV4.json |    55 +
 ...ssFieldPropertyIrrelevantDtmiOrTermV4.json |   108 +
 ...eldPropertySchemaDependentReferenceV4.json |    62 +
 ...ion-ClassFieldPropertyUndefinedTermV4.json |    55 +
 ...eldTypeIncludesIrrelevantDtmiOrTermV4.json |   104 +
 ...ClassFieldTypeIncludesUndefinedTermV4.json |    53 +
 ...ePropertyContentsDependentReferenceV4.json |    50 +
 ...cePropertyExtendsDependentReferenceV4.json |    50 +
 ...terfacePropertyIrrelevantDtmiOrTermV4.json |    76 +
 ...cePropertySchemasDependentReferenceV4.json |    50 +
 ...ClassInterfacePropertyUndefinedTermV4.json |    39 +
 ...aceTypeIncludesIrrelevantDtmiOrTermV4.json |    72 +
 ...sInterfaceTypeIncludesUndefinedTermV4.json |    37 +
 ...sMapKeyPropertyIrrelevantDtmiOrTermV4.json |   124 +
 ...on-ClassMapKeyPropertyUndefinedTermV4.json |    63 +
 ...KeyTypeIncludesIrrelevantDtmiOrTermV4.json |   120 +
 ...lassMapKeyTypeIncludesUndefinedTermV4.json |    61 +
 ...lassMapPropertyIrrelevantDtmiOrTermV4.json |   120 +
 ...MapPropertyMapKeyDependentReferenceV4.json |    64 +
 ...pPropertyMapValueDependentReferenceV4.json |    64 +
 ...etion-ClassMapPropertyUndefinedTermV4.json |    61 +
 ...MapTypeIncludesIrrelevantDtmiOrTermV4.json |   116 +
 ...n-ClassMapTypeIncludesUndefinedTermV4.json |    59 +
 ...apValuePropertyIrrelevantDtmiOrTermV4.json |   124 +
 ...luePropertySchemaDependentReferenceV4.json |    70 +
 ...-ClassMapValuePropertyUndefinedTermV4.json |    63 +
 ...lueTypeIncludesIrrelevantDtmiOrTermV4.json |   120 +
 ...ssMapValueTypeIncludesUndefinedTermV4.json |    61 +
 ...ectPropertyFieldsDependentReferenceV4.json |    56 +
 ...sObjectPropertyIrrelevantDtmiOrTermV4.json |    88 +
 ...on-ClassObjectPropertyUndefinedTermV4.json |    45 +
 ...ectTypeIncludesIrrelevantDtmiOrTermV4.json |    84 +
 ...lassObjectTypeIncludesUndefinedTermV4.json |    43 +
 ...ropertyPropertyIrrelevantDtmiOrTermV4.json |    92 +
 ...rtyPropertySchemaDependentReferenceV4.json |    58 +
 ...-ClassPropertyPropertyUndefinedTermV4.json |    47 +
 ...rtyTypeIncludesIrrelevantDtmiOrTermV4.json |    88 +
 ...ssPropertyTypeIncludesUndefinedTermV4.json |    45 +
 ...ionshipPropertyIrrelevantDtmiOrTermV4.json |    88 +
 ...ropertyPropertiesDependentReferenceV4.json |    58 +
 ...ssRelationshipPropertyUndefinedTermV4.json |    45 +
 ...hipTypeIncludesIrrelevantDtmiOrTermV4.json |    84 +
 ...lationshipTypeIncludesUndefinedTermV4.json |    43 +
 ...lemetryPropertyIrrelevantDtmiOrTermV4.json |    92 +
 ...tryPropertySchemaDependentReferenceV4.json |    58 +
 ...ClassTelemetryPropertyUndefinedTermV4.json |    47 +
 ...tryTypeIncludesIrrelevantDtmiOrTermV4.json |    88 +
 ...sTelemetryTypeIncludesUndefinedTermV4.json |    45 +
 ...ontextDefinedLanguageExtensionQuantV4.json |    71 +
 ...ation-ClassArrayPropertyCommentTermV4.json |    42 +
 ...n-ClassArrayPropertyDescriptionTermV4.json |    46 +
 ...n-ClassArrayPropertyDisplayNameTermV4.json |    46 +
 ...opertyElementSchemaPreferTermToDtmiV4.json |    78 +
 ...ClassArrayPropertyElementSchemaTermV4.json |    40 +
 ...on-ClassArrayTypeDuplicatesMaterialV4.json |    46 +
 ...n-ClassArrayTypeIncludesTermAndDtmiV4.json |    24 +
 ...tion-ClassArrayTypePreferTermToDtmiV4.json |    40 +
 ...ommandPropertyCommandTypeDeprecatedV4.json |    21 +
 ...ClassCommandPropertyCommandTypeTermV4.json |    40 +
 ...ion-ClassCommandPropertyCommentTermV4.json |    40 +
 ...ClassCommandPropertyDescriptionTermV4.json |    44 +
 ...ClassCommandPropertyDisplayNameTermV4.json |    44 +
 ...dation-ClassCommandPropertyNameTermV4.json |    38 +
 ...ion-ClassCommandPropertyRequestTermV4.json |    46 +
 ...on-ClassCommandPropertyResponseTermV4.json |    46 +
 ...ssCommandRequestPropertyCommentTermV4.json |    48 +
 ...mmandRequestPropertyDescriptionTermV4.json |    52 +
 ...mmandRequestPropertyDisplayNameTermV4.json |    52 +
 ...ClassCommandRequestPropertyNameTermV4.json |    46 +
 ...sCommandRequestPropertyNullableTermV4.json |    48 +
 ...questPropertySchemaPreferTermToDtmiV4.json |    90 +
 ...assCommandRequestPropertySchemaTermV4.json |    46 +
 ...ommandRequestTypeDuplicatesMaterialV4.json |    54 +
 ...mmandRequestTypeIncludesTermAndDtmiV4.json |    28 +
 ...sCommandRequestTypePreferTermToDtmiV4.json |    48 +
 ...sCommandResponsePropertyCommentTermV4.json |    48 +
 ...mandResponsePropertyDescriptionTermV4.json |    52 +
 ...mandResponsePropertyDisplayNameTermV4.json |    52 +
 ...lassCommandResponsePropertyNameTermV4.json |    46 +
 ...CommandResponsePropertyNullableTermV4.json |    48 +
 ...ponsePropertySchemaPreferTermToDtmiV4.json |    90 +
 ...ssCommandResponsePropertySchemaTermV4.json |    46 +
 ...mmandResponseTypeDuplicatesMaterialV4.json |    54 +
 ...mandResponseTypeIncludesTermAndDtmiV4.json |    28 +
 ...CommandResponseTypePreferTermToDtmiV4.json |    48 +
 ...-ClassCommandTypeDuplicatesMaterialV4.json |    44 +
 ...ClassCommandTypeIncludesTermAndDtmiV4.json |    23 +
 ...on-ClassCommandTypePreferTermToDtmiV4.json |    38 +
 ...n-ClassComponentPropertyCommentTermV4.json |    48 +
 ...assComponentPropertyDescriptionTermV4.json |    52 +
 ...assComponentPropertyDisplayNameTermV4.json |    52 +
 ...tion-ClassComponentPropertyNameTermV4.json |    46 +
 ...on-ClassComponentPropertySchemaTermV4.json |    46 +
 ...lassComponentTypeDuplicatesMaterialV4.json |    52 +
 ...assComponentTypeIncludesTermAndDtmiV4.json |    27 +
 ...-ClassComponentTypePreferTermToDtmiV4.json |    46 +
 ...dation-ClassEnumPropertyCommentTermV4.json |    42 +
 ...on-ClassEnumPropertyDescriptionTermV4.json |    46 +
 ...on-ClassEnumPropertyDisplayNameTermV4.json |    46 +
 ...ion-ClassEnumPropertyEnumValuesTermV4.json |    52 +
 ...on-ClassEnumPropertyValueSchemaTermV4.json |    40 +
 ...ValueSchemaValueIntegerPreferToDtmiV4.json |    48 +
 ...yValueSchemaValueStringPreferToDtmiV4.json |    48 +
 ...ion-ClassEnumTypeDuplicatesMaterialV4.json |    46 +
 ...on-ClassEnumTypeIncludesTermAndDtmiV4.json |    24 +
 ...ation-ClassEnumTypePreferTermToDtmiV4.json |    40 +
 ...n-ClassEnumValuePropertyCommentTermV4.json |    50 +
 ...assEnumValuePropertyDescriptionTermV4.json |    54 +
 ...assEnumValuePropertyDisplayNameTermV4.json |    54 +
 ...ClassEnumValuePropertyEnumValueTermV4.json |    48 +
 ...tion-ClassEnumValuePropertyNameTermV4.json |    48 +
 ...lassEnumValueTypeDuplicatesMaterialV4.json |    56 +
 ...assEnumValueTypeIncludesTermAndDtmiV4.json |    29 +
 ...-ClassEnumValueTypePreferTermToDtmiV4.json |    50 +
 ...ation-ClassFieldPropertyCommentTermV4.json |    48 +
 ...n-ClassFieldPropertyDescriptionTermV4.json |    52 +
 ...n-ClassFieldPropertyDisplayNameTermV4.json |    52 +
 ...endation-ClassFieldPropertyNameTermV4.json |    46 +
 ...FieldPropertySchemaPreferTermToDtmiV4.json |    90 +
 ...dation-ClassFieldPropertySchemaTermV4.json |    46 +
 ...on-ClassFieldTypeDuplicatesMaterialV4.json |    54 +
 ...n-ClassFieldTypeIncludesTermAndDtmiV4.json |    28 +
 ...tion-ClassFieldTypePreferTermToDtmiV4.json |    48 +
 ...n-ClassInterfacePropertyCommentTermV4.json |    32 +
 ...-ClassInterfacePropertyContentsTermV4.json |    42 +
 ...assInterfacePropertyDescriptionTermV4.json |    36 +
 ...assInterfacePropertyDisplayNameTermV4.json |    36 +
 ...n-ClassInterfacePropertyExtendsTermV4.json |    42 +
 ...n-ClassInterfacePropertySchemasTermV4.json |    44 +
 ...lassInterfaceTypeDuplicatesMaterialV4.json |    36 +
 ...assInterfaceTypeIncludesTermAndDtmiV4.json |    19 +
 ...-ClassInterfaceTypePreferTermToDtmiV4.json |    30 +
 ...tion-ClassMapKeyPropertyCommentTermV4.json |    56 +
 ...-ClassMapKeyPropertyDescriptionTermV4.json |    60 +
 ...-ClassMapKeyPropertyDisplayNameTermV4.json |    60 +
 ...ndation-ClassMapKeyPropertyNameTermV4.json |    54 +
 ...ation-ClassMapKeyPropertySchemaTermV4.json |    54 +
 ...opertySchemaValueStringPreferToDtmiV4.json |    54 +
 ...n-ClassMapKeyTypeDuplicatesMaterialV4.json |    62 +
 ...-ClassMapKeyTypeIncludesTermAndDtmiV4.json |    32 +
 ...ion-ClassMapKeyTypePreferTermToDtmiV4.json |    56 +
 ...ndation-ClassMapPropertyCommentTermV4.json |    56 +
 ...ion-ClassMapPropertyDescriptionTermV4.json |    60 +
 ...ion-ClassMapPropertyDisplayNameTermV4.json |    60 +
 ...endation-ClassMapPropertyMapKeyTermV4.json |    54 +
 ...dation-ClassMapPropertyMapValueTermV4.json |    54 +
 ...tion-ClassMapTypeDuplicatesMaterialV4.json |    60 +
 ...ion-ClassMapTypeIncludesTermAndDtmiV4.json |    31 +
 ...dation-ClassMapTypePreferTermToDtmiV4.json |    54 +
 ...on-ClassMapValuePropertyCommentTermV4.json |    56 +
 ...lassMapValuePropertyDescriptionTermV4.json |    60 +
 ...lassMapValuePropertyDisplayNameTermV4.json |    60 +
 ...ation-ClassMapValuePropertyNameTermV4.json |    54 +
 ...ValuePropertySchemaPreferTermToDtmiV4.json |   106 +
 ...ion-ClassMapValuePropertySchemaTermV4.json |    54 +
 ...ClassMapValueTypeDuplicatesMaterialV4.json |    62 +
 ...lassMapValueTypeIncludesTermAndDtmiV4.json |    32 +
 ...n-ClassMapValueTypePreferTermToDtmiV4.json |    56 +
 ...tion-ClassObjectPropertyCommentTermV4.json |    40 +
 ...-ClassObjectPropertyDescriptionTermV4.json |    44 +
 ...-ClassObjectPropertyDisplayNameTermV4.json |    44 +
 ...ation-ClassObjectPropertyFieldsTermV4.json |    50 +
 ...n-ClassObjectTypeDuplicatesMaterialV4.json |    44 +
 ...-ClassObjectTypeIncludesTermAndDtmiV4.json |    23 +
 ...ion-ClassObjectTypePreferTermToDtmiV4.json |    38 +
 ...on-ClassPropertyPropertyCommentTermV4.json |    42 +
 ...lassPropertyPropertyDescriptionTermV4.json |    46 +
 ...lassPropertyPropertyDisplayNameTermV4.json |    46 +
 ...ation-ClassPropertyPropertyNameTermV4.json |    40 +
 ...pertyPropertySchemaPreferTermToDtmiV4.json |    78 +
 ...ion-ClassPropertyPropertySchemaTermV4.json |    40 +
 ...n-ClassPropertyPropertyWritableTermV4.json |    42 +
 ...ClassPropertyTypeDuplicatesMaterialV4.json |    46 +
 ...lassPropertyTypeIncludesTermAndDtmiV4.json |    24 +
 ...n-ClassPropertyTypePreferTermToDtmiV4.json |    40 +
 ...lassRelationshipPropertyCommentTermV4.json |    40 +
 ...RelationshipPropertyDescriptionTermV4.json |    44 +
 ...RelationshipPropertyDisplayNameTermV4.json |    44 +
 ...tionshipPropertyMaxMultiplicityTermV4.json |    40 +
 ...tionshipPropertyMinMultiplicityTermV4.json |    40 +
 ...n-ClassRelationshipPropertyNameTermV4.json |    38 +
 ...sRelationshipPropertyPropertiesTermV4.json |    52 +
 ...ClassRelationshipPropertyTargetTermV4.json |    40 +
 ...assRelationshipPropertyWritableTermV4.json |    40 +
 ...sRelationshipTypeDuplicatesMaterialV4.json |    44 +
 ...RelationshipTypeIncludesTermAndDtmiV4.json |    23 +
 ...assRelationshipTypePreferTermToDtmiV4.json |    38 +
 ...n-ClassTelemetryPropertyCommentTermV4.json |    42 +
 ...assTelemetryPropertyDescriptionTermV4.json |    46 +
 ...assTelemetryPropertyDisplayNameTermV4.json |    46 +
 ...tion-ClassTelemetryPropertyNameTermV4.json |    40 +
 ...metryPropertySchemaPreferTermToDtmiV4.json |    78 +
 ...on-ClassTelemetryPropertySchemaTermV4.json |    40 +
 ...lassTelemetryTypeDuplicatesMaterialV4.json |    46 +
 ...assTelemetryTypeIncludesTermAndDtmiV4.json |    24 +
 ...-ClassTelemetryTypePreferTermToDtmiV4.json |    40 +
 ...ndation-ContextDtdlLimitlessOnlyOneV4.json |    55 +
 .../Recommendation-ContextDtdlOnlyOneV4.json  |    69 +
 ...tion-ContextRepeatsDeversionedValueV4.json |    19 +
 .../Recommendation-ContextUniqueValuesV4.json |    35 +
 ...izableStringArrayElementHasLanguageV4.json |    45 +
 ...tion-RepresentationalBooleanHasTypeV4.json |    55 +
 ...tion-RepresentationalIntegerHasTypeV4.json |    53 +
 ...ation-RepresentationalStringHasTypeV4.json |    41 +
 ...mendation-ValueGeospatialSchemaTermV4.json |    48 +
 ...mmendation-ValuePrimitiveSchemaTermV4.json |    48 +
 ...quirement-ClassArrayContextConformsV4.json |   370 +
 .../Requirement-ClassArrayIdDuplicateV4.json  |    49 +
 .../Requirement-ClassArrayIdIsDtmiV4.json     |  1020 ++
 .../Requirement-ClassArrayIdNotArrayV4.json   |   289 +
 .../Requirement-ClassArrayIdRequiredV4.json   |    76 +
 ...quirement-ClassArrayInvalidKeywordsV4.json |   158 +
 ...opertiesElementSchemaSchemaMaxDepthV4.json |   135 +
 ...assArrayPropertyCommentStringLengthV4.json |    60 +
 ...ent-ClassArrayPropertyCommentStringV4.json |   435 +
 ...lassArrayPropertyCommentTermAndDtmiV4.json |    43 +
 ...sArrayPropertyDescriptionLangStringV4.json |   506 +
 ...rrayPropertyDescriptionStringLengthV4.json |    60 +
 ...ArrayPropertyDescriptionTermAndDtmiV4.json |    51 +
 ...sArrayPropertyDisplayNameLangStringV4.json |   506 +
 ...rrayPropertyDisplayNameStringLengthV4.json |    60 +
 ...ArrayPropertyDisplayNameTermAndDtmiV4.json |    51 +
 ...ssArrayPropertyElementSchemaElementV4.json |   767 +
 ...rayPropertyElementSchemaTermAndDtmiV4.json |    41 +
 ...ropertyElementSchemaTypeConformanceV4.json |   658 +
 ...ropertyFormallyIrrelevantDtmiOrTermV4.json |    80 +
 ...sArrayPropertyFormallyUndefinedTermV4.json |    41 +
 ...ement-ClassArrayPropertyInvalidDtmiV4.json |    47 +
 ...nt-ClassArrayPropertyNotDtmiNorTermV4.json |    47 +
 ...rement-ClassArrayRequiredPropertiesV4.json |    72 +
 ...t-ClassArrayTypeIncludesInvalidDtmiV4.json |    45 +
 ...ment-ClassArrayTypeIncludesMaterialV4.json |   156 +
 ...lassArrayTypeIncludesNotDtmiNorTermV4.json |    45 +
 ...irement-ClassArrayTypeStringOrArrayV4.json |   314 +
 ...irement-ClassCommandContextConformsV4.json |   370 +
 ...Requirement-ClassCommandIdDuplicateV4.json |    47 +
 .../Requirement-ClassCommandIdIsDtmiV4.json   |  1020 ++
 .../Requirement-ClassCommandIdNotArrayV4.json |   289 +
 ...irement-ClassCommandInvalidKeywordsV4.json |   150 +
 ...ndPropertyCommandTypeSpecificValuesV4.json |  2494 ++++
 ...mmandPropertyCommandTypeTermAndDtmiV4.json |    41 +
 ...sCommandPropertyCommentStringLengthV4.json |    57 +
 ...t-ClassCommandPropertyCommentStringV4.json |   414 +
 ...ssCommandPropertyCommentTermAndDtmiV4.json |    41 +
 ...ommandPropertyDescriptionLangStringV4.json |   482 +
 ...mandPropertyDescriptionStringLengthV4.json |    57 +
 ...mmandPropertyDescriptionTermAndDtmiV4.json |    49 +
 ...ommandPropertyDisplayNameLangStringV4.json |   482 +
 ...mandPropertyDisplayNameStringLengthV4.json |    57 +
 ...mmandPropertyDisplayNameTermAndDtmiV4.json |    49 +
 ...ropertyFormallyIrrelevantDtmiOrTermV4.json |    76 +
 ...ommandPropertyFormallyUndefinedTermV4.json |    39 +
 ...ent-ClassCommandPropertyInvalidDtmiV4.json |    45 +
 ...ent-ClassCommandPropertyNamePatternV4.json |   437 +
 ...lassCommandPropertyNameStringLengthV4.json |    54 +
 ...ment-ClassCommandPropertyNameStringV4.json |   411 +
 ...ClassCommandPropertyNameTermAndDtmiV4.json |    39 +
 ...rtyNameUniqueAmongInterfaceContentsV4.json |    74 +
 ...-ClassCommandPropertyNotDtmiNorTermV4.json |    45 +
 ...-ClassCommandPropertyRequestElementV4.json |   313 +
 ...ssCommandPropertyRequestTermAndDtmiV4.json |    53 +
 ...mmandPropertyRequestTypeConformanceV4.json |   732 +
 ...ClassCommandPropertyResponseElementV4.json |   313 +
 ...sCommandPropertyResponseTermAndDtmiV4.json |    53 +
 ...mandPropertyResponseTypeConformanceV4.json |   732 +
 ...-ClassCommandRequestContextConformsV4.json |   434 +
 ...ment-ClassCommandRequestIdDuplicateV4.json |    57 +
 ...irement-ClassCommandRequestIdIsDtmiV4.json |  1240 ++
 ...ement-ClassCommandRequestIdNotArrayV4.json |   345 +
 ...-ClassCommandRequestInvalidKeywordsV4.json |   182 +
 ...dRequestPropertyCommentStringLengthV4.json |    69 +
 ...CommandRequestPropertyCommentStringV4.json |   498 +
 ...ndRequestPropertyCommentTermAndDtmiV4.json |    49 +
 ...equestPropertyDescriptionLangStringV4.json |   578 +
 ...uestPropertyDescriptionStringLengthV4.json |    69 +
 ...questPropertyDescriptionTermAndDtmiV4.json |    57 +
 ...equestPropertyDisplayNameLangStringV4.json |   578 +
 ...uestPropertyDisplayNameStringLengthV4.json |    69 +
 ...questPropertyDisplayNameTermAndDtmiV4.json |    57 +
 ...ropertyFormallyIrrelevantDtmiOrTermV4.json |    92 +
 ...equestPropertyFormallyUndefinedTermV4.json |    47 +
 ...ssCommandRequestPropertyInvalidDtmiV4.json |    55 +
 ...ssCommandRequestPropertyNamePatternV4.json |   537 +
 ...mandRequestPropertyNameStringLengthV4.json |    66 +
 ...assCommandRequestPropertyNameStringV4.json |   499 +
 ...mmandRequestPropertyNameTermAndDtmiV4.json |    47 +
 ...ommandRequestPropertyNotDtmiNorTermV4.json |    55 +
 ...mmandRequestPropertyNullableBooleanV4.json |   596 +
 ...dRequestPropertyNullableTermAndDtmiV4.json |    49 +
 ...CommandRequestPropertySchemaElementV4.json |   861 ++
 ...andRequestPropertySchemaTermAndDtmiV4.json |    47 +
 ...equestPropertySchemaTypeConformanceV4.json |   742 +
 ...assCommandRequestRequiredPropertiesV4.json |    84 +
 ...mmandRequestTypeIncludesInvalidDtmiV4.json |    53 +
 ...sCommandRequestTypeIncludesMaterialV4.json |   188 +
 ...ndRequestTypeIncludesNotDtmiNorTermV4.json |    53 +
 ...lassCommandRequestTypeStringOrArrayV4.json |   378 +
 ...ment-ClassCommandRequiredPropertiesV4.json |    68 +
 ...ClassCommandResponseContextConformsV4.json |   434 +
 ...ent-ClassCommandResponseIdDuplicateV4.json |    57 +
 ...rement-ClassCommandResponseIdIsDtmiV4.json |  1240 ++
 ...ment-ClassCommandResponseIdNotArrayV4.json |   345 +
 ...ClassCommandResponseInvalidKeywordsV4.json |   182 +
 ...ResponsePropertyCommentStringLengthV4.json |    69 +
 ...ommandResponsePropertyCommentStringV4.json |   498 +
 ...dResponsePropertyCommentTermAndDtmiV4.json |    49 +
 ...sponsePropertyDescriptionLangStringV4.json |   578 +
 ...onsePropertyDescriptionStringLengthV4.json |    69 +
 ...ponsePropertyDescriptionTermAndDtmiV4.json |    57 +
 ...sponsePropertyDisplayNameLangStringV4.json |   578 +
 ...onsePropertyDisplayNameStringLengthV4.json |    69 +
 ...ponsePropertyDisplayNameTermAndDtmiV4.json |    57 +
 ...ropertyFormallyIrrelevantDtmiOrTermV4.json |    92 +
 ...sponsePropertyFormallyUndefinedTermV4.json |    47 +
 ...sCommandResponsePropertyInvalidDtmiV4.json |    55 +
 ...sCommandResponsePropertyNamePatternV4.json |   537 +
 ...andResponsePropertyNameStringLengthV4.json |    66 +
 ...ssCommandResponsePropertyNameStringV4.json |   499 +
 ...mandResponsePropertyNameTermAndDtmiV4.json |    47 +
 ...mmandResponsePropertyNotDtmiNorTermV4.json |    55 +
 ...mandResponsePropertyNullableBooleanV4.json |   596 +
 ...ResponsePropertyNullableTermAndDtmiV4.json |    49 +
 ...ommandResponsePropertySchemaElementV4.json |   861 ++
 ...ndResponsePropertySchemaTermAndDtmiV4.json |    47 +
 ...sponsePropertySchemaTypeConformanceV4.json |   742 +
 ...ssCommandResponseRequiredPropertiesV4.json |    84 +
 ...mandResponseTypeIncludesInvalidDtmiV4.json |    53 +
 ...CommandResponseTypeIncludesMaterialV4.json |   188 +
 ...dResponseTypeIncludesNotDtmiNorTermV4.json |    53 +
 ...assCommandResponseTypeStringOrArrayV4.json |   378 +
 ...ClassCommandTypeIncludesInvalidDtmiV4.json |    43 +
 ...nt-ClassCommandTypeIncludesMaterialV4.json |   148 +
 ...ssCommandTypeIncludesNotDtmiNorTermV4.json |    43 +
 ...ement-ClassCommandTypeStringOrArrayV4.json |   298 +
 ...ement-ClassComponentContextConformsV4.json |   434 +
 ...quirement-ClassComponentIdDuplicateV4.json |    55 +
 .../Requirement-ClassComponentIdIsDtmiV4.json |  1240 ++
 ...equirement-ClassComponentIdNotArrayV4.json |   345 +
 ...ement-ClassComponentInvalidKeywordsV4.json |   182 +
 ...rtiesSchemaContentsExcludeComponentV4.json |    69 +
 ...omponentPropertyCommentStringLengthV4.json |    69 +
 ...ClassComponentPropertyCommentStringV4.json |   498 +
 ...ComponentPropertyCommentTermAndDtmiV4.json |    49 +
 ...ponentPropertyDescriptionLangStringV4.json |   578 +
 ...nentPropertyDescriptionStringLengthV4.json |    69 +
 ...onentPropertyDescriptionTermAndDtmiV4.json |    57 +
 ...ponentPropertyDisplayNameLangStringV4.json |   578 +
 ...nentPropertyDisplayNameStringLengthV4.json |    69 +
 ...onentPropertyDisplayNameTermAndDtmiV4.json |    57 +
 ...ropertyFormallyIrrelevantDtmiOrTermV4.json |    92 +
 ...ponentPropertyFormallyUndefinedTermV4.json |    47 +
 ...t-ClassComponentPropertyInvalidDtmiV4.json |    53 +
 ...t-ClassComponentPropertyNamePatternV4.json |   537 +
 ...ssComponentPropertyNameStringLengthV4.json |    66 +
 ...nt-ClassComponentPropertyNameStringV4.json |   499 +
 ...assComponentPropertyNameTermAndDtmiV4.json |    47 +
 ...rtyNameUniqueAmongInterfaceContentsV4.json |    98 +
 ...lassComponentPropertyNotDtmiNorTermV4.json |    53 +
 ...ClassComponentPropertySchemaElementV4.json |   274 +
 ...sComponentPropertySchemaTermAndDtmiV4.json |    53 +
 ...ponentPropertySchemaTypeConformanceV4.json |   734 +
 ...nt-ClassComponentRequiredPropertiesV4.json |   119 +
 ...assComponentTypeIncludesInvalidDtmiV4.json |    51 +
 ...-ClassComponentTypeIncludesMaterialV4.json |   180 +
 ...ComponentTypeIncludesNotDtmiNorTermV4.json |    51 +
 ...ent-ClassComponentTypeStringOrArrayV4.json |   362 +
 ...equirement-ClassEnumContextConformsV4.json |   370 +
 .../Requirement-ClassEnumIdDuplicateV4.json   |    49 +
 .../spec/Requirement-ClassEnumIdIsDtmiV4.json |  1020 ++
 .../Requirement-ClassEnumIdNotArrayV4.json    |   289 +
 .../Requirement-ClassEnumIdRequiredV4.json    |    76 +
 ...equirement-ClassEnumInvalidKeywordsV4.json |   158 +
 ...lassEnumPropertyCommentStringLengthV4.json |    60 +
 ...ment-ClassEnumPropertyCommentStringV4.json |   435 +
 ...ClassEnumPropertyCommentTermAndDtmiV4.json |    43 +
 ...ssEnumPropertyDescriptionLangStringV4.json |   506 +
 ...EnumPropertyDescriptionStringLengthV4.json |    60 +
 ...sEnumPropertyDescriptionTermAndDtmiV4.json |    51 +
 ...ssEnumPropertyDisplayNameLangStringV4.json |   506 +
 ...EnumPropertyDisplayNameStringLengthV4.json |    60 +
 ...sEnumPropertyDisplayNameTermAndDtmiV4.json |    51 +
 ...-ClassEnumPropertyEnumValuesElementV4.json |   287 +
 ...ssEnumPropertyEnumValuesTermAndDtmiV4.json |    63 +
 ...umPropertyEnumValuesTypeConformanceV4.json |   763 +
 ...ropertyFormallyIrrelevantDtmiOrTermV4.json |    80 +
 ...ssEnumPropertyFormallyUndefinedTermV4.json |    41 +
 ...rement-ClassEnumPropertyInvalidDtmiV4.json |    47 +
 ...ent-ClassEnumPropertyNotDtmiNorTermV4.json |    47 +
 ...umPropertyValueSchemaSpecificValuesV4.json |  2561 ++++
 ...sEnumPropertyValueSchemaTermAndDtmiV4.json |    41 +
 ...irement-ClassEnumRequiredPropertiesV4.json |    72 +
 ...nt-ClassEnumTypeIncludesInvalidDtmiV4.json |    45 +
 ...ement-ClassEnumTypeIncludesMaterialV4.json |   156 +
 ...ClassEnumTypeIncludesNotDtmiNorTermV4.json |    45 +
 ...uirement-ClassEnumTypeStringOrArrayV4.json |   314 +
 ...ement-ClassEnumValueContextConformsV4.json |   434 +
 ...quirement-ClassEnumValueIdDuplicateV4.json |    59 +
 .../Requirement-ClassEnumValueIdIsDtmiV4.json |  1295 ++
 ...equirement-ClassEnumValueIdNotArrayV4.json |   359 +
 ...ement-ClassEnumValueInvalidKeywordsV4.json |   190 +
 ...numValuePropertyCommentStringLengthV4.json |    72 +
 ...ClassEnumValuePropertyCommentStringV4.json |   519 +
 ...EnumValuePropertyCommentTermAndDtmiV4.json |    51 +
 ...mValuePropertyDescriptionLangStringV4.json |   602 +
 ...aluePropertyDescriptionStringLengthV4.json |    72 +
 ...ValuePropertyDescriptionTermAndDtmiV4.json |    59 +
 ...mValuePropertyDisplayNameLangStringV4.json |   602 +
 ...aluePropertyDisplayNameStringLengthV4.json |    72 +
 ...ValuePropertyDisplayNameTermAndDtmiV4.json |    59 +
 ...ssEnumValuePropertyEnumValueIntegerV4.json |   521 +
 ...assEnumValuePropertyEnumValueStringV4.json |   521 +
 ...umValuePropertyEnumValueTermAndDtmiV4.json |    49 +
 ...yEnumValueUniqueAmongEnumEnumValuesV4.json |   172 +
 ...ropertyFormallyIrrelevantDtmiOrTermV4.json |    96 +
 ...mValuePropertyFormallyUndefinedTermV4.json |    49 +
 ...t-ClassEnumValuePropertyInvalidDtmiV4.json |    57 +
 ...t-ClassEnumValuePropertyNamePatternV4.json |   562 +
 ...ssEnumValuePropertyNameStringLengthV4.json |    69 +
 ...nt-ClassEnumValuePropertyNameStringV4.json |   521 +
 ...assEnumValuePropertyNameTermAndDtmiV4.json |    49 +
 ...opertyNameUniqueAmongEnumEnumValuesV4.json |    87 +
 ...lassEnumValuePropertyNotDtmiNorTermV4.json |    57 +
 ...nt-ClassEnumValueRequiredPropertiesV4.json |    88 +
 ...assEnumValueTypeIncludesInvalidDtmiV4.json |    55 +
 ...-ClassEnumValueTypeIncludesMaterialV4.json |   196 +
 ...EnumValueTypeIncludesNotDtmiNorTermV4.json |    55 +
 ...ent-ClassEnumValueTypeStringOrArrayV4.json |   394 +
 ...quirement-ClassFieldContextConformsV4.json |   418 +
 .../Requirement-ClassFieldIdDuplicateV4.json  |    57 +
 .../Requirement-ClassFieldIdIsDtmiV4.json     |  1240 ++
 .../Requirement-ClassFieldIdNotArrayV4.json   |   345 +
 ...quirement-ClassFieldInvalidKeywordsV4.json |   182 +
 ...assFieldPropertyCommentStringLengthV4.json |    69 +
 ...ent-ClassFieldPropertyCommentStringV4.json |   498 +
 ...lassFieldPropertyCommentTermAndDtmiV4.json |    49 +
 ...sFieldPropertyDescriptionLangStringV4.json |   578 +
 ...ieldPropertyDescriptionStringLengthV4.json |    69 +
 ...FieldPropertyDescriptionTermAndDtmiV4.json |    57 +
 ...sFieldPropertyDisplayNameLangStringV4.json |   578 +
 ...ieldPropertyDisplayNameStringLengthV4.json |    69 +
 ...FieldPropertyDisplayNameTermAndDtmiV4.json |    57 +
 ...ropertyFormallyIrrelevantDtmiOrTermV4.json |    92 +
 ...sFieldPropertyFormallyUndefinedTermV4.json |    47 +
 ...ement-ClassFieldPropertyInvalidDtmiV4.json |    55 +
 ...ement-ClassFieldPropertyNamePatternV4.json |   537 +
 ...-ClassFieldPropertyNameStringLengthV4.json |    66 +
 ...rement-ClassFieldPropertyNameStringV4.json |   499 +
 ...t-ClassFieldPropertyNameTermAndDtmiV4.json |    47 +
 ...PropertyNameUniqueAmongObjectFieldsV4.json |    84 +
 ...nt-ClassFieldPropertyNotDtmiNorTermV4.json |    55 +
 ...ent-ClassFieldPropertySchemaElementV4.json |   869 ++
 ...ClassFieldPropertySchemaTermAndDtmiV4.json |    47 +
 ...sFieldPropertySchemaTypeConformanceV4.json |   742 +
 ...rement-ClassFieldRequiredPropertiesV4.json |    84 +
 ...t-ClassFieldTypeIncludesInvalidDtmiV4.json |    53 +
 ...ment-ClassFieldTypeIncludesMaterialV4.json |   188 +
 ...lassFieldTypeIncludesNotDtmiNorTermV4.json |    53 +
 ...irement-ClassFieldTypeStringOrArrayV4.json |   378 +
 ...ent-ClassInterfaceContextAtTopLevelV4.json |    31 +
 ...ement-ClassInterfaceContextConformsV4.json |   306 +
 ...t-ClassInterfaceContextDtdlTopLevelV4.json |    62 +
 ...quirement-ClassInterfaceIdDuplicateV4.json |    37 +
 .../Requirement-ClassInterfaceIdIsDtmiV4.json |   793 +
 .../Requirement-ClassInterfaceIdLongV4.json   |    44 +
 ...equirement-ClassInterfaceIdNotArrayV4.json |   233 +
 ...ement-ClassInterfaceInvalidKeywordsV4.json |   126 +
 ...sInterfacePropertiesExtendsMaxCountV4.json | 12346 ++++++++++++++++
 ...sInterfacePropertiesExtendsMaxDepthV4.json |   194 +
 ...rfacePropertiesExtendsSelfReferenceV4.json |    39 +
 ...nterfacePropertyCommentStringLengthV4.json |    47 +
 ...ClassInterfacePropertyCommentStringV4.json |   346 +
 ...InterfacePropertyCommentTermAndDtmiV4.json |    35 +
 ...assInterfacePropertyContentsElementV4.json |   145 +
 ...nterfacePropertyContentsTermAndDtmiV4.json |    55 +
 ...facePropertyContentsTypeConformanceV4.json |   549 +
 ...erfacePropertyDescriptionLangStringV4.json |   404 +
 ...facePropertyDescriptionStringLengthV4.json |    47 +
 ...rfacePropertyDescriptionTermAndDtmiV4.json |    43 +
 ...erfacePropertyDisplayNameLangStringV4.json |   404 +
 ...facePropertyDisplayNameStringLengthV4.json |    47 +
 ...rfacePropertyDisplayNameTermAndDtmiV4.json |    43 +
 ...lassInterfacePropertyExtendsElementV4.json |   187 +
 ...InterfacePropertyExtendsTermAndDtmiV4.json |    55 +
 ...rfacePropertyExtendsTypeConformanceV4.json |   640 +
 ...ropertyFormallyIrrelevantDtmiOrTermV4.json |    64 +
 ...erfacePropertyFormallyUndefinedTermV4.json |    33 +
 ...t-ClassInterfacePropertyInvalidDtmiV4.json |    39 +
 ...lassInterfacePropertyNotDtmiNorTermV4.json |    39 +
 ...lassInterfacePropertySchemasElementV4.json |   189 +
 ...InterfacePropertySchemasTermAndDtmiV4.json |    59 +
 ...rfacePropertySchemasTypeConformanceV4.json |   570 +
 ...nt-ClassInterfaceRequiredPropertiesV4.json |    62 +
 ...assInterfaceTypeIncludesInvalidDtmiV4.json |    37 +
 ...-ClassInterfaceTypeIncludesMaterialV4.json |   120 +
 ...InterfaceTypeIncludesNotDtmiNorTermV4.json |    37 +
 ...ent-ClassInterfaceTypeStringOrArrayV4.json |   250 +
 ...Requirement-ClassMapContextConformsV4.json |   482 +
 .../Requirement-ClassMapIdDuplicateV4.json    |    63 +
 .../spec/Requirement-ClassMapIdIsDtmiV4.json  |  1405 ++
 .../Requirement-ClassMapIdNotArrayV4.json     |   387 +
 .../Requirement-ClassMapIdRequiredV4.json     |   104 +
 ...Requirement-ClassMapInvalidKeywordsV4.json |   214 +
 ...uirement-ClassMapKeyContextConformsV4.json |   482 +
 .../Requirement-ClassMapKeyIdDuplicateV4.json |    65 +
 .../Requirement-ClassMapKeyIdIsDtmiV4.json    |  1460 ++
 .../Requirement-ClassMapKeyIdNotArrayV4.json  |   401 +
 ...uirement-ClassMapKeyInvalidKeywordsV4.json |   214 +
 ...ssMapKeyPropertyCommentStringLengthV4.json |    81 +
 ...nt-ClassMapKeyPropertyCommentStringV4.json |   582 +
 ...assMapKeyPropertyCommentTermAndDtmiV4.json |    57 +
 ...MapKeyPropertyDescriptionLangStringV4.json |   674 +
 ...pKeyPropertyDescriptionStringLengthV4.json |    81 +
 ...apKeyPropertyDescriptionTermAndDtmiV4.json |    65 +
 ...MapKeyPropertyDisplayNameLangStringV4.json |   674 +
 ...pKeyPropertyDisplayNameStringLengthV4.json |    81 +
 ...apKeyPropertyDisplayNameTermAndDtmiV4.json |    65 +
 ...ropertyFormallyIrrelevantDtmiOrTermV4.json |   108 +
 ...MapKeyPropertyFormallyUndefinedTermV4.json |    55 +
 ...ment-ClassMapKeyPropertyInvalidDtmiV4.json |    63 +
 ...ment-ClassMapKeyPropertyNamePatternV4.json |   637 +
 ...ClassMapKeyPropertyNameStringLengthV4.json |    78 +
 ...ement-ClassMapKeyPropertyNameStringV4.json |   587 +
 ...-ClassMapKeyPropertyNameTermAndDtmiV4.json |    55 +
 ...t-ClassMapKeyPropertyNotDtmiNorTermV4.json |    63 +
 ...sMapKeyPropertySchemaSpecificValuesV4.json |  3392 +++++
 ...lassMapKeyPropertySchemaTermAndDtmiV4.json |    55 +
 ...ement-ClassMapKeyRequiredPropertiesV4.json |   100 +
 ...-ClassMapKeyTypeIncludesInvalidDtmiV4.json |    61 +
 ...ent-ClassMapKeyTypeIncludesMaterialV4.json |   220 +
 ...assMapKeyTypeIncludesNotDtmiNorTermV4.json |    61 +
 ...rement-ClassMapKeyTypeStringOrArrayV4.json |   442 +
 ...opertiesElementSchemaSchemaMaxDepthV4.json |   317 +
 ...ClassMapPropertyCommentStringLengthV4.json |    81 +
 ...ement-ClassMapPropertyCommentStringV4.json |   582 +
 ...-ClassMapPropertyCommentTermAndDtmiV4.json |    57 +
 ...assMapPropertyDescriptionLangStringV4.json |   674 +
 ...sMapPropertyDescriptionStringLengthV4.json |    81 +
 ...ssMapPropertyDescriptionTermAndDtmiV4.json |    65 +
 ...assMapPropertyDisplayNameLangStringV4.json |   674 +
 ...sMapPropertyDisplayNameStringLengthV4.json |    81 +
 ...ssMapPropertyDisplayNameTermAndDtmiV4.json |    65 +
 ...ropertyFormallyIrrelevantDtmiOrTermV4.json |   108 +
 ...assMapPropertyFormallyUndefinedTermV4.json |    55 +
 ...irement-ClassMapPropertyInvalidDtmiV4.json |    61 +
 ...ement-ClassMapPropertyMapKeyElementV4.json |   386 +
 ...t-ClassMapPropertyMapKeyTermAndDtmiV4.json |    61 +
 ...assMapPropertyMapKeyTypeConformanceV4.json |   856 ++
 ...ent-ClassMapPropertyMapValueElementV4.json |   386 +
 ...ClassMapPropertyMapValueTermAndDtmiV4.json |    61 +
 ...sMapPropertyMapValueTypeConformanceV4.json |   856 ++
 ...ment-ClassMapPropertyNotDtmiNorTermV4.json |    61 +
 ...uirement-ClassMapRequiredPropertiesV4.json |   137 +
 ...ent-ClassMapTypeIncludesInvalidDtmiV4.json |    59 +
 ...rement-ClassMapTypeIncludesMaterialV4.json |   212 +
 ...-ClassMapTypeIncludesNotDtmiNorTermV4.json |    59 +
 ...quirement-ClassMapTypeStringOrArrayV4.json |   426 +
 ...rement-ClassMapValueContextConformsV4.json |   482 +
 ...equirement-ClassMapValueIdDuplicateV4.json |    65 +
 .../Requirement-ClassMapValueIdIsDtmiV4.json  |  1460 ++
 ...Requirement-ClassMapValueIdNotArrayV4.json |   401 +
 ...rement-ClassMapValueInvalidKeywordsV4.json |   214 +
 ...MapValuePropertyCommentStringLengthV4.json |    81 +
 ...-ClassMapValuePropertyCommentStringV4.json |   582 +
 ...sMapValuePropertyCommentTermAndDtmiV4.json |    57 +
 ...pValuePropertyDescriptionLangStringV4.json |   674 +
 ...aluePropertyDescriptionStringLengthV4.json |    81 +
 ...ValuePropertyDescriptionTermAndDtmiV4.json |    65 +
 ...pValuePropertyDisplayNameLangStringV4.json |   674 +
 ...aluePropertyDisplayNameStringLengthV4.json |    81 +
 ...ValuePropertyDisplayNameTermAndDtmiV4.json |    65 +
 ...ropertyFormallyIrrelevantDtmiOrTermV4.json |   108 +
 ...pValuePropertyFormallyUndefinedTermV4.json |    55 +
 ...nt-ClassMapValuePropertyInvalidDtmiV4.json |    63 +
 ...nt-ClassMapValuePropertyNamePatternV4.json |   637 +
 ...assMapValuePropertyNameStringLengthV4.json |    78 +
 ...ent-ClassMapValuePropertyNameStringV4.json |   587 +
 ...lassMapValuePropertyNameTermAndDtmiV4.json |    55 +
 ...ClassMapValuePropertyNotDtmiNorTermV4.json |    63 +
 ...-ClassMapValuePropertySchemaElementV4.json |  1013 ++
 ...ssMapValuePropertySchemaTermAndDtmiV4.json |    55 +
 ...pValuePropertySchemaTypeConformanceV4.json |   854 ++
 ...ent-ClassMapValueRequiredPropertiesV4.json |   100 +
 ...lassMapValueTypeIncludesInvalidDtmiV4.json |    61 +
 ...t-ClassMapValueTypeIncludesMaterialV4.json |   220 +
 ...sMapValueTypeIncludesNotDtmiNorTermV4.json |    61 +
 ...ment-ClassMapValueTypeStringOrArrayV4.json |   442 +
 ...uirement-ClassObjectContextConformsV4.json |   354 +
 .../Requirement-ClassObjectIdDuplicateV4.json |    47 +
 .../Requirement-ClassObjectIdIsDtmiV4.json    |   965 ++
 .../Requirement-ClassObjectIdNotArrayV4.json  |   275 +
 .../Requirement-ClassObjectIdRequiredV4.json  |    72 +
 ...uirement-ClassObjectInvalidKeywordsV4.json |   150 +
 ...opertiesElementSchemaSchemaMaxDepthV4.json |   219 +
 ...ssObjectPropertyCommentStringLengthV4.json |    57 +
 ...nt-ClassObjectPropertyCommentStringV4.json |   414 +
 ...assObjectPropertyCommentTermAndDtmiV4.json |    41 +
 ...ObjectPropertyDescriptionLangStringV4.json |   482 +
 ...jectPropertyDescriptionStringLengthV4.json |    57 +
 ...bjectPropertyDescriptionTermAndDtmiV4.json |    49 +
 ...ObjectPropertyDisplayNameLangStringV4.json |   482 +
 ...jectPropertyDisplayNameStringLengthV4.json |    57 +
 ...bjectPropertyDisplayNameTermAndDtmiV4.json |    49 +
 ...nt-ClassObjectPropertyFieldsElementV4.json |   275 +
 ...lassObjectPropertyFieldsTermAndDtmiV4.json |    61 +
 ...ObjectPropertyFieldsTypeConformanceV4.json |   732 +
 ...ropertyFormallyIrrelevantDtmiOrTermV4.json |    76 +
 ...ObjectPropertyFormallyUndefinedTermV4.json |    39 +
 ...ment-ClassObjectPropertyInvalidDtmiV4.json |    45 +
 ...t-ClassObjectPropertyNotDtmiNorTermV4.json |    45 +
 ...ement-ClassObjectRequiredPropertiesV4.json |    35 +
 ...-ClassObjectTypeIncludesInvalidDtmiV4.json |    43 +
 ...ent-ClassObjectTypeIncludesMaterialV4.json |   148 +
 ...assObjectTypeIncludesNotDtmiNorTermV4.json |    43 +
 ...rement-ClassObjectTypeStringOrArrayV4.json |   298 +
 ...rement-ClassPropertyContextConformsV4.json |   386 +
 ...equirement-ClassPropertyIdDuplicateV4.json |    49 +
 .../Requirement-ClassPropertyIdIsDtmiV4.json  |  1075 ++
 ...Requirement-ClassPropertyIdNotArrayV4.json |   303 +
 ...rement-ClassPropertyInvalidKeywordsV4.json |   158 +
 ...PropertyPropertyCommentStringLengthV4.json |    60 +
 ...-ClassPropertyPropertyCommentStringV4.json |   435 +
 ...sPropertyPropertyCommentTermAndDtmiV4.json |    43 +
 ...opertyPropertyDescriptionLangStringV4.json |   506 +
 ...ertyPropertyDescriptionStringLengthV4.json |    60 +
 ...pertyPropertyDescriptionTermAndDtmiV4.json |    51 +
 ...opertyPropertyDisplayNameLangStringV4.json |   506 +
 ...ertyPropertyDisplayNameStringLengthV4.json |    60 +
 ...pertyPropertyDisplayNameTermAndDtmiV4.json |    51 +
 ...ropertyFormallyIrrelevantDtmiOrTermV4.json |    80 +
 ...opertyPropertyFormallyUndefinedTermV4.json |    41 +
 ...nt-ClassPropertyPropertyInvalidDtmiV4.json |    47 +
 ...nt-ClassPropertyPropertyNamePatternV4.json |   462 +
 ...assPropertyPropertyNameStringLengthV4.json |    57 +
 ...ent-ClassPropertyPropertyNameStringV4.json |   433 +
 ...lassPropertyPropertyNameTermAndDtmiV4.json |    41 +
 ...rtyNameUniqueAmongInterfaceContentsV4.json |    80 +
 ...meUniqueAmongRelationshipPropertiesV4.json |    90 +
 ...ClassPropertyPropertyNotDtmiNorTermV4.json |    47 +
 ...-ClassPropertyPropertySchemaElementV4.json |   753 +
 ...ssPropertyPropertySchemaTermAndDtmiV4.json |    41 +
 ...opertyPropertySchemaTypeConformanceV4.json |   658 +
 ...lassPropertyPropertyWritableBooleanV4.json |   521 +
 ...PropertyPropertyWritableTermAndDtmiV4.json |    43 +
 ...ent-ClassPropertyRequiredPropertiesV4.json |   107 +
 ...lassPropertyTypeIncludesInvalidDtmiV4.json |    45 +
 ...t-ClassPropertyTypeIncludesMaterialV4.json |   156 +
 ...sPropertyTypeIncludesNotDtmiNorTermV4.json |    45 +
 ...ment-ClassPropertyTypeStringOrArrayV4.json |   314 +
 ...nt-ClassRelationshipContextConformsV4.json |   370 +
 ...rement-ClassRelationshipIdDuplicateV4.json |    47 +
 ...quirement-ClassRelationshipIdIsDtmiV4.json |  1020 ++
 ...irement-ClassRelationshipIdNotArrayV4.json |   289 +
 ...nt-ClassRelationshipInvalidKeywordsV4.json |   150 +
 ...tionshipPropertyCommentStringLengthV4.json |    57 +
 ...ssRelationshipPropertyCommentStringV4.json |   414 +
 ...ationshipPropertyCommentTermAndDtmiV4.json |    41 +
 ...onshipPropertyDescriptionLangStringV4.json |   482 +
 ...shipPropertyDescriptionStringLengthV4.json |    57 +
 ...nshipPropertyDescriptionTermAndDtmiV4.json |    49 +
 ...onshipPropertyDisplayNameLangStringV4.json |   482 +
 ...shipPropertyDisplayNameStringLengthV4.json |    57 +
 ...nshipPropertyDisplayNameTermAndDtmiV4.json |    49 +
 ...ropertyFormallyIrrelevantDtmiOrTermV4.json |    76 +
 ...onshipPropertyFormallyUndefinedTermV4.json |    39 +
 ...lassRelationshipPropertyInvalidDtmiV4.json |    45 +
 ...nshipPropertyMaxMultiplicityIntegerV4.json |   414 +
 ...shipPropertyMaxMultiplicityMinValueV4.json |    57 +
 ...pPropertyMaxMultiplicityTermAndDtmiV4.json |    41 +
 ...ipPropertyMinMultiplicityExactValueV4.json |    94 +
 ...nshipPropertyMinMultiplicityIntegerV4.json |   414 +
 ...pPropertyMinMultiplicityTermAndDtmiV4.json |    41 +
 ...lassRelationshipPropertyNamePatternV4.json |   437 +
 ...elationshipPropertyNameStringLengthV4.json |    54 +
 ...ClassRelationshipPropertyNameStringV4.json |   411 +
 ...RelationshipPropertyNameTermAndDtmiV4.json |    39 +
 ...rtyNameUniqueAmongInterfaceContentsV4.json |    74 +
 ...sRelationshipPropertyNotDtmiNorTermV4.json |    45 +
 ...lationshipPropertyPropertiesElementV4.json |   225 +
 ...onshipPropertyPropertiesTermAndDtmiV4.json |    65 +
 ...ipPropertyPropertiesTypeConformanceV4.json |   732 +
 ...assRelationshipPropertyTargetIsDtmiV4.json |  1147 ++
 ...lationshipPropertyTargetTermAndDtmiV4.json |    41 +
 ...RelationshipPropertyWritableBooleanV4.json |   496 +
 ...tionshipPropertyWritableTermAndDtmiV4.json |    41 +
 ...ClassRelationshipRequiredPropertiesV4.json |    68 +
 ...RelationshipTypeIncludesInvalidDtmiV4.json |    43 +
 ...assRelationshipTypeIncludesMaterialV4.json |   148 +
 ...ationshipTypeIncludesNotDtmiNorTermV4.json |    43 +
 ...-ClassRelationshipTypeStringOrArrayV4.json |   298 +
 ...ement-ClassTelemetryContextConformsV4.json |   386 +
 ...quirement-ClassTelemetryIdDuplicateV4.json |    49 +
 .../Requirement-ClassTelemetryIdIsDtmiV4.json |  1075 ++
 ...equirement-ClassTelemetryIdNotArrayV4.json |   303 +
 ...ement-ClassTelemetryInvalidKeywordsV4.json |   158 +
 ...elemetryPropertyCommentStringLengthV4.json |    60 +
 ...ClassTelemetryPropertyCommentStringV4.json |   435 +
 ...TelemetryPropertyCommentTermAndDtmiV4.json |    43 +
 ...emetryPropertyDescriptionLangStringV4.json |   506 +
 ...etryPropertyDescriptionStringLengthV4.json |    60 +
 ...metryPropertyDescriptionTermAndDtmiV4.json |    51 +
 ...emetryPropertyDisplayNameLangStringV4.json |   506 +
 ...etryPropertyDisplayNameStringLengthV4.json |    60 +
 ...metryPropertyDisplayNameTermAndDtmiV4.json |    51 +
 ...ropertyFormallyIrrelevantDtmiOrTermV4.json |    80 +
 ...emetryPropertyFormallyUndefinedTermV4.json |    41 +
 ...t-ClassTelemetryPropertyInvalidDtmiV4.json |    47 +
 ...t-ClassTelemetryPropertyNamePatternV4.json |   462 +
 ...ssTelemetryPropertyNameStringLengthV4.json |    57 +
 ...nt-ClassTelemetryPropertyNameStringV4.json |   433 +
 ...assTelemetryPropertyNameTermAndDtmiV4.json |    41 +
 ...rtyNameUniqueAmongInterfaceContentsV4.json |    80 +
 ...lassTelemetryPropertyNotDtmiNorTermV4.json |    47 +
 ...ClassTelemetryPropertySchemaElementV4.json |   753 +
 ...sTelemetryPropertySchemaTermAndDtmiV4.json |    41 +
 ...emetryPropertySchemaTypeConformanceV4.json |   658 +
 ...nt-ClassTelemetryRequiredPropertiesV4.json |   107 +
 ...assTelemetryTypeIncludesInvalidDtmiV4.json |    45 +
 ...-ClassTelemetryTypeIncludesMaterialV4.json |   156 +
 ...TelemetryTypeIncludesNotDtmiNorTermV4.json |    45 +
 ...ent-ClassTelemetryTypeStringOrArrayV4.json |   314 +
 .../Requirement-ContextArrayAllStringsV4.json |   231 +
 ...quirement-ContextDtdlPrecedesOrOnlyV4.json |    99 +
 ...irement-ContextDtmiWithVersionQuantV4.json |   166 +
 ...quirement-ContextStringOrArrayQuantV4.json |   261 +
 ...uirement-CoreLimitsFollowsLimitlessV4.json |   140 +
 ...Requirement-DependencyReferenceableV4.json |   143 +
 DTDL/v4/spec/Requirement-DtmiIsStringV4.json  |   208 +
 DTDL/v4/spec/Requirement-DtmiRegexV4.json     |   966 ++
 .../Requirement-DtmiReservedPrefixesV4.json   |    60 +
 ...ent-ExtensionLimitsFollowsLimitlessV4.json |     1 +
 ...nt-LimitlessContextFollowedByLimitsV4.json |   124 +
 ...equirement-LimitlessContextPrecedesV4.json |   103 +
 ...calizableStringArrayElementHasValueV4.json |    59 +
 ...tringArrayElementLanguageValueRegexV4.json |   150 +
 ...ringArrayElementLanguageValueUniqueV4.json |   154 +
 ...zableStringArrayElementOnlyKeywordsV4.json |    43 +
 ...ingArrayElementOnlyValueAndLanguageV4.json |   248 +
 ...bleStringArrayElementStringOrObjectV4.json |   151 +
 ...izableStringArrayElementValueStringV4.json |   235 +
 ...ocalizableStringArrayOnlyOneDefaultV4.json |   406 +
 ...alizableStringObjectMemberNameRegexV4.json |   129 +
 ...izableStringObjectMemberValueStringV4.json |   213 +
 ...nt-LocalizableStringOrArrayOrObjectV4.json |   149 +
 DTDL/v4/spec/Requirement-NoPathToSelfV4.json  |   174 +
 ...ent-RepresentationalBooleanHasValueV4.json |    74 +
 ...RepresentationalBooleanOnlyKeywordsV4.json |    53 +
 ...esentationalBooleanOnlyValueAndTypeV4.json |   303 +
 ...ent-RepresentationalBooleanOrObjectV4.json |   396 +
 ...-RepresentationalBooleanTypeBooleanV4.json |   438 +
 ...RepresentationalBooleanValueBooleanV4.json |   290 +
 ...ent-RepresentationalIntegerHasValueV4.json |    71 +
 ...RepresentationalIntegerOnlyKeywordsV4.json |    51 +
 ...esentationalIntegerOnlyValueAndTypeV4.json |   292 +
 ...ent-RepresentationalIntegerOrObjectV4.json |   380 +
 ...-RepresentationalIntegerTypeIntegerV4.json |   422 +
 ...RepresentationalIntegerValueIntegerV4.json |   279 +
 ...ment-RepresentationalStringHasValueV4.json |    53 +
 ...-RepresentationalStringOnlyKeywordsV4.json |    39 +
 ...resentationalStringOnlyValueAndTypeV4.json |   226 +
 ...ment-RepresentationalStringOrObjectV4.json |   284 +
 ...nt-RepresentationalStringTypeStringV4.json |   326 +
 ...t-RepresentationalStringValueStringV4.json |   213 +
 .../v4/spec/Requirement-RootArrayOrObjV4.json |   218 +
 ...ment-TopLevelDtdlContextOrLimitlessV4.json |   119 +
 .../spec/Requirement-TopLevelRootableV4.json  |    60 +
 README.md                                     |     1 +
 2660 files changed, 232325 insertions(+), 46620 deletions(-)
 create mode 100644 DTDL/v2/spec/Requirement-ClassArrayPropertiesElementSchemaSchemaSelfReferenceV2.json
 create mode 100644 DTDL/v2/spec/Requirement-ClassInterfacePropertiesExtendsSelfReferenceV2.json
 create mode 100644 DTDL/v2/spec/Requirement-ClassMapPropertiesElementSchemaSchemaSelfReferenceV2.json
 create mode 100644 DTDL/v2/spec/Requirement-ClassObjectPropertiesElementSchemaSchemaSelfReferenceV2.json
 create mode 100644 DTDL/v3/spec/Requirement-ClassArrayPropertiesElementSchemaSchemaSelfReferenceV3.json
 create mode 100644 DTDL/v3/spec/Requirement-ClassInterfacePropertiesExtendsSelfReferenceV3.json
 create mode 100644 DTDL/v3/spec/Requirement-ClassMapPropertiesElementSchemaSchemaSelfReferenceV3.json
 create mode 100644 DTDL/v3/spec/Requirement-ClassObjectPropertiesElementSchemaSchemaSelfReferenceV3.json
 create mode 100644 DTDL/v3/spec/Requirement-ContextArrayAllStringsV3.json
 create mode 100644 DTDL/v4/DTDL.Extensions.md
 create mode 100644 DTDL/v4/DTDL.Specification.v4.md
 create mode 100644 DTDL/v4/DTDL.annotation.v2.md
 create mode 100644 DTDL/v4/DTDL.historization.v2.md
 create mode 100644 DTDL/v4/DTDL.mqtt.v2.md
 create mode 100644 DTDL/v4/DTDL.overriding.v2.md
 create mode 100644 DTDL/v4/DTDL.quantitativeTypes.v2.md
 create mode 100644 DTDL/v4/DTDL.requirement.v1.md
 create mode 100644 DTDL/v4/DTDL.v4.md
 create mode 100644 DTDL/v4/context/DTDL.FeatureExtension.annotation.v2.context.json
 create mode 100644 DTDL/v4/context/DTDL.FeatureExtension.historization.v2.context.json
 create mode 100644 DTDL/v4/context/DTDL.FeatureExtension.mqtt.v2.context.json
 create mode 100644 DTDL/v4/context/DTDL.FeatureExtension.overriding.v2.context.json
 create mode 100644 DTDL/v4/context/DTDL.FeatureExtension.quantitativeTypes.v2.context.json
 create mode 100644 DTDL/v4/context/DTDL.FeatureExtension.requirement.v1.context.json
 create mode 100644 DTDL/v4/context/DTDL.v4.context.json
 create mode 100644 DTDL/v4/metamodel/DTDL.FeatureExtension.annotation.v2.RDF-SHACL.json
 create mode 100644 DTDL/v4/metamodel/DTDL.FeatureExtension.historization.v2.RDF-SHACL.json
 create mode 100644 DTDL/v4/metamodel/DTDL.FeatureExtension.mqtt.v2.RDF-SHACL.json
 create mode 100644 DTDL/v4/metamodel/DTDL.FeatureExtension.overriding.v2.RDF-SHACL.json
 create mode 100644 DTDL/v4/metamodel/DTDL.FeatureExtension.quantitativeTypes.v2.Elements.json
 create mode 100644 DTDL/v4/metamodel/DTDL.FeatureExtension.quantitativeTypes.v2.RDF-SHACL.json
 create mode 100644 DTDL/v4/metamodel/DTDL.FeatureExtension.requirement.v1.RDF-SHACL.json
 create mode 100644 DTDL/v4/metamodel/DTDL.v4.ModelElements.json
 create mode 100644 DTDL/v4/metamodel/DTDL.v4.ModelRDF-SHACL.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassArrayOptionalPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassArrayPropertiesElementSchemaSchemaSelfReferenceV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassArrayPropertyCommentDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassArrayPropertyDescriptionDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassArrayPropertyDisplayNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassArrayPropertyElementSchemaDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassCommandOptionalPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassCommandPropertyCommandTypeDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassCommandPropertyCommentDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassCommandPropertyDescriptionDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassCommandPropertyDisplayNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassCommandPropertyNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassCommandPropertyRequestDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassCommandPropertyResponseDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassCommandRequestOptionalPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassCommandRequestPropertyCommentDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassCommandRequestPropertyDescriptionDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassCommandRequestPropertyDisplayNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassCommandRequestPropertyNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassCommandRequestPropertyNullableDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassCommandRequestPropertySchemaDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassCommandResponseOptionalPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassCommandResponsePropertyCommentDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassCommandResponsePropertyDescriptionDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassCommandResponsePropertyDisplayNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassCommandResponsePropertyNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassCommandResponsePropertyNullableDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassCommandResponsePropertySchemaDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassComponentOptionalPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassComponentPropertyCommentDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassComponentPropertyDescriptionDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassComponentPropertyDisplayNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassComponentPropertyNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassComponentPropertySchemaDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassEnumOptionalPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassEnumPropertyCommentDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassEnumPropertyDescriptionDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassEnumPropertyDisplayNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassEnumPropertyEnumValuesDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassEnumPropertyValueSchemaDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassEnumValueOptionalPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassEnumValuePropertyCommentDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassEnumValuePropertyDescriptionDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassEnumValuePropertyDisplayNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassEnumValuePropertyEnumValueDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassEnumValuePropertyNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassFieldOptionalPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassFieldPropertyCommentDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassFieldPropertyDescriptionDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassFieldPropertyDisplayNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassFieldPropertyNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassFieldPropertySchemaDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassInterfaceOptionalPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassInterfacePropertyCommentDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassInterfacePropertyContentsDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassInterfacePropertyDescriptionDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassInterfacePropertyDisplayNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassInterfacePropertyExtendsDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassInterfacePropertySchemasDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassMapKeyOptionalPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassMapKeyPropertyCommentDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassMapKeyPropertyDescriptionDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassMapKeyPropertyDisplayNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassMapKeyPropertyNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassMapKeyPropertySchemaDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassMapOptionalPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassMapPropertiesElementSchemaSchemaSelfReferenceV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassMapPropertyCommentDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassMapPropertyDescriptionDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassMapPropertyDisplayNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassMapPropertyMapKeyDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassMapPropertyMapValueDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassMapValueOptionalPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassMapValuePropertyCommentDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassMapValuePropertyDescriptionDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassMapValuePropertyDisplayNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassMapValuePropertyNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassMapValuePropertySchemaDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassObjectOptionalPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassObjectPropertiesElementSchemaSchemaSelfReferenceV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassObjectPropertyCommentDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassObjectPropertyDescriptionDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassObjectPropertyDisplayNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassObjectPropertyFieldsDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassPropertyOptionalPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassPropertyPropertyCommentDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassPropertyPropertyDescriptionDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassPropertyPropertyDisplayNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassPropertyPropertyNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassPropertyPropertySchemaDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassPropertyPropertyWritableDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassRelationshipOptionalPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassRelationshipPropertyCommentDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassRelationshipPropertyDescriptionDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassRelationshipPropertyDisplayNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassRelationshipPropertyMaxMultiplicityDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassRelationshipPropertyMinMultiplicityDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassRelationshipPropertyNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassRelationshipPropertyPropertiesDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassRelationshipPropertyTargetDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassRelationshipPropertyWritableDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassTelemetryOptionalPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassTelemetryPropertyCommentDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassTelemetryPropertyDescriptionDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassTelemetryPropertyDisplayNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassTelemetryPropertyNameDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ClassTelemetryPropertySchemaDtmiV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ValueGeospatialSchemaV4.json
 create mode 100644 DTDL/v4/spec/Allowance-ValuePrimitiveSchemaV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassArrayPropertyElementSchemaDependentReferenceV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassArrayPropertyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassArrayPropertyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassArrayTypeIncludesIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassArrayTypeIncludesUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassCommandPropertyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassCommandPropertyRequestDependentReferenceV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassCommandPropertyResponseDependentReferenceV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassCommandPropertyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassCommandRequestPropertyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassCommandRequestPropertySchemaDependentReferenceV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassCommandRequestPropertyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassCommandRequestTypeIncludesIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassCommandRequestTypeIncludesUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassCommandResponsePropertyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassCommandResponsePropertySchemaDependentReferenceV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassCommandResponsePropertyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassCommandResponseTypeIncludesIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassCommandResponseTypeIncludesUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassCommandTypeIncludesIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassCommandTypeIncludesUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassComponentPropertyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassComponentPropertySchemaDependentReferenceV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassComponentPropertyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassComponentTypeIncludesIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassComponentTypeIncludesUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassEnumPropertyEnumValuesDependentReferenceV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassEnumPropertyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassEnumPropertyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassEnumTypeIncludesIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassEnumTypeIncludesUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassEnumValuePropertyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassEnumValuePropertyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassEnumValueTypeIncludesIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassEnumValueTypeIncludesUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassFieldPropertyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassFieldPropertySchemaDependentReferenceV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassFieldPropertyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassFieldTypeIncludesIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassFieldTypeIncludesUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassInterfacePropertyContentsDependentReferenceV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassInterfacePropertyExtendsDependentReferenceV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassInterfacePropertyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassInterfacePropertySchemasDependentReferenceV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassInterfacePropertyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassInterfaceTypeIncludesIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassInterfaceTypeIncludesUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassMapKeyPropertyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassMapKeyPropertyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassMapKeyTypeIncludesIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassMapKeyTypeIncludesUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassMapPropertyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassMapPropertyMapKeyDependentReferenceV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassMapPropertyMapValueDependentReferenceV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassMapPropertyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassMapTypeIncludesIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassMapTypeIncludesUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassMapValuePropertyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassMapValuePropertySchemaDependentReferenceV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassMapValuePropertyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassMapValueTypeIncludesIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassMapValueTypeIncludesUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassObjectPropertyFieldsDependentReferenceV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassObjectPropertyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassObjectPropertyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassObjectTypeIncludesIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassObjectTypeIncludesUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassPropertyPropertyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassPropertyPropertySchemaDependentReferenceV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassPropertyPropertyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassPropertyTypeIncludesIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassPropertyTypeIncludesUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassRelationshipPropertyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassRelationshipPropertyPropertiesDependentReferenceV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassRelationshipPropertyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassRelationshipTypeIncludesIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassRelationshipTypeIncludesUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassTelemetryPropertyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassTelemetryPropertySchemaDependentReferenceV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassTelemetryPropertyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassTelemetryTypeIncludesIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ClassTelemetryTypeIncludesUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Completion-ContextDefinedLanguageExtensionQuantV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassArrayPropertyCommentTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassArrayPropertyDescriptionTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassArrayPropertyDisplayNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassArrayPropertyElementSchemaPreferTermToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassArrayPropertyElementSchemaTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassArrayTypeDuplicatesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassArrayTypeIncludesTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassArrayTypePreferTermToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandPropertyCommandTypeDeprecatedV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandPropertyCommandTypeTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandPropertyCommentTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandPropertyDescriptionTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandPropertyDisplayNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandPropertyNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandPropertyRequestTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandPropertyResponseTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandRequestPropertyCommentTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandRequestPropertyDescriptionTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandRequestPropertyDisplayNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandRequestPropertyNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandRequestPropertyNullableTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandRequestPropertySchemaPreferTermToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandRequestPropertySchemaTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandRequestTypeDuplicatesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandRequestTypeIncludesTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandRequestTypePreferTermToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandResponsePropertyCommentTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandResponsePropertyDescriptionTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandResponsePropertyDisplayNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandResponsePropertyNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandResponsePropertyNullableTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandResponsePropertySchemaPreferTermToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandResponsePropertySchemaTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandResponseTypeDuplicatesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandResponseTypeIncludesTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandResponseTypePreferTermToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandTypeDuplicatesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandTypeIncludesTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassCommandTypePreferTermToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassComponentPropertyCommentTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassComponentPropertyDescriptionTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassComponentPropertyDisplayNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassComponentPropertyNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassComponentPropertySchemaTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassComponentTypeDuplicatesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassComponentTypeIncludesTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassComponentTypePreferTermToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassEnumPropertyCommentTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassEnumPropertyDescriptionTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassEnumPropertyDisplayNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassEnumPropertyEnumValuesTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassEnumPropertyValueSchemaTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassEnumPropertyValueSchemaValueIntegerPreferToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassEnumPropertyValueSchemaValueStringPreferToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassEnumTypeDuplicatesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassEnumTypeIncludesTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassEnumTypePreferTermToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassEnumValuePropertyCommentTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassEnumValuePropertyDescriptionTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassEnumValuePropertyDisplayNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassEnumValuePropertyEnumValueTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassEnumValuePropertyNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassEnumValueTypeDuplicatesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassEnumValueTypeIncludesTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassEnumValueTypePreferTermToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassFieldPropertyCommentTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassFieldPropertyDescriptionTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassFieldPropertyDisplayNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassFieldPropertyNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassFieldPropertySchemaPreferTermToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassFieldPropertySchemaTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassFieldTypeDuplicatesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassFieldTypeIncludesTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassFieldTypePreferTermToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassInterfacePropertyCommentTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassInterfacePropertyContentsTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassInterfacePropertyDescriptionTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassInterfacePropertyDisplayNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassInterfacePropertyExtendsTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassInterfacePropertySchemasTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassInterfaceTypeDuplicatesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassInterfaceTypeIncludesTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassInterfaceTypePreferTermToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapKeyPropertyCommentTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapKeyPropertyDescriptionTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapKeyPropertyDisplayNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapKeyPropertyNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapKeyPropertySchemaTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapKeyPropertySchemaValueStringPreferToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapKeyTypeDuplicatesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapKeyTypeIncludesTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapKeyTypePreferTermToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapPropertyCommentTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapPropertyDescriptionTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapPropertyDisplayNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapPropertyMapKeyTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapPropertyMapValueTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapTypeDuplicatesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapTypeIncludesTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapTypePreferTermToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapValuePropertyCommentTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapValuePropertyDescriptionTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapValuePropertyDisplayNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapValuePropertyNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapValuePropertySchemaPreferTermToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapValuePropertySchemaTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapValueTypeDuplicatesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapValueTypeIncludesTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassMapValueTypePreferTermToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassObjectPropertyCommentTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassObjectPropertyDescriptionTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassObjectPropertyDisplayNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassObjectPropertyFieldsTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassObjectTypeDuplicatesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassObjectTypeIncludesTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassObjectTypePreferTermToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassPropertyPropertyCommentTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassPropertyPropertyDescriptionTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassPropertyPropertyDisplayNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassPropertyPropertyNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassPropertyPropertySchemaPreferTermToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassPropertyPropertySchemaTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassPropertyPropertyWritableTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassPropertyTypeDuplicatesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassPropertyTypeIncludesTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassPropertyTypePreferTermToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassRelationshipPropertyCommentTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassRelationshipPropertyDescriptionTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassRelationshipPropertyDisplayNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassRelationshipPropertyMaxMultiplicityTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassRelationshipPropertyMinMultiplicityTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassRelationshipPropertyNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassRelationshipPropertyPropertiesTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassRelationshipPropertyTargetTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassRelationshipPropertyWritableTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassRelationshipTypeDuplicatesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassRelationshipTypeIncludesTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassRelationshipTypePreferTermToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassTelemetryPropertyCommentTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassTelemetryPropertyDescriptionTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassTelemetryPropertyDisplayNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassTelemetryPropertyNameTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassTelemetryPropertySchemaPreferTermToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassTelemetryPropertySchemaTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassTelemetryTypeDuplicatesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassTelemetryTypeIncludesTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ClassTelemetryTypePreferTermToDtmiV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ContextDtdlLimitlessOnlyOneV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ContextDtdlOnlyOneV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ContextRepeatsDeversionedValueV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ContextUniqueValuesV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-LocalizableStringArrayElementHasLanguageV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-RepresentationalBooleanHasTypeV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-RepresentationalIntegerHasTypeV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-RepresentationalStringHasTypeV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ValueGeospatialSchemaTermV4.json
 create mode 100644 DTDL/v4/spec/Recommendation-ValuePrimitiveSchemaTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayContextConformsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayIdDuplicateV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayIdIsDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayIdNotArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayIdRequiredV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayInvalidKeywordsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayPropertiesElementSchemaSchemaMaxDepthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayPropertyCommentStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayPropertyCommentStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayPropertyCommentTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayPropertyDescriptionLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayPropertyDescriptionStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayPropertyDescriptionTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayPropertyDisplayNameLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayPropertyDisplayNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayPropertyDisplayNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayPropertyElementSchemaElementV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayPropertyElementSchemaTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayPropertyElementSchemaTypeConformanceV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayPropertyFormallyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayPropertyFormallyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayPropertyInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayPropertyNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayRequiredPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayTypeIncludesInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayTypeIncludesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayTypeIncludesNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassArrayTypeStringOrArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandContextConformsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandIdDuplicateV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandIdIsDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandIdNotArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandInvalidKeywordsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyCommandTypeSpecificValuesV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyCommandTypeTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyCommentStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyCommentStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyCommentTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyDescriptionLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyDescriptionStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyDescriptionTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyDisplayNameLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyDisplayNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyDisplayNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyFormallyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyFormallyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyNamePatternV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyNameStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyNameUniqueAmongInterfaceContentsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyRequestElementV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyRequestTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyRequestTypeConformanceV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyResponseElementV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyResponseTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandPropertyResponseTypeConformanceV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestContextConformsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestIdDuplicateV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestIdIsDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestIdNotArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestInvalidKeywordsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestPropertyCommentStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestPropertyCommentStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestPropertyCommentTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestPropertyDescriptionLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestPropertyDescriptionStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestPropertyDescriptionTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestPropertyDisplayNameLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestPropertyDisplayNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestPropertyDisplayNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestPropertyFormallyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestPropertyFormallyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestPropertyInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNamePatternV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNameStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNullableBooleanV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNullableTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestPropertySchemaElementV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestPropertySchemaTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestPropertySchemaTypeConformanceV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestRequiredPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestTypeIncludesInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestTypeIncludesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestTypeIncludesNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequestTypeStringOrArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandRequiredPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponseContextConformsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponseIdDuplicateV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponseIdIsDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponseIdNotArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponseInvalidKeywordsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponsePropertyCommentStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponsePropertyCommentStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponsePropertyCommentTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponsePropertyDescriptionLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponsePropertyDescriptionStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponsePropertyDescriptionTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponsePropertyDisplayNameLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponsePropertyDisplayNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponsePropertyDisplayNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponsePropertyFormallyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponsePropertyFormallyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponsePropertyInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNamePatternV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNameStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNullableBooleanV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNullableTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponsePropertySchemaElementV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponsePropertySchemaTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponsePropertySchemaTypeConformanceV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponseRequiredPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponseTypeIncludesInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponseTypeIncludesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponseTypeIncludesNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandResponseTypeStringOrArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandTypeIncludesInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandTypeIncludesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandTypeIncludesNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassCommandTypeStringOrArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentContextConformsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentIdDuplicateV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentIdIsDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentIdNotArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentInvalidKeywordsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentPropertiesSchemaContentsExcludeComponentV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentPropertyCommentStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentPropertyCommentStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentPropertyCommentTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentPropertyDescriptionLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentPropertyDescriptionStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentPropertyDescriptionTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentPropertyDisplayNameLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentPropertyDisplayNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentPropertyDisplayNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentPropertyFormallyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentPropertyFormallyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentPropertyInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentPropertyNamePatternV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentPropertyNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentPropertyNameStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentPropertyNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentPropertyNameUniqueAmongInterfaceContentsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentPropertyNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentPropertySchemaElementV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentPropertySchemaTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentPropertySchemaTypeConformanceV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentRequiredPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentTypeIncludesInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentTypeIncludesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentTypeIncludesNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassComponentTypeStringOrArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumContextConformsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumIdDuplicateV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumIdIsDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumIdNotArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumIdRequiredV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumInvalidKeywordsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumPropertyCommentStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumPropertyCommentStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumPropertyCommentTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumPropertyDescriptionLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumPropertyDescriptionStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumPropertyDescriptionTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumPropertyDisplayNameLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumPropertyDisplayNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumPropertyDisplayNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumPropertyEnumValuesElementV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumPropertyEnumValuesTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumPropertyEnumValuesTypeConformanceV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumPropertyFormallyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumPropertyFormallyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumPropertyInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumPropertyNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumPropertyValueSchemaSpecificValuesV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumPropertyValueSchemaTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumRequiredPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumTypeIncludesInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumTypeIncludesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumTypeIncludesNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumTypeStringOrArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValueContextConformsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValueIdDuplicateV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValueIdIsDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValueIdNotArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValueInvalidKeywordsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValuePropertyCommentStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValuePropertyCommentStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValuePropertyCommentTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValuePropertyDescriptionLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValuePropertyDescriptionStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValuePropertyDescriptionTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValuePropertyDisplayNameLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValuePropertyDisplayNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValuePropertyDisplayNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValuePropertyEnumValueIntegerV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValuePropertyEnumValueStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValuePropertyEnumValueTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValuePropertyEnumValueUniqueAmongEnumEnumValuesV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValuePropertyFormallyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValuePropertyFormallyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValuePropertyInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValuePropertyNamePatternV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValuePropertyNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValuePropertyNameStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValuePropertyNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValuePropertyNameUniqueAmongEnumEnumValuesV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValuePropertyNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValueRequiredPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValueTypeIncludesInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValueTypeIncludesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValueTypeIncludesNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassEnumValueTypeStringOrArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldContextConformsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldIdDuplicateV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldIdIsDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldIdNotArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldInvalidKeywordsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldPropertyCommentStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldPropertyCommentStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldPropertyCommentTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldPropertyDescriptionLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldPropertyDescriptionStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldPropertyDescriptionTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldPropertyDisplayNameLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldPropertyDisplayNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldPropertyDisplayNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldPropertyFormallyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldPropertyFormallyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldPropertyInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldPropertyNamePatternV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldPropertyNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldPropertyNameStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldPropertyNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldPropertyNameUniqueAmongObjectFieldsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldPropertyNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldPropertySchemaElementV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldPropertySchemaTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldPropertySchemaTypeConformanceV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldRequiredPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldTypeIncludesInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldTypeIncludesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldTypeIncludesNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassFieldTypeStringOrArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfaceContextAtTopLevelV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfaceContextConformsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfaceContextDtdlTopLevelV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfaceIdDuplicateV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfaceIdIsDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfaceIdLongV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfaceIdNotArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfaceInvalidKeywordsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertiesExtendsMaxCountV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertiesExtendsMaxDepthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertiesExtendsSelfReferenceV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertyCommentStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertyCommentStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertyCommentTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertyContentsElementV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertyContentsTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertyContentsTypeConformanceV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertyDescriptionLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertyDescriptionStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertyDescriptionTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertyDisplayNameLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertyDisplayNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertyDisplayNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertyExtendsElementV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertyExtendsTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertyExtendsTypeConformanceV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertyFormallyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertyFormallyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertyInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertyNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertySchemasElementV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertySchemasTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfacePropertySchemasTypeConformanceV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfaceRequiredPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfaceTypeIncludesInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfaceTypeIncludesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfaceTypeIncludesNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassInterfaceTypeStringOrArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapContextConformsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapIdDuplicateV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapIdIsDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapIdNotArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapIdRequiredV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapInvalidKeywordsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyContextConformsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyIdDuplicateV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyIdIsDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyIdNotArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyInvalidKeywordsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyPropertyCommentStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyPropertyCommentStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyPropertyCommentTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyPropertyDescriptionLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyPropertyDescriptionStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyPropertyDescriptionTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyPropertyDisplayNameLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyPropertyDisplayNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyPropertyDisplayNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyPropertyFormallyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyPropertyFormallyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyPropertyInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyPropertyNamePatternV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyPropertyNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyPropertyNameStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyPropertyNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyPropertyNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyPropertySchemaSpecificValuesV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyPropertySchemaTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyRequiredPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyTypeIncludesInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyTypeIncludesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyTypeIncludesNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapKeyTypeStringOrArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapPropertiesElementSchemaSchemaMaxDepthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapPropertyCommentStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapPropertyCommentStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapPropertyCommentTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapPropertyDescriptionLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapPropertyDescriptionStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapPropertyDescriptionTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapPropertyDisplayNameLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapPropertyDisplayNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapPropertyDisplayNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapPropertyFormallyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapPropertyFormallyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapPropertyInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapPropertyMapKeyElementV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapPropertyMapKeyTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapPropertyMapKeyTypeConformanceV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapPropertyMapValueElementV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapPropertyMapValueTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapPropertyMapValueTypeConformanceV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapPropertyNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapRequiredPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapTypeIncludesInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapTypeIncludesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapTypeIncludesNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapTypeStringOrArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValueContextConformsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValueIdDuplicateV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValueIdIsDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValueIdNotArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValueInvalidKeywordsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValuePropertyCommentStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValuePropertyCommentStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValuePropertyCommentTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValuePropertyDescriptionLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValuePropertyDescriptionStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValuePropertyDescriptionTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValuePropertyDisplayNameLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValuePropertyDisplayNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValuePropertyDisplayNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValuePropertyFormallyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValuePropertyFormallyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValuePropertyInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValuePropertyNamePatternV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValuePropertyNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValuePropertyNameStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValuePropertyNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValuePropertyNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValuePropertySchemaElementV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValuePropertySchemaTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValuePropertySchemaTypeConformanceV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValueRequiredPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValueTypeIncludesInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValueTypeIncludesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValueTypeIncludesNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassMapValueTypeStringOrArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectContextConformsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectIdDuplicateV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectIdIsDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectIdNotArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectIdRequiredV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectInvalidKeywordsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectPropertiesElementSchemaSchemaMaxDepthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectPropertyCommentStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectPropertyCommentStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectPropertyCommentTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectPropertyDescriptionLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectPropertyDescriptionStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectPropertyDescriptionTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectPropertyDisplayNameLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectPropertyDisplayNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectPropertyDisplayNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectPropertyFieldsElementV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectPropertyFieldsTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectPropertyFieldsTypeConformanceV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectPropertyFormallyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectPropertyFormallyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectPropertyInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectPropertyNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectRequiredPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectTypeIncludesInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectTypeIncludesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectTypeIncludesNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassObjectTypeStringOrArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyContextConformsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyIdDuplicateV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyIdIsDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyIdNotArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyInvalidKeywordsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyPropertyCommentStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyPropertyCommentStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyPropertyCommentTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyPropertyDescriptionLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyPropertyDescriptionStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyPropertyDescriptionTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyPropertyDisplayNameLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyPropertyDisplayNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyPropertyDisplayNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyPropertyFormallyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyPropertyFormallyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyPropertyInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyPropertyNamePatternV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyPropertyNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyPropertyNameStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyPropertyNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyPropertyNameUniqueAmongInterfaceContentsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyPropertyNameUniqueAmongRelationshipPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyPropertyNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyPropertySchemaElementV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyPropertySchemaTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyPropertySchemaTypeConformanceV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyPropertyWritableBooleanV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyPropertyWritableTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyRequiredPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyTypeIncludesInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyTypeIncludesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyTypeIncludesNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassPropertyTypeStringOrArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipContextConformsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipIdDuplicateV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipIdIsDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipIdNotArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipInvalidKeywordsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyCommentStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyCommentStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyCommentTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyDescriptionLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyDescriptionStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyDescriptionTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyDisplayNameLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyDisplayNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyDisplayNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyFormallyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyFormallyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityIntegerV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityMinValueV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyMinMultiplicityExactValueV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyMinMultiplicityIntegerV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyMinMultiplicityTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyNamePatternV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyNameStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyNameUniqueAmongInterfaceContentsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyPropertiesElementV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyPropertiesTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyPropertiesTypeConformanceV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyTargetIsDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyTargetTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyWritableBooleanV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipPropertyWritableTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipRequiredPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipTypeIncludesInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipTypeIncludesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipTypeIncludesNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassRelationshipTypeStringOrArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryContextConformsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryIdDuplicateV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryIdIsDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryIdNotArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryInvalidKeywordsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryPropertyCommentStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryPropertyCommentStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryPropertyCommentTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryPropertyDescriptionLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryPropertyDescriptionStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryPropertyDescriptionTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryPropertyDisplayNameLangStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryPropertyDisplayNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryPropertyDisplayNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryPropertyFormallyIrrelevantDtmiOrTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryPropertyFormallyUndefinedTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryPropertyInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryPropertyNamePatternV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryPropertyNameStringLengthV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryPropertyNameStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryPropertyNameTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryPropertyNameUniqueAmongInterfaceContentsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryPropertyNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryPropertySchemaElementV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryPropertySchemaTermAndDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryPropertySchemaTypeConformanceV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryRequiredPropertiesV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryTypeIncludesInvalidDtmiV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryTypeIncludesMaterialV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryTypeIncludesNotDtmiNorTermV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ClassTelemetryTypeStringOrArrayV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ContextArrayAllStringsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ContextDtdlPrecedesOrOnlyV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ContextDtmiWithVersionQuantV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ContextStringOrArrayQuantV4.json
 create mode 100644 DTDL/v4/spec/Requirement-CoreLimitsFollowsLimitlessV4.json
 create mode 100644 DTDL/v4/spec/Requirement-DependencyReferenceableV4.json
 create mode 100644 DTDL/v4/spec/Requirement-DtmiIsStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-DtmiRegexV4.json
 create mode 100644 DTDL/v4/spec/Requirement-DtmiReservedPrefixesV4.json
 create mode 100644 DTDL/v4/spec/Requirement-ExtensionLimitsFollowsLimitlessV4.json
 create mode 100644 DTDL/v4/spec/Requirement-LimitlessContextFollowedByLimitsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-LimitlessContextPrecedesV4.json
 create mode 100644 DTDL/v4/spec/Requirement-LocalizableStringArrayElementHasValueV4.json
 create mode 100644 DTDL/v4/spec/Requirement-LocalizableStringArrayElementLanguageValueRegexV4.json
 create mode 100644 DTDL/v4/spec/Requirement-LocalizableStringArrayElementLanguageValueUniqueV4.json
 create mode 100644 DTDL/v4/spec/Requirement-LocalizableStringArrayElementOnlyKeywordsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-LocalizableStringArrayElementOnlyValueAndLanguageV4.json
 create mode 100644 DTDL/v4/spec/Requirement-LocalizableStringArrayElementStringOrObjectV4.json
 create mode 100644 DTDL/v4/spec/Requirement-LocalizableStringArrayElementValueStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-LocalizableStringArrayOnlyOneDefaultV4.json
 create mode 100644 DTDL/v4/spec/Requirement-LocalizableStringObjectMemberNameRegexV4.json
 create mode 100644 DTDL/v4/spec/Requirement-LocalizableStringObjectMemberValueStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-LocalizableStringOrArrayOrObjectV4.json
 create mode 100644 DTDL/v4/spec/Requirement-NoPathToSelfV4.json
 create mode 100644 DTDL/v4/spec/Requirement-RepresentationalBooleanHasValueV4.json
 create mode 100644 DTDL/v4/spec/Requirement-RepresentationalBooleanOnlyKeywordsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-RepresentationalBooleanOnlyValueAndTypeV4.json
 create mode 100644 DTDL/v4/spec/Requirement-RepresentationalBooleanOrObjectV4.json
 create mode 100644 DTDL/v4/spec/Requirement-RepresentationalBooleanTypeBooleanV4.json
 create mode 100644 DTDL/v4/spec/Requirement-RepresentationalBooleanValueBooleanV4.json
 create mode 100644 DTDL/v4/spec/Requirement-RepresentationalIntegerHasValueV4.json
 create mode 100644 DTDL/v4/spec/Requirement-RepresentationalIntegerOnlyKeywordsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-RepresentationalIntegerOnlyValueAndTypeV4.json
 create mode 100644 DTDL/v4/spec/Requirement-RepresentationalIntegerOrObjectV4.json
 create mode 100644 DTDL/v4/spec/Requirement-RepresentationalIntegerTypeIntegerV4.json
 create mode 100644 DTDL/v4/spec/Requirement-RepresentationalIntegerValueIntegerV4.json
 create mode 100644 DTDL/v4/spec/Requirement-RepresentationalStringHasValueV4.json
 create mode 100644 DTDL/v4/spec/Requirement-RepresentationalStringOnlyKeywordsV4.json
 create mode 100644 DTDL/v4/spec/Requirement-RepresentationalStringOnlyValueAndTypeV4.json
 create mode 100644 DTDL/v4/spec/Requirement-RepresentationalStringOrObjectV4.json
 create mode 100644 DTDL/v4/spec/Requirement-RepresentationalStringTypeStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-RepresentationalStringValueStringV4.json
 create mode 100644 DTDL/v4/spec/Requirement-RootArrayOrObjV4.json
 create mode 100644 DTDL/v4/spec/Requirement-TopLevelDtdlContextOrLimitlessV4.json
 create mode 100644 DTDL/v4/spec/Requirement-TopLevelRootableV4.json

diff --git a/DTDL/v2/DTDL.Specification.v2.md b/DTDL/v2/DTDL.Specification.v2.md
index bbdc7bca..2d178bda 100644
--- a/DTDL/v2/DTDL.Specification.v2.md
+++ b/DTDL/v2/DTDL.Specification.v2.md
@@ -31,7 +31,7 @@ It is based on [JSON-LD](https://json-ld.org/spec/FCGS/json-ld/20180607/), which
 DTDL can be understood and validated without knowing RDF or JSON-LD, and the present document specifies DTDL without reference to either of these other standards.
 DTDL cannot be readily understood without a basic knowledge of JSON; however, JSON syntax is fortunately straightforward, in marked contrast to the size, complexity, and subtlety of JSON-LD.
 
-Within this document, the key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED",  "MAY", and "OPTIONAL" are to be interpreted as described in IETF [RFC 2119](https://tools.ietf.org/search/rfc2119) as updated by [RFC 8174](https://tools.ietf.org/search/rfc8174), per [BCP 14](https://tools.ietf.org/search/bcp14).
+Within this document, the key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED",  "MAY", and "OPTIONAL" are to be interpreted as described in IETF [RFC 2119](https://www.rfc-editor.org/rfc/rfc2119) as updated by [RFC 8174](https://www.rfc-editor.org/rfc/rfc8174), per [BCP 14](https://www.rfc-editor.org/info/bcp14).
 Although these IETF documents make no distinction between the meaning of "MUST" and "SHALL", in the present document a violation of a "MUST" requirement indicates an **invalid** model, whereas a violation of a "SHALL" requirement indicates an **incomplete** model.
 See [Model completeness](#model-completeness) for a description of this distinction.
 
@@ -51,7 +51,7 @@ Following is a complete set of JSON terms with concise definitions:
 * value &mdash; an object OR array OR string OR number OR boolean OR null
 
 For brevity and simplicity, the definitions above &mdash; particularly for number and string &mdash; are succinct to the point of imprecision.
-See IETF [RFC 8259](https://tools.ietf.org/search/rfc8259) for more details on JSON syntax.
+See IETF [RFC 8259](https://www.rfc-editor.org/rfc/rfc8259) for more details on JSON syntax.
 Note that the term "boolean" is never used in the JSON spec; the paired terms "true" and "false" are always used instead.
 Another term not used in the JSON spec is "integer", which herein will mean an integral number expressible in 4 bytes.
 
@@ -169,8 +169,8 @@ If the definition of this extension is not known, the model is contextually inco
 ```json
 {
   "@context": [
-      "dtmi:dtdl:context;2",
-      "dtmi:example:someExtensionContext;1"
+    "dtmi:dtdl:context;2",
+    "dtmi:example:someExtensionContext;1"
   ],
   "@id": "dtmi:example:someInterface;1",
   "@type": "Interface",
@@ -1628,10 +1628,14 @@ In addition to the direct requirements on members of various [DTDL elements](#dt
 Specifically:
 
 * There [MUST NOT](spec/Requirement-ClassArrayPropertiesElementSchemaSchemaMaxDepthV2.json) be more than 5 "elementSchema" or "schema" members in any path from a DTDL [Array](#array) element to another DTDL element.
+* There [MUST NOT](spec/Requirement-ClassArrayPropertiesElementSchemaSchemaSelfReferenceV2.json) be a path from a DTDL [Array](#array) element wherein some "elementSchema" or "schema" member referentially includes the DTDL Array element where the path begins.
 * There [MUST NOT](spec/Requirement-ClassComponentPropertiesSchemaContentsExcludeComponentV2.json) be a path of "schema" or "contents" members from any DTDL [Component](#component) element to any DTDL [Component](#component) element.
 * There [MUST NOT](spec/Requirement-ClassInterfacePropertiesExtendsMaxDepthV2.json) be more than 10 members in any path of "extends" members from a DTDL [Interface](#interface) element to another DTDL element.
+* There [MUST NOT](spec/Requirement-ClassInterfacePropertiesExtendsSelfReferenceV2.json) be a path of "extends" members from a DTDL [Interface](#interface) element to the DTDL Interface element where the path begins.
 * There [MUST NOT](spec/Requirement-ClassMapPropertiesElementSchemaSchemaMaxDepthV2.json) be more than 5 "elementSchema" or "schema" members in any path from a DTDL [Map](#map) element to another DTDL element.
+* There [MUST NOT](spec/Requirement-ClassMapPropertiesElementSchemaSchemaSelfReferenceV2.json) be a path from a DTDL [Map](#map) element wherein some "elementSchema" or "schema" member referentially includes the DTDL Map element where the path begins.
 * There [MUST NOT](spec/Requirement-ClassObjectPropertiesElementSchemaSchemaMaxDepthV2.json) be more than 5 "elementSchema" or "schema" members in any path from a DTDL [Object](#object) element to another DTDL element.
+* There [MUST NOT](spec/Requirement-ClassObjectPropertiesElementSchemaSchemaSelfReferenceV2.json) be a path from a DTDL [Object](#object) element wherein some "elementSchema" or "schema" member referentially includes the DTDL Object element where the path begins.
 * A DTDL [Property](#property) element [MUST NOT](spec/Requirement-ClassPropertyPropertiesSchemaExcludeArrayV2.json) be an ancestor of any DTDL element with a "schema" member that includes or referentially includes a DTDL [Array](#array) element.
 * A DTDL [Property](#property) element [MUST NOT](spec/Requirement-ClassPropertyPropertiesSchemaExcludeArrayImplicantV2.json) be an ancestor of any DTDL element with a "schema" member that includes any string from the [Geospatial schemas](#geospatial-schemas) table.
 
@@ -2495,8 +2499,8 @@ The active context of the DTDL Relationship element is the set { "dtmi:dtdl:cont
 ```json
 {
   "@context": [
-      "dtmi:dtdl:context;2",
-      "dtmi:ex:foo;2"
+    "dtmi:dtdl:context;2",
+    "dtmi:ex:foo;2"
   ],
   "@id": "dtmi:ex:anInterface;1",
   "@type": "Interface",
diff --git a/DTDL/v2/DTDL.iotcentral.v2.md b/DTDL/v2/DTDL.iotcentral.v2.md
index 871e74e5..230d8198 100644
--- a/DTDL/v2/DTDL.iotcentral.v2.md
+++ b/DTDL/v2/DTDL.iotcentral.v2.md
@@ -20,15 +20,15 @@ The chart below lists constraints on properties of a Property or a Telemetry tha
 
 | Property | Limits |
 | --- | --- |
-| `schema` | must have type [Enum](#enum) |
+| `schema` | must have type Enum |
 
 ### State examples
 
 ```json
 {
   "@context": [
-      "dtmi:dtdl:context;2",
-      "dtmi:iotcentral:context;2"
+    "dtmi:dtdl:context;2",
+    "dtmi:iotcentral:context;2"
   ],
   "@id": "dtmi:com:example:Monitor;1",
   "@type": "Interface",
@@ -70,8 +70,8 @@ The chart below lists constraints on properties of an element that is co-typed E
 ```json
 {
   "@context": [
-      "dtmi:dtdl:context;2",
-      "dtmi:iotcentral:context;2"
+    "dtmi:dtdl:context;2",
+    "dtmi:iotcentral:context;2"
   ],
   "@id": "dtmi:com:example:Alarm;1",
   "@type": "Interface",
@@ -100,8 +100,8 @@ The chart below lists constraints on properties of an element that is co-typed L
 ```json
 {
   "@context": [
-      "dtmi:dtdl:context;2",
-      "dtmi:iotcentral:context;2"
+    "dtmi:dtdl:context;2",
+    "dtmi:iotcentral:context;2"
   ],
   "@id": "dtmi:com:example:Tracker;1",
   "@type": "Interface",
@@ -136,8 +136,8 @@ The chart below lists constraints on properties of an element that is co-typed V
 ```json
 {
   "@context": [
-      "dtmi:dtdl:context;2",
-      "dtmi:iotcentral:context;2"
+    "dtmi:dtdl:context;2",
+    "dtmi:iotcentral:context;2"
   ],
   "@id": "dtmi:com:example:Speedometer;1",
   "@type": "Interface",
@@ -173,8 +173,8 @@ The chart below lists constraints on properties of an element that is co-typed A
 ```json
 {
   "@context": [
-      "dtmi:dtdl:context;2",
-      "dtmi:iotcentral:context;2"
+    "dtmi:dtdl:context;2",
+    "dtmi:iotcentral:context;2"
   ],
   "@id": "dtmi:com:example:Accelerometer;1",
   "@type": "Interface",
@@ -204,8 +204,8 @@ The version restrictions described above apply only to co-types of adjunct types
 ```json
 {
   "@context": [
-      "dtmi:dtdl:context;2",
-      "dtmi:iotcentral:context;2"
+    "dtmi:dtdl:context;2",
+    "dtmi:iotcentral:context;2"
   ],
   "@id": "dtmi:com:example:Locator;1",
   "@type": "Interface",
diff --git a/DTDL/v2/DTDL.v2.md b/DTDL/v2/DTDL.v2.md
index 8701b9f1..0df28664 100644
--- a/DTDL/v2/DTDL.v2.md
+++ b/DTDL/v2/DTDL.v2.md
@@ -2,7 +2,7 @@
 
 **Version 2**
 
-This version of DTDL is used for [Azure Digital Twins](https://azure.microsoft.com/services/digital-twins/) and [IoT Plug and Play](https://aka.ms/iotpnp). 
+This version of DTDL is used for [Azure Digital Twins](https://azure.microsoft.com/services/digital-twins/) and [IoT Plug and Play](https://aka.ms/iotpnp).
 
 > Note: Since April 2023, DTDL v3 is the latest supported version in Azure products and services (except IoT Central)
 
@@ -55,6 +55,7 @@ For example, properties that are semantically annotated as "temperature" can be
 When writing a digital twin definition, it's necessary to specify the version of DTDL being used.
 Because DTDL is based on JSON-LD, we use the JSON-LD context (the `@context` statement) to specify the version of DTDL being used.
 For DTDL version 2, the appropriate context specifier is "dtmi:dtdl:context;2".
+See the [Context](#context) section for more details.
 
 ## Interface
 
@@ -462,9 +463,9 @@ A full set of primitive data types are provided and can be specified directly as
 | `boolean` | a boolean value |
 | `date` | a date in ISO 8601 format, per [RFC 3339](https://tools.ietf.org/html/rfc3339) |
 | `dateTime` | a date and time in ISO 8601 format, per [RFC 3339](https://tools.ietf.org/html/rfc3339) |
-| `double` | a finite numeric value that is expressible in IEEE 754 double-precision floating point format, conformant with xsd:double |
+| `double` | a finite numeric value that is expressible in IEEE 754 double-precision floating point format, conformant with the numeric range of xsd:double |
 | `duration` | a duration in ISO 8601 format |
-| `float` | a finite numeric value that is expressible in IEEE 754 single-precision floating point format, conformant with xsd:float |
+| `float` | a finite numeric value that is expressible in IEEE 754 single-precision floating point format, conformant with the numeric range of xsd:float |
 | `integer` | a signed integral numeric value that is expressible in 4 bytes |
 | `long` | a signed integral numeric value that is expressible in 8 bytes |
 | `string` | a UTF8 string |
@@ -476,8 +477,9 @@ Complex schemas are designed for supporting complex data types made up of primit
 In DTDL v2, the complex schemas are [Array](#array), [Enum](#enum), [Map](#map), and [Object](#object).
 A complex schema can be specified directly as the value of a schema property or described in the Interface schemas set and referenced in a schema property.
 
-Complex schema definitions are recursive.
+Complex schema definitions are recursive but not self-referential.
 An Array's elementSchema may be Array, Enum, Map, Object, or any of the [primitive schema](#primitive-schema) types.
+However, the elementSchema must not refer to the Array itself or to another complex schema that refers to the Array.
 The same is true for a Map's mapValue's schema and an Object's field's schema.
 For DTDL v2, the maximum depth of nested complex schemas is 5 levels.
 
@@ -644,7 +646,7 @@ The chart below lists the properties that a MapKey may have.
 | `description` | optional | localizable *string* | max 512 characters | A localizable description for display. |
 | `displayName` | optional | localizable *string* | max 64 characters | A localizable name for display. |
 | `name` | required | *string* | max 64 characters; contains only alphanumerics and underscore, starting with a letter, ending with alphanumeric | The programming name of the element. |
-| `schema` | required | [String](#string) | must be *string* | The data type of the Map's key, which must be string. |
+| `schema` | required | [primitive schema](#primitive-schema) | must be *string* | The data type of the Map's key, which must be string. |
 
 ### MapValue
 
@@ -1007,7 +1009,7 @@ IRIs in DTDL are [JSON-LD IRIs](https://w3c.github.io/json-ld-syntax/#iris) and
 Some string properties in models are meant for display and, therefore, support localization.
 Digital twin models use JSON-LD's string internationalization support for localization.
 Each localizable property (e.g. `displayName` and `description`) is defined to be a JSON-LD language map (`"@container": "@language"`).
-The keys of the language map must be language tag strings (see [BCP 47](https://tools.ietf.org/html/bcp47)).
+The keys of the language map must be language tag strings (see [BCP 47](https://www.rfc-editor.org/info/bcp47)).
 [ISO 639](https://www.loc.gov/standards/iso639-2/php/code_list.php) provides a list of language tags.
 The default language for DTDL documents is English.
 
@@ -1078,7 +1080,7 @@ By contrast, if the undefined co-type "Commercial" were not present in the above
 
 ## Language extensions
 
-DTDL also supports a selection of [language extensions](../v3/DTDL.Extensions.md), which offer additional functionality beyond what is provided by the core DTDL language.
+DTDL also supports a selection of [language extensions](../v4/DTDL.Extensions.md), which offer additional functionality beyond what is provided by the core DTDL language.
 The chart below lists the language extensions that are currently available for use with DTDL version 2.
 
 | Extension | Category | Description |
@@ -1103,7 +1105,7 @@ The chart below lists the language extensions that are currently available for u
 ## References
 
 * JSON-LD: JSON-LD 1.1 - https://json-ld.org/spec/latest/json-ld/
-* Language codes: BCP47 - https://tools.ietf.org/html/bcp47
+* Language codes: BCP47 - https://www.rfc-editor.org/info/bcp47
 * RDF (Resource Description Framework): RDF Concepts and Abstract Syntax - http://www.w3.org/TR/2014/REC-rdf11-concepts-20140225/
 * RDF Schema: RDF Schema 1.1 - http://www.w3.org/TR/rdf-schema/
 
diff --git a/DTDL/v2/metamodel/DTDL.v2.ModelElements.json b/DTDL/v2/metamodel/DTDL.v2.ModelElements.json
index 5943adca..5b80c84a 100644
--- a/DTDL/v2/metamodel/DTDL.v2.ModelElements.json
+++ b/DTDL/v2/metamodel/DTDL.v2.ModelElements.json
@@ -14,7 +14,7 @@
     "@type": "Double",
     "displayName": "double",
     "description": {
-      "en-US": "a finite numeric value that is expressible in IEEE 754 double-precision floating point format, conformant with xsd:double"
+      "en-US": "a finite numeric value that is expressible in IEEE 754 double-precision floating point format, conformant with the numeric range of xsd:double"
     }
   },
   {
@@ -23,7 +23,7 @@
     "@type": "Float",
     "displayName": "float",
     "description": {
-      "en-US": "a finite numeric value that is expressible in IEEE 754 single-precision floating point format, conformant with xsd:float"
+      "en-US": "a finite numeric value that is expressible in IEEE 754 single-precision floating point format, conformant with the numeric range of xsd:float"
     }
   },
   {
diff --git a/DTDL/v2/spec/Allowance-ClassArrayOptionalPropertiesV2.json b/DTDL/v2/spec/Allowance-ClassArrayOptionalPropertiesV2.json
index e458b158..662b4945 100644
--- a/DTDL/v2/spec/Allowance-ClassArrayOptionalPropertiesV2.json
+++ b/DTDL/v2/spec/Allowance-ClassArrayOptionalPropertiesV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_um;1",
+        "@id": "dtmi:example:mu_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "kappa_wum",
+          "name": "mu_chi",
           "schema": {
             "@context": [],
             "@type": "Array",
@@ -29,11 +29,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_fuddle;1",
+        "@id": "dtmi:example:mu_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "kappa_humpf",
+          "name": "mu_omega",
           "schema": {
             "@type": "Array",
             "elementSchema": "time"
@@ -50,10 +50,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_nuh;1",
+        "@id": "dtmi:example:mu_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_glikk;1",
+          "@id": "dtmi:example:mu_wum;1",
           "@type": "Array",
           "elementSchema": "boolean"
         }
@@ -68,10 +68,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_quan;1",
+        "@id": "dtmi:example:mu_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_snee;1",
+          "@id": "dtmi:example:mu_humpf;1",
           "@type": "Array",
           "elementSchema": "date"
         }
@@ -86,10 +86,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_spazz;1",
+        "@id": "dtmi:example:mu_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_thnad;1",
+          "@id": "dtmi:example:mu_glikk;1",
           "@type": "Array",
           "elementSchema": "dateTime"
         }
diff --git a/DTDL/v2/spec/Allowance-ClassArrayPropertyCommentDtmiV2.json b/DTDL/v2/spec/Allowance-ClassArrayPropertyCommentDtmiV2.json
index df239c20..031e126c 100644
--- a/DTDL/v2/spec/Allowance-ClassArrayPropertyCommentDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassArrayPropertyCommentDtmiV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_sigma;1",
+        "@id": "dtmi:example:pi_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_pi;1",
+          "@id": "dtmi:example:pi_pi;1",
           "@type": "Array",
-          "dtmi:dtdl:property:comment;2": "xi_rho",
-          "elementSchema": "double"
+          "dtmi:dtdl:property:comment;2": "pi_rho",
+          "elementSchema": "float"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassArrayPropertyDescriptionDtmiV2.json b/DTDL/v2/spec/Allowance-ClassArrayPropertyDescriptionDtmiV2.json
index 3113eea0..a3665a21 100644
--- a/DTDL/v2/spec/Allowance-ClassArrayPropertyDescriptionDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassArrayPropertyDescriptionDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_gamma;1",
+        "@id": "dtmi:example:sigma_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_alpha;1",
+          "@id": "dtmi:example:sigma_alpha;1",
           "@type": "Array",
           "dtmi:dtdl:property:description;2": [
-            "pi_beta"
+            "sigma_beta"
           ],
-          "elementSchema": "float"
+          "elementSchema": "long"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassArrayPropertyDisplayNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassArrayPropertyDisplayNameDtmiV2.json
index 429f2d6b..b718cea2 100644
--- a/DTDL/v2/spec/Allowance-ClassArrayPropertyDisplayNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassArrayPropertyDisplayNameDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_nuh;1",
+        "@id": "dtmi:example:tau_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_fuddle;1",
+          "@id": "dtmi:example:tau_fuddle;1",
           "@type": "Array",
           "dtmi:dtdl:property:displayName;2": [
-            "rho_glikk"
+            "tau_glikk"
           ],
-          "elementSchema": "long"
+          "elementSchema": "time"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassArrayPropertyElementSchemaDtmiV2.json b/DTDL/v2/spec/Allowance-ClassArrayPropertyElementSchemaDtmiV2.json
index 62860a0e..d9cadfca 100644
--- a/DTDL/v2/spec/Allowance-ClassArrayPropertyElementSchemaDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassArrayPropertyElementSchemaDtmiV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_rho;1",
+        "@id": "dtmi:example:mu_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_pi;1",
+          "@id": "dtmi:example:mu_mu;1",
           "@type": "Array",
           "dtmi:dtdl:property:elementSchema;2": "date"
         }
diff --git a/DTDL/v2/spec/Allowance-ClassArrayPropertyInvalidDtmiV2.json b/DTDL/v2/spec/Allowance-ClassArrayPropertyInvalidDtmiV2.json
index 9b13ad90..16499994 100644
--- a/DTDL/v2/spec/Allowance-ClassArrayPropertyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassArrayPropertyInvalidDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_wum;1",
+        "@id": "dtmi:example:upsilon_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_yuzz;1",
+          "@id": "dtmi:example:upsilon_yuzz;1",
           "@type": [
             "Array",
             "Foobar"
           ],
-          "elementSchema": "double",
+          "elementSchema": "float",
           "dtmi:foo//bar": 626
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassArrayPropertyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Allowance-ClassArrayPropertyIrrelevantDtmiOrTermV2.json
index 9664be06..413b56de 100644
--- a/DTDL/v2/spec/Allowance-ClassArrayPropertyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassArrayPropertyIrrelevantDtmiOrTermV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_xi;1",
+        "@id": "dtmi:example:upsilon_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_nu;1",
+          "@id": "dtmi:example:upsilon_nu;1",
           "@type": [
             "Array",
             "Foobar"
           ],
-          "elementSchema": "long",
+          "elementSchema": "time",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_pi;1",
+        "@id": "dtmi:example:upsilon_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_omicron;1",
+          "@id": "dtmi:example:upsilon_omicron;1",
           "@type": [
             "Array",
             "Foobar"
           ],
-          "elementSchema": "string",
+          "elementSchema": "boolean",
           "boolean": null
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassArrayPropertyNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassArrayPropertyNotDtmiNorTermV2.json
index df3b56cc..294fa505 100644
--- a/DTDL/v2/spec/Allowance-ClassArrayPropertyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassArrayPropertyNotDtmiNorTermV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_snee;1",
+        "@id": "dtmi:example:upsilon_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_nuh;1",
+          "@id": "dtmi:example:upsilon_nuh;1",
           "@type": [
             "Array",
             "Foobar"
           ],
-          "elementSchema": "integer",
+          "elementSchema": "string",
           "http://foo.com/bar": true
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassArrayPropertyUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassArrayPropertyUndefinedTermV2.json
index 7fb05298..ced97cfd 100644
--- a/DTDL/v2/spec/Allowance-ClassArrayPropertyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassArrayPropertyUndefinedTermV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_jogg;1",
+        "@id": "dtmi:example:upsilon_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_zatz;1",
+          "@id": "dtmi:example:upsilon_zatz;1",
           "@type": [
             "Array",
             "Foobar"
           ],
-          "elementSchema": "time",
+          "elementSchema": "date",
           "foobar": {}
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassArrayTypeIncludesNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassArrayTypeIncludesNotDtmiNorTermV2.json
index 63e47fc6..cb649dc8 100644
--- a/DTDL/v2/spec/Allowance-ClassArrayTypeIncludesNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassArrayTypeIncludesNotDtmiNorTermV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_glikk;1",
+        "@id": "dtmi:example:eta_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_fuddle;1",
+          "@id": "dtmi:example:eta_tau;1",
           "@type": [
             "Array",
             "http://foo.com/bar"
diff --git a/DTDL/v2/spec/Allowance-ClassArrayTypeIncludesUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassArrayTypeIncludesUndefinedTermV2.json
index 67630b64..39a72d0c 100644
--- a/DTDL/v2/spec/Allowance-ClassArrayTypeIncludesUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassArrayTypeIncludesUndefinedTermV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_snee;1",
+        "@id": "dtmi:example:eta_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_nuh;1",
+          "@id": "dtmi:example:eta_phi;1",
           "@type": [
             "Array",
             "Foobar"
diff --git a/DTDL/v2/spec/Allowance-ClassCommandOptionalPropertiesV2.json b/DTDL/v2/spec/Allowance-ClassCommandOptionalPropertiesV2.json
index 918d2640..fd9cb097 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandOptionalPropertiesV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandOptionalPropertiesV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_sigma;1",
+        "@id": "dtmi:example:omega_sigma;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:chi_rho;1",
+          "@id": "dtmi:example:omega_rho;1",
           "@type": "Interface",
           "contents": {
             "@context": [],
             "@type": "Command",
-            "name": "chi_pi"
+            "name": "omega_pi"
           }
         }
       }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_phi;1",
+        "@id": "dtmi:example:omega_phi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:chi_upsilon;1",
+          "@id": "dtmi:example:omega_upsilon;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "chi_tau"
+            "name": "omega_tau"
           }
         }
       }
@@ -50,11 +50,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_psi;1",
+        "@id": "dtmi:example:omega_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_chi"
+          "name": "omega_chi"
         }
       }
     ]
@@ -67,11 +67,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_yuzz;1",
+        "@id": "dtmi:example:omega_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_omega"
+          "name": "omega_omega"
         }
       }
     ]
@@ -84,11 +84,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_um;1",
+        "@id": "dtmi:example:omega_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_wum"
+          "name": "omega_wum"
         }
       }
     ]
@@ -101,11 +101,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_fuddle;1",
+        "@id": "dtmi:example:omega_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_humpf"
+          "name": "omega_humpf"
         }
       }
     ]
@@ -118,11 +118,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_nuh;1",
+        "@id": "dtmi:example:omega_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_glikk"
+          "name": "omega_glikk"
         }
       }
     ]
@@ -135,11 +135,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_quan;1",
+        "@id": "dtmi:example:omega_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_snee"
+          "name": "omega_snee"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassCommandPayloadOptionalPropertiesV2.json b/DTDL/v2/spec/Allowance-ClassCommandPayloadOptionalPropertiesV2.json
index 342da48e..c400cbfa 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandPayloadOptionalPropertiesV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandPayloadOptionalPropertiesV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_flunn;1",
+        "@id": "dtmi:example:omicron_snee;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:mu_jogg;1",
+          "@id": "dtmi:example:omicron_nuh;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "mu_zatz",
+            "name": "omicron_glikk",
             "request": {
               "@context": [],
-              "name": "mu_floob",
-              "schema": "double"
+              "name": "omicron_fuddle",
+              "schema": "time"
             }
           }
         }
@@ -33,14 +33,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_vroo;1",
+        "@id": "dtmi:example:omicron_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_yekk",
+          "name": "omicron_thnad",
           "request": {
-            "name": "mu_itch",
-            "schema": "duration"
+            "name": "omicron_quan",
+            "schema": "boolean"
           }
         }
       }
@@ -54,17 +54,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_gamma;1",
+        "@id": "dtmi:example:omicron_flunn;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_beta;1",
+          "@id": "dtmi:example:omicron_jogg;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "nu_alpha",
+            "name": "omicron_zatz",
             "request": {
-              "name": "mu_hi",
-              "schema": "float"
+              "name": "omicron_floob",
+              "schema": "date"
             }
           }
         }
@@ -79,14 +79,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_zeta;1",
+        "@id": "dtmi:example:omicron_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_epsilon",
+          "name": "omicron_yekk",
           "request": {
-            "name": "nu_delta",
-            "schema": "integer"
+            "name": "omicron_itch",
+            "schema": "dateTime"
           }
         }
       }
@@ -100,14 +100,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_iota;1",
+        "@id": "dtmi:example:pi_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_theta",
+          "name": "pi_alpha",
           "request": {
-            "name": "nu_eta",
-            "schema": "long"
+            "name": "omicron_hi",
+            "schema": "double"
           }
         }
       }
@@ -121,14 +121,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_mu;1",
+        "@id": "dtmi:example:pi_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_lambda",
+          "name": "pi_delta",
           "request": {
-            "name": "nu_kappa",
-            "schema": "string"
+            "name": "pi_gamma",
+            "schema": "duration"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyCommentDtmiV2.json b/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyCommentDtmiV2.json
index 6233b388..6e1956d1 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyCommentDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyCommentDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_fuddle;1",
+        "@id": "dtmi:example:wum_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_humpf",
+          "name": "wum_fuddle",
           "request": {
-            "dtmi:dtdl:property:comment;2": "psi_wum",
-            "name": "psi_um",
-            "schema": "dateTime"
+            "dtmi:dtdl:property:comment;2": "wum_um",
+            "name": "wum_humpf",
+            "schema": "boolean"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyDescriptionDtmiV2.json b/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyDescriptionDtmiV2.json
index 8399167a..24f7a716 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyDescriptionDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyDescriptionDtmiV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_gamma;1",
+        "@id": "dtmi:example:fuddle_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_beta",
+          "name": "fuddle_gamma",
           "request": {
             "dtmi:dtdl:property:description;2": [
-              "yuzz_hi"
+              "fuddle_alpha"
             ],
-            "name": "wum_alpha",
-            "schema": "duration"
+            "name": "fuddle_beta",
+            "schema": "dateTime"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyDisplayNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyDisplayNameDtmiV2.json
index 091d288e..5ddd6ea0 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyDisplayNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyDisplayNameDtmiV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_upsilon;1",
+        "@id": "dtmi:example:nuh_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_tau",
+          "name": "nuh_upsilon",
           "request": {
             "dtmi:dtdl:property:displayName;2": [
-              "humpf_rho"
+              "nuh_sigma"
             ],
-            "name": "humpf_sigma",
-            "schema": "integer"
+            "name": "nuh_tau",
+            "schema": "duration"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyInvalidDtmiV2.json b/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyInvalidDtmiV2.json
index 3495efb9..61d40014 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyInvalidDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_nuh;1",
+        "@id": "dtmi:example:snee_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_glikk",
+          "name": "snee_nuh",
           "request": {
             "@type": [
               "CommandPayload",
               "Foobar"
             ],
-            "name": "fuddle_fuddle",
-            "schema": "dateTime",
+            "name": "snee_glikk",
+            "schema": "boolean",
             "dtmi:foo//bar": 626
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyIrrelevantDtmiOrTermV2.json
index c4ed0fb4..be9daba4 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyIrrelevantDtmiOrTermV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_nu;1",
+        "@id": "dtmi:example:snee_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_mu",
+          "name": "snee_nu",
           "request": {
             "@type": [
               "CommandPayload",
               "Foobar"
             ],
-            "name": "fuddle_lambda",
-            "schema": "integer",
+            "name": "snee_mu",
+            "schema": "duration",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_pi;1",
+        "@id": "dtmi:example:snee_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_omicron",
+          "name": "snee_pi",
           "request": {
             "@type": [
               "CommandPayload",
               "Foobar"
             ],
-            "name": "fuddle_xi",
-            "schema": "long",
+            "name": "snee_omicron",
+            "schema": "float",
             "boolean": null
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyNameDtmiV2.json
index 566a3f78..35eaf2bd 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyNameDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_spazz;1",
+        "@id": "dtmi:example:theta_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_thnad",
+          "name": "theta_rho",
           "request": {
-            "dtmi:dtdl:property:name;2": "epsilon_quan",
-            "schema": "string"
+            "dtmi:dtdl:property:name;2": "theta_pi",
+            "schema": "duration"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyNotDtmiNorTermV2.json
index 1725a2eb..122f6933 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyNotDtmiNorTermV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_itch;1",
+        "@id": "dtmi:example:snee_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_flunn",
+          "name": "snee_itch",
           "request": {
             "@type": [
               "CommandPayload",
               "Foobar"
             ],
-            "name": "fuddle_jogg",
-            "schema": "float",
+            "name": "snee_flunn",
+            "schema": "double",
             "http://foo.com/bar": true
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertySchemaDtmiV2.json b/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertySchemaDtmiV2.json
index d839e935..ab018ad5 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertySchemaDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertySchemaDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_psi;1",
+        "@id": "dtmi:example:omicron_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_chi",
+          "name": "omicron_omicron",
           "request": {
-            "name": "mu_phi",
-            "dtmi:dtdl:property:schema;2": "integer"
+            "name": "omicron_xi",
+            "dtmi:dtdl:property:schema;2": "dateTime"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyUndefinedTermV2.json
index 28d5b7c3..9a9736d2 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandPayloadPropertyUndefinedTermV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_zeta;1",
+        "@id": "dtmi:example:quan_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_epsilon",
+          "name": "quan_zeta",
           "request": {
             "@type": [
               "CommandPayload",
               "Foobar"
             ],
-            "name": "glikk_delta",
-            "schema": "string",
+            "name": "quan_epsilon",
+            "schema": "integer",
             "foobar": {}
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassCommandPayloadTypeIncludesNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassCommandPayloadTypeIncludesNotDtmiNorTermV2.json
index 6ef96129..c44e9131 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandPayloadTypeIncludesNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandPayloadTypeIncludesNotDtmiNorTermV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_delta;1",
+        "@id": "dtmi:example:upsilon_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_gamma",
+          "name": "upsilon_delta",
           "request": {
             "@type": [
               "CommandPayload",
               "http://foo.com/bar"
             ],
-            "name": "rho_beta",
-            "schema": "string"
+            "name": "upsilon_gamma",
+            "schema": "integer"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassCommandPayloadTypeIncludesUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassCommandPayloadTypeIncludesUndefinedTermV2.json
index 6f1cc80d..cb5ba7c8 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandPayloadTypeIncludesUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandPayloadTypeIncludesUndefinedTermV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_eta;1",
+        "@id": "dtmi:example:upsilon_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_zeta",
+          "name": "upsilon_eta",
           "request": {
             "@type": [
               "CommandPayload",
               "Foobar"
             ],
-            "name": "rho_epsilon",
-            "schema": "time"
+            "name": "upsilon_zeta",
+            "schema": "long"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassCommandPropertyCommandTypeDtmiV2.json b/DTDL/v2/spec/Allowance-ClassCommandPropertyCommandTypeDtmiV2.json
index 3f7be83c..4e49e65e 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandPropertyCommandTypeDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandPropertyCommandTypeDtmiV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_glikk;1",
+        "@id": "dtmi:example:quan_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "dtmi:dtdl:property:commandType;2": "asynchronous",
-          "name": "nuh_fuddle"
+          "name": "quan_spazz"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassCommandPropertyCommentDtmiV2.json b/DTDL/v2/spec/Allowance-ClassCommandPropertyCommentDtmiV2.json
index d2a6b9ac..1df2e2f6 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandPropertyCommentDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandPropertyCommentDtmiV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_gamma;1",
+        "@id": "dtmi:example:spazz_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "dtmi:dtdl:property:comment;2": "quan_alpha",
-          "name": "quan_beta"
+          "dtmi:dtdl:property:comment;2": "spazz_eta",
+          "name": "spazz_theta"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassCommandPropertyDescriptionDtmiV2.json b/DTDL/v2/spec/Allowance-ClassCommandPropertyDescriptionDtmiV2.json
index 1117dec8..99aa11c7 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandPropertyDescriptionDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandPropertyDescriptionDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_nuh;1",
+        "@id": "dtmi:example:floob_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "dtmi:dtdl:property:description;2": [
-            "thnad_fuddle"
+            "floob_spazz"
           ],
-          "name": "thnad_glikk"
+          "name": "floob_floob"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassCommandPropertyDisplayNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassCommandPropertyDisplayNameDtmiV2.json
index 23d3013a..8e5752ea 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandPropertyDisplayNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandPropertyDisplayNameDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_pi;1",
+        "@id": "dtmi:example:jogg_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "dtmi:dtdl:property:displayName;2": [
-            "floob_xi"
+            "jogg_upsilon"
           ],
-          "name": "floob_omicron"
+          "name": "jogg_phi"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassCommandPropertyInvalidDtmiV2.json b/DTDL/v2/spec/Allowance-ClassCommandPropertyInvalidDtmiV2.json
index 3206b2d1..d2b1c2f4 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandPropertyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandPropertyInvalidDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_spazz;1",
+        "@id": "dtmi:example:epsilon_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Command",
             "Foobar"
           ],
-          "name": "beta_thnad",
+          "name": "epsilon_rho",
           "dtmi:foo//bar": 626
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassCommandPropertyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Allowance-ClassCommandPropertyIrrelevantDtmiOrTermV2.json
index 976f9927..556ef726 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandPropertyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandPropertyIrrelevantDtmiOrTermV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_psi;1",
+        "@id": "dtmi:example:epsilon_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Command",
             "Foobar"
           ],
-          "name": "beta_chi",
+          "name": "epsilon_epsilon",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -28,14 +28,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_yuzz;1",
+        "@id": "dtmi:example:epsilon_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Command",
             "Foobar"
           ],
-          "name": "beta_omega",
+          "name": "epsilon_eta",
           "boolean": null
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassCommandPropertyNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassCommandPropertyNameDtmiV2.json
index 4e04f132..aebca6c3 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandPropertyNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandPropertyNameDtmiV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_epsilon;1",
+        "@id": "dtmi:example:omega_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "dtmi:dtdl:property:name;2": "chi_delta"
+          "dtmi:dtdl:property:name;2": "omega_delta"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassCommandPropertyNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassCommandPropertyNotDtmiNorTermV2.json
index c789ca73..7fc4ca06 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandPropertyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandPropertyNotDtmiNorTermV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_yekk;1",
+        "@id": "dtmi:example:epsilon_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Command",
             "Foobar"
           ],
-          "name": "beta_itch",
+          "name": "epsilon_psi",
           "http://foo.com/bar": true
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassCommandPropertyRequestDtmiV2.json b/DTDL/v2/spec/Allowance-ClassCommandPropertyRequestDtmiV2.json
index da9b98d1..115796ba 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandPropertyRequestDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandPropertyRequestDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_humpf;1",
+        "@id": "dtmi:example:hi_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "itch_wum",
+          "name": "vroo_vroo",
           "dtmi:dtdl:property:request;2": {
-            "name": "itch_um",
-            "schema": "long"
+            "name": "vroo_hi",
+            "schema": "date"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassCommandPropertyResponseDtmiV2.json b/DTDL/v2/spec/Allowance-ClassCommandPropertyResponseDtmiV2.json
index fbb38532..f70aff1b 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandPropertyResponseDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandPropertyResponseDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_itch;1",
+        "@id": "dtmi:example:delta_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "alpha_jogg",
+          "name": "delta_phi",
           "dtmi:dtdl:property:response;2": {
-            "name": "alpha_flunn",
-            "schema": "time"
+            "name": "delta_chi",
+            "schema": "float"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassCommandPropertyUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassCommandPropertyUndefinedTermV2.json
index 68d2c201..c76defb7 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandPropertyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandPropertyUndefinedTermV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_delta;1",
+        "@id": "dtmi:example:epsilon_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Command",
             "Foobar"
           ],
-          "name": "gamma_gamma",
+          "name": "epsilon_fuddle",
           "foobar": {}
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassCommandTypeIncludesNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassCommandTypeIncludesNotDtmiNorTermV2.json
index d2c7a0ea..314925af 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandTypeIncludesNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandTypeIncludesNotDtmiNorTermV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_thnad;1",
+        "@id": "dtmi:example:chi_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Command",
             "http://foo.com/bar"
           ],
-          "name": "upsilon_quan"
+          "name": "chi_quan"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassCommandTypeIncludesUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassCommandTypeIncludesUndefinedTermV2.json
index e8f6e051..5f2271f6 100644
--- a/DTDL/v2/spec/Allowance-ClassCommandTypeIncludesUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassCommandTypeIncludesUndefinedTermV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_floob;1",
+        "@id": "dtmi:example:chi_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Command",
             "Foobar"
           ],
-          "name": "upsilon_spazz"
+          "name": "chi_spazz"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassComponentOptionalPropertiesV2.json b/DTDL/v2/spec/Allowance-ClassComponentOptionalPropertiesV2.json
index 83f0599e..7214c621 100644
--- a/DTDL/v2/spec/Allowance-ClassComponentOptionalPropertiesV2.json
+++ b/DTDL/v2/spec/Allowance-ClassComponentOptionalPropertiesV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_omicron;1",
+        "@id": "dtmi:example:hi_omega;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:itch_xi;1",
+          "@id": "dtmi:example:hi_psi;1",
           "@type": "Interface",
           "contents": {
             "@context": [],
             "@type": "Component",
-            "name": "itch_mu",
+            "name": "hi_phi",
             "schema": {
-              "@id": "dtmi:example:itch_nu;1",
+              "@id": "dtmi:example:hi_chi;1",
               "@type": "Interface"
             }
           }
@@ -33,16 +33,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_tau;1",
+        "@id": "dtmi:example:hi_humpf;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:itch_sigma;1",
+          "@id": "dtmi:example:hi_um;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "itch_pi",
+            "name": "hi_yuzz",
             "schema": {
-              "@id": "dtmi:example:itch_rho;1",
+              "@id": "dtmi:example:hi_wum;1",
               "@type": "Interface"
             }
           }
@@ -58,13 +58,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_chi;1",
+        "@id": "dtmi:example:hi_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "itch_upsilon",
+          "name": "hi_fuddle",
           "schema": {
-            "@id": "dtmi:example:itch_phi;1",
+            "@id": "dtmi:example:hi_glikk;1",
             "@type": "Interface"
           }
         }
@@ -79,13 +79,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_yuzz;1",
+        "@id": "dtmi:example:hi_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "itch_psi",
+          "name": "hi_snee",
           "schema": {
-            "@id": "dtmi:example:itch_omega;1",
+            "@id": "dtmi:example:hi_quan;1",
             "@type": "Interface"
           }
         }
@@ -100,13 +100,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_humpf;1",
+        "@id": "dtmi:example:hi_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "itch_wum",
+          "name": "hi_spazz",
           "schema": {
-            "@id": "dtmi:example:itch_um;1",
+            "@id": "dtmi:example:hi_floob;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassComponentPropertyCommentDtmiV2.json b/DTDL/v2/spec/Allowance-ClassComponentPropertyCommentDtmiV2.json
index 074f5588..a1ca348b 100644
--- a/DTDL/v2/spec/Allowance-ClassComponentPropertyCommentDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassComponentPropertyCommentDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_upsilon;1",
+        "@id": "dtmi:example:theta_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "dtmi:dtdl:property:comment;2": "epsilon_rho",
-          "name": "epsilon_sigma",
+          "dtmi:dtdl:property:comment;2": "theta_thnad",
+          "name": "theta_spazz",
           "schema": {
-            "@id": "dtmi:example:epsilon_tau;1",
+            "@id": "dtmi:example:theta_floob;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassComponentPropertyDescriptionDtmiV2.json b/DTDL/v2/spec/Allowance-ClassComponentPropertyDescriptionDtmiV2.json
index 2aa9cf15..812fb600 100644
--- a/DTDL/v2/spec/Allowance-ClassComponentPropertyDescriptionDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassComponentPropertyDescriptionDtmiV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_zatz;1",
+        "@id": "dtmi:example:lambda_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "dtmi:dtdl:property:description;2": [
-            "eta_thnad"
+            "lambda_theta"
           ],
-          "name": "eta_spazz",
+          "name": "lambda_iota",
           "schema": {
-            "@id": "dtmi:example:eta_floob;1",
+            "@id": "dtmi:example:lambda_kappa;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassComponentPropertyDisplayNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassComponentPropertyDisplayNameDtmiV2.json
index 9f76ba5b..61518617 100644
--- a/DTDL/v2/spec/Allowance-ClassComponentPropertyDisplayNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassComponentPropertyDisplayNameDtmiV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_lambda;1",
+        "@id": "dtmi:example:nu_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "dtmi:dtdl:property:displayName;2": [
-            "kappa_theta"
+            "nu_yuzz"
           ],
-          "name": "kappa_iota",
+          "name": "nu_wum",
           "schema": {
-            "@id": "dtmi:example:kappa_kappa;1",
+            "@id": "dtmi:example:nu_um;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassComponentPropertyInvalidDtmiV2.json b/DTDL/v2/spec/Allowance-ClassComponentPropertyInvalidDtmiV2.json
index c8e22e4b..45defc27 100644
--- a/DTDL/v2/spec/Allowance-ClassComponentPropertyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassComponentPropertyInvalidDtmiV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_chi;1",
+        "@id": "dtmi:example:xi_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Component",
             "Foobar"
           ],
-          "name": "lambda_upsilon",
+          "name": "xi_zatz",
           "schema": {
-            "@id": "dtmi:example:lambda_phi;1",
+            "@id": "dtmi:example:xi_jogg;1",
             "@type": "Interface"
           },
           "dtmi:foo//bar": 626
diff --git a/DTDL/v2/spec/Allowance-ClassComponentPropertyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Allowance-ClassComponentPropertyIrrelevantDtmiOrTermV2.json
index 0de72773..f41efae6 100644
--- a/DTDL/v2/spec/Allowance-ClassComponentPropertyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassComponentPropertyIrrelevantDtmiOrTermV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_delta;1",
+        "@id": "dtmi:example:xi_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Component",
             "Foobar"
           ],
-          "name": "lambda_beta",
+          "name": "xi_tau",
           "schema": {
-            "@id": "dtmi:example:lambda_gamma;1",
+            "@id": "dtmi:example:xi_upsilon;1",
             "@type": "Interface"
           },
           "dtmi:foo:bar;1": 626
@@ -32,16 +32,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_eta;1",
+        "@id": "dtmi:example:xi_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Component",
             "Foobar"
           ],
-          "name": "lambda_epsilon",
+          "name": "xi_chi",
           "schema": {
-            "@id": "dtmi:example:lambda_zeta;1",
+            "@id": "dtmi:example:xi_psi;1",
             "@type": "Interface"
           },
           "boolean": null
diff --git a/DTDL/v2/spec/Allowance-ClassComponentPropertyNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassComponentPropertyNameDtmiV2.json
index 30e26fec..d7632bdf 100644
--- a/DTDL/v2/spec/Allowance-ClassComponentPropertyNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassComponentPropertyNameDtmiV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_thnad;1",
+        "@id": "dtmi:example:jogg_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "dtmi:dtdl:property:name;2": "spazz_snee",
+          "dtmi:dtdl:property:name;2": "jogg_quan",
           "schema": {
-            "@id": "dtmi:example:spazz_quan;1",
+            "@id": "dtmi:example:jogg_thnad;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassComponentPropertyNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassComponentPropertyNotDtmiNorTermV2.json
index e564a1e1..6b5e2d54 100644
--- a/DTDL/v2/spec/Allowance-ClassComponentPropertyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassComponentPropertyNotDtmiNorTermV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_nuh;1",
+        "@id": "dtmi:example:omicron_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Component",
             "Foobar"
           ],
-          "name": "lambda_fuddle",
+          "name": "omicron_gamma",
           "schema": {
-            "@id": "dtmi:example:lambda_glikk;1",
+            "@id": "dtmi:example:omicron_delta;1",
             "@type": "Interface"
           },
           "http://foo.com/bar": true
diff --git a/DTDL/v2/spec/Allowance-ClassComponentPropertySchemaDtmiV2.json b/DTDL/v2/spec/Allowance-ClassComponentPropertySchemaDtmiV2.json
index 8cf0a08e..c137c5a2 100644
--- a/DTDL/v2/spec/Allowance-ClassComponentPropertySchemaDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassComponentPropertySchemaDtmiV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_itch;1",
+        "@id": "dtmi:example:hi_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "flunn_jogg",
+          "name": "hi_delta",
           "dtmi:dtdl:property:schema;2": {
-            "@id": "dtmi:example:flunn_flunn;1",
+            "@id": "dtmi:example:hi_epsilon;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassComponentPropertyUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassComponentPropertyUndefinedTermV2.json
index f80d3142..a9a8de00 100644
--- a/DTDL/v2/spec/Allowance-ClassComponentPropertyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassComponentPropertyUndefinedTermV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_itch;1",
+        "@id": "dtmi:example:omicron_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Component",
             "Foobar"
           ],
-          "name": "lambda_jogg",
+          "name": "omicron_mu",
           "schema": {
-            "@id": "dtmi:example:lambda_flunn;1",
+            "@id": "dtmi:example:omicron_nu;1",
             "@type": "Interface"
           },
           "foobar": {}
diff --git a/DTDL/v2/spec/Allowance-ClassComponentTypeIncludesNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassComponentTypeIncludesNotDtmiNorTermV2.json
index 5c01aa5f..3aff26fb 100644
--- a/DTDL/v2/spec/Allowance-ClassComponentTypeIncludesNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassComponentTypeIncludesNotDtmiNorTermV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_epsilon;1",
+        "@id": "dtmi:example:floob_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Component",
             "http://foo.com/bar"
           ],
-          "name": "quan_gamma",
+          "name": "floob_delta",
           "schema": {
-            "@id": "dtmi:example:quan_delta;1",
+            "@id": "dtmi:example:floob_epsilon;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassComponentTypeIncludesUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassComponentTypeIncludesUndefinedTermV2.json
index ecbf8807..b529f751 100644
--- a/DTDL/v2/spec/Allowance-ClassComponentTypeIncludesUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassComponentTypeIncludesUndefinedTermV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_theta;1",
+        "@id": "dtmi:example:floob_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Component",
             "Foobar"
           ],
-          "name": "quan_zeta",
+          "name": "floob_eta",
           "schema": {
-            "@id": "dtmi:example:quan_eta;1",
+            "@id": "dtmi:example:floob_theta;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassEnumOptionalPropertiesV2.json b/DTDL/v2/spec/Allowance-ClassEnumOptionalPropertiesV2.json
index c7eaa00b..2907affa 100644
--- a/DTDL/v2/spec/Allowance-ClassEnumOptionalPropertiesV2.json
+++ b/DTDL/v2/spec/Allowance-ClassEnumOptionalPropertiesV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_zeta;1",
+        "@id": "dtmi:example:zatz_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_epsilon",
+          "name": "zatz_glikk",
           "schema": {
             "@context": [],
             "@type": "Enum",
             "enumValues": [
               {
-                "enumValue": 508,
-                "name": "thnad_delta"
+                "enumValue": 517,
+                "name": "zatz_fuddle"
               }
             ],
             "valueSchema": "integer"
@@ -35,17 +35,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_iota;1",
+        "@id": "dtmi:example:zatz_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_theta",
+          "name": "zatz_quan",
           "schema": {
             "@type": "Enum",
             "enumValues": [
               {
-                "enumValue": 509,
-                "name": "thnad_eta"
+                "enumValue": 518,
+                "name": "zatz_snee"
               }
             ],
             "valueSchema": "integer"
@@ -62,15 +62,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_mu;1",
+        "@id": "dtmi:example:zatz_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_kappa;1",
+          "@id": "dtmi:example:zatz_spazz;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 510,
-              "name": "thnad_lambda"
+              "enumValue": 519,
+              "name": "zatz_floob"
             }
           ],
           "valueSchema": "integer"
@@ -86,15 +86,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_omicron;1",
+        "@id": "dtmi:example:zatz_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_nu;1",
+          "@id": "dtmi:example:zatz_jogg;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 511,
-              "name": "thnad_xi"
+              "enumValue": 520,
+              "name": "zatz_flunn"
             }
           ],
           "valueSchema": "integer"
@@ -110,15 +110,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_sigma;1",
+        "@id": "dtmi:example:zatz_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_pi;1",
+          "@id": "dtmi:example:zatz_yekk;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 512,
-              "name": "thnad_rho"
+              "enumValue": 521,
+              "name": "zatz_vroo"
             }
           ],
           "valueSchema": "integer"
diff --git a/DTDL/v2/spec/Allowance-ClassEnumPropertyCommentDtmiV2.json b/DTDL/v2/spec/Allowance-ClassEnumPropertyCommentDtmiV2.json
index c4bf57fb..ac1fe84b 100644
--- a/DTDL/v2/spec/Allowance-ClassEnumPropertyCommentDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassEnumPropertyCommentDtmiV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_wum;1",
+        "@id": "dtmi:example:alpha_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_psi;1",
+          "@id": "dtmi:example:alpha_lambda;1",
           "@type": "Enum",
-          "dtmi:dtdl:property:comment;2": "itch_omega",
+          "dtmi:dtdl:property:comment;2": "alpha_mu",
           "enumValues": [
             {
-              "enumValue": 623,
-              "name": "itch_yuzz"
+              "enumValue": 634,
+              "name": "alpha_nu"
             }
           ],
           "valueSchema": "integer"
diff --git a/DTDL/v2/spec/Allowance-ClassEnumPropertyDescriptionDtmiV2.json b/DTDL/v2/spec/Allowance-ClassEnumPropertyDescriptionDtmiV2.json
index e3cdd6c8..2a08b003 100644
--- a/DTDL/v2/spec/Allowance-ClassEnumPropertyDescriptionDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassEnumPropertyDescriptionDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_hi;1",
+        "@id": "dtmi:example:gamma_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_itch;1",
+          "@id": "dtmi:example:gamma_humpf;1",
           "@type": "Enum",
           "dtmi:dtdl:property:description;2": [
-            "vroo_yekk"
+            "gamma_fuddle"
           ],
           "enumValues": [
             {
-              "enumValue": 655,
-              "name": "vroo_vroo"
+              "enumValue": 666,
+              "name": "gamma_glikk"
             }
           ],
           "valueSchema": "integer"
diff --git a/DTDL/v2/spec/Allowance-ClassEnumPropertyDisplayNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassEnumPropertyDisplayNameDtmiV2.json
index a3f36a22..8ba003d2 100644
--- a/DTDL/v2/spec/Allowance-ClassEnumPropertyDisplayNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassEnumPropertyDisplayNameDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_rho;1",
+        "@id": "dtmi:example:zeta_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_xi;1",
+          "@id": "dtmi:example:zeta_beta;1",
           "@type": "Enum",
           "dtmi:dtdl:property:displayName;2": [
-            "beta_omicron"
+            "zeta_gamma"
           ],
           "enumValues": [
             {
-              "enumValue": 687,
-              "name": "beta_pi"
+              "enumValue": 698,
+              "name": "zeta_delta"
             }
           ],
           "valueSchema": "integer"
diff --git a/DTDL/v2/spec/Allowance-ClassEnumPropertyEnumValuesDtmiV2.json b/DTDL/v2/spec/Allowance-ClassEnumPropertyEnumValuesDtmiV2.json
index d63c171a..3c6cb829 100644
--- a/DTDL/v2/spec/Allowance-ClassEnumPropertyEnumValuesDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassEnumPropertyEnumValuesDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_hi;1",
+        "@id": "dtmi:example:fuddle_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_yekk;1",
+          "@id": "dtmi:example:fuddle_psi;1",
           "@type": "Enum",
           "dtmi:dtdl:property:enumValues;2": [
             {
-              "enumValue": 406,
-              "name": "yuzz_vroo"
+              "enumValue": 415,
+              "name": "fuddle_omega"
             }
           ],
           "valueSchema": "integer"
diff --git a/DTDL/v2/spec/Allowance-ClassEnumPropertyInvalidDtmiV2.json b/DTDL/v2/spec/Allowance-ClassEnumPropertyInvalidDtmiV2.json
index 99a9e396..0f306e39 100644
--- a/DTDL/v2/spec/Allowance-ClassEnumPropertyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassEnumPropertyInvalidDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_humpf;1",
+        "@id": "dtmi:example:eta_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_wum;1",
+          "@id": "dtmi:example:eta_xi;1",
           "@type": [
             "Enum",
             "Foobar"
           ],
           "enumValues": [
             {
-              "enumValue": 703,
-              "name": "gamma_um"
+              "enumValue": 714,
+              "name": "eta_omicron"
             }
           ],
           "valueSchema": "integer",
diff --git a/DTDL/v2/spec/Allowance-ClassEnumPropertyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Allowance-ClassEnumPropertyIrrelevantDtmiOrTermV2.json
index 3b95e9f8..7feb6d33 100644
--- a/DTDL/v2/spec/Allowance-ClassEnumPropertyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassEnumPropertyIrrelevantDtmiOrTermV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_kappa;1",
+        "@id": "dtmi:example:zeta_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_theta;1",
+          "@id": "dtmi:example:zeta_flunn;1",
           "@type": [
             "Enum",
             "Foobar"
           ],
           "enumValues": [
             {
-              "enumValue": 697,
-              "name": "gamma_iota"
+              "enumValue": 708,
+              "name": "zeta_itch"
             }
           ],
           "valueSchema": "integer",
@@ -35,18 +35,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_nu;1",
+        "@id": "dtmi:example:eta_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_lambda;1",
+          "@id": "dtmi:example:zeta_vroo;1",
           "@type": [
             "Enum",
             "Foobar"
           ],
           "enumValues": [
             {
-              "enumValue": 698,
-              "name": "gamma_mu"
+              "enumValue": 709,
+              "name": "zeta_hi"
             }
           ],
           "valueSchema": "integer",
diff --git a/DTDL/v2/spec/Allowance-ClassEnumPropertyNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassEnumPropertyNotDtmiNorTermV2.json
index 003836c9..a8674cd4 100644
--- a/DTDL/v2/spec/Allowance-ClassEnumPropertyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassEnumPropertyNotDtmiNorTermV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_zatz;1",
+        "@id": "dtmi:example:eta_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_spazz;1",
+          "@id": "dtmi:example:eta_psi;1",
           "@type": [
             "Enum",
             "Foobar"
           ],
           "enumValues": [
             {
-              "enumValue": 706,
-              "name": "gamma_floob"
+              "enumValue": 717,
+              "name": "eta_omega"
             }
           ],
           "valueSchema": "integer",
diff --git a/DTDL/v2/spec/Allowance-ClassEnumPropertyUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassEnumPropertyUndefinedTermV2.json
index f44fda43..a19082a9 100644
--- a/DTDL/v2/spec/Allowance-ClassEnumPropertyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassEnumPropertyUndefinedTermV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_gamma;1",
+        "@id": "dtmi:example:eta_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_alpha;1",
+          "@id": "dtmi:example:eta_snee;1",
           "@type": [
             "Enum",
             "Foobar"
           ],
           "enumValues": [
             {
-              "enumValue": 709,
-              "name": "delta_beta"
+              "enumValue": 720,
+              "name": "eta_quan"
             }
           ],
           "valueSchema": "integer",
diff --git a/DTDL/v2/spec/Allowance-ClassEnumPropertyValueSchemaDtmiV2.json b/DTDL/v2/spec/Allowance-ClassEnumPropertyValueSchemaDtmiV2.json
index c8522246..1c608609 100644
--- a/DTDL/v2/spec/Allowance-ClassEnumPropertyValueSchemaDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassEnumPropertyValueSchemaDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_thnad;1",
+        "@id": "dtmi:example:zatz_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_snee;1",
+          "@id": "dtmi:example:zatz_xi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 503,
-              "name": "quan_quan"
+              "enumValue": 512,
+              "name": "zatz_omicron"
             }
           ],
           "dtmi:dtdl:property:valueSchema;2": "integer"
diff --git a/DTDL/v2/spec/Allowance-ClassEnumTypeIncludesNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassEnumTypeIncludesNotDtmiNorTermV2.json
index bafe1a7d..83f6b42b 100644
--- a/DTDL/v2/spec/Allowance-ClassEnumTypeIncludesNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassEnumTypeIncludesNotDtmiNorTermV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_yekk;1",
+        "@id": "dtmi:example:sigma_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_flunn;1",
+          "@id": "dtmi:example:sigma_nu;1",
           "@type": [
             "Enum",
             "http://foo.com/bar"
           ],
           "enumValues": [
             {
-              "enumValue": 90,
-              "name": "xi_itch"
+              "enumValue": 97,
+              "name": "sigma_xi"
             }
           ],
           "valueSchema": "integer"
diff --git a/DTDL/v2/spec/Allowance-ClassEnumTypeIncludesUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassEnumTypeIncludesUndefinedTermV2.json
index 12762e98..a239fa36 100644
--- a/DTDL/v2/spec/Allowance-ClassEnumTypeIncludesUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassEnumTypeIncludesUndefinedTermV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_alpha;1",
+        "@id": "dtmi:example:sigma_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_vroo;1",
+          "@id": "dtmi:example:sigma_pi;1",
           "@type": [
             "Enum",
             "Foobar"
           ],
           "enumValues": [
             {
-              "enumValue": 91,
-              "name": "xi_hi"
+              "enumValue": 98,
+              "name": "sigma_rho"
             }
           ],
           "valueSchema": "integer"
diff --git a/DTDL/v2/spec/Allowance-ClassEnumValueOptionalPropertiesV2.json b/DTDL/v2/spec/Allowance-ClassEnumValueOptionalPropertiesV2.json
index de6a05b2..6b23169f 100644
--- a/DTDL/v2/spec/Allowance-ClassEnumValueOptionalPropertiesV2.json
+++ b/DTDL/v2/spec/Allowance-ClassEnumValueOptionalPropertiesV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_omicron;1",
+        "@id": "dtmi:example:omicron_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "lambda_xi",
+          "name": "omicron_beta",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
               "@context": [],
-              "enumValue": 782,
-              "name": "lambda_nu"
+              "enumValue": 793,
+              "name": "omicron_alpha"
             }
           }
         }
@@ -33,15 +33,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_sigma;1",
+        "@id": "dtmi:example:omicron_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_rho;1",
+          "@id": "dtmi:example:omicron_epsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 783,
-            "name": "lambda_pi"
+            "enumValue": 794,
+            "name": "omicron_delta"
           }
         }
       }
@@ -55,17 +55,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_phi;1",
+        "@id": "dtmi:example:omicron_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "lambda_upsilon",
+          "name": "omicron_theta",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 784,
-              "name": "lambda_tau"
+              "enumValue": 795,
+              "name": "omicron_eta"
             }
           }
         }
@@ -80,15 +80,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_omega;1",
+        "@id": "dtmi:example:omicron_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_psi;1",
+          "@id": "dtmi:example:omicron_lambda;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 785,
-            "name": "lambda_chi"
+            "enumValue": 796,
+            "name": "omicron_kappa"
           }
         }
       }
@@ -102,15 +102,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_um;1",
+        "@id": "dtmi:example:omicron_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_wum;1",
+          "@id": "dtmi:example:omicron_xi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 786,
-            "name": "lambda_yuzz"
+            "enumValue": 797,
+            "name": "omicron_nu"
           }
         }
       }
@@ -124,15 +124,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_glikk;1",
+        "@id": "dtmi:example:omicron_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_fuddle;1",
+          "@id": "dtmi:example:omicron_rho;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 787,
-            "name": "lambda_humpf"
+            "enumValue": 798,
+            "name": "omicron_pi"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassEnumValuePropertyCommentDtmiV2.json b/DTDL/v2/spec/Allowance-ClassEnumValuePropertyCommentDtmiV2.json
index 84c29f4b..fcbffc48 100644
--- a/DTDL/v2/spec/Allowance-ClassEnumValuePropertyCommentDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassEnumValuePropertyCommentDtmiV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_quan;1",
+        "@id": "dtmi:example:yuzz_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_snee;1",
+          "@id": "dtmi:example:yuzz_wum;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "dtmi:dtdl:property:comment;2": "phi_glikk",
-            "enumValue": 931,
-            "name": "phi_nuh"
+            "dtmi:dtdl:property:comment;2": "yuzz_omega",
+            "enumValue": 944,
+            "name": "yuzz_yuzz"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassEnumValuePropertyDescriptionDtmiV2.json b/DTDL/v2/spec/Allowance-ClassEnumValuePropertyDescriptionDtmiV2.json
index 503db53a..2cfb5244 100644
--- a/DTDL/v2/spec/Allowance-ClassEnumValuePropertyDescriptionDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassEnumValuePropertyDescriptionDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_eta;1",
+        "@id": "dtmi:example:humpf_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_zeta;1",
+          "@id": "dtmi:example:um_hi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "dtmi:dtdl:property:description;2": [
-              "omega_delta"
+              "um_yekk"
             ],
-            "enumValue": 963,
-            "name": "omega_epsilon"
+            "enumValue": 976,
+            "name": "um_vroo"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassEnumValuePropertyDisplayNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassEnumValuePropertyDisplayNameDtmiV2.json
index e9473f24..f7089486 100644
--- a/DTDL/v2/spec/Allowance-ClassEnumValuePropertyDisplayNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassEnumValuePropertyDisplayNameDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_omega;1",
+        "@id": "dtmi:example:glikk_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_psi;1",
+          "@id": "dtmi:example:glikk_rho;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "dtmi:dtdl:property:displayName;2": [
-              "wum_phi"
+              "glikk_omicron"
             ],
-            "enumValue": 995,
-            "name": "wum_chi"
+            "enumValue": 1008,
+            "name": "glikk_pi"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassEnumValuePropertyEnumValueDtmiV2.json b/DTDL/v2/spec/Allowance-ClassEnumValuePropertyEnumValueDtmiV2.json
index 94cdc8c2..08e5d0c3 100644
--- a/DTDL/v2/spec/Allowance-ClassEnumValuePropertyEnumValueDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassEnumValuePropertyEnumValueDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_zeta;1",
+        "@id": "dtmi:example:lambda_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_epsilon;1",
+          "@id": "dtmi:example:lambda_floob;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "dtmi:dtdl:property:enumValue;2": 714,
-            "name": "theta_delta"
+            "dtmi:dtdl:property:enumValue;2": 725,
+            "name": "lambda_spazz"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassEnumValuePropertyInvalidDtmiV2.json b/DTDL/v2/spec/Allowance-ClassEnumValuePropertyInvalidDtmiV2.json
index ae42521e..69ccb0ce 100644
--- a/DTDL/v2/spec/Allowance-ClassEnumValuePropertyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassEnumValuePropertyInvalidDtmiV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_spazz;1",
+        "@id": "dtmi:example:nuh_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_thnad;1",
+          "@id": "dtmi:example:nuh_humpf;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -18,8 +18,8 @@
               "EnumValue",
               "Foobar"
             ],
-            "enumValue": 1011,
-            "name": "um_quan",
+            "enumValue": 1024,
+            "name": "nuh_um",
             "dtmi:foo//bar": 626
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassEnumValuePropertyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Allowance-ClassEnumValuePropertyIrrelevantDtmiOrTermV2.json
index 0f80ebe0..87a2752a 100644
--- a/DTDL/v2/spec/Allowance-ClassEnumValuePropertyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassEnumValuePropertyIrrelevantDtmiOrTermV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_rho;1",
+        "@id": "dtmi:example:nuh_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_pi;1",
+          "@id": "dtmi:example:nuh_kappa;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -18,8 +18,8 @@
               "EnumValue",
               "Foobar"
             ],
-            "enumValue": 1005,
-            "name": "um_omicron",
+            "enumValue": 1018,
+            "name": "nuh_iota",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -34,10 +34,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_upsilon;1",
+        "@id": "dtmi:example:nuh_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_tau;1",
+          "@id": "dtmi:example:nuh_nu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -45,8 +45,8 @@
               "EnumValue",
               "Foobar"
             ],
-            "enumValue": 1006,
-            "name": "um_sigma",
+            "enumValue": 1019,
+            "name": "nuh_mu",
             "boolean": null
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassEnumValuePropertyNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassEnumValuePropertyNameDtmiV2.json
index 583e1dd8..3118e2ab 100644
--- a/DTDL/v2/spec/Allowance-ClassEnumValuePropertyNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassEnumValuePropertyNameDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_yekk;1",
+        "@id": "dtmi:example:xi_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_itch;1",
+          "@id": "dtmi:example:xi_humpf;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 777,
-            "dtmi:dtdl:property:name;2": "kappa_flunn"
+            "enumValue": 788,
+            "dtmi:dtdl:property:name;2": "xi_um"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassEnumValuePropertyNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassEnumValuePropertyNotDtmiNorTermV2.json
index 32a6d4f0..ae1c1ff5 100644
--- a/DTDL/v2/spec/Allowance-ClassEnumValuePropertyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassEnumValuePropertyNotDtmiNorTermV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_alpha;1",
+        "@id": "dtmi:example:nuh_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_hi;1",
+          "@id": "dtmi:example:nuh_zatz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -18,8 +18,8 @@
               "EnumValue",
               "Foobar"
             ],
-            "enumValue": 1014,
-            "name": "um_vroo",
+            "enumValue": 1027,
+            "name": "nuh_floob",
             "http://foo.com/bar": true
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassEnumValuePropertyUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassEnumValuePropertyUndefinedTermV2.json
index 21e28998..4e9c7a96 100644
--- a/DTDL/v2/spec/Allowance-ClassEnumValuePropertyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassEnumValuePropertyUndefinedTermV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_kappa;1",
+        "@id": "dtmi:example:snee_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_iota;1",
+          "@id": "dtmi:example:snee_gamma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -18,8 +18,8 @@
               "EnumValue",
               "Foobar"
             ],
-            "enumValue": 1017,
-            "name": "humpf_theta",
+            "enumValue": 1030,
+            "name": "snee_beta",
             "foobar": {}
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassEnumValueTypeIncludesNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassEnumValueTypeIncludesNotDtmiNorTermV2.json
index 082bd05d..ef1e8b13 100644
--- a/DTDL/v2/spec/Allowance-ClassEnumValueTypeIncludesNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassEnumValueTypeIncludesNotDtmiNorTermV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_theta;1",
+        "@id": "dtmi:example:tau_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_eta;1",
+          "@id": "dtmi:example:tau_alpha;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -18,8 +18,8 @@
               "EnumValue",
               "http://foo.com/bar"
             ],
-            "enumValue": 837,
-            "name": "omicron_zeta"
+            "enumValue": 850,
+            "name": "sigma_hi"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassEnumValueTypeIncludesUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassEnumValueTypeIncludesUndefinedTermV2.json
index cba86ff5..0a5f1c22 100644
--- a/DTDL/v2/spec/Allowance-ClassEnumValueTypeIncludesUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassEnumValueTypeIncludesUndefinedTermV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_lambda;1",
+        "@id": "dtmi:example:tau_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_kappa;1",
+          "@id": "dtmi:example:tau_delta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -18,8 +18,8 @@
               "EnumValue",
               "Foobar"
             ],
-            "enumValue": 838,
-            "name": "omicron_iota"
+            "enumValue": 851,
+            "name": "tau_gamma"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassFieldOptionalPropertiesV2.json b/DTDL/v2/spec/Allowance-ClassFieldOptionalPropertiesV2.json
index 9b11a906..fe19dc43 100644
--- a/DTDL/v2/spec/Allowance-ClassFieldOptionalPropertiesV2.json
+++ b/DTDL/v2/spec/Allowance-ClassFieldOptionalPropertiesV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_gamma;1",
+        "@id": "dtmi:example:vroo_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "jogg_beta",
+          "name": "vroo_delta",
           "schema": {
             "@type": "Object",
             "fields": {
               "@context": [],
-              "name": "jogg_alpha",
-              "schema": "integer"
+              "name": "vroo_gamma",
+              "schema": "duration"
             }
           }
         }
@@ -32,14 +32,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_zeta;1",
+        "@id": "dtmi:example:vroo_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_epsilon;1",
+          "@id": "dtmi:example:vroo_eta;1",
           "@type": "Object",
           "fields": {
-            "name": "jogg_delta",
-            "schema": "long"
+            "name": "vroo_zeta",
+            "schema": "float"
           }
         }
       }
@@ -53,16 +53,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_iota;1",
+        "@id": "dtmi:example:vroo_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "jogg_theta",
+          "name": "vroo_kappa",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "jogg_eta",
-              "schema": "string"
+              "name": "vroo_iota",
+              "schema": "integer"
             }
           }
         }
@@ -77,14 +77,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_mu;1",
+        "@id": "dtmi:example:vroo_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_lambda;1",
+          "@id": "dtmi:example:vroo_nu;1",
           "@type": "Object",
           "fields": {
-            "name": "jogg_kappa",
-            "schema": "time"
+            "name": "vroo_mu",
+            "schema": "long"
           }
         }
       }
@@ -98,14 +98,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_omicron;1",
+        "@id": "dtmi:example:vroo_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_xi;1",
+          "@id": "dtmi:example:vroo_pi;1",
           "@type": "Object",
           "fields": {
-            "name": "jogg_nu",
-            "schema": "boolean"
+            "name": "vroo_omicron",
+            "schema": "string"
           }
         }
       }
@@ -119,14 +119,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_sigma;1",
+        "@id": "dtmi:example:vroo_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_rho;1",
+          "@id": "dtmi:example:vroo_tau;1",
           "@type": "Object",
           "fields": {
-            "name": "jogg_pi",
-            "schema": "date"
+            "name": "vroo_sigma",
+            "schema": "time"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassFieldPropertyCommentDtmiV2.json b/DTDL/v2/spec/Allowance-ClassFieldPropertyCommentDtmiV2.json
index 8531647c..8d9f59a8 100644
--- a/DTDL/v2/spec/Allowance-ClassFieldPropertyCommentDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassFieldPropertyCommentDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_phi;1",
+        "@id": "dtmi:example:iota_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_upsilon;1",
+          "@id": "dtmi:example:iota_humpf;1",
           "@type": "Object",
           "fields": {
-            "dtmi:dtdl:property:comment;2": "epsilon_sigma",
-            "name": "epsilon_tau",
+            "dtmi:dtdl:property:comment;2": "iota_wum",
+            "name": "iota_um",
             "schema": "float"
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassFieldPropertyDescriptionDtmiV2.json b/DTDL/v2/spec/Allowance-ClassFieldPropertyDescriptionDtmiV2.json
index 14b436e5..b53895d7 100644
--- a/DTDL/v2/spec/Allowance-ClassFieldPropertyDescriptionDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassFieldPropertyDescriptionDtmiV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_jogg;1",
+        "@id": "dtmi:example:mu_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_zatz;1",
+          "@id": "dtmi:example:mu_beta;1",
           "@type": "Object",
           "fields": {
             "dtmi:dtdl:property:description;2": [
-              "eta_spazz"
+              "lambda_hi"
             ],
-            "name": "eta_floob",
+            "name": "mu_alpha",
             "schema": "long"
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassFieldPropertyDisplayNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassFieldPropertyDisplayNameDtmiV2.json
index 1c7b7227..5611b17c 100644
--- a/DTDL/v2/spec/Allowance-ClassFieldPropertyDisplayNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassFieldPropertyDisplayNameDtmiV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_mu;1",
+        "@id": "dtmi:example:xi_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_lambda;1",
+          "@id": "dtmi:example:xi_tau;1",
           "@type": "Object",
           "fields": {
             "dtmi:dtdl:property:displayName;2": [
-              "kappa_iota"
+              "xi_rho"
             ],
-            "name": "kappa_kappa",
+            "name": "xi_sigma",
             "schema": "time"
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassFieldPropertyInvalidDtmiV2.json b/DTDL/v2/spec/Allowance-ClassFieldPropertyInvalidDtmiV2.json
index 5c9b70dc..5d6bddfb 100644
--- a/DTDL/v2/spec/Allowance-ClassFieldPropertyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassFieldPropertyInvalidDtmiV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_psi;1",
+        "@id": "dtmi:example:omicron_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_chi;1",
+          "@id": "dtmi:example:omicron_glikk;1",
           "@type": "Object",
           "fields": {
             "@type": [
               "Field",
               "Foobar"
             ],
-            "name": "lambda_phi",
+            "name": "omicron_fuddle",
             "schema": "float",
             "dtmi:foo//bar": 626
           }
diff --git a/DTDL/v2/spec/Allowance-ClassFieldPropertyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Allowance-ClassFieldPropertyIrrelevantDtmiOrTermV2.json
index 410ae04f..7b85e179 100644
--- a/DTDL/v2/spec/Allowance-ClassFieldPropertyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassFieldPropertyIrrelevantDtmiOrTermV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_epsilon;1",
+        "@id": "dtmi:example:omicron_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_delta;1",
+          "@id": "dtmi:example:omicron_mu;1",
           "@type": "Object",
           "fields": {
             "@type": [
               "Field",
               "Foobar"
             ],
-            "name": "lambda_gamma",
+            "name": "omicron_lambda",
             "schema": "time",
             "dtmi:foo:bar;1": 626
           }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_theta;1",
+        "@id": "dtmi:example:omicron_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_eta;1",
+          "@id": "dtmi:example:omicron_omicron;1",
           "@type": "Object",
           "fields": {
             "@type": [
               "Field",
               "Foobar"
             ],
-            "name": "lambda_zeta",
+            "name": "omicron_xi",
             "schema": "boolean",
             "boolean": null
           }
diff --git a/DTDL/v2/spec/Allowance-ClassFieldPropertyNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassFieldPropertyNameDtmiV2.json
index ff5f167d..f66d7064 100644
--- a/DTDL/v2/spec/Allowance-ClassFieldPropertyNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassFieldPropertyNameDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_zeta;1",
+        "@id": "dtmi:example:thnad_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_epsilon;1",
+          "@id": "dtmi:example:thnad_vroo;1",
           "@type": "Object",
           "fields": {
-            "dtmi:dtdl:property:name;2": "nuh_delta",
-            "schema": "date"
+            "dtmi:dtdl:property:name;2": "thnad_yekk",
+            "schema": "time"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassFieldPropertyNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassFieldPropertyNotDtmiNorTermV2.json
index 1c40d113..57ee51ae 100644
--- a/DTDL/v2/spec/Allowance-ClassFieldPropertyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassFieldPropertyNotDtmiNorTermV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_snee;1",
+        "@id": "dtmi:example:omicron_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_nuh;1",
+          "@id": "dtmi:example:omicron_flunn;1",
           "@type": "Object",
           "fields": {
             "@type": [
               "Field",
               "Foobar"
             ],
-            "name": "lambda_glikk",
+            "name": "omicron_jogg",
             "schema": "string",
             "http://foo.com/bar": true
           }
diff --git a/DTDL/v2/spec/Allowance-ClassFieldPropertySchemaDtmiV2.json b/DTDL/v2/spec/Allowance-ClassFieldPropertySchemaDtmiV2.json
index 8f751e4c..5c7bf92e 100644
--- a/DTDL/v2/spec/Allowance-ClassFieldPropertySchemaDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassFieldPropertySchemaDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_nuh;1",
+        "@id": "dtmi:example:yekk_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_glikk;1",
+          "@id": "dtmi:example:yekk_snee;1",
           "@type": "Object",
           "fields": {
-            "name": "zatz_fuddle",
-            "dtmi:dtdl:property:schema;2": "time"
+            "name": "yekk_nuh",
+            "dtmi:dtdl:property:schema;2": "long"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassFieldPropertyUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassFieldPropertyUndefinedTermV2.json
index 3c67bffb..172f3726 100644
--- a/DTDL/v2/spec/Allowance-ClassFieldPropertyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassFieldPropertyUndefinedTermV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_yekk;1",
+        "@id": "dtmi:example:pi_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_itch;1",
+          "@id": "dtmi:example:pi_epsilon;1",
           "@type": "Object",
           "fields": {
             "@type": [
               "Field",
               "Foobar"
             ],
-            "name": "lambda_flunn",
+            "name": "pi_delta",
             "schema": "date",
             "foobar": {}
           }
diff --git a/DTDL/v2/spec/Allowance-ClassFieldTypeIncludesNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassFieldTypeIncludesNotDtmiNorTermV2.json
index be11e511..9999405b 100644
--- a/DTDL/v2/spec/Allowance-ClassFieldTypeIncludesNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassFieldTypeIncludesNotDtmiNorTermV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_flunn;1",
+        "@id": "dtmi:example:gamma_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_jogg;1",
+          "@id": "dtmi:example:gamma_gamma;1",
           "@type": "Object",
           "fields": {
             "@type": [
               "Field",
               "http://foo.com/bar"
             ],
-            "name": "yekk_zatz",
+            "name": "gamma_beta",
             "schema": "date"
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassFieldTypeIncludesUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassFieldTypeIncludesUndefinedTermV2.json
index 499b029b..666e101a 100644
--- a/DTDL/v2/spec/Allowance-ClassFieldTypeIncludesUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassFieldTypeIncludesUndefinedTermV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_vroo;1",
+        "@id": "dtmi:example:gamma_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_yekk;1",
+          "@id": "dtmi:example:gamma_zeta;1",
           "@type": "Object",
           "fields": {
             "@type": [
               "Field",
               "Foobar"
             ],
-            "name": "yekk_itch",
+            "name": "gamma_epsilon",
             "schema": "dateTime"
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassInterfaceOptionalPropertiesV2.json b/DTDL/v2/spec/Allowance-ClassInterfaceOptionalPropertiesV2.json
index 4e16aae1..2f2c271b 100644
--- a/DTDL/v2/spec/Allowance-ClassInterfaceOptionalPropertiesV2.json
+++ b/DTDL/v2/spec/Allowance-ClassInterfaceOptionalPropertiesV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_zeta;1",
+        "@id": "dtmi:example:rho_xi;1",
         "@type": "Interface",
         "extends": {
           "@context": [],
-          "@id": "dtmi:example:nu_epsilon;1",
+          "@id": "dtmi:example:rho_nu;1",
           "@type": "Interface"
         }
       }
@@ -25,7 +25,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_eta;1",
+        "@id": "dtmi:example:rho_omicron;1",
         "@type": "Interface"
       }
     ]
@@ -38,7 +38,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_theta;1",
+        "@id": "dtmi:example:rho_pi;1",
         "@type": "Interface"
       }
     ]
@@ -51,7 +51,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_iota;1",
+        "@id": "dtmi:example:rho_rho;1",
         "@type": "Interface"
       }
     ]
@@ -64,7 +64,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_kappa;1",
+        "@id": "dtmi:example:rho_sigma;1",
         "@type": "Interface"
       }
     ]
@@ -77,7 +77,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_lambda;1",
+        "@id": "dtmi:example:rho_tau;1",
         "@type": "Interface"
       }
     ]
@@ -90,7 +90,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_mu;1",
+        "@id": "dtmi:example:rho_upsilon;1",
         "@type": "Interface"
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassInterfacePropertyCommentDtmiV2.json b/DTDL/v2/spec/Allowance-ClassInterfacePropertyCommentDtmiV2.json
index 8975e4d6..45ef1e2e 100644
--- a/DTDL/v2/spec/Allowance-ClassInterfacePropertyCommentDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassInterfacePropertyCommentDtmiV2.json
@@ -7,9 +7,9 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_glikk;1",
+        "@id": "dtmi:example:sigma_vroo;1",
         "@type": "Interface",
-        "dtmi:dtdl:property:comment;2": "xi_nuh"
+        "dtmi:dtdl:property:comment;2": "sigma_hi"
       }
     ]
   }
diff --git a/DTDL/v2/spec/Allowance-ClassInterfacePropertyContentsDtmiV2.json b/DTDL/v2/spec/Allowance-ClassInterfacePropertyContentsDtmiV2.json
index de705334..4dbba2a9 100644
--- a/DTDL/v2/spec/Allowance-ClassInterfacePropertyContentsDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassInterfacePropertyContentsDtmiV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_wum;1",
+        "@id": "dtmi:example:delta_gamma;1",
         "@type": "Interface",
         "dtmi:dtdl:property:contents;2": [
           {
             "@type": "Command",
-            "name": "vroo_um"
+            "name": "delta_delta"
           }
         ]
       }
diff --git a/DTDL/v2/spec/Allowance-ClassInterfacePropertyDescriptionDtmiV2.json b/DTDL/v2/spec/Allowance-ClassInterfacePropertyDescriptionDtmiV2.json
index 616121d2..001a8ccf 100644
--- a/DTDL/v2/spec/Allowance-ClassInterfacePropertyDescriptionDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassInterfacePropertyDescriptionDtmiV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_chi;1",
+        "@id": "dtmi:example:delta_vroo;1",
         "@type": "Interface",
         "dtmi:dtdl:property:description;2": [
-          "hi_psi"
+          "delta_hi"
         ]
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassInterfacePropertyDisplayNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassInterfacePropertyDisplayNameDtmiV2.json
index bac23e9d..aa3ca020 100644
--- a/DTDL/v2/spec/Allowance-ClassInterfacePropertyDisplayNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassInterfacePropertyDisplayNameDtmiV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_sigma;1",
+        "@id": "dtmi:example:epsilon_jogg;1",
         "@type": "Interface",
         "dtmi:dtdl:property:displayName;2": [
-          "alpha_tau"
+          "epsilon_flunn"
         ]
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassInterfacePropertyExtendsDtmiV2.json b/DTDL/v2/spec/Allowance-ClassInterfacePropertyExtendsDtmiV2.json
index 10a513bd..4c5fa823 100644
--- a/DTDL/v2/spec/Allowance-ClassInterfacePropertyExtendsDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassInterfacePropertyExtendsDtmiV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_wum;1",
+        "@id": "dtmi:example:iota_iota;1",
         "@type": "Interface",
         "dtmi:dtdl:property:extends;2": [
           {
-            "@id": "dtmi:example:delta_um;1",
+            "@id": "dtmi:example:iota_kappa;1",
             "@type": "Interface"
           }
         ]
diff --git a/DTDL/v2/spec/Allowance-ClassInterfacePropertyInvalidDtmiV2.json b/DTDL/v2/spec/Allowance-ClassInterfacePropertyInvalidDtmiV2.json
index 66e863b2..fe4119f2 100644
--- a/DTDL/v2/spec/Allowance-ClassInterfacePropertyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassInterfacePropertyInvalidDtmiV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_quan;1",
+        "@id": "dtmi:example:mu_chi;1",
         "@type": [
           "Interface",
           "Foobar"
diff --git a/DTDL/v2/spec/Allowance-ClassInterfacePropertyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Allowance-ClassInterfacePropertyIrrelevantDtmiOrTermV2.json
index 49afd29b..e4522eba 100644
--- a/DTDL/v2/spec/Allowance-ClassInterfacePropertyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassInterfacePropertyIrrelevantDtmiOrTermV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_um;1",
+        "@id": "dtmi:example:mu_pi;1",
         "@type": [
           "Interface",
           "Foobar"
@@ -24,7 +24,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_humpf;1",
+        "@id": "dtmi:example:mu_rho;1",
         "@type": [
           "Interface",
           "Foobar"
diff --git a/DTDL/v2/spec/Allowance-ClassInterfacePropertyNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassInterfacePropertyNotDtmiNorTermV2.json
index 0506b0bd..b44709cb 100644
--- a/DTDL/v2/spec/Allowance-ClassInterfacePropertyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassInterfacePropertyNotDtmiNorTermV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_floob;1",
+        "@id": "dtmi:example:mu_yuzz;1",
         "@type": [
           "Interface",
           "Foobar"
diff --git a/DTDL/v2/spec/Allowance-ClassInterfacePropertySchemasDtmiV2.json b/DTDL/v2/spec/Allowance-ClassInterfacePropertySchemasDtmiV2.json
index f15e334f..e5890ccf 100644
--- a/DTDL/v2/spec/Allowance-ClassInterfacePropertySchemasDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassInterfacePropertySchemasDtmiV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_kappa;1",
+        "@id": "dtmi:example:lambda_vroo;1",
         "@type": "Interface",
         "dtmi:dtdl:property:schemas;2": [
           {
-            "@id": "dtmi:example:eta_lambda;1",
+            "@id": "dtmi:example:lambda_hi;1",
             "@type": "Array",
-            "elementSchema": "dateTime"
+            "elementSchema": "duration"
           }
         ]
       }
diff --git a/DTDL/v2/spec/Allowance-ClassInterfacePropertyUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassInterfacePropertyUndefinedTermV2.json
index cdd2ff2c..84b8ea1e 100644
--- a/DTDL/v2/spec/Allowance-ClassInterfacePropertyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassInterfacePropertyUndefinedTermV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_flunn;1",
+        "@id": "dtmi:example:mu_humpf;1",
         "@type": [
           "Interface",
           "Foobar"
diff --git a/DTDL/v2/spec/Allowance-ClassInterfaceTypeIncludesNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassInterfaceTypeIncludesNotDtmiNorTermV2.json
index dbb9b04b..2216b5c7 100644
--- a/DTDL/v2/spec/Allowance-ClassInterfaceTypeIncludesNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassInterfaceTypeIncludesNotDtmiNorTermV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_alpha;1",
+        "@id": "dtmi:example:rho_iota;1",
         "@type": [
           "Interface",
           "http://foo.com/bar"
diff --git a/DTDL/v2/spec/Allowance-ClassInterfaceTypeIncludesUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassInterfaceTypeIncludesUndefinedTermV2.json
index 598ffc5e..f045a618 100644
--- a/DTDL/v2/spec/Allowance-ClassInterfaceTypeIncludesUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassInterfaceTypeIncludesUndefinedTermV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_beta;1",
+        "@id": "dtmi:example:rho_kappa;1",
         "@type": [
           "Interface",
           "Foobar"
diff --git a/DTDL/v2/spec/Allowance-ClassMapKeyOptionalPropertiesV2.json b/DTDL/v2/spec/Allowance-ClassMapKeyOptionalPropertiesV2.json
index 23c25ade..f775ad72 100644
--- a/DTDL/v2/spec/Allowance-ClassMapKeyOptionalPropertiesV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapKeyOptionalPropertiesV2.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_yuzz;1",
+        "@id": "dtmi:example:pi_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "lambda_omega",
+          "name": "pi_yekk",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "lambda_psi",
-              "schema": "integer"
+              "name": "pi_itch",
+              "schema": "duration"
             },
             "mapKey": {
               "@context": [],
-              "name": "lambda_chi",
+              "name": "pi_flunn",
               "schema": "string"
             }
           }
@@ -36,17 +36,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_fuddle;1",
+        "@id": "dtmi:example:rho_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_um;1",
+          "@id": "dtmi:example:rho_alpha;1",
           "@type": "Map",
           "mapValue": {
-            "name": "lambda_humpf",
-            "schema": "long"
+            "name": "rho_beta",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "lambda_wum",
+            "name": "pi_hi",
             "schema": "string"
           }
         }
@@ -61,19 +61,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_quan;1",
+        "@id": "dtmi:example:rho_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "lambda_snee",
+          "name": "rho_zeta",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "lambda_nuh",
-              "schema": "string"
+              "name": "rho_epsilon",
+              "schema": "integer"
             },
             "mapKey": {
-              "name": "lambda_glikk",
+              "name": "rho_delta",
               "schema": "string"
             }
           }
@@ -89,17 +89,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_zatz;1",
+        "@id": "dtmi:example:rho_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_spazz;1",
+          "@id": "dtmi:example:rho_iota;1",
           "@type": "Map",
           "mapValue": {
-            "name": "lambda_floob",
-            "schema": "time"
+            "name": "rho_kappa",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "lambda_thnad",
+            "name": "rho_theta",
             "schema": "string"
           }
         }
@@ -114,17 +114,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_yekk;1",
+        "@id": "dtmi:example:rho_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_flunn;1",
+          "@id": "dtmi:example:rho_nu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "lambda_itch",
-            "schema": "boolean"
+            "name": "rho_xi",
+            "schema": "string"
           },
           "mapKey": {
-            "name": "lambda_jogg",
+            "name": "rho_mu",
             "schema": "string"
           }
         }
@@ -139,17 +139,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_beta;1",
+        "@id": "dtmi:example:rho_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_hi;1",
+          "@id": "dtmi:example:rho_rho;1",
           "@type": "Map",
           "mapValue": {
-            "name": "mu_alpha",
-            "schema": "date"
+            "name": "rho_sigma",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "lambda_vroo",
+            "name": "rho_pi",
             "schema": "string"
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassMapKeyPropertyCommentDtmiV2.json b/DTDL/v2/spec/Allowance-ClassMapKeyPropertyCommentDtmiV2.json
index 948fa7a6..cfd7eafe 100644
--- a/DTDL/v2/spec/Allowance-ClassMapKeyPropertyCommentDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapKeyPropertyCommentDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_upsilon;1",
+        "@id": "dtmi:example:nuh_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_sigma;1",
+          "@id": "dtmi:example:glikk_hi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_tau",
+            "name": "nuh_alpha",
             "schema": "float"
           },
           "mapKey": {
-            "dtmi:dtdl:property:comment;2": "yuzz_pi",
-            "name": "yuzz_rho",
+            "dtmi:dtdl:property:comment;2": "glikk_yekk",
+            "name": "glikk_vroo",
             "schema": "string"
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassMapKeyPropertyDescriptionDtmiV2.json b/DTDL/v2/spec/Allowance-ClassMapKeyPropertyDescriptionDtmiV2.json
index 128698a3..8f5b5a72 100644
--- a/DTDL/v2/spec/Allowance-ClassMapKeyPropertyDescriptionDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapKeyPropertyDescriptionDtmiV2.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_wum;1",
+        "@id": "dtmi:example:thnad_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_omega;1",
+          "@id": "dtmi:example:thnad_zeta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "humpf_yuzz",
+            "name": "thnad_eta",
             "schema": "long"
           },
           "mapKey": {
             "dtmi:dtdl:property:description;2": [
-              "humpf_chi"
+              "thnad_delta"
             ],
-            "name": "humpf_psi",
+            "name": "thnad_epsilon",
             "schema": "string"
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassMapKeyPropertyDisplayNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassMapKeyPropertyDisplayNameDtmiV2.json
index 0c2ca3f1..a3f2a303 100644
--- a/DTDL/v2/spec/Allowance-ClassMapKeyPropertyDisplayNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapKeyPropertyDisplayNameDtmiV2.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_snee;1",
+        "@id": "dtmi:example:zatz_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_glikk;1",
+          "@id": "dtmi:example:zatz_mu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nuh_nuh",
+            "name": "zatz_nu",
             "schema": "time"
           },
           "mapKey": {
             "dtmi:dtdl:property:displayName;2": [
-              "nuh_humpf"
+              "zatz_kappa"
             ],
-            "name": "nuh_fuddle",
+            "name": "zatz_lambda",
             "schema": "string"
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassMapKeyPropertyInvalidDtmiV2.json b/DTDL/v2/spec/Allowance-ClassMapKeyPropertyInvalidDtmiV2.json
index 4682f3fc..d36a2677 100644
--- a/DTDL/v2/spec/Allowance-ClassMapKeyPropertyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapKeyPropertyInvalidDtmiV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_pi;1",
+        "@id": "dtmi:example:jogg_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_xi;1",
+          "@id": "dtmi:example:jogg_flunn;1",
           "@type": "Map",
           "mapValue": {
-            "name": "quan_omicron",
+            "name": "jogg_itch",
             "schema": "float"
           },
           "mapKey": {
@@ -21,7 +21,7 @@
               "MapKey",
               "Foobar"
             ],
-            "name": "quan_nu",
+            "name": "jogg_jogg",
             "schema": "string",
             "dtmi:foo//bar": 626
           }
diff --git a/DTDL/v2/spec/Allowance-ClassMapKeyPropertyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Allowance-ClassMapKeyPropertyIrrelevantDtmiOrTermV2.json
index f2092610..9074e27f 100644
--- a/DTDL/v2/spec/Allowance-ClassMapKeyPropertyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapKeyPropertyIrrelevantDtmiOrTermV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_spazz;1",
+        "@id": "dtmi:example:jogg_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_quan;1",
+          "@id": "dtmi:example:jogg_omicron;1",
           "@type": "Map",
           "mapValue": {
-            "name": "snee_thnad",
+            "name": "jogg_pi",
             "schema": "time"
           },
           "mapKey": {
@@ -21,7 +21,7 @@
               "MapKey",
               "Foobar"
             ],
-            "name": "snee_snee",
+            "name": "jogg_xi",
             "schema": "string",
             "dtmi:foo:bar;1": 626
           }
@@ -37,13 +37,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_flunn;1",
+        "@id": "dtmi:example:jogg_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_zatz;1",
+          "@id": "dtmi:example:jogg_tau;1",
           "@type": "Map",
           "mapValue": {
-            "name": "snee_jogg",
+            "name": "jogg_upsilon",
             "schema": "boolean"
           },
           "mapKey": {
@@ -51,7 +51,7 @@
               "MapKey",
               "Foobar"
             ],
-            "name": "snee_floob",
+            "name": "jogg_sigma",
             "schema": "string",
             "boolean": null
           }
diff --git a/DTDL/v2/spec/Allowance-ClassMapKeyPropertyNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassMapKeyPropertyNameDtmiV2.json
index b7f88079..dbed5406 100644
--- a/DTDL/v2/spec/Allowance-ClassMapKeyPropertyNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapKeyPropertyNameDtmiV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_epsilon;1",
+        "@id": "dtmi:example:zeta_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_gamma;1",
+          "@id": "dtmi:example:zeta_upsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "alpha_delta",
-            "schema": "duration"
+            "name": "zeta_phi",
+            "schema": "dateTime"
           },
           "mapKey": {
-            "dtmi:dtdl:property:name;2": "alpha_beta",
+            "dtmi:dtdl:property:name;2": "zeta_tau",
             "schema": "string"
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassMapKeyPropertyNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassMapKeyPropertyNotDtmiNorTermV2.json
index 9239a1e6..016952ae 100644
--- a/DTDL/v2/spec/Allowance-ClassMapKeyPropertyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapKeyPropertyNotDtmiNorTermV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_humpf;1",
+        "@id": "dtmi:example:flunn_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_wum;1",
+          "@id": "dtmi:example:flunn_theta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "quan_um",
+            "name": "flunn_iota",
             "schema": "string"
           },
           "mapKey": {
@@ -21,7 +21,7 @@
               "MapKey",
               "Foobar"
             ],
-            "name": "quan_yuzz",
+            "name": "flunn_eta",
             "schema": "string",
             "http://foo.com/bar": true
           }
diff --git a/DTDL/v2/spec/Allowance-ClassMapKeyPropertySchemaDtmiV2.json b/DTDL/v2/spec/Allowance-ClassMapKeyPropertySchemaDtmiV2.json
index 16756143..4358b388 100644
--- a/DTDL/v2/spec/Allowance-ClassMapKeyPropertySchemaDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapKeyPropertySchemaDtmiV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_epsilon;1",
+        "@id": "dtmi:example:pi_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_gamma;1",
+          "@id": "dtmi:example:pi_upsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "lambda_delta",
-            "schema": "date"
+            "name": "pi_phi",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "lambda_beta",
+            "name": "pi_tau",
             "dtmi:dtdl:property:schema;2": "string"
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassMapKeyPropertyUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassMapKeyPropertyUndefinedTermV2.json
index 10af719a..76120356 100644
--- a/DTDL/v2/spec/Allowance-ClassMapKeyPropertyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapKeyPropertyUndefinedTermV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_itch;1",
+        "@id": "dtmi:example:flunn_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_jogg;1",
+          "@id": "dtmi:example:flunn_upsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "quan_flunn",
+            "name": "flunn_phi",
             "schema": "date"
           },
           "mapKey": {
@@ -21,7 +21,7 @@
               "MapKey",
               "Foobar"
             ],
-            "name": "quan_zatz",
+            "name": "flunn_tau",
             "schema": "string",
             "foobar": {}
           }
diff --git a/DTDL/v2/spec/Allowance-ClassMapKeyTypeIncludesNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassMapKeyTypeIncludesNotDtmiNorTermV2.json
index 937b8c5e..a0bba9bf 100644
--- a/DTDL/v2/spec/Allowance-ClassMapKeyTypeIncludesNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapKeyTypeIncludesNotDtmiNorTermV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_glikk;1",
+        "@id": "dtmi:example:chi_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_humpf;1",
+          "@id": "dtmi:example:chi_kappa;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_fuddle",
+            "name": "chi_lambda",
             "schema": "date"
           },
           "mapKey": {
@@ -21,7 +21,7 @@
               "MapKey",
               "http://foo.com/bar"
             ],
-            "name": "pi_um",
+            "name": "chi_iota",
             "schema": "string"
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassMapKeyTypeIncludesUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassMapKeyTypeIncludesUndefinedTermV2.json
index fd4df1cf..9cbb8305 100644
--- a/DTDL/v2/spec/Allowance-ClassMapKeyTypeIncludesUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapKeyTypeIncludesUndefinedTermV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_thnad;1",
+        "@id": "dtmi:example:chi_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_snee;1",
+          "@id": "dtmi:example:chi_xi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_quan",
+            "name": "chi_omicron",
             "schema": "dateTime"
           },
           "mapKey": {
@@ -21,7 +21,7 @@
               "MapKey",
               "Foobar"
             ],
-            "name": "pi_nuh",
+            "name": "chi_nu",
             "schema": "string"
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassMapOptionalPropertiesV2.json b/DTDL/v2/spec/Allowance-ClassMapOptionalPropertiesV2.json
index 22d1348d..1974c0a5 100644
--- a/DTDL/v2/spec/Allowance-ClassMapOptionalPropertiesV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapOptionalPropertiesV2.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_sigma;1",
+        "@id": "dtmi:example:um_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "chi_rho",
+          "name": "um_wum",
           "schema": {
             "@context": [],
             "@type": "Map",
             "mapKey": {
-              "name": "chi_omicron",
+              "name": "um_omega",
               "schema": "string"
             },
             "mapValue": {
-              "name": "chi_pi",
-              "schema": "integer"
+              "name": "um_yuzz",
+              "schema": "dateTime"
             }
           }
         }
@@ -36,20 +36,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_chi;1",
+        "@id": "dtmi:example:um_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "chi_phi",
+          "name": "um_glikk",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "chi_tau",
+              "name": "um_humpf",
               "schema": "string"
             },
             "mapValue": {
-              "name": "chi_upsilon",
-              "schema": "long"
+              "name": "um_fuddle",
+              "schema": "double"
             }
           }
         }
@@ -64,18 +64,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_wum;1",
+        "@id": "dtmi:example:um_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_psi;1",
+          "@id": "dtmi:example:um_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_omega",
+            "name": "um_quan",
             "schema": "string"
           },
           "mapValue": {
-            "name": "chi_yuzz",
-            "schema": "string"
+            "name": "um_thnad",
+            "schema": "duration"
           }
         }
       }
@@ -89,18 +89,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_glikk;1",
+        "@id": "dtmi:example:um_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_um;1",
+          "@id": "dtmi:example:um_floob;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_humpf",
+            "name": "um_zatz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "chi_fuddle",
-            "schema": "time"
+            "name": "um_jogg",
+            "schema": "float"
           }
         }
       }
@@ -114,18 +114,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_thnad;1",
+        "@id": "dtmi:example:um_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_nuh;1",
+          "@id": "dtmi:example:um_itch;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_snee",
+            "name": "um_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "chi_quan",
-            "schema": "boolean"
+            "name": "um_vroo",
+            "schema": "integer"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassMapPropertyCommentDtmiV2.json b/DTDL/v2/spec/Allowance-ClassMapPropertyCommentDtmiV2.json
index 8468e380..969a5641 100644
--- a/DTDL/v2/spec/Allowance-ClassMapPropertyCommentDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapPropertyCommentDtmiV2.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_omega;1",
+        "@id": "dtmi:example:floob_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_upsilon;1",
+          "@id": "dtmi:example:floob_zatz;1",
           "@type": "Map",
-          "dtmi:dtdl:property:comment;2": "nuh_phi",
+          "dtmi:dtdl:property:comment;2": "floob_jogg",
           "mapKey": {
-            "name": "nuh_chi",
+            "name": "floob_flunn",
             "schema": "string"
           },
           "mapValue": {
-            "name": "nuh_psi",
-            "schema": "date"
+            "name": "floob_itch",
+            "schema": "time"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassMapPropertyDescriptionDtmiV2.json b/DTDL/v2/spec/Allowance-ClassMapPropertyDescriptionDtmiV2.json
index 34bdd491..1fc9de66 100644
--- a/DTDL/v2/spec/Allowance-ClassMapPropertyDescriptionDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapPropertyDescriptionDtmiV2.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_glikk;1",
+        "@id": "dtmi:example:itch_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_wum;1",
+          "@id": "dtmi:example:flunn_hi;1",
           "@type": "Map",
           "dtmi:dtdl:property:description;2": [
-            "thnad_um"
+            "itch_alpha"
           ],
           "mapKey": {
-            "name": "thnad_humpf",
+            "name": "itch_beta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "thnad_fuddle",
-            "schema": "double"
+            "name": "itch_gamma",
+            "schema": "date"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassMapPropertyDisplayNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassMapPropertyDisplayNameDtmiV2.json
index 4fb5416a..f7a67508 100644
--- a/DTDL/v2/spec/Allowance-ClassMapPropertyDisplayNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapPropertyDisplayNameDtmiV2.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_floob;1",
+        "@id": "dtmi:example:hi_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_snee;1",
+          "@id": "dtmi:example:hi_zeta;1",
           "@type": "Map",
           "dtmi:dtdl:property:displayName;2": [
-            "zatz_quan"
+            "hi_eta"
           ],
           "mapKey": {
-            "name": "zatz_thnad",
+            "name": "hi_theta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_spazz",
-            "schema": "float"
+            "name": "hi_iota",
+            "schema": "double"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassMapPropertyInvalidDtmiV2.json b/DTDL/v2/spec/Allowance-ClassMapPropertyInvalidDtmiV2.json
index 1fcb8060..91de1f28 100644
--- a/DTDL/v2/spec/Allowance-ClassMapPropertyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapPropertyInvalidDtmiV2.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_upsilon;1",
+        "@id": "dtmi:example:alpha_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_rho;1",
+          "@id": "dtmi:example:alpha_thnad;1",
           "@type": [
             "Map",
             "Foobar"
           ],
           "mapKey": {
-            "name": "flunn_sigma",
+            "name": "alpha_spazz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_tau",
-            "schema": "date"
+            "name": "alpha_floob",
+            "schema": "time"
           },
           "dtmi:foo//bar": 626
         }
diff --git a/DTDL/v2/spec/Allowance-ClassMapPropertyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Allowance-ClassMapPropertyIrrelevantDtmiOrTermV2.json
index e6aba503..4033a23f 100644
--- a/DTDL/v2/spec/Allowance-ClassMapPropertyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapPropertyIrrelevantDtmiOrTermV2.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_flunn;1",
+        "@id": "dtmi:example:alpha_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_floob;1",
+          "@id": "dtmi:example:alpha_kappa;1",
           "@type": [
             "Map",
             "Foobar"
           ],
           "mapKey": {
-            "name": "jogg_zatz",
+            "name": "alpha_lambda",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_jogg",
-            "schema": "float"
+            "name": "alpha_mu",
+            "schema": "double"
           },
           "dtmi:foo:bar;1": 626
         }
@@ -36,21 +36,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_hi;1",
+        "@id": "dtmi:example:alpha_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_itch;1",
+          "@id": "dtmi:example:alpha_xi;1",
           "@type": [
             "Map",
             "Foobar"
           ],
           "mapKey": {
-            "name": "jogg_yekk",
+            "name": "alpha_omicron",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_vroo",
-            "schema": "integer"
+            "name": "alpha_pi",
+            "schema": "duration"
           },
           "boolean": null
         }
diff --git a/DTDL/v2/spec/Allowance-ClassMapPropertyMapKeyDtmiV2.json b/DTDL/v2/spec/Allowance-ClassMapPropertyMapKeyDtmiV2.json
index 35cfc6dd..1f9cfcbd 100644
--- a/DTDL/v2/spec/Allowance-ClassMapPropertyMapKeyDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapPropertyMapKeyDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_fuddle;1",
+        "@id": "dtmi:example:phi_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_wum;1",
+          "@id": "dtmi:example:phi_yuzz;1",
           "@type": "Map",
           "dtmi:dtdl:property:mapKey;2": {
-            "name": "pi_um",
+            "name": "phi_wum",
             "schema": "string"
           },
           "mapValue": {
-            "name": "pi_humpf",
-            "schema": "time"
+            "name": "phi_um",
+            "schema": "double"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassMapPropertyMapValueDtmiV2.json b/DTDL/v2/spec/Allowance-ClassMapPropertyMapValueDtmiV2.json
index a54ac5fe..7c943cfd 100644
--- a/DTDL/v2/spec/Allowance-ClassMapPropertyMapValueDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapPropertyMapValueDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_flunn;1",
+        "@id": "dtmi:example:um_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_floob;1",
+          "@id": "dtmi:example:um_beta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_zatz",
+            "name": "um_gamma",
             "schema": "string"
           },
           "dtmi:dtdl:property:mapValue;2": {
-            "name": "phi_jogg",
-            "schema": "time"
+            "name": "um_delta",
+            "schema": "float"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassMapPropertyNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassMapPropertyNotDtmiNorTermV2.json
index bd28d929..dbcc7af7 100644
--- a/DTDL/v2/spec/Allowance-ClassMapPropertyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapPropertyNotDtmiNorTermV2.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_snee;1",
+        "@id": "dtmi:example:beta_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_fuddle;1",
+          "@id": "dtmi:example:beta_gamma;1",
           "@type": [
             "Map",
             "Foobar"
           ],
           "mapKey": {
-            "name": "flunn_glikk",
+            "name": "beta_delta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_nuh",
-            "schema": "duration"
+            "name": "beta_epsilon",
+            "schema": "dateTime"
           },
           "http://foo.com/bar": true
         }
diff --git a/DTDL/v2/spec/Allowance-ClassMapPropertyUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassMapPropertyUndefinedTermV2.json
index d6c959b7..5c7e0d3a 100644
--- a/DTDL/v2/spec/Allowance-ClassMapPropertyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapPropertyUndefinedTermV2.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_alpha;1",
+        "@id": "dtmi:example:beta_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_yekk;1",
+          "@id": "dtmi:example:beta_omicron;1",
           "@type": [
             "Map",
             "Foobar"
           ],
           "mapKey": {
-            "name": "flunn_vroo",
+            "name": "beta_pi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_hi",
-            "schema": "long"
+            "name": "beta_rho",
+            "schema": "float"
           },
           "foobar": {}
         }
diff --git a/DTDL/v2/spec/Allowance-ClassMapTypeIncludesNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassMapTypeIncludesNotDtmiNorTermV2.json
index 70dc4e21..00a71878 100644
--- a/DTDL/v2/spec/Allowance-ClassMapTypeIncludesNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapTypeIncludesNotDtmiNorTermV2.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_quan;1",
+        "@id": "dtmi:example:pi_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_glikk;1",
+          "@id": "dtmi:example:pi_tau;1",
           "@type": [
             "Map",
             "http://foo.com/bar"
           ],
           "mapKey": {
-            "name": "lambda_nuh",
+            "name": "pi_upsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "lambda_snee",
-            "schema": "string"
+            "name": "pi_phi",
+            "schema": "boolean"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassMapTypeIncludesUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassMapTypeIncludesUndefinedTermV2.json
index 6b99537d..7eb6d44c 100644
--- a/DTDL/v2/spec/Allowance-ClassMapTypeIncludesUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapTypeIncludesUndefinedTermV2.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_zatz;1",
+        "@id": "dtmi:example:pi_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_thnad;1",
+          "@id": "dtmi:example:pi_psi;1",
           "@type": [
             "Map",
             "Foobar"
           ],
           "mapKey": {
-            "name": "lambda_spazz",
+            "name": "pi_omega",
             "schema": "string"
           },
           "mapValue": {
-            "name": "lambda_floob",
-            "schema": "time"
+            "name": "pi_yuzz",
+            "schema": "date"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassMapValueOptionalPropertiesV2.json b/DTDL/v2/spec/Allowance-ClassMapValueOptionalPropertiesV2.json
index 97847151..02f6f27f 100644
--- a/DTDL/v2/spec/Allowance-ClassMapValueOptionalPropertiesV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapValueOptionalPropertiesV2.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_quan;1",
+        "@id": "dtmi:example:iota_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "gamma_snee",
+          "name": "iota_omega",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "gamma_nuh",
+              "name": "iota_psi",
               "schema": "string"
             },
             "mapValue": {
               "@context": [],
-              "name": "gamma_glikk",
+              "name": "iota_chi",
               "schema": "date"
             }
           }
@@ -36,17 +36,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_zatz;1",
+        "@id": "dtmi:example:iota_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_spazz;1",
+          "@id": "dtmi:example:iota_um;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_floob",
+            "name": "iota_humpf",
             "schema": "string"
           },
           "mapValue": {
-            "name": "gamma_thnad",
+            "name": "iota_wum",
             "schema": "dateTime"
           }
         }
@@ -61,19 +61,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_yekk;1",
+        "@id": "dtmi:example:iota_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "gamma_itch",
+          "name": "iota_snee",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "gamma_flunn",
+              "name": "iota_nuh",
               "schema": "string"
             },
             "mapValue": {
-              "name": "gamma_jogg",
+              "name": "iota_glikk",
               "schema": "double"
             }
           }
@@ -89,17 +89,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_beta;1",
+        "@id": "dtmi:example:iota_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_hi;1",
+          "@id": "dtmi:example:iota_spazz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_alpha",
+            "name": "iota_floob",
             "schema": "string"
           },
           "mapValue": {
-            "name": "gamma_vroo",
+            "name": "iota_thnad",
             "schema": "duration"
           }
         }
@@ -114,17 +114,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_zeta;1",
+        "@id": "dtmi:example:iota_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_delta;1",
+          "@id": "dtmi:example:iota_flunn;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_epsilon",
+            "name": "iota_itch",
             "schema": "string"
           },
           "mapValue": {
-            "name": "delta_gamma",
+            "name": "iota_jogg",
             "schema": "float"
           }
         }
@@ -139,17 +139,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_kappa;1",
+        "@id": "dtmi:example:kappa_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_theta;1",
+          "@id": "dtmi:example:iota_hi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_iota",
+            "name": "kappa_alpha",
             "schema": "string"
           },
           "mapValue": {
-            "name": "delta_eta",
+            "name": "iota_vroo",
             "schema": "integer"
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassMapValuePropertyCommentDtmiV2.json b/DTDL/v2/spec/Allowance-ClassMapValuePropertyCommentDtmiV2.json
index b3f8710f..b66cbc47 100644
--- a/DTDL/v2/spec/Allowance-ClassMapValuePropertyCommentDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapValuePropertyCommentDtmiV2.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_humpf;1",
+        "@id": "dtmi:example:psi_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_wum;1",
+          "@id": "dtmi:example:psi_wum;1",
           "@type": "Map",
           "mapKey": {
-            "name": "rho_um",
+            "name": "psi_um",
             "schema": "string"
           },
           "mapValue": {
-            "dtmi:dtdl:property:comment;2": "rho_omega",
-            "name": "rho_yuzz",
-            "schema": "boolean"
+            "dtmi:dtdl:property:comment;2": "psi_omega",
+            "name": "psi_yuzz",
+            "schema": "dateTime"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassMapValuePropertyDescriptionDtmiV2.json b/DTDL/v2/spec/Allowance-ClassMapValuePropertyDescriptionDtmiV2.json
index a9292029..dccb23f2 100644
--- a/DTDL/v2/spec/Allowance-ClassMapValuePropertyDescriptionDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapValuePropertyDescriptionDtmiV2.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_thnad;1",
+        "@id": "dtmi:example:wum_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_snee;1",
+          "@id": "dtmi:example:wum_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_quan",
+            "name": "wum_quan",
             "schema": "string"
           },
           "mapValue": {
             "dtmi:dtdl:property:description;2": [
-              "upsilon_glikk"
+              "wum_glikk"
             ],
-            "name": "upsilon_nuh",
-            "schema": "dateTime"
+            "name": "wum_nuh",
+            "schema": "duration"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassMapValuePropertyDisplayNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassMapValuePropertyDisplayNameDtmiV2.json
index 39d25e27..60b9f5d5 100644
--- a/DTDL/v2/spec/Allowance-ClassMapValuePropertyDisplayNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapValuePropertyDisplayNameDtmiV2.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_itch;1",
+        "@id": "dtmi:example:fuddle_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_jogg;1",
+          "@id": "dtmi:example:fuddle_jogg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "psi_flunn",
+            "name": "fuddle_flunn",
             "schema": "string"
           },
           "mapValue": {
             "dtmi:dtdl:property:displayName;2": [
-              "psi_floob"
+              "fuddle_floob"
             ],
-            "name": "psi_zatz",
-            "schema": "duration"
+            "name": "fuddle_zatz",
+            "schema": "integer"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassMapValuePropertyInvalidDtmiV2.json b/DTDL/v2/spec/Allowance-ClassMapValuePropertyInvalidDtmiV2.json
index d0d56a14..bcc037b8 100644
--- a/DTDL/v2/spec/Allowance-ClassMapValuePropertyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapValuePropertyInvalidDtmiV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_omega;1",
+        "@id": "dtmi:example:nuh_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_chi;1",
+          "@id": "dtmi:example:nuh_chi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_psi",
+            "name": "nuh_psi",
             "schema": "string"
           },
           "mapValue": {
@@ -21,8 +21,8 @@
               "MapValue",
               "Foobar"
             ],
-            "name": "yuzz_phi",
-            "schema": "boolean",
+            "name": "nuh_phi",
+            "schema": "dateTime",
             "dtmi:foo//bar": 626
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassMapValuePropertyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Allowance-ClassMapValuePropertyIrrelevantDtmiOrTermV2.json
index 3c889e01..7f5b3762 100644
--- a/DTDL/v2/spec/Allowance-ClassMapValuePropertyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapValuePropertyIrrelevantDtmiOrTermV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_hi;1",
+        "@id": "dtmi:example:glikk_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_yekk;1",
+          "@id": "dtmi:example:glikk_yekk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_vroo",
+            "name": "glikk_vroo",
             "schema": "string"
           },
           "mapValue": {
@@ -21,8 +21,8 @@
               "MapValue",
               "Foobar"
             ],
-            "name": "omega_itch",
-            "schema": "duration",
+            "name": "glikk_itch",
+            "schema": "integer",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -37,13 +37,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_delta;1",
+        "@id": "dtmi:example:nuh_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_beta;1",
+          "@id": "dtmi:example:nuh_beta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_gamma",
+            "name": "nuh_gamma",
             "schema": "string"
           },
           "mapValue": {
@@ -51,8 +51,8 @@
               "MapValue",
               "Foobar"
             ],
-            "name": "yuzz_alpha",
-            "schema": "float",
+            "name": "nuh_alpha",
+            "schema": "long",
             "boolean": null
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassMapValuePropertyNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassMapValuePropertyNameDtmiV2.json
index 094b55fb..1eee44b0 100644
--- a/DTDL/v2/spec/Allowance-ClassMapValuePropertyNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapValuePropertyNameDtmiV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_alpha;1",
+        "@id": "dtmi:example:hi_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_vroo;1",
+          "@id": "dtmi:example:hi_omega;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_hi",
+            "name": "hi_yuzz",
             "schema": "string"
           },
           "mapValue": {
-            "dtmi:dtdl:property:name;2": "zatz_yekk",
+            "dtmi:dtdl:property:name;2": "hi_psi",
             "schema": "integer"
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassMapValuePropertyNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassMapValuePropertyNotDtmiNorTermV2.json
index 7aa26192..5f90e53c 100644
--- a/DTDL/v2/spec/Allowance-ClassMapValuePropertyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapValuePropertyNotDtmiNorTermV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_floob;1",
+        "@id": "dtmi:example:nuh_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_thnad;1",
+          "@id": "dtmi:example:nuh_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_spazz",
+            "name": "nuh_spazz",
             "schema": "string"
           },
           "mapValue": {
@@ -21,8 +21,8 @@
               "MapValue",
               "Foobar"
             ],
-            "name": "yuzz_quan",
-            "schema": "double",
+            "name": "nuh_quan",
+            "schema": "float",
             "http://foo.com/bar": true
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassMapValuePropertySchemaDtmiV2.json b/DTDL/v2/spec/Allowance-ClassMapValuePropertySchemaDtmiV2.json
index 40b22e0b..37512658 100644
--- a/DTDL/v2/spec/Allowance-ClassMapValuePropertySchemaDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapValuePropertySchemaDtmiV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_nu;1",
+        "@id": "dtmi:example:iota_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_lambda;1",
+          "@id": "dtmi:example:iota_gamma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_mu",
+            "name": "iota_delta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "gamma_kappa",
+            "name": "iota_beta",
             "dtmi:dtdl:property:schema;2": "duration"
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassMapValuePropertyUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassMapValuePropertyUndefinedTermV2.json
index 39ff7bd6..7f379ef9 100644
--- a/DTDL/v2/spec/Allowance-ClassMapValuePropertyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapValuePropertyUndefinedTermV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_epsilon;1",
+        "@id": "dtmi:example:snee_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_gamma;1",
+          "@id": "dtmi:example:snee_gamma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_delta",
+            "name": "snee_delta",
             "schema": "string"
           },
           "mapValue": {
@@ -21,8 +21,8 @@
               "MapValue",
               "Foobar"
             ],
-            "name": "wum_beta",
-            "schema": "integer",
+            "name": "snee_beta",
+            "schema": "string",
             "foobar": {}
           }
         }
diff --git a/DTDL/v2/spec/Allowance-ClassMapValueTypeIncludesNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassMapValueTypeIncludesNotDtmiNorTermV2.json
index 9a964c0b..bc18050b 100644
--- a/DTDL/v2/spec/Allowance-ClassMapValueTypeIncludesNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapValueTypeIncludesNotDtmiNorTermV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_jogg;1",
+        "@id": "dtmi:example:xi_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_floob;1",
+          "@id": "dtmi:example:xi_floob;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_zatz",
+            "name": "xi_zatz",
             "schema": "string"
           },
           "mapValue": {
@@ -21,8 +21,8 @@
               "MapValue",
               "http://foo.com/bar"
             ],
-            "name": "theta_spazz",
-            "schema": "integer"
+            "name": "xi_spazz",
+            "schema": "string"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassMapValueTypeIncludesUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassMapValueTypeIncludesUndefinedTermV2.json
index 3ea4e53a..7088a4af 100644
--- a/DTDL/v2/spec/Allowance-ClassMapValueTypeIncludesUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassMapValueTypeIncludesUndefinedTermV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_vroo;1",
+        "@id": "dtmi:example:xi_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_itch;1",
+          "@id": "dtmi:example:xi_itch;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_yekk",
+            "name": "xi_yekk",
             "schema": "string"
           },
           "mapValue": {
@@ -21,8 +21,8 @@
               "MapValue",
               "Foobar"
             ],
-            "name": "theta_flunn",
-            "schema": "long"
+            "name": "xi_flunn",
+            "schema": "time"
           }
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassObjectOptionalPropertiesV2.json b/DTDL/v2/spec/Allowance-ClassObjectOptionalPropertiesV2.json
index 69a4edb9..06d06ee6 100644
--- a/DTDL/v2/spec/Allowance-ClassObjectOptionalPropertiesV2.json
+++ b/DTDL/v2/spec/Allowance-ClassObjectOptionalPropertiesV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_wum;1",
+        "@id": "dtmi:example:yekk_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "spazz_yuzz",
+          "name": "yekk_quan",
           "schema": {
             "@context": [],
             "@type": "Object",
             "fields": [
               {
-                "name": "spazz_omega",
-                "schema": "date"
+                "name": "yekk_snee",
+                "schema": "float"
               }
             ]
           }
@@ -34,17 +34,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_fuddle;1",
+        "@id": "dtmi:example:yekk_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "spazz_humpf",
+          "name": "yekk_floob",
           "schema": {
             "@type": "Object",
             "fields": [
               {
-                "name": "spazz_um",
-                "schema": "dateTime"
+                "name": "yekk_spazz",
+                "schema": "integer"
               }
             ]
           }
@@ -60,15 +60,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_snee;1",
+        "@id": "dtmi:example:yekk_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_glikk;1",
+          "@id": "dtmi:example:yekk_jogg;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "spazz_nuh",
-              "schema": "double"
+              "name": "yekk_flunn",
+              "schema": "long"
             }
           ]
         }
@@ -83,15 +83,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_spazz;1",
+        "@id": "dtmi:example:yekk_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_quan;1",
+          "@id": "dtmi:example:yekk_yekk;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "spazz_thnad",
-              "schema": "duration"
+              "name": "yekk_vroo",
+              "schema": "string"
             }
           ]
         }
@@ -106,15 +106,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_jogg;1",
+        "@id": "dtmi:example:vroo_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_floob;1",
+          "@id": "dtmi:example:vroo_alpha;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "spazz_zatz",
-              "schema": "float"
+              "name": "vroo_beta",
+              "schema": "time"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Allowance-ClassObjectPropertyCommentDtmiV2.json b/DTDL/v2/spec/Allowance-ClassObjectPropertyCommentDtmiV2.json
index 14723215..acd42e9a 100644
--- a/DTDL/v2/spec/Allowance-ClassObjectPropertyCommentDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassObjectPropertyCommentDtmiV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_gamma;1",
+        "@id": "dtmi:example:epsilon_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_hi;1",
+          "@id": "dtmi:example:epsilon_xi;1",
           "@type": "Object",
-          "dtmi:dtdl:property:comment;2": "vroo_alpha",
+          "dtmi:dtdl:property:comment;2": "epsilon_omicron",
           "fields": [
             {
-              "name": "vroo_beta",
-              "schema": "integer"
+              "name": "epsilon_pi",
+              "schema": "dateTime"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Allowance-ClassObjectPropertyDescriptionDtmiV2.json b/DTDL/v2/spec/Allowance-ClassObjectPropertyDescriptionDtmiV2.json
index 70343af7..f67443a4 100644
--- a/DTDL/v2/spec/Allowance-ClassObjectPropertyDescriptionDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassObjectPropertyDescriptionDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_upsilon;1",
+        "@id": "dtmi:example:eta_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_rho;1",
+          "@id": "dtmi:example:eta_nuh;1",
           "@type": "Object",
           "dtmi:dtdl:property:description;2": [
-            "alpha_sigma"
+            "eta_snee"
           ],
           "fields": [
             {
-              "name": "alpha_tau",
-              "schema": "string"
+              "name": "eta_quan",
+              "schema": "duration"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Allowance-ClassObjectPropertyDisplayNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassObjectPropertyDisplayNameDtmiV2.json
index d0f63fc2..862ba6da 100644
--- a/DTDL/v2/spec/Allowance-ClassObjectPropertyDisplayNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassObjectPropertyDisplayNameDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_zatz;1",
+        "@id": "dtmi:example:kappa_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_thnad;1",
+          "@id": "dtmi:example:kappa_epsilon;1",
           "@type": "Object",
           "dtmi:dtdl:property:displayName;2": [
-            "gamma_spazz"
+            "kappa_zeta"
           ],
           "fields": [
             {
-              "name": "gamma_floob",
-              "schema": "boolean"
+              "name": "kappa_eta",
+              "schema": "integer"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Allowance-ClassObjectPropertyFieldsDtmiV2.json b/DTDL/v2/spec/Allowance-ClassObjectPropertyFieldsDtmiV2.json
index 934fc232..4fdf93cc 100644
--- a/DTDL/v2/spec/Allowance-ClassObjectPropertyFieldsDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassObjectPropertyFieldsDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_iota;1",
+        "@id": "dtmi:example:yekk_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_eta;1",
+          "@id": "dtmi:example:yekk_omicron;1",
           "@type": "Object",
           "dtmi:dtdl:property:fields;2": [
             {
-              "name": "spazz_theta",
-              "schema": "duration"
+              "name": "yekk_pi",
+              "schema": "string"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Allowance-ClassObjectPropertyInvalidDtmiV2.json b/DTDL/v2/spec/Allowance-ClassObjectPropertyInvalidDtmiV2.json
index f2355aa2..7cf358c7 100644
--- a/DTDL/v2/spec/Allowance-ClassObjectPropertyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassObjectPropertyInvalidDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_epsilon;1",
+        "@id": "dtmi:example:lambda_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_gamma;1",
+          "@id": "dtmi:example:lambda_rho;1",
           "@type": [
             "Object",
             "Foobar"
           ],
           "fields": [
             {
-              "name": "epsilon_delta",
-              "schema": "integer"
+              "name": "lambda_sigma",
+              "schema": "dateTime"
             }
           ],
           "dtmi:foo//bar": 626
diff --git a/DTDL/v2/spec/Allowance-ClassObjectPropertyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Allowance-ClassObjectPropertyIrrelevantDtmiOrTermV2.json
index c56d0b08..0a5da5de 100644
--- a/DTDL/v2/spec/Allowance-ClassObjectPropertyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassObjectPropertyIrrelevantDtmiOrTermV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_glikk;1",
+        "@id": "dtmi:example:lambda_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_humpf;1",
+          "@id": "dtmi:example:kappa_vroo;1",
           "@type": [
             "Object",
             "Foobar"
           ],
           "fields": [
             {
-              "name": "delta_fuddle",
-              "schema": "boolean"
+              "name": "kappa_hi",
+              "schema": "integer"
             }
           ],
           "dtmi:foo:bar;1": 626
@@ -34,18 +34,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_quan;1",
+        "@id": "dtmi:example:lambda_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_nuh;1",
+          "@id": "dtmi:example:lambda_beta;1",
           "@type": [
             "Object",
             "Foobar"
           ],
           "fields": [
             {
-              "name": "delta_snee",
-              "schema": "date"
+              "name": "lambda_gamma",
+              "schema": "long"
             }
           ],
           "boolean": null
diff --git a/DTDL/v2/spec/Allowance-ClassObjectPropertyNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassObjectPropertyNotDtmiNorTermV2.json
index d0328cb4..3965bf2d 100644
--- a/DTDL/v2/spec/Allowance-ClassObjectPropertyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassObjectPropertyNotDtmiNorTermV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_xi;1",
+        "@id": "dtmi:example:lambda_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_mu;1",
+          "@id": "dtmi:example:lambda_wum;1",
           "@type": [
             "Object",
             "Foobar"
           ],
           "fields": [
             {
-              "name": "epsilon_nu",
-              "schema": "time"
+              "name": "lambda_um",
+              "schema": "float"
             }
           ],
           "http://foo.com/bar": true
diff --git a/DTDL/v2/spec/Allowance-ClassObjectPropertyUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassObjectPropertyUndefinedTermV2.json
index 17898c3a..e657f964 100644
--- a/DTDL/v2/spec/Allowance-ClassObjectPropertyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassObjectPropertyUndefinedTermV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_psi;1",
+        "@id": "dtmi:example:lambda_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_phi;1",
+          "@id": "dtmi:example:lambda_spazz;1",
           "@type": [
             "Object",
             "Foobar"
           ],
           "fields": [
             {
-              "name": "epsilon_chi",
-              "schema": "dateTime"
+              "name": "lambda_floob",
+              "schema": "string"
             }
           ],
           "foobar": {}
diff --git a/DTDL/v2/spec/Allowance-ClassObjectTypeIncludesNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassObjectTypeIncludesNotDtmiNorTermV2.json
index ba7d4cfc..152154fa 100644
--- a/DTDL/v2/spec/Allowance-ClassObjectTypeIncludesNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassObjectTypeIncludesNotDtmiNorTermV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_beta;1",
+        "@id": "dtmi:example:spazz_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_hi;1",
+          "@id": "dtmi:example:thnad_hi;1",
           "@type": [
             "Object",
             "http://foo.com/bar"
           ],
           "fields": [
             {
-              "name": "fuddle_alpha",
-              "schema": "integer"
+              "name": "spazz_alpha",
+              "schema": "string"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Allowance-ClassObjectTypeIncludesUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassObjectTypeIncludesUndefinedTermV2.json
index af3e24e2..01972fb6 100644
--- a/DTDL/v2/spec/Allowance-ClassObjectTypeIncludesUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassObjectTypeIncludesUndefinedTermV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_epsilon;1",
+        "@id": "dtmi:example:spazz_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_gamma;1",
+          "@id": "dtmi:example:spazz_gamma;1",
           "@type": [
             "Object",
             "Foobar"
           ],
           "fields": [
             {
-              "name": "fuddle_delta",
-              "schema": "long"
+              "name": "spazz_delta",
+              "schema": "time"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Allowance-ClassPropertyCotypePropertyDtmiV2.json b/DTDL/v2/spec/Allowance-ClassPropertyCotypePropertyDtmiV2.json
index 7c16627a..fba0fb1b 100644
--- a/DTDL/v2/spec/Allowance-ClassPropertyCotypePropertyDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassPropertyCotypePropertyDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_kappa;1",
+        "@id": "dtmi:example:flunn_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "quan_iota",
+          "name": "flunn_zatz",
           "schema": "long",
           "unit": "gigawatt"
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_mu;1",
+        "@id": "dtmi:example:flunn_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "quan_lambda",
+          "name": "flunn_flunn",
           "schema": "double",
           "dtmi:dtdl:property:unit;2": "gigawatt"
         }
diff --git a/DTDL/v2/spec/Allowance-ClassPropertyOptionalPropertiesV2.json b/DTDL/v2/spec/Allowance-ClassPropertyOptionalPropertiesV2.json
index 1f38794b..e367d19e 100644
--- a/DTDL/v2/spec/Allowance-ClassPropertyOptionalPropertiesV2.json
+++ b/DTDL/v2/spec/Allowance-ClassPropertyOptionalPropertiesV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_lambda;1",
+        "@id": "dtmi:example:omega_quan;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:sigma_kappa;1",
+          "@id": "dtmi:example:omega_snee;1",
           "@type": "Interface",
           "contents": {
             "@context": [],
             "@type": "Property",
-            "name": "sigma_iota",
-            "schema": "long"
+            "name": "omega_nuh",
+            "schema": "double"
           }
         }
       }
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_xi;1",
+        "@id": "dtmi:example:omega_floob;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:sigma_nu;1",
+          "@id": "dtmi:example:omega_spazz;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "sigma_mu",
-            "schema": "string"
+            "name": "omega_thnad",
+            "schema": "duration"
           }
         }
       }
@@ -52,12 +52,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_pi;1",
+        "@id": "dtmi:example:omega_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "sigma_omicron",
-          "schema": "time"
+          "name": "omega_zatz",
+          "schema": "float"
         }
       }
     ]
@@ -70,12 +70,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_sigma;1",
+        "@id": "dtmi:example:omega_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "sigma_rho",
-          "schema": "boolean"
+          "name": "omega_flunn",
+          "schema": "integer"
         }
       }
     ]
@@ -88,12 +88,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_upsilon;1",
+        "@id": "dtmi:example:omega_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "sigma_tau",
-          "schema": "date"
+          "name": "omega_yekk",
+          "schema": "long"
         }
       }
     ]
@@ -106,12 +106,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_chi;1",
+        "@id": "dtmi:example:yuzz_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "sigma_phi",
-          "schema": "dateTime"
+          "name": "omega_hi",
+          "schema": "string"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassPropertyPropertyCommentDtmiV2.json b/DTDL/v2/spec/Allowance-ClassPropertyPropertyCommentDtmiV2.json
index feb55b9a..fbd6a329 100644
--- a/DTDL/v2/spec/Allowance-ClassPropertyPropertyCommentDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassPropertyPropertyCommentDtmiV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_floob;1",
+        "@id": "dtmi:example:glikk_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "dtmi:dtdl:property:comment;2": "psi_thnad",
-          "name": "psi_spazz",
-          "schema": "time"
+          "dtmi:dtdl:property:comment;2": "glikk_tau",
+          "name": "glikk_upsilon",
+          "schema": "long"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassPropertyPropertyDescriptionDtmiV2.json b/DTDL/v2/spec/Allowance-ClassPropertyPropertyDescriptionDtmiV2.json
index 4d4f4b57..d76ee2c9 100644
--- a/DTDL/v2/spec/Allowance-ClassPropertyPropertyDescriptionDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassPropertyPropertyDescriptionDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_phi;1",
+        "@id": "dtmi:example:snee_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
           "dtmi:dtdl:property:description;2": [
-            "yuzz_tau"
+            "snee_delta"
           ],
-          "name": "yuzz_upsilon",
-          "schema": "date"
+          "name": "snee_epsilon",
+          "schema": "time"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassPropertyPropertyDisplayNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassPropertyPropertyDisplayNameDtmiV2.json
index 3c3af901..4d4c5941 100644
--- a/DTDL/v2/spec/Allowance-ClassPropertyPropertyDisplayNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassPropertyPropertyDisplayNameDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_zeta;1",
+        "@id": "dtmi:example:quan_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
           "dtmi:dtdl:property:displayName;2": [
-            "um_delta"
+            "quan_snee"
           ],
-          "name": "um_epsilon",
-          "schema": "double"
+          "name": "quan_quan",
+          "schema": "date"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassPropertyPropertyInvalidDtmiV2.json b/DTDL/v2/spec/Allowance-ClassPropertyPropertyInvalidDtmiV2.json
index 155a7e38..4766681a 100644
--- a/DTDL/v2/spec/Allowance-ClassPropertyPropertyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassPropertyPropertyInvalidDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_thnad;1",
+        "@id": "dtmi:example:itch_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Foobar"
           ],
-          "name": "quan_quan",
-          "schema": "double",
+          "name": "itch_sigma",
+          "schema": "date",
           "dtmi:foo//bar": 626
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassPropertyPropertyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Allowance-ClassPropertyPropertyIrrelevantDtmiOrTermV2.json
index 4d606a6d..78ef0e4a 100644
--- a/DTDL/v2/spec/Allowance-ClassPropertyPropertyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassPropertyPropertyIrrelevantDtmiOrTermV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_chi;1",
+        "@id": "dtmi:example:itch_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Foobar"
           ],
-          "name": "quan_phi",
-          "schema": "long",
+          "name": "itch_zeta",
+          "schema": "float",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_omega;1",
+        "@id": "dtmi:example:itch_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Foobar"
           ],
-          "name": "quan_psi",
-          "schema": "string",
+          "name": "itch_theta",
+          "schema": "integer",
           "boolean": null
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassPropertyPropertyNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassPropertyPropertyNameDtmiV2.json
index 2c29dd21..30064f1b 100644
--- a/DTDL/v2/spec/Allowance-ClassPropertyPropertyNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassPropertyPropertyNameDtmiV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_humpf;1",
+        "@id": "dtmi:example:omicron_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "dtmi:dtdl:property:name;2": "iota_um",
-          "schema": "date"
+          "dtmi:dtdl:property:name;2": "omicron_yekk",
+          "schema": "long"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassPropertyPropertyNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassPropertyPropertyNotDtmiNorTermV2.json
index 29c6e6ae..6fef3e7d 100644
--- a/DTDL/v2/spec/Allowance-ClassPropertyPropertyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassPropertyPropertyNotDtmiNorTermV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_itch;1",
+        "@id": "dtmi:example:itch_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Foobar"
           ],
-          "name": "quan_flunn",
-          "schema": "integer",
+          "name": "itch_omega",
+          "schema": "duration",
           "http://foo.com/bar": true
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassPropertyPropertySchemaDtmiV2.json b/DTDL/v2/spec/Allowance-ClassPropertyPropertySchemaDtmiV2.json
index 2c3be03a..a60eaaf8 100644
--- a/DTDL/v2/spec/Allowance-ClassPropertyPropertySchemaDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassPropertyPropertySchemaDtmiV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_hi;1",
+        "@id": "dtmi:example:omega_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "rho_vroo",
-          "dtmi:dtdl:property:schema;2": "boolean"
+          "name": "omega_phi",
+          "dtmi:dtdl:property:schema;2": "integer"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassPropertyPropertyUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassPropertyPropertyUndefinedTermV2.json
index 21412acc..6f1fa826 100644
--- a/DTDL/v2/spec/Allowance-ClassPropertyPropertyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassPropertyPropertyUndefinedTermV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_gamma;1",
+        "@id": "dtmi:example:itch_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Foobar"
           ],
-          "name": "thnad_beta",
-          "schema": "time",
+          "name": "itch_glikk",
+          "schema": "long",
           "foobar": {}
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassPropertyPropertyWritableDtmiV2.json b/DTDL/v2/spec/Allowance-ClassPropertyPropertyWritableDtmiV2.json
index 07cfb48f..7a0d4f2c 100644
--- a/DTDL/v2/spec/Allowance-ClassPropertyPropertyWritableDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassPropertyPropertyWritableDtmiV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_fuddle;1",
+        "@id": "dtmi:example:spazz_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_humpf",
-          "schema": "double",
+          "name": "spazz_nu",
+          "schema": "date",
           "dtmi:dtdl:property:writable;2": false
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassPropertyTypeIncludesNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassPropertyTypeIncludesNotDtmiNorTermV2.json
index 412ac0c6..fe4e50e5 100644
--- a/DTDL/v2/spec/Allowance-ClassPropertyTypeIncludesNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassPropertyTypeIncludesNotDtmiNorTermV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_theta;1",
+        "@id": "dtmi:example:xi_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "http://foo.com/bar"
           ],
-          "name": "theta_eta",
-          "schema": "long"
+          "name": "xi_phi",
+          "schema": "double"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassPropertyTypeIncludesSemanticTypeV2.json b/DTDL/v2/spec/Allowance-ClassPropertyTypeIncludesSemanticTypeV2.json
index 4f6f04be..70bcd483 100644
--- a/DTDL/v2/spec/Allowance-ClassPropertyTypeIncludesSemanticTypeV2.json
+++ b/DTDL/v2/spec/Allowance-ClassPropertyTypeIncludesSemanticTypeV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_nu;1",
+        "@id": "dtmi:example:nu_um;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Acceleration"
           ],
-          "name": "eta_mu",
-          "schema": "integer",
+          "name": "nu_wum",
+          "schema": "double",
           "unit": "centimetrePerSecondSquared"
         }
       }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_omicron;1",
+        "@id": "dtmi:example:nu_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Acceleration;2"
           ],
-          "name": "eta_xi",
-          "schema": "long",
+          "name": "nu_humpf",
+          "schema": "float",
           "unit": "centimetrePerSecondSquared"
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassPropertyTypeIncludesUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassPropertyTypeIncludesUndefinedTermV2.json
index 8ddf07c9..d312eecf 100644
--- a/DTDL/v2/spec/Allowance-ClassPropertyTypeIncludesUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassPropertyTypeIncludesUndefinedTermV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_kappa;1",
+        "@id": "dtmi:example:xi_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Foobar"
           ],
-          "name": "theta_iota",
-          "schema": "string"
+          "name": "xi_psi",
+          "schema": "duration"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassRelationshipOptionalPropertiesV2.json b/DTDL/v2/spec/Allowance-ClassRelationshipOptionalPropertiesV2.json
index f0a16630..858a9c17 100644
--- a/DTDL/v2/spec/Allowance-ClassRelationshipOptionalPropertiesV2.json
+++ b/DTDL/v2/spec/Allowance-ClassRelationshipOptionalPropertiesV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_wum;1",
+        "@id": "dtmi:example:alpha_lambda;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zatz_yuzz;1",
+          "@id": "dtmi:example:alpha_kappa;1",
           "@type": "Interface",
           "contents": {
             "@context": [],
             "@type": "Relationship",
-            "name": "zatz_omega"
+            "name": "alpha_iota"
           }
         }
       }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_fuddle;1",
+        "@id": "dtmi:example:alpha_xi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zatz_humpf;1",
+          "@id": "dtmi:example:alpha_nu;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "zatz_um"
+            "name": "alpha_mu"
           }
         }
       }
@@ -50,11 +50,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_nuh;1",
+        "@id": "dtmi:example:alpha_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zatz_glikk"
+          "name": "alpha_omicron"
         }
       }
     ]
@@ -67,11 +67,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_quan;1",
+        "@id": "dtmi:example:alpha_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zatz_snee"
+          "name": "alpha_rho"
         }
       }
     ]
@@ -84,11 +84,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_spazz;1",
+        "@id": "dtmi:example:alpha_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zatz_thnad"
+          "name": "alpha_tau"
         }
       }
     ]
@@ -101,11 +101,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_zatz;1",
+        "@id": "dtmi:example:alpha_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zatz_floob"
+          "name": "alpha_phi"
         }
       }
     ]
@@ -118,11 +118,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_flunn;1",
+        "@id": "dtmi:example:alpha_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zatz_jogg"
+          "name": "alpha_psi"
         }
       }
     ]
@@ -135,11 +135,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_yekk;1",
+        "@id": "dtmi:example:alpha_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zatz_itch"
+          "name": "alpha_yuzz"
         }
       }
     ]
@@ -152,11 +152,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_hi;1",
+        "@id": "dtmi:example:alpha_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zatz_vroo"
+          "name": "alpha_um"
         }
       }
     ]
@@ -169,11 +169,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_beta;1",
+        "@id": "dtmi:example:alpha_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "jogg_alpha"
+          "name": "alpha_fuddle"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyCommentDtmiV2.json b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyCommentDtmiV2.json
index 2d274601..e975958f 100644
--- a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyCommentDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyCommentDtmiV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_pi;1",
+        "@id": "dtmi:example:eta_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "dtmi:dtdl:property:comment;2": "hi_xi",
-          "name": "hi_omicron"
+          "dtmi:dtdl:property:comment;2": "eta_epsilon",
+          "name": "eta_zeta"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyDescriptionDtmiV2.json b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyDescriptionDtmiV2.json
index aa656570..faa6668d 100644
--- a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyDescriptionDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyDescriptionDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_alpha;1",
+        "@id": "dtmi:example:theta_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "dtmi:dtdl:property:description;2": [
-            "alpha_vroo"
+            "theta_quan"
           ],
-          "name": "alpha_hi"
+          "name": "theta_thnad"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyDisplayNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyDisplayNameDtmiV2.json
index 366d00bc..877497b0 100644
--- a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyDisplayNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyDisplayNameDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_fuddle;1",
+        "@id": "dtmi:example:kappa_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "dtmi:dtdl:property:displayName;2": [
-            "gamma_um"
+            "kappa_sigma"
           ],
-          "name": "gamma_humpf"
+          "name": "kappa_tau"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyInvalidDtmiV2.json b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyInvalidDtmiV2.json
index 393a5157..b7d21f64 100644
--- a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyInvalidDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_nu;1",
+        "@id": "dtmi:example:alpha_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Relationship",
             "Foobar"
           ],
-          "name": "zatz_mu",
+          "name": "alpha_nu",
           "dtmi:foo//bar": 626
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyIrrelevantDtmiOrTermV2.json
index 92d7f2f1..c62270eb 100644
--- a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyIrrelevantDtmiOrTermV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_alpha;1",
+        "@id": "dtmi:example:alpha_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Relationship",
             "Foobar"
           ],
-          "name": "floob_hi",
+          "name": "alpha_alpha",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -28,14 +28,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_gamma;1",
+        "@id": "dtmi:example:alpha_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Relationship",
             "Foobar"
           ],
-          "name": "zatz_beta",
+          "name": "alpha_gamma",
           "boolean": null
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyMaxMultiplicityDtmiV2.json b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyMaxMultiplicityDtmiV2.json
index c6ad02c8..f1ad7524 100644
--- a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyMaxMultiplicityDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyMaxMultiplicityDtmiV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_nu;1",
+        "@id": "dtmi:example:mu_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "dtmi:dtdl:property:maxMultiplicity;2": 500,
-          "name": "epsilon_mu"
+          "name": "mu_gamma"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyMinMultiplicityDtmiV2.json b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyMinMultiplicityDtmiV2.json
index 61e1713a..9e04d125 100644
--- a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyMinMultiplicityDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyMinMultiplicityDtmiV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_snee;1",
+        "@id": "dtmi:example:nu_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "dtmi:dtdl:property:minMultiplicity;2": 0,
-          "name": "zeta_nuh"
+          "name": "nu_chi"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyNameDtmiV2.json
index 47fd46f9..6439a98f 100644
--- a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyNameDtmiV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_nu;1",
+        "@id": "dtmi:example:hi_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "dtmi:dtdl:property:name;2": "zatz_mu"
+          "dtmi:dtdl:property:name;2": "hi_itch"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyNotDtmiNorTermV2.json
index be7b59e6..7456d686 100644
--- a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyNotDtmiNorTermV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_tau;1",
+        "@id": "dtmi:example:alpha_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Relationship",
             "Foobar"
           ],
-          "name": "zatz_sigma",
+          "name": "alpha_tau",
           "http://foo.com/bar": true
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyPropertiesDtmiV2.json b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyPropertiesDtmiV2.json
index 0b88561a..9a226200 100644
--- a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyPropertiesDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyPropertiesDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_thnad;1",
+        "@id": "dtmi:example:jogg_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "nuh_snee",
+          "name": "jogg_quan",
           "dtmi:dtdl:property:properties;2": [
             {
               "@type": "Property",
-              "name": "nuh_quan",
+              "name": "jogg_thnad",
               "schema": "long"
             }
           ]
diff --git a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyTargetDtmiV2.json b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyTargetDtmiV2.json
index 9600437c..e231c823 100644
--- a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyTargetDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyTargetDtmiV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_alpha;1",
+        "@id": "dtmi:example:vroo_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "thnad_vroo",
-          "dtmi:dtdl:property:target;2": "dtmi:example:thnad_hi;1"
+          "name": "yekk_hi",
+          "dtmi:dtdl:property:target;2": "dtmi:example:vroo_alpha;1"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyUndefinedTermV2.json
index 3b404dbd..d7f7852a 100644
--- a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyUndefinedTermV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_yuzz;1",
+        "@id": "dtmi:example:alpha_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Relationship",
             "Foobar"
           ],
-          "name": "zatz_omega",
+          "name": "alpha_yuzz",
           "foobar": {}
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyWritableDtmiV2.json b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyWritableDtmiV2.json
index 309936a2..c376db10 100644
--- a/DTDL/v2/spec/Allowance-ClassRelationshipPropertyWritableDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassRelationshipPropertyWritableDtmiV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_omega;1",
+        "@id": "dtmi:example:hi_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "floob_psi",
+          "name": "hi_omega",
           "dtmi:dtdl:property:writable;2": true
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassRelationshipTypeIncludesNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassRelationshipTypeIncludesNotDtmiNorTermV2.json
index a3e9fab1..a9f1cd68 100644
--- a/DTDL/v2/spec/Allowance-ClassRelationshipTypeIncludesNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassRelationshipTypeIncludesNotDtmiNorTermV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_vroo;1",
+        "@id": "dtmi:example:vroo_um;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Relationship",
             "http://foo.com/bar"
           ],
-          "name": "spazz_yekk"
+          "name": "vroo_wum"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassRelationshipTypeIncludesUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassRelationshipTypeIncludesUndefinedTermV2.json
index 9ca1ae91..8afd0dbc 100644
--- a/DTDL/v2/spec/Allowance-ClassRelationshipTypeIncludesUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassRelationshipTypeIncludesUndefinedTermV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_alpha;1",
+        "@id": "dtmi:example:vroo_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Relationship",
             "Foobar"
           ],
-          "name": "spazz_hi"
+          "name": "vroo_humpf"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassTelemetryCotypePropertyDtmiV2.json b/DTDL/v2/spec/Allowance-ClassTelemetryCotypePropertyDtmiV2.json
index 35ed3b1a..57e79e76 100644
--- a/DTDL/v2/spec/Allowance-ClassTelemetryCotypePropertyDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassTelemetryCotypePropertyDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_fuddle;1",
+        "@id": "dtmi:example:humpf_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "upsilon_humpf",
+          "name": "um_hi",
           "schema": "double",
           "unit": "acre"
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_nuh;1",
+        "@id": "dtmi:example:humpf_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "upsilon_glikk",
+          "name": "humpf_beta",
           "schema": "float",
           "dtmi:dtdl:property:unit;2": "acre"
         }
diff --git a/DTDL/v2/spec/Allowance-ClassTelemetryOptionalPropertiesV2.json b/DTDL/v2/spec/Allowance-ClassTelemetryOptionalPropertiesV2.json
index 69167284..49faea82 100644
--- a/DTDL/v2/spec/Allowance-ClassTelemetryOptionalPropertiesV2.json
+++ b/DTDL/v2/spec/Allowance-ClassTelemetryOptionalPropertiesV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_zeta;1",
+        "@id": "dtmi:example:xi_omicron;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:eta_epsilon;1",
+          "@id": "dtmi:example:xi_xi;1",
           "@type": "Interface",
           "contents": {
             "@context": [],
             "@type": "Telemetry",
-            "name": "eta_delta",
+            "name": "xi_nu",
             "schema": "time"
           }
         }
@@ -30,14 +30,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_iota;1",
+        "@id": "dtmi:example:xi_sigma;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:eta_theta;1",
+          "@id": "dtmi:example:xi_rho;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "eta_eta",
+            "name": "xi_pi",
             "schema": "boolean"
           }
         }
@@ -52,11 +52,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_lambda;1",
+        "@id": "dtmi:example:xi_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "eta_kappa",
+          "name": "xi_tau",
           "schema": "date"
         }
       }
@@ -70,11 +70,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_nu;1",
+        "@id": "dtmi:example:xi_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "eta_mu",
+          "name": "xi_phi",
           "schema": "dateTime"
         }
       }
@@ -88,11 +88,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_omicron;1",
+        "@id": "dtmi:example:xi_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "eta_xi",
+          "name": "xi_psi",
           "schema": "double"
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassTelemetryPropertyCommentDtmiV2.json b/DTDL/v2/spec/Allowance-ClassTelemetryPropertyCommentDtmiV2.json
index 6db47a4a..ba199fbe 100644
--- a/DTDL/v2/spec/Allowance-ClassTelemetryPropertyCommentDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassTelemetryPropertyCommentDtmiV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_fuddle;1",
+        "@id": "dtmi:example:upsilon_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "dtmi:dtdl:property:comment;2": "mu_um",
-          "name": "mu_humpf",
-          "schema": "boolean"
+          "dtmi:dtdl:property:comment;2": "tau_vroo",
+          "name": "tau_hi",
+          "schema": "dateTime"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassTelemetryPropertyDescriptionDtmiV2.json b/DTDL/v2/spec/Allowance-ClassTelemetryPropertyDescriptionDtmiV2.json
index 55d8571a..945eb245 100644
--- a/DTDL/v2/spec/Allowance-ClassTelemetryPropertyDescriptionDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassTelemetryPropertyDescriptionDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_xi;1",
+        "@id": "dtmi:example:phi_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
           "dtmi:dtdl:property:description;2": [
-            "xi_mu"
+            "phi_um"
           ],
-          "name": "xi_nu",
-          "schema": "dateTime"
+          "name": "phi_humpf",
+          "schema": "duration"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassTelemetryPropertyDisplayNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassTelemetryPropertyDisplayNameDtmiV2.json
index 2afd967e..7ac7f08b 100644
--- a/DTDL/v2/spec/Allowance-ClassTelemetryPropertyDisplayNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassTelemetryPropertyDisplayNameDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_vroo;1",
+        "@id": "dtmi:example:psi_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
           "dtmi:dtdl:property:displayName;2": [
-            "omicron_itch"
+            "psi_mu"
           ],
-          "name": "omicron_yekk",
-          "schema": "duration"
+          "name": "psi_nu",
+          "schema": "integer"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Allowance-ClassTelemetryPropertyInvalidDtmiV2.json b/DTDL/v2/spec/Allowance-ClassTelemetryPropertyInvalidDtmiV2.json
index c6a09667..16348764 100644
--- a/DTDL/v2/spec/Allowance-ClassTelemetryPropertyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassTelemetryPropertyInvalidDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_kappa;1",
+        "@id": "dtmi:example:humpf_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Foobar"
           ],
-          "name": "phi_iota",
-          "schema": "duration",
+          "name": "humpf_omega",
+          "schema": "integer",
           "dtmi:foo//bar": 626
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassTelemetryPropertyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Allowance-ClassTelemetryPropertyIrrelevantDtmiOrTermV2.json
index d08d4719..f5c89bd7 100644
--- a/DTDL/v2/spec/Allowance-ClassTelemetryPropertyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassTelemetryPropertyIrrelevantDtmiOrTermV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_yekk;1",
+        "@id": "dtmi:example:humpf_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Foobar"
           ],
-          "name": "upsilon_itch",
-          "schema": "string",
+          "name": "humpf_mu",
+          "schema": "boolean",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_hi;1",
+        "@id": "dtmi:example:humpf_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Foobar"
           ],
-          "name": "upsilon_vroo",
-          "schema": "time",
+          "name": "humpf_xi",
+          "schema": "date",
           "boolean": null
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassTelemetryPropertyNameDtmiV2.json b/DTDL/v2/spec/Allowance-ClassTelemetryPropertyNameDtmiV2.json
index 328ebe09..9783a566 100644
--- a/DTDL/v2/spec/Allowance-ClassTelemetryPropertyNameDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassTelemetryPropertyNameDtmiV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_chi;1",
+        "@id": "dtmi:example:epsilon_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "dtmi:dtdl:property:name;2": "yekk_phi",
+          "dtmi:dtdl:property:name;2": "epsilon_chi",
           "schema": "duration"
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassTelemetryPropertyNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassTelemetryPropertyNotDtmiNorTermV2.json
index 00ed22c7..851d5813 100644
--- a/DTDL/v2/spec/Allowance-ClassTelemetryPropertyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassTelemetryPropertyNotDtmiNorTermV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_pi;1",
+        "@id": "dtmi:example:humpf_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Foobar"
           ],
-          "name": "phi_omicron",
-          "schema": "long",
+          "name": "humpf_glikk",
+          "schema": "time",
           "http://foo.com/bar": true
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassTelemetryPropertySchemaDtmiV2.json b/DTDL/v2/spec/Allowance-ClassTelemetryPropertySchemaDtmiV2.json
index b3cd913d..82322e37 100644
--- a/DTDL/v2/spec/Allowance-ClassTelemetryPropertySchemaDtmiV2.json
+++ b/DTDL/v2/spec/Allowance-ClassTelemetryPropertySchemaDtmiV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_jogg;1",
+        "@id": "dtmi:example:xi_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "zeta_zatz",
+          "name": "xi_gamma",
           "dtmi:dtdl:property:schema;2": "dateTime"
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassTelemetryPropertyUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassTelemetryPropertyUndefinedTermV2.json
index ac0f9465..3fe6aab8 100644
--- a/DTDL/v2/spec/Allowance-ClassTelemetryPropertyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassTelemetryPropertyUndefinedTermV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_chi;1",
+        "@id": "dtmi:example:humpf_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Foobar"
           ],
-          "name": "phi_phi",
-          "schema": "boolean",
+          "name": "humpf_floob",
+          "schema": "dateTime",
           "foobar": {}
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassTelemetryTypeIncludesNotDtmiNorTermV2.json b/DTDL/v2/spec/Allowance-ClassTelemetryTypeIncludesNotDtmiNorTermV2.json
index e9e0c90b..0ac00138 100644
--- a/DTDL/v2/spec/Allowance-ClassTelemetryTypeIncludesNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassTelemetryTypeIncludesNotDtmiNorTermV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_theta;1",
+        "@id": "dtmi:example:delta_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "http://foo.com/bar"
           ],
-          "name": "itch_eta",
+          "name": "delta_theta",
           "schema": "integer"
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassTelemetryTypeIncludesSemanticTypeV2.json b/DTDL/v2/spec/Allowance-ClassTelemetryTypeIncludesSemanticTypeV2.json
index 736b7f42..7efbc692 100644
--- a/DTDL/v2/spec/Allowance-ClassTelemetryTypeIncludesSemanticTypeV2.json
+++ b/DTDL/v2/spec/Allowance-ClassTelemetryTypeIncludesSemanticTypeV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_nu;1",
+        "@id": "dtmi:example:gamma_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "LuminousIntensity"
           ],
-          "name": "flunn_mu",
-          "schema": "float",
+          "name": "gamma_nu",
+          "schema": "long",
           "unit": "candela"
         }
       }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_omicron;1",
+        "@id": "dtmi:example:gamma_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:LuminousIntensity;2"
           ],
-          "name": "flunn_xi",
-          "schema": "integer",
+          "name": "gamma_omicron",
+          "schema": "double",
           "unit": "candela"
         }
       }
diff --git a/DTDL/v2/spec/Allowance-ClassTelemetryTypeIncludesUndefinedTermV2.json b/DTDL/v2/spec/Allowance-ClassTelemetryTypeIncludesUndefinedTermV2.json
index 8b1d4779..cdfd1f4b 100644
--- a/DTDL/v2/spec/Allowance-ClassTelemetryTypeIncludesUndefinedTermV2.json
+++ b/DTDL/v2/spec/Allowance-ClassTelemetryTypeIncludesUndefinedTermV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_kappa;1",
+        "@id": "dtmi:example:delta_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Foobar"
           ],
-          "name": "itch_iota",
+          "name": "delta_kappa",
           "schema": "long"
         }
       }
diff --git a/DTDL/v2/spec/Completion-ClassArrayPropertyElementSchemaDependentReferenceV2.json b/DTDL/v2/spec/Completion-ClassArrayPropertyElementSchemaDependentReferenceV2.json
index 1aacb21e..cadd6bfb 100644
--- a/DTDL/v2/spec/Completion-ClassArrayPropertyElementSchemaDependentReferenceV2.json
+++ b/DTDL/v2/spec/Completion-ClassArrayPropertyElementSchemaDependentReferenceV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_glikk;1",
+        "@id": "dtmi:example:iota_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "eta_fuddle",
+          "name": "iota_yuzz",
           "schema": {
             "@type": "Array",
             "elementSchema": "dtmi:ex:dependentRef;1"
@@ -33,11 +33,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_snee;1",
+        "@id": "dtmi:example:iota_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "eta_nuh",
+          "name": "iota_um",
           "schema": {
             "@type": "Array",
             "elementSchema": [
diff --git a/DTDL/v2/spec/Completion-ClassArrayTypeIncludesIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Completion-ClassArrayTypeIncludesIrrelevantDtmiOrTermV2.json
index 51be0ea2..d049e518 100644
--- a/DTDL/v2/spec/Completion-ClassArrayTypeIncludesIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Completion-ClassArrayTypeIncludesIrrelevantDtmiOrTermV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_sigma;1",
+        "@id": "dtmi:example:eta_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_rho;1",
+          "@id": "dtmi:example:eta_eta;1",
           "@type": [
             "Array",
             "dtmi:foo:bar;1"
@@ -28,11 +28,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_upsilon;1",
+        "@id": "dtmi:example:eta_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:epsilon_tau;1",
+          "@id": "dtmi:example:eta_iota;1",
           "@type": [
             "Array",
             "dtmi:foo:bar;1"
@@ -50,10 +50,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_chi;1",
+        "@id": "dtmi:example:eta_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_phi;1",
+          "@id": "dtmi:example:eta_lambda;1",
           "@type": [
             "Array",
             "boolean"
@@ -71,11 +71,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_omega;1",
+        "@id": "dtmi:example:eta_xi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:epsilon_psi;1",
+          "@id": "dtmi:example:eta_nu;1",
           "@type": [
             "Array",
             "boolean"
diff --git a/DTDL/v2/spec/Completion-ClassCommandPayloadPropertySchemaDependentReferenceV2.json b/DTDL/v2/spec/Completion-ClassCommandPayloadPropertySchemaDependentReferenceV2.json
index 139ac44c..c5c623dd 100644
--- a/DTDL/v2/spec/Completion-ClassCommandPayloadPropertySchemaDependentReferenceV2.json
+++ b/DTDL/v2/spec/Completion-ClassCommandPayloadPropertySchemaDependentReferenceV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_gamma;1",
+        "@id": "dtmi:example:lambda_flunn;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:iota_beta;1",
+          "@id": "dtmi:example:lambda_jogg;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "iota_alpha",
+            "name": "lambda_zatz",
             "request": {
-              "name": "theta_hi",
+              "name": "lambda_floob",
               "schema": "dtmi:ex:dependentRef;1"
             }
           }
@@ -37,16 +37,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_eta;1",
+        "@id": "dtmi:example:lambda_hi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:iota_zeta;1",
+          "@id": "dtmi:example:lambda_vroo;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "iota_epsilon",
+            "name": "lambda_yekk",
             "request": {
-              "name": "iota_delta",
+              "name": "lambda_itch",
               "schema": [
                 "dtmi:ex:dependentRef;1"
               ]
diff --git a/DTDL/v2/spec/Completion-ClassCommandPayloadTypeIncludesIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Completion-ClassCommandPayloadTypeIncludesIrrelevantDtmiOrTermV2.json
index 6e37f81d..c1e93bc3 100644
--- a/DTDL/v2/spec/Completion-ClassCommandPayloadTypeIncludesIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Completion-ClassCommandPayloadTypeIncludesIrrelevantDtmiOrTermV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_fuddle;1",
+        "@id": "dtmi:example:tau_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_humpf",
+          "name": "tau_fuddle",
           "request": {
             "@type": [
               "CommandPayload",
               "dtmi:foo:bar;1"
             ],
-            "name": "pi_um",
-            "schema": "dateTime"
+            "name": "tau_humpf",
+            "schema": "boolean"
           }
         }
       }
@@ -32,19 +32,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_snee;1",
+        "@id": "dtmi:example:tau_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_nuh",
+          "name": "tau_snee",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": [
               "CommandPayload",
               "dtmi:foo:bar;1"
             ],
-            "name": "pi_glikk",
-            "schema": "double"
+            "name": "tau_nuh",
+            "schema": "date"
           }
         }
       }
@@ -58,18 +58,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_spazz;1",
+        "@id": "dtmi:example:tau_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_thnad",
+          "name": "tau_spazz",
           "request": {
             "@type": [
               "CommandPayload",
               "boolean"
             ],
-            "name": "pi_quan",
-            "schema": "duration"
+            "name": "tau_thnad",
+            "schema": "dateTime"
           }
         }
       }
@@ -83,19 +83,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_jogg;1",
+        "@id": "dtmi:example:tau_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_zatz",
+          "name": "tau_jogg",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": [
               "CommandPayload",
               "boolean"
             ],
-            "name": "pi_floob",
-            "schema": "float"
+            "name": "tau_zatz",
+            "schema": "double"
           }
         }
       }
diff --git a/DTDL/v2/spec/Completion-ClassCommandPropertyRequestDependentReferenceV2.json b/DTDL/v2/spec/Completion-ClassCommandPropertyRequestDependentReferenceV2.json
index 18b9c2a9..1b24aef9 100644
--- a/DTDL/v2/spec/Completion-ClassCommandPropertyRequestDependentReferenceV2.json
+++ b/DTDL/v2/spec/Completion-ClassCommandPropertyRequestDependentReferenceV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_spazz;1",
+        "@id": "dtmi:example:itch_theta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zatz_thnad;1",
+          "@id": "dtmi:example:itch_eta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "zatz_quan",
+            "name": "itch_zeta",
             "request": "dtmi:ex:dependentRef;1"
           }
         }
@@ -34,14 +34,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_jogg;1",
+        "@id": "dtmi:example:itch_lambda;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zatz_zatz;1",
+          "@id": "dtmi:example:itch_kappa;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "zatz_floob",
+            "name": "itch_iota",
             "request": [
               "dtmi:ex:dependentRef;1"
             ]
diff --git a/DTDL/v2/spec/Completion-ClassCommandPropertyResponseDependentReferenceV2.json b/DTDL/v2/spec/Completion-ClassCommandPropertyResponseDependentReferenceV2.json
index e5437973..d5a35737 100644
--- a/DTDL/v2/spec/Completion-ClassCommandPropertyResponseDependentReferenceV2.json
+++ b/DTDL/v2/spec/Completion-ClassCommandPropertyResponseDependentReferenceV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_delta;1",
+        "@id": "dtmi:example:alpha_glikk;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:vroo_gamma;1",
+          "@id": "dtmi:example:alpha_fuddle;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "vroo_beta",
+            "name": "alpha_humpf",
             "response": "dtmi:ex:dependentRef;1"
           }
         }
@@ -34,14 +34,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_eta;1",
+        "@id": "dtmi:example:alpha_quan;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:vroo_zeta;1",
+          "@id": "dtmi:example:alpha_snee;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "vroo_epsilon",
+            "name": "alpha_nuh",
             "response": [
               "dtmi:ex:dependentRef;1"
             ]
diff --git a/DTDL/v2/spec/Completion-ClassCommandTypeIncludesIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Completion-ClassCommandTypeIncludesIrrelevantDtmiOrTermV2.json
index 7a5a88f1..b91df655 100644
--- a/DTDL/v2/spec/Completion-ClassCommandTypeIncludesIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Completion-ClassCommandTypeIncludesIrrelevantDtmiOrTermV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_chi;1",
+        "@id": "dtmi:example:chi_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Command",
             "dtmi:foo:bar;1"
           ],
-          "name": "upsilon_phi"
+          "name": "chi_phi"
         }
       }
     ]
@@ -27,7 +27,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_omega;1",
+        "@id": "dtmi:example:chi_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -35,7 +35,7 @@
             "Command",
             "dtmi:foo:bar;1"
           ],
-          "name": "upsilon_psi"
+          "name": "chi_psi"
         }
       }
     ]
@@ -48,14 +48,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_wum;1",
+        "@id": "dtmi:example:chi_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Command",
             "boolean"
           ],
-          "name": "upsilon_yuzz"
+          "name": "chi_yuzz"
         }
       }
     ]
@@ -68,7 +68,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_humpf;1",
+        "@id": "dtmi:example:chi_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -76,7 +76,7 @@
             "Command",
             "boolean"
           ],
-          "name": "upsilon_um"
+          "name": "chi_um"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Completion-ClassComponentPropertySchemaDependentReferenceV2.json b/DTDL/v2/spec/Completion-ClassComponentPropertySchemaDependentReferenceV2.json
index cd362308..a29744dd 100644
--- a/DTDL/v2/spec/Completion-ClassComponentPropertySchemaDependentReferenceV2.json
+++ b/DTDL/v2/spec/Completion-ClassComponentPropertySchemaDependentReferenceV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_gamma;1",
+        "@id": "dtmi:example:itch_mu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zatz_beta;1",
+          "@id": "dtmi:example:itch_lambda;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "zatz_alpha",
+            "name": "itch_kappa",
             "schema": "dtmi:ex:dependentRef;1"
           }
         }
@@ -34,14 +34,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_zeta;1",
+        "@id": "dtmi:example:itch_omicron;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zatz_epsilon;1",
+          "@id": "dtmi:example:itch_xi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "zatz_delta",
+            "name": "itch_nu",
             "schema": [
               "dtmi:ex:dependentRef;1"
             ]
diff --git a/DTDL/v2/spec/Completion-ClassComponentTypeIncludesIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Completion-ClassComponentTypeIncludesIrrelevantDtmiOrTermV2.json
index 59cd48c9..58245984 100644
--- a/DTDL/v2/spec/Completion-ClassComponentTypeIncludesIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Completion-ClassComponentTypeIncludesIrrelevantDtmiOrTermV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_glikk;1",
+        "@id": "dtmi:example:spazz_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Component",
             "dtmi:foo:bar;1"
           ],
-          "name": "snee_humpf",
+          "name": "spazz_fuddle",
           "schema": {
-            "@id": "dtmi:example:snee_fuddle;1",
+            "@id": "dtmi:example:spazz_glikk;1",
             "@type": "Interface"
           }
         }
@@ -31,7 +31,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_quan;1",
+        "@id": "dtmi:example:spazz_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -39,9 +39,9 @@
             "Component",
             "dtmi:foo:bar;1"
           ],
-          "name": "snee_nuh",
+          "name": "spazz_snee",
           "schema": {
-            "@id": "dtmi:example:snee_snee;1",
+            "@id": "dtmi:example:spazz_quan;1",
             "@type": "Interface"
           }
         }
@@ -56,16 +56,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_floob;1",
+        "@id": "dtmi:example:spazz_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Component",
             "boolean"
           ],
-          "name": "snee_thnad",
+          "name": "spazz_spazz",
           "schema": {
-            "@id": "dtmi:example:snee_spazz;1",
+            "@id": "dtmi:example:spazz_floob;1",
             "@type": "Interface"
           }
         }
@@ -80,7 +80,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_flunn;1",
+        "@id": "dtmi:example:spazz_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -88,9 +88,9 @@
             "Component",
             "boolean"
           ],
-          "name": "snee_zatz",
+          "name": "spazz_jogg",
           "schema": {
-            "@id": "dtmi:example:snee_jogg;1",
+            "@id": "dtmi:example:spazz_flunn;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v2/spec/Completion-ClassEnumPropertyEnumValuesDependentReferenceV2.json b/DTDL/v2/spec/Completion-ClassEnumPropertyEnumValuesDependentReferenceV2.json
index 37881608..41c1a9f6 100644
--- a/DTDL/v2/spec/Completion-ClassEnumPropertyEnumValuesDependentReferenceV2.json
+++ b/DTDL/v2/spec/Completion-ClassEnumPropertyEnumValuesDependentReferenceV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_zatz;1",
+        "@id": "dtmi:example:tau_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omicron_floob",
+          "name": "tau_sigma",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
@@ -34,11 +34,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_flunn;1",
+        "@id": "dtmi:example:tau_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omicron_jogg",
+          "name": "tau_upsilon",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
diff --git a/DTDL/v2/spec/Completion-ClassEnumTypeIncludesIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Completion-ClassEnumTypeIncludesIrrelevantDtmiOrTermV2.json
index 89b36630..177aa8a7 100644
--- a/DTDL/v2/spec/Completion-ClassEnumTypeIncludesIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Completion-ClassEnumTypeIncludesIrrelevantDtmiOrTermV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_psi;1",
+        "@id": "dtmi:example:rho_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_phi;1",
+          "@id": "dtmi:example:rho_jogg;1",
           "@type": [
             "Enum",
             "dtmi:foo:bar;1"
           ],
           "enumValues": [
             {
-              "enumValue": 84,
-              "name": "xi_chi"
+              "enumValue": 91,
+              "name": "rho_flunn"
             }
           ],
           "valueSchema": "integer"
@@ -34,19 +34,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_wum;1",
+        "@id": "dtmi:example:rho_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:xi_omega;1",
+          "@id": "dtmi:example:rho_yekk;1",
           "@type": [
             "Enum",
             "dtmi:foo:bar;1"
           ],
           "enumValues": [
             {
-              "enumValue": 85,
-              "name": "xi_yuzz"
+              "enumValue": 92,
+              "name": "rho_vroo"
             }
           ],
           "valueSchema": "integer"
@@ -62,18 +62,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_fuddle;1",
+        "@id": "dtmi:example:sigma_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_um;1",
+          "@id": "dtmi:example:sigma_alpha;1",
           "@type": [
             "Enum",
             "boolean"
           ],
           "enumValues": [
             {
-              "enumValue": 86,
-              "name": "xi_humpf"
+              "enumValue": 93,
+              "name": "sigma_beta"
             }
           ],
           "valueSchema": "integer"
@@ -89,19 +89,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_snee;1",
+        "@id": "dtmi:example:sigma_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:xi_glikk;1",
+          "@id": "dtmi:example:sigma_delta;1",
           "@type": [
             "Enum",
             "boolean"
           ],
           "enumValues": [
             {
-              "enumValue": 87,
-              "name": "xi_nuh"
+              "enumValue": 94,
+              "name": "sigma_epsilon"
             }
           ],
           "valueSchema": "integer"
diff --git a/DTDL/v2/spec/Completion-ClassEnumValueTypeIncludesIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Completion-ClassEnumValueTypeIncludesIrrelevantDtmiOrTermV2.json
index 86b7bb9d..2661358c 100644
--- a/DTDL/v2/spec/Completion-ClassEnumValueTypeIncludesIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Completion-ClassEnumValueTypeIncludesIrrelevantDtmiOrTermV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_quan;1",
+        "@id": "dtmi:example:sigma_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_snee;1",
+          "@id": "dtmi:example:sigma_wum;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -18,8 +18,8 @@
               "EnumValue",
               "dtmi:foo:bar;1"
             ],
-            "enumValue": 831,
-            "name": "xi_nuh"
+            "enumValue": 844,
+            "name": "sigma_yuzz"
           }
         }
       }
@@ -33,10 +33,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_floob;1",
+        "@id": "dtmi:example:sigma_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_spazz;1",
+          "@id": "dtmi:example:sigma_fuddle;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -45,8 +45,8 @@
               "EnumValue",
               "dtmi:foo:bar;1"
             ],
-            "enumValue": 832,
-            "name": "xi_thnad"
+            "enumValue": 845,
+            "name": "sigma_humpf"
           }
         }
       }
@@ -60,10 +60,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_flunn;1",
+        "@id": "dtmi:example:sigma_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_jogg;1",
+          "@id": "dtmi:example:sigma_snee;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -71,8 +71,8 @@
               "EnumValue",
               "boolean"
             ],
-            "enumValue": 833,
-            "name": "xi_zatz"
+            "enumValue": 846,
+            "name": "sigma_nuh"
           }
         }
       }
@@ -86,10 +86,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_vroo;1",
+        "@id": "dtmi:example:sigma_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_yekk;1",
+          "@id": "dtmi:example:sigma_spazz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -98,8 +98,8 @@
               "EnumValue",
               "boolean"
             ],
-            "enumValue": 834,
-            "name": "xi_itch"
+            "enumValue": 847,
+            "name": "sigma_thnad"
           }
         }
       }
diff --git a/DTDL/v2/spec/Completion-ClassFieldPropertySchemaDependentReferenceV2.json b/DTDL/v2/spec/Completion-ClassFieldPropertySchemaDependentReferenceV2.json
index 11125372..8913c628 100644
--- a/DTDL/v2/spec/Completion-ClassFieldPropertySchemaDependentReferenceV2.json
+++ b/DTDL/v2/spec/Completion-ClassFieldPropertySchemaDependentReferenceV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_mu;1",
+        "@id": "dtmi:example:jogg_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_lambda",
+          "name": "jogg_nu",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "thnad_kappa",
+              "name": "jogg_mu",
               "schema": "dtmi:ex:dependentRef;1"
             }
           }
@@ -36,15 +36,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_omicron;1",
+        "@id": "dtmi:example:jogg_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_xi",
+          "name": "jogg_pi",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "thnad_nu",
+              "name": "jogg_omicron",
               "schema": [
                 "dtmi:ex:dependentRef;1"
               ]
diff --git a/DTDL/v2/spec/Completion-ClassFieldTypeIncludesIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Completion-ClassFieldTypeIncludesIrrelevantDtmiOrTermV2.json
index 6deb2c1e..66e4abd1 100644
--- a/DTDL/v2/spec/Completion-ClassFieldTypeIncludesIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Completion-ClassFieldTypeIncludesIrrelevantDtmiOrTermV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_phi;1",
+        "@id": "dtmi:example:beta_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_upsilon;1",
+          "@id": "dtmi:example:beta_humpf;1",
           "@type": "Object",
           "fields": {
             "@type": [
               "Field",
               "dtmi:foo:bar;1"
             ],
-            "name": "yekk_tau",
+            "name": "beta_um",
             "schema": "float"
           }
         }
@@ -32,10 +32,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_omega;1",
+        "@id": "dtmi:example:beta_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_psi;1",
+          "@id": "dtmi:example:beta_nuh;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -43,7 +43,7 @@
               "Field",
               "dtmi:foo:bar;1"
             ],
-            "name": "yekk_chi",
+            "name": "beta_glikk",
             "schema": "integer"
           }
         }
@@ -58,17 +58,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_um;1",
+        "@id": "dtmi:example:beta_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_wum;1",
+          "@id": "dtmi:example:beta_thnad;1",
           "@type": "Object",
           "fields": {
             "@type": [
               "Field",
               "boolean"
             ],
-            "name": "yekk_yuzz",
+            "name": "beta_quan",
             "schema": "long"
           }
         }
@@ -83,10 +83,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_glikk;1",
+        "@id": "dtmi:example:beta_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_fuddle;1",
+          "@id": "dtmi:example:beta_zatz;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -94,7 +94,7 @@
               "Field",
               "boolean"
             ],
-            "name": "yekk_humpf",
+            "name": "beta_floob",
             "schema": "string"
           }
         }
diff --git a/DTDL/v2/spec/Completion-ClassInterfacePropertyContentsDependentReferenceV2.json b/DTDL/v2/spec/Completion-ClassInterfacePropertyContentsDependentReferenceV2.json
index c8392260..66c6c222 100644
--- a/DTDL/v2/spec/Completion-ClassInterfacePropertyContentsDependentReferenceV2.json
+++ b/DTDL/v2/spec/Completion-ClassInterfacePropertyContentsDependentReferenceV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_yuzz;1",
+        "@id": "dtmi:example:upsilon_beta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omicron_omega;1",
+          "@id": "dtmi:example:upsilon_alpha;1",
           "@type": "Interface",
           "contents": "dtmi:ex:dependentRef;1"
         }
@@ -30,10 +30,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_um;1",
+        "@id": "dtmi:example:upsilon_delta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omicron_wum;1",
+          "@id": "dtmi:example:upsilon_gamma;1",
           "@type": "Interface",
           "contents": [
             "dtmi:ex:dependentRef;1"
diff --git a/DTDL/v2/spec/Completion-ClassInterfacePropertyExtendsDependentReferenceV2.json b/DTDL/v2/spec/Completion-ClassInterfacePropertyExtendsDependentReferenceV2.json
index 9d8b8c79..abee3cf5 100644
--- a/DTDL/v2/spec/Completion-ClassInterfacePropertyExtendsDependentReferenceV2.json
+++ b/DTDL/v2/spec/Completion-ClassInterfacePropertyExtendsDependentReferenceV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_kappa;1",
+        "@id": "dtmi:example:zeta_floob;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:beta_iota;1",
+          "@id": "dtmi:example:zeta_spazz;1",
           "@type": "Interface",
           "extends": "dtmi:ex:dependentRef;1"
         }
@@ -30,10 +30,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_mu;1",
+        "@id": "dtmi:example:zeta_jogg;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:beta_lambda;1",
+          "@id": "dtmi:example:zeta_zatz;1",
           "@type": "Interface",
           "extends": [
             "dtmi:ex:dependentRef;1"
diff --git a/DTDL/v2/spec/Completion-ClassInterfacePropertySchemasDependentReferenceV2.json b/DTDL/v2/spec/Completion-ClassInterfacePropertySchemasDependentReferenceV2.json
index c420e4e7..5c79d081 100644
--- a/DTDL/v2/spec/Completion-ClassInterfacePropertySchemasDependentReferenceV2.json
+++ b/DTDL/v2/spec/Completion-ClassInterfacePropertySchemasDependentReferenceV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_omicron;1",
+        "@id": "dtmi:example:kappa_delta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:epsilon_xi;1",
+          "@id": "dtmi:example:kappa_gamma;1",
           "@type": "Interface",
           "schemas": "dtmi:ex:dependentRef;1"
         }
@@ -30,10 +30,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_rho;1",
+        "@id": "dtmi:example:kappa_zeta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:epsilon_pi;1",
+          "@id": "dtmi:example:kappa_epsilon;1",
           "@type": "Interface",
           "schemas": [
             "dtmi:ex:dependentRef;1"
diff --git a/DTDL/v2/spec/Completion-ClassInterfaceTypeIncludesIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Completion-ClassInterfaceTypeIncludesIrrelevantDtmiOrTermV2.json
index 62962e75..e6952420 100644
--- a/DTDL/v2/spec/Completion-ClassInterfaceTypeIncludesIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Completion-ClassInterfaceTypeIncludesIrrelevantDtmiOrTermV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_jogg;1",
+        "@id": "dtmi:example:rho_gamma;1",
         "@type": [
           "Interface",
           "dtmi:foo:bar;1"
@@ -26,7 +26,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:mu_flunn;1",
+        "@id": "dtmi:example:rho_delta;1",
         "@type": [
           "Interface",
           "dtmi:foo:bar;1"
@@ -42,7 +42,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_itch;1",
+        "@id": "dtmi:example:rho_epsilon;1",
         "@type": [
           "Interface",
           "boolean"
@@ -61,7 +61,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:mu_yekk;1",
+        "@id": "dtmi:example:rho_zeta;1",
         "@type": [
           "Interface",
           "boolean"
diff --git a/DTDL/v2/spec/Completion-ClassMapKeyTypeIncludesIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Completion-ClassMapKeyTypeIncludesIrrelevantDtmiOrTermV2.json
index 7e9bfe28..3d806171 100644
--- a/DTDL/v2/spec/Completion-ClassMapKeyTypeIncludesIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Completion-ClassMapKeyTypeIncludesIrrelevantDtmiOrTermV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_zeta;1",
+        "@id": "dtmi:example:phi_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_delta;1",
+          "@id": "dtmi:example:phi_fuddle;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_epsilon",
+            "name": "phi_glikk",
             "schema": "float"
           },
           "mapKey": {
@@ -21,7 +21,7 @@
               "MapKey",
               "dtmi:foo:bar;1"
             ],
-            "name": "pi_gamma",
+            "name": "phi_humpf",
             "schema": "string"
           }
         }
@@ -36,13 +36,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_kappa;1",
+        "@id": "dtmi:example:phi_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_theta;1",
+          "@id": "dtmi:example:phi_quan;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_iota",
+            "name": "phi_thnad",
             "schema": "integer"
           },
           "mapKey": {
@@ -51,7 +51,7 @@
               "MapKey",
               "dtmi:foo:bar;1"
             ],
-            "name": "pi_eta",
+            "name": "phi_snee",
             "schema": "string"
           }
         }
@@ -66,13 +66,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_xi;1",
+        "@id": "dtmi:example:phi_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_mu;1",
+          "@id": "dtmi:example:phi_zatz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_nu",
+            "name": "phi_jogg",
             "schema": "long"
           },
           "mapKey": {
@@ -80,7 +80,7 @@
               "MapKey",
               "boolean"
             ],
-            "name": "pi_lambda",
+            "name": "phi_floob",
             "schema": "string"
           }
         }
@@ -95,13 +95,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_sigma;1",
+        "@id": "dtmi:example:phi_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_pi;1",
+          "@id": "dtmi:example:phi_yekk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_rho",
+            "name": "phi_vroo",
             "schema": "string"
           },
           "mapKey": {
@@ -110,7 +110,7 @@
               "MapKey",
               "boolean"
             ],
-            "name": "pi_omicron",
+            "name": "phi_itch",
             "schema": "string"
           }
         }
diff --git a/DTDL/v2/spec/Completion-ClassMapPropertyMapKeyDependentReferenceV2.json b/DTDL/v2/spec/Completion-ClassMapPropertyMapKeyDependentReferenceV2.json
index 0005abb8..5d6233ea 100644
--- a/DTDL/v2/spec/Completion-ClassMapPropertyMapKeyDependentReferenceV2.json
+++ b/DTDL/v2/spec/Completion-ClassMapPropertyMapKeyDependentReferenceV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_zeta;1",
+        "@id": "dtmi:example:sigma_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nu_epsilon",
+          "name": "sigma_delta",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "nu_delta",
-              "schema": "dateTime"
+              "name": "sigma_gamma",
+              "schema": "integer"
             },
             "mapKey": "dtmi:ex:dependentRef;1"
           }
@@ -37,16 +37,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_iota;1",
+        "@id": "dtmi:example:sigma_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nu_theta",
+          "name": "sigma_eta",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "nu_eta",
-              "schema": "double"
+              "name": "sigma_zeta",
+              "schema": "long"
             },
             "mapKey": [
               "dtmi:ex:dependentRef;1"
diff --git a/DTDL/v2/spec/Completion-ClassMapPropertyMapValueDependentReferenceV2.json b/DTDL/v2/spec/Completion-ClassMapPropertyMapValueDependentReferenceV2.json
index 833ad25c..d3a1a6ad 100644
--- a/DTDL/v2/spec/Completion-ClassMapPropertyMapValueDependentReferenceV2.json
+++ b/DTDL/v2/spec/Completion-ClassMapPropertyMapValueDependentReferenceV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_pi;1",
+        "@id": "dtmi:example:psi_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "sigma_omicron",
+          "name": "psi_omega",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "sigma_xi",
+              "name": "psi_psi",
               "schema": "string"
             },
             "mapValue": "dtmi:ex:dependentRef;1"
@@ -37,15 +37,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_tau;1",
+        "@id": "dtmi:example:psi_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "sigma_sigma",
+          "name": "psi_um",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "sigma_rho",
+              "name": "psi_wum",
               "schema": "string"
             },
             "mapValue": [
diff --git a/DTDL/v2/spec/Completion-ClassMapTypeIncludesIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Completion-ClassMapTypeIncludesIrrelevantDtmiOrTermV2.json
index 2bc552f6..7469ca1e 100644
--- a/DTDL/v2/spec/Completion-ClassMapTypeIncludesIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Completion-ClassMapTypeIncludesIrrelevantDtmiOrTermV2.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_iota;1",
+        "@id": "dtmi:example:omicron_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_zeta;1",
+          "@id": "dtmi:example:omicron_jogg;1",
           "@type": [
             "Map",
             "dtmi:foo:bar;1"
           ],
           "mapKey": {
-            "name": "lambda_eta",
+            "name": "omicron_flunn",
             "schema": "string"
           },
           "mapValue": {
-            "name": "lambda_theta",
-            "schema": "dateTime"
+            "name": "omicron_itch",
+            "schema": "duration"
           }
         }
       }
@@ -35,22 +35,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_nu;1",
+        "@id": "dtmi:example:pi_beta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:lambda_kappa;1",
+          "@id": "dtmi:example:omicron_vroo;1",
           "@type": [
             "Map",
             "dtmi:foo:bar;1"
           ],
           "mapKey": {
-            "name": "lambda_lambda",
+            "name": "omicron_hi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "lambda_mu",
-            "schema": "double"
+            "name": "pi_alpha",
+            "schema": "float"
           }
         }
       }
@@ -64,21 +64,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_rho;1",
+        "@id": "dtmi:example:pi_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_xi;1",
+          "@id": "dtmi:example:pi_gamma;1",
           "@type": [
             "Map",
             "boolean"
           ],
           "mapKey": {
-            "name": "lambda_omicron",
+            "name": "pi_delta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "lambda_pi",
-            "schema": "duration"
+            "name": "pi_epsilon",
+            "schema": "integer"
           }
         }
       }
@@ -92,22 +92,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_phi;1",
+        "@id": "dtmi:example:pi_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:lambda_sigma;1",
+          "@id": "dtmi:example:pi_eta;1",
           "@type": [
             "Map",
             "boolean"
           ],
           "mapKey": {
-            "name": "lambda_tau",
+            "name": "pi_theta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "lambda_upsilon",
-            "schema": "float"
+            "name": "pi_iota",
+            "schema": "long"
           }
         }
       }
diff --git a/DTDL/v2/spec/Completion-ClassMapValuePropertySchemaDependentReferenceV2.json b/DTDL/v2/spec/Completion-ClassMapValuePropertySchemaDependentReferenceV2.json
index d000cc26..bf7d01ed 100644
--- a/DTDL/v2/spec/Completion-ClassMapValuePropertySchemaDependentReferenceV2.json
+++ b/DTDL/v2/spec/Completion-ClassMapValuePropertySchemaDependentReferenceV2.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_epsilon;1",
+        "@id": "dtmi:example:delta_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "vroo_delta",
+          "name": "delta_flunn",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "vroo_gamma",
+              "name": "delta_jogg",
               "schema": "string"
             },
             "mapValue": {
-              "name": "vroo_beta",
+              "name": "delta_zatz",
               "schema": "dtmi:ex:dependentRef;1"
             }
           }
@@ -40,19 +40,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_iota;1",
+        "@id": "dtmi:example:epsilon_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "vroo_theta",
+          "name": "delta_hi",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "vroo_eta",
+              "name": "delta_vroo",
               "schema": "string"
             },
             "mapValue": {
-              "name": "vroo_zeta",
+              "name": "delta_yekk",
               "schema": [
                 "dtmi:ex:dependentRef;1"
               ]
diff --git a/DTDL/v2/spec/Completion-ClassMapValueTypeIncludesIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Completion-ClassMapValueTypeIncludesIrrelevantDtmiOrTermV2.json
index 9b6a6c2e..1d2a3f5a 100644
--- a/DTDL/v2/spec/Completion-ClassMapValueTypeIncludesIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Completion-ClassMapValueTypeIncludesIrrelevantDtmiOrTermV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_xi;1",
+        "@id": "dtmi:example:xi_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_mu;1",
+          "@id": "dtmi:example:xi_mu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_nu",
+            "name": "xi_nu",
             "schema": "string"
           },
           "mapValue": {
@@ -21,8 +21,8 @@
               "MapValue",
               "dtmi:foo:bar;1"
             ],
-            "name": "theta_lambda",
-            "schema": "boolean"
+            "name": "xi_lambda",
+            "schema": "dateTime"
           }
         }
       }
@@ -36,13 +36,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_sigma;1",
+        "@id": "dtmi:example:xi_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_pi;1",
+          "@id": "dtmi:example:xi_pi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_rho",
+            "name": "xi_rho",
             "schema": "string"
           },
           "mapValue": {
@@ -51,8 +51,8 @@
               "MapValue",
               "dtmi:foo:bar;1"
             ],
-            "name": "theta_omicron",
-            "schema": "date"
+            "name": "xi_omicron",
+            "schema": "double"
           }
         }
       }
@@ -66,13 +66,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_chi;1",
+        "@id": "dtmi:example:xi_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_upsilon;1",
+          "@id": "dtmi:example:xi_upsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_phi",
+            "name": "xi_phi",
             "schema": "string"
           },
           "mapValue": {
@@ -80,8 +80,8 @@
               "MapValue",
               "boolean"
             ],
-            "name": "theta_tau",
-            "schema": "dateTime"
+            "name": "xi_tau",
+            "schema": "duration"
           }
         }
       }
@@ -95,13 +95,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_wum;1",
+        "@id": "dtmi:example:xi_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_omega;1",
+          "@id": "dtmi:example:xi_omega;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_yuzz",
+            "name": "xi_yuzz",
             "schema": "string"
           },
           "mapValue": {
@@ -110,8 +110,8 @@
               "MapValue",
               "boolean"
             ],
-            "name": "theta_psi",
-            "schema": "double"
+            "name": "xi_psi",
+            "schema": "float"
           }
         }
       }
diff --git a/DTDL/v2/spec/Completion-ClassObjectPropertyFieldsDependentReferenceV2.json b/DTDL/v2/spec/Completion-ClassObjectPropertyFieldsDependentReferenceV2.json
index 22b876bf..25c7caf8 100644
--- a/DTDL/v2/spec/Completion-ClassObjectPropertyFieldsDependentReferenceV2.json
+++ b/DTDL/v2/spec/Completion-ClassObjectPropertyFieldsDependentReferenceV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_yekk;1",
+        "@id": "dtmi:example:floob_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_itch",
+          "name": "floob_epsilon",
           "schema": {
             "@type": "Object",
             "fields": "dtmi:ex:dependentRef;1"
@@ -33,11 +33,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_hi;1",
+        "@id": "dtmi:example:floob_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_vroo",
+          "name": "floob_eta",
           "schema": {
             "@type": "Object",
             "fields": [
diff --git a/DTDL/v2/spec/Completion-ClassObjectTypeIncludesIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Completion-ClassObjectTypeIncludesIrrelevantDtmiOrTermV2.json
index 808ca90c..60d09598 100644
--- a/DTDL/v2/spec/Completion-ClassObjectTypeIncludesIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Completion-ClassObjectTypeIncludesIrrelevantDtmiOrTermV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_um;1",
+        "@id": "dtmi:example:thnad_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_yuzz;1",
+          "@id": "dtmi:example:thnad_yuzz;1",
           "@type": [
             "Object",
             "dtmi:foo:bar;1"
           ],
           "fields": [
             {
-              "name": "humpf_wum",
-              "schema": "boolean"
+              "name": "thnad_wum",
+              "schema": "dateTime"
             }
           ]
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_glikk;1",
+        "@id": "dtmi:example:thnad_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:humpf_humpf;1",
+          "@id": "dtmi:example:thnad_humpf;1",
           "@type": [
             "Object",
             "dtmi:foo:bar;1"
           ],
           "fields": [
             {
-              "name": "humpf_fuddle",
-              "schema": "date"
+              "name": "thnad_fuddle",
+              "schema": "double"
             }
           ]
         }
@@ -60,18 +60,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_quan;1",
+        "@id": "dtmi:example:thnad_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_nuh;1",
+          "@id": "dtmi:example:thnad_nuh;1",
           "@type": [
             "Object",
             "boolean"
           ],
           "fields": [
             {
-              "name": "humpf_snee",
-              "schema": "dateTime"
+              "name": "thnad_snee",
+              "schema": "duration"
             }
           ]
         }
@@ -86,19 +86,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_floob;1",
+        "@id": "dtmi:example:thnad_floob;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:humpf_thnad;1",
+          "@id": "dtmi:example:thnad_thnad;1",
           "@type": [
             "Object",
             "boolean"
           ],
           "fields": [
             {
-              "name": "humpf_spazz",
-              "schema": "double"
+              "name": "thnad_spazz",
+              "schema": "float"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Completion-ClassPropertyPropertySchemaDependentReferenceV2.json b/DTDL/v2/spec/Completion-ClassPropertyPropertySchemaDependentReferenceV2.json
index cbe0e3d8..93da0012 100644
--- a/DTDL/v2/spec/Completion-ClassPropertyPropertySchemaDependentReferenceV2.json
+++ b/DTDL/v2/spec/Completion-ClassPropertyPropertySchemaDependentReferenceV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_quan;1",
+        "@id": "dtmi:example:sigma_mu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:lambda_snee;1",
+          "@id": "dtmi:example:sigma_lambda;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "lambda_nuh",
+            "name": "sigma_kappa",
             "schema": "dtmi:ex:dependentRef;1"
           }
         }
@@ -34,14 +34,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_floob;1",
+        "@id": "dtmi:example:sigma_omicron;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:lambda_spazz;1",
+          "@id": "dtmi:example:sigma_xi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "lambda_thnad",
+            "name": "sigma_nu",
             "schema": [
               "dtmi:ex:dependentRef;1"
             ]
diff --git a/DTDL/v2/spec/Completion-ClassPropertyTypeIncludesIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Completion-ClassPropertyTypeIncludesIrrelevantDtmiOrTermV2.json
index d59b02c2..64442a5a 100644
--- a/DTDL/v2/spec/Completion-ClassPropertyTypeIncludesIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Completion-ClassPropertyTypeIncludesIrrelevantDtmiOrTermV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_flunn;1",
+        "@id": "dtmi:example:xi_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:foo:bar;1"
           ],
-          "name": "eta_jogg",
-          "schema": "date"
+          "name": "xi_iota",
+          "schema": "long"
         }
       }
     ]
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_yekk;1",
+        "@id": "dtmi:example:xi_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,8 +36,8 @@
             "Property",
             "dtmi:foo:bar;1"
           ],
-          "name": "eta_itch",
-          "schema": "dateTime"
+          "name": "xi_lambda",
+          "schema": "string"
         }
       }
     ]
@@ -50,15 +50,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_hi;1",
+        "@id": "dtmi:example:xi_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "boolean"
           ],
-          "name": "eta_vroo",
-          "schema": "double"
+          "name": "xi_nu",
+          "schema": "time"
         }
       }
     ]
@@ -71,7 +71,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_beta;1",
+        "@id": "dtmi:example:xi_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -79,8 +79,8 @@
             "Property",
             "boolean"
           ],
-          "name": "theta_alpha",
-          "schema": "duration"
+          "name": "xi_omicron",
+          "schema": "boolean"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Completion-ClassRelationshipPropertyPropertiesDependentReferenceV2.json b/DTDL/v2/spec/Completion-ClassRelationshipPropertyPropertiesDependentReferenceV2.json
index c53a8f8f..55d28562 100644
--- a/DTDL/v2/spec/Completion-ClassRelationshipPropertyPropertiesDependentReferenceV2.json
+++ b/DTDL/v2/spec/Completion-ClassRelationshipPropertyPropertiesDependentReferenceV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_floob;1",
+        "@id": "dtmi:example:xi_zatz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:eta_spazz;1",
+          "@id": "dtmi:example:xi_floob;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "eta_thnad",
+            "name": "xi_spazz",
             "properties": "dtmi:ex:dependentRef;1"
           }
         }
@@ -34,14 +34,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_flunn;1",
+        "@id": "dtmi:example:xi_itch;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:eta_jogg;1",
+          "@id": "dtmi:example:xi_flunn;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "eta_zatz",
+            "name": "xi_jogg",
             "properties": [
               "dtmi:ex:dependentRef;1"
             ]
diff --git a/DTDL/v2/spec/Completion-ClassRelationshipTypeIncludesIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Completion-ClassRelationshipTypeIncludesIrrelevantDtmiOrTermV2.json
index 402811a6..5142eb5b 100644
--- a/DTDL/v2/spec/Completion-ClassRelationshipTypeIncludesIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Completion-ClassRelationshipTypeIncludesIrrelevantDtmiOrTermV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_glikk;1",
+        "@id": "dtmi:example:vroo_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Relationship",
             "dtmi:foo:bar;1"
           ],
-          "name": "spazz_fuddle"
+          "name": "vroo_xi"
         }
       }
     ]
@@ -27,7 +27,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_snee;1",
+        "@id": "dtmi:example:vroo_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -35,7 +35,7 @@
             "Relationship",
             "dtmi:foo:bar;1"
           ],
-          "name": "spazz_nuh"
+          "name": "vroo_pi"
         }
       }
     ]
@@ -48,14 +48,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_thnad;1",
+        "@id": "dtmi:example:vroo_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Relationship",
             "boolean"
           ],
-          "name": "spazz_quan"
+          "name": "vroo_sigma"
         }
       }
     ]
@@ -68,7 +68,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_floob;1",
+        "@id": "dtmi:example:vroo_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -76,7 +76,7 @@
             "Relationship",
             "boolean"
           ],
-          "name": "spazz_spazz"
+          "name": "vroo_upsilon"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Completion-ClassTelemetryPropertySchemaDependentReferenceV2.json b/DTDL/v2/spec/Completion-ClassTelemetryPropertySchemaDependentReferenceV2.json
index 94d829f1..5f4ad9c4 100644
--- a/DTDL/v2/spec/Completion-ClassTelemetryPropertySchemaDependentReferenceV2.json
+++ b/DTDL/v2/spec/Completion-ClassTelemetryPropertySchemaDependentReferenceV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_spazz;1",
+        "@id": "dtmi:example:theta_alpha;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:hi_thnad;1",
+          "@id": "dtmi:example:eta_hi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "hi_quan",
+            "name": "eta_vroo",
             "schema": "dtmi:ex:dependentRef;1"
           }
         }
@@ -34,14 +34,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_jogg;1",
+        "@id": "dtmi:example:theta_delta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:hi_zatz;1",
+          "@id": "dtmi:example:theta_gamma;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "hi_floob",
+            "name": "theta_beta",
             "schema": [
               "dtmi:ex:dependentRef;1"
             ]
diff --git a/DTDL/v2/spec/Completion-ClassTelemetryTypeIncludesIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Completion-ClassTelemetryTypeIncludesIrrelevantDtmiOrTermV2.json
index 96ec44f0..aa7254ba 100644
--- a/DTDL/v2/spec/Completion-ClassTelemetryTypeIncludesIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Completion-ClassTelemetryTypeIncludesIrrelevantDtmiOrTermV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_flunn;1",
+        "@id": "dtmi:example:gamma_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:foo:bar;1"
           ],
-          "name": "flunn_jogg",
+          "name": "gamma_flunn",
           "schema": "boolean"
         }
       }
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_yekk;1",
+        "@id": "dtmi:example:gamma_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,7 +36,7 @@
             "Telemetry",
             "dtmi:foo:bar;1"
           ],
-          "name": "flunn_itch",
+          "name": "gamma_yekk",
           "schema": "date"
         }
       }
@@ -50,14 +50,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_hi;1",
+        "@id": "dtmi:example:delta_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "boolean"
           ],
-          "name": "flunn_vroo",
+          "name": "gamma_hi",
           "schema": "dateTime"
         }
       }
@@ -71,7 +71,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_beta;1",
+        "@id": "dtmi:example:delta_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -79,7 +79,7 @@
             "Telemetry",
             "boolean"
           ],
-          "name": "itch_alpha",
+          "name": "delta_beta",
           "schema": "double"
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassArrayInvalidKeywordsV2.json b/DTDL/v2/spec/Recommendation-ClassArrayInvalidKeywordsV2.json
index d64db2ac..ca4cf07f 100644
--- a/DTDL/v2/spec/Recommendation-ClassArrayInvalidKeywordsV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassArrayInvalidKeywordsV2.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_theta;1",
+        "@id": "dtmi:example:upsilon_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_eta;1",
+          "@id": "dtmi:example:upsilon_eta;1",
           "@type": "Array",
-          "elementSchema": "duration",
+          "elementSchema": "integer",
           "@value": 626
         }
       }
@@ -28,12 +28,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_kappa;1",
+        "@id": "dtmi:example:upsilon_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_iota;1",
+          "@id": "dtmi:example:upsilon_iota;1",
           "@type": "Array",
-          "elementSchema": "float",
+          "elementSchema": "long",
           "@language": "en"
         }
       }
@@ -48,12 +48,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_mu;1",
+        "@id": "dtmi:example:upsilon_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_lambda;1",
+          "@id": "dtmi:example:upsilon_lambda;1",
           "@type": "Array",
-          "elementSchema": "integer",
+          "elementSchema": "string",
           "@foobar": true
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassArrayPropertyCommentTermV2.json b/DTDL/v2/spec/Recommendation-ClassArrayPropertyCommentTermV2.json
index a42438d3..3f69f693 100644
--- a/DTDL/v2/spec/Recommendation-ClassArrayPropertyCommentTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassArrayPropertyCommentTermV2.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_phi;1",
+        "@id": "dtmi:example:pi_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_tau;1",
+          "@id": "dtmi:example:pi_tau;1",
           "@type": "Array",
-          "comment": "xi_upsilon",
-          "elementSchema": "duration"
+          "comment": "pi_upsilon",
+          "elementSchema": "integer"
         }
       }
     ]
@@ -28,13 +28,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_omega;1",
+        "@id": "dtmi:example:pi_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_chi;1",
+          "@id": "dtmi:example:pi_chi;1",
           "@type": "Array",
-          "dtmi:dtdl:property:comment;2": "xi_psi",
-          "elementSchema": "float"
+          "dtmi:dtdl:property:comment;2": "pi_psi",
+          "elementSchema": "long"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassArrayPropertyDescriptionTermV2.json b/DTDL/v2/spec/Recommendation-ClassArrayPropertyDescriptionTermV2.json
index 5aeaad90..b88f0cc6 100644
--- a/DTDL/v2/spec/Recommendation-ClassArrayPropertyDescriptionTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassArrayPropertyDescriptionTermV2.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_zeta;1",
+        "@id": "dtmi:example:sigma_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_delta;1",
+          "@id": "dtmi:example:sigma_delta;1",
           "@type": "Array",
           "description": [
-            "pi_epsilon"
+            "sigma_epsilon"
           ],
-          "elementSchema": "integer"
+          "elementSchema": "string"
         }
       }
     ]
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_iota;1",
+        "@id": "dtmi:example:sigma_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_eta;1",
+          "@id": "dtmi:example:sigma_eta;1",
           "@type": "Array",
           "dtmi:dtdl:property:description;2": [
-            "pi_theta"
+            "sigma_theta"
           ],
-          "elementSchema": "long"
+          "elementSchema": "time"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassArrayPropertyDisplayNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassArrayPropertyDisplayNameTermV2.json
index 2b82db26..95d5fca1 100644
--- a/DTDL/v2/spec/Recommendation-ClassArrayPropertyDisplayNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassArrayPropertyDisplayNameTermV2.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_thnad;1",
+        "@id": "dtmi:example:tau_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_snee;1",
+          "@id": "dtmi:example:tau_snee;1",
           "@type": "Array",
           "displayName": [
-            "rho_quan"
+            "tau_quan"
           ],
-          "elementSchema": "string"
+          "elementSchema": "boolean"
         }
       }
     ]
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_zatz;1",
+        "@id": "dtmi:example:tau_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_spazz;1",
+          "@id": "dtmi:example:tau_spazz;1",
           "@type": "Array",
           "dtmi:dtdl:property:displayName;2": [
-            "rho_floob"
+            "tau_floob"
           ],
-          "elementSchema": "time"
+          "elementSchema": "date"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassArrayPropertyElementSchemaPreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassArrayPropertyElementSchemaPreferTermToDtmiV2.json
index 210c864d..7d9a386b 100644
--- a/DTDL/v2/spec/Recommendation-ClassArrayPropertyElementSchemaPreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassArrayPropertyElementSchemaPreferTermToDtmiV2.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_iota;1",
+        "@id": "dtmi:example:mu_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_theta;1",
+          "@id": "dtmi:example:mu_delta;1",
           "@type": "Array",
           "elementSchema": "date"
         }
@@ -27,10 +27,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_lambda;1",
+        "@id": "dtmi:example:mu_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_kappa;1",
+          "@id": "dtmi:example:mu_zeta;1",
           "@type": "Array",
           "elementSchema": "dtmi:dtdl:instance:Schema:date;2"
         }
@@ -46,10 +46,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_nu;1",
+        "@id": "dtmi:example:mu_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_mu;1",
+          "@id": "dtmi:example:mu_theta;1",
           "@type": "Array",
           "elementSchema": "point"
         }
@@ -65,10 +65,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_omicron;1",
+        "@id": "dtmi:example:mu_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_xi;1",
+          "@id": "dtmi:example:mu_kappa;1",
           "@type": "Array",
           "elementSchema": "dtmi:standard:schema:geospatial:point;2"
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassArrayPropertyElementSchemaTermV2.json b/DTDL/v2/spec/Recommendation-ClassArrayPropertyElementSchemaTermV2.json
index 27f15d4c..17abd1c4 100644
--- a/DTDL/v2/spec/Recommendation-ClassArrayPropertyElementSchemaTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassArrayPropertyElementSchemaTermV2.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_tau;1",
+        "@id": "dtmi:example:mu_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_sigma;1",
+          "@id": "dtmi:example:mu_xi;1",
           "@type": "Array",
           "elementSchema": "dateTime"
         }
@@ -27,10 +27,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_phi;1",
+        "@id": "dtmi:example:mu_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_upsilon;1",
+          "@id": "dtmi:example:mu_pi;1",
           "@type": "Array",
           "dtmi:dtdl:property:elementSchema;2": "double"
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassArrayTypeDuplicatesMaterialV2.json b/DTDL/v2/spec/Recommendation-ClassArrayTypeDuplicatesMaterialV2.json
index e226674f..ed411f7c 100644
--- a/DTDL/v2/spec/Recommendation-ClassArrayTypeDuplicatesMaterialV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassArrayTypeDuplicatesMaterialV2.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_kappa;1",
+        "@id": "dtmi:example:zeta_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_iota;1",
+          "@id": "dtmi:example:zeta_vroo;1",
           "elementSchema": "integer",
           "@type": [
             "Array",
@@ -30,10 +30,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_mu;1",
+        "@id": "dtmi:example:eta_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_lambda;1",
+          "@id": "dtmi:example:eta_alpha;1",
           "elementSchema": "long",
           "@type": [
             "dtmi:dtdl:class:Array;2",
diff --git a/DTDL/v2/spec/Recommendation-ClassArrayTypeIncludesTermAndDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassArrayTypeIncludesTermAndDtmiV2.json
index fa9ceb7f..4db1e65f 100644
--- a/DTDL/v2/spec/Recommendation-ClassArrayTypeIncludesTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassArrayTypeIncludesTermAndDtmiV2.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_theta;1",
+        "@id": "dtmi:example:zeta_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_eta;1",
+          "@id": "dtmi:example:zeta_itch;1",
           "elementSchema": "float",
           "@type": [
             "Array",
diff --git a/DTDL/v2/spec/Recommendation-ClassArrayTypePreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassArrayTypePreferTermToDtmiV2.json
index 198c2462..7e557488 100644
--- a/DTDL/v2/spec/Recommendation-ClassArrayTypePreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassArrayTypePreferTermToDtmiV2.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_xi;1",
+        "@id": "dtmi:example:eta_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_nu;1",
+          "@id": "dtmi:example:eta_gamma;1",
           "elementSchema": "string",
           "@type": "Array"
         }
@@ -27,10 +27,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_pi;1",
+        "@id": "dtmi:example:eta_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_omicron;1",
+          "@id": "dtmi:example:eta_epsilon;1",
           "elementSchema": "time",
           "@type": "dtmi:dtdl:class:Array;2"
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassCommandInvalidKeywordsV2.json b/DTDL/v2/spec/Recommendation-ClassCommandInvalidKeywordsV2.json
index 0c3f8544..b32cbb30 100644
--- a/DTDL/v2/spec/Recommendation-ClassCommandInvalidKeywordsV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassCommandInvalidKeywordsV2.json
@@ -8,11 +8,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_rho;1",
+        "@id": "dtmi:example:delta_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "beta_pi",
+          "name": "delta_vroo",
           "@value": 626
         }
       }
@@ -27,11 +27,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_tau;1",
+        "@id": "dtmi:example:epsilon_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "beta_sigma",
+          "name": "epsilon_alpha",
           "@language": "en"
         }
       }
@@ -46,11 +46,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_phi;1",
+        "@id": "dtmi:example:epsilon_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "beta_upsilon",
+          "name": "epsilon_gamma",
           "@foobar": true
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassCommandPayloadInvalidKeywordsV2.json b/DTDL/v2/spec/Recommendation-ClassCommandPayloadInvalidKeywordsV2.json
index 0b579e36..0729fc6b 100644
--- a/DTDL/v2/spec/Recommendation-ClassCommandPayloadInvalidKeywordsV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassCommandPayloadInvalidKeywordsV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_delta;1",
+        "@id": "dtmi:example:snee_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_gamma",
+          "name": "snee_delta",
           "request": {
-            "name": "fuddle_beta",
-            "schema": "double",
+            "name": "snee_gamma",
+            "schema": "date",
             "@value": 626
           }
         }
@@ -31,14 +31,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_eta;1",
+        "@id": "dtmi:example:snee_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_zeta",
+          "name": "snee_eta",
           "request": {
-            "name": "fuddle_epsilon",
-            "schema": "duration",
+            "name": "snee_zeta",
+            "schema": "dateTime",
             "@language": "en"
           }
         }
@@ -54,14 +54,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_kappa;1",
+        "@id": "dtmi:example:snee_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_iota",
+          "name": "snee_kappa",
           "request": {
-            "name": "fuddle_theta",
-            "schema": "float",
+            "name": "snee_iota",
+            "schema": "double",
             "@foobar": true
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassCommandPayloadPropertyCommentTermV2.json b/DTDL/v2/spec/Recommendation-ClassCommandPayloadPropertyCommentTermV2.json
index 977478db..6b076318 100644
--- a/DTDL/v2/spec/Recommendation-ClassCommandPayloadPropertyCommentTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassCommandPayloadPropertyCommentTermV2.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_quan;1",
+        "@id": "dtmi:example:wum_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_snee",
+          "name": "wum_quan",
           "request": {
-            "comment": "psi_glikk",
-            "name": "psi_nuh",
-            "schema": "double"
+            "comment": "wum_nuh",
+            "name": "wum_snee",
+            "schema": "date"
           }
         }
       }
@@ -31,15 +31,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_zatz;1",
+        "@id": "dtmi:example:wum_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_floob",
+          "name": "wum_zatz",
           "request": {
-            "dtmi:dtdl:property:comment;2": "psi_thnad",
-            "name": "psi_spazz",
-            "schema": "duration"
+            "dtmi:dtdl:property:comment;2": "wum_spazz",
+            "name": "wum_floob",
+            "schema": "dateTime"
           }
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassCommandPayloadPropertyDescriptionTermV2.json b/DTDL/v2/spec/Recommendation-ClassCommandPayloadPropertyDescriptionTermV2.json
index f61388e0..9765f354 100644
--- a/DTDL/v2/spec/Recommendation-ClassCommandPayloadPropertyDescriptionTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassCommandPayloadPropertyDescriptionTermV2.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_eta;1",
+        "@id": "dtmi:example:fuddle_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_zeta",
+          "name": "fuddle_eta",
           "request": {
             "description": [
-              "wum_delta"
+              "fuddle_epsilon"
             ],
-            "name": "wum_epsilon",
-            "schema": "float"
+            "name": "fuddle_zeta",
+            "schema": "double"
           }
         }
       }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_lambda;1",
+        "@id": "dtmi:example:fuddle_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_kappa",
+          "name": "fuddle_lambda",
           "request": {
             "dtmi:dtdl:property:description;2": [
-              "wum_theta"
+              "fuddle_iota"
             ],
-            "name": "wum_iota",
-            "schema": "integer"
+            "name": "fuddle_kappa",
+            "schema": "duration"
           }
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassCommandPayloadPropertyDisplayNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassCommandPayloadPropertyDisplayNameTermV2.json
index bc66d46f..583b8c4d 100644
--- a/DTDL/v2/spec/Recommendation-ClassCommandPayloadPropertyDisplayNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassCommandPayloadPropertyDisplayNameTermV2.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_omega;1",
+        "@id": "dtmi:example:nuh_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_psi",
+          "name": "nuh_omega",
           "request": {
             "displayName": [
-              "humpf_phi"
+              "nuh_chi"
             ],
-            "name": "humpf_chi",
-            "schema": "long"
+            "name": "nuh_psi",
+            "schema": "float"
           }
         }
       }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_humpf;1",
+        "@id": "dtmi:example:nuh_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_um",
+          "name": "nuh_humpf",
           "request": {
             "dtmi:dtdl:property:displayName;2": [
-              "humpf_yuzz"
+              "nuh_wum"
             ],
-            "name": "humpf_wum",
-            "schema": "string"
+            "name": "nuh_um",
+            "schema": "integer"
           }
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassCommandPayloadPropertyNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassCommandPayloadPropertyNameTermV2.json
index 59296726..2862cabf 100644
--- a/DTDL/v2/spec/Recommendation-ClassCommandPayloadPropertyNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassCommandPayloadPropertyNameTermV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_jogg;1",
+        "@id": "dtmi:example:theta_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_zatz",
+          "name": "theta_upsilon",
           "request": {
-            "name": "epsilon_floob",
-            "schema": "time"
+            "name": "theta_tau",
+            "schema": "float"
           }
         }
       }
@@ -30,14 +30,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_yekk;1",
+        "@id": "dtmi:example:theta_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_itch",
+          "name": "theta_psi",
           "request": {
-            "dtmi:dtdl:property:name;2": "epsilon_flunn",
-            "schema": "boolean"
+            "dtmi:dtdl:property:name;2": "theta_chi",
+            "schema": "integer"
           }
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassCommandPayloadPropertySchemaPreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassCommandPayloadPropertySchemaPreferTermToDtmiV2.json
index eea120aa..935613e1 100644
--- a/DTDL/v2/spec/Recommendation-ClassCommandPayloadPropertySchemaPreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassCommandPayloadPropertySchemaPreferTermToDtmiV2.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_lambda;1",
+        "@id": "dtmi:example:omicron_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_kappa",
+          "name": "omicron_gamma",
           "request": {
-            "name": "mu_iota",
+            "name": "omicron_beta",
             "schema": "double"
           }
         }
@@ -30,13 +30,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_xi;1",
+        "@id": "dtmi:example:omicron_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_nu",
+          "name": "omicron_zeta",
           "request": {
-            "name": "mu_mu",
+            "name": "omicron_epsilon",
             "schema": "dtmi:dtdl:instance:Schema:double;2"
           }
         }
@@ -52,13 +52,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_rho;1",
+        "@id": "dtmi:example:omicron_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_pi",
+          "name": "omicron_iota",
           "request": {
-            "name": "mu_omicron",
+            "name": "omicron_theta",
             "schema": "point"
           }
         }
@@ -74,13 +74,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_upsilon;1",
+        "@id": "dtmi:example:omicron_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_tau",
+          "name": "omicron_mu",
           "request": {
-            "name": "mu_sigma",
+            "name": "omicron_lambda",
             "schema": "dtmi:standard:schema:geospatial:point;2"
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassCommandPayloadPropertySchemaTermV2.json b/DTDL/v2/spec/Recommendation-ClassCommandPayloadPropertySchemaTermV2.json
index 4a8715e3..76ba0777 100644
--- a/DTDL/v2/spec/Recommendation-ClassCommandPayloadPropertySchemaTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassCommandPayloadPropertySchemaTermV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_wum;1",
+        "@id": "dtmi:example:omicron_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_yuzz",
+          "name": "omicron_sigma",
           "request": {
-            "name": "mu_omega",
-            "schema": "long"
+            "name": "omicron_rho",
+            "schema": "double"
           }
         }
       }
@@ -30,14 +30,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_fuddle;1",
+        "@id": "dtmi:example:omicron_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_humpf",
+          "name": "omicron_phi",
           "request": {
-            "name": "mu_um",
-            "dtmi:dtdl:property:schema;2": "string"
+            "name": "omicron_upsilon",
+            "dtmi:dtdl:property:schema;2": "duration"
           }
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassCommandPayloadTypeDuplicatesMaterialV2.json b/DTDL/v2/spec/Recommendation-ClassCommandPayloadTypeDuplicatesMaterialV2.json
index 3b561368..332a0454 100644
--- a/DTDL/v2/spec/Recommendation-ClassCommandPayloadTypeDuplicatesMaterialV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassCommandPayloadTypeDuplicatesMaterialV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_rho;1",
+        "@id": "dtmi:example:tau_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_pi",
+          "name": "tau_rho",
           "request": {
-            "name": "pi_omicron",
-            "schema": "string",
+            "name": "tau_pi",
+            "schema": "integer",
             "@type": [
               "CommandPayload",
               "CommandPayload"
@@ -34,14 +34,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_upsilon;1",
+        "@id": "dtmi:example:tau_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_tau",
+          "name": "tau_upsilon",
           "request": {
-            "name": "pi_sigma",
-            "schema": "time",
+            "name": "tau_tau",
+            "schema": "long",
             "@type": [
               "dtmi:dtdl:class:CommandPayload;2",
               "dtmi:dtdl:class:CommandPayload;2"
diff --git a/DTDL/v2/spec/Recommendation-ClassCommandPayloadTypeIncludesTermAndDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassCommandPayloadTypeIncludesTermAndDtmiV2.json
index ee559346..b5ac3ee7 100644
--- a/DTDL/v2/spec/Recommendation-ClassCommandPayloadTypeIncludesTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassCommandPayloadTypeIncludesTermAndDtmiV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_xi;1",
+        "@id": "dtmi:example:tau_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_nu",
+          "name": "tau_xi",
           "request": {
-            "name": "pi_mu",
-            "schema": "long",
+            "name": "tau_nu",
+            "schema": "float",
             "@type": [
               "CommandPayload",
               "dtmi:dtdl:class:CommandPayload;2"
diff --git a/DTDL/v2/spec/Recommendation-ClassCommandPayloadTypePreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassCommandPayloadTypePreferTermToDtmiV2.json
index 92278e14..4258c6ca 100644
--- a/DTDL/v2/spec/Recommendation-ClassCommandPayloadTypePreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassCommandPayloadTypePreferTermToDtmiV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_psi;1",
+        "@id": "dtmi:example:tau_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_chi",
+          "name": "tau_psi",
           "request": {
-            "name": "pi_phi",
-            "schema": "boolean",
+            "name": "tau_chi",
+            "schema": "string",
             "@type": "CommandPayload"
           }
         }
@@ -31,14 +31,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_wum;1",
+        "@id": "dtmi:example:tau_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_yuzz",
+          "name": "tau_wum",
           "request": {
-            "name": "pi_omega",
-            "schema": "date",
+            "name": "tau_yuzz",
+            "schema": "time",
             "@type": "dtmi:dtdl:class:CommandPayload;2"
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassCommandPropertyCommandTypeDeprecatedV2.json b/DTDL/v2/spec/Recommendation-ClassCommandPropertyCommandTypeDeprecatedV2.json
index c2aa54fd..93a8c8c3 100644
--- a/DTDL/v2/spec/Recommendation-ClassCommandPropertyCommandTypeDeprecatedV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassCommandPropertyCommandTypeDeprecatedV2.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_yekk;1",
+        "@id": "dtmi:example:fuddle_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "commandType": "asynchronous",
-          "name": "wum_itch"
+          "name": "fuddle_gamma"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassCommandPropertyCommandTypeTermV2.json b/DTDL/v2/spec/Recommendation-ClassCommandPropertyCommandTypeTermV2.json
index 5517ca1c..8ec5195b 100644
--- a/DTDL/v2/spec/Recommendation-ClassCommandPropertyCommandTypeTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassCommandPropertyCommandTypeTermV2.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_snee;1",
+        "@id": "dtmi:example:quan_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "commandType": "asynchronous",
-          "name": "nuh_nuh"
+          "name": "quan_zatz"
         }
       }
     ]
@@ -27,12 +27,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_thnad;1",
+        "@id": "dtmi:example:quan_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "dtmi:dtdl:property:commandType;2": "asynchronous",
-          "name": "nuh_quan"
+          "name": "quan_flunn"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassCommandPropertyCommentTermV2.json b/DTDL/v2/spec/Recommendation-ClassCommandPropertyCommentTermV2.json
index 5ff26494..b1af7138 100644
--- a/DTDL/v2/spec/Recommendation-ClassCommandPropertyCommentTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassCommandPropertyCommentTermV2.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_zeta;1",
+        "@id": "dtmi:example:spazz_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "comment": "quan_delta",
-          "name": "quan_epsilon"
+          "comment": "spazz_kappa",
+          "name": "spazz_lambda"
         }
       }
     ]
@@ -27,12 +27,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_iota;1",
+        "@id": "dtmi:example:spazz_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "dtmi:dtdl:property:comment;2": "quan_eta",
-          "name": "quan_theta"
+          "dtmi:dtdl:property:comment;2": "spazz_nu",
+          "name": "spazz_xi"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassCommandPropertyDescriptionTermV2.json b/DTDL/v2/spec/Recommendation-ClassCommandPropertyDescriptionTermV2.json
index 0b621889..cbfd61c4 100644
--- a/DTDL/v2/spec/Recommendation-ClassCommandPropertyDescriptionTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassCommandPropertyDescriptionTermV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_thnad;1",
+        "@id": "dtmi:example:floob_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "description": [
-            "thnad_snee"
+            "floob_jogg"
           ],
-          "name": "thnad_quan"
+          "name": "floob_flunn"
         }
       }
     ]
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_zatz;1",
+        "@id": "dtmi:example:floob_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "dtmi:dtdl:property:description;2": [
-            "thnad_spazz"
+            "floob_yekk"
           ],
-          "name": "thnad_floob"
+          "name": "floob_vroo"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassCommandPropertyDisplayNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassCommandPropertyDisplayNameTermV2.json
index ed8a4129..a4cc12ab 100644
--- a/DTDL/v2/spec/Recommendation-ClassCommandPropertyDisplayNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassCommandPropertyDisplayNameTermV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_tau;1",
+        "@id": "dtmi:example:jogg_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "displayName": [
-            "floob_rho"
+            "jogg_psi"
           ],
-          "name": "floob_sigma"
+          "name": "jogg_omega"
         }
       }
     ]
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_chi;1",
+        "@id": "dtmi:example:jogg_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "dtmi:dtdl:property:displayName;2": [
-            "floob_upsilon"
+            "jogg_wum"
           ],
-          "name": "floob_phi"
+          "name": "jogg_um"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassCommandPropertyNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassCommandPropertyNameTermV2.json
index 7087a6f0..f1712cc2 100644
--- a/DTDL/v2/spec/Recommendation-ClassCommandPropertyNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassCommandPropertyNameTermV2.json
@@ -8,11 +8,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_eta;1",
+        "@id": "dtmi:example:omega_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_zeta"
+          "name": "omega_zeta"
         }
       }
     ]
@@ -26,11 +26,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_iota;1",
+        "@id": "dtmi:example:omega_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "dtmi:dtdl:property:name;2": "chi_theta"
+          "dtmi:dtdl:property:name;2": "omega_theta"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassCommandPropertyRequestTermV2.json b/DTDL/v2/spec/Recommendation-ClassCommandPropertyRequestTermV2.json
index 64bcf4ec..6ae37f97 100644
--- a/DTDL/v2/spec/Recommendation-ClassCommandPropertyRequestTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassCommandPropertyRequestTermV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_nuh;1",
+        "@id": "dtmi:example:hi_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "itch_fuddle",
+          "name": "hi_beta",
           "request": {
-            "name": "itch_glikk",
-            "schema": "string"
+            "name": "hi_gamma",
+            "schema": "dateTime"
           }
         }
       }
@@ -30,14 +30,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_thnad;1",
+        "@id": "dtmi:example:hi_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "itch_snee",
+          "name": "hi_epsilon",
           "dtmi:dtdl:property:request;2": {
-            "name": "itch_quan",
-            "schema": "time"
+            "name": "hi_zeta",
+            "schema": "double"
           }
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassCommandPropertyResponseTermV2.json b/DTDL/v2/spec/Recommendation-ClassCommandPropertyResponseTermV2.json
index d912fb65..0466b2e1 100644
--- a/DTDL/v2/spec/Recommendation-ClassCommandPropertyResponseTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassCommandPropertyResponseTermV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_hi;1",
+        "@id": "dtmi:example:delta_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "alpha_yekk",
+          "name": "delta_omega",
           "response": {
-            "name": "alpha_vroo",
-            "schema": "boolean"
+            "name": "delta_yuzz",
+            "schema": "integer"
           }
         }
       }
@@ -30,14 +30,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_gamma;1",
+        "@id": "dtmi:example:delta_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "beta_alpha",
+          "name": "delta_um",
           "dtmi:dtdl:property:response;2": {
-            "name": "beta_beta",
-            "schema": "date"
+            "name": "delta_humpf",
+            "schema": "long"
           }
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassCommandTypeDuplicatesMaterialV2.json b/DTDL/v2/spec/Recommendation-ClassCommandTypeDuplicatesMaterialV2.json
index ce38539a..41f517cd 100644
--- a/DTDL/v2/spec/Recommendation-ClassCommandTypeDuplicatesMaterialV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassCommandTypeDuplicatesMaterialV2.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_xi;1",
+        "@id": "dtmi:example:chi_xi;1",
         "@type": "Interface",
         "contents": {
-          "name": "upsilon_nu",
+          "name": "chi_nu",
           "@type": [
             "Command",
             "Command"
@@ -29,10 +29,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_pi;1",
+        "@id": "dtmi:example:chi_pi;1",
         "@type": "Interface",
         "contents": {
-          "name": "upsilon_omicron",
+          "name": "chi_omicron",
           "@type": [
             "dtmi:dtdl:class:Command;2",
             "dtmi:dtdl:class:Command;2"
diff --git a/DTDL/v2/spec/Recommendation-ClassCommandTypeIncludesTermAndDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassCommandTypeIncludesTermAndDtmiV2.json
index 418da488..32f9f13a 100644
--- a/DTDL/v2/spec/Recommendation-ClassCommandTypeIncludesTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassCommandTypeIncludesTermAndDtmiV2.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_mu;1",
+        "@id": "dtmi:example:chi_mu;1",
         "@type": "Interface",
         "contents": {
-          "name": "upsilon_lambda",
+          "name": "chi_lambda",
           "@type": [
             "Command",
             "dtmi:dtdl:class:Command;2"
diff --git a/DTDL/v2/spec/Recommendation-ClassCommandTypePreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassCommandTypePreferTermToDtmiV2.json
index 0a5cc37c..c79fbffb 100644
--- a/DTDL/v2/spec/Recommendation-ClassCommandTypePreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassCommandTypePreferTermToDtmiV2.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_sigma;1",
+        "@id": "dtmi:example:chi_sigma;1",
         "@type": "Interface",
         "contents": {
-          "name": "upsilon_rho",
+          "name": "chi_rho",
           "@type": "Command"
         }
       }
@@ -26,10 +26,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_upsilon;1",
+        "@id": "dtmi:example:chi_upsilon;1",
         "@type": "Interface",
         "contents": {
-          "name": "upsilon_tau",
+          "name": "chi_tau",
           "@type": "dtmi:dtdl:class:Command;2"
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassComponentInvalidKeywordsV2.json b/DTDL/v2/spec/Recommendation-ClassComponentInvalidKeywordsV2.json
index 8aef4e8f..5b131a2d 100644
--- a/DTDL/v2/spec/Recommendation-ClassComponentInvalidKeywordsV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassComponentInvalidKeywordsV2.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_jogg;1",
+        "@id": "dtmi:example:xi_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "kappa_floob",
+          "name": "xi_kappa",
           "schema": {
-            "@id": "dtmi:example:kappa_zatz;1",
+            "@id": "dtmi:example:xi_lambda;1",
             "@type": "Interface"
           },
           "@value": 626
@@ -31,13 +31,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_yekk;1",
+        "@id": "dtmi:example:xi_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "kappa_flunn",
+          "name": "xi_nu",
           "schema": {
-            "@id": "dtmi:example:kappa_itch;1",
+            "@id": "dtmi:example:xi_xi;1",
             "@type": "Interface"
           },
           "@language": "en"
@@ -54,13 +54,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_alpha;1",
+        "@id": "dtmi:example:xi_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "kappa_vroo",
+          "name": "xi_pi",
           "schema": {
-            "@id": "dtmi:example:kappa_hi;1",
+            "@id": "dtmi:example:xi_rho;1",
             "@type": "Interface"
           },
           "@foobar": true
diff --git a/DTDL/v2/spec/Recommendation-ClassComponentPropertyCommentTermV2.json b/DTDL/v2/spec/Recommendation-ClassComponentPropertyCommentTermV2.json
index b968e8f1..167cc0f2 100644
--- a/DTDL/v2/spec/Recommendation-ClassComponentPropertyCommentTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassComponentPropertyCommentTermV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_omega;1",
+        "@id": "dtmi:example:theta_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "comment": "epsilon_phi",
-          "name": "epsilon_chi",
+          "comment": "theta_jogg",
+          "name": "theta_flunn",
           "schema": {
-            "@id": "dtmi:example:epsilon_psi;1",
+            "@id": "dtmi:example:theta_itch;1",
             "@type": "Interface"
           }
         }
@@ -31,14 +31,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_humpf;1",
+        "@id": "dtmi:example:iota_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "dtmi:dtdl:property:comment;2": "epsilon_yuzz",
-          "name": "epsilon_wum",
+          "dtmi:dtdl:property:comment;2": "theta_vroo",
+          "name": "theta_hi",
           "schema": {
-            "@id": "dtmi:example:epsilon_um;1",
+            "@id": "dtmi:example:iota_alpha;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassComponentPropertyDescriptionTermV2.json b/DTDL/v2/spec/Recommendation-ClassComponentPropertyDescriptionTermV2.json
index c39781df..7b0d0625 100644
--- a/DTDL/v2/spec/Recommendation-ClassComponentPropertyDescriptionTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassComponentPropertyDescriptionTermV2.json
@@ -8,16 +8,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_yekk;1",
+        "@id": "dtmi:example:lambda_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "description": [
-            "eta_jogg"
+            "lambda_mu"
           ],
-          "name": "eta_flunn",
+          "name": "lambda_nu",
           "schema": {
-            "@id": "dtmi:example:eta_itch;1",
+            "@id": "dtmi:example:lambda_xi;1",
             "@type": "Interface"
           }
         }
@@ -33,16 +33,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_beta;1",
+        "@id": "dtmi:example:lambda_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "dtmi:dtdl:property:description;2": [
-            "eta_vroo"
+            "lambda_pi"
           ],
-          "name": "eta_hi",
+          "name": "lambda_rho",
           "schema": {
-            "@id": "dtmi:example:theta_alpha;1",
+            "@id": "dtmi:example:lambda_sigma;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassComponentPropertyDisplayNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassComponentPropertyDisplayNameTermV2.json
index 4942e592..176d52d6 100644
--- a/DTDL/v2/spec/Recommendation-ClassComponentPropertyDisplayNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassComponentPropertyDisplayNameTermV2.json
@@ -8,16 +8,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_omicron;1",
+        "@id": "dtmi:example:nu_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "displayName": [
-            "kappa_mu"
+            "nu_fuddle"
           ],
-          "name": "kappa_nu",
+          "name": "nu_glikk",
           "schema": {
-            "@id": "dtmi:example:kappa_xi;1",
+            "@id": "dtmi:example:nu_nuh;1",
             "@type": "Interface"
           }
         }
@@ -33,16 +33,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_tau;1",
+        "@id": "dtmi:example:nu_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "dtmi:dtdl:property:displayName;2": [
-            "kappa_pi"
+            "nu_quan"
           ],
-          "name": "kappa_rho",
+          "name": "nu_thnad",
           "schema": {
-            "@id": "dtmi:example:kappa_sigma;1",
+            "@id": "dtmi:example:nu_spazz;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassComponentPropertyNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassComponentPropertyNameTermV2.json
index 5c7f6018..dbb2c0b6 100644
--- a/DTDL/v2/spec/Recommendation-ClassComponentPropertyNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassComponentPropertyNameTermV2.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_zatz;1",
+        "@id": "dtmi:example:jogg_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "spazz_spazz",
+          "name": "jogg_floob",
           "schema": {
-            "@id": "dtmi:example:spazz_floob;1",
+            "@id": "dtmi:example:jogg_zatz;1",
             "@type": "Interface"
           }
         }
@@ -30,13 +30,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_itch;1",
+        "@id": "dtmi:example:jogg_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "dtmi:dtdl:property:name;2": "spazz_jogg",
+          "dtmi:dtdl:property:name;2": "jogg_flunn",
           "schema": {
-            "@id": "dtmi:example:spazz_flunn;1",
+            "@id": "dtmi:example:jogg_itch;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassComponentPropertySchemaTermV2.json b/DTDL/v2/spec/Recommendation-ClassComponentPropertySchemaTermV2.json
index ac9c5321..61b88de1 100644
--- a/DTDL/v2/spec/Recommendation-ClassComponentPropertySchemaTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassComponentPropertySchemaTermV2.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_hi;1",
+        "@id": "dtmi:example:hi_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "flunn_yekk",
+          "name": "hi_eta",
           "schema": {
-            "@id": "dtmi:example:flunn_vroo;1",
+            "@id": "dtmi:example:hi_theta;1",
             "@type": "Interface"
           }
         }
@@ -30,13 +30,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_gamma;1",
+        "@id": "dtmi:example:hi_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "itch_alpha",
+          "name": "hi_kappa",
           "dtmi:dtdl:property:schema;2": {
-            "@id": "dtmi:example:itch_beta;1",
+            "@id": "dtmi:example:hi_lambda;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassComponentTypeDuplicatesMaterialV2.json b/DTDL/v2/spec/Recommendation-ClassComponentTypeDuplicatesMaterialV2.json
index a519786a..22ee5774 100644
--- a/DTDL/v2/spec/Recommendation-ClassComponentTypeDuplicatesMaterialV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassComponentTypeDuplicatesMaterialV2.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_sigma;1",
+        "@id": "dtmi:example:spazz_tau;1",
         "@type": "Interface",
         "contents": {
-          "name": "snee_pi",
+          "name": "spazz_rho",
           "schema": {
-            "@id": "dtmi:example:snee_rho;1",
+            "@id": "dtmi:example:spazz_sigma;1",
             "@type": "Interface"
           },
           "@type": [
@@ -33,12 +33,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_phi;1",
+        "@id": "dtmi:example:spazz_chi;1",
         "@type": "Interface",
         "contents": {
-          "name": "snee_tau",
+          "name": "spazz_upsilon",
           "schema": {
-            "@id": "dtmi:example:snee_upsilon;1",
+            "@id": "dtmi:example:spazz_phi;1",
             "@type": "Interface"
           },
           "@type": [
diff --git a/DTDL/v2/spec/Recommendation-ClassComponentTypeIncludesTermAndDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassComponentTypeIncludesTermAndDtmiV2.json
index 244fde3c..e92c94c5 100644
--- a/DTDL/v2/spec/Recommendation-ClassComponentTypeIncludesTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassComponentTypeIncludesTermAndDtmiV2.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_omicron;1",
+        "@id": "dtmi:example:spazz_pi;1",
         "@type": "Interface",
         "contents": {
-          "name": "snee_nu",
+          "name": "spazz_xi",
           "schema": {
-            "@id": "dtmi:example:snee_xi;1",
+            "@id": "dtmi:example:spazz_omicron;1",
             "@type": "Interface"
           },
           "@type": [
diff --git a/DTDL/v2/spec/Recommendation-ClassComponentTypePreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassComponentTypePreferTermToDtmiV2.json
index 2e1314ff..a20d712b 100644
--- a/DTDL/v2/spec/Recommendation-ClassComponentTypePreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassComponentTypePreferTermToDtmiV2.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_omega;1",
+        "@id": "dtmi:example:spazz_yuzz;1",
         "@type": "Interface",
         "contents": {
-          "name": "snee_chi",
+          "name": "spazz_psi",
           "schema": {
-            "@id": "dtmi:example:snee_psi;1",
+            "@id": "dtmi:example:spazz_omega;1",
             "@type": "Interface"
           },
           "@type": "Component"
@@ -30,12 +30,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_um;1",
+        "@id": "dtmi:example:spazz_humpf;1",
         "@type": "Interface",
         "contents": {
-          "name": "snee_yuzz",
+          "name": "spazz_wum",
           "schema": {
-            "@id": "dtmi:example:snee_wum;1",
+            "@id": "dtmi:example:spazz_um;1",
             "@type": "Interface"
           },
           "@type": "dtmi:dtdl:class:Component;2"
diff --git a/DTDL/v2/spec/Recommendation-ClassEnumInvalidKeywordsV2.json b/DTDL/v2/spec/Recommendation-ClassEnumInvalidKeywordsV2.json
index 5f7c843a..34890345 100644
--- a/DTDL/v2/spec/Recommendation-ClassEnumInvalidKeywordsV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassEnumInvalidKeywordsV2.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_alpha;1",
+        "@id": "dtmi:example:zeta_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_vroo;1",
+          "@id": "dtmi:example:zeta_glikk;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 694,
-              "name": "beta_hi"
+              "enumValue": 705,
+              "name": "zeta_nuh"
             }
           ],
           "valueSchema": "integer",
@@ -34,15 +34,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_delta;1",
+        "@id": "dtmi:example:zeta_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_beta;1",
+          "@id": "dtmi:example:zeta_quan;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 695,
-              "name": "gamma_gamma"
+              "enumValue": 706,
+              "name": "zeta_thnad"
             }
           ],
           "valueSchema": "integer",
@@ -60,15 +60,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_eta;1",
+        "@id": "dtmi:example:zeta_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_epsilon;1",
+          "@id": "dtmi:example:zeta_floob;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 696,
-              "name": "gamma_zeta"
+              "enumValue": 707,
+              "name": "zeta_zatz"
             }
           ],
           "valueSchema": "integer",
diff --git a/DTDL/v2/spec/Recommendation-ClassEnumPropertyCommentTermV2.json b/DTDL/v2/spec/Recommendation-ClassEnumPropertyCommentTermV2.json
index cc3df472..76abf4c2 100644
--- a/DTDL/v2/spec/Recommendation-ClassEnumPropertyCommentTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassEnumPropertyCommentTermV2.json
@@ -8,16 +8,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_glikk;1",
+        "@id": "dtmi:example:alpha_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_um;1",
+          "@id": "dtmi:example:alpha_omicron;1",
           "@type": "Enum",
-          "comment": "itch_humpf",
+          "comment": "alpha_pi",
           "enumValues": [
             {
-              "enumValue": 624,
-              "name": "itch_fuddle"
+              "enumValue": 635,
+              "name": "alpha_rho"
             }
           ],
           "valueSchema": "integer"
@@ -34,16 +34,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_thnad;1",
+        "@id": "dtmi:example:alpha_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_nuh;1",
+          "@id": "dtmi:example:alpha_tau;1",
           "@type": "Enum",
-          "dtmi:dtdl:property:comment;2": "itch_snee",
+          "dtmi:dtdl:property:comment;2": "alpha_upsilon",
           "enumValues": [
             {
-              "enumValue": 625,
-              "name": "itch_quan"
+              "enumValue": 636,
+              "name": "alpha_phi"
             }
           ],
           "valueSchema": "integer"
diff --git a/DTDL/v2/spec/Recommendation-ClassEnumPropertyDescriptionTermV2.json b/DTDL/v2/spec/Recommendation-ClassEnumPropertyDescriptionTermV2.json
index e07a9e99..c6a416cc 100644
--- a/DTDL/v2/spec/Recommendation-ClassEnumPropertyDescriptionTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassEnumPropertyDescriptionTermV2.json
@@ -8,18 +8,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_delta;1",
+        "@id": "dtmi:example:gamma_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_alpha;1",
+          "@id": "dtmi:example:gamma_snee;1",
           "@type": "Enum",
           "description": [
-            "hi_beta"
+            "gamma_quan"
           ],
           "enumValues": [
             {
-              "enumValue": 656,
-              "name": "hi_gamma"
+              "enumValue": 667,
+              "name": "gamma_thnad"
             }
           ],
           "valueSchema": "integer"
@@ -36,18 +36,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_theta;1",
+        "@id": "dtmi:example:gamma_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_epsilon;1",
+          "@id": "dtmi:example:gamma_floob;1",
           "@type": "Enum",
           "dtmi:dtdl:property:description;2": [
-            "hi_zeta"
+            "gamma_zatz"
           ],
           "enumValues": [
             {
-              "enumValue": 657,
-              "name": "hi_eta"
+              "enumValue": 668,
+              "name": "gamma_jogg"
             }
           ],
           "valueSchema": "integer"
diff --git a/DTDL/v2/spec/Recommendation-ClassEnumPropertyDisplayNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassEnumPropertyDisplayNameTermV2.json
index ca735b38..3ea00682 100644
--- a/DTDL/v2/spec/Recommendation-ClassEnumPropertyDisplayNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassEnumPropertyDisplayNameTermV2.json
@@ -8,18 +8,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_phi;1",
+        "@id": "dtmi:example:zeta_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_sigma;1",
+          "@id": "dtmi:example:zeta_zeta;1",
           "@type": "Enum",
           "displayName": [
-            "beta_tau"
+            "zeta_eta"
           ],
           "enumValues": [
             {
-              "enumValue": 688,
-              "name": "beta_upsilon"
+              "enumValue": 699,
+              "name": "zeta_theta"
             }
           ],
           "valueSchema": "integer"
@@ -36,18 +36,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_yuzz;1",
+        "@id": "dtmi:example:zeta_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_chi;1",
+          "@id": "dtmi:example:zeta_kappa;1",
           "@type": "Enum",
           "dtmi:dtdl:property:displayName;2": [
-            "beta_psi"
+            "zeta_lambda"
           ],
           "enumValues": [
             {
-              "enumValue": 689,
-              "name": "beta_omega"
+              "enumValue": 700,
+              "name": "zeta_mu"
             }
           ],
           "valueSchema": "integer"
diff --git a/DTDL/v2/spec/Recommendation-ClassEnumPropertyEnumValuesTermV2.json b/DTDL/v2/spec/Recommendation-ClassEnumPropertyEnumValuesTermV2.json
index 03782c67..5c0ee175 100644
--- a/DTDL/v2/spec/Recommendation-ClassEnumPropertyEnumValuesTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassEnumPropertyEnumValuesTermV2.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_gamma;1",
+        "@id": "dtmi:example:fuddle_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_alpha;1",
+          "@id": "dtmi:example:fuddle_wum;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 407,
-              "name": "wum_beta"
+              "enumValue": 416,
+              "name": "fuddle_um"
             }
           ],
           "valueSchema": "integer"
@@ -33,15 +33,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_zeta;1",
+        "@id": "dtmi:example:fuddle_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_delta;1",
+          "@id": "dtmi:example:fuddle_fuddle;1",
           "@type": "Enum",
           "dtmi:dtdl:property:enumValues;2": [
             {
-              "enumValue": 408,
-              "name": "wum_epsilon"
+              "enumValue": 417,
+              "name": "fuddle_glikk"
             }
           ],
           "valueSchema": "integer"
diff --git a/DTDL/v2/spec/Recommendation-ClassEnumPropertyValueSchemaTermV2.json b/DTDL/v2/spec/Recommendation-ClassEnumPropertyValueSchemaTermV2.json
index 4b953801..5cecc916 100644
--- a/DTDL/v2/spec/Recommendation-ClassEnumPropertyValueSchemaTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassEnumPropertyValueSchemaTermV2.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_zatz;1",
+        "@id": "dtmi:example:zatz_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_spazz;1",
+          "@id": "dtmi:example:zatz_rho;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 504,
-              "name": "quan_floob"
+              "enumValue": 513,
+              "name": "zatz_sigma"
             }
           ],
           "valueSchema": "integer"
@@ -33,15 +33,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_itch;1",
+        "@id": "dtmi:example:zatz_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_jogg;1",
+          "@id": "dtmi:example:zatz_upsilon;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 505,
-              "name": "quan_flunn"
+              "enumValue": 514,
+              "name": "zatz_phi"
             }
           ],
           "dtmi:dtdl:property:valueSchema;2": "integer"
diff --git a/DTDL/v2/spec/Recommendation-ClassEnumPropertyValueSchemaValueIntegerPreferToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassEnumPropertyValueSchemaValueIntegerPreferToDtmiV2.json
index 41afaece..3d2cc47c 100644
--- a/DTDL/v2/spec/Recommendation-ClassEnumPropertyValueSchemaValueIntegerPreferToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassEnumPropertyValueSchemaValueIntegerPreferToDtmiV2.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_chi;1",
+        "@id": "dtmi:example:zatz_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_phi;1",
+          "@id": "dtmi:example:zatz_gamma;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "quan_upsilon",
+            "name": "zatz_beta",
             "enumValue": 3
           },
           "valueSchema": "integer"
@@ -31,13 +31,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_yuzz;1",
+        "@id": "dtmi:example:zatz_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_omega;1",
+          "@id": "dtmi:example:zatz_zeta;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "quan_psi",
+            "name": "zatz_epsilon",
             "enumValue": 3
           },
           "valueSchema": "dtmi:dtdl:instance:Schema:integer;2"
diff --git a/DTDL/v2/spec/Recommendation-ClassEnumPropertyValueSchemaValueStringPreferToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassEnumPropertyValueSchemaValueStringPreferToDtmiV2.json
index 28ac17ef..d4323d2a 100644
--- a/DTDL/v2/spec/Recommendation-ClassEnumPropertyValueSchemaValueStringPreferToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassEnumPropertyValueSchemaValueStringPreferToDtmiV2.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_humpf;1",
+        "@id": "dtmi:example:zatz_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_um;1",
+          "@id": "dtmi:example:zatz_iota;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "quan_wum",
+            "name": "zatz_theta",
             "enumValue": "alpha_tau"
           },
           "valueSchema": "string"
@@ -31,13 +31,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_nuh;1",
+        "@id": "dtmi:example:zatz_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_glikk;1",
+          "@id": "dtmi:example:zatz_mu;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "quan_fuddle",
+            "name": "zatz_lambda",
             "enumValue": "alpha_tau"
           },
           "valueSchema": "dtmi:dtdl:instance:Schema:string;2"
diff --git a/DTDL/v2/spec/Recommendation-ClassEnumTypeDuplicatesMaterialV2.json b/DTDL/v2/spec/Recommendation-ClassEnumTypeDuplicatesMaterialV2.json
index 3598240f..18cb1a3e 100644
--- a/DTDL/v2/spec/Recommendation-ClassEnumTypeDuplicatesMaterialV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassEnumTypeDuplicatesMaterialV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_lambda;1",
+        "@id": "dtmi:example:rho_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_iota;1",
+          "@id": "dtmi:example:rho_wum;1",
           "enumValues": [
             {
-              "enumValue": 80,
-              "name": "xi_kappa"
+              "enumValue": 87,
+              "name": "rho_um"
             }
           ],
           "valueSchema": "integer",
@@ -36,14 +36,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_xi;1",
+        "@id": "dtmi:example:rho_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_mu;1",
+          "@id": "dtmi:example:rho_fuddle;1",
           "enumValues": [
             {
-              "enumValue": 81,
-              "name": "xi_nu"
+              "enumValue": 88,
+              "name": "rho_glikk"
             }
           ],
           "valueSchema": "integer",
diff --git a/DTDL/v2/spec/Recommendation-ClassEnumTypeIncludesTermAndDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassEnumTypeIncludesTermAndDtmiV2.json
index f3ca1174..41654337 100644
--- a/DTDL/v2/spec/Recommendation-ClassEnumTypeIncludesTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassEnumTypeIncludesTermAndDtmiV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_theta;1",
+        "@id": "dtmi:example:rho_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_zeta;1",
+          "@id": "dtmi:example:rho_psi;1",
           "enumValues": [
             {
-              "enumValue": 79,
-              "name": "xi_eta"
+              "enumValue": 86,
+              "name": "rho_omega"
             }
           ],
           "valueSchema": "integer",
diff --git a/DTDL/v2/spec/Recommendation-ClassEnumTypePreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassEnumTypePreferTermToDtmiV2.json
index 81e7ffb4..ae6ace53 100644
--- a/DTDL/v2/spec/Recommendation-ClassEnumTypePreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassEnumTypePreferTermToDtmiV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_rho;1",
+        "@id": "dtmi:example:rho_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_omicron;1",
+          "@id": "dtmi:example:rho_snee;1",
           "enumValues": [
             {
-              "enumValue": 82,
-              "name": "xi_pi"
+              "enumValue": 89,
+              "name": "rho_quan"
             }
           ],
           "valueSchema": "integer",
@@ -33,14 +33,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_upsilon;1",
+        "@id": "dtmi:example:rho_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_sigma;1",
+          "@id": "dtmi:example:rho_spazz;1",
           "enumValues": [
             {
-              "enumValue": 83,
-              "name": "xi_tau"
+              "enumValue": 90,
+              "name": "rho_floob"
             }
           ],
           "valueSchema": "integer",
diff --git a/DTDL/v2/spec/Recommendation-ClassEnumValueInvalidKeywordsV2.json b/DTDL/v2/spec/Recommendation-ClassEnumValueInvalidKeywordsV2.json
index 5b061ef6..5fe7c187 100644
--- a/DTDL/v2/spec/Recommendation-ClassEnumValueInvalidKeywordsV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassEnumValueInvalidKeywordsV2.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_theta;1",
+        "@id": "dtmi:example:nuh_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_eta;1",
+          "@id": "dtmi:example:nuh_alpha;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1002,
-            "name": "um_zeta",
+            "enumValue": 1015,
+            "name": "glikk_hi",
             "@value": 626
           }
         }
@@ -32,15 +32,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_lambda;1",
+        "@id": "dtmi:example:nuh_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_kappa;1",
+          "@id": "dtmi:example:nuh_delta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1003,
-            "name": "um_iota",
+            "enumValue": 1016,
+            "name": "nuh_gamma",
             "@language": "en"
           }
         }
@@ -56,15 +56,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_xi;1",
+        "@id": "dtmi:example:nuh_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_nu;1",
+          "@id": "dtmi:example:nuh_eta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1004,
-            "name": "um_mu",
+            "enumValue": 1017,
+            "name": "nuh_zeta",
             "@foobar": true
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassEnumValuePropertyCommentTermV2.json b/DTDL/v2/spec/Recommendation-ClassEnumValuePropertyCommentTermV2.json
index 7ea91701..80b8abb0 100644
--- a/DTDL/v2/spec/Recommendation-ClassEnumValuePropertyCommentTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassEnumValuePropertyCommentTermV2.json
@@ -8,16 +8,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_zatz;1",
+        "@id": "dtmi:example:yuzz_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_floob;1",
+          "@id": "dtmi:example:yuzz_glikk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "comment": "phi_thnad",
-            "enumValue": 932,
-            "name": "phi_spazz"
+            "comment": "yuzz_humpf",
+            "enumValue": 945,
+            "name": "yuzz_fuddle"
           }
         }
       }
@@ -32,16 +32,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_yekk;1",
+        "@id": "dtmi:example:yuzz_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_itch;1",
+          "@id": "dtmi:example:yuzz_thnad;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "dtmi:dtdl:property:comment;2": "phi_jogg",
-            "enumValue": 933,
-            "name": "phi_flunn"
+            "dtmi:dtdl:property:comment;2": "yuzz_snee",
+            "enumValue": 946,
+            "name": "yuzz_quan"
           }
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassEnumValuePropertyDescriptionTermV2.json b/DTDL/v2/spec/Recommendation-ClassEnumValuePropertyDescriptionTermV2.json
index 52e9f7db..8254e132 100644
--- a/DTDL/v2/spec/Recommendation-ClassEnumValuePropertyDescriptionTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassEnumValuePropertyDescriptionTermV2.json
@@ -8,18 +8,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_lambda;1",
+        "@id": "dtmi:example:humpf_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_kappa;1",
+          "@id": "dtmi:example:humpf_delta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "description": [
-              "omega_theta"
+              "humpf_beta"
             ],
-            "enumValue": 964,
-            "name": "omega_iota"
+            "enumValue": 977,
+            "name": "humpf_gamma"
           }
         }
       }
@@ -34,18 +34,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_omicron;1",
+        "@id": "dtmi:example:humpf_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_xi;1",
+          "@id": "dtmi:example:humpf_theta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "dtmi:dtdl:property:description;2": [
-              "omega_mu"
+              "humpf_zeta"
             ],
-            "enumValue": 965,
-            "name": "omega_nu"
+            "enumValue": 978,
+            "name": "humpf_eta"
           }
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassEnumValuePropertyDisplayNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassEnumValuePropertyDisplayNameTermV2.json
index bf776d7d..df1c594e 100644
--- a/DTDL/v2/spec/Recommendation-ClassEnumValuePropertyDisplayNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassEnumValuePropertyDisplayNameTermV2.json
@@ -8,18 +8,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_humpf;1",
+        "@id": "dtmi:example:glikk_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_um;1",
+          "@id": "dtmi:example:glikk_phi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "displayName": [
-              "wum_yuzz"
+              "glikk_tau"
             ],
-            "enumValue": 996,
-            "name": "wum_wum"
+            "enumValue": 1009,
+            "name": "glikk_upsilon"
           }
         }
       }
@@ -34,18 +34,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_snee;1",
+        "@id": "dtmi:example:glikk_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_nuh;1",
+          "@id": "dtmi:example:glikk_yuzz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "dtmi:dtdl:property:displayName;2": [
-              "wum_fuddle"
+              "glikk_psi"
             ],
-            "enumValue": 997,
-            "name": "wum_glikk"
+            "enumValue": 1010,
+            "name": "glikk_omega"
           }
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassEnumValuePropertyEnumValueTermV2.json b/DTDL/v2/spec/Recommendation-ClassEnumValuePropertyEnumValueTermV2.json
index f455caa2..7bdd8cc1 100644
--- a/DTDL/v2/spec/Recommendation-ClassEnumValuePropertyEnumValueTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassEnumValuePropertyEnumValueTermV2.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_iota;1",
+        "@id": "dtmi:example:lambda_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_theta;1",
+          "@id": "dtmi:example:lambda_flunn;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 715,
-            "name": "theta_eta"
+            "enumValue": 726,
+            "name": "lambda_jogg"
           }
         }
       }
@@ -31,15 +31,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_mu;1",
+        "@id": "dtmi:example:lambda_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_lambda;1",
+          "@id": "dtmi:example:lambda_vroo;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "dtmi:dtdl:property:enumValue;2": 716,
-            "name": "theta_kappa"
+            "dtmi:dtdl:property:enumValue;2": 727,
+            "name": "lambda_yekk"
           }
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassEnumValuePropertyNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassEnumValuePropertyNameTermV2.json
index aeba15a4..949d1a92 100644
--- a/DTDL/v2/spec/Recommendation-ClassEnumValuePropertyNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassEnumValuePropertyNameTermV2.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_alpha;1",
+        "@id": "dtmi:example:xi_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_hi;1",
+          "@id": "dtmi:example:xi_nuh;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 778,
-            "name": "kappa_vroo"
+            "enumValue": 789,
+            "name": "xi_glikk"
           }
         }
       }
@@ -31,15 +31,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_delta;1",
+        "@id": "dtmi:example:xi_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_gamma;1",
+          "@id": "dtmi:example:xi_thnad;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 779,
-            "dtmi:dtdl:property:name;2": "lambda_beta"
+            "enumValue": 790,
+            "dtmi:dtdl:property:name;2": "xi_quan"
           }
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassEnumValueTypeDuplicatesMaterialV2.json b/DTDL/v2/spec/Recommendation-ClassEnumValueTypeDuplicatesMaterialV2.json
index 70d158fa..f02028e7 100644
--- a/DTDL/v2/spec/Recommendation-ClassEnumValueTypeDuplicatesMaterialV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassEnumValueTypeDuplicatesMaterialV2.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_phi;1",
+        "@id": "dtmi:example:sigma_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_upsilon;1",
+          "@id": "dtmi:example:sigma_xi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 827,
-            "name": "xi_tau",
+            "enumValue": 840,
+            "name": "sigma_nu",
             "@type": [
               "EnumValue",
               "EnumValue"
@@ -35,15 +35,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_omega;1",
+        "@id": "dtmi:example:sigma_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_psi;1",
+          "@id": "dtmi:example:sigma_rho;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 828,
-            "name": "xi_chi",
+            "enumValue": 841,
+            "name": "sigma_pi",
             "@type": [
               "dtmi:dtdl:class:EnumValue;2",
               "dtmi:dtdl:class:EnumValue;2"
diff --git a/DTDL/v2/spec/Recommendation-ClassEnumValueTypeIncludesTermAndDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassEnumValueTypeIncludesTermAndDtmiV2.json
index 40a535e7..528c9e57 100644
--- a/DTDL/v2/spec/Recommendation-ClassEnumValueTypeIncludesTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassEnumValueTypeIncludesTermAndDtmiV2.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_sigma;1",
+        "@id": "dtmi:example:sigma_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_rho;1",
+          "@id": "dtmi:example:sigma_lambda;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 826,
-            "name": "xi_pi",
+            "enumValue": 839,
+            "name": "sigma_kappa",
             "@type": [
               "EnumValue",
               "dtmi:dtdl:class:EnumValue;2"
diff --git a/DTDL/v2/spec/Recommendation-ClassEnumValueTypePreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassEnumValueTypePreferTermToDtmiV2.json
index b3093350..3daab7c6 100644
--- a/DTDL/v2/spec/Recommendation-ClassEnumValueTypePreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassEnumValueTypePreferTermToDtmiV2.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_um;1",
+        "@id": "dtmi:example:sigma_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_wum;1",
+          "@id": "dtmi:example:sigma_upsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 829,
-            "name": "xi_yuzz",
+            "enumValue": 842,
+            "name": "sigma_tau",
             "@type": "EnumValue"
           }
         }
@@ -32,15 +32,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_glikk;1",
+        "@id": "dtmi:example:sigma_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_fuddle;1",
+          "@id": "dtmi:example:sigma_psi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 830,
-            "name": "xi_humpf",
+            "enumValue": 843,
+            "name": "sigma_chi",
             "@type": "dtmi:dtdl:class:EnumValue;2"
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassFieldInvalidKeywordsV2.json b/DTDL/v2/spec/Recommendation-ClassFieldInvalidKeywordsV2.json
index 637d5c98..2fbf98d9 100644
--- a/DTDL/v2/spec/Recommendation-ClassFieldInvalidKeywordsV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassFieldInvalidKeywordsV2.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_flunn;1",
+        "@id": "dtmi:example:omicron_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_jogg;1",
+          "@id": "dtmi:example:omicron_gamma;1",
           "@type": "Object",
           "fields": {
-            "name": "kappa_zatz",
+            "name": "omicron_beta",
             "schema": "integer",
             "@value": 626
           }
@@ -31,13 +31,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_vroo;1",
+        "@id": "dtmi:example:omicron_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_yekk;1",
+          "@id": "dtmi:example:omicron_zeta;1",
           "@type": "Object",
           "fields": {
-            "name": "kappa_itch",
+            "name": "omicron_epsilon",
             "schema": "long",
             "@language": "en"
           }
@@ -54,13 +54,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_beta;1",
+        "@id": "dtmi:example:omicron_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_alpha;1",
+          "@id": "dtmi:example:omicron_iota;1",
           "@type": "Object",
           "fields": {
-            "name": "kappa_hi",
+            "name": "omicron_theta",
             "schema": "string",
             "@foobar": true
           }
diff --git a/DTDL/v2/spec/Recommendation-ClassFieldPropertyCommentTermV2.json b/DTDL/v2/spec/Recommendation-ClassFieldPropertyCommentTermV2.json
index 5dad0581..6a685200 100644
--- a/DTDL/v2/spec/Recommendation-ClassFieldPropertyCommentTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassFieldPropertyCommentTermV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_yuzz;1",
+        "@id": "dtmi:example:iota_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_omega;1",
+          "@id": "dtmi:example:iota_snee;1",
           "@type": "Object",
           "fields": {
-            "comment": "epsilon_chi",
-            "name": "epsilon_psi",
+            "comment": "iota_glikk",
+            "name": "iota_nuh",
             "schema": "integer"
           }
         }
@@ -31,14 +31,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_fuddle;1",
+        "@id": "dtmi:example:iota_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_humpf;1",
+          "@id": "dtmi:example:iota_floob;1",
           "@type": "Object",
           "fields": {
-            "dtmi:dtdl:property:comment;2": "epsilon_wum",
-            "name": "epsilon_um",
+            "dtmi:dtdl:property:comment;2": "iota_thnad",
+            "name": "iota_spazz",
             "schema": "long"
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassFieldPropertyDescriptionTermV2.json b/DTDL/v2/spec/Recommendation-ClassFieldPropertyDescriptionTermV2.json
index 590903d1..6f883f7c 100644
--- a/DTDL/v2/spec/Recommendation-ClassFieldPropertyDescriptionTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassFieldPropertyDescriptionTermV2.json
@@ -8,16 +8,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_vroo;1",
+        "@id": "dtmi:example:mu_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_yekk;1",
+          "@id": "dtmi:example:mu_zeta;1",
           "@type": "Object",
           "fields": {
             "description": [
-              "eta_flunn"
+              "mu_delta"
             ],
-            "name": "eta_itch",
+            "name": "mu_epsilon",
             "schema": "string"
           }
         }
@@ -33,16 +33,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_gamma;1",
+        "@id": "dtmi:example:mu_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_beta;1",
+          "@id": "dtmi:example:mu_kappa;1",
           "@type": "Object",
           "fields": {
             "dtmi:dtdl:property:description;2": [
-              "eta_hi"
+              "mu_theta"
             ],
-            "name": "theta_alpha",
+            "name": "mu_iota",
             "schema": "time"
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassFieldPropertyDisplayNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassFieldPropertyDisplayNameTermV2.json
index 554232e6..c9f9f571 100644
--- a/DTDL/v2/spec/Recommendation-ClassFieldPropertyDisplayNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassFieldPropertyDisplayNameTermV2.json
@@ -8,16 +8,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_pi;1",
+        "@id": "dtmi:example:xi_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_omicron;1",
+          "@id": "dtmi:example:xi_psi;1",
           "@type": "Object",
           "fields": {
             "displayName": [
-              "kappa_nu"
+              "xi_phi"
             ],
-            "name": "kappa_xi",
+            "name": "xi_chi",
             "schema": "boolean"
           }
         }
@@ -33,16 +33,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_upsilon;1",
+        "@id": "dtmi:example:xi_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_tau;1",
+          "@id": "dtmi:example:xi_um;1",
           "@type": "Object",
           "fields": {
             "dtmi:dtdl:property:displayName;2": [
-              "kappa_rho"
+              "xi_yuzz"
             ],
-            "name": "kappa_sigma",
+            "name": "xi_wum",
             "schema": "date"
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassFieldPropertyNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassFieldPropertyNameTermV2.json
index 68443a5f..84f9d842 100644
--- a/DTDL/v2/spec/Recommendation-ClassFieldPropertyNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassFieldPropertyNameTermV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_iota;1",
+        "@id": "dtmi:example:spazz_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_theta;1",
+          "@id": "dtmi:example:spazz_beta;1",
           "@type": "Object",
           "fields": {
-            "name": "nuh_eta",
-            "schema": "dateTime"
+            "name": "spazz_alpha",
+            "schema": "boolean"
           }
         }
       }
@@ -30,14 +30,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_mu;1",
+        "@id": "dtmi:example:spazz_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_lambda;1",
+          "@id": "dtmi:example:spazz_epsilon;1",
           "@type": "Object",
           "fields": {
-            "dtmi:dtdl:property:name;2": "nuh_kappa",
-            "schema": "double"
+            "dtmi:dtdl:property:name;2": "spazz_delta",
+            "schema": "date"
           }
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassFieldPropertySchemaPreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassFieldPropertySchemaPreferTermToDtmiV2.json
index 7bddef08..b15ae065 100644
--- a/DTDL/v2/spec/Recommendation-ClassFieldPropertySchemaPreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassFieldPropertySchemaPreferTermToDtmiV2.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_tau;1",
+        "@id": "dtmi:example:yekk_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_sigma;1",
+          "@id": "dtmi:example:yekk_upsilon;1",
           "@type": "Object",
           "fields": {
-            "name": "zatz_rho",
+            "name": "yekk_tau",
             "schema": "float"
           }
         }
@@ -30,13 +30,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_chi;1",
+        "@id": "dtmi:example:yekk_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_phi;1",
+          "@id": "dtmi:example:yekk_psi;1",
           "@type": "Object",
           "fields": {
-            "name": "zatz_upsilon",
+            "name": "yekk_chi",
             "schema": "dtmi:dtdl:instance:Schema:float;2"
           }
         }
@@ -52,13 +52,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_yuzz;1",
+        "@id": "dtmi:example:yekk_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_omega;1",
+          "@id": "dtmi:example:yekk_wum;1",
           "@type": "Object",
           "fields": {
-            "name": "zatz_psi",
+            "name": "yekk_yuzz",
             "schema": "point"
           }
         }
@@ -74,13 +74,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_humpf;1",
+        "@id": "dtmi:example:yekk_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_um;1",
+          "@id": "dtmi:example:yekk_fuddle;1",
           "@type": "Object",
           "fields": {
-            "name": "zatz_wum",
+            "name": "yekk_humpf",
             "schema": "dtmi:standard:schema:geospatial:point;2"
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassFieldPropertySchemaTermV2.json b/DTDL/v2/spec/Recommendation-ClassFieldPropertySchemaTermV2.json
index f5052d10..b4709fbb 100644
--- a/DTDL/v2/spec/Recommendation-ClassFieldPropertySchemaTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassFieldPropertySchemaTermV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_thnad;1",
+        "@id": "dtmi:example:yekk_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_quan;1",
+          "@id": "dtmi:example:yekk_spazz;1",
           "@type": "Object",
           "fields": {
-            "name": "zatz_snee",
-            "schema": "boolean"
+            "name": "yekk_thnad",
+            "schema": "string"
           }
         }
       }
@@ -30,14 +30,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_zatz;1",
+        "@id": "dtmi:example:yekk_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_floob;1",
+          "@id": "dtmi:example:yekk_jogg;1",
           "@type": "Object",
           "fields": {
-            "name": "zatz_spazz",
-            "dtmi:dtdl:property:schema;2": "date"
+            "name": "yekk_zatz",
+            "dtmi:dtdl:property:schema;2": "time"
           }
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassFieldTypeDuplicatesMaterialV2.json b/DTDL/v2/spec/Recommendation-ClassFieldTypeDuplicatesMaterialV2.json
index ff62b38d..a719bbce 100644
--- a/DTDL/v2/spec/Recommendation-ClassFieldTypeDuplicatesMaterialV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassFieldTypeDuplicatesMaterialV2.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_iota;1",
+        "@id": "dtmi:example:beta_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_theta;1",
+          "@id": "dtmi:example:beta_pi;1",
           "@type": "Object",
           "fields": {
-            "name": "yekk_eta",
+            "name": "beta_omicron",
             "schema": "date",
             "@type": [
               "Field",
@@ -34,13 +34,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_mu;1",
+        "@id": "dtmi:example:beta_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_lambda;1",
+          "@id": "dtmi:example:beta_tau;1",
           "@type": "Object",
           "fields": {
-            "name": "yekk_kappa",
+            "name": "beta_sigma",
             "schema": "dateTime",
             "@type": [
               "dtmi:dtdl:class:Field;2",
diff --git a/DTDL/v2/spec/Recommendation-ClassFieldTypeIncludesTermAndDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassFieldTypeIncludesTermAndDtmiV2.json
index 6dfd35be..b9ca2fcc 100644
--- a/DTDL/v2/spec/Recommendation-ClassFieldTypeIncludesTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassFieldTypeIncludesTermAndDtmiV2.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_zeta;1",
+        "@id": "dtmi:example:beta_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_epsilon;1",
+          "@id": "dtmi:example:beta_nu;1",
           "@type": "Object",
           "fields": {
-            "name": "yekk_delta",
+            "name": "beta_mu",
             "schema": "boolean",
             "@type": [
               "Field",
diff --git a/DTDL/v2/spec/Recommendation-ClassFieldTypePreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassFieldTypePreferTermToDtmiV2.json
index 2133cb0b..b0d45228 100644
--- a/DTDL/v2/spec/Recommendation-ClassFieldTypePreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassFieldTypePreferTermToDtmiV2.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_omicron;1",
+        "@id": "dtmi:example:beta_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_xi;1",
+          "@id": "dtmi:example:beta_chi;1",
           "@type": "Object",
           "fields": {
-            "name": "yekk_nu",
+            "name": "beta_phi",
             "schema": "double",
             "@type": "Field"
           }
@@ -31,13 +31,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_sigma;1",
+        "@id": "dtmi:example:beta_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_rho;1",
+          "@id": "dtmi:example:beta_yuzz;1",
           "@type": "Object",
           "fields": {
-            "name": "yekk_pi",
+            "name": "beta_omega",
             "schema": "duration",
             "@type": "dtmi:dtdl:class:Field;2"
           }
diff --git a/DTDL/v2/spec/Recommendation-ClassInterfaceInvalidKeywordsV2.json b/DTDL/v2/spec/Recommendation-ClassInterfaceInvalidKeywordsV2.json
index c8f6b3b1..150cb1ec 100644
--- a/DTDL/v2/spec/Recommendation-ClassInterfaceInvalidKeywordsV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassInterfaceInvalidKeywordsV2.json
@@ -8,7 +8,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_omega;1",
+        "@id": "dtmi:example:mu_nu;1",
         "@type": "Interface",
         "@value": 626
       }
@@ -23,7 +23,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_yuzz;1",
+        "@id": "dtmi:example:mu_xi;1",
         "@type": "Interface",
         "@language": "en"
       }
@@ -38,7 +38,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_wum;1",
+        "@id": "dtmi:example:mu_omicron;1",
         "@type": "Interface",
         "@foobar": true
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassInterfacePropertyCommentTermV2.json b/DTDL/v2/spec/Recommendation-ClassInterfacePropertyCommentTermV2.json
index c27c155e..71d7821b 100644
--- a/DTDL/v2/spec/Recommendation-ClassInterfacePropertyCommentTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassInterfacePropertyCommentTermV2.json
@@ -8,9 +8,9 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_snee;1",
+        "@id": "dtmi:example:tau_alpha;1",
         "@type": "Interface",
-        "comment": "xi_quan"
+        "comment": "tau_beta"
       }
     ]
   },
@@ -23,9 +23,9 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_thnad;1",
+        "@id": "dtmi:example:tau_gamma;1",
         "@type": "Interface",
-        "dtmi:dtdl:property:comment;2": "xi_spazz"
+        "dtmi:dtdl:property:comment;2": "tau_delta"
       }
     ]
   }
diff --git a/DTDL/v2/spec/Recommendation-ClassInterfacePropertyContentsTermV2.json b/DTDL/v2/spec/Recommendation-ClassInterfacePropertyContentsTermV2.json
index ccdbc02c..a5da5c9c 100644
--- a/DTDL/v2/spec/Recommendation-ClassInterfacePropertyContentsTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassInterfacePropertyContentsTermV2.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_humpf;1",
+        "@id": "dtmi:example:delta_epsilon;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Command",
-            "name": "vroo_fuddle"
+            "name": "delta_zeta"
           }
         ]
       }
@@ -28,12 +28,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_glikk;1",
+        "@id": "dtmi:example:delta_eta;1",
         "@type": "Interface",
         "dtmi:dtdl:property:contents;2": [
           {
             "@type": "Command",
-            "name": "vroo_nuh"
+            "name": "delta_theta"
           }
         ]
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassInterfacePropertyDescriptionTermV2.json b/DTDL/v2/spec/Recommendation-ClassInterfacePropertyDescriptionTermV2.json
index cffaccd5..42c6c862 100644
--- a/DTDL/v2/spec/Recommendation-ClassInterfacePropertyDescriptionTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassInterfacePropertyDescriptionTermV2.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_omega;1",
+        "@id": "dtmi:example:epsilon_alpha;1",
         "@type": "Interface",
         "description": [
-          "hi_yuzz"
+          "epsilon_beta"
         ]
       }
     ]
@@ -25,10 +25,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_wum;1",
+        "@id": "dtmi:example:epsilon_gamma;1",
         "@type": "Interface",
         "dtmi:dtdl:property:description;2": [
-          "hi_um"
+          "epsilon_delta"
         ]
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassInterfacePropertyDisplayNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassInterfacePropertyDisplayNameTermV2.json
index 9b91612f..0562244d 100644
--- a/DTDL/v2/spec/Recommendation-ClassInterfacePropertyDisplayNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassInterfacePropertyDisplayNameTermV2.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_upsilon;1",
+        "@id": "dtmi:example:epsilon_itch;1",
         "@type": "Interface",
         "displayName": [
-          "alpha_phi"
+          "epsilon_yekk"
         ]
       }
     ]
@@ -25,10 +25,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_chi;1",
+        "@id": "dtmi:example:epsilon_vroo;1",
         "@type": "Interface",
         "dtmi:dtdl:property:displayName;2": [
-          "alpha_psi"
+          "epsilon_hi"
         ]
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassInterfacePropertyExtendsTermV2.json b/DTDL/v2/spec/Recommendation-ClassInterfacePropertyExtendsTermV2.json
index fb40aa16..48d3418f 100644
--- a/DTDL/v2/spec/Recommendation-ClassInterfacePropertyExtendsTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassInterfacePropertyExtendsTermV2.json
@@ -8,11 +8,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_humpf;1",
+        "@id": "dtmi:example:iota_lambda;1",
         "@type": "Interface",
         "extends": [
           {
-            "@id": "dtmi:example:delta_fuddle;1",
+            "@id": "dtmi:example:iota_mu;1",
             "@type": "Interface"
           }
         ]
@@ -28,11 +28,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_glikk;1",
+        "@id": "dtmi:example:iota_nu;1",
         "@type": "Interface",
         "dtmi:dtdl:property:extends;2": [
           {
-            "@id": "dtmi:example:delta_nuh;1",
+            "@id": "dtmi:example:iota_xi;1",
             "@type": "Interface"
           }
         ]
diff --git a/DTDL/v2/spec/Recommendation-ClassInterfacePropertySchemasTermV2.json b/DTDL/v2/spec/Recommendation-ClassInterfacePropertySchemasTermV2.json
index d7065415..10f19b0e 100644
--- a/DTDL/v2/spec/Recommendation-ClassInterfacePropertySchemasTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassInterfacePropertySchemasTermV2.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_mu;1",
+        "@id": "dtmi:example:mu_alpha;1",
         "@type": "Interface",
         "schemas": [
           {
-            "@id": "dtmi:example:eta_nu;1",
+            "@id": "dtmi:example:mu_beta;1",
             "@type": "Array",
-            "elementSchema": "double"
+            "elementSchema": "float"
           }
         ]
       }
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_xi;1",
+        "@id": "dtmi:example:mu_gamma;1",
         "@type": "Interface",
         "dtmi:dtdl:property:schemas;2": [
           {
-            "@id": "dtmi:example:eta_omicron;1",
+            "@id": "dtmi:example:mu_delta;1",
             "@type": "Array",
-            "elementSchema": "duration"
+            "elementSchema": "integer"
           }
         ]
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassInterfaceTypeDuplicatesMaterialV2.json b/DTDL/v2/spec/Recommendation-ClassInterfaceTypeDuplicatesMaterialV2.json
index 05acc06b..d653e99a 100644
--- a/DTDL/v2/spec/Recommendation-ClassInterfaceTypeDuplicatesMaterialV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassInterfaceTypeDuplicatesMaterialV2.json
@@ -8,7 +8,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_thnad;1",
+        "@id": "dtmi:example:pi_vroo;1",
         "@type": [
           "Interface",
           "Interface"
@@ -25,7 +25,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_spazz;1",
+        "@id": "dtmi:example:pi_hi;1",
         "@type": [
           "dtmi:dtdl:class:Interface;2",
           "dtmi:dtdl:class:Interface;2"
diff --git a/DTDL/v2/spec/Recommendation-ClassInterfaceTypeIncludesTermAndDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassInterfaceTypeIncludesTermAndDtmiV2.json
index 5a2e18b2..85256325 100644
--- a/DTDL/v2/spec/Recommendation-ClassInterfaceTypeIncludesTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassInterfaceTypeIncludesTermAndDtmiV2.json
@@ -8,7 +8,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_quan;1",
+        "@id": "dtmi:example:pi_yekk;1",
         "@type": [
           "Interface",
           "dtmi:dtdl:class:Interface;2"
diff --git a/DTDL/v2/spec/Recommendation-ClassInterfaceTypePreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassInterfaceTypePreferTermToDtmiV2.json
index 7b6657b1..4286987e 100644
--- a/DTDL/v2/spec/Recommendation-ClassInterfaceTypePreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassInterfaceTypePreferTermToDtmiV2.json
@@ -8,7 +8,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_floob;1",
+        "@id": "dtmi:example:rho_alpha;1",
         "@type": "Interface"
       }
     ]
@@ -22,7 +22,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_zatz;1",
+        "@id": "dtmi:example:rho_beta;1",
         "@type": "dtmi:dtdl:class:Interface;2"
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassMapInvalidKeywordsV2.json b/DTDL/v2/spec/Recommendation-ClassMapInvalidKeywordsV2.json
index a6736ed1..075bcff9 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapInvalidKeywordsV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapInvalidKeywordsV2.json
@@ -8,18 +8,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_um;1",
+        "@id": "dtmi:example:alpha_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_omega;1",
+          "@id": "dtmi:example:hi_yekk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_yuzz",
+            "name": "hi_vroo",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_wum",
-            "schema": "dateTime"
+            "name": "hi_hi",
+            "schema": "boolean"
           },
           "@value": 626
         }
@@ -35,18 +35,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_nuh;1",
+        "@id": "dtmi:example:alpha_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_humpf;1",
+          "@id": "dtmi:example:alpha_beta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_fuddle",
+            "name": "alpha_gamma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_glikk",
-            "schema": "double"
+            "name": "alpha_delta",
+            "schema": "date"
           },
           "@language": "en"
         }
@@ -62,18 +62,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_spazz;1",
+        "@id": "dtmi:example:alpha_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_snee;1",
+          "@id": "dtmi:example:alpha_zeta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_quan",
+            "name": "alpha_eta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_thnad",
-            "schema": "duration"
+            "name": "alpha_theta",
+            "schema": "dateTime"
           },
           "@foobar": true
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassMapKeyInvalidKeywordsV2.json b/DTDL/v2/spec/Recommendation-ClassMapKeyInvalidKeywordsV2.json
index 7c8d0672..01856256 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapKeyInvalidKeywordsV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapKeyInvalidKeywordsV2.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_psi;1",
+        "@id": "dtmi:example:jogg_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_phi;1",
+          "@id": "dtmi:example:jogg_gamma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "snee_chi",
+            "name": "jogg_delta",
             "schema": "integer"
           },
           "mapKey": {
-            "name": "snee_upsilon",
+            "name": "jogg_beta",
             "schema": "string",
             "@value": 626
           }
@@ -35,17 +35,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_um;1",
+        "@id": "dtmi:example:jogg_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_yuzz;1",
+          "@id": "dtmi:example:jogg_eta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "snee_wum",
+            "name": "jogg_theta",
             "schema": "long"
           },
           "mapKey": {
-            "name": "snee_omega",
+            "name": "jogg_zeta",
             "schema": "string",
             "@language": "en"
           }
@@ -62,17 +62,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_nuh;1",
+        "@id": "dtmi:example:jogg_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_fuddle;1",
+          "@id": "dtmi:example:jogg_lambda;1",
           "@type": "Map",
           "mapValue": {
-            "name": "snee_glikk",
+            "name": "jogg_mu",
             "schema": "string"
           },
           "mapKey": {
-            "name": "snee_humpf",
+            "name": "jogg_kappa",
             "schema": "string",
             "@foobar": true
           }
diff --git a/DTDL/v2/spec/Recommendation-ClassMapKeyPropertyCommentTermV2.json b/DTDL/v2/spec/Recommendation-ClassMapKeyPropertyCommentTermV2.json
index ff74f941..edd43308 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapKeyPropertyCommentTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapKeyPropertyCommentTermV2.json
@@ -8,18 +8,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_yuzz;1",
+        "@id": "dtmi:example:nuh_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_psi;1",
+          "@id": "dtmi:example:nuh_epsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_omega",
+            "name": "nuh_zeta",
             "schema": "integer"
           },
           "mapKey": {
-            "comment": "yuzz_phi",
-            "name": "yuzz_chi",
+            "comment": "nuh_gamma",
+            "name": "nuh_delta",
             "schema": "string"
           }
         }
@@ -35,18 +35,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_glikk;1",
+        "@id": "dtmi:example:nuh_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_humpf;1",
+          "@id": "dtmi:example:nuh_kappa;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_fuddle",
+            "name": "nuh_lambda",
             "schema": "long"
           },
           "mapKey": {
-            "dtmi:dtdl:property:comment;2": "yuzz_wum",
-            "name": "yuzz_um",
+            "dtmi:dtdl:property:comment;2": "nuh_theta",
+            "name": "nuh_iota",
             "schema": "string"
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassMapKeyPropertyDescriptionTermV2.json b/DTDL/v2/spec/Recommendation-ClassMapKeyPropertyDescriptionTermV2.json
index 1e60b7fb..79838c6c 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapKeyPropertyDescriptionTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapKeyPropertyDescriptionTermV2.json
@@ -8,20 +8,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_nuh;1",
+        "@id": "dtmi:example:thnad_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_fuddle;1",
+          "@id": "dtmi:example:thnad_lambda;1",
           "@type": "Map",
           "mapValue": {
-            "name": "humpf_glikk",
+            "name": "thnad_mu",
             "schema": "string"
           },
           "mapKey": {
             "description": [
-              "humpf_um"
+              "thnad_iota"
             ],
-            "name": "humpf_humpf",
+            "name": "thnad_kappa",
             "schema": "string"
           }
         }
@@ -37,20 +37,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_floob;1",
+        "@id": "dtmi:example:thnad_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_thnad;1",
+          "@id": "dtmi:example:thnad_pi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "humpf_spazz",
+            "name": "thnad_rho",
             "schema": "time"
           },
           "mapKey": {
             "dtmi:dtdl:property:description;2": [
-              "humpf_snee"
+              "thnad_xi"
             ],
-            "name": "humpf_quan",
+            "name": "thnad_omicron",
             "schema": "string"
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassMapKeyPropertyDisplayNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassMapKeyPropertyDisplayNameTermV2.json
index 7c5fc221..baa8ff29 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapKeyPropertyDisplayNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapKeyPropertyDisplayNameTermV2.json
@@ -8,20 +8,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_zatz;1",
+        "@id": "dtmi:example:zatz_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_spazz;1",
+          "@id": "dtmi:example:zatz_rho;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nuh_floob",
+            "name": "zatz_sigma",
             "schema": "boolean"
           },
           "mapKey": {
             "displayName": [
-              "nuh_quan"
+              "zatz_omicron"
             ],
-            "name": "nuh_thnad",
+            "name": "zatz_pi",
             "schema": "string"
           }
         }
@@ -37,20 +37,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_vroo;1",
+        "@id": "dtmi:example:zatz_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_itch;1",
+          "@id": "dtmi:example:zatz_chi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nuh_yekk",
+            "name": "zatz_psi",
             "schema": "date"
           },
           "mapKey": {
             "dtmi:dtdl:property:displayName;2": [
-              "nuh_jogg"
+              "zatz_upsilon"
             ],
-            "name": "nuh_flunn",
+            "name": "zatz_phi",
             "schema": "string"
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassMapKeyPropertyNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassMapKeyPropertyNameTermV2.json
index f8e71c3e..ab2d1767 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapKeyPropertyNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapKeyPropertyNameTermV2.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_iota;1",
+        "@id": "dtmi:example:zeta_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_eta;1",
+          "@id": "dtmi:example:zeta_omega;1",
           "@type": "Map",
           "mapValue": {
-            "name": "alpha_theta",
-            "schema": "float"
+            "name": "zeta_yuzz",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "alpha_zeta",
+            "name": "zeta_psi",
             "schema": "string"
           }
         }
@@ -34,17 +34,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_nu;1",
+        "@id": "dtmi:example:zeta_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_lambda;1",
+          "@id": "dtmi:example:zeta_humpf;1",
           "@type": "Map",
           "mapValue": {
-            "name": "alpha_mu",
-            "schema": "integer"
+            "name": "zeta_fuddle",
+            "schema": "duration"
           },
           "mapKey": {
-            "dtmi:dtdl:property:name;2": "alpha_kappa",
+            "dtmi:dtdl:property:name;2": "zeta_um",
             "schema": "string"
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassMapKeyPropertySchemaTermV2.json b/DTDL/v2/spec/Recommendation-ClassMapKeyPropertySchemaTermV2.json
index 955de495..3020773e 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapKeyPropertySchemaTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapKeyPropertySchemaTermV2.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_iota;1",
+        "@id": "dtmi:example:pi_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_eta;1",
+          "@id": "dtmi:example:pi_omega;1",
           "@type": "Map",
           "mapValue": {
-            "name": "lambda_theta",
-            "schema": "dateTime"
+            "name": "pi_yuzz",
+            "schema": "boolean"
           },
           "mapKey": {
-            "name": "lambda_zeta",
+            "name": "pi_psi",
             "schema": "string"
           }
         }
@@ -34,17 +34,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_nu;1",
+        "@id": "dtmi:example:pi_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_lambda;1",
+          "@id": "dtmi:example:pi_humpf;1",
           "@type": "Map",
           "mapValue": {
-            "name": "lambda_mu",
-            "schema": "double"
+            "name": "pi_fuddle",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "lambda_kappa",
+            "name": "pi_um",
             "dtmi:dtdl:property:schema;2": "string"
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassMapKeyPropertySchemaValueStringPreferToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassMapKeyPropertySchemaValueStringPreferToDtmiV2.json
index 561aaa7e..4c686813 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapKeyPropertySchemaValueStringPreferToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapKeyPropertySchemaValueStringPreferToDtmiV2.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_itch;1",
+        "@id": "dtmi:example:pi_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_jogg;1",
+          "@id": "dtmi:example:pi_mu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_flunn",
-            "schema": "time"
+            "name": "pi_nu",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "kappa_zatz",
+            "name": "pi_lambda",
             "schema": "string"
           }
         }
@@ -34,17 +34,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_alpha;1",
+        "@id": "dtmi:example:pi_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_vroo;1",
+          "@id": "dtmi:example:pi_pi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_hi",
-            "schema": "boolean"
+            "name": "pi_rho",
+            "schema": "string"
           },
           "mapKey": {
-            "name": "kappa_yekk",
+            "name": "pi_omicron",
             "schema": "dtmi:dtdl:instance:Schema:string;2"
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassMapKeyTypeDuplicatesMaterialV2.json b/DTDL/v2/spec/Recommendation-ClassMapKeyTypeDuplicatesMaterialV2.json
index f96b2a74..2d542c98 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapKeyTypeDuplicatesMaterialV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapKeyTypeDuplicatesMaterialV2.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_quan;1",
+        "@id": "dtmi:example:phi_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_nuh;1",
+          "@id": "dtmi:example:phi_nu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_snee",
+            "name": "phi_xi",
             "schema": "date"
           },
           "mapKey": {
-            "name": "omicron_glikk",
+            "name": "phi_mu",
             "schema": "string",
             "@type": [
               "MapKey",
@@ -38,17 +38,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_zatz;1",
+        "@id": "dtmi:example:phi_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_spazz;1",
+          "@id": "dtmi:example:phi_rho;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_floob",
+            "name": "phi_sigma",
             "schema": "dateTime"
           },
           "mapKey": {
-            "name": "omicron_thnad",
+            "name": "phi_pi",
             "schema": "string",
             "@type": [
               "dtmi:dtdl:class:MapKey;2",
diff --git a/DTDL/v2/spec/Recommendation-ClassMapKeyTypeIncludesTermAndDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassMapKeyTypeIncludesTermAndDtmiV2.json
index 83e81c27..636834d2 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapKeyTypeIncludesTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapKeyTypeIncludesTermAndDtmiV2.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_fuddle;1",
+        "@id": "dtmi:example:phi_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_um;1",
+          "@id": "dtmi:example:phi_iota;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_humpf",
+            "name": "phi_kappa",
             "schema": "boolean"
           },
           "mapKey": {
-            "name": "omicron_wum",
+            "name": "phi_theta",
             "schema": "string",
             "@type": [
               "MapKey",
diff --git a/DTDL/v2/spec/Recommendation-ClassMapKeyTypePreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassMapKeyTypePreferTermToDtmiV2.json
index c47319a5..6d616373 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapKeyTypePreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapKeyTypePreferTermToDtmiV2.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_yekk;1",
+        "@id": "dtmi:example:phi_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_flunn;1",
+          "@id": "dtmi:example:phi_phi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_itch",
+            "name": "phi_chi",
             "schema": "double"
           },
           "mapKey": {
-            "name": "omicron_jogg",
+            "name": "phi_upsilon",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -35,17 +35,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_beta;1",
+        "@id": "dtmi:example:phi_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_hi;1",
+          "@id": "dtmi:example:phi_yuzz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_alpha",
+            "name": "phi_wum",
             "schema": "duration"
           },
           "mapKey": {
-            "name": "omicron_vroo",
+            "name": "phi_omega",
             "schema": "string",
             "@type": "dtmi:dtdl:class:MapKey;2"
           }
diff --git a/DTDL/v2/spec/Recommendation-ClassMapPropertyCommentTermV2.json b/DTDL/v2/spec/Recommendation-ClassMapPropertyCommentTermV2.json
index cf790481..e5a0f3bc 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapPropertyCommentTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapPropertyCommentTermV2.json
@@ -8,19 +8,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_fuddle;1",
+        "@id": "dtmi:example:zatz_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_yuzz;1",
+          "@id": "dtmi:example:floob_vroo;1",
           "@type": "Map",
-          "comment": "nuh_wum",
+          "comment": "floob_hi",
           "mapKey": {
-            "name": "nuh_um",
+            "name": "zatz_alpha",
             "schema": "string"
           },
           "mapValue": {
-            "name": "nuh_humpf",
-            "schema": "dateTime"
+            "name": "zatz_beta",
+            "schema": "boolean"
           }
         }
       }
@@ -35,19 +35,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_thnad;1",
+        "@id": "dtmi:example:zatz_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_glikk;1",
+          "@id": "dtmi:example:zatz_delta;1",
           "@type": "Map",
-          "dtmi:dtdl:property:comment;2": "nuh_nuh",
+          "dtmi:dtdl:property:comment;2": "zatz_epsilon",
           "mapKey": {
-            "name": "nuh_snee",
+            "name": "zatz_zeta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "nuh_quan",
-            "schema": "double"
+            "name": "zatz_eta",
+            "schema": "date"
           }
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassMapPropertyDescriptionTermV2.json b/DTDL/v2/spec/Recommendation-ClassMapPropertyDescriptionTermV2.json
index 5b599500..8c0191c0 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapPropertyDescriptionTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapPropertyDescriptionTermV2.json
@@ -8,21 +8,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_spazz;1",
+        "@id": "dtmi:example:itch_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_nuh;1",
+          "@id": "dtmi:example:itch_epsilon;1",
           "@type": "Map",
           "description": [
-            "thnad_snee"
+            "itch_zeta"
           ],
           "mapKey": {
-            "name": "thnad_quan",
+            "name": "itch_eta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "thnad_thnad",
-            "schema": "duration"
+            "name": "itch_theta",
+            "schema": "dateTime"
           }
         }
       }
@@ -37,21 +37,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_itch;1",
+        "@id": "dtmi:example:itch_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_floob;1",
+          "@id": "dtmi:example:itch_kappa;1",
           "@type": "Map",
           "dtmi:dtdl:property:description;2": [
-            "thnad_zatz"
+            "itch_lambda"
           ],
           "mapKey": {
-            "name": "thnad_jogg",
+            "name": "itch_mu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "thnad_flunn",
-            "schema": "float"
+            "name": "itch_nu",
+            "schema": "double"
           }
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassMapPropertyDisplayNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassMapPropertyDisplayNameTermV2.json
index 1e3e11f4..0f97076b 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapPropertyDisplayNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapPropertyDisplayNameTermV2.json
@@ -8,21 +8,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_yekk;1",
+        "@id": "dtmi:example:hi_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_zatz;1",
+          "@id": "dtmi:example:hi_lambda;1",
           "@type": "Map",
           "displayName": [
-            "zatz_jogg"
+            "hi_mu"
           ],
           "mapKey": {
-            "name": "zatz_flunn",
+            "name": "hi_nu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_itch",
-            "schema": "integer"
+            "name": "hi_xi",
+            "schema": "duration"
           }
         }
       }
@@ -37,21 +37,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_gamma;1",
+        "@id": "dtmi:example:hi_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_vroo;1",
+          "@id": "dtmi:example:hi_pi;1",
           "@type": "Map",
           "dtmi:dtdl:property:displayName;2": [
-            "zatz_hi"
+            "hi_rho"
           ],
           "mapKey": {
-            "name": "jogg_alpha",
+            "name": "hi_sigma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_beta",
-            "schema": "long"
+            "name": "hi_tau",
+            "schema": "float"
           }
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassMapPropertyMapKeyTermV2.json b/DTDL/v2/spec/Recommendation-ClassMapPropertyMapKeyTermV2.json
index 80bf175d..1c38093c 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapPropertyMapKeyTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapPropertyMapKeyTermV2.json
@@ -8,18 +8,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_quan;1",
+        "@id": "dtmi:example:phi_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_glikk;1",
+          "@id": "dtmi:example:phi_fuddle;1",
           "@type": "Map",
           "mapKey": {
-            "name": "pi_nuh",
+            "name": "phi_glikk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "pi_snee",
-            "schema": "boolean"
+            "name": "phi_nuh",
+            "schema": "duration"
           }
         }
       }
@@ -34,18 +34,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_zatz;1",
+        "@id": "dtmi:example:phi_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_thnad;1",
+          "@id": "dtmi:example:phi_quan;1",
           "@type": "Map",
           "dtmi:dtdl:property:mapKey;2": {
-            "name": "pi_spazz",
+            "name": "phi_thnad",
             "schema": "string"
           },
           "mapValue": {
-            "name": "pi_floob",
-            "schema": "date"
+            "name": "phi_spazz",
+            "schema": "float"
           }
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassMapPropertyMapValueTermV2.json b/DTDL/v2/spec/Recommendation-ClassMapPropertyMapValueTermV2.json
index 3df19d78..d4fe7055 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapPropertyMapValueTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapPropertyMapValueTermV2.json
@@ -8,18 +8,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_hi;1",
+        "@id": "dtmi:example:um_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_itch;1",
+          "@id": "dtmi:example:um_zeta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_yekk",
+            "name": "um_eta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "phi_vroo",
-            "schema": "boolean"
+            "name": "um_theta",
+            "schema": "integer"
           }
         }
       }
@@ -34,18 +34,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_delta;1",
+        "@id": "dtmi:example:um_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_alpha;1",
+          "@id": "dtmi:example:um_kappa;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_beta",
+            "name": "um_lambda",
             "schema": "string"
           },
           "dtmi:dtdl:property:mapValue;2": {
-            "name": "chi_gamma",
-            "schema": "date"
+            "name": "um_mu",
+            "schema": "long"
           }
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassMapTypeDuplicatesMaterialV2.json b/DTDL/v2/spec/Recommendation-ClassMapTypeDuplicatesMaterialV2.json
index 3edcfb02..92ddde97 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapTypeDuplicatesMaterialV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapTypeDuplicatesMaterialV2.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_floob;1",
+        "@id": "dtmi:example:omicron_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_quan;1",
+          "@id": "dtmi:example:omicron_chi;1",
           "mapKey": {
-            "name": "kappa_thnad",
+            "name": "omicron_psi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "kappa_spazz",
-            "schema": "string"
+            "name": "omicron_omega",
+            "schema": "boolean"
           },
           "@type": [
             "Map",
@@ -37,17 +37,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_itch;1",
+        "@id": "dtmi:example:omicron_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_zatz;1",
+          "@id": "dtmi:example:omicron_wum;1",
           "mapKey": {
-            "name": "kappa_jogg",
+            "name": "omicron_um",
             "schema": "string"
           },
           "mapValue": {
-            "name": "kappa_flunn",
-            "schema": "time"
+            "name": "omicron_humpf",
+            "schema": "date"
           },
           "@type": [
             "dtmi:dtdl:class:Map;2",
diff --git a/DTDL/v2/spec/Recommendation-ClassMapTypeIncludesTermAndDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassMapTypeIncludesTermAndDtmiV2.json
index 3cc8eaba..43f79708 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapTypeIncludesTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapTypeIncludesTermAndDtmiV2.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_snee;1",
+        "@id": "dtmi:example:omicron_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_fuddle;1",
+          "@id": "dtmi:example:omicron_sigma;1",
           "mapKey": {
-            "name": "kappa_glikk",
+            "name": "omicron_tau",
             "schema": "string"
           },
           "mapValue": {
-            "name": "kappa_nuh",
-            "schema": "long"
+            "name": "omicron_upsilon",
+            "schema": "time"
           },
           "@type": [
             "Map",
diff --git a/DTDL/v2/spec/Recommendation-ClassMapTypePreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassMapTypePreferTermToDtmiV2.json
index e7e38a5d..e77723dc 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapTypePreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapTypePreferTermToDtmiV2.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_alpha;1",
+        "@id": "dtmi:example:omicron_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_yekk;1",
+          "@id": "dtmi:example:omicron_glikk;1",
           "mapKey": {
-            "name": "kappa_vroo",
+            "name": "omicron_nuh",
             "schema": "string"
           },
           "mapValue": {
-            "name": "kappa_hi",
-            "schema": "boolean"
+            "name": "omicron_snee",
+            "schema": "dateTime"
           },
           "@type": "Map"
         }
@@ -34,17 +34,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_epsilon;1",
+        "@id": "dtmi:example:omicron_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_beta;1",
+          "@id": "dtmi:example:omicron_thnad;1",
           "mapKey": {
-            "name": "lambda_gamma",
+            "name": "omicron_spazz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "lambda_delta",
-            "schema": "date"
+            "name": "omicron_floob",
+            "schema": "double"
           },
           "@type": "dtmi:dtdl:class:Map;2"
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassMapValueInvalidKeywordsV2.json b/DTDL/v2/spec/Recommendation-ClassMapValueInvalidKeywordsV2.json
index fd1500e4..afc25a14 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapValueInvalidKeywordsV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapValueInvalidKeywordsV2.json
@@ -8,18 +8,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_nuh;1",
+        "@id": "dtmi:example:glikk_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_fuddle;1",
+          "@id": "dtmi:example:glikk_fuddle;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_glikk",
+            "name": "glikk_glikk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omega_humpf",
-            "schema": "date",
+            "name": "glikk_humpf",
+            "schema": "double",
             "@value": 626
           }
         }
@@ -35,18 +35,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_spazz;1",
+        "@id": "dtmi:example:glikk_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_quan;1",
+          "@id": "dtmi:example:glikk_quan;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_thnad",
+            "name": "glikk_thnad",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omega_snee",
-            "schema": "dateTime",
+            "name": "glikk_snee",
+            "schema": "duration",
             "@language": "en"
           }
         }
@@ -62,18 +62,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_flunn;1",
+        "@id": "dtmi:example:glikk_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_zatz;1",
+          "@id": "dtmi:example:glikk_zatz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_jogg",
+            "name": "glikk_jogg",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omega_floob",
-            "schema": "double",
+            "name": "glikk_floob",
+            "schema": "float",
             "@foobar": true
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassMapValuePropertyCommentTermV2.json b/DTDL/v2/spec/Recommendation-ClassMapValuePropertyCommentTermV2.json
index e2075274..dea65bb1 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapValuePropertyCommentTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapValuePropertyCommentTermV2.json
@@ -8,19 +8,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_quan;1",
+        "@id": "dtmi:example:psi_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_nuh;1",
+          "@id": "dtmi:example:psi_nuh;1",
           "@type": "Map",
           "mapKey": {
-            "name": "rho_snee",
+            "name": "psi_snee",
             "schema": "string"
           },
           "mapValue": {
-            "comment": "rho_fuddle",
-            "name": "rho_glikk",
-            "schema": "date"
+            "comment": "psi_fuddle",
+            "name": "psi_glikk",
+            "schema": "double"
           }
         }
       }
@@ -35,19 +35,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_jogg;1",
+        "@id": "dtmi:example:psi_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_floob;1",
+          "@id": "dtmi:example:psi_floob;1",
           "@type": "Map",
           "mapKey": {
-            "name": "rho_zatz",
+            "name": "psi_zatz",
             "schema": "string"
           },
           "mapValue": {
-            "dtmi:dtdl:property:comment;2": "rho_thnad",
-            "name": "rho_spazz",
-            "schema": "dateTime"
+            "dtmi:dtdl:property:comment;2": "psi_thnad",
+            "name": "psi_spazz",
+            "schema": "duration"
           }
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassMapValuePropertyDescriptionTermV2.json b/DTDL/v2/spec/Recommendation-ClassMapValuePropertyDescriptionTermV2.json
index 3acb61b2..20924093 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapValuePropertyDescriptionTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapValuePropertyDescriptionTermV2.json
@@ -8,21 +8,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_flunn;1",
+        "@id": "dtmi:example:wum_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_zatz;1",
+          "@id": "dtmi:example:wum_zatz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_jogg",
+            "name": "wum_jogg",
             "schema": "string"
           },
           "mapValue": {
             "description": [
-              "upsilon_spazz"
+              "wum_spazz"
             ],
-            "name": "upsilon_floob",
-            "schema": "double"
+            "name": "wum_floob",
+            "schema": "float"
           }
         }
       }
@@ -37,21 +37,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_alpha;1",
+        "@id": "dtmi:example:um_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_vroo;1",
+          "@id": "dtmi:example:wum_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_hi",
+            "name": "wum_hi",
             "schema": "string"
           },
           "mapValue": {
             "dtmi:dtdl:property:description;2": [
-              "upsilon_itch"
+              "wum_itch"
             ],
-            "name": "upsilon_yekk",
-            "schema": "duration"
+            "name": "wum_yekk",
+            "schema": "integer"
           }
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassMapValuePropertyDisplayNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassMapValuePropertyDisplayNameTermV2.json
index 586396b8..8e7d4dc1 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapValuePropertyDisplayNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapValuePropertyDisplayNameTermV2.json
@@ -8,21 +8,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_beta;1",
+        "@id": "dtmi:example:glikk_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_hi;1",
+          "@id": "dtmi:example:fuddle_hi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_alpha",
+            "name": "glikk_alpha",
             "schema": "string"
           },
           "mapValue": {
             "displayName": [
-              "psi_yekk"
+              "fuddle_yekk"
             ],
-            "name": "psi_vroo",
-            "schema": "float"
+            "name": "fuddle_vroo",
+            "schema": "long"
           }
         }
       }
@@ -37,21 +37,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_eta;1",
+        "@id": "dtmi:example:glikk_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_epsilon;1",
+          "@id": "dtmi:example:glikk_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_zeta",
+            "name": "glikk_zeta",
             "schema": "string"
           },
           "mapValue": {
             "dtmi:dtdl:property:displayName;2": [
-              "omega_gamma"
+              "glikk_gamma"
             ],
-            "name": "omega_delta",
-            "schema": "integer"
+            "name": "glikk_delta",
+            "schema": "string"
           }
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassMapValuePropertyNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassMapValuePropertyNameTermV2.json
index 0fa60dfe..21711ebb 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapValuePropertyNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapValuePropertyNameTermV2.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_epsilon;1",
+        "@id": "dtmi:example:hi_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_gamma;1",
+          "@id": "dtmi:example:hi_humpf;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_delta",
+            "name": "hi_fuddle",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_beta",
+            "name": "hi_um",
             "schema": "long"
           }
         }
@@ -34,17 +34,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_iota;1",
+        "@id": "dtmi:example:hi_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_eta;1",
+          "@id": "dtmi:example:hi_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_theta",
+            "name": "hi_quan",
             "schema": "string"
           },
           "mapValue": {
-            "dtmi:dtdl:property:name;2": "jogg_zeta",
+            "dtmi:dtdl:property:name;2": "hi_nuh",
             "schema": "string"
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassMapValuePropertySchemaPreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassMapValuePropertySchemaPreferTermToDtmiV2.json
index 03275129..7df2f42f 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapValuePropertySchemaPreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapValuePropertySchemaPreferTermToDtmiV2.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_itch;1",
+        "@id": "dtmi:example:theta_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_jogg;1",
+          "@id": "dtmi:example:theta_glikk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "beta_flunn",
+            "name": "theta_nuh",
             "schema": "string"
           },
           "mapValue": {
-            "name": "beta_zatz",
+            "name": "theta_fuddle",
             "schema": "long"
           }
         }
@@ -34,17 +34,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_alpha;1",
+        "@id": "dtmi:example:theta_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_vroo;1",
+          "@id": "dtmi:example:theta_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "beta_hi",
+            "name": "theta_spazz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "beta_yekk",
+            "name": "theta_quan",
             "schema": "dtmi:dtdl:instance:Schema:long;2"
           }
         }
@@ -60,17 +60,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_epsilon;1",
+        "@id": "dtmi:example:theta_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_gamma;1",
+          "@id": "dtmi:example:theta_jogg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_delta",
+            "name": "theta_flunn",
             "schema": "string"
           },
           "mapValue": {
-            "name": "gamma_beta",
+            "name": "theta_zatz",
             "schema": "point"
           }
         }
@@ -86,17 +86,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_iota;1",
+        "@id": "dtmi:example:iota_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_eta;1",
+          "@id": "dtmi:example:theta_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_theta",
+            "name": "theta_hi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "gamma_zeta",
+            "name": "theta_yekk",
             "schema": "dtmi:standard:schema:geospatial:point;2"
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassMapValuePropertySchemaTermV2.json b/DTDL/v2/spec/Recommendation-ClassMapValuePropertySchemaTermV2.json
index 5294e700..6fa5a8f5 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapValuePropertySchemaTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapValuePropertySchemaTermV2.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_rho;1",
+        "@id": "dtmi:example:iota_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_omicron;1",
+          "@id": "dtmi:example:iota_eta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_pi",
+            "name": "iota_theta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "gamma_xi",
+            "name": "iota_zeta",
             "schema": "float"
           }
         }
@@ -34,17 +34,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_phi;1",
+        "@id": "dtmi:example:iota_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_tau;1",
+          "@id": "dtmi:example:iota_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_upsilon",
+            "name": "iota_mu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "gamma_sigma",
+            "name": "iota_kappa",
             "dtmi:dtdl:property:schema;2": "integer"
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassMapValueTypeDuplicatesMaterialV2.json b/DTDL/v2/spec/Recommendation-ClassMapValueTypeDuplicatesMaterialV2.json
index cb1f14cf..ed2642fd 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapValueTypeDuplicatesMaterialV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapValueTypeDuplicatesMaterialV2.json
@@ -8,18 +8,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_yekk;1",
+        "@id": "dtmi:example:nu_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_flunn;1",
+          "@id": "dtmi:example:nu_flunn;1",
           "@type": "Map",
           "mapKey": {
-            "name": "eta_itch",
+            "name": "nu_itch",
             "schema": "string"
           },
           "mapValue": {
-            "name": "eta_jogg",
-            "schema": "integer",
+            "name": "nu_jogg",
+            "schema": "string",
             "@type": [
               "MapValue",
               "MapValue"
@@ -38,18 +38,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_beta;1",
+        "@id": "dtmi:example:xi_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_hi;1",
+          "@id": "dtmi:example:nu_hi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_alpha",
+            "name": "xi_alpha",
             "schema": "string"
           },
           "mapValue": {
-            "name": "eta_vroo",
-            "schema": "long",
+            "name": "nu_vroo",
+            "schema": "time",
             "@type": [
               "dtmi:dtdl:class:MapValue;2",
               "dtmi:dtdl:class:MapValue;2"
diff --git a/DTDL/v2/spec/Recommendation-ClassMapValueTypeIncludesTermAndDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassMapValueTypeIncludesTermAndDtmiV2.json
index f99089fe..8d5092c5 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapValueTypeIncludesTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapValueTypeIncludesTermAndDtmiV2.json
@@ -8,18 +8,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_zatz;1",
+        "@id": "dtmi:example:nu_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_spazz;1",
+          "@id": "dtmi:example:nu_spazz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "eta_floob",
+            "name": "nu_floob",
             "schema": "string"
           },
           "mapValue": {
-            "name": "eta_thnad",
-            "schema": "float",
+            "name": "nu_thnad",
+            "schema": "long",
             "@type": [
               "MapValue",
               "dtmi:dtdl:class:MapValue;2"
diff --git a/DTDL/v2/spec/Recommendation-ClassMapValueTypePreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassMapValueTypePreferTermToDtmiV2.json
index 05391dac..8e4893a3 100644
--- a/DTDL/v2/spec/Recommendation-ClassMapValueTypePreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassMapValueTypePreferTermToDtmiV2.json
@@ -8,18 +8,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_zeta;1",
+        "@id": "dtmi:example:xi_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_delta;1",
+          "@id": "dtmi:example:xi_delta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_epsilon",
+            "name": "xi_epsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_gamma",
-            "schema": "string",
+            "name": "xi_gamma",
+            "schema": "boolean",
             "@type": "MapValue"
           }
         }
@@ -35,18 +35,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_kappa;1",
+        "@id": "dtmi:example:xi_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_theta;1",
+          "@id": "dtmi:example:xi_theta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_iota",
+            "name": "xi_iota",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_eta",
-            "schema": "time",
+            "name": "xi_eta",
+            "schema": "date",
             "@type": "dtmi:dtdl:class:MapValue;2"
           }
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassObjectInvalidKeywordsV2.json b/DTDL/v2/spec/Recommendation-ClassObjectInvalidKeywordsV2.json
index 66e6ad51..fa2b25ee 100644
--- a/DTDL/v2/spec/Recommendation-ClassObjectInvalidKeywordsV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassObjectInvalidKeywordsV2.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_phi;1",
+        "@id": "dtmi:example:kappa_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_tau;1",
+          "@id": "dtmi:example:kappa_quan;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "delta_upsilon",
-              "schema": "long"
+              "name": "kappa_thnad",
+              "schema": "double"
             }
           ],
           "@value": 626
@@ -33,15 +33,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_omega;1",
+        "@id": "dtmi:example:kappa_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_chi;1",
+          "@id": "dtmi:example:kappa_floob;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "delta_psi",
-              "schema": "string"
+              "name": "kappa_zatz",
+              "schema": "duration"
             }
           ],
           "@language": "en"
@@ -58,15 +58,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_um;1",
+        "@id": "dtmi:example:kappa_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_yuzz;1",
+          "@id": "dtmi:example:kappa_flunn;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "delta_wum",
-              "schema": "time"
+              "name": "kappa_itch",
+              "schema": "float"
             }
           ],
           "@foobar": true
diff --git a/DTDL/v2/spec/Recommendation-ClassObjectPropertyCommentTermV2.json b/DTDL/v2/spec/Recommendation-ClassObjectPropertyCommentTermV2.json
index e1a1ef66..d9dc676b 100644
--- a/DTDL/v2/spec/Recommendation-ClassObjectPropertyCommentTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassObjectPropertyCommentTermV2.json
@@ -8,16 +8,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_eta;1",
+        "@id": "dtmi:example:epsilon_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_delta;1",
+          "@id": "dtmi:example:epsilon_sigma;1",
           "@type": "Object",
-          "comment": "vroo_epsilon",
+          "comment": "epsilon_tau",
           "fields": [
             {
-              "name": "vroo_zeta",
-              "schema": "long"
+              "name": "epsilon_upsilon",
+              "schema": "double"
             }
           ]
         }
@@ -33,16 +33,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_lambda;1",
+        "@id": "dtmi:example:epsilon_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_theta;1",
+          "@id": "dtmi:example:epsilon_chi;1",
           "@type": "Object",
-          "dtmi:dtdl:property:comment;2": "vroo_iota",
+          "dtmi:dtdl:property:comment;2": "epsilon_psi",
           "fields": [
             {
-              "name": "vroo_kappa",
-              "schema": "string"
+              "name": "epsilon_omega",
+              "schema": "duration"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassObjectPropertyDescriptionTermV2.json b/DTDL/v2/spec/Recommendation-ClassObjectPropertyDescriptionTermV2.json
index 8afa3ae7..3cb2207c 100644
--- a/DTDL/v2/spec/Recommendation-ClassObjectPropertyDescriptionTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassObjectPropertyDescriptionTermV2.json
@@ -8,18 +8,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_omega;1",
+        "@id": "dtmi:example:eta_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_phi;1",
+          "@id": "dtmi:example:eta_spazz;1",
           "@type": "Object",
           "description": [
-            "alpha_chi"
+            "eta_floob"
           ],
           "fields": [
             {
-              "name": "alpha_psi",
-              "schema": "time"
+              "name": "eta_zatz",
+              "schema": "float"
             }
           ]
         }
@@ -35,18 +35,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_humpf;1",
+        "@id": "dtmi:example:eta_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_yuzz;1",
+          "@id": "dtmi:example:eta_flunn;1",
           "@type": "Object",
           "dtmi:dtdl:property:description;2": [
-            "alpha_wum"
+            "eta_itch"
           ],
           "fields": [
             {
-              "name": "alpha_um",
-              "schema": "boolean"
+              "name": "eta_yekk",
+              "schema": "integer"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassObjectPropertyDisplayNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassObjectPropertyDisplayNameTermV2.json
index 0b17a426..f2d59728 100644
--- a/DTDL/v2/spec/Recommendation-ClassObjectPropertyDisplayNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassObjectPropertyDisplayNameTermV2.json
@@ -8,18 +8,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_yekk;1",
+        "@id": "dtmi:example:kappa_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_jogg;1",
+          "@id": "dtmi:example:kappa_iota;1",
           "@type": "Object",
           "displayName": [
-            "gamma_flunn"
+            "kappa_kappa"
           ],
           "fields": [
             {
-              "name": "gamma_itch",
-              "schema": "date"
+              "name": "kappa_lambda",
+              "schema": "long"
             }
           ]
         }
@@ -35,18 +35,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_beta;1",
+        "@id": "dtmi:example:kappa_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_vroo;1",
+          "@id": "dtmi:example:kappa_nu;1",
           "@type": "Object",
           "dtmi:dtdl:property:displayName;2": [
-            "gamma_hi"
+            "kappa_xi"
           ],
           "fields": [
             {
-              "name": "delta_alpha",
-              "schema": "dateTime"
+              "name": "kappa_omicron",
+              "schema": "string"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassObjectPropertyFieldsTermV2.json b/DTDL/v2/spec/Recommendation-ClassObjectPropertyFieldsTermV2.json
index e150d687..5fcc3ebd 100644
--- a/DTDL/v2/spec/Recommendation-ClassObjectPropertyFieldsTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassObjectPropertyFieldsTermV2.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_mu;1",
+        "@id": "dtmi:example:yekk_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_kappa;1",
+          "@id": "dtmi:example:yekk_sigma;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "spazz_lambda",
-              "schema": "float"
+              "name": "yekk_tau",
+              "schema": "time"
             }
           ]
         }
@@ -32,15 +32,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_omicron;1",
+        "@id": "dtmi:example:yekk_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_nu;1",
+          "@id": "dtmi:example:yekk_phi;1",
           "@type": "Object",
           "dtmi:dtdl:property:fields;2": [
             {
-              "name": "spazz_xi",
-              "schema": "integer"
+              "name": "yekk_chi",
+              "schema": "boolean"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassObjectTypeDuplicatesMaterialV2.json b/DTDL/v2/spec/Recommendation-ClassObjectTypeDuplicatesMaterialV2.json
index 522209a9..89478634 100644
--- a/DTDL/v2/spec/Recommendation-ClassObjectTypeDuplicatesMaterialV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassObjectTypeDuplicatesMaterialV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_omicron;1",
+        "@id": "dtmi:example:thnad_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_nu;1",
+          "@id": "dtmi:example:thnad_nu;1",
           "fields": [
             {
-              "name": "humpf_xi",
-              "schema": "integer"
+              "name": "thnad_xi",
+              "schema": "string"
             }
           ],
           "@type": [
@@ -35,14 +35,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_sigma;1",
+        "@id": "dtmi:example:thnad_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_pi;1",
+          "@id": "dtmi:example:thnad_pi;1",
           "fields": [
             {
-              "name": "humpf_rho",
-              "schema": "long"
+              "name": "thnad_rho",
+              "schema": "time"
             }
           ],
           "@type": [
diff --git a/DTDL/v2/spec/Recommendation-ClassObjectTypeIncludesTermAndDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassObjectTypeIncludesTermAndDtmiV2.json
index 28439341..7a1bb87d 100644
--- a/DTDL/v2/spec/Recommendation-ClassObjectTypeIncludesTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassObjectTypeIncludesTermAndDtmiV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_mu;1",
+        "@id": "dtmi:example:thnad_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_kappa;1",
+          "@id": "dtmi:example:thnad_kappa;1",
           "fields": [
             {
-              "name": "humpf_lambda",
-              "schema": "float"
+              "name": "thnad_lambda",
+              "schema": "long"
             }
           ],
           "@type": [
diff --git a/DTDL/v2/spec/Recommendation-ClassObjectTypePreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassObjectTypePreferTermToDtmiV2.json
index 79ae1be3..902f10c3 100644
--- a/DTDL/v2/spec/Recommendation-ClassObjectTypePreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassObjectTypePreferTermToDtmiV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_phi;1",
+        "@id": "dtmi:example:thnad_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_tau;1",
+          "@id": "dtmi:example:thnad_tau;1",
           "fields": [
             {
-              "name": "humpf_upsilon",
-              "schema": "string"
+              "name": "thnad_upsilon",
+              "schema": "boolean"
             }
           ],
           "@type": "Object"
@@ -32,14 +32,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_omega;1",
+        "@id": "dtmi:example:thnad_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_chi;1",
+          "@id": "dtmi:example:thnad_chi;1",
           "fields": [
             {
-              "name": "humpf_psi",
-              "schema": "time"
+              "name": "thnad_psi",
+              "schema": "date"
             }
           ],
           "@type": "dtmi:dtdl:class:Object;2"
diff --git a/DTDL/v2/spec/Recommendation-ClassPropertyCotypePropertyTermV2.json b/DTDL/v2/spec/Recommendation-ClassPropertyCotypePropertyTermV2.json
index 72578b61..2c329dd5 100644
--- a/DTDL/v2/spec/Recommendation-ClassPropertyCotypePropertyTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassPropertyCotypePropertyTermV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_xi;1",
+        "@id": "dtmi:example:flunn_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "quan_nu",
+          "name": "flunn_yekk",
           "schema": "float",
           "unit": "gigawatt"
         }
@@ -31,14 +31,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_pi;1",
+        "@id": "dtmi:example:itch_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "quan_omicron",
+          "name": "flunn_hi",
           "schema": "integer",
           "dtmi:dtdl:property:unit;2": "gigawatt"
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassPropertyCotypePropertyValuePreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassPropertyCotypePropertyValuePreferTermToDtmiV2.json
index 0dbc7274..d4a9496e 100644
--- a/DTDL/v2/spec/Recommendation-ClassPropertyCotypePropertyValuePreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassPropertyCotypePropertyValuePreferTermToDtmiV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_phi;1",
+        "@id": "dtmi:example:flunn_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "snee_upsilon",
+          "name": "flunn_epsilon",
           "schema": "long",
           "unit": "gigawatt"
         }
@@ -31,14 +31,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_psi;1",
+        "@id": "dtmi:example:flunn_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "snee_chi",
+          "name": "flunn_eta",
           "schema": "double",
           "unit": "gigawatt"
         }
@@ -54,14 +54,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_yuzz;1",
+        "@id": "dtmi:example:flunn_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "snee_omega",
+          "name": "flunn_iota",
           "schema": "float",
           "unit": "dtmi:standard:unit:gigawatt;2"
         }
@@ -77,14 +77,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_um;1",
+        "@id": "dtmi:example:flunn_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "snee_wum",
+          "name": "flunn_lambda",
           "schema": "integer",
           "unit": "dtmi:standard:unit:gigawatt;2"
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassPropertyDuplicateSemanticTypesV2.json b/DTDL/v2/spec/Recommendation-ClassPropertyDuplicateSemanticTypesV2.json
index b06859e4..85dc4254 100644
--- a/DTDL/v2/spec/Recommendation-ClassPropertyDuplicateSemanticTypesV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassPropertyDuplicateSemanticTypesV2.json
@@ -8,7 +8,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_nuh;1",
+        "@id": "dtmi:example:xi_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
@@ -16,8 +16,8 @@
             "Acceleration",
             "Acceleration"
           ],
-          "name": "eta_glikk",
-          "schema": "long",
+          "name": "xi_alpha",
+          "schema": "float",
           "unit": "centimetrePerSecondSquared"
         }
       }
@@ -32,7 +32,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_quan;1",
+        "@id": "dtmi:example:xi_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
@@ -40,8 +40,8 @@
             "dtmi:standard:class:Acceleration;2",
             "dtmi:standard:class:Acceleration;2"
           ],
-          "name": "eta_snee",
-          "schema": "double",
+          "name": "xi_gamma",
+          "schema": "integer",
           "unit": "centimetrePerSecondSquared"
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassPropertyInvalidKeywordsV2.json b/DTDL/v2/spec/Recommendation-ClassPropertyInvalidKeywordsV2.json
index 424e10fe..113c026c 100644
--- a/DTDL/v2/spec/Recommendation-ClassPropertyInvalidKeywordsV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassPropertyInvalidKeywordsV2.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_hi;1",
+        "@id": "dtmi:example:spazz_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_vroo",
-          "schema": "boolean",
+          "name": "spazz_um",
+          "schema": "string",
           "@value": 626
         }
       }
@@ -28,12 +28,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_beta;1",
+        "@id": "dtmi:example:spazz_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_alpha",
-          "schema": "date",
+          "name": "spazz_fuddle",
+          "schema": "time",
           "@language": "en"
         }
       }
@@ -48,12 +48,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_delta;1",
+        "@id": "dtmi:example:spazz_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_gamma",
-          "schema": "dateTime",
+          "name": "spazz_nuh",
+          "schema": "boolean",
           "@foobar": true
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassPropertyPropertyCommentTermV2.json b/DTDL/v2/spec/Recommendation-ClassPropertyPropertyCommentTermV2.json
index b2cab04e..aabaee80 100644
--- a/DTDL/v2/spec/Recommendation-ClassPropertyPropertyCommentTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassPropertyPropertyCommentTermV2.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_flunn;1",
+        "@id": "dtmi:example:glikk_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "comment": "psi_zatz",
-          "name": "psi_jogg",
-          "schema": "boolean"
+          "comment": "glikk_chi",
+          "name": "glikk_psi",
+          "schema": "string"
         }
       }
     ]
@@ -28,13 +28,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_vroo;1",
+        "@id": "dtmi:example:glikk_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "dtmi:dtdl:property:comment;2": "psi_itch",
-          "name": "psi_yekk",
-          "schema": "date"
+          "dtmi:dtdl:property:comment;2": "glikk_yuzz",
+          "name": "glikk_wum",
+          "schema": "time"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassPropertyPropertyDescriptionTermV2.json b/DTDL/v2/spec/Recommendation-ClassPropertyPropertyDescriptionTermV2.json
index 483c2c28..4f8a17bb 100644
--- a/DTDL/v2/spec/Recommendation-ClassPropertyPropertyDescriptionTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassPropertyPropertyDescriptionTermV2.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_omega;1",
+        "@id": "dtmi:example:snee_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
           "description": [
-            "yuzz_chi"
+            "snee_eta"
           ],
-          "name": "yuzz_psi",
-          "schema": "dateTime"
+          "name": "snee_theta",
+          "schema": "boolean"
         }
       }
     ]
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_um;1",
+        "@id": "dtmi:example:snee_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
           "dtmi:dtdl:property:description;2": [
-            "yuzz_yuzz"
+            "snee_kappa"
           ],
-          "name": "yuzz_wum",
-          "schema": "double"
+          "name": "snee_lambda",
+          "schema": "date"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassPropertyPropertyDisplayNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassPropertyPropertyDisplayNameTermV2.json
index f8765717..1e521e8f 100644
--- a/DTDL/v2/spec/Recommendation-ClassPropertyPropertyDisplayNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassPropertyPropertyDisplayNameTermV2.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_iota;1",
+        "@id": "dtmi:example:quan_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
           "displayName": [
-            "um_eta"
+            "quan_spazz"
           ],
-          "name": "um_theta",
-          "schema": "duration"
+          "name": "quan_floob",
+          "schema": "dateTime"
         }
       }
     ]
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_mu;1",
+        "@id": "dtmi:example:quan_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
           "dtmi:dtdl:property:displayName;2": [
-            "um_kappa"
+            "quan_jogg"
           ],
-          "name": "um_lambda",
-          "schema": "float"
+          "name": "quan_flunn",
+          "schema": "double"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassPropertyPropertyNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassPropertyPropertyNameTermV2.json
index 3a7fbc40..5accc671 100644
--- a/DTDL/v2/spec/Recommendation-ClassPropertyPropertyNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassPropertyPropertyNameTermV2.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_glikk;1",
+        "@id": "dtmi:example:pi_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "iota_fuddle",
-          "schema": "dateTime"
+          "name": "omicron_hi",
+          "schema": "string"
         }
       }
     ]
@@ -27,12 +27,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_snee;1",
+        "@id": "dtmi:example:pi_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "dtmi:dtdl:property:name;2": "iota_nuh",
-          "schema": "double"
+          "dtmi:dtdl:property:name;2": "pi_beta",
+          "schema": "time"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassPropertyPropertySchemaPreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassPropertyPropertySchemaPreferTermToDtmiV2.json
index f30aad49..00728188 100644
--- a/DTDL/v2/spec/Recommendation-ClassPropertyPropertySchemaPreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassPropertyPropertySchemaPreferTermToDtmiV2.json
@@ -8,11 +8,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_pi;1",
+        "@id": "dtmi:example:upsilon_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "xi_omicron",
+          "name": "upsilon_zatz",
           "schema": "time"
         }
       }
@@ -27,11 +27,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_sigma;1",
+        "@id": "dtmi:example:upsilon_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "xi_rho",
+          "name": "upsilon_flunn",
           "schema": "dtmi:dtdl:instance:Schema:time;2"
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassPropertyPropertySchemaTermV2.json b/DTDL/v2/spec/Recommendation-ClassPropertyPropertySchemaTermV2.json
index 1ce5f9dc..1208ec2b 100644
--- a/DTDL/v2/spec/Recommendation-ClassPropertyPropertySchemaTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassPropertyPropertySchemaTermV2.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_beta;1",
+        "@id": "dtmi:example:omega_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "sigma_alpha",
-          "schema": "date"
+          "name": "omega_psi",
+          "schema": "long"
         }
       }
     ]
@@ -27,12 +27,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_delta;1",
+        "@id": "dtmi:example:omega_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "sigma_gamma",
-          "dtmi:dtdl:property:schema;2": "dateTime"
+          "name": "omega_yuzz",
+          "dtmi:dtdl:property:schema;2": "string"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassPropertyPropertyWritableTermV2.json b/DTDL/v2/spec/Recommendation-ClassPropertyPropertyWritableTermV2.json
index f7bf68ad..0b7d610f 100644
--- a/DTDL/v2/spec/Recommendation-ClassPropertyPropertyWritableTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassPropertyPropertyWritableTermV2.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_nuh;1",
+        "@id": "dtmi:example:spazz_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_glikk",
-          "schema": "duration",
+          "name": "spazz_omicron",
+          "schema": "dateTime",
           "writable": true
         }
       }
@@ -28,12 +28,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_quan;1",
+        "@id": "dtmi:example:spazz_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_snee",
-          "schema": "float",
+          "name": "spazz_rho",
+          "schema": "double",
           "dtmi:dtdl:property:writable;2": false
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassPropertySemanticTypePreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassPropertySemanticTypePreferTermToDtmiV2.json
index c62afe5e..e1df631a 100644
--- a/DTDL/v2/spec/Recommendation-ClassPropertySemanticTypePreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassPropertySemanticTypePreferTermToDtmiV2.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_spazz;1",
+        "@id": "dtmi:example:xi_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Acceleration"
           ],
-          "name": "eta_thnad",
-          "schema": "float",
+          "name": "xi_epsilon",
+          "schema": "long",
           "unit": "centimetrePerSecondSquared"
         }
       }
@@ -31,15 +31,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_zatz;1",
+        "@id": "dtmi:example:xi_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Acceleration;2"
           ],
-          "name": "eta_floob",
-          "schema": "integer",
+          "name": "xi_eta",
+          "schema": "double",
           "unit": "centimetrePerSecondSquared"
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassPropertySemanticTypeTermAndDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassPropertySemanticTypeTermAndDtmiV2.json
index ae232298..79b4b70b 100644
--- a/DTDL/v2/spec/Recommendation-ClassPropertySemanticTypeTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassPropertySemanticTypeTermAndDtmiV2.json
@@ -8,7 +8,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_fuddle;1",
+        "@id": "dtmi:example:nu_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
@@ -16,8 +16,8 @@
             "Acceleration",
             "dtmi:standard:class:Acceleration;2"
           ],
-          "name": "eta_humpf",
-          "schema": "integer",
+          "name": "nu_vroo",
+          "schema": "double",
           "unit": "centimetrePerSecondSquared"
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassPropertyTypeDuplicatesMaterialV2.json b/DTDL/v2/spec/Recommendation-ClassPropertyTypeDuplicatesMaterialV2.json
index 70d31c25..3080914c 100644
--- a/DTDL/v2/spec/Recommendation-ClassPropertyTypeDuplicatesMaterialV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassPropertyTypeDuplicatesMaterialV2.json
@@ -8,11 +8,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_epsilon;1",
+        "@id": "dtmi:example:nu_tau;1",
         "@type": "Interface",
         "contents": {
-          "name": "eta_delta",
-          "schema": "duration",
+          "name": "nu_sigma",
+          "schema": "boolean",
           "@type": [
             "Property",
             "Property"
@@ -30,11 +30,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_eta;1",
+        "@id": "dtmi:example:nu_phi;1",
         "@type": "Interface",
         "contents": {
-          "name": "eta_zeta",
-          "schema": "float",
+          "name": "nu_upsilon",
+          "schema": "date",
           "@type": [
             "dtmi:dtdl:class:Property;2",
             "dtmi:dtdl:class:Property;2"
diff --git a/DTDL/v2/spec/Recommendation-ClassPropertyTypeIncludesTermAndDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassPropertyTypeIncludesTermAndDtmiV2.json
index 653b44c1..67a9ddba 100644
--- a/DTDL/v2/spec/Recommendation-ClassPropertyTypeIncludesTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassPropertyTypeIncludesTermAndDtmiV2.json
@@ -8,11 +8,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_gamma;1",
+        "@id": "dtmi:example:nu_rho;1",
         "@type": "Interface",
         "contents": {
-          "name": "eta_beta",
-          "schema": "double",
+          "name": "nu_pi",
+          "schema": "time",
           "@type": [
             "Property",
             "dtmi:dtdl:class:Property;2"
diff --git a/DTDL/v2/spec/Recommendation-ClassPropertyTypePreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassPropertyTypePreferTermToDtmiV2.json
index b4d7ba88..63701492 100644
--- a/DTDL/v2/spec/Recommendation-ClassPropertyTypePreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassPropertyTypePreferTermToDtmiV2.json
@@ -8,11 +8,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_iota;1",
+        "@id": "dtmi:example:nu_psi;1",
         "@type": "Interface",
         "contents": {
-          "name": "eta_theta",
-          "schema": "integer",
+          "name": "nu_chi",
+          "schema": "dateTime",
           "@type": "Property"
         }
       }
@@ -27,11 +27,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_lambda;1",
+        "@id": "dtmi:example:nu_yuzz;1",
         "@type": "Interface",
         "contents": {
-          "name": "eta_kappa",
-          "schema": "long",
+          "name": "nu_omega",
+          "schema": "double",
           "@type": "dtmi:dtdl:class:Property;2"
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassRelationshipInvalidKeywordsV2.json b/DTDL/v2/spec/Recommendation-ClassRelationshipInvalidKeywordsV2.json
index ec56eca8..1f39b820 100644
--- a/DTDL/v2/spec/Recommendation-ClassRelationshipInvalidKeywordsV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassRelationshipInvalidKeywordsV2.json
@@ -8,11 +8,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_jogg;1",
+        "@id": "dtmi:example:hi_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "floob_zatz",
+          "name": "hi_jogg",
           "@value": 626
         }
       }
@@ -27,11 +27,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_itch;1",
+        "@id": "dtmi:example:hi_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "floob_flunn",
+          "name": "hi_itch",
           "@language": "en"
         }
       }
@@ -46,11 +46,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_vroo;1",
+        "@id": "dtmi:example:hi_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "floob_yekk",
+          "name": "hi_vroo",
           "@foobar": true
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyCommentTermV2.json b/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyCommentTermV2.json
index 1886db76..c1ef7c1a 100644
--- a/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyCommentTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyCommentTermV2.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_tau;1",
+        "@id": "dtmi:example:eta_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "comment": "hi_rho",
-          "name": "hi_sigma"
+          "comment": "eta_theta",
+          "name": "eta_iota"
         }
       }
     ]
@@ -27,12 +27,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_chi;1",
+        "@id": "dtmi:example:eta_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "dtmi:dtdl:property:comment;2": "hi_upsilon",
-          "name": "hi_phi"
+          "dtmi:dtdl:property:comment;2": "eta_lambda",
+          "name": "eta_mu"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyDescriptionTermV2.json b/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyDescriptionTermV2.json
index f4b2604f..534ba467 100644
--- a/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyDescriptionTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyDescriptionTermV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_delta;1",
+        "@id": "dtmi:example:theta_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "description": [
-            "beta_beta"
+            "theta_floob"
           ],
-          "name": "beta_gamma"
+          "name": "theta_zatz"
         }
       }
     ]
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_eta;1",
+        "@id": "dtmi:example:theta_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "dtmi:dtdl:property:description;2": [
-            "beta_epsilon"
+            "theta_flunn"
           ],
-          "name": "beta_zeta"
+          "name": "theta_itch"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyDisplayNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyDisplayNameTermV2.json
index df3f4a16..c9e8dfd8 100644
--- a/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyDisplayNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyDisplayNameTermV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_snee;1",
+        "@id": "dtmi:example:kappa_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "displayName": [
-            "gamma_glikk"
+            "kappa_phi"
           ],
-          "name": "gamma_nuh"
+          "name": "kappa_chi"
         }
       }
     ]
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_spazz;1",
+        "@id": "dtmi:example:kappa_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "dtmi:dtdl:property:displayName;2": [
-            "gamma_quan"
+            "kappa_omega"
           ],
-          "name": "gamma_thnad"
+          "name": "kappa_yuzz"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyMaxMultiplicityTermV2.json b/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyMaxMultiplicityTermV2.json
index e9d84b8c..af4e3b25 100644
--- a/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyMaxMultiplicityTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyMaxMultiplicityTermV2.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_omicron;1",
+        "@id": "dtmi:example:mu_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "maxMultiplicity": 500,
-          "name": "epsilon_xi"
+          "name": "mu_epsilon"
         }
       }
     ]
@@ -27,12 +27,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_rho;1",
+        "@id": "dtmi:example:mu_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "dtmi:dtdl:property:maxMultiplicity;2": 500,
-          "name": "epsilon_pi"
+          "name": "mu_eta"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyMinMultiplicityTermV2.json b/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyMinMultiplicityTermV2.json
index 028bd213..5ccf6be8 100644
--- a/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyMinMultiplicityTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyMinMultiplicityTermV2.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_thnad;1",
+        "@id": "dtmi:example:nu_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "minMultiplicity": 0,
-          "name": "zeta_quan"
+          "name": "nu_omega"
         }
       }
     ]
@@ -27,12 +27,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_floob;1",
+        "@id": "dtmi:example:nu_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "dtmi:dtdl:property:minMultiplicity;2": 0,
-          "name": "zeta_spazz"
+          "name": "nu_wum"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyNameTermV2.json
index 47bcb14d..42e1aedf 100644
--- a/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyNameTermV2.json
@@ -8,11 +8,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_omicron;1",
+        "@id": "dtmi:example:hi_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zatz_xi"
+          "name": "hi_vroo"
         }
       }
     ]
@@ -26,11 +26,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_rho;1",
+        "@id": "dtmi:example:alpha_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "dtmi:dtdl:property:name;2": "zatz_pi"
+          "dtmi:dtdl:property:name;2": "alpha_alpha"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyPropertiesTermV2.json b/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyPropertiesTermV2.json
index cffed392..42ae1a08 100644
--- a/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyPropertiesTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyPropertiesTermV2.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_zatz;1",
+        "@id": "dtmi:example:jogg_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "nuh_spazz",
+          "name": "jogg_floob",
           "properties": [
             {
               "@type": "Property",
-              "name": "nuh_floob",
+              "name": "jogg_zatz",
               "schema": "string"
             }
           ]
@@ -33,15 +33,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_itch;1",
+        "@id": "dtmi:example:jogg_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "nuh_jogg",
+          "name": "jogg_flunn",
           "dtmi:dtdl:property:properties;2": [
             {
               "@type": "Property",
-              "name": "nuh_flunn",
+              "name": "jogg_itch",
               "schema": "time"
             }
           ]
diff --git a/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyTargetTermV2.json b/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyTargetTermV2.json
index 527542d1..d5e6d8d9 100644
--- a/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyTargetTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyTargetTermV2.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_delta;1",
+        "@id": "dtmi:example:vroo_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "spazz_beta",
-          "target": "dtmi:example:spazz_gamma;1"
+          "name": "vroo_gamma",
+          "target": "dtmi:example:vroo_delta;1"
         }
       }
     ]
@@ -27,12 +27,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_eta;1",
+        "@id": "dtmi:example:vroo_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "spazz_epsilon",
-          "dtmi:dtdl:property:target;2": "dtmi:example:spazz_zeta;1"
+          "name": "vroo_zeta",
+          "dtmi:dtdl:property:target;2": "dtmi:example:vroo_eta;1"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyWritableTermV2.json b/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyWritableTermV2.json
index 7a94eae7..a1242159 100644
--- a/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyWritableTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassRelationshipPropertyWritableTermV2.json
@@ -8,11 +8,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_wum;1",
+        "@id": "dtmi:example:hi_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "floob_yuzz",
+          "name": "hi_wum",
           "writable": false
         }
       }
@@ -27,11 +27,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_humpf;1",
+        "@id": "dtmi:example:hi_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "floob_um",
+          "name": "hi_humpf",
           "dtmi:dtdl:property:writable;2": true
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassRelationshipTypeDuplicatesMaterialV2.json b/DTDL/v2/spec/Recommendation-ClassRelationshipTypeDuplicatesMaterialV2.json
index 0644be37..419532d3 100644
--- a/DTDL/v2/spec/Recommendation-ClassRelationshipTypeDuplicatesMaterialV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassRelationshipTypeDuplicatesMaterialV2.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_chi;1",
+        "@id": "dtmi:example:vroo_eta;1",
         "@type": "Interface",
         "contents": {
-          "name": "spazz_phi",
+          "name": "vroo_zeta",
           "@type": [
             "Relationship",
             "Relationship"
@@ -29,10 +29,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_omega;1",
+        "@id": "dtmi:example:vroo_iota;1",
         "@type": "Interface",
         "contents": {
-          "name": "spazz_psi",
+          "name": "vroo_theta",
           "@type": [
             "dtmi:dtdl:class:Relationship;2",
             "dtmi:dtdl:class:Relationship;2"
diff --git a/DTDL/v2/spec/Recommendation-ClassRelationshipTypeIncludesTermAndDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassRelationshipTypeIncludesTermAndDtmiV2.json
index b6cb3764..70533023 100644
--- a/DTDL/v2/spec/Recommendation-ClassRelationshipTypeIncludesTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassRelationshipTypeIncludesTermAndDtmiV2.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_upsilon;1",
+        "@id": "dtmi:example:vroo_epsilon;1",
         "@type": "Interface",
         "contents": {
-          "name": "spazz_tau",
+          "name": "vroo_delta",
           "@type": [
             "Relationship",
             "dtmi:dtdl:class:Relationship;2"
diff --git a/DTDL/v2/spec/Recommendation-ClassRelationshipTypePreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassRelationshipTypePreferTermToDtmiV2.json
index 9099840a..69a8c4b9 100644
--- a/DTDL/v2/spec/Recommendation-ClassRelationshipTypePreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassRelationshipTypePreferTermToDtmiV2.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_wum;1",
+        "@id": "dtmi:example:vroo_lambda;1",
         "@type": "Interface",
         "contents": {
-          "name": "spazz_yuzz",
+          "name": "vroo_kappa",
           "@type": "Relationship"
         }
       }
@@ -26,10 +26,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_humpf;1",
+        "@id": "dtmi:example:vroo_nu;1",
         "@type": "Interface",
         "contents": {
-          "name": "spazz_um",
+          "name": "vroo_mu",
           "@type": "dtmi:dtdl:class:Relationship;2"
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassTelemetryCotypePropertyTermV2.json b/DTDL/v2/spec/Recommendation-ClassTelemetryCotypePropertyTermV2.json
index 9f2505c2..99ef8e3c 100644
--- a/DTDL/v2/spec/Recommendation-ClassTelemetryCotypePropertyTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassTelemetryCotypePropertyTermV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_quan;1",
+        "@id": "dtmi:example:humpf_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "upsilon_snee",
+          "name": "humpf_delta",
           "schema": "integer",
           "unit": "acre"
         }
@@ -31,14 +31,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_spazz;1",
+        "@id": "dtmi:example:humpf_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "upsilon_thnad",
+          "name": "humpf_zeta",
           "schema": "long",
           "dtmi:dtdl:property:unit;2": "acre"
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassTelemetryCotypePropertyValuePreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassTelemetryCotypePropertyValuePreferTermToDtmiV2.json
index 99d9ac60..5f11f772 100644
--- a/DTDL/v2/spec/Recommendation-ClassTelemetryCotypePropertyValuePreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassTelemetryCotypePropertyValuePreferTermToDtmiV2.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_itch;1",
+        "@id": "dtmi:example:um_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "tau_flunn",
+          "name": "um_lambda",
           "schema": "double",
           "unit": "acre"
         }
@@ -31,14 +31,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_vroo;1",
+        "@id": "dtmi:example:um_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "tau_yekk",
+          "name": "um_nu",
           "schema": "float",
           "unit": "acre"
         }
@@ -54,14 +54,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_alpha;1",
+        "@id": "dtmi:example:um_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "tau_hi",
+          "name": "um_omicron",
           "schema": "integer",
           "unit": "dtmi:standard:unit:acre;2"
         }
@@ -77,14 +77,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_gamma;1",
+        "@id": "dtmi:example:um_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "upsilon_beta",
+          "name": "um_rho",
           "schema": "long",
           "unit": "dtmi:standard:unit:acre;2"
         }
diff --git a/DTDL/v2/spec/Recommendation-ClassTelemetryDuplicateSemanticTypesV2.json b/DTDL/v2/spec/Recommendation-ClassTelemetryDuplicateSemanticTypesV2.json
index 49d8f6ee..fdd2d5b4 100644
--- a/DTDL/v2/spec/Recommendation-ClassTelemetryDuplicateSemanticTypesV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassTelemetryDuplicateSemanticTypesV2.json
@@ -8,7 +8,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_nuh;1",
+        "@id": "dtmi:example:gamma_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": [
@@ -16,8 +16,8 @@
             "LuminousIntensity",
             "LuminousIntensity"
           ],
-          "name": "flunn_glikk",
-          "schema": "integer",
+          "name": "gamma_nuh",
+          "schema": "double",
           "unit": "candela"
         }
       }
@@ -32,7 +32,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_quan;1",
+        "@id": "dtmi:example:gamma_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": [
@@ -40,8 +40,8 @@
             "dtmi:standard:class:LuminousIntensity;2",
             "dtmi:standard:class:LuminousIntensity;2"
           ],
-          "name": "flunn_snee",
-          "schema": "long",
+          "name": "gamma_quan",
+          "schema": "float",
           "unit": "candela"
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassTelemetryInvalidKeywordsV2.json b/DTDL/v2/spec/Recommendation-ClassTelemetryInvalidKeywordsV2.json
index e17a0337..89ec7b5c 100644
--- a/DTDL/v2/spec/Recommendation-ClassTelemetryInvalidKeywordsV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassTelemetryInvalidKeywordsV2.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_tau;1",
+        "@id": "dtmi:example:psi_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "pi_sigma",
-          "schema": "date",
+          "name": "psi_quan",
+          "schema": "double",
           "@value": 626
         }
       }
@@ -28,12 +28,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_phi;1",
+        "@id": "dtmi:example:psi_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "pi_upsilon",
-          "schema": "dateTime",
+          "name": "psi_spazz",
+          "schema": "duration",
           "@language": "en"
         }
       }
@@ -48,12 +48,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_psi;1",
+        "@id": "dtmi:example:psi_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "pi_chi",
-          "schema": "double",
+          "name": "psi_zatz",
+          "schema": "float",
           "@foobar": true
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassTelemetryPropertyCommentTermV2.json b/DTDL/v2/spec/Recommendation-ClassTelemetryPropertyCommentTermV2.json
index b4e8267b..7dc546b9 100644
--- a/DTDL/v2/spec/Recommendation-ClassTelemetryPropertyCommentTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassTelemetryPropertyCommentTermV2.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_snee;1",
+        "@id": "dtmi:example:upsilon_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "comment": "mu_glikk",
-          "name": "mu_nuh",
-          "schema": "date"
+          "comment": "upsilon_beta",
+          "name": "upsilon_gamma",
+          "schema": "double"
         }
       }
     ]
@@ -28,13 +28,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_spazz;1",
+        "@id": "dtmi:example:upsilon_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "dtmi:dtdl:property:comment;2": "mu_quan",
-          "name": "mu_thnad",
-          "schema": "dateTime"
+          "dtmi:dtdl:property:comment;2": "upsilon_epsilon",
+          "name": "upsilon_zeta",
+          "schema": "duration"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassTelemetryPropertyDescriptionTermV2.json b/DTDL/v2/spec/Recommendation-ClassTelemetryPropertyDescriptionTermV2.json
index ca9afa15..92944ddf 100644
--- a/DTDL/v2/spec/Recommendation-ClassTelemetryPropertyDescriptionTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassTelemetryPropertyDescriptionTermV2.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_rho;1",
+        "@id": "dtmi:example:phi_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
           "description": [
-            "xi_omicron"
+            "phi_glikk"
           ],
-          "name": "xi_pi",
-          "schema": "double"
+          "name": "phi_nuh",
+          "schema": "float"
         }
       }
     ]
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_upsilon;1",
+        "@id": "dtmi:example:phi_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
           "dtmi:dtdl:property:description;2": [
-            "xi_sigma"
+            "phi_quan"
           ],
-          "name": "xi_tau",
-          "schema": "duration"
+          "name": "phi_thnad",
+          "schema": "integer"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassTelemetryPropertyDisplayNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassTelemetryPropertyDisplayNameTermV2.json
index f7d1297f..06fce87d 100644
--- a/DTDL/v2/spec/Recommendation-ClassTelemetryPropertyDisplayNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassTelemetryPropertyDisplayNameTermV2.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_beta;1",
+        "@id": "dtmi:example:psi_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
           "displayName": [
-            "omicron_hi"
+            "psi_omicron"
           ],
-          "name": "pi_alpha",
-          "schema": "float"
+          "name": "psi_pi",
+          "schema": "long"
         }
       }
     ]
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_epsilon;1",
+        "@id": "dtmi:example:psi_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
           "dtmi:dtdl:property:displayName;2": [
-            "pi_gamma"
+            "psi_sigma"
           ],
-          "name": "pi_delta",
-          "schema": "integer"
+          "name": "psi_tau",
+          "schema": "string"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Recommendation-ClassTelemetryPropertyNameTermV2.json b/DTDL/v2/spec/Recommendation-ClassTelemetryPropertyNameTermV2.json
index 51b74230..16180aa7 100644
--- a/DTDL/v2/spec/Recommendation-ClassTelemetryPropertyNameTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassTelemetryPropertyNameTermV2.json
@@ -8,11 +8,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_omega;1",
+        "@id": "dtmi:example:epsilon_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "yekk_psi",
+          "name": "epsilon_omega",
           "schema": "float"
         }
       }
@@ -27,11 +27,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_wum;1",
+        "@id": "dtmi:example:epsilon_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "dtmi:dtdl:property:name;2": "yekk_yuzz",
+          "dtmi:dtdl:property:name;2": "epsilon_wum",
           "schema": "integer"
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassTelemetryPropertySchemaPreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassTelemetryPropertySchemaPreferTermToDtmiV2.json
index 194dd733..2dc423de 100644
--- a/DTDL/v2/spec/Recommendation-ClassTelemetryPropertySchemaPreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassTelemetryPropertySchemaPreferTermToDtmiV2.json
@@ -8,11 +8,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_omicron;1",
+        "@id": "dtmi:example:kappa_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "gamma_xi",
+          "name": "kappa_psi",
           "schema": "dateTime"
         }
       }
@@ -27,11 +27,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_rho;1",
+        "@id": "dtmi:example:kappa_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "gamma_pi",
+          "name": "kappa_yuzz",
           "schema": "dtmi:dtdl:instance:Schema:dateTime;2"
         }
       }
@@ -46,11 +46,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_tau;1",
+        "@id": "dtmi:example:kappa_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "gamma_sigma",
+          "name": "kappa_um",
           "schema": "point"
         }
       }
@@ -65,11 +65,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_phi;1",
+        "@id": "dtmi:example:kappa_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "gamma_upsilon",
+          "name": "kappa_fuddle",
           "schema": "dtmi:standard:schema:geospatial:point;2"
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassTelemetryPropertySchemaTermV2.json b/DTDL/v2/spec/Recommendation-ClassTelemetryPropertySchemaTermV2.json
index e6cfd223..6d01091d 100644
--- a/DTDL/v2/spec/Recommendation-ClassTelemetryPropertySchemaTermV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassTelemetryPropertySchemaTermV2.json
@@ -8,11 +8,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_itch;1",
+        "@id": "dtmi:example:xi_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "zeta_flunn",
+          "name": "xi_epsilon",
           "schema": "double"
         }
       }
@@ -27,11 +27,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_vroo;1",
+        "@id": "dtmi:example:xi_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "zeta_yekk",
+          "name": "xi_eta",
           "dtmi:dtdl:property:schema;2": "duration"
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassTelemetrySemanticTypePreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassTelemetrySemanticTypePreferTermToDtmiV2.json
index e477f5d3..881dbab5 100644
--- a/DTDL/v2/spec/Recommendation-ClassTelemetrySemanticTypePreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassTelemetrySemanticTypePreferTermToDtmiV2.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_spazz;1",
+        "@id": "dtmi:example:gamma_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "LuminousIntensity"
           ],
-          "name": "flunn_thnad",
-          "schema": "double",
+          "name": "gamma_spazz",
+          "schema": "integer",
           "unit": "candela"
         }
       }
@@ -31,15 +31,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_zatz;1",
+        "@id": "dtmi:example:gamma_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:LuminousIntensity;2"
           ],
-          "name": "flunn_floob",
-          "schema": "float",
+          "name": "gamma_zatz",
+          "schema": "long",
           "unit": "candela"
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassTelemetrySemanticTypeTermAndDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassTelemetrySemanticTypeTermAndDtmiV2.json
index 3f2b95a7..fcfa3ea8 100644
--- a/DTDL/v2/spec/Recommendation-ClassTelemetrySemanticTypeTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassTelemetrySemanticTypeTermAndDtmiV2.json
@@ -8,7 +8,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_fuddle;1",
+        "@id": "dtmi:example:gamma_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": [
@@ -16,8 +16,8 @@
             "LuminousIntensity",
             "dtmi:standard:class:LuminousIntensity;2"
           ],
-          "name": "flunn_humpf",
-          "schema": "float",
+          "name": "gamma_fuddle",
+          "schema": "long",
           "unit": "candela"
         }
       }
diff --git a/DTDL/v2/spec/Recommendation-ClassTelemetryTypeDuplicatesMaterialV2.json b/DTDL/v2/spec/Recommendation-ClassTelemetryTypeDuplicatesMaterialV2.json
index 4429117c..47f50a41 100644
--- a/DTDL/v2/spec/Recommendation-ClassTelemetryTypeDuplicatesMaterialV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassTelemetryTypeDuplicatesMaterialV2.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_epsilon;1",
+        "@id": "dtmi:example:gamma_zeta;1",
         "@type": "Interface",
         "contents": {
-          "name": "flunn_delta",
+          "name": "gamma_epsilon",
           "schema": "double",
           "@type": [
             "Telemetry",
@@ -30,10 +30,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_eta;1",
+        "@id": "dtmi:example:gamma_theta;1",
         "@type": "Interface",
         "contents": {
-          "name": "flunn_zeta",
+          "name": "gamma_eta",
           "schema": "duration",
           "@type": [
             "dtmi:dtdl:class:Telemetry;2",
diff --git a/DTDL/v2/spec/Recommendation-ClassTelemetryTypeIncludesTermAndDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassTelemetryTypeIncludesTermAndDtmiV2.json
index 8ca7e062..0c407090 100644
--- a/DTDL/v2/spec/Recommendation-ClassTelemetryTypeIncludesTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassTelemetryTypeIncludesTermAndDtmiV2.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_gamma;1",
+        "@id": "dtmi:example:gamma_delta;1",
         "@type": "Interface",
         "contents": {
-          "name": "flunn_beta",
+          "name": "gamma_gamma",
           "schema": "dateTime",
           "@type": [
             "Telemetry",
diff --git a/DTDL/v2/spec/Recommendation-ClassTelemetryTypePreferTermToDtmiV2.json b/DTDL/v2/spec/Recommendation-ClassTelemetryTypePreferTermToDtmiV2.json
index d386f0d2..ba847877 100644
--- a/DTDL/v2/spec/Recommendation-ClassTelemetryTypePreferTermToDtmiV2.json
+++ b/DTDL/v2/spec/Recommendation-ClassTelemetryTypePreferTermToDtmiV2.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_iota;1",
+        "@id": "dtmi:example:gamma_kappa;1",
         "@type": "Interface",
         "contents": {
-          "name": "flunn_theta",
+          "name": "gamma_iota",
           "schema": "float",
           "@type": "Telemetry"
         }
@@ -27,10 +27,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_lambda;1",
+        "@id": "dtmi:example:gamma_mu;1",
         "@type": "Interface",
         "contents": {
-          "name": "flunn_kappa",
+          "name": "gamma_lambda",
           "schema": "integer",
           "@type": "dtmi:dtdl:class:Telemetry;2"
         }
diff --git a/DTDL/v2/spec/Requirement-ClassArrayContextConformsV2.json b/DTDL/v2/spec/Requirement-ClassArrayContextConformsV2.json
index 37540ccc..cd53e811 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayContextConformsV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayContextConformsV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_zatz;1",
+        "@id": "dtmi:example:mu_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "kappa_floob",
+          "name": "mu_snee",
           "schema": {
             "@type": "Array",
             "elementSchema": "double",
@@ -29,11 +29,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_flunn;1",
+        "@id": "dtmi:example:mu_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "kappa_jogg",
+          "name": "mu_thnad",
           "schema": {
             "@type": "Array",
             "elementSchema": "duration",
@@ -51,11 +51,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_yekk;1",
+        "@id": "dtmi:example:mu_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "kappa_itch",
+          "name": "mu_floob",
           "schema": {
             "@type": "Array",
             "elementSchema": "float",
@@ -75,11 +75,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_hi;1",
+        "@id": "dtmi:example:mu_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "kappa_vroo",
+          "name": "mu_jogg",
           "schema": {
             "@type": "Array",
             "elementSchema": "integer",
@@ -97,11 +97,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_beta;1",
+        "@id": "dtmi:example:mu_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "lambda_alpha",
+          "name": "mu_itch",
           "schema": {
             "@type": "Array",
             "elementSchema": "long",
@@ -119,11 +119,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_delta;1",
+        "@id": "dtmi:example:mu_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "lambda_gamma",
+          "name": "mu_vroo",
           "schema": {
             "@type": "Array",
             "elementSchema": "string",
@@ -141,11 +141,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_zeta;1",
+        "@id": "dtmi:example:nu_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "lambda_epsilon",
+          "name": "nu_alpha",
           "schema": {
             "@type": "Array",
             "elementSchema": "time",
@@ -165,11 +165,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_theta;1",
+        "@id": "dtmi:example:nu_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "lambda_eta",
+          "name": "nu_gamma",
           "schema": {
             "@type": "Array",
             "elementSchema": "boolean",
@@ -189,11 +189,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_kappa;1",
+        "@id": "dtmi:example:nu_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "lambda_iota",
+          "name": "nu_epsilon",
           "schema": {
             "@type": "Array",
             "elementSchema": "date",
@@ -213,15 +213,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_mu;1",
+        "@id": "dtmi:example:nu_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "lambda_lambda",
+          "name": "nu_eta",
           "schema": {
             "@type": "Array",
             "elementSchema": "dateTime",
-            "@context": {}
+            "@context": "dtmi:iotcentral:context"
           }
         }
       }
@@ -235,17 +235,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_xi;1",
+        "@id": "dtmi:example:nu_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "lambda_nu",
+          "name": "nu_iota",
           "schema": {
             "@type": "Array",
             "elementSchema": "double",
-            "@context": [
-              {}
-            ]
+            "@context": "http://iotcentral/context/2"
           }
         }
       }
@@ -259,15 +257,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_pi;1",
+        "@id": "dtmi:example:nu_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "lambda_omicron",
+          "name": "nu_lambda",
           "schema": {
             "@type": "Array",
             "elementSchema": "duration",
-            "@context": "dtmi:iotcentral:context"
+            "@context": "iotcentral;2"
           }
         }
       }
@@ -281,15 +279,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_sigma;1",
+        "@id": "dtmi:example:nu_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "lambda_rho",
+          "name": "nu_nu",
           "schema": {
             "@type": "Array",
             "elementSchema": "float",
-            "@context": "http://iotcentral/context/2"
+            "@context": {}
           }
         }
       }
@@ -303,15 +301,67 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_upsilon;1",
+        "@id": "dtmi:example:nu_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "lambda_tau",
+          "name": "nu_omicron",
           "schema": {
             "@type": "Array",
             "elementSchema": "integer",
-            "@context": "iotcentral;2"
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:nu_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "nu_rho",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "long",
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:nu_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "nu_tau",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "string",
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassArrayGraphKeywordV2.json b/DTDL/v2/spec/Requirement-ClassArrayGraphKeywordV2.json
index 69593105..0000a482 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayGraphKeywordV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayGraphKeywordV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_delta;1",
+        "@id": "dtmi:example:upsilon_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_gamma;1",
+          "@id": "dtmi:example:upsilon_gamma;1",
           "@type": "Array",
-          "elementSchema": "dateTime",
+          "elementSchema": "duration",
           "@graph": {}
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_zeta;1",
+        "@id": "dtmi:example:upsilon_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:sigma_epsilon;1",
+          "@id": "dtmi:example:upsilon_epsilon;1",
           "@type": "Array",
-          "elementSchema": "double",
+          "elementSchema": "float",
           "@graph": {}
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassArrayIdDuplicateV2.json b/DTDL/v2/spec/Requirement-ClassArrayIdDuplicateV2.json
index 1f77e81d..9eaa2985 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayIdDuplicateV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayIdDuplicateV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_eta;1",
+        "@id": "dtmi:example:omicron_eta;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:nu_eta;1",
+          "@id": "dtmi:example:omicron_eta;1",
           "@type": "Telemetry",
-          "name": "nu_theta",
+          "name": "omicron_theta",
           "schema": {
-            "@id": "dtmi:example:nu_eta;1",
+            "@id": "dtmi:example:omicron_eta;1",
             "@type": "Array",
-            "elementSchema": "long"
+            "elementSchema": "time"
           }
         }
       }
@@ -30,17 +30,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_iota;1",
+        "@id": "dtmi:example:omicron_iota;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:nu_iota;1",
+          "@id": "dtmi:example:omicron_iota;1",
           "@type": "Telemetry",
-          "name": "nu_kappa",
+          "name": "omicron_kappa",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "@id": "dtmi:example:nu_iota;1",
+            "@id": "dtmi:example:omicron_iota;1",
             "@type": "Array",
-            "elementSchema": "string"
+            "elementSchema": "boolean"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassArrayIdIsDtmiV2.json b/DTDL/v2/spec/Requirement-ClassArrayIdIsDtmiV2.json
index feac8457..f65686f7 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayIdIsDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayIdIsDtmiV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_um;1",
+        "@id": "dtmi:example:nu_um;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;7",
           "@type": "Array",
-          "elementSchema": "date"
+          "elementSchema": "double"
         }
       }
     ]
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_humpf;1",
+        "@id": "dtmi:example:nu_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;108675309",
           "@type": "Array",
-          "elementSchema": "dateTime"
+          "elementSchema": "duration"
         }
       }
     ]
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_fuddle;1",
+        "@id": "dtmi:example:nu_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;999999999",
           "@type": "Array",
-          "elementSchema": "double"
+          "elementSchema": "float"
         }
       }
     ]
@@ -61,12 +61,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_glikk;1",
+        "@id": "dtmi:example:nu_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo;1",
           "@type": "Array",
-          "elementSchema": "duration"
+          "elementSchema": "integer"
         }
       }
     ]
@@ -79,12 +79,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_nuh;1",
+        "@id": "dtmi:example:nu_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@id": null,
           "@type": "Array",
-          "elementSchema": "float"
+          "elementSchema": "long"
         }
       }
     ]
@@ -97,13 +97,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_snee;1",
+        "@id": "dtmi:example:nu_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": null,
           "@type": "Array",
-          "elementSchema": "integer"
+          "elementSchema": "string"
         }
       }
     ]
@@ -116,12 +116,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_quan;1",
+        "@id": "dtmi:example:nu_quan;1",
         "@type": "Interface",
         "schemas": {
           "@id": 626,
           "@type": "Array",
-          "elementSchema": "long"
+          "elementSchema": "time"
         }
       }
     ]
@@ -134,13 +134,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_thnad;1",
+        "@id": "dtmi:example:nu_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": 626,
           "@type": "Array",
-          "elementSchema": "string"
+          "elementSchema": "boolean"
         }
       }
     ]
@@ -153,12 +153,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_spazz;1",
+        "@id": "dtmi:example:nu_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@id": true,
           "@type": "Array",
-          "elementSchema": "time"
+          "elementSchema": "date"
         }
       }
     ]
@@ -171,13 +171,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_floob;1",
+        "@id": "dtmi:example:nu_floob;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": true,
           "@type": "Array",
-          "elementSchema": "boolean"
+          "elementSchema": "dateTime"
         }
       }
     ]
@@ -190,14 +190,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_zatz;1",
+        "@id": "dtmi:example:nu_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@id": {
             "@value": "dtmi:apparently:valid:identifier;3"
           },
           "@type": "Array",
-          "elementSchema": "date"
+          "elementSchema": "double"
         }
       }
     ]
@@ -210,7 +210,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_jogg;1",
+        "@id": "dtmi:example:nu_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -218,7 +218,7 @@
             "@value": "dtmi:apparently:valid:identifier;3"
           },
           "@type": "Array",
-          "elementSchema": "dateTime"
+          "elementSchema": "duration"
         }
       }
     ]
@@ -231,12 +231,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_flunn;1",
+        "@id": "dtmi:example:nu_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;0",
           "@type": "Array",
-          "elementSchema": "double"
+          "elementSchema": "float"
         }
       }
     ]
@@ -249,13 +249,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_itch;1",
+        "@id": "dtmi:example:nu_itch;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0",
           "@type": "Array",
-          "elementSchema": "duration"
+          "elementSchema": "integer"
         }
       }
     ]
@@ -268,12 +268,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_yekk;1",
+        "@id": "dtmi:example:nu_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Array",
-          "elementSchema": "float"
+          "elementSchema": "long"
         }
       }
     ]
@@ -286,13 +286,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_vroo;1",
+        "@id": "dtmi:example:nu_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Array",
-          "elementSchema": "integer"
+          "elementSchema": "string"
         }
       }
     ]
@@ -305,12 +305,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_hi;1",
+        "@id": "dtmi:example:nu_hi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Array",
-          "elementSchema": "long"
+          "elementSchema": "time"
         }
       }
     ]
@@ -323,13 +323,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_alpha;1",
+        "@id": "dtmi:example:xi_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Array",
-          "elementSchema": "string"
+          "elementSchema": "boolean"
         }
       }
     ]
@@ -342,12 +342,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_beta;1",
+        "@id": "dtmi:example:xi_beta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;1a",
           "@type": "Array",
-          "elementSchema": "time"
+          "elementSchema": "date"
         }
       }
     ]
@@ -360,13 +360,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_gamma;1",
+        "@id": "dtmi:example:xi_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1a",
           "@type": "Array",
-          "elementSchema": "boolean"
+          "elementSchema": "dateTime"
         }
       }
     ]
@@ -379,12 +379,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_delta;1",
+        "@id": "dtmi:example:xi_delta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Array",
-          "elementSchema": "date"
+          "elementSchema": "double"
         }
       }
     ]
@@ -397,13 +397,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_epsilon;1",
+        "@id": "dtmi:example:xi_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Array",
-          "elementSchema": "dateTime"
+          "elementSchema": "duration"
         }
       }
     ]
@@ -416,12 +416,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_zeta;1",
+        "@id": "dtmi:example:xi_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Array",
-          "elementSchema": "double"
+          "elementSchema": "float"
         }
       }
     ]
@@ -434,13 +434,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_eta;1",
+        "@id": "dtmi:example:xi_eta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Array",
-          "elementSchema": "duration"
+          "elementSchema": "integer"
         }
       }
     ]
@@ -453,12 +453,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_theta;1",
+        "@id": "dtmi:example:xi_theta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Array",
-          "elementSchema": "float"
+          "elementSchema": "long"
         }
       }
     ]
@@ -471,13 +471,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_iota;1",
+        "@id": "dtmi:example:xi_iota;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Array",
-          "elementSchema": "integer"
+          "elementSchema": "string"
         }
       }
     ]
@@ -490,12 +490,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_kappa;1",
+        "@id": "dtmi:example:xi_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Array",
-          "elementSchema": "long"
+          "elementSchema": "time"
         }
       }
     ]
@@ -508,13 +508,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_lambda;1",
+        "@id": "dtmi:example:xi_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Array",
-          "elementSchema": "string"
+          "elementSchema": "boolean"
         }
       }
     ]
@@ -527,12 +527,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_mu;1",
+        "@id": "dtmi:example:xi_mu;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;01",
           "@type": "Array",
-          "elementSchema": "time"
+          "elementSchema": "date"
         }
       }
     ]
@@ -545,13 +545,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_nu;1",
+        "@id": "dtmi:example:xi_nu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;01",
           "@type": "Array",
-          "elementSchema": "boolean"
+          "elementSchema": "dateTime"
         }
       }
     ]
@@ -564,12 +564,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_xi;1",
+        "@id": "dtmi:example:xi_xi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;",
           "@type": "Array",
-          "elementSchema": "date"
+          "elementSchema": "double"
         }
       }
     ]
@@ -582,13 +582,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_omicron;1",
+        "@id": "dtmi:example:xi_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;",
           "@type": "Array",
-          "elementSchema": "dateTime"
+          "elementSchema": "duration"
         }
       }
     ]
@@ -601,12 +601,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_pi;1",
+        "@id": "dtmi:example:xi_pi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Array",
-          "elementSchema": "double"
+          "elementSchema": "float"
         }
       }
     ]
@@ -619,13 +619,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_rho;1",
+        "@id": "dtmi:example:xi_rho;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Array",
-          "elementSchema": "duration"
+          "elementSchema": "integer"
         }
       }
     ]
@@ -638,12 +638,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_sigma;1",
+        "@id": "dtmi:example:xi_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Array",
-          "elementSchema": "float"
+          "elementSchema": "long"
         }
       }
     ]
@@ -656,13 +656,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_tau;1",
+        "@id": "dtmi:example:xi_tau;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Array",
-          "elementSchema": "integer"
+          "elementSchema": "string"
         }
       }
     ]
@@ -675,12 +675,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_upsilon;1",
+        "@id": "dtmi:example:xi_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:test:1seg;1",
           "@type": "Array",
-          "elementSchema": "long"
+          "elementSchema": "time"
         }
       }
     ]
@@ -693,13 +693,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_phi;1",
+        "@id": "dtmi:example:xi_phi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:1seg;1",
           "@type": "Array",
-          "elementSchema": "string"
+          "elementSchema": "boolean"
         }
       }
     ]
@@ -712,12 +712,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_chi;1",
+        "@id": "dtmi:example:xi_chi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Array",
-          "elementSchema": "time"
+          "elementSchema": "date"
         }
       }
     ]
@@ -730,13 +730,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_psi;1",
+        "@id": "dtmi:example:xi_psi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Array",
-          "elementSchema": "boolean"
+          "elementSchema": "dateTime"
         }
       }
     ]
@@ -749,12 +749,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_omega;1",
+        "@id": "dtmi:example:xi_omega;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo::bar;1",
           "@type": "Array",
-          "elementSchema": "date"
+          "elementSchema": "double"
         }
       }
     ]
@@ -767,13 +767,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_yuzz;1",
+        "@id": "dtmi:example:xi_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo::bar;1",
           "@type": "Array",
-          "elementSchema": "dateTime"
+          "elementSchema": "duration"
         }
       }
     ]
@@ -786,12 +786,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_wum;1",
+        "@id": "dtmi:example:xi_wum;1",
         "@type": "Interface",
         "schemas": {
           "@id": "urn:foo:bar:1",
           "@type": "Array",
-          "elementSchema": "double"
+          "elementSchema": "float"
         }
       }
     ]
@@ -804,13 +804,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_um;1",
+        "@id": "dtmi:example:xi_um;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "urn:foo:bar:1",
           "@type": "Array",
-          "elementSchema": "duration"
+          "elementSchema": "integer"
         }
       }
     ]
@@ -823,12 +823,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_humpf;1",
+        "@id": "dtmi:example:xi_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@id": "http://foo/bar/baz",
           "@type": "Array",
-          "elementSchema": "float"
+          "elementSchema": "long"
         }
       }
     ]
@@ -841,13 +841,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_fuddle;1",
+        "@id": "dtmi:example:xi_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "http://foo/bar/baz",
           "@type": "Array",
-          "elementSchema": "integer"
+          "elementSchema": "string"
         }
       }
     ]
@@ -860,12 +860,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_glikk;1",
+        "@id": "dtmi:example:xi_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:;1",
           "@type": "Array",
-          "elementSchema": "long"
+          "elementSchema": "time"
         }
       }
     ]
@@ -878,13 +878,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_nuh;1",
+        "@id": "dtmi:example:xi_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:;1",
           "@type": "Array",
-          "elementSchema": "string"
+          "elementSchema": "boolean"
         }
       }
     ]
@@ -897,12 +897,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_snee;1",
+        "@id": "dtmi:example:xi_snee;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar",
           "@type": "Array",
-          "elementSchema": "time"
+          "elementSchema": "date"
         }
       }
     ]
@@ -915,13 +915,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_quan;1",
+        "@id": "dtmi:example:xi_quan;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar",
           "@type": "Array",
-          "elementSchema": "boolean"
+          "elementSchema": "dateTime"
         }
       }
     ]
@@ -934,12 +934,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_thnad;1",
+        "@id": "dtmi:example:xi_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.14",
           "@type": "Array",
-          "elementSchema": "date"
+          "elementSchema": "double"
         }
       }
     ]
@@ -952,13 +952,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_spazz;1",
+        "@id": "dtmi:example:xi_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.14",
           "@type": "Array",
-          "elementSchema": "dateTime"
+          "elementSchema": "duration"
         }
       }
     ]
@@ -971,12 +971,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_floob;1",
+        "@id": "dtmi:example:xi_floob;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.141592",
           "@type": "Array",
-          "elementSchema": "double"
+          "elementSchema": "float"
         }
       }
     ]
@@ -989,13 +989,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_zatz;1",
+        "@id": "dtmi:example:xi_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.141592",
           "@type": "Array",
-          "elementSchema": "duration"
+          "elementSchema": "integer"
         }
       }
     ]
@@ -1008,12 +1008,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_jogg;1",
+        "@id": "dtmi:example:xi_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:dtdl:example;1",
           "@type": "Array",
-          "elementSchema": "float"
+          "elementSchema": "long"
         }
       }
     ]
@@ -1026,13 +1026,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_flunn;1",
+        "@id": "dtmi:example:xi_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:dtdl:example;1",
           "@type": "Array",
-          "elementSchema": "integer"
+          "elementSchema": "string"
         }
       }
     ]
@@ -1045,12 +1045,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_itch;1",
+        "@id": "dtmi:example:xi_itch;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:standard:example;1",
           "@type": "Array",
-          "elementSchema": "long"
+          "elementSchema": "time"
         }
       }
     ]
@@ -1063,13 +1063,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_yekk;1",
+        "@id": "dtmi:example:xi_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:standard:example;1",
           "@type": "Array",
-          "elementSchema": "string"
+          "elementSchema": "boolean"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassArrayIdNotArrayV2.json b/DTDL/v2/spec/Requirement-ClassArrayIdNotArrayV2.json
index dc85911e..05157020 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayIdNotArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayIdNotArrayV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_vroo;1",
+        "@id": "dtmi:example:xi_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
             "dtmi:foo:bar;7"
           ],
           "@type": "Array",
-          "elementSchema": "time"
+          "elementSchema": "date"
         }
       }
     ]
@@ -27,7 +27,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_hi;1",
+        "@id": "dtmi:example:xi_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -35,7 +35,7 @@
             "dtmi:foo:bar;7"
           ],
           "@type": "Array",
-          "elementSchema": "boolean"
+          "elementSchema": "dateTime"
         }
       }
     ]
@@ -48,14 +48,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_alpha;1",
+        "@id": "dtmi:example:omicron_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
             "dtmi:foo:bar;108675309"
           ],
           "@type": "Array",
-          "elementSchema": "date"
+          "elementSchema": "double"
         }
       }
     ]
@@ -68,7 +68,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_beta;1",
+        "@id": "dtmi:example:omicron_beta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -76,7 +76,7 @@
             "dtmi:foo:bar;108675309"
           ],
           "@type": "Array",
-          "elementSchema": "dateTime"
+          "elementSchema": "duration"
         }
       }
     ]
@@ -89,14 +89,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_gamma;1",
+        "@id": "dtmi:example:omicron_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
             "dtmi:foo:bar;999999999"
           ],
           "@type": "Array",
-          "elementSchema": "double"
+          "elementSchema": "float"
         }
       }
     ]
@@ -109,7 +109,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_delta;1",
+        "@id": "dtmi:example:omicron_delta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -117,7 +117,7 @@
             "dtmi:foo:bar;999999999"
           ],
           "@type": "Array",
-          "elementSchema": "duration"
+          "elementSchema": "integer"
         }
       }
     ]
@@ -130,14 +130,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_epsilon;1",
+        "@id": "dtmi:example:omicron_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
             "dtmi:foo;1"
           ],
           "@type": "Array",
-          "elementSchema": "float"
+          "elementSchema": "long"
         }
       }
     ]
@@ -150,7 +150,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_zeta;1",
+        "@id": "dtmi:example:omicron_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -158,7 +158,7 @@
             "dtmi:foo;1"
           ],
           "@type": "Array",
-          "elementSchema": "integer"
+          "elementSchema": "string"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassArrayIdRequiredV2.json b/DTDL/v2/spec/Requirement-ClassArrayIdRequiredV2.json
index 6faedc5d..7f095841 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayIdRequiredV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayIdRequiredV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_chi;1",
+        "@id": "dtmi:example:nu_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "lambda_phi",
+          "name": "nu_phi",
           "schema": {
             "@type": "Array",
-            "elementSchema": "long"
+            "elementSchema": "time"
           }
         }
       }
@@ -28,12 +28,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_omega;1",
+        "@id": "dtmi:example:nu_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_psi;1",
+          "@id": "dtmi:example:nu_psi;1",
           "@type": "Array",
-          "elementSchema": "string"
+          "elementSchema": "boolean"
         }
       }
     ]
@@ -46,11 +46,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_yuzz;1",
+        "@id": "dtmi:example:nu_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@type": "Array",
-          "elementSchema": "time"
+          "elementSchema": "date"
         }
       }
     ]
@@ -63,12 +63,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_wum;1",
+        "@id": "dtmi:example:nu_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Array",
-          "elementSchema": "boolean"
+          "elementSchema": "dateTime"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassArrayPropertiesElementSchemaSchemaMaxDepthV2.json b/DTDL/v2/spec/Requirement-ClassArrayPropertiesElementSchemaSchemaMaxDepthV2.json
index d4c0b0a6..0f17339d 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayPropertiesElementSchemaSchemaMaxDepthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayPropertiesElementSchemaSchemaMaxDepthV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_humpf;1",
+        "@id": "dtmi:example:humpf_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "phi_um",
+          "name": "humpf_vroo",
           "schema": {
             "@type": "Array",
             "elementSchema": {
@@ -40,11 +40,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_glikk;1",
+        "@id": "dtmi:example:fuddle_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "phi_fuddle",
+          "name": "fuddle_alpha",
           "schema": {
             "@type": "Array",
             "elementSchema": {
@@ -76,11 +76,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_snee;1",
+        "@id": "dtmi:example:fuddle_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "phi_nuh",
+          "name": "fuddle_gamma",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Array",
diff --git a/DTDL/v2/spec/Requirement-ClassArrayPropertiesElementSchemaSchemaSelfReferenceV2.json b/DTDL/v2/spec/Requirement-ClassArrayPropertiesElementSchemaSchemaSelfReferenceV2.json
new file mode 100644
index 00000000..41be996b
--- /dev/null
+++ b/DTDL/v2/spec/Requirement-ClassArrayPropertiesElementSchemaSchemaSelfReferenceV2.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:fuddle_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "fuddle_epsilon",
+          "schema": {
+            "@id": "dtmi:foo:beta_tau;1",
+            "@type": "Array",
+            "elementSchema": "dtmi:foo:beta_tau;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:fuddle_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "fuddle_eta",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:beta_tau;1",
+            "@type": "Array",
+            "elementSchema": "dtmi:foo:beta_tau;1"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v2/spec/Requirement-ClassArrayPropertyCommentStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassArrayPropertyCommentStringLengthV2.json
index 52a06706..ff7174a1 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayPropertyCommentStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayPropertyCommentStringLengthV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_lambda;1",
+        "@id": "dtmi:example:pi_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_kappa;1",
+          "@id": "dtmi:example:pi_kappa;1",
           "@type": "Array",
-          "elementSchema": "boolean",
+          "elementSchema": "dateTime",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_nu;1",
+        "@id": "dtmi:example:pi_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_mu;1",
+          "@id": "dtmi:example:pi_mu;1",
           "@type": "Array",
-          "elementSchema": "date",
+          "elementSchema": "double",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -45,13 +45,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_omicron;1",
+        "@id": "dtmi:example:pi_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:xi_xi;1",
+          "@id": "dtmi:example:pi_xi;1",
           "@type": "Array",
-          "elementSchema": "dateTime",
+          "elementSchema": "duration",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassArrayPropertyCommentStringV2.json b/DTDL/v2/spec/Requirement-ClassArrayPropertyCommentStringV2.json
index 81303f0d..b3c366dc 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayPropertyCommentStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayPropertyCommentStringV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_mu;1",
+        "@id": "dtmi:example:omicron_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_lambda;1",
+          "@id": "dtmi:example:omicron_lambda;1",
           "@type": "Array",
-          "elementSchema": "time",
+          "elementSchema": "date",
           "comment": "hello"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_xi;1",
+        "@id": "dtmi:example:omicron_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_nu;1",
+          "@id": "dtmi:example:omicron_nu;1",
           "@type": "Array",
-          "elementSchema": "boolean",
+          "elementSchema": "dateTime",
           "comment": [
             "hello"
           ]
@@ -47,12 +47,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_pi;1",
+        "@id": "dtmi:example:omicron_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_omicron;1",
+          "@id": "dtmi:example:omicron_omicron;1",
           "@type": "Array",
-          "elementSchema": "date",
+          "elementSchema": "double",
           "comment": {
             "@value": "hello",
             "@type": "xsd:string"
@@ -69,12 +69,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_sigma;1",
+        "@id": "dtmi:example:omicron_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_rho;1",
+          "@id": "dtmi:example:omicron_rho;1",
           "@type": "Array",
-          "elementSchema": "dateTime",
+          "elementSchema": "duration",
           "comment": [
             {
               "@value": "hello",
@@ -93,12 +93,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_upsilon;1",
+        "@id": "dtmi:example:omicron_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_tau;1",
+          "@id": "dtmi:example:omicron_tau;1",
           "@type": "Array",
-          "elementSchema": "double",
+          "elementSchema": "float",
           "comment": []
         }
       }
@@ -112,12 +112,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_chi;1",
+        "@id": "dtmi:example:omicron_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_phi;1",
+          "@id": "dtmi:example:omicron_phi;1",
           "@type": "Array",
-          "elementSchema": "duration",
+          "elementSchema": "integer",
           "comment": null
         }
       }
@@ -131,13 +131,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_omega;1",
+        "@id": "dtmi:example:omicron_omega;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nu_psi;1",
+          "@id": "dtmi:example:omicron_psi;1",
           "@type": "Array",
-          "elementSchema": "float",
+          "elementSchema": "long",
           "comment": null
         }
       }
@@ -151,12 +151,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_wum;1",
+        "@id": "dtmi:example:omicron_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_yuzz;1",
+          "@id": "dtmi:example:omicron_yuzz;1",
           "@type": "Array",
-          "elementSchema": "integer",
+          "elementSchema": "string",
           "comment": true
         }
       }
@@ -170,13 +170,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_humpf;1",
+        "@id": "dtmi:example:omicron_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nu_um;1",
+          "@id": "dtmi:example:omicron_um;1",
           "@type": "Array",
-          "elementSchema": "long",
+          "elementSchema": "time",
           "comment": true
         }
       }
@@ -190,12 +190,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_glikk;1",
+        "@id": "dtmi:example:omicron_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_fuddle;1",
+          "@id": "dtmi:example:omicron_fuddle;1",
           "@type": "Array",
-          "elementSchema": "string",
+          "elementSchema": "boolean",
           "comment": 626
         }
       }
@@ -209,13 +209,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_snee;1",
+        "@id": "dtmi:example:omicron_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nu_nuh;1",
+          "@id": "dtmi:example:omicron_nuh;1",
           "@type": "Array",
-          "elementSchema": "time",
+          "elementSchema": "date",
           "comment": 626
         }
       }
@@ -229,12 +229,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_thnad;1",
+        "@id": "dtmi:example:omicron_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_quan;1",
+          "@id": "dtmi:example:omicron_quan;1",
           "@type": "Array",
-          "elementSchema": "boolean",
+          "elementSchema": "dateTime",
           "comment": [
             null
           ]
@@ -250,13 +250,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_floob;1",
+        "@id": "dtmi:example:omicron_floob;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nu_spazz;1",
+          "@id": "dtmi:example:omicron_spazz;1",
           "@type": "Array",
-          "elementSchema": "date",
+          "elementSchema": "double",
           "comment": [
             null
           ]
@@ -272,12 +272,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_jogg;1",
+        "@id": "dtmi:example:omicron_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_zatz;1",
+          "@id": "dtmi:example:omicron_zatz;1",
           "@type": "Array",
-          "elementSchema": "dateTime",
+          "elementSchema": "duration",
           "comment": [
             true
           ]
@@ -293,13 +293,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_itch;1",
+        "@id": "dtmi:example:omicron_itch;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nu_flunn;1",
+          "@id": "dtmi:example:omicron_flunn;1",
           "@type": "Array",
-          "elementSchema": "double",
+          "elementSchema": "float",
           "comment": [
             true
           ]
@@ -315,12 +315,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_vroo;1",
+        "@id": "dtmi:example:omicron_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_yekk;1",
+          "@id": "dtmi:example:omicron_yekk;1",
           "@type": "Array",
-          "elementSchema": "duration",
+          "elementSchema": "integer",
           "comment": [
             626
           ]
@@ -336,13 +336,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_alpha;1",
+        "@id": "dtmi:example:pi_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nu_hi;1",
+          "@id": "dtmi:example:omicron_hi;1",
           "@type": "Array",
-          "elementSchema": "float",
+          "elementSchema": "long",
           "comment": [
             626
           ]
@@ -358,12 +358,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_gamma;1",
+        "@id": "dtmi:example:pi_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_beta;1",
+          "@id": "dtmi:example:pi_beta;1",
           "@type": "Array",
-          "elementSchema": "integer",
+          "elementSchema": "string",
           "comment": {}
         }
       }
@@ -377,13 +377,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_epsilon;1",
+        "@id": "dtmi:example:pi_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:xi_delta;1",
+          "@id": "dtmi:example:pi_delta;1",
           "@type": "Array",
-          "elementSchema": "long",
+          "elementSchema": "time",
           "comment": {}
         }
       }
@@ -397,12 +397,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_eta;1",
+        "@id": "dtmi:example:pi_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_zeta;1",
+          "@id": "dtmi:example:pi_zeta;1",
           "@type": "Array",
-          "elementSchema": "string",
+          "elementSchema": "boolean",
           "comment": [
             {}
           ]
@@ -418,13 +418,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_iota;1",
+        "@id": "dtmi:example:pi_iota;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:xi_theta;1",
+          "@id": "dtmi:example:pi_theta;1",
           "@type": "Array",
-          "elementSchema": "time",
+          "elementSchema": "date",
           "comment": [
             {}
           ]
diff --git a/DTDL/v2/spec/Requirement-ClassArrayPropertyCommentTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassArrayPropertyCommentTermAndDtmiV2.json
index cbddda76..e7fa3b9a 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayPropertyCommentTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayPropertyCommentTermAndDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_humpf;1",
+        "@id": "dtmi:example:pi_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_yuzz;1",
+          "@id": "dtmi:example:pi_yuzz;1",
           "@type": "Array",
-          "comment": "xi_wum",
-          "dtmi:dtdl:property:comment;2": "xi_um",
-          "elementSchema": "integer"
+          "comment": "pi_wum",
+          "dtmi:dtdl:property:comment;2": "pi_um",
+          "elementSchema": "string"
         }
       }
     ]
@@ -27,15 +27,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_snee;1",
+        "@id": "dtmi:example:pi_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:xi_fuddle;1",
+          "@id": "dtmi:example:pi_fuddle;1",
           "@type": "Array",
-          "comment": "xi_glikk",
-          "dtmi:dtdl:property:comment;2": "xi_nuh",
-          "elementSchema": "long"
+          "comment": "pi_glikk",
+          "dtmi:dtdl:property:comment;2": "pi_nuh",
+          "elementSchema": "time"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassArrayPropertyDescriptionLangStringV2.json b/DTDL/v2/spec/Requirement-ClassArrayPropertyDescriptionLangStringV2.json
index bfd05029..f941452b 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayPropertyDescriptionLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayPropertyDescriptionLangStringV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_thnad;1",
+        "@id": "dtmi:example:pi_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_quan;1",
+          "@id": "dtmi:example:pi_quan;1",
           "@type": "Array",
-          "elementSchema": "string",
+          "elementSchema": "boolean",
           "description": "hello"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_floob;1",
+        "@id": "dtmi:example:pi_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_spazz;1",
+          "@id": "dtmi:example:pi_spazz;1",
           "@type": "Array",
-          "elementSchema": "time",
+          "elementSchema": "date",
           "description": [
             "hello"
           ]
@@ -47,12 +47,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_jogg;1",
+        "@id": "dtmi:example:pi_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_zatz;1",
+          "@id": "dtmi:example:pi_zatz;1",
           "@type": "Array",
-          "elementSchema": "boolean",
+          "elementSchema": "dateTime",
           "description": {
             "en": "hello"
           }
@@ -68,12 +68,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_itch;1",
+        "@id": "dtmi:example:pi_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_flunn;1",
+          "@id": "dtmi:example:pi_flunn;1",
           "@type": "Array",
-          "elementSchema": "date",
+          "elementSchema": "double",
           "description": [
             {
               "@value": "hello",
@@ -92,12 +92,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_vroo;1",
+        "@id": "dtmi:example:pi_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_yekk;1",
+          "@id": "dtmi:example:pi_yekk;1",
           "@type": "Array",
-          "elementSchema": "dateTime",
+          "elementSchema": "duration",
           "description": {}
         }
       }
@@ -111,12 +111,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_alpha;1",
+        "@id": "dtmi:example:rho_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_hi;1",
+          "@id": "dtmi:example:pi_hi;1",
           "@type": "Array",
-          "elementSchema": "double",
+          "elementSchema": "float",
           "description": []
         }
       }
@@ -130,12 +130,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_gamma;1",
+        "@id": "dtmi:example:rho_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_beta;1",
+          "@id": "dtmi:example:rho_beta;1",
           "@type": "Array",
-          "elementSchema": "duration",
+          "elementSchema": "integer",
           "description": null
         }
       }
@@ -149,13 +149,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_epsilon;1",
+        "@id": "dtmi:example:rho_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omicron_delta;1",
+          "@id": "dtmi:example:rho_delta;1",
           "@type": "Array",
-          "elementSchema": "float",
+          "elementSchema": "long",
           "description": null
         }
       }
@@ -169,12 +169,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_eta;1",
+        "@id": "dtmi:example:rho_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_zeta;1",
+          "@id": "dtmi:example:rho_zeta;1",
           "@type": "Array",
-          "elementSchema": "integer",
+          "elementSchema": "string",
           "description": true
         }
       }
@@ -188,13 +188,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_iota;1",
+        "@id": "dtmi:example:rho_iota;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omicron_theta;1",
+          "@id": "dtmi:example:rho_theta;1",
           "@type": "Array",
-          "elementSchema": "long",
+          "elementSchema": "time",
           "description": true
         }
       }
@@ -208,12 +208,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_lambda;1",
+        "@id": "dtmi:example:rho_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_kappa;1",
+          "@id": "dtmi:example:rho_kappa;1",
           "@type": "Array",
-          "elementSchema": "string",
+          "elementSchema": "boolean",
           "description": 626
         }
       }
@@ -227,13 +227,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_nu;1",
+        "@id": "dtmi:example:rho_nu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omicron_mu;1",
+          "@id": "dtmi:example:rho_mu;1",
           "@type": "Array",
-          "elementSchema": "time",
+          "elementSchema": "date",
           "description": 626
         }
       }
@@ -247,12 +247,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_omicron;1",
+        "@id": "dtmi:example:rho_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_xi;1",
+          "@id": "dtmi:example:rho_xi;1",
           "@type": "Array",
-          "elementSchema": "boolean",
+          "elementSchema": "dateTime",
           "description": [
             null
           ]
@@ -268,13 +268,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_rho;1",
+        "@id": "dtmi:example:rho_rho;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omicron_pi;1",
+          "@id": "dtmi:example:rho_pi;1",
           "@type": "Array",
-          "elementSchema": "date",
+          "elementSchema": "double",
           "description": [
             null
           ]
@@ -290,12 +290,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_tau;1",
+        "@id": "dtmi:example:rho_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_sigma;1",
+          "@id": "dtmi:example:rho_sigma;1",
           "@type": "Array",
-          "elementSchema": "dateTime",
+          "elementSchema": "duration",
           "description": [
             true
           ]
@@ -311,13 +311,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_phi;1",
+        "@id": "dtmi:example:rho_phi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omicron_upsilon;1",
+          "@id": "dtmi:example:rho_upsilon;1",
           "@type": "Array",
-          "elementSchema": "double",
+          "elementSchema": "float",
           "description": [
             true
           ]
@@ -333,12 +333,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_psi;1",
+        "@id": "dtmi:example:rho_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_chi;1",
+          "@id": "dtmi:example:rho_chi;1",
           "@type": "Array",
-          "elementSchema": "duration",
+          "elementSchema": "integer",
           "description": [
             626
           ]
@@ -354,13 +354,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_yuzz;1",
+        "@id": "dtmi:example:rho_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omicron_omega;1",
+          "@id": "dtmi:example:rho_omega;1",
           "@type": "Array",
-          "elementSchema": "float",
+          "elementSchema": "long",
           "description": [
             626
           ]
@@ -376,12 +376,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_um;1",
+        "@id": "dtmi:example:rho_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_wum;1",
+          "@id": "dtmi:example:rho_wum;1",
           "@type": "Array",
-          "elementSchema": "integer",
+          "elementSchema": "string",
           "description": [
             {}
           ]
@@ -397,13 +397,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_fuddle;1",
+        "@id": "dtmi:example:rho_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omicron_humpf;1",
+          "@id": "dtmi:example:rho_humpf;1",
           "@type": "Array",
-          "elementSchema": "long",
+          "elementSchema": "time",
           "description": [
             {}
           ]
@@ -419,12 +419,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_nuh;1",
+        "@id": "dtmi:example:rho_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_glikk;1",
+          "@id": "dtmi:example:rho_glikk;1",
           "@type": "Array",
-          "elementSchema": "string",
+          "elementSchema": "boolean",
           "description": {
             "@value": "hello",
             "@language": "en"
@@ -441,13 +441,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_quan;1",
+        "@id": "dtmi:example:rho_quan;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omicron_snee;1",
+          "@id": "dtmi:example:rho_snee;1",
           "@type": "Array",
-          "elementSchema": "time",
+          "elementSchema": "date",
           "description": {
             "@value": "hello",
             "@language": "en"
@@ -464,12 +464,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_spazz;1",
+        "@id": "dtmi:example:rho_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_thnad;1",
+          "@id": "dtmi:example:rho_thnad;1",
           "@type": "Array",
-          "elementSchema": "boolean",
+          "elementSchema": "dateTime",
           "description": [
             {
               "en": "hello"
@@ -487,13 +487,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_zatz;1",
+        "@id": "dtmi:example:rho_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omicron_floob;1",
+          "@id": "dtmi:example:rho_floob;1",
           "@type": "Array",
-          "elementSchema": "date",
+          "elementSchema": "double",
           "description": [
             {
               "en": "hello"
diff --git a/DTDL/v2/spec/Requirement-ClassArrayPropertyDescriptionStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassArrayPropertyDescriptionStringLengthV2.json
index 3e86d5fc..8fc82529 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayPropertyDescriptionStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayPropertyDescriptionStringLengthV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_flunn;1",
+        "@id": "dtmi:example:rho_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_jogg;1",
+          "@id": "dtmi:example:rho_jogg;1",
           "@type": "Array",
-          "elementSchema": "dateTime",
+          "elementSchema": "duration",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_yekk;1",
+        "@id": "dtmi:example:rho_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_itch;1",
+          "@id": "dtmi:example:rho_itch;1",
           "@type": "Array",
-          "elementSchema": "double",
+          "elementSchema": "float",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -45,13 +45,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_hi;1",
+        "@id": "dtmi:example:rho_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omicron_vroo;1",
+          "@id": "dtmi:example:rho_vroo;1",
           "@type": "Array",
-          "elementSchema": "duration",
+          "elementSchema": "integer",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassArrayPropertyDescriptionTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassArrayPropertyDescriptionTermAndDtmiV2.json
index d58a4816..0070f8d9 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayPropertyDescriptionTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayPropertyDescriptionTermAndDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_nu;1",
+        "@id": "dtmi:example:sigma_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_kappa;1",
+          "@id": "dtmi:example:sigma_kappa;1",
           "@type": "Array",
           "description": [
-            "pi_lambda"
+            "sigma_lambda"
           ],
           "dtmi:dtdl:property:description;2": [
-            "pi_mu"
+            "sigma_mu"
           ],
-          "elementSchema": "string"
+          "elementSchema": "boolean"
         }
       }
     ]
@@ -31,19 +31,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_rho;1",
+        "@id": "dtmi:example:sigma_rho;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:pi_xi;1",
+          "@id": "dtmi:example:sigma_xi;1",
           "@type": "Array",
           "description": [
-            "pi_omicron"
+            "sigma_omicron"
           ],
           "dtmi:dtdl:property:description;2": [
-            "pi_pi"
+            "sigma_pi"
           ],
-          "elementSchema": "time"
+          "elementSchema": "date"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassArrayPropertyDisplayNameLangStringV2.json b/DTDL/v2/spec/Requirement-ClassArrayPropertyDisplayNameLangStringV2.json
index 768818d1..3bd5884d 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayPropertyDisplayNameLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayPropertyDisplayNameLangStringV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_tau;1",
+        "@id": "dtmi:example:sigma_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_sigma;1",
+          "@id": "dtmi:example:sigma_sigma;1",
           "@type": "Array",
-          "elementSchema": "boolean",
+          "elementSchema": "dateTime",
           "displayName": "hello"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_phi;1",
+        "@id": "dtmi:example:sigma_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_upsilon;1",
+          "@id": "dtmi:example:sigma_upsilon;1",
           "@type": "Array",
-          "elementSchema": "date",
+          "elementSchema": "double",
           "displayName": [
             "hello"
           ]
@@ -47,12 +47,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_psi;1",
+        "@id": "dtmi:example:sigma_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_chi;1",
+          "@id": "dtmi:example:sigma_chi;1",
           "@type": "Array",
-          "elementSchema": "dateTime",
+          "elementSchema": "duration",
           "displayName": {
             "en": "hello"
           }
@@ -68,12 +68,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_yuzz;1",
+        "@id": "dtmi:example:sigma_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_omega;1",
+          "@id": "dtmi:example:sigma_omega;1",
           "@type": "Array",
-          "elementSchema": "double",
+          "elementSchema": "float",
           "displayName": [
             {
               "@value": "hello",
@@ -92,12 +92,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_um;1",
+        "@id": "dtmi:example:sigma_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_wum;1",
+          "@id": "dtmi:example:sigma_wum;1",
           "@type": "Array",
-          "elementSchema": "duration",
+          "elementSchema": "integer",
           "displayName": {}
         }
       }
@@ -111,12 +111,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_fuddle;1",
+        "@id": "dtmi:example:sigma_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_humpf;1",
+          "@id": "dtmi:example:sigma_humpf;1",
           "@type": "Array",
-          "elementSchema": "float",
+          "elementSchema": "long",
           "displayName": []
         }
       }
@@ -130,12 +130,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_nuh;1",
+        "@id": "dtmi:example:sigma_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_glikk;1",
+          "@id": "dtmi:example:sigma_glikk;1",
           "@type": "Array",
-          "elementSchema": "integer",
+          "elementSchema": "string",
           "displayName": null
         }
       }
@@ -149,13 +149,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_quan;1",
+        "@id": "dtmi:example:sigma_quan;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:pi_snee;1",
+          "@id": "dtmi:example:sigma_snee;1",
           "@type": "Array",
-          "elementSchema": "long",
+          "elementSchema": "time",
           "displayName": null
         }
       }
@@ -169,12 +169,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_spazz;1",
+        "@id": "dtmi:example:sigma_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_thnad;1",
+          "@id": "dtmi:example:sigma_thnad;1",
           "@type": "Array",
-          "elementSchema": "string",
+          "elementSchema": "boolean",
           "displayName": true
         }
       }
@@ -188,13 +188,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_zatz;1",
+        "@id": "dtmi:example:sigma_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:pi_floob;1",
+          "@id": "dtmi:example:sigma_floob;1",
           "@type": "Array",
-          "elementSchema": "time",
+          "elementSchema": "date",
           "displayName": true
         }
       }
@@ -208,12 +208,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_flunn;1",
+        "@id": "dtmi:example:sigma_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_jogg;1",
+          "@id": "dtmi:example:sigma_jogg;1",
           "@type": "Array",
-          "elementSchema": "boolean",
+          "elementSchema": "dateTime",
           "displayName": 626
         }
       }
@@ -227,13 +227,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_yekk;1",
+        "@id": "dtmi:example:sigma_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:pi_itch;1",
+          "@id": "dtmi:example:sigma_itch;1",
           "@type": "Array",
-          "elementSchema": "date",
+          "elementSchema": "double",
           "displayName": 626
         }
       }
@@ -247,12 +247,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_hi;1",
+        "@id": "dtmi:example:sigma_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_vroo;1",
+          "@id": "dtmi:example:sigma_vroo;1",
           "@type": "Array",
-          "elementSchema": "dateTime",
+          "elementSchema": "duration",
           "displayName": [
             null
           ]
@@ -268,13 +268,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_beta;1",
+        "@id": "dtmi:example:tau_beta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:rho_alpha;1",
+          "@id": "dtmi:example:tau_alpha;1",
           "@type": "Array",
-          "elementSchema": "double",
+          "elementSchema": "float",
           "displayName": [
             null
           ]
@@ -290,12 +290,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_delta;1",
+        "@id": "dtmi:example:tau_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_gamma;1",
+          "@id": "dtmi:example:tau_gamma;1",
           "@type": "Array",
-          "elementSchema": "duration",
+          "elementSchema": "integer",
           "displayName": [
             true
           ]
@@ -311,13 +311,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_zeta;1",
+        "@id": "dtmi:example:tau_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:rho_epsilon;1",
+          "@id": "dtmi:example:tau_epsilon;1",
           "@type": "Array",
-          "elementSchema": "float",
+          "elementSchema": "long",
           "displayName": [
             true
           ]
@@ -333,12 +333,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_theta;1",
+        "@id": "dtmi:example:tau_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_eta;1",
+          "@id": "dtmi:example:tau_eta;1",
           "@type": "Array",
-          "elementSchema": "integer",
+          "elementSchema": "string",
           "displayName": [
             626
           ]
@@ -354,13 +354,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_kappa;1",
+        "@id": "dtmi:example:tau_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:rho_iota;1",
+          "@id": "dtmi:example:tau_iota;1",
           "@type": "Array",
-          "elementSchema": "long",
+          "elementSchema": "time",
           "displayName": [
             626
           ]
@@ -376,12 +376,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_mu;1",
+        "@id": "dtmi:example:tau_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_lambda;1",
+          "@id": "dtmi:example:tau_lambda;1",
           "@type": "Array",
-          "elementSchema": "string",
+          "elementSchema": "boolean",
           "displayName": [
             {}
           ]
@@ -397,13 +397,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_xi;1",
+        "@id": "dtmi:example:tau_xi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:rho_nu;1",
+          "@id": "dtmi:example:tau_nu;1",
           "@type": "Array",
-          "elementSchema": "time",
+          "elementSchema": "date",
           "displayName": [
             {}
           ]
@@ -419,12 +419,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_pi;1",
+        "@id": "dtmi:example:tau_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_omicron;1",
+          "@id": "dtmi:example:tau_omicron;1",
           "@type": "Array",
-          "elementSchema": "boolean",
+          "elementSchema": "dateTime",
           "displayName": {
             "@value": "hello",
             "@language": "en"
@@ -441,13 +441,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_sigma;1",
+        "@id": "dtmi:example:tau_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:rho_rho;1",
+          "@id": "dtmi:example:tau_rho;1",
           "@type": "Array",
-          "elementSchema": "date",
+          "elementSchema": "double",
           "displayName": {
             "@value": "hello",
             "@language": "en"
@@ -464,12 +464,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_upsilon;1",
+        "@id": "dtmi:example:tau_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_tau;1",
+          "@id": "dtmi:example:tau_tau;1",
           "@type": "Array",
-          "elementSchema": "dateTime",
+          "elementSchema": "duration",
           "displayName": [
             {
               "en": "hello"
@@ -487,13 +487,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_chi;1",
+        "@id": "dtmi:example:tau_chi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:rho_phi;1",
+          "@id": "dtmi:example:tau_phi;1",
           "@type": "Array",
-          "elementSchema": "double",
+          "elementSchema": "float",
           "displayName": [
             {
               "en": "hello"
diff --git a/DTDL/v2/spec/Requirement-ClassArrayPropertyDisplayNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassArrayPropertyDisplayNameStringLengthV2.json
index 316245a2..f70b88a7 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayPropertyDisplayNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayPropertyDisplayNameStringLengthV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_omega;1",
+        "@id": "dtmi:example:tau_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_psi;1",
+          "@id": "dtmi:example:tau_psi;1",
           "@type": "Array",
-          "elementSchema": "duration",
+          "elementSchema": "integer",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSometh"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_wum;1",
+        "@id": "dtmi:example:tau_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_yuzz;1",
+          "@id": "dtmi:example:tau_yuzz;1",
           "@type": "Array",
-          "elementSchema": "float",
+          "elementSchema": "long",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
         }
       }
@@ -45,13 +45,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_humpf;1",
+        "@id": "dtmi:example:tau_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:rho_um;1",
+          "@id": "dtmi:example:tau_um;1",
           "@type": "Array",
-          "elementSchema": "integer",
+          "elementSchema": "string",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassArrayPropertyDisplayNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassArrayPropertyDisplayNameTermAndDtmiV2.json
index 162c8a84..f2bc1aec 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayPropertyDisplayNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayPropertyDisplayNameTermAndDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_yekk;1",
+        "@id": "dtmi:example:tau_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_jogg;1",
+          "@id": "dtmi:example:tau_jogg;1",
           "@type": "Array",
           "displayName": [
-            "rho_flunn"
+            "tau_flunn"
           ],
           "dtmi:dtdl:property:displayName;2": [
-            "rho_itch"
+            "tau_itch"
           ],
-          "elementSchema": "boolean"
+          "elementSchema": "dateTime"
         }
       }
     ]
@@ -31,19 +31,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_beta;1",
+        "@id": "dtmi:example:upsilon_beta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:rho_vroo;1",
+          "@id": "dtmi:example:tau_vroo;1",
           "@type": "Array",
           "displayName": [
-            "rho_hi"
+            "tau_hi"
           ],
           "dtmi:dtdl:property:displayName;2": [
-            "sigma_alpha"
+            "upsilon_alpha"
           ],
-          "elementSchema": "date"
+          "elementSchema": "double"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassArrayPropertyElementSchemaElementV2.json b/DTDL/v2/spec/Requirement-ClassArrayPropertyElementSchemaElementV2.json
index 163a00c0..3d7fe160 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayPropertyElementSchemaElementV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayPropertyElementSchemaElementV2.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_spazz;1",
+        "@id": "dtmi:example:eta_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "epsilon_thnad",
+          "name": "eta_omega",
           "schema": {
             "@type": "Array",
             "elementSchema": {
               "@type": "Enum",
               "enumValues": [
                 {
-                  "enumValue": 17,
-                  "name": "epsilon_quan"
+                  "enumValue": 24,
+                  "name": "eta_psi"
                 }
               ],
               "valueSchema": "integer"
@@ -37,11 +37,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_jogg;1",
+        "@id": "dtmi:example:eta_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "epsilon_zatz",
+          "name": "eta_um",
           "schema": {
             "@type": "Array",
             "elementSchema": [
@@ -49,8 +49,8 @@
                 "@type": "Enum",
                 "enumValues": [
                   {
-                    "enumValue": 18,
-                    "name": "epsilon_floob"
+                    "enumValue": 25,
+                    "name": "eta_wum"
                   }
                 ],
                 "valueSchema": "integer"
@@ -69,22 +69,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_itch;1",
+        "@id": "dtmi:example:eta_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 19,
-              "name": "epsilon_flunn"
+              "enumValue": 26,
+              "name": "eta_fuddle"
             }
           ],
           "valueSchema": "integer"
         },
         "contents": {
           "@type": "Telemetry",
-          "name": "epsilon_yekk",
+          "name": "eta_nuh",
           "schema": {
             "@type": "Array",
             "elementSchema": "dtmi:ex:dependentRef;1"
@@ -101,22 +101,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_hi;1",
+        "@id": "dtmi:example:eta_quan;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 20,
-              "name": "epsilon_vroo"
+              "enumValue": 27,
+              "name": "eta_snee"
             }
           ],
           "valueSchema": "integer"
         },
         "contents": {
           "@type": "Telemetry",
-          "name": "zeta_alpha",
+          "name": "eta_thnad",
           "schema": {
             "@type": "Array",
             "elementSchema": [
@@ -135,15 +135,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_delta;1",
+        "@id": "dtmi:example:eta_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "zeta_gamma",
+          "name": "eta_floob",
           "schema": {
             "@type": "Array",
             "elementSchema": {
-              "@id": "dtmi:example:zeta_beta;1",
+              "@id": "dtmi:example:eta_spazz;1",
               "@type": "Enum",
               "valueSchema": "integer",
               "@context": "dtmi:dtdl:context;3"
@@ -161,16 +161,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_eta;1",
+        "@id": "dtmi:example:eta_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "zeta_zeta",
+          "name": "eta_flunn",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Array",
             "elementSchema": {
-              "@id": "dtmi:example:zeta_epsilon;1",
+              "@id": "dtmi:example:eta_jogg;1",
               "@type": "Enum",
               "valueSchema": "integer",
               "@context": "dtmi:dtdl:context;3"
@@ -188,22 +188,75 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_kappa;1",
+        "@id": "dtmi:example:eta_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "eta_vroo",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": {
+              "@id": "dtmi:example:eta_yekk;1",
+              "@type": "Enum",
+              "valueSchema": "integer",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:theta_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "theta_beta",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Array",
+            "elementSchema": {
+              "@id": "dtmi:example:theta_alpha;1",
+              "@type": "Enum",
+              "valueSchema": "integer",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:theta_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 22,
-              "name": "zeta_iota"
+              "enumValue": 29,
+              "name": "theta_epsilon"
             }
           ],
           "valueSchema": "integer"
         },
         "contents": {
           "@type": "Telemetry",
-          "name": "zeta_lambda",
+          "name": "theta_eta",
           "schema": {
             "@type": "Array",
             "elementSchema": [
@@ -211,8 +264,8 @@
                 "@type": "Enum",
                 "enumValues": [
                   {
-                    "enumValue": 21,
-                    "name": "zeta_theta"
+                    "enumValue": 28,
+                    "name": "theta_delta"
                   }
                 ],
                 "valueSchema": "integer"
@@ -232,22 +285,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_xi;1",
+        "@id": "dtmi:example:theta_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 24,
-              "name": "zeta_nu"
+              "enumValue": 31,
+              "name": "theta_iota"
             }
           ],
           "valueSchema": "integer"
         },
         "contents": {
           "@type": "Telemetry",
-          "name": "zeta_omicron",
+          "name": "theta_lambda",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Array",
@@ -256,8 +309,8 @@
                 "@type": "Enum",
                 "enumValues": [
                   {
-                    "enumValue": 23,
-                    "name": "zeta_mu"
+                    "enumValue": 30,
+                    "name": "theta_theta"
                   }
                 ],
                 "valueSchema": "integer"
@@ -277,10 +330,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_rho;1",
+        "@id": "dtmi:example:theta_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_pi;1",
+          "@id": "dtmi:example:theta_mu;1",
           "@type": "Array",
           "elementSchema": "boolean"
         }
@@ -295,10 +348,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_tau;1",
+        "@id": "dtmi:example:theta_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_sigma;1",
+          "@id": "dtmi:example:theta_xi;1",
           "@type": "Array",
           "elementSchema": [
             "boolean"
@@ -315,10 +368,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_phi;1",
+        "@id": "dtmi:example:theta_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_upsilon;1",
+          "@id": "dtmi:example:theta_pi;1",
           "@type": "Array",
           "elementSchema": "dtmi:dtdl:instance:Schema:boolean;2"
         }
@@ -333,10 +386,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_psi;1",
+        "@id": "dtmi:example:theta_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_chi;1",
+          "@id": "dtmi:example:theta_sigma;1",
           "@type": "Array",
           "elementSchema": [
             "dtmi:dtdl:instance:Schema:boolean;2"
@@ -353,10 +406,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_yuzz;1",
+        "@id": "dtmi:example:theta_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_omega;1",
+          "@id": "dtmi:example:theta_upsilon;1",
           "@type": "Array",
           "elementSchema": "point"
         }
@@ -371,10 +424,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_um;1",
+        "@id": "dtmi:example:theta_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_wum;1",
+          "@id": "dtmi:example:theta_chi;1",
           "@type": "Array",
           "elementSchema": [
             "point"
@@ -391,10 +444,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_fuddle;1",
+        "@id": "dtmi:example:theta_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_humpf;1",
+          "@id": "dtmi:example:theta_omega;1",
           "@type": "Array",
           "elementSchema": "dtmi:standard:schema:geospatial:point;2"
         }
@@ -409,10 +462,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_nuh;1",
+        "@id": "dtmi:example:theta_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_glikk;1",
+          "@id": "dtmi:example:theta_wum;1",
           "@type": "Array",
           "elementSchema": [
             "dtmi:standard:schema:geospatial:point;2"
@@ -429,10 +482,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_quan;1",
+        "@id": "dtmi:example:theta_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_snee;1",
+          "@id": "dtmi:example:theta_humpf;1",
           "@type": "Array",
           "elementSchema": "Foobar"
         }
@@ -447,11 +500,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_spazz;1",
+        "@id": "dtmi:example:theta_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zeta_thnad;1",
+          "@id": "dtmi:example:theta_glikk;1",
           "@type": "Array",
           "elementSchema": "Foobar"
         }
@@ -466,10 +519,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_zatz;1",
+        "@id": "dtmi:example:theta_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_floob;1",
+          "@id": "dtmi:example:theta_snee;1",
           "@type": "Array",
           "elementSchema": null
         }
@@ -484,11 +537,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_flunn;1",
+        "@id": "dtmi:example:theta_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zeta_jogg;1",
+          "@id": "dtmi:example:theta_thnad;1",
           "@type": "Array",
           "elementSchema": null
         }
@@ -503,10 +556,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_yekk;1",
+        "@id": "dtmi:example:theta_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_itch;1",
+          "@id": "dtmi:example:theta_floob;1",
           "@type": "Array",
           "elementSchema": true
         }
@@ -521,11 +574,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_hi;1",
+        "@id": "dtmi:example:theta_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zeta_vroo;1",
+          "@id": "dtmi:example:theta_jogg;1",
           "@type": "Array",
           "elementSchema": true
         }
@@ -540,10 +593,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_beta;1",
+        "@id": "dtmi:example:theta_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_alpha;1",
+          "@id": "dtmi:example:theta_itch;1",
           "@type": "Array",
           "elementSchema": 626
         }
@@ -558,11 +611,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_delta;1",
+        "@id": "dtmi:example:theta_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:eta_gamma;1",
+          "@id": "dtmi:example:theta_vroo;1",
           "@type": "Array",
           "elementSchema": 626
         }
@@ -577,10 +630,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_zeta;1",
+        "@id": "dtmi:example:iota_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_epsilon;1",
+          "@id": "dtmi:example:iota_alpha;1",
           "@type": "Array",
           "elementSchema": [
             null
@@ -597,11 +650,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_theta;1",
+        "@id": "dtmi:example:iota_delta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:eta_eta;1",
+          "@id": "dtmi:example:iota_gamma;1",
           "@type": "Array",
           "elementSchema": [
             null
@@ -618,10 +671,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_kappa;1",
+        "@id": "dtmi:example:iota_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_iota;1",
+          "@id": "dtmi:example:iota_epsilon;1",
           "@type": "Array",
           "elementSchema": [
             true
@@ -638,11 +691,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_mu;1",
+        "@id": "dtmi:example:iota_theta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:eta_lambda;1",
+          "@id": "dtmi:example:iota_eta;1",
           "@type": "Array",
           "elementSchema": [
             true
@@ -659,10 +712,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_xi;1",
+        "@id": "dtmi:example:iota_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_nu;1",
+          "@id": "dtmi:example:iota_iota;1",
           "@type": "Array",
           "elementSchema": [
             626
@@ -679,11 +732,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_pi;1",
+        "@id": "dtmi:example:iota_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:eta_omicron;1",
+          "@id": "dtmi:example:iota_lambda;1",
           "@type": "Array",
           "elementSchema": [
             626
@@ -700,10 +753,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_sigma;1",
+        "@id": "dtmi:example:iota_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_rho;1",
+          "@id": "dtmi:example:iota_nu;1",
           "@type": "Array",
           "elementSchema": {}
         }
@@ -718,11 +771,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_upsilon;1",
+        "@id": "dtmi:example:iota_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:eta_tau;1",
+          "@id": "dtmi:example:iota_omicron;1",
           "@type": "Array",
           "elementSchema": {}
         }
@@ -737,10 +790,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_chi;1",
+        "@id": "dtmi:example:iota_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_phi;1",
+          "@id": "dtmi:example:iota_rho;1",
           "@type": "Array",
           "elementSchema": [
             {}
@@ -757,11 +810,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_omega;1",
+        "@id": "dtmi:example:iota_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:eta_psi;1",
+          "@id": "dtmi:example:iota_tau;1",
           "@type": "Array",
           "elementSchema": [
             {}
@@ -778,10 +831,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_wum;1",
+        "@id": "dtmi:example:iota_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_yuzz;1",
+          "@id": "dtmi:example:iota_phi;1",
           "@type": "Array",
           "elementSchema": []
         }
@@ -796,11 +849,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_humpf;1",
+        "@id": "dtmi:example:iota_omega;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:eta_um;1",
+          "@id": "dtmi:example:iota_psi;1",
           "@type": "Array",
           "elementSchema": []
         }
diff --git a/DTDL/v2/spec/Requirement-ClassArrayPropertyElementSchemaTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassArrayPropertyElementSchemaTermAndDtmiV2.json
index 71034ac5..0f606e37 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayPropertyElementSchemaTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayPropertyElementSchemaTermAndDtmiV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_psi;1",
+        "@id": "dtmi:example:mu_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_chi;1",
+          "@id": "dtmi:example:mu_sigma;1",
           "@type": "Array",
           "elementSchema": "duration",
           "dtmi:dtdl:property:elementSchema;2": "float"
@@ -26,11 +26,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_yuzz;1",
+        "@id": "dtmi:example:mu_phi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:kappa_omega;1",
+          "@id": "dtmi:example:mu_upsilon;1",
           "@type": "Array",
           "elementSchema": "integer",
           "dtmi:dtdl:property:elementSchema;2": "long"
diff --git a/DTDL/v2/spec/Requirement-ClassArrayPropertyElementSchemaTypeConformanceV2.json b/DTDL/v2/spec/Requirement-ClassArrayPropertyElementSchemaTypeConformanceV2.json
index 92187711..ff36bf11 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayPropertyElementSchemaTypeConformanceV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayPropertyElementSchemaTypeConformanceV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_spazz;1",
+        "@id": "dtmi:example:iota_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_thnad;1",
+          "@id": "dtmi:example:iota_glikk;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:eta_quan;1",
+            "@id": "dtmi:example:iota_fuddle;1",
             "elementSchema": "string",
             "@type": "Array"
           }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_flunn;1",
+        "@id": "dtmi:example:iota_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_jogg;1",
+          "@id": "dtmi:example:iota_thnad;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:eta_floob;1",
-            "name": "eta_zatz",
+            "@id": "dtmi:example:iota_snee;1",
+            "name": "iota_quan",
             "@type": "Command"
           }
         }
@@ -51,15 +51,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_hi;1",
+        "@id": "dtmi:example:iota_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:eta_vroo;1",
+          "@id": "dtmi:example:iota_jogg;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:eta_itch;1",
-            "name": "eta_yekk",
+            "@id": "dtmi:example:iota_floob;1",
+            "name": "iota_zatz",
             "@type": "Command"
           }
         }
@@ -74,14 +74,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_delta;1",
+        "@id": "dtmi:example:iota_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_gamma;1",
+          "@id": "dtmi:example:iota_vroo;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:theta_alpha;1",
-            "name": "theta_beta",
+            "@id": "dtmi:example:iota_itch;1",
+            "name": "iota_yekk",
             "schema": "time",
             "@type": "CommandPayload"
           }
@@ -97,15 +97,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_theta;1",
+        "@id": "dtmi:example:kappa_delta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:theta_eta;1",
+          "@id": "dtmi:example:kappa_gamma;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:theta_epsilon;1",
-            "name": "theta_zeta",
+            "@id": "dtmi:example:kappa_alpha;1",
+            "name": "kappa_beta",
             "schema": "boolean",
             "@type": "CommandPayload"
           }
@@ -121,16 +121,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_nu;1",
+        "@id": "dtmi:example:kappa_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_mu;1",
+          "@id": "dtmi:example:kappa_theta;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:theta_iota;1",
-            "name": "theta_kappa",
+            "@id": "dtmi:example:kappa_epsilon;1",
+            "name": "kappa_zeta",
             "schema": {
-              "@id": "dtmi:example:theta_lambda;1",
+              "@id": "dtmi:example:kappa_eta;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -147,17 +147,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_sigma;1",
+        "@id": "dtmi:example:kappa_xi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:theta_rho;1",
+          "@id": "dtmi:example:kappa_nu;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:theta_xi;1",
-            "name": "theta_omicron",
+            "@id": "dtmi:example:kappa_kappa;1",
+            "name": "kappa_lambda",
             "schema": {
-              "@id": "dtmi:example:theta_pi;1",
+              "@id": "dtmi:example:kappa_mu;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -174,17 +174,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_chi;1",
+        "@id": "dtmi:example:kappa_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_phi;1",
+          "@id": "dtmi:example:kappa_rho;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:theta_tau;1",
+            "@id": "dtmi:example:kappa_omicron;1",
             "enumValues": [
               {
-                "enumValue": 25,
-                "name": "theta_upsilon"
+                "enumValue": 32,
+                "name": "kappa_pi"
               }
             ],
             "valueSchema": "integer",
@@ -202,15 +202,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_wum;1",
+        "@id": "dtmi:example:kappa_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_yuzz;1",
+          "@id": "dtmi:example:kappa_phi;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:theta_psi;1",
-            "enumValue": 26,
-            "name": "theta_omega",
+            "@id": "dtmi:example:kappa_tau;1",
+            "enumValue": 33,
+            "name": "kappa_upsilon",
             "@type": "EnumValue"
           }
         }
@@ -225,16 +225,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_glikk;1",
+        "@id": "dtmi:example:kappa_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:theta_fuddle;1",
+          "@id": "dtmi:example:kappa_yuzz;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:theta_um;1",
-            "enumValue": 27,
-            "name": "theta_humpf",
+            "@id": "dtmi:example:kappa_psi;1",
+            "enumValue": 34,
+            "name": "kappa_omega",
             "@type": "EnumValue"
           }
         }
@@ -249,14 +249,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_thnad;1",
+        "@id": "dtmi:example:kappa_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_quan;1",
+          "@id": "dtmi:example:kappa_fuddle;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:theta_nuh;1",
-            "name": "theta_snee",
+            "@id": "dtmi:example:kappa_um;1",
+            "name": "kappa_humpf",
             "schema": "date",
             "@type": "Field"
           }
@@ -272,15 +272,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_jogg;1",
+        "@id": "dtmi:example:kappa_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:theta_zatz;1",
+          "@id": "dtmi:example:kappa_quan;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:theta_spazz;1",
-            "name": "theta_floob",
+            "@id": "dtmi:example:kappa_nuh;1",
+            "name": "kappa_snee",
             "schema": "dateTime",
             "@type": "Field"
           }
@@ -296,13 +296,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_yekk;1",
+        "@id": "dtmi:example:kappa_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_itch;1",
+          "@id": "dtmi:example:kappa_floob;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:theta_flunn;1",
+            "@id": "dtmi:example:kappa_spazz;1",
             "@type": "Interface"
           }
         }
@@ -317,14 +317,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_alpha;1",
+        "@id": "dtmi:example:kappa_itch;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:theta_hi;1",
+          "@id": "dtmi:example:kappa_flunn;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:theta_vroo;1",
+            "@id": "dtmi:example:kappa_jogg;1",
             "@type": "Interface"
           }
         }
@@ -339,19 +339,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_zeta;1",
+        "@id": "dtmi:example:lambda_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_epsilon;1",
+          "@id": "dtmi:example:lambda_alpha;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:iota_beta;1",
+            "@id": "dtmi:example:kappa_yekk;1",
             "mapKey": {
-              "name": "iota_gamma",
+              "name": "kappa_vroo",
               "schema": "string"
             },
             "mapValue": {
-              "name": "iota_delta",
+              "name": "kappa_hi",
               "schema": "double"
             },
             "@type": "Map"
@@ -368,14 +368,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_kappa;1",
+        "@id": "dtmi:example:lambda_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_iota;1",
+          "@id": "dtmi:example:lambda_epsilon;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:iota_eta;1",
-            "name": "iota_theta",
+            "@id": "dtmi:example:lambda_gamma;1",
+            "name": "lambda_delta",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -391,15 +391,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_xi;1",
+        "@id": "dtmi:example:lambda_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:iota_nu;1",
+          "@id": "dtmi:example:lambda_iota;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:iota_lambda;1",
-            "name": "iota_mu",
+            "@id": "dtmi:example:lambda_eta;1",
+            "name": "lambda_theta",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -415,14 +415,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_sigma;1",
+        "@id": "dtmi:example:lambda_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_rho;1",
+          "@id": "dtmi:example:lambda_nu;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:iota_omicron;1",
-            "name": "iota_pi",
+            "@id": "dtmi:example:lambda_lambda;1",
+            "name": "lambda_mu",
             "schema": "duration",
             "@type": "MapValue"
           }
@@ -438,15 +438,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_chi;1",
+        "@id": "dtmi:example:lambda_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:iota_phi;1",
+          "@id": "dtmi:example:lambda_rho;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:iota_tau;1",
-            "name": "iota_upsilon",
+            "@id": "dtmi:example:lambda_omicron;1",
+            "name": "lambda_pi",
             "schema": "float",
             "@type": "MapValue"
           }
@@ -462,16 +462,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_wum;1",
+        "@id": "dtmi:example:lambda_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_yuzz;1",
+          "@id": "dtmi:example:lambda_phi;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:iota_psi;1",
+            "@id": "dtmi:example:lambda_tau;1",
             "fields": [
               {
-                "name": "iota_omega",
+                "name": "lambda_upsilon",
                 "schema": "integer"
               }
             ],
@@ -489,14 +489,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_glikk;1",
+        "@id": "dtmi:example:lambda_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_fuddle;1",
+          "@id": "dtmi:example:lambda_yuzz;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:iota_um;1",
-            "name": "iota_humpf",
+            "@id": "dtmi:example:lambda_psi;1",
+            "name": "lambda_omega",
             "schema": "long",
             "@type": "Property"
           }
@@ -512,15 +512,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_thnad;1",
+        "@id": "dtmi:example:lambda_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:iota_quan;1",
+          "@id": "dtmi:example:lambda_fuddle;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:iota_nuh;1",
-            "name": "iota_snee",
+            "@id": "dtmi:example:lambda_um;1",
+            "name": "lambda_humpf",
             "schema": "string",
             "@type": "Property"
           }
@@ -536,14 +536,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_jogg;1",
+        "@id": "dtmi:example:lambda_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_zatz;1",
+          "@id": "dtmi:example:lambda_quan;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:iota_spazz;1",
-            "name": "iota_floob",
+            "@id": "dtmi:example:lambda_nuh;1",
+            "name": "lambda_snee",
             "@type": "Relationship"
           }
         }
@@ -558,15 +558,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_vroo;1",
+        "@id": "dtmi:example:lambda_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:iota_yekk;1",
+          "@id": "dtmi:example:lambda_zatz;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:iota_flunn;1",
-            "name": "iota_itch",
+            "@id": "dtmi:example:lambda_spazz;1",
+            "name": "lambda_floob",
             "@type": "Relationship"
           }
         }
@@ -581,14 +581,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_gamma;1",
+        "@id": "dtmi:example:lambda_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_beta;1",
+          "@id": "dtmi:example:lambda_yekk;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:iota_hi;1",
-            "name": "kappa_alpha",
+            "@id": "dtmi:example:lambda_flunn;1",
+            "name": "lambda_itch",
             "schema": "time",
             "@type": "Telemetry"
           }
@@ -604,15 +604,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_eta;1",
+        "@id": "dtmi:example:mu_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:kappa_zeta;1",
+          "@id": "dtmi:example:mu_beta;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:kappa_delta;1",
-            "name": "kappa_epsilon",
+            "@id": "dtmi:example:lambda_hi;1",
+            "name": "mu_alpha",
             "schema": "boolean",
             "@type": "Telemetry"
           }
diff --git a/DTDL/v2/spec/Requirement-ClassArrayPropertyFormallyInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassArrayPropertyFormallyInvalidDtmiV2.json
index 784c4041..af9e9dac 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayPropertyFormallyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayPropertyFormallyInvalidDtmiV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_humpf;1",
+        "@id": "dtmi:example:upsilon_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_um;1",
+          "@id": "dtmi:example:upsilon_um;1",
           "@type": "Array",
-          "elementSchema": "duration",
+          "elementSchema": "integer",
           "dtmi:foo//bar": 626
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_glikk;1",
+        "@id": "dtmi:example:upsilon_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:sigma_fuddle;1",
+          "@id": "dtmi:example:upsilon_fuddle;1",
           "@type": "Array",
-          "elementSchema": "float",
+          "elementSchema": "long",
           "dtmi:foo//bar": 626
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassArrayPropertyFormallyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Requirement-ClassArrayPropertyFormallyIrrelevantDtmiOrTermV2.json
index e2dc822c..3616fe9c 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayPropertyFormallyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayPropertyFormallyIrrelevantDtmiOrTermV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_sigma;1",
+        "@id": "dtmi:example:upsilon_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_rho;1",
+          "@id": "dtmi:example:upsilon_rho;1",
           "@type": "Array",
-          "elementSchema": "time",
+          "elementSchema": "date",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_upsilon;1",
+        "@id": "dtmi:example:upsilon_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:sigma_tau;1",
+          "@id": "dtmi:example:upsilon_tau;1",
           "@type": "Array",
-          "elementSchema": "boolean",
+          "elementSchema": "dateTime",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -46,12 +46,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_chi;1",
+        "@id": "dtmi:example:upsilon_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_phi;1",
+          "@id": "dtmi:example:upsilon_phi;1",
           "@type": "Array",
-          "elementSchema": "date",
+          "elementSchema": "double",
           "boolean": null
         }
       }
@@ -65,13 +65,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_omega;1",
+        "@id": "dtmi:example:upsilon_omega;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:sigma_psi;1",
+          "@id": "dtmi:example:upsilon_psi;1",
           "@type": "Array",
-          "elementSchema": "dateTime",
+          "elementSchema": "duration",
           "boolean": null
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassArrayPropertyFormallyNotDtmiNorTermV2.json b/DTDL/v2/spec/Requirement-ClassArrayPropertyFormallyNotDtmiNorTermV2.json
index 37e0af0d..991c9451 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayPropertyFormallyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayPropertyFormallyNotDtmiNorTermV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_thnad;1",
+        "@id": "dtmi:example:upsilon_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_quan;1",
+          "@id": "dtmi:example:upsilon_quan;1",
           "@type": "Array",
-          "elementSchema": "long",
+          "elementSchema": "time",
           "http://foo.com/bar": true
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_floob;1",
+        "@id": "dtmi:example:upsilon_floob;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:sigma_spazz;1",
+          "@id": "dtmi:example:upsilon_spazz;1",
           "@type": "Array",
-          "elementSchema": "string",
+          "elementSchema": "boolean",
           "http://foo.com/bar": true
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassArrayPropertyFormallyUndefinedTermV2.json b/DTDL/v2/spec/Requirement-ClassArrayPropertyFormallyUndefinedTermV2.json
index 5922c135..71b341ca 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayPropertyFormallyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayPropertyFormallyUndefinedTermV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_itch;1",
+        "@id": "dtmi:example:upsilon_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_flunn;1",
+          "@id": "dtmi:example:upsilon_flunn;1",
           "@type": "Array",
-          "elementSchema": "boolean",
+          "elementSchema": "dateTime",
           "foobar": {}
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_vroo;1",
+        "@id": "dtmi:example:upsilon_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:sigma_yekk;1",
+          "@id": "dtmi:example:upsilon_yekk;1",
           "@type": "Array",
-          "elementSchema": "date",
+          "elementSchema": "double",
           "foobar": {}
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassArrayRequiredPropertiesV2.json b/DTDL/v2/spec/Requirement-ClassArrayRequiredPropertiesV2.json
index a6c5d696..f2f1ee37 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayRequiredPropertiesV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayRequiredPropertiesV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_jogg;1",
+        "@id": "dtmi:example:epsilon_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_zatz;1",
+          "@id": "dtmi:example:epsilon_um;1",
           "elementSchema": "time"
         }
       }
@@ -24,11 +24,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_itch;1",
+        "@id": "dtmi:example:epsilon_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:gamma_flunn;1",
+          "@id": "dtmi:example:epsilon_fuddle;1",
           "elementSchema": "boolean"
         }
       }
@@ -42,10 +42,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_vroo;1",
+        "@id": "dtmi:example:epsilon_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_yekk;1",
+          "@id": "dtmi:example:epsilon_nuh;1",
           "@type": "Array"
         }
       }
@@ -59,11 +59,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_alpha;1",
+        "@id": "dtmi:example:epsilon_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:gamma_hi;1",
+          "@id": "dtmi:example:epsilon_quan;1",
           "@type": "Array"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassArrayTypeIncludesInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassArrayTypeIncludesInvalidDtmiV2.json
index aae3315e..45cb834b 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayTypeIncludesInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayTypeIncludesInvalidDtmiV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_wum;1",
+        "@id": "dtmi:example:eta_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_yuzz;1",
+          "@id": "dtmi:example:eta_omicron;1",
           "@type": [
             "Array",
             "dtmi:foo//bar"
@@ -28,11 +28,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_humpf;1",
+        "@id": "dtmi:example:eta_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:epsilon_um;1",
+          "@id": "dtmi:example:eta_rho;1",
           "@type": [
             "Array",
             "dtmi:foo//bar"
diff --git a/DTDL/v2/spec/Requirement-ClassArrayTypeIncludesMaterialV2.json b/DTDL/v2/spec/Requirement-ClassArrayTypeIncludesMaterialV2.json
index 26e07803..5999c10c 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayTypeIncludesMaterialV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayTypeIncludesMaterialV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_spazz;1",
+        "@id": "dtmi:example:zeta_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_thnad;1",
+          "@id": "dtmi:example:zeta_omega;1",
           "elementSchema": "long",
           "@type": "Array"
         }
@@ -25,10 +25,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_zatz;1",
+        "@id": "dtmi:example:zeta_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_floob;1",
+          "@id": "dtmi:example:zeta_wum;1",
           "elementSchema": "string",
           "@type": [
             "Array"
@@ -45,10 +45,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_flunn;1",
+        "@id": "dtmi:example:zeta_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_jogg;1",
+          "@id": "dtmi:example:zeta_humpf;1",
           "elementSchema": "time",
           "@type": "dtmi:dtdl:class:Array;2"
         }
@@ -63,10 +63,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_yekk;1",
+        "@id": "dtmi:example:zeta_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_itch;1",
+          "@id": "dtmi:example:zeta_glikk;1",
           "elementSchema": "boolean",
           "@type": [
             "dtmi:dtdl:class:Array;2"
@@ -83,10 +83,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_hi;1",
+        "@id": "dtmi:example:zeta_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_vroo;1",
+          "@id": "dtmi:example:zeta_snee;1",
           "elementSchema": "date",
           "@type": "Something"
         }
@@ -101,11 +101,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_beta;1",
+        "@id": "dtmi:example:zeta_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:epsilon_alpha;1",
+          "@id": "dtmi:example:zeta_thnad;1",
           "elementSchema": "dateTime",
           "@type": "Something"
         }
@@ -120,10 +120,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_delta;1",
+        "@id": "dtmi:example:zeta_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_gamma;1",
+          "@id": "dtmi:example:zeta_floob;1",
           "elementSchema": "double",
           "@type": [
             "Something"
@@ -140,11 +140,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_zeta;1",
+        "@id": "dtmi:example:zeta_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:epsilon_epsilon;1",
+          "@id": "dtmi:example:zeta_jogg;1",
           "elementSchema": "duration",
           "@type": [
             "Something"
diff --git a/DTDL/v2/spec/Requirement-ClassArrayTypeStringOrArrayV2.json b/DTDL/v2/spec/Requirement-ClassArrayTypeStringOrArrayV2.json
index 2408984a..aad6fd0b 100644
--- a/DTDL/v2/spec/Requirement-ClassArrayTypeStringOrArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassArrayTypeStringOrArrayV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_gamma;1",
+        "@id": "dtmi:example:epsilon_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_beta;1",
+          "@id": "dtmi:example:epsilon_spazz;1",
           "elementSchema": "date",
           "@type": 626
         }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_epsilon;1",
+        "@id": "dtmi:example:epsilon_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_delta;1",
+          "@id": "dtmi:example:epsilon_zatz;1",
           "elementSchema": "dateTime",
           "@type": 626
         }
@@ -44,10 +44,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_eta;1",
+        "@id": "dtmi:example:epsilon_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_zeta;1",
+          "@id": "dtmi:example:epsilon_flunn;1",
           "elementSchema": "double",
           "@type": null
         }
@@ -62,11 +62,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_iota;1",
+        "@id": "dtmi:example:epsilon_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_theta;1",
+          "@id": "dtmi:example:epsilon_yekk;1",
           "elementSchema": "duration",
           "@type": null
         }
@@ -81,10 +81,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_lambda;1",
+        "@id": "dtmi:example:zeta_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_kappa;1",
+          "@id": "dtmi:example:epsilon_hi;1",
           "elementSchema": "float",
           "@type": true
         }
@@ -99,11 +99,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_nu;1",
+        "@id": "dtmi:example:zeta_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_mu;1",
+          "@id": "dtmi:example:zeta_beta;1",
           "elementSchema": "integer",
           "@type": true
         }
@@ -118,10 +118,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_omicron;1",
+        "@id": "dtmi:example:zeta_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_xi;1",
+          "@id": "dtmi:example:zeta_delta;1",
           "elementSchema": "long",
           "@type": {}
         }
@@ -136,11 +136,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_rho;1",
+        "@id": "dtmi:example:zeta_eta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_pi;1",
+          "@id": "dtmi:example:zeta_zeta;1",
           "elementSchema": "string",
           "@type": {}
         }
@@ -155,10 +155,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_tau;1",
+        "@id": "dtmi:example:zeta_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_sigma;1",
+          "@id": "dtmi:example:zeta_theta;1",
           "elementSchema": "time",
           "@type": [
             626
@@ -175,11 +175,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_phi;1",
+        "@id": "dtmi:example:zeta_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_upsilon;1",
+          "@id": "dtmi:example:zeta_kappa;1",
           "elementSchema": "boolean",
           "@type": [
             626
@@ -196,10 +196,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_psi;1",
+        "@id": "dtmi:example:zeta_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_chi;1",
+          "@id": "dtmi:example:zeta_mu;1",
           "elementSchema": "date",
           "@type": [
             null
@@ -216,11 +216,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_yuzz;1",
+        "@id": "dtmi:example:zeta_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_omega;1",
+          "@id": "dtmi:example:zeta_xi;1",
           "elementSchema": "dateTime",
           "@type": [
             null
@@ -237,10 +237,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_um;1",
+        "@id": "dtmi:example:zeta_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_wum;1",
+          "@id": "dtmi:example:zeta_pi;1",
           "elementSchema": "double",
           "@type": [
             true
@@ -257,11 +257,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_fuddle;1",
+        "@id": "dtmi:example:zeta_tau;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_humpf;1",
+          "@id": "dtmi:example:zeta_sigma;1",
           "elementSchema": "duration",
           "@type": [
             true
@@ -278,10 +278,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_nuh;1",
+        "@id": "dtmi:example:zeta_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_glikk;1",
+          "@id": "dtmi:example:zeta_upsilon;1",
           "elementSchema": "float",
           "@type": [
             {}
@@ -298,11 +298,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_quan;1",
+        "@id": "dtmi:example:zeta_psi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_snee;1",
+          "@id": "dtmi:example:zeta_chi;1",
           "elementSchema": "integer",
           "@type": [
             {}
diff --git a/DTDL/v2/spec/Requirement-ClassCommandContextConformsV2.json b/DTDL/v2/spec/Requirement-ClassCommandContextConformsV2.json
index 27cc4929..ccc40b89 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandContextConformsV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandContextConformsV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_floob;1",
+        "@id": "dtmi:example:omega_floob;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:chi_spazz;1",
+          "@id": "dtmi:example:omega_spazz;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "chi_thnad",
+            "name": "omega_thnad",
             "@context": "dtmi:iotcentral:context;2"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_flunn;1",
+        "@id": "dtmi:example:omega_flunn;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:chi_jogg;1",
+          "@id": "dtmi:example:omega_jogg;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "chi_zatz",
+            "name": "omega_zatz",
             "@context": []
           }
         }
@@ -51,14 +51,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_vroo;1",
+        "@id": "dtmi:example:omega_vroo;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:chi_yekk;1",
+          "@id": "dtmi:example:omega_yekk;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "chi_itch",
+            "name": "omega_itch",
             "@context": [
               "dtmi:iotcentral:context;2"
             ]
@@ -75,14 +75,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_beta;1",
+        "@id": "dtmi:example:yuzz_beta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:psi_alpha;1",
+          "@id": "dtmi:example:yuzz_alpha;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "chi_hi",
+            "name": "omega_hi",
             "@context": null
           }
         }
@@ -97,14 +97,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_epsilon;1",
+        "@id": "dtmi:example:yuzz_epsilon;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:psi_delta;1",
+          "@id": "dtmi:example:yuzz_delta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "psi_gamma",
+            "name": "yuzz_gamma",
             "@context": 626
           }
         }
@@ -119,14 +119,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_theta;1",
+        "@id": "dtmi:example:yuzz_theta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:psi_eta;1",
+          "@id": "dtmi:example:yuzz_eta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "psi_zeta",
+            "name": "yuzz_zeta",
             "@context": true
           }
         }
@@ -141,14 +141,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_lambda;1",
+        "@id": "dtmi:example:yuzz_lambda;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:psi_kappa;1",
+          "@id": "dtmi:example:yuzz_kappa;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "psi_iota",
+            "name": "yuzz_iota",
             "@context": [
               null
             ]
@@ -165,14 +165,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_xi;1",
+        "@id": "dtmi:example:yuzz_xi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:psi_nu;1",
+          "@id": "dtmi:example:yuzz_nu;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "psi_mu",
+            "name": "yuzz_mu",
             "@context": [
               626
             ]
@@ -189,14 +189,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_rho;1",
+        "@id": "dtmi:example:yuzz_rho;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:psi_pi;1",
+          "@id": "dtmi:example:yuzz_pi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "psi_omicron",
+            "name": "yuzz_omicron",
             "@context": [
               true
             ]
@@ -213,15 +213,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_upsilon;1",
+        "@id": "dtmi:example:yuzz_upsilon;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:psi_tau;1",
+          "@id": "dtmi:example:yuzz_tau;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "psi_sigma",
-            "@context": {}
+            "name": "yuzz_sigma",
+            "@context": "dtmi:iotcentral:context"
           }
         }
       }
@@ -235,17 +235,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_psi;1",
+        "@id": "dtmi:example:yuzz_psi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:psi_chi;1",
+          "@id": "dtmi:example:yuzz_chi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "psi_phi",
-            "@context": [
-              {}
-            ]
+            "name": "yuzz_phi",
+            "@context": "http://iotcentral/context/2"
           }
         }
       }
@@ -259,15 +257,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_wum;1",
+        "@id": "dtmi:example:yuzz_wum;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:psi_yuzz;1",
+          "@id": "dtmi:example:yuzz_yuzz;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "psi_omega",
-            "@context": "dtmi:iotcentral:context"
+            "name": "yuzz_omega",
+            "@context": "iotcentral;2"
           }
         }
       }
@@ -281,15 +279,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_fuddle;1",
+        "@id": "dtmi:example:yuzz_fuddle;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:psi_humpf;1",
+          "@id": "dtmi:example:yuzz_humpf;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "psi_um",
-            "@context": "http://iotcentral/context/2"
+            "name": "yuzz_um",
+            "@context": {}
           }
         }
       }
@@ -303,15 +301,67 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_snee;1",
+        "@id": "dtmi:example:yuzz_snee;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:psi_nuh;1",
+          "@id": "dtmi:example:yuzz_nuh;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "psi_glikk",
-            "@context": "iotcentral;2"
+            "name": "yuzz_glikk",
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:yuzz_spazz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:yuzz_thnad;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "yuzz_quan",
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:yuzz_jogg;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:yuzz_zatz;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "yuzz_floob",
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandGraphKeywordV2.json b/DTDL/v2/spec/Requirement-ClassCommandGraphKeywordV2.json
index 8188608d..f79c3ae5 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandGraphKeywordV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandGraphKeywordV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_nu;1",
+        "@id": "dtmi:example:delta_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "beta_mu",
+          "name": "delta_jogg",
           "@graph": {}
         }
       }
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_omicron;1",
+        "@id": "dtmi:example:delta_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "beta_xi",
+          "name": "delta_itch",
           "@graph": {}
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandIdDuplicateV2.json b/DTDL/v2/spec/Requirement-ClassCommandIdDuplicateV2.json
index 1fc52e1e..5f3f2c41 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandIdDuplicateV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandIdDuplicateV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_floob;1",
+        "@id": "dtmi:example:humpf_vroo;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:wum_floob;1",
+          "@id": "dtmi:example:humpf_vroo;1",
           "@type": "Interface",
           "contents": {
-            "@id": "dtmi:example:wum_floob;1",
+            "@id": "dtmi:example:humpf_vroo;1",
             "@type": "Command",
-            "name": "wum_zatz"
+            "name": "humpf_hi"
           }
         }
       }
@@ -29,16 +29,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_jogg;1",
+        "@id": "dtmi:example:fuddle_alpha;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:wum_jogg;1",
+          "@id": "dtmi:example:fuddle_alpha;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "@id": "dtmi:example:wum_jogg;1",
+            "@id": "dtmi:example:fuddle_alpha;1",
             "@type": "Command",
-            "name": "wum_flunn"
+            "name": "fuddle_beta"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandIdIsDtmiV2.json b/DTDL/v2/spec/Requirement-ClassCommandIdIsDtmiV2.json
index 04e791be..f6d860d9 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandIdIsDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandIdIsDtmiV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_thnad;1",
+        "@id": "dtmi:example:yuzz_itch;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;7",
           "@type": "Command",
-          "name": "psi_quan"
+          "name": "yuzz_flunn"
         }
       }
     ]
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_floob;1",
+        "@id": "dtmi:example:yuzz_vroo;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;108675309",
           "@type": "Command",
-          "name": "psi_spazz"
+          "name": "yuzz_yekk"
         }
       }
     ]
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_jogg;1",
+        "@id": "dtmi:example:wum_alpha;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;999999999",
           "@type": "Command",
-          "name": "psi_zatz"
+          "name": "yuzz_hi"
         }
       }
     ]
@@ -61,12 +61,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_itch;1",
+        "@id": "dtmi:example:wum_gamma;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo;1",
           "@type": "Command",
-          "name": "psi_flunn"
+          "name": "wum_beta"
         }
       }
     ]
@@ -79,12 +79,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_vroo;1",
+        "@id": "dtmi:example:wum_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@id": null,
           "@type": "Command",
-          "name": "psi_yekk"
+          "name": "wum_delta"
         }
       }
     ]
@@ -97,13 +97,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_alpha;1",
+        "@id": "dtmi:example:wum_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": null,
           "@type": "Command",
-          "name": "psi_hi"
+          "name": "wum_zeta"
         }
       }
     ]
@@ -116,12 +116,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_gamma;1",
+        "@id": "dtmi:example:wum_iota;1",
         "@type": "Interface",
         "contents": {
           "@id": 626,
           "@type": "Command",
-          "name": "omega_beta"
+          "name": "wum_theta"
         }
       }
     ]
@@ -134,13 +134,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_epsilon;1",
+        "@id": "dtmi:example:wum_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": 626,
           "@type": "Command",
-          "name": "omega_delta"
+          "name": "wum_kappa"
         }
       }
     ]
@@ -153,12 +153,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_eta;1",
+        "@id": "dtmi:example:wum_nu;1",
         "@type": "Interface",
         "contents": {
           "@id": true,
           "@type": "Command",
-          "name": "omega_zeta"
+          "name": "wum_mu"
         }
       }
     ]
@@ -171,13 +171,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_iota;1",
+        "@id": "dtmi:example:wum_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": true,
           "@type": "Command",
-          "name": "omega_theta"
+          "name": "wum_xi"
         }
       }
     ]
@@ -190,14 +190,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_lambda;1",
+        "@id": "dtmi:example:wum_rho;1",
         "@type": "Interface",
         "contents": {
           "@id": {
             "@value": "dtmi:apparently:valid:identifier;3"
           },
           "@type": "Command",
-          "name": "omega_kappa"
+          "name": "wum_pi"
         }
       }
     ]
@@ -210,7 +210,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_nu;1",
+        "@id": "dtmi:example:wum_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -218,7 +218,7 @@
             "@value": "dtmi:apparently:valid:identifier;3"
           },
           "@type": "Command",
-          "name": "omega_mu"
+          "name": "wum_sigma"
         }
       }
     ]
@@ -231,12 +231,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_omicron;1",
+        "@id": "dtmi:example:wum_phi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0",
           "@type": "Command",
-          "name": "omega_xi"
+          "name": "wum_upsilon"
         }
       }
     ]
@@ -249,13 +249,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_rho;1",
+        "@id": "dtmi:example:wum_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0",
           "@type": "Command",
-          "name": "omega_pi"
+          "name": "wum_chi"
         }
       }
     ]
@@ -268,12 +268,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_tau;1",
+        "@id": "dtmi:example:wum_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Command",
-          "name": "omega_sigma"
+          "name": "wum_omega"
         }
       }
     ]
@@ -286,13 +286,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_phi;1",
+        "@id": "dtmi:example:wum_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Command",
-          "name": "omega_upsilon"
+          "name": "wum_wum"
         }
       }
     ]
@@ -305,12 +305,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_psi;1",
+        "@id": "dtmi:example:wum_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Command",
-          "name": "omega_chi"
+          "name": "wum_humpf"
         }
       }
     ]
@@ -323,13 +323,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_yuzz;1",
+        "@id": "dtmi:example:wum_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Command",
-          "name": "omega_omega"
+          "name": "wum_glikk"
         }
       }
     ]
@@ -342,12 +342,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_um;1",
+        "@id": "dtmi:example:wum_quan;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;1a",
           "@type": "Command",
-          "name": "omega_wum"
+          "name": "wum_snee"
         }
       }
     ]
@@ -360,13 +360,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_fuddle;1",
+        "@id": "dtmi:example:wum_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1a",
           "@type": "Command",
-          "name": "omega_humpf"
+          "name": "wum_thnad"
         }
       }
     ]
@@ -379,12 +379,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_nuh;1",
+        "@id": "dtmi:example:wum_zatz;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Command",
-          "name": "omega_glikk"
+          "name": "wum_floob"
         }
       }
     ]
@@ -397,13 +397,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_quan;1",
+        "@id": "dtmi:example:wum_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Command",
-          "name": "omega_snee"
+          "name": "wum_jogg"
         }
       }
     ]
@@ -416,12 +416,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_spazz;1",
+        "@id": "dtmi:example:wum_yekk;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Command",
-          "name": "omega_thnad"
+          "name": "wum_itch"
         }
       }
     ]
@@ -434,13 +434,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_zatz;1",
+        "@id": "dtmi:example:wum_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Command",
-          "name": "omega_floob"
+          "name": "wum_vroo"
         }
       }
     ]
@@ -453,12 +453,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_flunn;1",
+        "@id": "dtmi:example:um_beta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Command",
-          "name": "omega_jogg"
+          "name": "um_alpha"
         }
       }
     ]
@@ -471,13 +471,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_yekk;1",
+        "@id": "dtmi:example:um_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Command",
-          "name": "omega_itch"
+          "name": "um_gamma"
         }
       }
     ]
@@ -490,12 +490,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_hi;1",
+        "@id": "dtmi:example:um_zeta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Command",
-          "name": "omega_vroo"
+          "name": "um_epsilon"
         }
       }
     ]
@@ -508,13 +508,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_beta;1",
+        "@id": "dtmi:example:um_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Command",
-          "name": "yuzz_alpha"
+          "name": "um_eta"
         }
       }
     ]
@@ -527,12 +527,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_delta;1",
+        "@id": "dtmi:example:um_kappa;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;01",
           "@type": "Command",
-          "name": "yuzz_gamma"
+          "name": "um_iota"
         }
       }
     ]
@@ -545,13 +545,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_zeta;1",
+        "@id": "dtmi:example:um_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;01",
           "@type": "Command",
-          "name": "yuzz_epsilon"
+          "name": "um_lambda"
         }
       }
     ]
@@ -564,12 +564,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_theta;1",
+        "@id": "dtmi:example:um_xi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;",
           "@type": "Command",
-          "name": "yuzz_eta"
+          "name": "um_nu"
         }
       }
     ]
@@ -582,13 +582,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_kappa;1",
+        "@id": "dtmi:example:um_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;",
           "@type": "Command",
-          "name": "yuzz_iota"
+          "name": "um_omicron"
         }
       }
     ]
@@ -601,12 +601,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_mu;1",
+        "@id": "dtmi:example:um_sigma;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Command",
-          "name": "yuzz_lambda"
+          "name": "um_rho"
         }
       }
     ]
@@ -619,13 +619,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_xi;1",
+        "@id": "dtmi:example:um_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Command",
-          "name": "yuzz_nu"
+          "name": "um_tau"
         }
       }
     ]
@@ -638,12 +638,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_pi;1",
+        "@id": "dtmi:example:um_chi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Command",
-          "name": "yuzz_omicron"
+          "name": "um_phi"
         }
       }
     ]
@@ -656,13 +656,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_sigma;1",
+        "@id": "dtmi:example:um_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Command",
-          "name": "yuzz_rho"
+          "name": "um_psi"
         }
       }
     ]
@@ -675,12 +675,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_upsilon;1",
+        "@id": "dtmi:example:um_wum;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:1seg;1",
           "@type": "Command",
-          "name": "yuzz_tau"
+          "name": "um_yuzz"
         }
       }
     ]
@@ -693,13 +693,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_chi;1",
+        "@id": "dtmi:example:um_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:1seg;1",
           "@type": "Command",
-          "name": "yuzz_phi"
+          "name": "um_um"
         }
       }
     ]
@@ -712,12 +712,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_omega;1",
+        "@id": "dtmi:example:um_glikk;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Command",
-          "name": "yuzz_psi"
+          "name": "um_fuddle"
         }
       }
     ]
@@ -730,13 +730,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_wum;1",
+        "@id": "dtmi:example:um_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Command",
-          "name": "yuzz_yuzz"
+          "name": "um_nuh"
         }
       }
     ]
@@ -749,12 +749,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_humpf;1",
+        "@id": "dtmi:example:um_thnad;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo::bar;1",
           "@type": "Command",
-          "name": "yuzz_um"
+          "name": "um_quan"
         }
       }
     ]
@@ -767,13 +767,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_glikk;1",
+        "@id": "dtmi:example:um_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo::bar;1",
           "@type": "Command",
-          "name": "yuzz_fuddle"
+          "name": "um_spazz"
         }
       }
     ]
@@ -786,12 +786,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_snee;1",
+        "@id": "dtmi:example:um_jogg;1",
         "@type": "Interface",
         "contents": {
           "@id": "urn:foo:bar:1",
           "@type": "Command",
-          "name": "yuzz_nuh"
+          "name": "um_zatz"
         }
       }
     ]
@@ -804,13 +804,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_thnad;1",
+        "@id": "dtmi:example:um_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "urn:foo:bar:1",
           "@type": "Command",
-          "name": "yuzz_quan"
+          "name": "um_flunn"
         }
       }
     ]
@@ -823,12 +823,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_floob;1",
+        "@id": "dtmi:example:um_vroo;1",
         "@type": "Interface",
         "contents": {
           "@id": "http://foo/bar/baz",
           "@type": "Command",
-          "name": "yuzz_spazz"
+          "name": "um_yekk"
         }
       }
     ]
@@ -841,13 +841,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_jogg;1",
+        "@id": "dtmi:example:humpf_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "http://foo/bar/baz",
           "@type": "Command",
-          "name": "yuzz_zatz"
+          "name": "um_hi"
         }
       }
     ]
@@ -860,12 +860,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_itch;1",
+        "@id": "dtmi:example:humpf_gamma;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:;1",
           "@type": "Command",
-          "name": "yuzz_flunn"
+          "name": "humpf_beta"
         }
       }
     ]
@@ -878,13 +878,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_vroo;1",
+        "@id": "dtmi:example:humpf_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:;1",
           "@type": "Command",
-          "name": "yuzz_yekk"
+          "name": "humpf_delta"
         }
       }
     ]
@@ -897,12 +897,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_alpha;1",
+        "@id": "dtmi:example:humpf_eta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar",
           "@type": "Command",
-          "name": "yuzz_hi"
+          "name": "humpf_zeta"
         }
       }
     ]
@@ -915,13 +915,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_gamma;1",
+        "@id": "dtmi:example:humpf_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar",
           "@type": "Command",
-          "name": "wum_beta"
+          "name": "humpf_theta"
         }
       }
     ]
@@ -934,12 +934,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_epsilon;1",
+        "@id": "dtmi:example:humpf_lambda;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.14",
           "@type": "Command",
-          "name": "wum_delta"
+          "name": "humpf_kappa"
         }
       }
     ]
@@ -952,13 +952,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_eta;1",
+        "@id": "dtmi:example:humpf_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.14",
           "@type": "Command",
-          "name": "wum_zeta"
+          "name": "humpf_mu"
         }
       }
     ]
@@ -971,12 +971,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_iota;1",
+        "@id": "dtmi:example:humpf_omicron;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.141592",
           "@type": "Command",
-          "name": "wum_theta"
+          "name": "humpf_xi"
         }
       }
     ]
@@ -989,13 +989,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_lambda;1",
+        "@id": "dtmi:example:humpf_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.141592",
           "@type": "Command",
-          "name": "wum_kappa"
+          "name": "humpf_pi"
         }
       }
     ]
@@ -1008,12 +1008,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_nu;1",
+        "@id": "dtmi:example:humpf_tau;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:dtdl:example;1",
           "@type": "Command",
-          "name": "wum_mu"
+          "name": "humpf_sigma"
         }
       }
     ]
@@ -1026,13 +1026,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_omicron;1",
+        "@id": "dtmi:example:humpf_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:dtdl:example;1",
           "@type": "Command",
-          "name": "wum_xi"
+          "name": "humpf_upsilon"
         }
       }
     ]
@@ -1045,12 +1045,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_rho;1",
+        "@id": "dtmi:example:humpf_psi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:standard:example;1",
           "@type": "Command",
-          "name": "wum_pi"
+          "name": "humpf_chi"
         }
       }
     ]
@@ -1063,13 +1063,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_tau;1",
+        "@id": "dtmi:example:humpf_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:standard:example;1",
           "@type": "Command",
-          "name": "wum_sigma"
+          "name": "humpf_omega"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassCommandIdNotArrayV2.json b/DTDL/v2/spec/Requirement-ClassCommandIdNotArrayV2.json
index ae270129..11a3dbef 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandIdNotArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandIdNotArrayV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_phi;1",
+        "@id": "dtmi:example:humpf_um;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;7"
           ],
           "@type": "Command",
-          "name": "wum_upsilon"
+          "name": "humpf_wum"
         }
       }
     ]
@@ -27,7 +27,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_psi;1",
+        "@id": "dtmi:example:humpf_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -35,7 +35,7 @@
             "dtmi:foo:bar;7"
           ],
           "@type": "Command",
-          "name": "wum_chi"
+          "name": "humpf_humpf"
         }
       }
     ]
@@ -48,14 +48,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_yuzz;1",
+        "@id": "dtmi:example:humpf_nuh;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;108675309"
           ],
           "@type": "Command",
-          "name": "wum_omega"
+          "name": "humpf_glikk"
         }
       }
     ]
@@ -68,7 +68,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_um;1",
+        "@id": "dtmi:example:humpf_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -76,7 +76,7 @@
             "dtmi:foo:bar;108675309"
           ],
           "@type": "Command",
-          "name": "wum_wum"
+          "name": "humpf_snee"
         }
       }
     ]
@@ -89,14 +89,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_fuddle;1",
+        "@id": "dtmi:example:humpf_spazz;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;999999999"
           ],
           "@type": "Command",
-          "name": "wum_humpf"
+          "name": "humpf_thnad"
         }
       }
     ]
@@ -109,7 +109,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_nuh;1",
+        "@id": "dtmi:example:humpf_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -117,7 +117,7 @@
             "dtmi:foo:bar;999999999"
           ],
           "@type": "Command",
-          "name": "wum_glikk"
+          "name": "humpf_floob"
         }
       }
     ]
@@ -130,14 +130,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_quan;1",
+        "@id": "dtmi:example:humpf_flunn;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo;1"
           ],
           "@type": "Command",
-          "name": "wum_snee"
+          "name": "humpf_jogg"
         }
       }
     ]
@@ -150,7 +150,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_spazz;1",
+        "@id": "dtmi:example:humpf_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -158,7 +158,7 @@
             "dtmi:foo;1"
           ],
           "@type": "Command",
-          "name": "wum_thnad"
+          "name": "humpf_itch"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadContextConformsV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadContextConformsV2.json
index fd9a2cc8..f390cb08 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadContextConformsV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadContextConformsV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_pi;1",
+        "@id": "dtmi:example:pi_iota;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_omicron;1",
+          "@id": "dtmi:example:pi_theta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "nu_xi",
+            "name": "pi_eta",
             "request": {
-              "name": "nu_nu",
-              "schema": "time",
+              "name": "pi_zeta",
+              "schema": "float",
               "@context": "dtmi:iotcentral:context;2"
             }
           }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_upsilon;1",
+        "@id": "dtmi:example:pi_nu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_tau;1",
+          "@id": "dtmi:example:pi_mu;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "nu_sigma",
+            "name": "pi_lambda",
             "request": {
-              "name": "nu_rho",
-              "schema": "boolean",
+              "name": "pi_kappa",
+              "schema": "integer",
               "@context": []
             }
           }
@@ -59,17 +59,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_omega;1",
+        "@id": "dtmi:example:pi_rho;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_psi;1",
+          "@id": "dtmi:example:pi_pi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "nu_chi",
+            "name": "pi_omicron",
             "request": {
-              "name": "nu_phi",
-              "schema": "date",
+              "name": "pi_xi",
+              "schema": "long",
               "@context": [
                 "dtmi:iotcentral:context;2"
               ]
@@ -87,17 +87,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_humpf;1",
+        "@id": "dtmi:example:pi_phi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_um;1",
+          "@id": "dtmi:example:pi_upsilon;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "nu_wum",
+            "name": "pi_tau",
             "request": {
-              "name": "nu_yuzz",
-              "schema": "dateTime",
+              "name": "pi_sigma",
+              "schema": "string",
               "@context": null
             }
           }
@@ -113,17 +113,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_snee;1",
+        "@id": "dtmi:example:pi_yuzz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_nuh;1",
+          "@id": "dtmi:example:pi_omega;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "nu_glikk",
+            "name": "pi_psi",
             "request": {
-              "name": "nu_fuddle",
-              "schema": "double",
+              "name": "pi_chi",
+              "schema": "time",
               "@context": 626
             }
           }
@@ -139,17 +139,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_floob;1",
+        "@id": "dtmi:example:pi_fuddle;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_spazz;1",
+          "@id": "dtmi:example:pi_humpf;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "nu_thnad",
+            "name": "pi_um",
             "request": {
-              "name": "nu_quan",
-              "schema": "duration",
+              "name": "pi_wum",
+              "schema": "boolean",
               "@context": true
             }
           }
@@ -165,17 +165,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_itch;1",
+        "@id": "dtmi:example:pi_quan;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_flunn;1",
+          "@id": "dtmi:example:pi_snee;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "nu_jogg",
+            "name": "pi_nuh",
             "request": {
-              "name": "nu_zatz",
-              "schema": "float",
+              "name": "pi_glikk",
+              "schema": "date",
               "@context": [
                 null
               ]
@@ -193,17 +193,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_alpha;1",
+        "@id": "dtmi:example:pi_zatz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_hi;1",
+          "@id": "dtmi:example:pi_floob;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "nu_vroo",
+            "name": "pi_spazz",
             "request": {
-              "name": "nu_yekk",
-              "schema": "integer",
+              "name": "pi_thnad",
+              "schema": "dateTime",
               "@context": [
                 626
               ]
@@ -221,17 +221,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_epsilon;1",
+        "@id": "dtmi:example:pi_yekk;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_delta;1",
+          "@id": "dtmi:example:pi_itch;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "xi_gamma",
+            "name": "pi_flunn",
             "request": {
-              "name": "xi_beta",
-              "schema": "long",
+              "name": "pi_jogg",
+              "schema": "double",
               "@context": [
                 true
               ]
@@ -249,18 +249,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_iota;1",
+        "@id": "dtmi:example:rho_beta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_theta;1",
+          "@id": "dtmi:example:rho_alpha;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "xi_eta",
+            "name": "pi_hi",
             "request": {
-              "name": "xi_zeta",
-              "schema": "string",
-              "@context": {}
+              "name": "pi_vroo",
+              "schema": "duration",
+              "@context": "dtmi:iotcentral:context"
             }
           }
         }
@@ -275,20 +275,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_nu;1",
+        "@id": "dtmi:example:rho_zeta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_mu;1",
+          "@id": "dtmi:example:rho_epsilon;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "xi_lambda",
+            "name": "rho_delta",
             "request": {
-              "name": "xi_kappa",
-              "schema": "time",
-              "@context": [
-                {}
-              ]
+              "name": "rho_gamma",
+              "schema": "float",
+              "@context": "http://iotcentral/context/2"
             }
           }
         }
@@ -303,18 +301,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_rho;1",
+        "@id": "dtmi:example:rho_kappa;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_pi;1",
+          "@id": "dtmi:example:rho_iota;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "xi_omicron",
+            "name": "rho_theta",
             "request": {
-              "name": "xi_xi",
-              "schema": "boolean",
-              "@context": "dtmi:iotcentral:context"
+              "name": "rho_eta",
+              "schema": "integer",
+              "@context": "iotcentral;2"
             }
           }
         }
@@ -329,18 +327,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_phi;1",
+        "@id": "dtmi:example:rho_xi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_upsilon;1",
+          "@id": "dtmi:example:rho_nu;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "xi_tau",
+            "name": "rho_mu",
             "request": {
-              "name": "xi_sigma",
-              "schema": "date",
-              "@context": "http://iotcentral/context/2"
+              "name": "rho_lambda",
+              "schema": "long",
+              "@context": {}
             }
           }
         }
@@ -355,18 +353,78 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_yuzz;1",
+        "@id": "dtmi:example:rho_sigma;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_omega;1",
+          "@id": "dtmi:example:rho_rho;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "xi_psi",
+            "name": "rho_pi",
             "request": {
-              "name": "xi_chi",
-              "schema": "dateTime",
-              "@context": "iotcentral;2"
+              "name": "rho_omicron",
+              "schema": "string",
+              "@context": {
+                "foo": "dtmi:foo:bar;1"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:rho_chi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:rho_phi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "rho_upsilon",
+            "request": {
+              "name": "rho_tau",
+              "schema": "time",
+              "@context": [
+                {}
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:rho_wum;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:rho_yuzz;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "rho_omega",
+            "request": {
+              "name": "rho_psi",
+              "schema": "boolean",
+              "@context": [
+                {
+                  "foo": "dtmi:foo:bar;1"
+                }
+              ]
             }
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadGraphKeywordV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadGraphKeywordV2.json
index 59dcde7e..d9d51b0e 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadGraphKeywordV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadGraphKeywordV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_yekk;1",
+        "@id": "dtmi:example:nuh_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_itch",
+          "name": "nuh_yekk",
           "request": {
-            "name": "humpf_flunn",
-            "schema": "date",
+            "name": "nuh_itch",
+            "schema": "time",
             "@graph": {}
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_alpha;1",
+        "@id": "dtmi:example:snee_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_hi",
+          "name": "snee_alpha",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "humpf_vroo",
-            "schema": "dateTime",
+            "name": "nuh_hi",
+            "schema": "boolean",
             "@graph": {}
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadIdDuplicateV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadIdDuplicateV2.json
index 85ecfe86..c5768e70 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadIdDuplicateV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadIdDuplicateV2.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_thnad;1",
+        "@id": "dtmi:example:omega_spazz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:phi_thnad;1",
+          "@id": "dtmi:example:omega_spazz;1",
           "@type": "Interface",
           "contents": {
-            "@id": "dtmi:example:phi_thnad;1",
+            "@id": "dtmi:example:omega_spazz;1",
             "@type": "Command",
-            "name": "phi_floob",
+            "name": "omega_zatz",
             "request": {
-              "@id": "dtmi:example:phi_thnad;1",
-              "name": "phi_spazz",
-              "schema": "integer"
+              "@id": "dtmi:example:omega_spazz;1",
+              "name": "omega_floob",
+              "schema": "duration"
             }
           }
         }
@@ -34,20 +34,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_zatz;1",
+        "@id": "dtmi:example:omega_jogg;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:phi_zatz;1",
+          "@id": "dtmi:example:omega_jogg;1",
           "@type": "Interface",
           "contents": {
-            "@id": "dtmi:example:phi_zatz;1",
+            "@id": "dtmi:example:omega_jogg;1",
             "@type": "Command",
-            "name": "phi_flunn",
+            "name": "omega_itch",
             "request": {
               "@context": "dtmi:undefinedExtension:context;1",
-              "@id": "dtmi:example:phi_zatz;1",
-              "name": "phi_jogg",
-              "schema": "long"
+              "@id": "dtmi:example:omega_jogg;1",
+              "name": "omega_flunn",
+              "schema": "float"
             }
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadIdIsDtmiV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadIdIsDtmiV2.json
index 3dfc66d8..20462320 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadIdIsDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadIdIsDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_kappa;1",
+        "@id": "dtmi:example:upsilon_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_iota",
+          "name": "upsilon_kappa",
           "request": {
             "@id": "dtmi:foo:bar;7",
-            "name": "rho_theta",
-            "schema": "boolean"
+            "name": "upsilon_iota",
+            "schema": "string"
           }
         }
       }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_nu;1",
+        "@id": "dtmi:example:upsilon_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_mu",
+          "name": "upsilon_nu",
           "request": {
             "@id": "dtmi:foo:bar;108675309",
-            "name": "rho_lambda",
-            "schema": "date"
+            "name": "upsilon_mu",
+            "schema": "time"
           }
         }
       }
@@ -51,15 +51,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_pi;1",
+        "@id": "dtmi:example:upsilon_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_omicron",
+          "name": "upsilon_pi",
           "request": {
             "@id": "dtmi:foo:bar;999999999",
-            "name": "rho_xi",
-            "schema": "dateTime"
+            "name": "upsilon_omicron",
+            "schema": "boolean"
           }
         }
       }
@@ -73,15 +73,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_tau;1",
+        "@id": "dtmi:example:upsilon_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_sigma",
+          "name": "upsilon_tau",
           "request": {
             "@id": "dtmi:foo;1",
-            "name": "rho_rho",
-            "schema": "double"
+            "name": "upsilon_sigma",
+            "schema": "date"
           }
         }
       }
@@ -95,15 +95,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_chi;1",
+        "@id": "dtmi:example:upsilon_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_phi",
+          "name": "upsilon_chi",
           "request": {
             "@id": null,
-            "name": "rho_upsilon",
-            "schema": "duration"
+            "name": "upsilon_phi",
+            "schema": "dateTime"
           }
         }
       }
@@ -117,16 +117,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_yuzz;1",
+        "@id": "dtmi:example:upsilon_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_omega",
+          "name": "upsilon_yuzz",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": null,
-            "name": "rho_psi",
-            "schema": "float"
+            "name": "upsilon_omega",
+            "schema": "double"
           }
         }
       }
@@ -140,15 +140,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_humpf;1",
+        "@id": "dtmi:example:upsilon_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_um",
+          "name": "upsilon_humpf",
           "request": {
             "@id": 626,
-            "name": "rho_wum",
-            "schema": "integer"
+            "name": "upsilon_um",
+            "schema": "duration"
           }
         }
       }
@@ -162,16 +162,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_nuh;1",
+        "@id": "dtmi:example:upsilon_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_glikk",
+          "name": "upsilon_nuh",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": 626,
-            "name": "rho_fuddle",
-            "schema": "long"
+            "name": "upsilon_glikk",
+            "schema": "float"
           }
         }
       }
@@ -185,15 +185,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_thnad;1",
+        "@id": "dtmi:example:upsilon_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_quan",
+          "name": "upsilon_thnad",
           "request": {
             "@id": true,
-            "name": "rho_snee",
-            "schema": "string"
+            "name": "upsilon_quan",
+            "schema": "integer"
           }
         }
       }
@@ -207,16 +207,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_zatz;1",
+        "@id": "dtmi:example:upsilon_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_floob",
+          "name": "upsilon_zatz",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": true,
-            "name": "rho_spazz",
-            "schema": "time"
+            "name": "upsilon_floob",
+            "schema": "long"
           }
         }
       }
@@ -230,17 +230,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_itch;1",
+        "@id": "dtmi:example:upsilon_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_flunn",
+          "name": "upsilon_itch",
           "request": {
             "@id": {
               "@value": "dtmi:apparently:valid:identifier;3"
             },
-            "name": "rho_jogg",
-            "schema": "boolean"
+            "name": "upsilon_flunn",
+            "schema": "string"
           }
         }
       }
@@ -254,18 +254,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_hi;1",
+        "@id": "dtmi:example:phi_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_vroo",
+          "name": "upsilon_hi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": {
               "@value": "dtmi:apparently:valid:identifier;3"
             },
-            "name": "rho_yekk",
-            "schema": "date"
+            "name": "upsilon_vroo",
+            "schema": "time"
           }
         }
       }
@@ -279,15 +279,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_gamma;1",
+        "@id": "dtmi:example:phi_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_beta",
+          "name": "phi_gamma",
           "request": {
             "@id": "dtmi:foo:bar;0",
-            "name": "sigma_alpha",
-            "schema": "dateTime"
+            "name": "phi_beta",
+            "schema": "boolean"
           }
         }
       }
@@ -301,16 +301,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_zeta;1",
+        "@id": "dtmi:example:phi_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_epsilon",
+          "name": "phi_zeta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0",
-            "name": "sigma_delta",
-            "schema": "double"
+            "name": "phi_epsilon",
+            "schema": "date"
           }
         }
       }
@@ -324,15 +324,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_iota;1",
+        "@id": "dtmi:example:phi_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_theta",
+          "name": "phi_iota",
           "request": {
             "@id": "dtmi:foo:bar;0.0",
-            "name": "sigma_eta",
-            "schema": "duration"
+            "name": "phi_theta",
+            "schema": "dateTime"
           }
         }
       }
@@ -346,16 +346,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_mu;1",
+        "@id": "dtmi:example:phi_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_lambda",
+          "name": "phi_mu",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0.0",
-            "name": "sigma_kappa",
-            "schema": "float"
+            "name": "phi_lambda",
+            "schema": "double"
           }
         }
       }
@@ -369,15 +369,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_omicron;1",
+        "@id": "dtmi:example:phi_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_xi",
+          "name": "phi_omicron",
           "request": {
             "@id": "dtmi:foo:bar;1234567890",
-            "name": "sigma_nu",
-            "schema": "integer"
+            "name": "phi_xi",
+            "schema": "duration"
           }
         }
       }
@@ -391,16 +391,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_sigma;1",
+        "@id": "dtmi:example:phi_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_rho",
+          "name": "phi_sigma",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;1234567890",
-            "name": "sigma_pi",
-            "schema": "long"
+            "name": "phi_rho",
+            "schema": "float"
           }
         }
       }
@@ -414,15 +414,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_phi;1",
+        "@id": "dtmi:example:phi_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_upsilon",
+          "name": "phi_phi",
           "request": {
             "@id": "dtmi:foo:bar;1a",
-            "name": "sigma_tau",
-            "schema": "string"
+            "name": "phi_upsilon",
+            "schema": "integer"
           }
         }
       }
@@ -436,16 +436,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_omega;1",
+        "@id": "dtmi:example:phi_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_psi",
+          "name": "phi_omega",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;1a",
-            "name": "sigma_chi",
-            "schema": "time"
+            "name": "phi_psi",
+            "schema": "long"
           }
         }
       }
@@ -459,15 +459,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_um;1",
+        "@id": "dtmi:example:phi_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_wum",
+          "name": "phi_um",
           "request": {
             "@id": "dtmi:foo:bar;3.0",
-            "name": "sigma_yuzz",
-            "schema": "boolean"
+            "name": "phi_wum",
+            "schema": "string"
           }
         }
       }
@@ -481,16 +481,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_glikk;1",
+        "@id": "dtmi:example:phi_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_fuddle",
+          "name": "phi_glikk",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.0",
-            "name": "sigma_humpf",
-            "schema": "date"
+            "name": "phi_fuddle",
+            "schema": "time"
           }
         }
       }
@@ -504,15 +504,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_quan;1",
+        "@id": "dtmi:example:phi_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_snee",
+          "name": "phi_quan",
           "request": {
             "@id": "dtmi:foo:bar;3.1415926",
-            "name": "sigma_nuh",
-            "schema": "dateTime"
+            "name": "phi_snee",
+            "schema": "boolean"
           }
         }
       }
@@ -526,16 +526,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_floob;1",
+        "@id": "dtmi:example:phi_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_spazz",
+          "name": "phi_floob",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.1415926",
-            "name": "sigma_thnad",
-            "schema": "double"
+            "name": "phi_spazz",
+            "schema": "date"
           }
         }
       }
@@ -549,15 +549,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_flunn;1",
+        "@id": "dtmi:example:phi_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_jogg",
+          "name": "phi_flunn",
           "request": {
             "@id": "dtmi:foo:bar;6.02",
-            "name": "sigma_zatz",
-            "schema": "duration"
+            "name": "phi_jogg",
+            "schema": "dateTime"
           }
         }
       }
@@ -571,16 +571,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_vroo;1",
+        "@id": "dtmi:example:phi_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_yekk",
+          "name": "phi_vroo",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;6.02",
-            "name": "sigma_itch",
-            "schema": "float"
+            "name": "phi_yekk",
+            "schema": "double"
           }
         }
       }
@@ -594,15 +594,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_beta;1",
+        "@id": "dtmi:example:chi_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "tau_alpha",
+          "name": "chi_beta",
           "request": {
             "@id": "dtmi:foo:bar;0.1",
-            "name": "sigma_hi",
-            "schema": "integer"
+            "name": "chi_alpha",
+            "schema": "duration"
           }
         }
       }
@@ -616,16 +616,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_epsilon;1",
+        "@id": "dtmi:example:chi_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "tau_delta",
+          "name": "chi_epsilon",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0.1",
-            "name": "tau_gamma",
-            "schema": "long"
+            "name": "chi_delta",
+            "schema": "float"
           }
         }
       }
@@ -639,15 +639,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_theta;1",
+        "@id": "dtmi:example:chi_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "tau_eta",
+          "name": "chi_theta",
           "request": {
             "@id": "dtmi:foo:bar;01",
-            "name": "tau_zeta",
-            "schema": "string"
+            "name": "chi_eta",
+            "schema": "integer"
           }
         }
       }
@@ -661,16 +661,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_lambda;1",
+        "@id": "dtmi:example:chi_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "tau_kappa",
+          "name": "chi_lambda",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;01",
-            "name": "tau_iota",
-            "schema": "time"
+            "name": "chi_kappa",
+            "schema": "long"
           }
         }
       }
@@ -684,15 +684,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_xi;1",
+        "@id": "dtmi:example:chi_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "tau_nu",
+          "name": "chi_xi",
           "request": {
             "@id": "dtmi:foo:bar;",
-            "name": "tau_mu",
-            "schema": "boolean"
+            "name": "chi_nu",
+            "schema": "string"
           }
         }
       }
@@ -706,16 +706,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_rho;1",
+        "@id": "dtmi:example:chi_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "tau_pi",
+          "name": "chi_rho",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;",
-            "name": "tau_omicron",
-            "schema": "date"
+            "name": "chi_pi",
+            "schema": "time"
           }
         }
       }
@@ -729,15 +729,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_upsilon;1",
+        "@id": "dtmi:example:chi_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "tau_tau",
+          "name": "chi_upsilon",
           "request": {
             "@id": "dtmi:test:invalidId_;1",
-            "name": "tau_sigma",
-            "schema": "dateTime"
+            "name": "chi_tau",
+            "schema": "boolean"
           }
         }
       }
@@ -751,16 +751,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_psi;1",
+        "@id": "dtmi:example:chi_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "tau_chi",
+          "name": "chi_psi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:invalidId_;1",
-            "name": "tau_phi",
-            "schema": "double"
+            "name": "chi_chi",
+            "schema": "date"
           }
         }
       }
@@ -774,15 +774,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_wum;1",
+        "@id": "dtmi:example:chi_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "tau_yuzz",
+          "name": "chi_wum",
           "request": {
             "@id": "dtmi:test:_invalidUserId;1",
-            "name": "tau_omega",
-            "schema": "duration"
+            "name": "chi_yuzz",
+            "schema": "dateTime"
           }
         }
       }
@@ -796,16 +796,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_fuddle;1",
+        "@id": "dtmi:example:chi_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "tau_humpf",
+          "name": "chi_fuddle",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:_invalidUserId;1",
-            "name": "tau_um",
-            "schema": "float"
+            "name": "chi_humpf",
+            "schema": "double"
           }
         }
       }
@@ -819,15 +819,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_snee;1",
+        "@id": "dtmi:example:chi_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "tau_nuh",
+          "name": "chi_snee",
           "request": {
             "@id": "dtmi:test:1seg;1",
-            "name": "tau_glikk",
-            "schema": "integer"
+            "name": "chi_nuh",
+            "schema": "duration"
           }
         }
       }
@@ -841,16 +841,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_spazz;1",
+        "@id": "dtmi:example:chi_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "tau_thnad",
+          "name": "chi_spazz",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:1seg;1",
-            "name": "tau_quan",
-            "schema": "long"
+            "name": "chi_thnad",
+            "schema": "float"
           }
         }
       }
@@ -864,15 +864,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_jogg;1",
+        "@id": "dtmi:example:chi_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "tau_zatz",
+          "name": "chi_jogg",
           "request": {
             "@id": "dtmi:foo:bar.baz;1",
-            "name": "tau_floob",
-            "schema": "string"
+            "name": "chi_zatz",
+            "schema": "integer"
           }
         }
       }
@@ -886,16 +886,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_yekk;1",
+        "@id": "dtmi:example:chi_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "tau_itch",
+          "name": "chi_yekk",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar.baz;1",
-            "name": "tau_flunn",
-            "schema": "time"
+            "name": "chi_itch",
+            "schema": "long"
           }
         }
       }
@@ -909,15 +909,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_alpha;1",
+        "@id": "dtmi:example:psi_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "tau_hi",
+          "name": "psi_alpha",
           "request": {
             "@id": "dtmi:foo::bar;1",
-            "name": "tau_vroo",
-            "schema": "boolean"
+            "name": "chi_hi",
+            "schema": "string"
           }
         }
       }
@@ -931,16 +931,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_delta;1",
+        "@id": "dtmi:example:psi_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_gamma",
+          "name": "psi_delta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo::bar;1",
-            "name": "upsilon_beta",
-            "schema": "date"
+            "name": "psi_gamma",
+            "schema": "time"
           }
         }
       }
@@ -954,15 +954,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_eta;1",
+        "@id": "dtmi:example:psi_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_zeta",
+          "name": "psi_eta",
           "request": {
             "@id": "urn:foo:bar:1",
-            "name": "upsilon_epsilon",
-            "schema": "dateTime"
+            "name": "psi_zeta",
+            "schema": "boolean"
           }
         }
       }
@@ -976,16 +976,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_kappa;1",
+        "@id": "dtmi:example:psi_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_iota",
+          "name": "psi_kappa",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "urn:foo:bar:1",
-            "name": "upsilon_theta",
-            "schema": "double"
+            "name": "psi_iota",
+            "schema": "date"
           }
         }
       }
@@ -999,15 +999,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_nu;1",
+        "@id": "dtmi:example:psi_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_mu",
+          "name": "psi_nu",
           "request": {
             "@id": "http://foo/bar/baz",
-            "name": "upsilon_lambda",
-            "schema": "duration"
+            "name": "psi_mu",
+            "schema": "dateTime"
           }
         }
       }
@@ -1021,16 +1021,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_pi;1",
+        "@id": "dtmi:example:psi_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_omicron",
+          "name": "psi_pi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "http://foo/bar/baz",
-            "name": "upsilon_xi",
-            "schema": "float"
+            "name": "psi_omicron",
+            "schema": "double"
           }
         }
       }
@@ -1044,15 +1044,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_tau;1",
+        "@id": "dtmi:example:psi_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_sigma",
+          "name": "psi_tau",
           "request": {
             "@id": "dtmi:;1",
-            "name": "upsilon_rho",
-            "schema": "integer"
+            "name": "psi_sigma",
+            "schema": "duration"
           }
         }
       }
@@ -1066,16 +1066,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_chi;1",
+        "@id": "dtmi:example:psi_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_phi",
+          "name": "psi_chi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:;1",
-            "name": "upsilon_upsilon",
-            "schema": "long"
+            "name": "psi_phi",
+            "schema": "float"
           }
         }
       }
@@ -1089,15 +1089,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_yuzz;1",
+        "@id": "dtmi:example:psi_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_omega",
+          "name": "psi_yuzz",
           "request": {
             "@id": "dtmi:foo:bar",
-            "name": "upsilon_psi",
-            "schema": "string"
+            "name": "psi_omega",
+            "schema": "integer"
           }
         }
       }
@@ -1111,16 +1111,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_humpf;1",
+        "@id": "dtmi:example:psi_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_um",
+          "name": "psi_humpf",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar",
-            "name": "upsilon_wum",
-            "schema": "time"
+            "name": "psi_um",
+            "schema": "long"
           }
         }
       }
@@ -1134,15 +1134,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_nuh;1",
+        "@id": "dtmi:example:psi_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_glikk",
+          "name": "psi_nuh",
           "request": {
             "@id": "dtmi:foo:bar;3.14",
-            "name": "upsilon_fuddle",
-            "schema": "boolean"
+            "name": "psi_glikk",
+            "schema": "string"
           }
         }
       }
@@ -1156,16 +1156,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_thnad;1",
+        "@id": "dtmi:example:psi_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_quan",
+          "name": "psi_thnad",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.14",
-            "name": "upsilon_snee",
-            "schema": "date"
+            "name": "psi_quan",
+            "schema": "time"
           }
         }
       }
@@ -1179,15 +1179,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_zatz;1",
+        "@id": "dtmi:example:psi_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_floob",
+          "name": "psi_zatz",
           "request": {
             "@id": "dtmi:foo:bar;3.141592",
-            "name": "upsilon_spazz",
-            "schema": "dateTime"
+            "name": "psi_floob",
+            "schema": "boolean"
           }
         }
       }
@@ -1201,16 +1201,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_itch;1",
+        "@id": "dtmi:example:psi_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_flunn",
+          "name": "psi_itch",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.141592",
-            "name": "upsilon_jogg",
-            "schema": "double"
+            "name": "psi_flunn",
+            "schema": "date"
           }
         }
       }
@@ -1224,15 +1224,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_hi;1",
+        "@id": "dtmi:example:omega_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_vroo",
+          "name": "psi_hi",
           "request": {
             "@id": "dtmi:dtdl:example;1",
-            "name": "upsilon_yekk",
-            "schema": "duration"
+            "name": "psi_vroo",
+            "schema": "dateTime"
           }
         }
       }
@@ -1246,16 +1246,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_gamma;1",
+        "@id": "dtmi:example:omega_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_beta",
+          "name": "omega_gamma",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:dtdl:example;1",
-            "name": "phi_alpha",
-            "schema": "float"
+            "name": "omega_beta",
+            "schema": "double"
           }
         }
       }
@@ -1269,15 +1269,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_zeta;1",
+        "@id": "dtmi:example:omega_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_epsilon",
+          "name": "omega_zeta",
           "request": {
             "@id": "dtmi:standard:example;1",
-            "name": "phi_delta",
-            "schema": "integer"
+            "name": "omega_epsilon",
+            "schema": "duration"
           }
         }
       }
@@ -1291,16 +1291,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_iota;1",
+        "@id": "dtmi:example:omega_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_theta",
+          "name": "omega_iota",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:standard:example;1",
-            "name": "phi_eta",
-            "schema": "long"
+            "name": "omega_theta",
+            "schema": "float"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadIdNotArrayV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadIdNotArrayV2.json
index 1088a090..3a5fb09b 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadIdNotArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadIdNotArrayV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_mu;1",
+        "@id": "dtmi:example:omega_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_lambda",
+          "name": "omega_mu",
           "request": {
             "@id": [
               "dtmi:foo:bar;7"
             ],
-            "name": "phi_kappa",
-            "schema": "string"
+            "name": "omega_lambda",
+            "schema": "integer"
           }
         }
       }
@@ -31,18 +31,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_omicron;1",
+        "@id": "dtmi:example:omega_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_xi",
+          "name": "omega_omicron",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;7"
             ],
-            "name": "phi_nu",
-            "schema": "time"
+            "name": "omega_xi",
+            "schema": "long"
           }
         }
       }
@@ -56,17 +56,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_sigma;1",
+        "@id": "dtmi:example:omega_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_rho",
+          "name": "omega_sigma",
           "request": {
             "@id": [
               "dtmi:foo:bar;108675309"
             ],
-            "name": "phi_pi",
-            "schema": "boolean"
+            "name": "omega_rho",
+            "schema": "string"
           }
         }
       }
@@ -80,18 +80,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_phi;1",
+        "@id": "dtmi:example:omega_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_upsilon",
+          "name": "omega_phi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;108675309"
             ],
-            "name": "phi_tau",
-            "schema": "date"
+            "name": "omega_upsilon",
+            "schema": "time"
           }
         }
       }
@@ -105,17 +105,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_omega;1",
+        "@id": "dtmi:example:omega_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_psi",
+          "name": "omega_omega",
           "request": {
             "@id": [
               "dtmi:foo:bar;999999999"
             ],
-            "name": "phi_chi",
-            "schema": "dateTime"
+            "name": "omega_psi",
+            "schema": "boolean"
           }
         }
       }
@@ -129,18 +129,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_um;1",
+        "@id": "dtmi:example:omega_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_wum",
+          "name": "omega_um",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;999999999"
             ],
-            "name": "phi_yuzz",
-            "schema": "double"
+            "name": "omega_wum",
+            "schema": "date"
           }
         }
       }
@@ -154,17 +154,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_glikk;1",
+        "@id": "dtmi:example:omega_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_fuddle",
+          "name": "omega_glikk",
           "request": {
             "@id": [
               "dtmi:foo;1"
             ],
-            "name": "phi_humpf",
-            "schema": "duration"
+            "name": "omega_fuddle",
+            "schema": "dateTime"
           }
         }
       }
@@ -178,18 +178,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_quan;1",
+        "@id": "dtmi:example:omega_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_snee",
+          "name": "omega_quan",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo;1"
             ],
-            "name": "phi_nuh",
-            "schema": "float"
+            "name": "omega_snee",
+            "schema": "double"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyCommentStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyCommentStringLengthV2.json
index 0753b606..4439c3cb 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyCommentStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyCommentStringLengthV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_tau;1",
+        "@id": "dtmi:example:wum_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_sigma",
+          "name": "wum_tau",
           "request": {
-            "name": "psi_rho",
-            "schema": "time",
+            "name": "wum_sigma",
+            "schema": "long",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_chi;1",
+        "@id": "dtmi:example:wum_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_phi",
+          "name": "wum_chi",
           "request": {
-            "name": "psi_upsilon",
-            "schema": "boolean",
+            "name": "wum_phi",
+            "schema": "string",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
@@ -51,15 +51,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_yuzz;1",
+        "@id": "dtmi:example:wum_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_omega",
+          "name": "wum_yuzz",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "psi_psi",
-            "schema": "date",
+            "name": "wum_omega",
+            "schema": "time",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyCommentStringV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyCommentStringV2.json
index bfd843a6..639b5230 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyCommentStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyCommentStringV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_vroo;1",
+        "@id": "dtmi:example:omega_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_yekk",
+          "name": "omega_vroo",
           "request": {
-            "name": "phi_itch",
-            "schema": "string",
+            "name": "omega_yekk",
+            "schema": "integer",
             "comment": "hello"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_beta;1",
+        "@id": "dtmi:example:yuzz_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_alpha",
+          "name": "yuzz_beta",
           "request": {
-            "name": "phi_hi",
-            "schema": "time",
+            "name": "yuzz_alpha",
+            "schema": "long",
             "comment": [
               "hello"
             ]
@@ -53,14 +53,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_epsilon;1",
+        "@id": "dtmi:example:yuzz_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_delta",
+          "name": "yuzz_epsilon",
           "request": {
-            "name": "chi_gamma",
-            "schema": "boolean",
+            "name": "yuzz_delta",
+            "schema": "string",
             "comment": {
               "@value": "hello",
               "@type": "xsd:string"
@@ -78,14 +78,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_theta;1",
+        "@id": "dtmi:example:yuzz_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_eta",
+          "name": "yuzz_theta",
           "request": {
-            "name": "chi_zeta",
-            "schema": "date",
+            "name": "yuzz_eta",
+            "schema": "time",
             "comment": [
               {
                 "@value": "hello",
@@ -105,14 +105,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_lambda;1",
+        "@id": "dtmi:example:yuzz_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_kappa",
+          "name": "yuzz_lambda",
           "request": {
-            "name": "chi_iota",
-            "schema": "dateTime",
+            "name": "yuzz_kappa",
+            "schema": "boolean",
             "comment": []
           }
         }
@@ -127,14 +127,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_xi;1",
+        "@id": "dtmi:example:yuzz_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_nu",
+          "name": "yuzz_xi",
           "request": {
-            "name": "chi_mu",
-            "schema": "double",
+            "name": "yuzz_nu",
+            "schema": "date",
             "comment": null
           }
         }
@@ -149,15 +149,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_rho;1",
+        "@id": "dtmi:example:yuzz_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_pi",
+          "name": "yuzz_rho",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "chi_omicron",
-            "schema": "duration",
+            "name": "yuzz_pi",
+            "schema": "dateTime",
             "comment": null
           }
         }
@@ -172,14 +172,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_upsilon;1",
+        "@id": "dtmi:example:yuzz_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_tau",
+          "name": "yuzz_upsilon",
           "request": {
-            "name": "chi_sigma",
-            "schema": "float",
+            "name": "yuzz_tau",
+            "schema": "double",
             "comment": true
           }
         }
@@ -194,15 +194,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_psi;1",
+        "@id": "dtmi:example:yuzz_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_chi",
+          "name": "yuzz_psi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "chi_phi",
-            "schema": "integer",
+            "name": "yuzz_chi",
+            "schema": "duration",
             "comment": true
           }
         }
@@ -217,14 +217,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_wum;1",
+        "@id": "dtmi:example:yuzz_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_yuzz",
+          "name": "yuzz_wum",
           "request": {
-            "name": "chi_omega",
-            "schema": "long",
+            "name": "yuzz_yuzz",
+            "schema": "float",
             "comment": 626
           }
         }
@@ -239,15 +239,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_fuddle;1",
+        "@id": "dtmi:example:yuzz_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_humpf",
+          "name": "yuzz_fuddle",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "chi_um",
-            "schema": "string",
+            "name": "yuzz_humpf",
+            "schema": "integer",
             "comment": 626
           }
         }
@@ -262,14 +262,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_snee;1",
+        "@id": "dtmi:example:yuzz_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_nuh",
+          "name": "yuzz_snee",
           "request": {
-            "name": "chi_glikk",
-            "schema": "time",
+            "name": "yuzz_nuh",
+            "schema": "long",
             "comment": [
               null
             ]
@@ -286,15 +286,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_spazz;1",
+        "@id": "dtmi:example:yuzz_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_thnad",
+          "name": "yuzz_spazz",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "chi_quan",
-            "schema": "boolean",
+            "name": "yuzz_thnad",
+            "schema": "string",
             "comment": [
               null
             ]
@@ -311,14 +311,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_jogg;1",
+        "@id": "dtmi:example:yuzz_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_zatz",
+          "name": "yuzz_jogg",
           "request": {
-            "name": "chi_floob",
-            "schema": "date",
+            "name": "yuzz_zatz",
+            "schema": "time",
             "comment": [
               true
             ]
@@ -335,15 +335,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_yekk;1",
+        "@id": "dtmi:example:yuzz_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_itch",
+          "name": "yuzz_yekk",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "chi_flunn",
-            "schema": "dateTime",
+            "name": "yuzz_itch",
+            "schema": "boolean",
             "comment": [
               true
             ]
@@ -360,14 +360,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_alpha;1",
+        "@id": "dtmi:example:wum_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_hi",
+          "name": "wum_alpha",
           "request": {
-            "name": "chi_vroo",
-            "schema": "double",
+            "name": "yuzz_hi",
+            "schema": "date",
             "comment": [
               626
             ]
@@ -384,15 +384,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_delta;1",
+        "@id": "dtmi:example:wum_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_gamma",
+          "name": "wum_delta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "psi_beta",
-            "schema": "duration",
+            "name": "wum_gamma",
+            "schema": "dateTime",
             "comment": [
               626
             ]
@@ -409,14 +409,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_eta;1",
+        "@id": "dtmi:example:wum_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_zeta",
+          "name": "wum_eta",
           "request": {
-            "name": "psi_epsilon",
-            "schema": "float",
+            "name": "wum_zeta",
+            "schema": "double",
             "comment": {}
           }
         }
@@ -431,15 +431,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_kappa;1",
+        "@id": "dtmi:example:wum_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_iota",
+          "name": "wum_kappa",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "psi_theta",
-            "schema": "integer",
+            "name": "wum_iota",
+            "schema": "duration",
             "comment": {}
           }
         }
@@ -454,14 +454,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_nu;1",
+        "@id": "dtmi:example:wum_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_mu",
+          "name": "wum_nu",
           "request": {
-            "name": "psi_lambda",
-            "schema": "long",
+            "name": "wum_mu",
+            "schema": "float",
             "comment": [
               {}
             ]
@@ -478,15 +478,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_pi;1",
+        "@id": "dtmi:example:wum_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_omicron",
+          "name": "wum_pi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "psi_xi",
-            "schema": "string",
+            "name": "wum_omicron",
+            "schema": "integer",
             "comment": [
               {}
             ]
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyCommentTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyCommentTermAndDtmiV2.json
index aa785336..e59f87cb 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyCommentTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyCommentTermAndDtmiV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_vroo;1",
+        "@id": "dtmi:example:wum_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_yekk",
+          "name": "wum_vroo",
           "request": {
-            "comment": "psi_jogg",
-            "dtmi:dtdl:property:comment;2": "psi_flunn",
-            "name": "psi_itch",
-            "schema": "float"
+            "comment": "wum_flunn",
+            "dtmi:dtdl:property:comment;2": "wum_itch",
+            "name": "wum_yekk",
+            "schema": "double"
           }
         }
       }
@@ -30,17 +30,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_delta;1",
+        "@id": "dtmi:example:um_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_gamma",
+          "name": "um_delta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "comment": "psi_hi",
-            "dtmi:dtdl:property:comment;2": "omega_alpha",
-            "name": "omega_beta",
-            "schema": "integer"
+            "comment": "um_alpha",
+            "dtmi:dtdl:property:comment;2": "um_beta",
+            "name": "um_gamma",
+            "schema": "duration"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyDescriptionLangStringV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyDescriptionLangStringV2.json
index 15ba531e..2919a5b8 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyDescriptionLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyDescriptionLangStringV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_eta;1",
+        "@id": "dtmi:example:um_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_zeta",
+          "name": "um_eta",
           "request": {
-            "name": "omega_epsilon",
-            "schema": "long",
+            "name": "um_zeta",
+            "schema": "float",
             "description": "hello"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_kappa;1",
+        "@id": "dtmi:example:um_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_iota",
+          "name": "um_kappa",
           "request": {
-            "name": "omega_theta",
-            "schema": "string",
+            "name": "um_iota",
+            "schema": "integer",
             "description": [
               "hello"
             ]
@@ -53,14 +53,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_nu;1",
+        "@id": "dtmi:example:um_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_mu",
+          "name": "um_nu",
           "request": {
-            "name": "omega_lambda",
-            "schema": "time",
+            "name": "um_mu",
+            "schema": "long",
             "description": {
               "en": "hello"
             }
@@ -77,14 +77,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_pi;1",
+        "@id": "dtmi:example:um_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_omicron",
+          "name": "um_pi",
           "request": {
-            "name": "omega_xi",
-            "schema": "boolean",
+            "name": "um_omicron",
+            "schema": "string",
             "description": [
               {
                 "@value": "hello",
@@ -104,14 +104,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_tau;1",
+        "@id": "dtmi:example:um_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_sigma",
+          "name": "um_tau",
           "request": {
-            "name": "omega_rho",
-            "schema": "date",
+            "name": "um_sigma",
+            "schema": "time",
             "description": {}
           }
         }
@@ -126,14 +126,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_chi;1",
+        "@id": "dtmi:example:um_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_phi",
+          "name": "um_chi",
           "request": {
-            "name": "omega_upsilon",
-            "schema": "dateTime",
+            "name": "um_phi",
+            "schema": "boolean",
             "description": []
           }
         }
@@ -148,14 +148,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_yuzz;1",
+        "@id": "dtmi:example:um_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_omega",
+          "name": "um_yuzz",
           "request": {
-            "name": "omega_psi",
-            "schema": "double",
+            "name": "um_omega",
+            "schema": "date",
             "description": null
           }
         }
@@ -170,15 +170,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_humpf;1",
+        "@id": "dtmi:example:um_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_um",
+          "name": "um_humpf",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omega_wum",
-            "schema": "duration",
+            "name": "um_um",
+            "schema": "dateTime",
             "description": null
           }
         }
@@ -193,14 +193,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_nuh;1",
+        "@id": "dtmi:example:um_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_glikk",
+          "name": "um_nuh",
           "request": {
-            "name": "omega_fuddle",
-            "schema": "float",
+            "name": "um_glikk",
+            "schema": "double",
             "description": true
           }
         }
@@ -215,15 +215,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_thnad;1",
+        "@id": "dtmi:example:um_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_quan",
+          "name": "um_thnad",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omega_snee",
-            "schema": "integer",
+            "name": "um_quan",
+            "schema": "duration",
             "description": true
           }
         }
@@ -238,14 +238,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_zatz;1",
+        "@id": "dtmi:example:um_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_floob",
+          "name": "um_zatz",
           "request": {
-            "name": "omega_spazz",
-            "schema": "long",
+            "name": "um_floob",
+            "schema": "float",
             "description": 626
           }
         }
@@ -260,15 +260,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_itch;1",
+        "@id": "dtmi:example:um_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_flunn",
+          "name": "um_itch",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omega_jogg",
-            "schema": "string",
+            "name": "um_flunn",
+            "schema": "integer",
             "description": 626
           }
         }
@@ -283,14 +283,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_hi;1",
+        "@id": "dtmi:example:humpf_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_vroo",
+          "name": "um_hi",
           "request": {
-            "name": "omega_yekk",
-            "schema": "time",
+            "name": "um_vroo",
+            "schema": "long",
             "description": [
               null
             ]
@@ -307,15 +307,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_gamma;1",
+        "@id": "dtmi:example:humpf_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_beta",
+          "name": "humpf_gamma",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yuzz_alpha",
-            "schema": "boolean",
+            "name": "humpf_beta",
+            "schema": "string",
             "description": [
               null
             ]
@@ -332,14 +332,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_zeta;1",
+        "@id": "dtmi:example:humpf_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_epsilon",
+          "name": "humpf_zeta",
           "request": {
-            "name": "yuzz_delta",
-            "schema": "date",
+            "name": "humpf_epsilon",
+            "schema": "time",
             "description": [
               true
             ]
@@ -356,15 +356,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_iota;1",
+        "@id": "dtmi:example:humpf_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_theta",
+          "name": "humpf_iota",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yuzz_eta",
-            "schema": "dateTime",
+            "name": "humpf_theta",
+            "schema": "boolean",
             "description": [
               true
             ]
@@ -381,14 +381,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_mu;1",
+        "@id": "dtmi:example:humpf_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_lambda",
+          "name": "humpf_mu",
           "request": {
-            "name": "yuzz_kappa",
-            "schema": "double",
+            "name": "humpf_lambda",
+            "schema": "date",
             "description": [
               626
             ]
@@ -405,15 +405,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_omicron;1",
+        "@id": "dtmi:example:humpf_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_xi",
+          "name": "humpf_omicron",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yuzz_nu",
-            "schema": "duration",
+            "name": "humpf_xi",
+            "schema": "dateTime",
             "description": [
               626
             ]
@@ -430,14 +430,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_sigma;1",
+        "@id": "dtmi:example:humpf_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_rho",
+          "name": "humpf_sigma",
           "request": {
-            "name": "yuzz_pi",
-            "schema": "float",
+            "name": "humpf_rho",
+            "schema": "double",
             "description": [
               {}
             ]
@@ -454,15 +454,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_phi;1",
+        "@id": "dtmi:example:humpf_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_upsilon",
+          "name": "humpf_phi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yuzz_tau",
-            "schema": "integer",
+            "name": "humpf_upsilon",
+            "schema": "duration",
             "description": [
               {}
             ]
@@ -479,14 +479,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_omega;1",
+        "@id": "dtmi:example:humpf_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_psi",
+          "name": "humpf_omega",
           "request": {
-            "name": "yuzz_chi",
-            "schema": "long",
+            "name": "humpf_psi",
+            "schema": "float",
             "description": {
               "@value": "hello",
               "@language": "en"
@@ -504,15 +504,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_um;1",
+        "@id": "dtmi:example:humpf_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_wum",
+          "name": "humpf_um",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yuzz_yuzz",
-            "schema": "string",
+            "name": "humpf_wum",
+            "schema": "integer",
             "description": {
               "@value": "hello",
               "@language": "en"
@@ -530,14 +530,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_glikk;1",
+        "@id": "dtmi:example:humpf_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_fuddle",
+          "name": "humpf_glikk",
           "request": {
-            "name": "yuzz_humpf",
-            "schema": "time",
+            "name": "humpf_fuddle",
+            "schema": "long",
             "description": [
               {
                 "en": "hello"
@@ -556,15 +556,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_quan;1",
+        "@id": "dtmi:example:humpf_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_snee",
+          "name": "humpf_quan",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yuzz_nuh",
-            "schema": "boolean",
+            "name": "humpf_snee",
+            "schema": "string",
             "description": [
               {
                 "en": "hello"
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyDescriptionStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyDescriptionStringLengthV2.json
index 2dfa6d5f..eb2a6dd4 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyDescriptionStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyDescriptionStringLengthV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_floob;1",
+        "@id": "dtmi:example:humpf_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_spazz",
+          "name": "humpf_floob",
           "request": {
-            "name": "yuzz_thnad",
-            "schema": "date",
+            "name": "humpf_spazz",
+            "schema": "time",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_flunn;1",
+        "@id": "dtmi:example:humpf_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_jogg",
+          "name": "humpf_flunn",
           "request": {
-            "name": "yuzz_zatz",
-            "schema": "dateTime",
+            "name": "humpf_jogg",
+            "schema": "boolean",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
@@ -51,15 +51,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_vroo;1",
+        "@id": "dtmi:example:humpf_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_yekk",
+          "name": "humpf_vroo",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yuzz_itch",
-            "schema": "double",
+            "name": "humpf_yekk",
+            "schema": "date",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyDescriptionTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyDescriptionTermAndDtmiV2.json
index ccaba618..c8a14d73 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyDescriptionTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyDescriptionTermAndDtmiV2.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_pi;1",
+        "@id": "dtmi:example:fuddle_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_omicron",
+          "name": "fuddle_pi",
           "request": {
             "description": [
-              "wum_mu"
+              "fuddle_nu"
             ],
             "dtmi:dtdl:property:description;2": [
-              "wum_nu"
+              "fuddle_xi"
             ],
-            "name": "wum_xi",
-            "schema": "long"
+            "name": "fuddle_omicron",
+            "schema": "float"
           }
         }
       }
@@ -34,21 +34,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_phi;1",
+        "@id": "dtmi:example:fuddle_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_upsilon",
+          "name": "fuddle_phi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "description": [
-              "wum_rho"
+              "fuddle_sigma"
             ],
             "dtmi:dtdl:property:description;2": [
-              "wum_sigma"
+              "fuddle_tau"
             ],
-            "name": "wum_tau",
-            "schema": "string"
+            "name": "fuddle_upsilon",
+            "schema": "integer"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyDisplayNameLangStringV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyDisplayNameLangStringV2.json
index 60133274..d3c676e9 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyDisplayNameLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyDisplayNameLangStringV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_omega;1",
+        "@id": "dtmi:example:fuddle_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_psi",
+          "name": "fuddle_omega",
           "request": {
-            "name": "wum_chi",
-            "schema": "time",
+            "name": "fuddle_psi",
+            "schema": "long",
             "displayName": "hello"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_um;1",
+        "@id": "dtmi:example:fuddle_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_wum",
+          "name": "fuddle_um",
           "request": {
-            "name": "wum_yuzz",
-            "schema": "boolean",
+            "name": "fuddle_wum",
+            "schema": "string",
             "displayName": [
               "hello"
             ]
@@ -53,14 +53,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_glikk;1",
+        "@id": "dtmi:example:fuddle_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_fuddle",
+          "name": "fuddle_glikk",
           "request": {
-            "name": "wum_humpf",
-            "schema": "date",
+            "name": "fuddle_fuddle",
+            "schema": "time",
             "displayName": {
               "en": "hello"
             }
@@ -77,14 +77,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_quan;1",
+        "@id": "dtmi:example:fuddle_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_snee",
+          "name": "fuddle_quan",
           "request": {
-            "name": "wum_nuh",
-            "schema": "dateTime",
+            "name": "fuddle_snee",
+            "schema": "boolean",
             "displayName": [
               {
                 "@value": "hello",
@@ -104,14 +104,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_floob;1",
+        "@id": "dtmi:example:fuddle_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_spazz",
+          "name": "fuddle_floob",
           "request": {
-            "name": "wum_thnad",
-            "schema": "double",
+            "name": "fuddle_spazz",
+            "schema": "date",
             "displayName": {}
           }
         }
@@ -126,14 +126,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_flunn;1",
+        "@id": "dtmi:example:fuddle_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_jogg",
+          "name": "fuddle_flunn",
           "request": {
-            "name": "wum_zatz",
-            "schema": "duration",
+            "name": "fuddle_jogg",
+            "schema": "dateTime",
             "displayName": []
           }
         }
@@ -148,14 +148,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_vroo;1",
+        "@id": "dtmi:example:fuddle_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_yekk",
+          "name": "fuddle_vroo",
           "request": {
-            "name": "wum_itch",
-            "schema": "float",
+            "name": "fuddle_yekk",
+            "schema": "double",
             "displayName": null
           }
         }
@@ -170,15 +170,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_beta;1",
+        "@id": "dtmi:example:glikk_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_alpha",
+          "name": "glikk_beta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "wum_hi",
-            "schema": "integer",
+            "name": "glikk_alpha",
+            "schema": "duration",
             "displayName": null
           }
         }
@@ -193,14 +193,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_epsilon;1",
+        "@id": "dtmi:example:glikk_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_delta",
+          "name": "glikk_epsilon",
           "request": {
-            "name": "um_gamma",
-            "schema": "long",
+            "name": "glikk_delta",
+            "schema": "float",
             "displayName": true
           }
         }
@@ -215,15 +215,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_theta;1",
+        "@id": "dtmi:example:glikk_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_eta",
+          "name": "glikk_theta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "um_zeta",
-            "schema": "string",
+            "name": "glikk_eta",
+            "schema": "integer",
             "displayName": true
           }
         }
@@ -238,14 +238,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_lambda;1",
+        "@id": "dtmi:example:glikk_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_kappa",
+          "name": "glikk_lambda",
           "request": {
-            "name": "um_iota",
-            "schema": "time",
+            "name": "glikk_kappa",
+            "schema": "long",
             "displayName": 626
           }
         }
@@ -260,15 +260,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_xi;1",
+        "@id": "dtmi:example:glikk_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_nu",
+          "name": "glikk_xi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "um_mu",
-            "schema": "boolean",
+            "name": "glikk_nu",
+            "schema": "string",
             "displayName": 626
           }
         }
@@ -283,14 +283,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_rho;1",
+        "@id": "dtmi:example:glikk_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_pi",
+          "name": "glikk_rho",
           "request": {
-            "name": "um_omicron",
-            "schema": "date",
+            "name": "glikk_pi",
+            "schema": "time",
             "displayName": [
               null
             ]
@@ -307,15 +307,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_upsilon;1",
+        "@id": "dtmi:example:glikk_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_tau",
+          "name": "glikk_upsilon",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "um_sigma",
-            "schema": "dateTime",
+            "name": "glikk_tau",
+            "schema": "boolean",
             "displayName": [
               null
             ]
@@ -332,14 +332,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_psi;1",
+        "@id": "dtmi:example:glikk_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_chi",
+          "name": "glikk_psi",
           "request": {
-            "name": "um_phi",
-            "schema": "double",
+            "name": "glikk_chi",
+            "schema": "date",
             "displayName": [
               true
             ]
@@ -356,15 +356,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_wum;1",
+        "@id": "dtmi:example:glikk_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_yuzz",
+          "name": "glikk_wum",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "um_omega",
-            "schema": "duration",
+            "name": "glikk_yuzz",
+            "schema": "dateTime",
             "displayName": [
               true
             ]
@@ -381,14 +381,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_fuddle;1",
+        "@id": "dtmi:example:glikk_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_humpf",
+          "name": "glikk_fuddle",
           "request": {
-            "name": "um_um",
-            "schema": "float",
+            "name": "glikk_humpf",
+            "schema": "double",
             "displayName": [
               626
             ]
@@ -405,15 +405,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_snee;1",
+        "@id": "dtmi:example:glikk_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_nuh",
+          "name": "glikk_snee",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "um_glikk",
-            "schema": "integer",
+            "name": "glikk_nuh",
+            "schema": "duration",
             "displayName": [
               626
             ]
@@ -430,14 +430,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_spazz;1",
+        "@id": "dtmi:example:glikk_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_thnad",
+          "name": "glikk_spazz",
           "request": {
-            "name": "um_quan",
-            "schema": "long",
+            "name": "glikk_thnad",
+            "schema": "float",
             "displayName": [
               {}
             ]
@@ -454,15 +454,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_jogg;1",
+        "@id": "dtmi:example:glikk_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_zatz",
+          "name": "glikk_jogg",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "um_floob",
-            "schema": "string",
+            "name": "glikk_zatz",
+            "schema": "integer",
             "displayName": [
               {}
             ]
@@ -479,14 +479,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_yekk;1",
+        "@id": "dtmi:example:glikk_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_itch",
+          "name": "glikk_yekk",
           "request": {
-            "name": "um_flunn",
-            "schema": "time",
+            "name": "glikk_itch",
+            "schema": "long",
             "displayName": {
               "@value": "hello",
               "@language": "en"
@@ -504,15 +504,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_alpha;1",
+        "@id": "dtmi:example:nuh_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_hi",
+          "name": "nuh_alpha",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "um_vroo",
-            "schema": "boolean",
+            "name": "glikk_hi",
+            "schema": "string",
             "displayName": {
               "@value": "hello",
               "@language": "en"
@@ -530,14 +530,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_delta;1",
+        "@id": "dtmi:example:nuh_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_gamma",
+          "name": "nuh_delta",
           "request": {
-            "name": "humpf_beta",
-            "schema": "date",
+            "name": "nuh_gamma",
+            "schema": "time",
             "displayName": [
               {
                 "en": "hello"
@@ -556,15 +556,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_eta;1",
+        "@id": "dtmi:example:nuh_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_zeta",
+          "name": "nuh_eta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "humpf_epsilon",
-            "schema": "dateTime",
+            "name": "nuh_zeta",
+            "schema": "boolean",
             "displayName": [
               {
                 "en": "hello"
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyDisplayNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyDisplayNameStringLengthV2.json
index a5bd1689..76f02e62 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyDisplayNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyDisplayNameStringLengthV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_kappa;1",
+        "@id": "dtmi:example:nuh_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_iota",
+          "name": "nuh_kappa",
           "request": {
-            "name": "humpf_theta",
-            "schema": "double",
+            "name": "nuh_iota",
+            "schema": "date",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSometh"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_nu;1",
+        "@id": "dtmi:example:nuh_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_mu",
+          "name": "nuh_nu",
           "request": {
-            "name": "humpf_lambda",
-            "schema": "duration",
+            "name": "nuh_mu",
+            "schema": "dateTime",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
           }
         }
@@ -51,15 +51,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_pi;1",
+        "@id": "dtmi:example:nuh_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_omicron",
+          "name": "nuh_pi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "humpf_xi",
-            "schema": "float",
+            "name": "nuh_omicron",
+            "schema": "double",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyDisplayNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyDisplayNameTermAndDtmiV2.json
index 35d1e106..80941530 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyDisplayNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyDisplayNameTermAndDtmiV2.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_quan;1",
+        "@id": "dtmi:example:nuh_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_snee",
+          "name": "nuh_quan",
           "request": {
             "displayName": [
-              "humpf_fuddle"
+              "nuh_glikk"
             ],
             "dtmi:dtdl:property:displayName;2": [
-              "humpf_glikk"
+              "nuh_nuh"
             ],
-            "name": "humpf_nuh",
-            "schema": "time"
+            "name": "nuh_snee",
+            "schema": "long"
           }
         }
       }
@@ -34,21 +34,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_jogg;1",
+        "@id": "dtmi:example:nuh_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_zatz",
+          "name": "nuh_jogg",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "displayName": [
-              "humpf_thnad"
+              "nuh_spazz"
             ],
             "dtmi:dtdl:property:displayName;2": [
-              "humpf_spazz"
+              "nuh_floob"
             ],
-            "name": "humpf_floob",
-            "schema": "boolean"
+            "name": "nuh_zatz",
+            "schema": "string"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyFormallyInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyFormallyInvalidDtmiV2.json
index c1cb82cd..7b7c4ad0 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyFormallyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyFormallyInvalidDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_thnad;1",
+        "@id": "dtmi:example:snee_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_quan",
+          "name": "snee_thnad",
           "request": {
-            "name": "fuddle_snee",
-            "schema": "double",
+            "name": "snee_quan",
+            "schema": "date",
             "dtmi:foo//bar": 626
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_zatz;1",
+        "@id": "dtmi:example:snee_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_floob",
+          "name": "snee_zatz",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "fuddle_spazz",
-            "schema": "duration",
+            "name": "snee_floob",
+            "schema": "dateTime",
             "dtmi:foo//bar": 626
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyFormallyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyFormallyIrrelevantDtmiOrTermV2.json
index 409f9678..e8688f3b 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyFormallyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyFormallyIrrelevantDtmiOrTermV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_tau;1",
+        "@id": "dtmi:example:snee_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_sigma",
+          "name": "snee_tau",
           "request": {
-            "name": "fuddle_rho",
-            "schema": "string",
+            "name": "snee_sigma",
+            "schema": "integer",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_chi;1",
+        "@id": "dtmi:example:snee_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_phi",
+          "name": "snee_chi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "fuddle_upsilon",
-            "schema": "time",
+            "name": "snee_phi",
+            "schema": "long",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -52,14 +52,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_yuzz;1",
+        "@id": "dtmi:example:snee_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_omega",
+          "name": "snee_yuzz",
           "request": {
-            "name": "fuddle_psi",
-            "schema": "boolean",
+            "name": "snee_omega",
+            "schema": "string",
             "boolean": null
           }
         }
@@ -74,15 +74,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_humpf;1",
+        "@id": "dtmi:example:snee_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_um",
+          "name": "snee_humpf",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "fuddle_wum",
-            "schema": "date",
+            "name": "snee_um",
+            "schema": "time",
             "boolean": null
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyFormallyNotDtmiNorTermV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyFormallyNotDtmiNorTermV2.json
index 2a99de9a..d3eb9bba 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyFormallyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyFormallyNotDtmiNorTermV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_hi;1",
+        "@id": "dtmi:example:quan_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_vroo",
+          "name": "snee_hi",
           "request": {
-            "name": "fuddle_yekk",
-            "schema": "integer",
+            "name": "snee_vroo",
+            "schema": "duration",
             "http://foo.com/bar": true
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_gamma;1",
+        "@id": "dtmi:example:quan_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_beta",
+          "name": "quan_gamma",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "glikk_alpha",
-            "schema": "long",
+            "name": "quan_beta",
+            "schema": "float",
             "http://foo.com/bar": true
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyFormallyUndefinedTermV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyFormallyUndefinedTermV2.json
index db13027f..8f76a9c9 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyFormallyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyFormallyUndefinedTermV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_iota;1",
+        "@id": "dtmi:example:quan_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_theta",
+          "name": "quan_iota",
           "request": {
-            "name": "glikk_eta",
-            "schema": "time",
+            "name": "quan_theta",
+            "schema": "long",
             "foobar": {}
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_mu;1",
+        "@id": "dtmi:example:quan_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_lambda",
+          "name": "quan_mu",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "glikk_kappa",
-            "schema": "boolean",
+            "name": "quan_lambda",
+            "schema": "string",
             "foobar": {}
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyNamePatternV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyNamePatternV2.json
index 77844304..a541cca6 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyNamePatternV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyNamePatternV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_um;1",
+        "@id": "dtmi:example:eta_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_wum",
+          "name": "eta_iota",
           "request": {
-            "schema": "double",
+            "schema": "time",
             "name": "EARTH"
           }
         }
@@ -28,13 +28,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_fuddle;1",
+        "@id": "dtmi:example:eta_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_humpf",
+          "name": "eta_lambda",
           "request": {
-            "schema": "duration",
+            "schema": "boolean",
             "name": "Air"
           }
         }
@@ -49,13 +49,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_nuh;1",
+        "@id": "dtmi:example:eta_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_glikk",
+          "name": "eta_nu",
           "request": {
-            "schema": "float",
+            "schema": "date",
             "name": "fire"
           }
         }
@@ -70,13 +70,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_quan;1",
+        "@id": "dtmi:example:eta_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_snee",
+          "name": "eta_omicron",
           "request": {
-            "schema": "integer",
+            "schema": "dateTime",
             "name": "hello_world"
           }
         }
@@ -91,13 +91,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_spazz;1",
+        "@id": "dtmi:example:eta_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_thnad",
+          "name": "eta_rho",
           "request": {
-            "schema": "long",
+            "schema": "double",
             "name": "Anarchy99"
           }
         }
@@ -112,13 +112,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_zatz;1",
+        "@id": "dtmi:example:eta_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_floob",
+          "name": "eta_tau",
           "request": {
-            "schema": "string",
+            "schema": "duration",
             "name": "23skidoo"
           }
         }
@@ -133,14 +133,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_flunn;1",
+        "@id": "dtmi:example:eta_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_jogg",
+          "name": "eta_phi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "time",
+            "schema": "float",
             "name": "23skidoo"
           }
         }
@@ -155,13 +155,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_yekk;1",
+        "@id": "dtmi:example:eta_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_itch",
+          "name": "eta_psi",
           "request": {
-            "schema": "boolean",
+            "schema": "integer",
             "name": "626"
           }
         }
@@ -176,14 +176,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_hi;1",
+        "@id": "dtmi:example:eta_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_vroo",
+          "name": "eta_yuzz",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "date",
+            "schema": "long",
             "name": "626"
           }
         }
@@ -198,13 +198,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_beta;1",
+        "@id": "dtmi:example:eta_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_alpha",
+          "name": "eta_um",
           "request": {
-            "schema": "dateTime",
+            "schema": "string",
             "name": "goodbye-world"
           }
         }
@@ -219,14 +219,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_delta;1",
+        "@id": "dtmi:example:eta_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_gamma",
+          "name": "eta_fuddle",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "double",
+            "schema": "time",
             "name": "goodbye-world"
           }
         }
@@ -241,13 +241,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_zeta;1",
+        "@id": "dtmi:example:eta_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_epsilon",
+          "name": "eta_nuh",
           "request": {
-            "schema": "duration",
+            "schema": "boolean",
             "name": "_haha"
           }
         }
@@ -262,14 +262,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_theta;1",
+        "@id": "dtmi:example:eta_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_eta",
+          "name": "eta_quan",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "float",
+            "schema": "date",
             "name": "_haha"
           }
         }
@@ -284,13 +284,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_kappa;1",
+        "@id": "dtmi:example:eta_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_iota",
+          "name": "eta_spazz",
           "request": {
-            "schema": "integer",
+            "schema": "dateTime",
             "name": "toodaloo_"
           }
         }
@@ -305,14 +305,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_mu;1",
+        "@id": "dtmi:example:eta_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_lambda",
+          "name": "eta_zatz",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "long",
+            "schema": "double",
             "name": "toodaloo_"
           }
         }
@@ -327,13 +327,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_xi;1",
+        "@id": "dtmi:example:eta_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_nu",
+          "name": "eta_flunn",
           "request": {
-            "schema": "string",
+            "schema": "duration",
             "name": "pro:con"
           }
         }
@@ -348,14 +348,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_pi;1",
+        "@id": "dtmi:example:eta_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_omicron",
+          "name": "eta_yekk",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "time",
+            "schema": "float",
             "name": "pro:con"
           }
         }
@@ -370,13 +370,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_sigma;1",
+        "@id": "dtmi:example:theta_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_rho",
+          "name": "eta_hi",
           "request": {
-            "schema": "boolean",
+            "schema": "integer",
             "name": "mish/mash"
           }
         }
@@ -391,14 +391,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_upsilon;1",
+        "@id": "dtmi:example:theta_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_tau",
+          "name": "theta_beta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "date",
+            "schema": "long",
             "name": "mish/mash"
           }
         }
@@ -413,13 +413,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_chi;1",
+        "@id": "dtmi:example:theta_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_phi",
+          "name": "theta_delta",
           "request": {
-            "schema": "dateTime",
+            "schema": "string",
             "name": "#tag"
           }
         }
@@ -434,14 +434,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_omega;1",
+        "@id": "dtmi:example:theta_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_psi",
+          "name": "theta_zeta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "double",
+            "schema": "time",
             "name": "#tag"
           }
         }
@@ -456,13 +456,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_wum;1",
+        "@id": "dtmi:example:theta_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_yuzz",
+          "name": "theta_theta",
           "request": {
-            "schema": "duration",
+            "schema": "boolean",
             "name": "@tweet"
           }
         }
@@ -477,14 +477,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_humpf;1",
+        "@id": "dtmi:example:theta_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_um",
+          "name": "theta_kappa",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "float",
+            "schema": "date",
             "name": "@tweet"
           }
         }
@@ -499,13 +499,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_glikk;1",
+        "@id": "dtmi:example:theta_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_fuddle",
+          "name": "theta_mu",
           "request": {
-            "schema": "integer",
+            "schema": "dateTime",
             "name": "$money"
           }
         }
@@ -520,14 +520,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_snee;1",
+        "@id": "dtmi:example:theta_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_nuh",
+          "name": "theta_xi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "long",
+            "schema": "double",
             "name": "$money"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyNameStringLengthV2.json
index e1282c5c..b85cbd7d 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyNameStringLengthV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_phi;1",
+        "@id": "dtmi:example:eta_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_upsilon",
+          "name": "eta_gamma",
           "request": {
-            "schema": "boolean",
+            "schema": "integer",
             "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSometh"
           }
         }
@@ -28,13 +28,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_psi;1",
+        "@id": "dtmi:example:eta_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_chi",
+          "name": "eta_epsilon",
           "request": {
-            "schema": "date",
+            "schema": "long",
             "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
           }
         }
@@ -49,14 +49,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_yuzz;1",
+        "@id": "dtmi:example:eta_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_omega",
+          "name": "eta_eta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "dateTime",
+            "schema": "string",
             "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyNameStringV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyNameStringV2.json
index afcd654a..f7a06197 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyNameStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyNameStringV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_upsilon;1",
+        "@id": "dtmi:example:zeta_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_tau",
+          "name": "zeta_beta",
           "request": {
-            "schema": "string",
+            "schema": "duration",
             "name": "hello"
           }
         }
@@ -28,13 +28,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_chi;1",
+        "@id": "dtmi:example:zeta_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_phi",
+          "name": "zeta_delta",
           "request": {
-            "schema": "time",
+            "schema": "float",
             "name": [
               "hello"
             ]
@@ -51,13 +51,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_omega;1",
+        "@id": "dtmi:example:zeta_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_psi",
+          "name": "zeta_zeta",
           "request": {
-            "schema": "boolean",
+            "schema": "integer",
             "name": {
               "@value": "hello",
               "@type": "xsd:string"
@@ -75,13 +75,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_wum;1",
+        "@id": "dtmi:example:zeta_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_yuzz",
+          "name": "zeta_theta",
           "request": {
-            "schema": "date",
+            "schema": "long",
             "name": [
               {
                 "@value": "hello",
@@ -101,13 +101,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_humpf;1",
+        "@id": "dtmi:example:zeta_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_um",
+          "name": "zeta_kappa",
           "request": {
-            "schema": "dateTime",
+            "schema": "string",
             "name": null
           }
         }
@@ -122,14 +122,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_glikk;1",
+        "@id": "dtmi:example:zeta_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_fuddle",
+          "name": "zeta_mu",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "double",
+            "schema": "time",
             "name": null
           }
         }
@@ -144,13 +144,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_snee;1",
+        "@id": "dtmi:example:zeta_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_nuh",
+          "name": "zeta_xi",
           "request": {
-            "schema": "duration",
+            "schema": "boolean",
             "name": true
           }
         }
@@ -165,14 +165,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_thnad;1",
+        "@id": "dtmi:example:zeta_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_quan",
+          "name": "zeta_pi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "float",
+            "schema": "date",
             "name": true
           }
         }
@@ -187,13 +187,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_floob;1",
+        "@id": "dtmi:example:zeta_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_spazz",
+          "name": "zeta_sigma",
           "request": {
-            "schema": "integer",
+            "schema": "dateTime",
             "name": 626
           }
         }
@@ -208,14 +208,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_jogg;1",
+        "@id": "dtmi:example:zeta_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_zatz",
+          "name": "zeta_upsilon",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "long",
+            "schema": "double",
             "name": 626
           }
         }
@@ -230,13 +230,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_itch;1",
+        "@id": "dtmi:example:zeta_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_flunn",
+          "name": "zeta_chi",
           "request": {
-            "schema": "string",
+            "schema": "duration",
             "name": [
               null
             ]
@@ -253,14 +253,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_vroo;1",
+        "@id": "dtmi:example:zeta_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_yekk",
+          "name": "zeta_omega",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "time",
+            "schema": "float",
             "name": [
               null
             ]
@@ -277,13 +277,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_alpha;1",
+        "@id": "dtmi:example:zeta_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_hi",
+          "name": "zeta_wum",
           "request": {
-            "schema": "boolean",
+            "schema": "integer",
             "name": [
               true
             ]
@@ -300,14 +300,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_gamma;1",
+        "@id": "dtmi:example:zeta_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_beta",
+          "name": "zeta_humpf",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "date",
+            "schema": "long",
             "name": [
               true
             ]
@@ -324,13 +324,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_epsilon;1",
+        "@id": "dtmi:example:zeta_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_delta",
+          "name": "zeta_glikk",
           "request": {
-            "schema": "dateTime",
+            "schema": "string",
             "name": [
               626
             ]
@@ -347,14 +347,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_eta;1",
+        "@id": "dtmi:example:zeta_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_zeta",
+          "name": "zeta_snee",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "double",
+            "schema": "time",
             "name": [
               626
             ]
@@ -371,13 +371,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_iota;1",
+        "@id": "dtmi:example:zeta_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_theta",
+          "name": "zeta_thnad",
           "request": {
-            "schema": "duration",
+            "schema": "boolean",
             "name": {}
           }
         }
@@ -392,14 +392,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_lambda;1",
+        "@id": "dtmi:example:zeta_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_kappa",
+          "name": "zeta_floob",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "float",
+            "schema": "date",
             "name": {}
           }
         }
@@ -414,13 +414,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_nu;1",
+        "@id": "dtmi:example:zeta_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_mu",
+          "name": "zeta_jogg",
           "request": {
-            "schema": "integer",
+            "schema": "dateTime",
             "name": [
               {}
             ]
@@ -437,14 +437,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_omicron;1",
+        "@id": "dtmi:example:zeta_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_xi",
+          "name": "zeta_itch",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "long",
+            "schema": "double",
             "name": [
               {}
             ]
@@ -461,13 +461,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_rho;1",
+        "@id": "dtmi:example:zeta_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_pi",
+          "name": "zeta_vroo",
           "request": {
-            "schema": "string",
+            "schema": "duration",
             "name": []
           }
         }
@@ -482,14 +482,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_tau;1",
+        "@id": "dtmi:example:eta_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_sigma",
+          "name": "eta_alpha",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "time",
+            "schema": "float",
             "name": []
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyNameTermAndDtmiV2.json
index 3b26168a..a58e219a 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertyNameTermAndDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_beta;1",
+        "@id": "dtmi:example:theta_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_alpha",
+          "name": "theta_um",
           "request": {
-            "name": "epsilon_vroo",
-            "dtmi:dtdl:property:name;2": "epsilon_hi",
-            "schema": "date"
+            "name": "theta_yuzz",
+            "dtmi:dtdl:property:name;2": "theta_wum",
+            "schema": "long"
           }
         }
       }
@@ -29,16 +29,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_zeta;1",
+        "@id": "dtmi:example:theta_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_epsilon",
+          "name": "theta_nuh",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_gamma",
-            "dtmi:dtdl:property:name;2": "zeta_delta",
-            "schema": "dateTime"
+            "name": "theta_fuddle",
+            "dtmi:dtdl:property:name;2": "theta_glikk",
+            "schema": "string"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertySchemaElementV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertySchemaElementV2.json
index aa21416d..430afd6b 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertySchemaElementV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertySchemaElementV2.json
@@ -7,22 +7,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_lambda;1",
+        "@id": "dtmi:example:theta_zatz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zeta_kappa;1",
+          "@id": "dtmi:example:theta_floob;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "zeta_iota",
+            "name": "theta_spazz",
             "request": {
-              "name": "zeta_theta",
+              "name": "theta_thnad",
               "schema": {
                 "@type": "Enum",
                 "enumValues": [
                   {
-                    "enumValue": 36,
-                    "name": "zeta_eta"
+                    "enumValue": 43,
+                    "name": "theta_quan"
                   }
                 ],
                 "valueSchema": "integer"
@@ -41,23 +41,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_pi;1",
+        "@id": "dtmi:example:theta_vroo;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zeta_omicron;1",
+          "@id": "dtmi:example:theta_yekk;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "zeta_xi",
+            "name": "theta_itch",
             "request": {
-              "name": "zeta_nu",
+              "name": "theta_flunn",
               "schema": [
                 {
                   "@type": "Enum",
                   "enumValues": [
                     {
-                      "enumValue": 37,
-                      "name": "zeta_mu"
+                      "enumValue": 44,
+                      "name": "theta_jogg"
                     }
                   ],
                   "valueSchema": "integer"
@@ -77,24 +77,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_sigma;1",
+        "@id": "dtmi:example:iota_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 38,
-              "name": "zeta_rho"
+              "enumValue": 45,
+              "name": "theta_hi"
             }
           ],
           "valueSchema": "integer"
         },
         "contents": {
           "@type": "Command",
-          "name": "zeta_upsilon",
+          "name": "iota_gamma",
           "request": {
-            "name": "zeta_tau",
+            "name": "iota_beta",
             "schema": "dtmi:ex:dependentRef;1"
           }
         }
@@ -109,24 +109,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_chi;1",
+        "@id": "dtmi:example:iota_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 39,
-              "name": "zeta_phi"
+              "enumValue": 46,
+              "name": "iota_delta"
             }
           ],
           "valueSchema": "integer"
         },
         "contents": {
           "@type": "Command",
-          "name": "zeta_omega",
+          "name": "iota_eta",
           "request": {
-            "name": "zeta_psi",
+            "name": "iota_zeta",
             "schema": [
               "dtmi:ex:dependentRef;1"
             ]
@@ -143,18 +143,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_fuddle;1",
+        "@id": "dtmi:example:iota_mu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zeta_humpf;1",
+          "@id": "dtmi:example:iota_lambda;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "zeta_um",
+            "name": "iota_kappa",
             "request": {
-              "name": "zeta_wum",
+              "name": "iota_iota",
               "schema": {
-                "@id": "dtmi:example:zeta_yuzz;1",
+                "@id": "dtmi:example:iota_theta;1",
                 "@type": "Enum",
                 "valueSchema": "integer",
                 "@context": "dtmi:dtdl:context;3"
@@ -173,19 +173,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_thnad;1",
+        "@id": "dtmi:example:iota_rho;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zeta_quan;1",
+          "@id": "dtmi:example:iota_pi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "zeta_snee",
+            "name": "iota_omicron",
             "request": {
               "@context": "dtmi:undefinedExtension:context;1",
-              "name": "zeta_nuh",
+              "name": "iota_xi",
               "schema": {
-                "@id": "dtmi:example:zeta_glikk;1",
+                "@id": "dtmi:example:iota_nu;1",
                 "@type": "Enum",
                 "valueSchema": "integer",
                 "@context": "dtmi:dtdl:context;3"
@@ -204,31 +204,92 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_zatz;1",
+        "@id": "dtmi:example:iota_chi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:iota_phi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "iota_upsilon",
+            "request": {
+              "name": "iota_tau",
+              "schema": {
+                "@id": "dtmi:example:iota_sigma;1",
+                "@type": "Enum",
+                "valueSchema": "integer",
+                "@context": "dtmi:dtdl:context;4"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:iota_um;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:iota_wum;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "iota_yuzz",
+            "request": {
+              "@context": "dtmi:undefinedExtension:context;1",
+              "name": "iota_omega",
+              "schema": {
+                "@id": "dtmi:example:iota_psi;1",
+                "@type": "Enum",
+                "valueSchema": "integer",
+                "@context": "dtmi:dtdl:context;4"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:iota_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 41,
-              "name": "zeta_floob"
+              "enumValue": 48,
+              "name": "iota_fuddle"
             }
           ],
           "valueSchema": "integer"
         },
         "contents": {
           "@type": "Command",
-          "name": "zeta_flunn",
+          "name": "iota_snee",
           "request": {
-            "name": "zeta_jogg",
+            "name": "iota_nuh",
             "schema": [
               {
                 "@type": "Enum",
                 "enumValues": [
                   {
-                    "enumValue": 40,
-                    "name": "zeta_spazz"
+                    "enumValue": 47,
+                    "name": "iota_humpf"
                   }
                 ],
                 "valueSchema": "integer"
@@ -248,32 +309,32 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_vroo;1",
+        "@id": "dtmi:example:iota_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 43,
-              "name": "zeta_yekk"
+              "enumValue": 50,
+              "name": "iota_thnad"
             }
           ],
           "valueSchema": "integer"
         },
         "contents": {
           "@type": "Command",
-          "name": "eta_alpha",
+          "name": "iota_zatz",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_hi",
+            "name": "iota_floob",
             "schema": [
               {
                 "@type": "Enum",
                 "enumValues": [
                   {
-                    "enumValue": 42,
-                    "name": "zeta_itch"
+                    "enumValue": 49,
+                    "name": "iota_quan"
                   }
                 ],
                 "valueSchema": "integer"
@@ -293,13 +354,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_delta;1",
+        "@id": "dtmi:example:iota_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_gamma",
+          "name": "iota_flunn",
           "request": {
-            "name": "eta_beta",
+            "name": "iota_jogg",
             "schema": "dateTime"
           }
         }
@@ -314,13 +375,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_eta;1",
+        "@id": "dtmi:example:iota_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_zeta",
+          "name": "iota_vroo",
           "request": {
-            "name": "eta_epsilon",
+            "name": "iota_yekk",
             "schema": [
               "dateTime"
             ]
@@ -337,13 +398,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_kappa;1",
+        "@id": "dtmi:example:kappa_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_iota",
+          "name": "kappa_beta",
           "request": {
-            "name": "eta_theta",
+            "name": "kappa_alpha",
             "schema": "dtmi:dtdl:instance:Schema:dateTime;2"
           }
         }
@@ -358,13 +419,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_nu;1",
+        "@id": "dtmi:example:kappa_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_mu",
+          "name": "kappa_epsilon",
           "request": {
-            "name": "eta_lambda",
+            "name": "kappa_delta",
             "schema": [
               "dtmi:dtdl:instance:Schema:dateTime;2"
             ]
@@ -381,13 +442,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_pi;1",
+        "@id": "dtmi:example:kappa_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_omicron",
+          "name": "kappa_theta",
           "request": {
-            "name": "eta_xi",
+            "name": "kappa_eta",
             "schema": "point"
           }
         }
@@ -402,13 +463,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_tau;1",
+        "@id": "dtmi:example:kappa_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_sigma",
+          "name": "kappa_lambda",
           "request": {
-            "name": "eta_rho",
+            "name": "kappa_kappa",
             "schema": [
               "point"
             ]
@@ -425,13 +486,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_chi;1",
+        "@id": "dtmi:example:kappa_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_phi",
+          "name": "kappa_xi",
           "request": {
-            "name": "eta_upsilon",
+            "name": "kappa_nu",
             "schema": "dtmi:standard:schema:geospatial:point;2"
           }
         }
@@ -446,13 +507,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_yuzz;1",
+        "@id": "dtmi:example:kappa_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_omega",
+          "name": "kappa_rho",
           "request": {
-            "name": "eta_psi",
+            "name": "kappa_pi",
             "schema": [
               "dtmi:standard:schema:geospatial:point;2"
             ]
@@ -469,13 +530,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_humpf;1",
+        "@id": "dtmi:example:kappa_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_um",
+          "name": "kappa_upsilon",
           "request": {
-            "name": "eta_wum",
+            "name": "kappa_tau",
             "schema": "Foobar"
           }
         }
@@ -490,14 +551,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_nuh;1",
+        "@id": "dtmi:example:kappa_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_glikk",
+          "name": "kappa_psi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "eta_fuddle",
+            "name": "kappa_chi",
             "schema": "Foobar"
           }
         }
@@ -512,13 +573,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_thnad;1",
+        "@id": "dtmi:example:kappa_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_quan",
+          "name": "kappa_wum",
           "request": {
-            "name": "eta_snee",
+            "name": "kappa_yuzz",
             "schema": null
           }
         }
@@ -533,14 +594,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_zatz;1",
+        "@id": "dtmi:example:kappa_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_floob",
+          "name": "kappa_fuddle",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "eta_spazz",
+            "name": "kappa_humpf",
             "schema": null
           }
         }
@@ -555,13 +616,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_itch;1",
+        "@id": "dtmi:example:kappa_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_flunn",
+          "name": "kappa_snee",
           "request": {
-            "name": "eta_jogg",
+            "name": "kappa_nuh",
             "schema": true
           }
         }
@@ -576,14 +637,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_hi;1",
+        "@id": "dtmi:example:kappa_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_vroo",
+          "name": "kappa_spazz",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "eta_yekk",
+            "name": "kappa_thnad",
             "schema": true
           }
         }
@@ -598,13 +659,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_gamma;1",
+        "@id": "dtmi:example:kappa_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_beta",
+          "name": "kappa_jogg",
           "request": {
-            "name": "theta_alpha",
+            "name": "kappa_zatz",
             "schema": 626
           }
         }
@@ -619,14 +680,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_zeta;1",
+        "@id": "dtmi:example:kappa_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_epsilon",
+          "name": "kappa_yekk",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "theta_delta",
+            "name": "kappa_itch",
             "schema": 626
           }
         }
@@ -641,13 +702,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_iota;1",
+        "@id": "dtmi:example:lambda_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_theta",
+          "name": "lambda_alpha",
           "request": {
-            "name": "theta_eta",
+            "name": "kappa_hi",
             "schema": [
               null
             ]
@@ -664,14 +725,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_mu;1",
+        "@id": "dtmi:example:lambda_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_lambda",
+          "name": "lambda_delta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "theta_kappa",
+            "name": "lambda_gamma",
             "schema": [
               null
             ]
@@ -688,13 +749,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_omicron;1",
+        "@id": "dtmi:example:lambda_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_xi",
+          "name": "lambda_eta",
           "request": {
-            "name": "theta_nu",
+            "name": "lambda_zeta",
             "schema": [
               true
             ]
@@ -711,14 +772,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_sigma;1",
+        "@id": "dtmi:example:lambda_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_rho",
+          "name": "lambda_kappa",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "theta_pi",
+            "name": "lambda_iota",
             "schema": [
               true
             ]
@@ -735,13 +796,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_phi;1",
+        "@id": "dtmi:example:lambda_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_upsilon",
+          "name": "lambda_nu",
           "request": {
-            "name": "theta_tau",
+            "name": "lambda_mu",
             "schema": [
               626
             ]
@@ -758,14 +819,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_omega;1",
+        "@id": "dtmi:example:lambda_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_psi",
+          "name": "lambda_pi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "theta_chi",
+            "name": "lambda_omicron",
             "schema": [
               626
             ]
@@ -782,13 +843,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_um;1",
+        "@id": "dtmi:example:lambda_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_wum",
+          "name": "lambda_tau",
           "request": {
-            "name": "theta_yuzz",
+            "name": "lambda_sigma",
             "schema": {}
           }
         }
@@ -803,14 +864,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_glikk;1",
+        "@id": "dtmi:example:lambda_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_fuddle",
+          "name": "lambda_chi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "theta_humpf",
+            "name": "lambda_phi",
             "schema": {}
           }
         }
@@ -825,13 +886,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_quan;1",
+        "@id": "dtmi:example:lambda_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_snee",
+          "name": "lambda_yuzz",
           "request": {
-            "name": "theta_nuh",
+            "name": "lambda_omega",
             "schema": [
               {}
             ]
@@ -848,14 +909,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_floob;1",
+        "@id": "dtmi:example:lambda_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_spazz",
+          "name": "lambda_humpf",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "theta_thnad",
+            "name": "lambda_um",
             "schema": [
               {}
             ]
@@ -872,13 +933,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_flunn;1",
+        "@id": "dtmi:example:lambda_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_jogg",
+          "name": "lambda_nuh",
           "request": {
-            "name": "theta_zatz",
+            "name": "lambda_glikk",
             "schema": []
           }
         }
@@ -893,14 +954,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_vroo;1",
+        "@id": "dtmi:example:lambda_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_yekk",
+          "name": "lambda_thnad",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "theta_itch",
+            "name": "lambda_quan",
             "schema": []
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertySchemaTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertySchemaTermAndDtmiV2.json
index da986697..2eeb680c 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertySchemaTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertySchemaTermAndDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_snee;1",
+        "@id": "dtmi:example:omicron_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_nuh",
+          "name": "omicron_omega",
           "request": {
-            "name": "mu_glikk",
-            "schema": "time",
-            "dtmi:dtdl:property:schema;2": "boolean"
+            "name": "omicron_psi",
+            "schema": "float",
+            "dtmi:dtdl:property:schema;2": "integer"
           }
         }
       }
@@ -29,16 +29,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_spazz;1",
+        "@id": "dtmi:example:omicron_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_thnad",
+          "name": "omicron_um",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "mu_quan",
-            "schema": "date",
-            "dtmi:dtdl:property:schema;2": "dateTime"
+            "name": "omicron_wum",
+            "schema": "long",
+            "dtmi:dtdl:property:schema;2": "string"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertySchemaTypeConformanceV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertySchemaTypeConformanceV2.json
index 60661228..947bcc4f 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertySchemaTypeConformanceV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadPropertySchemaTypeConformanceV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_lambda;1",
+        "@id": "dtmi:example:mu_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_kappa",
+          "name": "mu_gamma",
           "request": {
-            "name": "iota_iota",
+            "name": "mu_beta",
             "schema": {
-              "@id": "dtmi:example:iota_theta;1",
-              "elementSchema": "double",
+              "@id": "dtmi:example:mu_alpha;1",
+              "elementSchema": "time",
               "@type": "Array"
             }
           }
@@ -32,16 +32,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_pi;1",
+        "@id": "dtmi:example:mu_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_omicron",
+          "name": "mu_theta",
           "request": {
-            "name": "iota_xi",
+            "name": "mu_eta",
             "schema": {
-              "@id": "dtmi:example:iota_mu;1",
-              "name": "iota_nu",
+              "@id": "dtmi:example:mu_epsilon;1",
+              "name": "mu_zeta",
               "@type": "Command"
             }
           }
@@ -57,17 +57,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_phi;1",
+        "@id": "dtmi:example:mu_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_upsilon",
+          "name": "mu_nu",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "iota_tau",
+            "name": "mu_mu",
             "schema": {
-              "@id": "dtmi:example:iota_rho;1",
-              "name": "iota_sigma",
+              "@id": "dtmi:example:mu_kappa;1",
+              "name": "mu_lambda",
               "@type": "Command"
             }
           }
@@ -83,17 +83,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_wum;1",
+        "@id": "dtmi:example:mu_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_yuzz",
+          "name": "mu_sigma",
           "request": {
-            "name": "iota_omega",
+            "name": "mu_rho",
             "schema": {
-              "@id": "dtmi:example:iota_chi;1",
-              "name": "iota_psi",
-              "schema": "duration",
+              "@id": "dtmi:example:mu_omicron;1",
+              "name": "mu_pi",
+              "schema": "boolean",
               "@type": "CommandPayload"
             }
           }
@@ -109,18 +109,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_nuh;1",
+        "@id": "dtmi:example:mu_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_glikk",
+          "name": "mu_psi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "iota_fuddle",
+            "name": "mu_chi",
             "schema": {
-              "@id": "dtmi:example:iota_um;1",
-              "name": "iota_humpf",
-              "schema": "float",
+              "@id": "dtmi:example:mu_upsilon;1",
+              "name": "mu_phi",
+              "schema": "date",
               "@type": "CommandPayload"
             }
           }
@@ -136,18 +136,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_zatz;1",
+        "@id": "dtmi:example:mu_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_floob",
+          "name": "mu_fuddle",
           "request": {
-            "name": "iota_spazz",
+            "name": "mu_humpf",
             "schema": {
-              "@id": "dtmi:example:iota_snee;1",
-              "name": "iota_quan",
+              "@id": "dtmi:example:mu_yuzz;1",
+              "name": "mu_wum",
               "schema": {
-                "@id": "dtmi:example:iota_thnad;1",
+                "@id": "dtmi:example:mu_um;1",
                 "@type": "Interface"
               },
               "@type": "Component"
@@ -165,19 +165,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_hi;1",
+        "@id": "dtmi:example:mu_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_vroo",
+          "name": "mu_spazz",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "iota_yekk",
+            "name": "mu_thnad",
             "schema": {
-              "@id": "dtmi:example:iota_jogg;1",
-              "name": "iota_flunn",
+              "@id": "dtmi:example:mu_nuh;1",
+              "name": "mu_snee",
               "schema": {
-                "@id": "dtmi:example:iota_itch;1",
+                "@id": "dtmi:example:mu_quan;1",
                 "@type": "Interface"
               },
               "@type": "Component"
@@ -195,19 +195,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_epsilon;1",
+        "@id": "dtmi:example:mu_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_delta",
+          "name": "mu_itch",
           "request": {
-            "name": "kappa_gamma",
+            "name": "mu_flunn",
             "schema": {
-              "@id": "dtmi:example:kappa_alpha;1",
+              "@id": "dtmi:example:mu_zatz;1",
               "enumValues": [
                 {
-                  "enumValue": 44,
-                  "name": "kappa_beta"
+                  "enumValue": 51,
+                  "name": "mu_jogg"
                 }
               ],
               "valueSchema": "integer",
@@ -226,17 +226,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_kappa;1",
+        "@id": "dtmi:example:nu_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_iota",
+          "name": "nu_beta",
           "request": {
-            "name": "kappa_theta",
+            "name": "nu_alpha",
             "schema": {
-              "@id": "dtmi:example:kappa_zeta;1",
-              "enumValue": 45,
-              "name": "kappa_eta",
+              "@id": "dtmi:example:mu_vroo;1",
+              "enumValue": 52,
+              "name": "mu_hi",
               "@type": "EnumValue"
             }
           }
@@ -252,18 +252,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_omicron;1",
+        "@id": "dtmi:example:nu_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_xi",
+          "name": "nu_eta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "kappa_nu",
+            "name": "nu_zeta",
             "schema": {
-              "@id": "dtmi:example:kappa_lambda;1",
-              "enumValue": 46,
-              "name": "kappa_mu",
+              "@id": "dtmi:example:nu_delta;1",
+              "enumValue": 53,
+              "name": "nu_epsilon",
               "@type": "EnumValue"
             }
           }
@@ -279,17 +279,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_upsilon;1",
+        "@id": "dtmi:example:nu_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_tau",
+          "name": "nu_mu",
           "request": {
-            "name": "kappa_sigma",
+            "name": "nu_lambda",
             "schema": {
-              "@id": "dtmi:example:kappa_pi;1",
-              "name": "kappa_rho",
-              "schema": "integer",
+              "@id": "dtmi:example:nu_iota;1",
+              "name": "nu_kappa",
+              "schema": "dateTime",
               "@type": "Field"
             }
           }
@@ -305,18 +305,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_yuzz;1",
+        "@id": "dtmi:example:nu_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_omega",
+          "name": "nu_rho",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "kappa_psi",
+            "name": "nu_pi",
             "schema": {
-              "@id": "dtmi:example:kappa_phi;1",
-              "name": "kappa_chi",
-              "schema": "long",
+              "@id": "dtmi:example:nu_xi;1",
+              "name": "nu_omicron",
+              "schema": "double",
               "@type": "Field"
             }
           }
@@ -332,15 +332,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_fuddle;1",
+        "@id": "dtmi:example:nu_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_humpf",
+          "name": "nu_phi",
           "request": {
-            "name": "kappa_um",
+            "name": "nu_upsilon",
             "schema": {
-              "@id": "dtmi:example:kappa_wum;1",
+              "@id": "dtmi:example:nu_tau;1",
               "@type": "Interface"
             }
           }
@@ -356,16 +356,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_quan;1",
+        "@id": "dtmi:example:nu_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_snee",
+          "name": "nu_yuzz",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "kappa_nuh",
+            "name": "nu_omega",
             "schema": {
-              "@id": "dtmi:example:kappa_glikk;1",
+              "@id": "dtmi:example:nu_psi;1",
               "@type": "Interface"
             }
           }
@@ -381,22 +381,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_flunn;1",
+        "@id": "dtmi:example:nu_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_jogg",
+          "name": "nu_nuh",
           "request": {
-            "name": "kappa_zatz",
+            "name": "nu_glikk",
             "schema": {
-              "@id": "dtmi:example:kappa_thnad;1",
+              "@id": "dtmi:example:nu_um;1",
               "mapKey": {
-                "name": "kappa_spazz",
+                "name": "nu_humpf",
                 "schema": "string"
               },
               "mapValue": {
-                "name": "kappa_floob",
-                "schema": "string"
+                "name": "nu_fuddle",
+                "schema": "duration"
               },
               "@type": "Map"
             }
@@ -413,16 +413,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_alpha;1",
+        "@id": "dtmi:example:nu_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_hi",
+          "name": "nu_floob",
           "request": {
-            "name": "kappa_vroo",
+            "name": "nu_spazz",
             "schema": {
-              "@id": "dtmi:example:kappa_itch;1",
-              "name": "kappa_yekk",
+              "@id": "dtmi:example:nu_quan;1",
+              "name": "nu_thnad",
               "schema": "string",
               "@type": "MapKey"
             }
@@ -439,17 +439,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_zeta;1",
+        "@id": "dtmi:example:nu_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_epsilon",
+          "name": "nu_yekk",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "lambda_delta",
+            "name": "nu_itch",
             "schema": {
-              "@id": "dtmi:example:lambda_beta;1",
-              "name": "lambda_gamma",
+              "@id": "dtmi:example:nu_jogg;1",
+              "name": "nu_flunn",
               "schema": "string",
               "@type": "MapKey"
             }
@@ -466,17 +466,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_lambda;1",
+        "@id": "dtmi:example:xi_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_kappa",
+          "name": "xi_gamma",
           "request": {
-            "name": "lambda_iota",
+            "name": "xi_beta",
             "schema": {
-              "@id": "dtmi:example:lambda_eta;1",
-              "name": "lambda_theta",
-              "schema": "time",
+              "@id": "dtmi:example:nu_hi;1",
+              "name": "xi_alpha",
+              "schema": "float",
               "@type": "MapValue"
             }
           }
@@ -492,18 +492,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_pi;1",
+        "@id": "dtmi:example:xi_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_omicron",
+          "name": "xi_theta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "lambda_xi",
+            "name": "xi_eta",
             "schema": {
-              "@id": "dtmi:example:lambda_mu;1",
-              "name": "lambda_nu",
-              "schema": "boolean",
+              "@id": "dtmi:example:xi_epsilon;1",
+              "name": "xi_zeta",
+              "schema": "integer",
               "@type": "MapValue"
             }
           }
@@ -519,19 +519,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_phi;1",
+        "@id": "dtmi:example:xi_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_upsilon",
+          "name": "xi_nu",
           "request": {
-            "name": "lambda_tau",
+            "name": "xi_mu",
             "schema": {
-              "@id": "dtmi:example:lambda_rho;1",
+              "@id": "dtmi:example:xi_kappa;1",
               "fields": [
                 {
-                  "name": "lambda_sigma",
-                  "schema": "date"
+                  "name": "xi_lambda",
+                  "schema": "long"
                 }
               ],
               "@type": "Object"
@@ -549,17 +549,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_wum;1",
+        "@id": "dtmi:example:xi_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_yuzz",
+          "name": "xi_sigma",
           "request": {
-            "name": "lambda_omega",
+            "name": "xi_rho",
             "schema": {
-              "@id": "dtmi:example:lambda_chi;1",
-              "name": "lambda_psi",
-              "schema": "dateTime",
+              "@id": "dtmi:example:xi_omicron;1",
+              "name": "xi_pi",
+              "schema": "string",
               "@type": "Property"
             }
           }
@@ -575,18 +575,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_nuh;1",
+        "@id": "dtmi:example:xi_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_glikk",
+          "name": "xi_psi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "lambda_fuddle",
+            "name": "xi_chi",
             "schema": {
-              "@id": "dtmi:example:lambda_um;1",
-              "name": "lambda_humpf",
-              "schema": "double",
+              "@id": "dtmi:example:xi_upsilon;1",
+              "name": "xi_phi",
+              "schema": "time",
               "@type": "Property"
             }
           }
@@ -602,16 +602,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_floob;1",
+        "@id": "dtmi:example:xi_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_spazz",
+          "name": "xi_humpf",
           "request": {
-            "name": "lambda_thnad",
+            "name": "xi_um",
             "schema": {
-              "@id": "dtmi:example:lambda_snee;1",
-              "name": "lambda_quan",
+              "@id": "dtmi:example:xi_yuzz;1",
+              "name": "xi_wum",
               "@type": "Relationship"
             }
           }
@@ -627,17 +627,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_yekk;1",
+        "@id": "dtmi:example:xi_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_itch",
+          "name": "xi_quan",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "lambda_flunn",
+            "name": "xi_snee",
             "schema": {
-              "@id": "dtmi:example:lambda_zatz;1",
-              "name": "lambda_jogg",
+              "@id": "dtmi:example:xi_glikk;1",
+              "name": "xi_nuh",
               "@type": "Relationship"
             }
           }
@@ -653,17 +653,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_gamma;1",
+        "@id": "dtmi:example:xi_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_beta",
+          "name": "xi_jogg",
           "request": {
-            "name": "mu_alpha",
+            "name": "xi_zatz",
             "schema": {
-              "@id": "dtmi:example:lambda_vroo;1",
-              "name": "lambda_hi",
-              "schema": "duration",
+              "@id": "dtmi:example:xi_spazz;1",
+              "name": "xi_floob",
+              "schema": "boolean",
               "@type": "Telemetry"
             }
           }
@@ -679,18 +679,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_theta;1",
+        "@id": "dtmi:example:omicron_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_eta",
+          "name": "xi_hi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "mu_zeta",
+            "name": "xi_vroo",
             "schema": {
-              "@id": "dtmi:example:mu_delta;1",
-              "name": "mu_epsilon",
-              "schema": "float",
+              "@id": "dtmi:example:xi_itch;1",
+              "name": "xi_yekk",
+              "schema": "date",
               "@type": "Telemetry"
             }
           }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadRequiredPropertiesV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadRequiredPropertiesV2.json
index 40e519b3..6c7d4ec4 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadRequiredPropertiesV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadRequiredPropertiesV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_kappa;1",
+        "@id": "dtmi:example:epsilon_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_iota",
+          "name": "epsilon_spazz",
           "request": {
-            "schema": "integer"
+            "schema": "dateTime"
           }
         }
       }
@@ -27,14 +27,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_mu;1",
+        "@id": "dtmi:example:epsilon_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_lambda",
+          "name": "epsilon_zatz",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "long"
+            "schema": "double"
           }
         }
       }
@@ -48,13 +48,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_omicron;1",
+        "@id": "dtmi:example:epsilon_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_xi",
+          "name": "epsilon_itch",
           "request": {
-            "name": "gamma_nu"
+            "name": "epsilon_flunn"
           }
         }
       }
@@ -68,14 +68,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_sigma;1",
+        "@id": "dtmi:example:zeta_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_rho",
+          "name": "epsilon_hi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "gamma_pi"
+            "name": "epsilon_vroo"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadTypeIncludesInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadTypeIncludesInvalidDtmiV2.json
index 3e71d9b5..6cacbe3c 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadTypeIncludesInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadTypeIncludesInvalidDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_yekk;1",
+        "@id": "dtmi:example:tau_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_itch",
+          "name": "tau_yekk",
           "request": {
             "@type": [
               "CommandPayload",
               "dtmi:foo//bar"
             ],
-            "name": "pi_flunn",
-            "schema": "integer"
+            "name": "tau_itch",
+            "schema": "duration"
           }
         }
       }
@@ -32,19 +32,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_alpha;1",
+        "@id": "dtmi:example:upsilon_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_hi",
+          "name": "upsilon_alpha",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": [
               "CommandPayload",
               "dtmi:foo//bar"
             ],
-            "name": "pi_vroo",
-            "schema": "long"
+            "name": "tau_hi",
+            "schema": "float"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadTypeIncludesMaterialV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadTypeIncludesMaterialV2.json
index 9d771352..04c80fa1 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadTypeIncludesMaterialV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadTypeIncludesMaterialV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_quan;1",
+        "@id": "dtmi:example:sigma_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_snee",
+          "name": "sigma_quan",
           "request": {
-            "name": "omicron_nuh",
-            "schema": "time",
+            "name": "sigma_snee",
+            "schema": "long",
             "@type": "CommandPayload"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_floob;1",
+        "@id": "dtmi:example:sigma_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_spazz",
+          "name": "sigma_floob",
           "request": {
-            "name": "omicron_thnad",
-            "schema": "boolean",
+            "name": "sigma_spazz",
+            "schema": "string",
             "@type": [
               "CommandPayload"
             ]
@@ -53,14 +53,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_flunn;1",
+        "@id": "dtmi:example:sigma_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_jogg",
+          "name": "sigma_flunn",
           "request": {
-            "name": "omicron_zatz",
-            "schema": "date",
+            "name": "sigma_jogg",
+            "schema": "time",
             "@type": "dtmi:dtdl:class:CommandPayload;2"
           }
         }
@@ -75,14 +75,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_vroo;1",
+        "@id": "dtmi:example:sigma_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_yekk",
+          "name": "sigma_vroo",
           "request": {
-            "name": "omicron_itch",
-            "schema": "dateTime",
+            "name": "sigma_yekk",
+            "schema": "boolean",
             "@type": [
               "dtmi:dtdl:class:CommandPayload;2"
             ]
@@ -99,14 +99,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_beta;1",
+        "@id": "dtmi:example:tau_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_alpha",
+          "name": "tau_beta",
           "request": {
-            "name": "omicron_hi",
-            "schema": "double",
+            "name": "tau_alpha",
+            "schema": "date",
             "@type": "Something"
           }
         }
@@ -121,15 +121,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_epsilon;1",
+        "@id": "dtmi:example:tau_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_delta",
+          "name": "tau_epsilon",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "pi_gamma",
-            "schema": "duration",
+            "name": "tau_delta",
+            "schema": "dateTime",
             "@type": "Something"
           }
         }
@@ -144,14 +144,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_theta;1",
+        "@id": "dtmi:example:tau_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_eta",
+          "name": "tau_theta",
           "request": {
-            "name": "pi_zeta",
-            "schema": "float",
+            "name": "tau_eta",
+            "schema": "double",
             "@type": [
               "Something"
             ]
@@ -168,15 +168,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_lambda;1",
+        "@id": "dtmi:example:tau_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_kappa",
+          "name": "tau_lambda",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "pi_iota",
-            "schema": "integer",
+            "name": "tau_kappa",
+            "schema": "duration",
             "@type": [
               "Something"
             ]
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPayloadTypeStringOrArrayV2.json b/DTDL/v2/spec/Requirement-ClassCommandPayloadTypeStringOrArrayV2.json
index 2b10c519..8e13b451 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPayloadTypeStringOrArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPayloadTypeStringOrArrayV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_humpf;1",
+        "@id": "dtmi:example:rho_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "xi_um",
+          "name": "rho_humpf",
           "request": {
-            "name": "xi_wum",
-            "schema": "double",
+            "name": "rho_um",
+            "schema": "date",
             "@type": 626
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_nuh;1",
+        "@id": "dtmi:example:rho_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "xi_glikk",
+          "name": "rho_nuh",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "xi_fuddle",
-            "schema": "duration",
+            "name": "rho_glikk",
+            "schema": "dateTime",
             "@type": 626
           }
         }
@@ -52,14 +52,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_thnad;1",
+        "@id": "dtmi:example:rho_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "xi_quan",
+          "name": "rho_thnad",
           "request": {
-            "name": "xi_snee",
-            "schema": "float",
+            "name": "rho_quan",
+            "schema": "double",
             "@type": null
           }
         }
@@ -74,15 +74,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_zatz;1",
+        "@id": "dtmi:example:rho_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "xi_floob",
+          "name": "rho_zatz",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "xi_spazz",
-            "schema": "integer",
+            "name": "rho_floob",
+            "schema": "duration",
             "@type": null
           }
         }
@@ -97,14 +97,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_itch;1",
+        "@id": "dtmi:example:rho_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "xi_flunn",
+          "name": "rho_itch",
           "request": {
-            "name": "xi_jogg",
-            "schema": "long",
+            "name": "rho_flunn",
+            "schema": "float",
             "@type": true
           }
         }
@@ -119,15 +119,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_hi;1",
+        "@id": "dtmi:example:sigma_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "xi_vroo",
+          "name": "rho_hi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "xi_yekk",
-            "schema": "string",
+            "name": "rho_vroo",
+            "schema": "integer",
             "@type": true
           }
         }
@@ -142,14 +142,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_gamma;1",
+        "@id": "dtmi:example:sigma_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_beta",
+          "name": "sigma_gamma",
           "request": {
-            "name": "omicron_alpha",
-            "schema": "time",
+            "name": "sigma_beta",
+            "schema": "long",
             "@type": {}
           }
         }
@@ -164,15 +164,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_zeta;1",
+        "@id": "dtmi:example:sigma_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_epsilon",
+          "name": "sigma_zeta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omicron_delta",
-            "schema": "boolean",
+            "name": "sigma_epsilon",
+            "schema": "string",
             "@type": {}
           }
         }
@@ -187,14 +187,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_iota;1",
+        "@id": "dtmi:example:sigma_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_theta",
+          "name": "sigma_iota",
           "request": {
-            "name": "omicron_eta",
-            "schema": "date",
+            "name": "sigma_theta",
+            "schema": "time",
             "@type": [
               626
             ]
@@ -211,15 +211,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_mu;1",
+        "@id": "dtmi:example:sigma_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_lambda",
+          "name": "sigma_mu",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omicron_kappa",
-            "schema": "dateTime",
+            "name": "sigma_lambda",
+            "schema": "boolean",
             "@type": [
               626
             ]
@@ -236,14 +236,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_omicron;1",
+        "@id": "dtmi:example:sigma_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_xi",
+          "name": "sigma_omicron",
           "request": {
-            "name": "omicron_nu",
-            "schema": "double",
+            "name": "sigma_xi",
+            "schema": "date",
             "@type": [
               null
             ]
@@ -260,15 +260,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_sigma;1",
+        "@id": "dtmi:example:sigma_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_rho",
+          "name": "sigma_sigma",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omicron_pi",
-            "schema": "duration",
+            "name": "sigma_rho",
+            "schema": "dateTime",
             "@type": [
               null
             ]
@@ -285,14 +285,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_phi;1",
+        "@id": "dtmi:example:sigma_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_upsilon",
+          "name": "sigma_phi",
           "request": {
-            "name": "omicron_tau",
-            "schema": "float",
+            "name": "sigma_upsilon",
+            "schema": "double",
             "@type": [
               true
             ]
@@ -309,15 +309,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_omega;1",
+        "@id": "dtmi:example:sigma_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_psi",
+          "name": "sigma_omega",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omicron_chi",
-            "schema": "integer",
+            "name": "sigma_psi",
+            "schema": "duration",
             "@type": [
               true
             ]
@@ -334,14 +334,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_um;1",
+        "@id": "dtmi:example:sigma_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_wum",
+          "name": "sigma_um",
           "request": {
-            "name": "omicron_yuzz",
-            "schema": "long",
+            "name": "sigma_wum",
+            "schema": "float",
             "@type": [
               {}
             ]
@@ -358,15 +358,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_glikk;1",
+        "@id": "dtmi:example:sigma_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_fuddle",
+          "name": "sigma_glikk",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omicron_humpf",
-            "schema": "string",
+            "name": "sigma_fuddle",
+            "schema": "integer",
             "@type": [
               {}
             ]
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyCommandTypeSpecificValuesV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyCommandTypeSpecificValuesV2.json
index abdb7114..44883d2b 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyCommandTypeSpecificValuesV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyCommandTypeSpecificValuesV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_hi;1",
+        "@id": "dtmi:example:fuddle_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_vroo",
+          "name": "fuddle_epsilon",
           "commandType": "asynchronous"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_beta;1",
+        "@id": "dtmi:example:fuddle_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_alpha",
+          "name": "fuddle_eta",
           "commandType": [
             "asynchronous"
           ]
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_delta;1",
+        "@id": "dtmi:example:fuddle_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_gamma",
+          "name": "fuddle_iota",
           "commandType": "dtmi:dtdl:instance:CommandType:asynchronous;2"
         }
       }
@@ -63,11 +63,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_zeta;1",
+        "@id": "dtmi:example:fuddle_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_epsilon",
+          "name": "fuddle_lambda",
           "commandType": [
             "dtmi:dtdl:instance:CommandType:asynchronous;2"
           ]
@@ -83,11 +83,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_theta;1",
+        "@id": "dtmi:example:fuddle_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_eta",
+          "name": "fuddle_nu",
           "commandType": [
             "asynchronous",
             "dtmi:dtdl:instance:CommandType:asynchronous;2"
@@ -104,12 +104,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_kappa;1",
+        "@id": "dtmi:example:fuddle_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "um_iota",
+          "name": "fuddle_omicron",
           "commandType": [
             "asynchronous",
             "dtmi:dtdl:instance:CommandType:asynchronous;2"
@@ -126,11 +126,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_mu;1",
+        "@id": "dtmi:example:fuddle_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_lambda",
+          "name": "fuddle_rho",
           "commandType": "synchronous"
         }
       }
@@ -144,11 +144,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_xi;1",
+        "@id": "dtmi:example:fuddle_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_nu",
+          "name": "fuddle_tau",
           "commandType": [
             "synchronous"
           ]
@@ -164,11 +164,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_pi;1",
+        "@id": "dtmi:example:fuddle_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_omicron",
+          "name": "fuddle_phi",
           "commandType": "dtmi:dtdl:instance:CommandType:synchronous;2"
         }
       }
@@ -182,11 +182,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_sigma;1",
+        "@id": "dtmi:example:fuddle_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_rho",
+          "name": "fuddle_psi",
           "commandType": [
             "dtmi:dtdl:instance:CommandType:synchronous;2"
           ]
@@ -202,11 +202,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_upsilon;1",
+        "@id": "dtmi:example:fuddle_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_tau",
+          "name": "fuddle_yuzz",
           "commandType": [
             "synchronous",
             "dtmi:dtdl:instance:CommandType:synchronous;2"
@@ -223,12 +223,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_chi;1",
+        "@id": "dtmi:example:fuddle_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "um_phi",
+          "name": "fuddle_um",
           "commandType": [
             "synchronous",
             "dtmi:dtdl:instance:CommandType:synchronous;2"
@@ -245,11 +245,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_omega;1",
+        "@id": "dtmi:example:fuddle_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_psi",
+          "name": "fuddle_fuddle",
           "commandType": []
         }
       }
@@ -263,11 +263,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_wum;1",
+        "@id": "dtmi:example:fuddle_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_yuzz",
+          "name": "fuddle_nuh",
           "commandType": null
         }
       }
@@ -281,12 +281,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_humpf;1",
+        "@id": "dtmi:example:fuddle_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "um_um",
+          "name": "fuddle_quan",
           "commandType": null
         }
       }
@@ -300,11 +300,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_glikk;1",
+        "@id": "dtmi:example:fuddle_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_fuddle",
+          "name": "fuddle_spazz",
           "commandType": true
         }
       }
@@ -318,12 +318,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_snee;1",
+        "@id": "dtmi:example:fuddle_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "um_nuh",
+          "name": "fuddle_zatz",
           "commandType": true
         }
       }
@@ -337,11 +337,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_thnad;1",
+        "@id": "dtmi:example:fuddle_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_quan",
+          "name": "fuddle_flunn",
           "commandType": 626
         }
       }
@@ -355,12 +355,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_floob;1",
+        "@id": "dtmi:example:fuddle_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "um_spazz",
+          "name": "fuddle_yekk",
           "commandType": 626
         }
       }
@@ -374,11 +374,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_jogg;1",
+        "@id": "dtmi:example:glikk_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_zatz",
+          "name": "fuddle_hi",
           "commandType": [
             null
           ]
@@ -394,12 +394,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_itch;1",
+        "@id": "dtmi:example:glikk_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "um_flunn",
+          "name": "glikk_beta",
           "commandType": [
             null
           ]
@@ -415,11 +415,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_vroo;1",
+        "@id": "dtmi:example:glikk_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_yekk",
+          "name": "glikk_delta",
           "commandType": [
             true
           ]
@@ -435,12 +435,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_alpha;1",
+        "@id": "dtmi:example:glikk_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "um_hi",
+          "name": "glikk_zeta",
           "commandType": [
             true
           ]
@@ -456,11 +456,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_gamma;1",
+        "@id": "dtmi:example:glikk_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_beta",
+          "name": "glikk_theta",
           "commandType": [
             626
           ]
@@ -476,12 +476,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_epsilon;1",
+        "@id": "dtmi:example:glikk_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "humpf_delta",
+          "name": "glikk_kappa",
           "commandType": [
             626
           ]
@@ -497,11 +497,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_eta;1",
+        "@id": "dtmi:example:glikk_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_zeta",
+          "name": "glikk_mu",
           "commandType": {}
         }
       }
@@ -515,12 +515,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_iota;1",
+        "@id": "dtmi:example:glikk_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "humpf_theta",
+          "name": "glikk_xi",
           "commandType": {}
         }
       }
@@ -534,11 +534,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_lambda;1",
+        "@id": "dtmi:example:glikk_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_kappa",
+          "name": "glikk_pi",
           "commandType": [
             {}
           ]
@@ -554,12 +554,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_nu;1",
+        "@id": "dtmi:example:glikk_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "humpf_mu",
+          "name": "glikk_sigma",
           "commandType": [
             {}
           ]
@@ -575,11 +575,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_omicron;1",
+        "@id": "dtmi:example:glikk_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_xi",
+          "name": "glikk_upsilon",
           "commandType": "boolean"
         }
       }
@@ -593,12 +593,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_rho;1",
+        "@id": "dtmi:example:glikk_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "humpf_pi",
+          "name": "glikk_chi",
           "commandType": "boolean"
         }
       }
@@ -612,11 +612,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_tau;1",
+        "@id": "dtmi:example:glikk_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_sigma",
+          "name": "glikk_omega",
           "commandType": "dtmi:dtdl:instance:Schema:boolean;2"
         }
       }
@@ -630,12 +630,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_phi;1",
+        "@id": "dtmi:example:glikk_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "humpf_upsilon",
+          "name": "glikk_wum",
           "commandType": "dtmi:dtdl:instance:Schema:boolean;2"
         }
       }
@@ -649,11 +649,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_psi;1",
+        "@id": "dtmi:example:glikk_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_chi",
+          "name": "glikk_humpf",
           "commandType": "date"
         }
       }
@@ -667,12 +667,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_yuzz;1",
+        "@id": "dtmi:example:glikk_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "humpf_omega",
+          "name": "glikk_glikk",
           "commandType": "date"
         }
       }
@@ -686,11 +686,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_um;1",
+        "@id": "dtmi:example:glikk_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_wum",
+          "name": "glikk_snee",
           "commandType": "dtmi:dtdl:instance:Schema:date;2"
         }
       }
@@ -704,12 +704,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_fuddle;1",
+        "@id": "dtmi:example:glikk_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "humpf_humpf",
+          "name": "glikk_thnad",
           "commandType": "dtmi:dtdl:instance:Schema:date;2"
         }
       }
@@ -723,11 +723,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_nuh;1",
+        "@id": "dtmi:example:glikk_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_glikk",
+          "name": "glikk_floob",
           "commandType": "dateTime"
         }
       }
@@ -741,12 +741,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_quan;1",
+        "@id": "dtmi:example:glikk_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "humpf_snee",
+          "name": "glikk_jogg",
           "commandType": "dateTime"
         }
       }
@@ -760,11 +760,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_spazz;1",
+        "@id": "dtmi:example:glikk_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_thnad",
+          "name": "glikk_itch",
           "commandType": "dtmi:dtdl:instance:Schema:dateTime;2"
         }
       }
@@ -778,12 +778,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_zatz;1",
+        "@id": "dtmi:example:glikk_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "humpf_floob",
+          "name": "glikk_vroo",
           "commandType": "dtmi:dtdl:instance:Schema:dateTime;2"
         }
       }
@@ -797,11 +797,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_flunn;1",
+        "@id": "dtmi:example:nuh_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_jogg",
+          "name": "nuh_alpha",
           "commandType": "double"
         }
       }
@@ -815,12 +815,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_yekk;1",
+        "@id": "dtmi:example:nuh_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "humpf_itch",
+          "name": "nuh_gamma",
           "commandType": "double"
         }
       }
@@ -834,11 +834,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_hi;1",
+        "@id": "dtmi:example:nuh_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_vroo",
+          "name": "nuh_epsilon",
           "commandType": "dtmi:dtdl:instance:Schema:double;2"
         }
       }
@@ -852,12 +852,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_beta;1",
+        "@id": "dtmi:example:nuh_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "fuddle_alpha",
+          "name": "nuh_eta",
           "commandType": "dtmi:dtdl:instance:Schema:double;2"
         }
       }
@@ -871,11 +871,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_delta;1",
+        "@id": "dtmi:example:nuh_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_gamma",
+          "name": "nuh_iota",
           "commandType": "duration"
         }
       }
@@ -889,12 +889,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_zeta;1",
+        "@id": "dtmi:example:nuh_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "fuddle_epsilon",
+          "name": "nuh_lambda",
           "commandType": "duration"
         }
       }
@@ -908,11 +908,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_theta;1",
+        "@id": "dtmi:example:nuh_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_eta",
+          "name": "nuh_nu",
           "commandType": "dtmi:dtdl:instance:Schema:duration;2"
         }
       }
@@ -926,12 +926,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_kappa;1",
+        "@id": "dtmi:example:nuh_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "fuddle_iota",
+          "name": "nuh_omicron",
           "commandType": "dtmi:dtdl:instance:Schema:duration;2"
         }
       }
@@ -945,11 +945,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_mu;1",
+        "@id": "dtmi:example:nuh_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_lambda",
+          "name": "nuh_rho",
           "commandType": "float"
         }
       }
@@ -963,12 +963,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_xi;1",
+        "@id": "dtmi:example:nuh_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "fuddle_nu",
+          "name": "nuh_tau",
           "commandType": "float"
         }
       }
@@ -982,11 +982,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_pi;1",
+        "@id": "dtmi:example:nuh_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_omicron",
+          "name": "nuh_phi",
           "commandType": "dtmi:dtdl:instance:Schema:float;2"
         }
       }
@@ -1000,12 +1000,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_sigma;1",
+        "@id": "dtmi:example:nuh_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "fuddle_rho",
+          "name": "nuh_psi",
           "commandType": "dtmi:dtdl:instance:Schema:float;2"
         }
       }
@@ -1019,11 +1019,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_upsilon;1",
+        "@id": "dtmi:example:nuh_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_tau",
+          "name": "nuh_yuzz",
           "commandType": "integer"
         }
       }
@@ -1037,12 +1037,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_chi;1",
+        "@id": "dtmi:example:nuh_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "fuddle_phi",
+          "name": "nuh_um",
           "commandType": "integer"
         }
       }
@@ -1056,11 +1056,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_omega;1",
+        "@id": "dtmi:example:nuh_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_psi",
+          "name": "nuh_fuddle",
           "commandType": "dtmi:dtdl:instance:Schema:integer;2"
         }
       }
@@ -1074,12 +1074,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_wum;1",
+        "@id": "dtmi:example:nuh_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "fuddle_yuzz",
+          "name": "nuh_nuh",
           "commandType": "dtmi:dtdl:instance:Schema:integer;2"
         }
       }
@@ -1093,11 +1093,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_humpf;1",
+        "@id": "dtmi:example:nuh_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_um",
+          "name": "nuh_quan",
           "commandType": "long"
         }
       }
@@ -1111,12 +1111,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_glikk;1",
+        "@id": "dtmi:example:nuh_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "fuddle_fuddle",
+          "name": "nuh_spazz",
           "commandType": "long"
         }
       }
@@ -1130,11 +1130,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_snee;1",
+        "@id": "dtmi:example:nuh_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_nuh",
+          "name": "nuh_zatz",
           "commandType": "dtmi:dtdl:instance:Schema:long;2"
         }
       }
@@ -1148,12 +1148,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_thnad;1",
+        "@id": "dtmi:example:nuh_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "fuddle_quan",
+          "name": "nuh_flunn",
           "commandType": "dtmi:dtdl:instance:Schema:long;2"
         }
       }
@@ -1167,11 +1167,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_floob;1",
+        "@id": "dtmi:example:nuh_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_spazz",
+          "name": "nuh_yekk",
           "commandType": "string"
         }
       }
@@ -1185,12 +1185,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_jogg;1",
+        "@id": "dtmi:example:snee_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "fuddle_zatz",
+          "name": "nuh_hi",
           "commandType": "string"
         }
       }
@@ -1204,11 +1204,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_itch;1",
+        "@id": "dtmi:example:snee_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_flunn",
+          "name": "snee_beta",
           "commandType": "dtmi:dtdl:instance:Schema:string;2"
         }
       }
@@ -1222,12 +1222,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_vroo;1",
+        "@id": "dtmi:example:snee_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "fuddle_yekk",
+          "name": "snee_delta",
           "commandType": "dtmi:dtdl:instance:Schema:string;2"
         }
       }
@@ -1241,11 +1241,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_alpha;1",
+        "@id": "dtmi:example:snee_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_hi",
+          "name": "snee_zeta",
           "commandType": "time"
         }
       }
@@ -1259,12 +1259,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_gamma;1",
+        "@id": "dtmi:example:snee_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "glikk_beta",
+          "name": "snee_theta",
           "commandType": "time"
         }
       }
@@ -1278,11 +1278,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_epsilon;1",
+        "@id": "dtmi:example:snee_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_delta",
+          "name": "snee_kappa",
           "commandType": "dtmi:dtdl:instance:Schema:time;2"
         }
       }
@@ -1296,12 +1296,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_eta;1",
+        "@id": "dtmi:example:snee_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "glikk_zeta",
+          "name": "snee_mu",
           "commandType": "dtmi:dtdl:instance:Schema:time;2"
         }
       }
@@ -1315,11 +1315,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_iota;1",
+        "@id": "dtmi:example:snee_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_theta",
+          "name": "snee_xi",
           "commandType": "geopoint"
         }
       }
@@ -1333,12 +1333,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_lambda;1",
+        "@id": "dtmi:example:snee_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "glikk_kappa",
+          "name": "snee_pi",
           "commandType": "geopoint"
         }
       }
@@ -1352,11 +1352,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_nu;1",
+        "@id": "dtmi:example:snee_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_mu",
+          "name": "snee_sigma",
           "commandType": "dtmi:iotcentral:schema:geopoint;2"
         }
       }
@@ -1370,12 +1370,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_omicron;1",
+        "@id": "dtmi:example:snee_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "glikk_xi",
+          "name": "snee_upsilon",
           "commandType": "dtmi:iotcentral:schema:geopoint;2"
         }
       }
@@ -1389,11 +1389,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_rho;1",
+        "@id": "dtmi:example:snee_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_pi",
+          "name": "snee_chi",
           "commandType": "vector"
         }
       }
@@ -1407,12 +1407,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_tau;1",
+        "@id": "dtmi:example:snee_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "glikk_sigma",
+          "name": "snee_omega",
           "commandType": "vector"
         }
       }
@@ -1426,11 +1426,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_phi;1",
+        "@id": "dtmi:example:snee_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_upsilon",
+          "name": "snee_wum",
           "commandType": "dtmi:iotcentral:schema:vector;2"
         }
       }
@@ -1444,12 +1444,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_psi;1",
+        "@id": "dtmi:example:snee_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "glikk_chi",
+          "name": "snee_humpf",
           "commandType": "dtmi:iotcentral:schema:vector;2"
         }
       }
@@ -1463,11 +1463,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_yuzz;1",
+        "@id": "dtmi:example:snee_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_omega",
+          "name": "snee_glikk",
           "commandType": "lineString"
         }
       }
@@ -1481,12 +1481,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_um;1",
+        "@id": "dtmi:example:snee_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "glikk_wum",
+          "name": "snee_snee",
           "commandType": "lineString"
         }
       }
@@ -1500,11 +1500,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_fuddle;1",
+        "@id": "dtmi:example:snee_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_humpf",
+          "name": "snee_thnad",
           "commandType": "dtmi:standard:schema:geospatial:lineString;2"
         }
       }
@@ -1518,12 +1518,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_nuh;1",
+        "@id": "dtmi:example:snee_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "glikk_glikk",
+          "name": "snee_floob",
           "commandType": "dtmi:standard:schema:geospatial:lineString;2"
         }
       }
@@ -1537,11 +1537,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_quan;1",
+        "@id": "dtmi:example:snee_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_snee",
+          "name": "snee_jogg",
           "commandType": "multiLineString"
         }
       }
@@ -1555,12 +1555,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_spazz;1",
+        "@id": "dtmi:example:snee_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "glikk_thnad",
+          "name": "snee_itch",
           "commandType": "multiLineString"
         }
       }
@@ -1574,11 +1574,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_zatz;1",
+        "@id": "dtmi:example:snee_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_floob",
+          "name": "snee_vroo",
           "commandType": "dtmi:standard:schema:geospatial:multiLineString;2"
         }
       }
@@ -1592,12 +1592,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_flunn;1",
+        "@id": "dtmi:example:quan_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "glikk_jogg",
+          "name": "quan_alpha",
           "commandType": "dtmi:standard:schema:geospatial:multiLineString;2"
         }
       }
@@ -1611,11 +1611,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_yekk;1",
+        "@id": "dtmi:example:quan_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_itch",
+          "name": "quan_gamma",
           "commandType": "multiPoint"
         }
       }
@@ -1629,12 +1629,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_hi;1",
+        "@id": "dtmi:example:quan_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "glikk_vroo",
+          "name": "quan_epsilon",
           "commandType": "multiPoint"
         }
       }
@@ -1648,11 +1648,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_beta;1",
+        "@id": "dtmi:example:quan_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_alpha",
+          "name": "quan_eta",
           "commandType": "dtmi:standard:schema:geospatial:multiPoint;2"
         }
       }
@@ -1666,12 +1666,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_delta;1",
+        "@id": "dtmi:example:quan_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "nuh_gamma",
+          "name": "quan_iota",
           "commandType": "dtmi:standard:schema:geospatial:multiPoint;2"
         }
       }
@@ -1685,11 +1685,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_zeta;1",
+        "@id": "dtmi:example:quan_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_epsilon",
+          "name": "quan_lambda",
           "commandType": "multiPolygon"
         }
       }
@@ -1703,12 +1703,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_theta;1",
+        "@id": "dtmi:example:quan_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "nuh_eta",
+          "name": "quan_nu",
           "commandType": "multiPolygon"
         }
       }
@@ -1722,11 +1722,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_kappa;1",
+        "@id": "dtmi:example:quan_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_iota",
+          "name": "quan_omicron",
           "commandType": "dtmi:standard:schema:geospatial:multiPolygon;2"
         }
       }
@@ -1740,12 +1740,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_mu;1",
+        "@id": "dtmi:example:quan_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "nuh_lambda",
+          "name": "quan_rho",
           "commandType": "dtmi:standard:schema:geospatial:multiPolygon;2"
         }
       }
@@ -1759,11 +1759,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_xi;1",
+        "@id": "dtmi:example:quan_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_nu",
+          "name": "quan_tau",
           "commandType": "point"
         }
       }
@@ -1777,12 +1777,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_pi;1",
+        "@id": "dtmi:example:quan_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "nuh_omicron",
+          "name": "quan_phi",
           "commandType": "point"
         }
       }
@@ -1796,11 +1796,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_sigma;1",
+        "@id": "dtmi:example:quan_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_rho",
+          "name": "quan_psi",
           "commandType": "dtmi:standard:schema:geospatial:point;2"
         }
       }
@@ -1814,12 +1814,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_upsilon;1",
+        "@id": "dtmi:example:quan_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "nuh_tau",
+          "name": "quan_yuzz",
           "commandType": "dtmi:standard:schema:geospatial:point;2"
         }
       }
@@ -1833,11 +1833,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_chi;1",
+        "@id": "dtmi:example:quan_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_phi",
+          "name": "quan_um",
           "commandType": "polygon"
         }
       }
@@ -1851,12 +1851,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_omega;1",
+        "@id": "dtmi:example:quan_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "nuh_psi",
+          "name": "quan_fuddle",
           "commandType": "polygon"
         }
       }
@@ -1870,11 +1870,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_wum;1",
+        "@id": "dtmi:example:quan_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_yuzz",
+          "name": "quan_nuh",
           "commandType": "dtmi:standard:schema:geospatial:polygon;2"
         }
       }
@@ -1888,12 +1888,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_humpf;1",
+        "@id": "dtmi:example:quan_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "nuh_um",
+          "name": "quan_quan",
           "commandType": "dtmi:standard:schema:geospatial:polygon;2"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyCommandTypeTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyCommandTypeTermAndDtmiV2.json
index 6fc6dda6..6769ad64 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyCommandTypeTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyCommandTypeTermAndDtmiV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_floob;1",
+        "@id": "dtmi:example:quan_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "commandType": "asynchronous",
           "dtmi:dtdl:property:commandType;2": "asynchronous",
-          "name": "nuh_spazz"
+          "name": "quan_yekk"
         }
       }
     ]
@@ -26,14 +26,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_jogg;1",
+        "@id": "dtmi:example:thnad_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
           "commandType": "asynchronous",
           "dtmi:dtdl:property:commandType;2": "asynchronous",
-          "name": "nuh_zatz"
+          "name": "quan_hi"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyCommentStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyCommentStringLengthV2.json
index 26f34045..051a2aac 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyCommentStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyCommentStringLengthV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_flunn;1",
+        "@id": "dtmi:example:spazz_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_jogg",
+          "name": "spazz_alpha",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_yekk;1",
+        "@id": "dtmi:example:spazz_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_itch",
+          "name": "spazz_gamma",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_hi;1",
+        "@id": "dtmi:example:spazz_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "snee_vroo",
+          "name": "spazz_epsilon",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyCommentStringV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyCommentStringV2.json
index 14f89c21..d641a06e 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyCommentStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyCommentStringV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_itch;1",
+        "@id": "dtmi:example:thnad_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_flunn",
+          "name": "thnad_beta",
           "comment": "hello"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_vroo;1",
+        "@id": "dtmi:example:thnad_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_yekk",
+          "name": "thnad_delta",
           "comment": [
             "hello"
           ]
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_alpha;1",
+        "@id": "dtmi:example:thnad_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_hi",
+          "name": "thnad_zeta",
           "comment": {
             "@value": "hello",
             "@type": "xsd:string"
@@ -66,11 +66,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_gamma;1",
+        "@id": "dtmi:example:thnad_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_beta",
+          "name": "thnad_theta",
           "comment": [
             {
               "@value": "hello",
@@ -89,11 +89,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_epsilon;1",
+        "@id": "dtmi:example:thnad_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_delta",
+          "name": "thnad_kappa",
           "comment": []
         }
       }
@@ -107,11 +107,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_eta;1",
+        "@id": "dtmi:example:thnad_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_zeta",
+          "name": "thnad_mu",
           "comment": null
         }
       }
@@ -125,12 +125,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_iota;1",
+        "@id": "dtmi:example:thnad_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "snee_theta",
+          "name": "thnad_xi",
           "comment": null
         }
       }
@@ -144,11 +144,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_lambda;1",
+        "@id": "dtmi:example:thnad_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_kappa",
+          "name": "thnad_pi",
           "comment": true
         }
       }
@@ -162,12 +162,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_nu;1",
+        "@id": "dtmi:example:thnad_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "snee_mu",
+          "name": "thnad_sigma",
           "comment": true
         }
       }
@@ -181,11 +181,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_omicron;1",
+        "@id": "dtmi:example:thnad_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_xi",
+          "name": "thnad_upsilon",
           "comment": 626
         }
       }
@@ -199,12 +199,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_rho;1",
+        "@id": "dtmi:example:thnad_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "snee_pi",
+          "name": "thnad_chi",
           "comment": 626
         }
       }
@@ -218,11 +218,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_tau;1",
+        "@id": "dtmi:example:thnad_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_sigma",
+          "name": "thnad_omega",
           "comment": [
             null
           ]
@@ -238,12 +238,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_phi;1",
+        "@id": "dtmi:example:thnad_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "snee_upsilon",
+          "name": "thnad_wum",
           "comment": [
             null
           ]
@@ -259,11 +259,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_psi;1",
+        "@id": "dtmi:example:thnad_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_chi",
+          "name": "thnad_humpf",
           "comment": [
             true
           ]
@@ -279,12 +279,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_yuzz;1",
+        "@id": "dtmi:example:thnad_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "snee_omega",
+          "name": "thnad_glikk",
           "comment": [
             true
           ]
@@ -300,11 +300,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_um;1",
+        "@id": "dtmi:example:thnad_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_wum",
+          "name": "thnad_snee",
           "comment": [
             626
           ]
@@ -320,12 +320,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_fuddle;1",
+        "@id": "dtmi:example:thnad_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "snee_humpf",
+          "name": "thnad_thnad",
           "comment": [
             626
           ]
@@ -341,11 +341,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_nuh;1",
+        "@id": "dtmi:example:thnad_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_glikk",
+          "name": "thnad_floob",
           "comment": {}
         }
       }
@@ -359,12 +359,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_quan;1",
+        "@id": "dtmi:example:thnad_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "snee_snee",
+          "name": "thnad_jogg",
           "comment": {}
         }
       }
@@ -378,11 +378,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_spazz;1",
+        "@id": "dtmi:example:thnad_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_thnad",
+          "name": "thnad_itch",
           "comment": [
             {}
           ]
@@ -398,12 +398,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_zatz;1",
+        "@id": "dtmi:example:thnad_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "snee_floob",
+          "name": "thnad_vroo",
           "comment": [
             {}
           ]
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyCommentTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyCommentTermAndDtmiV2.json
index 66bbcce1..7d725a60 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyCommentTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyCommentTermAndDtmiV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_nu;1",
+        "@id": "dtmi:example:spazz_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "comment": "quan_kappa",
-          "dtmi:dtdl:property:comment;2": "quan_lambda",
-          "name": "quan_mu"
+          "comment": "spazz_pi",
+          "dtmi:dtdl:property:comment;2": "spazz_rho",
+          "name": "spazz_sigma"
         }
       }
     ]
@@ -26,14 +26,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_rho;1",
+        "@id": "dtmi:example:spazz_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "comment": "quan_xi",
-          "dtmi:dtdl:property:comment;2": "quan_omicron",
-          "name": "quan_pi"
+          "comment": "spazz_upsilon",
+          "dtmi:dtdl:property:comment;2": "spazz_phi",
+          "name": "spazz_chi"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyDescriptionLangStringV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyDescriptionLangStringV2.json
index d3cb45cb..5c91b8c5 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyDescriptionLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyDescriptionLangStringV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_tau;1",
+        "@id": "dtmi:example:spazz_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_sigma",
+          "name": "spazz_omega",
           "description": "hello"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_phi;1",
+        "@id": "dtmi:example:spazz_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_upsilon",
+          "name": "spazz_wum",
           "description": [
             "hello"
           ]
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_psi;1",
+        "@id": "dtmi:example:spazz_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_chi",
+          "name": "spazz_humpf",
           "description": {
             "en": "hello"
           }
@@ -65,11 +65,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_yuzz;1",
+        "@id": "dtmi:example:spazz_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_omega",
+          "name": "spazz_glikk",
           "description": [
             {
               "@value": "hello",
@@ -88,11 +88,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_um;1",
+        "@id": "dtmi:example:spazz_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_wum",
+          "name": "spazz_snee",
           "description": {}
         }
       }
@@ -106,11 +106,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_fuddle;1",
+        "@id": "dtmi:example:spazz_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_humpf",
+          "name": "spazz_thnad",
           "description": []
         }
       }
@@ -124,11 +124,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_nuh;1",
+        "@id": "dtmi:example:spazz_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_glikk",
+          "name": "spazz_floob",
           "description": null
         }
       }
@@ -142,12 +142,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_quan;1",
+        "@id": "dtmi:example:spazz_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "quan_snee",
+          "name": "spazz_jogg",
           "description": null
         }
       }
@@ -161,11 +161,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_spazz;1",
+        "@id": "dtmi:example:spazz_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_thnad",
+          "name": "spazz_itch",
           "description": true
         }
       }
@@ -179,12 +179,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_zatz;1",
+        "@id": "dtmi:example:spazz_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "quan_floob",
+          "name": "spazz_vroo",
           "description": true
         }
       }
@@ -198,11 +198,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_flunn;1",
+        "@id": "dtmi:example:floob_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_jogg",
+          "name": "floob_alpha",
           "description": 626
         }
       }
@@ -216,12 +216,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_yekk;1",
+        "@id": "dtmi:example:floob_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "quan_itch",
+          "name": "floob_gamma",
           "description": 626
         }
       }
@@ -235,11 +235,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_hi;1",
+        "@id": "dtmi:example:floob_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_vroo",
+          "name": "floob_epsilon",
           "description": [
             null
           ]
@@ -255,12 +255,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_beta;1",
+        "@id": "dtmi:example:floob_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "thnad_alpha",
+          "name": "floob_eta",
           "description": [
             null
           ]
@@ -276,11 +276,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_delta;1",
+        "@id": "dtmi:example:floob_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "thnad_gamma",
+          "name": "floob_iota",
           "description": [
             true
           ]
@@ -296,12 +296,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_zeta;1",
+        "@id": "dtmi:example:floob_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "thnad_epsilon",
+          "name": "floob_lambda",
           "description": [
             true
           ]
@@ -317,11 +317,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_theta;1",
+        "@id": "dtmi:example:floob_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "thnad_eta",
+          "name": "floob_nu",
           "description": [
             626
           ]
@@ -337,12 +337,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_kappa;1",
+        "@id": "dtmi:example:floob_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "thnad_iota",
+          "name": "floob_omicron",
           "description": [
             626
           ]
@@ -358,11 +358,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_mu;1",
+        "@id": "dtmi:example:floob_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "thnad_lambda",
+          "name": "floob_rho",
           "description": [
             {}
           ]
@@ -378,12 +378,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_xi;1",
+        "@id": "dtmi:example:floob_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "thnad_nu",
+          "name": "floob_tau",
           "description": [
             {}
           ]
@@ -399,11 +399,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_pi;1",
+        "@id": "dtmi:example:floob_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "thnad_omicron",
+          "name": "floob_phi",
           "description": {
             "@value": "hello",
             "@language": "en"
@@ -420,12 +420,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_sigma;1",
+        "@id": "dtmi:example:floob_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "thnad_rho",
+          "name": "floob_psi",
           "description": {
             "@value": "hello",
             "@language": "en"
@@ -442,11 +442,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_upsilon;1",
+        "@id": "dtmi:example:floob_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "thnad_tau",
+          "name": "floob_yuzz",
           "description": [
             {
               "en": "hello"
@@ -464,12 +464,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_chi;1",
+        "@id": "dtmi:example:floob_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "thnad_phi",
+          "name": "floob_um",
           "description": [
             {
               "en": "hello"
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyDescriptionStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyDescriptionStringLengthV2.json
index b9377c9d..6b165a7e 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyDescriptionStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyDescriptionStringLengthV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_omega;1",
+        "@id": "dtmi:example:floob_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "thnad_psi",
+          "name": "floob_fuddle",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_wum;1",
+        "@id": "dtmi:example:floob_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "thnad_yuzz",
+          "name": "floob_nuh",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_humpf;1",
+        "@id": "dtmi:example:floob_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "thnad_um",
+          "name": "floob_quan",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyDescriptionTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyDescriptionTermAndDtmiV2.json
index 538e5e51..eb8f7d1c 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyDescriptionTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyDescriptionTermAndDtmiV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_yekk;1",
+        "@id": "dtmi:example:zatz_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "description": [
-            "thnad_jogg"
+            "zatz_alpha"
           ],
           "dtmi:dtdl:property:description;2": [
-            "thnad_flunn"
+            "zatz_beta"
           ],
-          "name": "thnad_itch"
+          "name": "zatz_gamma"
         }
       }
     ]
@@ -30,18 +30,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_beta;1",
+        "@id": "dtmi:example:zatz_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
           "description": [
-            "thnad_vroo"
+            "zatz_epsilon"
           ],
           "dtmi:dtdl:property:description;2": [
-            "thnad_hi"
+            "zatz_zeta"
           ],
-          "name": "spazz_alpha"
+          "name": "zatz_eta"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyDisplayNameLangStringV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyDisplayNameLangStringV2.json
index d4f7a325..27a32124 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyDisplayNameLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyDisplayNameLangStringV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_delta;1",
+        "@id": "dtmi:example:zatz_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_gamma",
+          "name": "zatz_iota",
           "displayName": "hello"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_zeta;1",
+        "@id": "dtmi:example:zatz_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_epsilon",
+          "name": "zatz_lambda",
           "displayName": [
             "hello"
           ]
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_theta;1",
+        "@id": "dtmi:example:zatz_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_eta",
+          "name": "zatz_nu",
           "displayName": {
             "en": "hello"
           }
@@ -65,11 +65,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_kappa;1",
+        "@id": "dtmi:example:zatz_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_iota",
+          "name": "zatz_omicron",
           "displayName": [
             {
               "@value": "hello",
@@ -88,11 +88,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_mu;1",
+        "@id": "dtmi:example:zatz_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_lambda",
+          "name": "zatz_rho",
           "displayName": {}
         }
       }
@@ -106,11 +106,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_xi;1",
+        "@id": "dtmi:example:zatz_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_nu",
+          "name": "zatz_tau",
           "displayName": []
         }
       }
@@ -124,11 +124,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_pi;1",
+        "@id": "dtmi:example:zatz_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_omicron",
+          "name": "zatz_phi",
           "displayName": null
         }
       }
@@ -142,12 +142,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_sigma;1",
+        "@id": "dtmi:example:zatz_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "spazz_rho",
+          "name": "zatz_psi",
           "displayName": null
         }
       }
@@ -161,11 +161,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_upsilon;1",
+        "@id": "dtmi:example:zatz_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_tau",
+          "name": "zatz_yuzz",
           "displayName": true
         }
       }
@@ -179,12 +179,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_chi;1",
+        "@id": "dtmi:example:zatz_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "spazz_phi",
+          "name": "zatz_um",
           "displayName": true
         }
       }
@@ -198,11 +198,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_omega;1",
+        "@id": "dtmi:example:zatz_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_psi",
+          "name": "zatz_fuddle",
           "displayName": 626
         }
       }
@@ -216,12 +216,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_wum;1",
+        "@id": "dtmi:example:zatz_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "spazz_yuzz",
+          "name": "zatz_nuh",
           "displayName": 626
         }
       }
@@ -235,11 +235,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_humpf;1",
+        "@id": "dtmi:example:zatz_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_um",
+          "name": "zatz_quan",
           "displayName": [
             null
           ]
@@ -255,12 +255,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_glikk;1",
+        "@id": "dtmi:example:zatz_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "spazz_fuddle",
+          "name": "zatz_spazz",
           "displayName": [
             null
           ]
@@ -276,11 +276,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_snee;1",
+        "@id": "dtmi:example:zatz_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_nuh",
+          "name": "zatz_zatz",
           "displayName": [
             true
           ]
@@ -296,12 +296,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_thnad;1",
+        "@id": "dtmi:example:zatz_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "spazz_quan",
+          "name": "zatz_flunn",
           "displayName": [
             true
           ]
@@ -317,11 +317,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_floob;1",
+        "@id": "dtmi:example:zatz_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_spazz",
+          "name": "zatz_yekk",
           "displayName": [
             626
           ]
@@ -337,12 +337,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_jogg;1",
+        "@id": "dtmi:example:jogg_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "spazz_zatz",
+          "name": "zatz_hi",
           "displayName": [
             626
           ]
@@ -358,11 +358,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_itch;1",
+        "@id": "dtmi:example:jogg_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_flunn",
+          "name": "jogg_beta",
           "displayName": [
             {}
           ]
@@ -378,12 +378,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_vroo;1",
+        "@id": "dtmi:example:jogg_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "spazz_yekk",
+          "name": "jogg_delta",
           "displayName": [
             {}
           ]
@@ -399,11 +399,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_alpha;1",
+        "@id": "dtmi:example:jogg_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_hi",
+          "name": "jogg_zeta",
           "displayName": {
             "@value": "hello",
             "@language": "en"
@@ -420,12 +420,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_gamma;1",
+        "@id": "dtmi:example:jogg_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "floob_beta",
+          "name": "jogg_theta",
           "displayName": {
             "@value": "hello",
             "@language": "en"
@@ -442,11 +442,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_epsilon;1",
+        "@id": "dtmi:example:jogg_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_delta",
+          "name": "jogg_kappa",
           "displayName": [
             {
               "en": "hello"
@@ -464,12 +464,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_eta;1",
+        "@id": "dtmi:example:jogg_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "floob_zeta",
+          "name": "jogg_mu",
           "displayName": [
             {
               "en": "hello"
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyDisplayNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyDisplayNameStringLengthV2.json
index 5742ca6f..6c0cbccb 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyDisplayNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyDisplayNameStringLengthV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_iota;1",
+        "@id": "dtmi:example:jogg_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_theta",
+          "name": "jogg_xi",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSometh"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_lambda;1",
+        "@id": "dtmi:example:jogg_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_kappa",
+          "name": "jogg_pi",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
         }
       }
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_nu;1",
+        "@id": "dtmi:example:jogg_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "floob_mu",
+          "name": "jogg_sigma",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyDisplayNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyDisplayNameTermAndDtmiV2.json
index 3f5db812..28b491d9 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyDisplayNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyDisplayNameTermAndDtmiV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_wum;1",
+        "@id": "dtmi:example:jogg_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "displayName": [
-            "floob_psi"
+            "jogg_fuddle"
           ],
           "dtmi:dtdl:property:displayName;2": [
-            "floob_omega"
+            "jogg_glikk"
           ],
-          "name": "floob_yuzz"
+          "name": "jogg_nuh"
         }
       }
     ]
@@ -30,18 +30,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_glikk;1",
+        "@id": "dtmi:example:jogg_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
           "displayName": [
-            "floob_um"
+            "jogg_quan"
           ],
           "dtmi:dtdl:property:displayName;2": [
-            "floob_humpf"
+            "jogg_thnad"
           ],
-          "name": "floob_fuddle"
+          "name": "jogg_spazz"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyFormallyInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyFormallyInvalidDtmiV2.json
index 7266762c..4384d7f6 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyFormallyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyFormallyInvalidDtmiV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_zatz;1",
+        "@id": "dtmi:example:epsilon_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "beta_floob",
+          "name": "epsilon_tau",
           "dtmi:foo//bar": 626
         }
       }
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_flunn;1",
+        "@id": "dtmi:example:epsilon_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "beta_jogg",
+          "name": "epsilon_phi",
           "dtmi:foo//bar": 626
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyFormallyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyFormallyIrrelevantDtmiOrTermV2.json
index 1e89fe06..7faef13a 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyFormallyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyFormallyIrrelevantDtmiOrTermV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_um;1",
+        "@id": "dtmi:example:epsilon_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "beta_wum",
+          "name": "epsilon_iota",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_fuddle;1",
+        "@id": "dtmi:example:epsilon_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "beta_humpf",
+          "name": "epsilon_lambda",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -44,11 +44,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_nuh;1",
+        "@id": "dtmi:example:epsilon_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "beta_glikk",
+          "name": "epsilon_nu",
           "boolean": null
         }
       }
@@ -62,12 +62,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_quan;1",
+        "@id": "dtmi:example:epsilon_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "beta_snee",
+          "name": "epsilon_omicron",
           "boolean": null
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyFormallyNotDtmiNorTermV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyFormallyNotDtmiNorTermV2.json
index 6f66b9f6..3663d3c5 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyFormallyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyFormallyNotDtmiNorTermV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_hi;1",
+        "@id": "dtmi:example:epsilon_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "beta_vroo",
+          "name": "epsilon_yuzz",
           "http://foo.com/bar": true
         }
       }
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_beta;1",
+        "@id": "dtmi:example:epsilon_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "gamma_alpha",
+          "name": "epsilon_um",
           "http://foo.com/bar": true
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyFormallyUndefinedTermV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyFormallyUndefinedTermV2.json
index 86595d4a..523a7e77 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyFormallyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyFormallyUndefinedTermV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_zeta;1",
+        "@id": "dtmi:example:epsilon_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_epsilon",
+          "name": "epsilon_nuh",
           "foobar": {}
         }
       }
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_theta;1",
+        "@id": "dtmi:example:epsilon_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "gamma_eta",
+          "name": "epsilon_quan",
           "foobar": {}
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyNamePatternV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyNamePatternV2.json
index 2714c382..4fb5e670 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyNamePatternV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyNamePatternV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_tau;1",
+        "@id": "dtmi:example:psi_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -24,7 +24,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_upsilon;1",
+        "@id": "dtmi:example:psi_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -41,7 +41,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_phi;1",
+        "@id": "dtmi:example:psi_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -58,7 +58,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_chi;1",
+        "@id": "dtmi:example:psi_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -75,7 +75,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_psi;1",
+        "@id": "dtmi:example:psi_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -92,7 +92,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_omega;1",
+        "@id": "dtmi:example:psi_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -109,7 +109,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_yuzz;1",
+        "@id": "dtmi:example:psi_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -127,7 +127,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_wum;1",
+        "@id": "dtmi:example:psi_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -144,7 +144,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_um;1",
+        "@id": "dtmi:example:psi_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -162,7 +162,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_humpf;1",
+        "@id": "dtmi:example:psi_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -179,7 +179,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_fuddle;1",
+        "@id": "dtmi:example:psi_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -197,7 +197,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_glikk;1",
+        "@id": "dtmi:example:psi_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -214,7 +214,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_nuh;1",
+        "@id": "dtmi:example:psi_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -232,7 +232,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_snee;1",
+        "@id": "dtmi:example:psi_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -249,7 +249,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_quan;1",
+        "@id": "dtmi:example:psi_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -267,7 +267,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_thnad;1",
+        "@id": "dtmi:example:psi_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -284,7 +284,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_spazz;1",
+        "@id": "dtmi:example:psi_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -302,7 +302,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_floob;1",
+        "@id": "dtmi:example:psi_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -319,7 +319,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_zatz;1",
+        "@id": "dtmi:example:psi_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -337,7 +337,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_jogg;1",
+        "@id": "dtmi:example:psi_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -354,7 +354,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_flunn;1",
+        "@id": "dtmi:example:psi_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -372,7 +372,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_itch;1",
+        "@id": "dtmi:example:psi_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -389,7 +389,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_yekk;1",
+        "@id": "dtmi:example:psi_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -407,7 +407,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_vroo;1",
+        "@id": "dtmi:example:psi_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -424,7 +424,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_hi;1",
+        "@id": "dtmi:example:psi_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyNameStringLengthV2.json
index d7630a25..05f7f3ca 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyNameStringLengthV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_pi;1",
+        "@id": "dtmi:example:psi_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -24,7 +24,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_rho;1",
+        "@id": "dtmi:example:psi_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -41,7 +41,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_sigma;1",
+        "@id": "dtmi:example:psi_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyNameStringV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyNameStringV2.json
index 3b96408a..657973fc 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyNameStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyNameStringV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_zatz;1",
+        "@id": "dtmi:example:chi_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -24,7 +24,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_jogg;1",
+        "@id": "dtmi:example:chi_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -43,7 +43,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_flunn;1",
+        "@id": "dtmi:example:chi_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -63,7 +63,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_itch;1",
+        "@id": "dtmi:example:chi_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -85,7 +85,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_yekk;1",
+        "@id": "dtmi:example:chi_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -102,7 +102,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_vroo;1",
+        "@id": "dtmi:example:chi_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -120,7 +120,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_hi;1",
+        "@id": "dtmi:example:chi_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -137,7 +137,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_alpha;1",
+        "@id": "dtmi:example:psi_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -155,7 +155,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_beta;1",
+        "@id": "dtmi:example:psi_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -172,7 +172,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_gamma;1",
+        "@id": "dtmi:example:psi_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -190,7 +190,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_delta;1",
+        "@id": "dtmi:example:psi_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -209,7 +209,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_epsilon;1",
+        "@id": "dtmi:example:psi_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -229,7 +229,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_zeta;1",
+        "@id": "dtmi:example:psi_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -248,7 +248,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_eta;1",
+        "@id": "dtmi:example:psi_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -268,7 +268,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_theta;1",
+        "@id": "dtmi:example:psi_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -287,7 +287,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_iota;1",
+        "@id": "dtmi:example:psi_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -307,7 +307,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_kappa;1",
+        "@id": "dtmi:example:psi_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -324,7 +324,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_lambda;1",
+        "@id": "dtmi:example:psi_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -342,7 +342,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_mu;1",
+        "@id": "dtmi:example:psi_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -361,7 +361,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_nu;1",
+        "@id": "dtmi:example:psi_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -381,7 +381,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_xi;1",
+        "@id": "dtmi:example:psi_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -398,7 +398,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_omicron;1",
+        "@id": "dtmi:example:psi_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyNameTermAndDtmiV2.json
index 368f43b0..4805bb7e 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyNameTermAndDtmiV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_mu;1",
+        "@id": "dtmi:example:omega_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_kappa",
-          "dtmi:dtdl:property:name;2": "chi_lambda"
+          "name": "omega_kappa",
+          "dtmi:dtdl:property:name;2": "omega_lambda"
         }
       }
     ]
@@ -25,13 +25,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_omicron;1",
+        "@id": "dtmi:example:omega_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "chi_nu",
-          "dtmi:dtdl:property:name;2": "chi_xi"
+          "name": "omega_nu",
+          "dtmi:dtdl:property:name;2": "omega_xi"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyNameUniqueAmongInterfaceContentsV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyNameUniqueAmongInterfaceContentsV2.json
index aa5b7857..1b99c2be 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyNameUniqueAmongInterfaceContentsV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyNameUniqueAmongInterfaceContentsV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_alpha;1",
+        "@id": "dtmi:example:omega_alpha;1",
         "@type": "Interface",
         "contents": [
           {
@@ -30,7 +30,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_beta;1",
+        "@id": "dtmi:example:omega_beta;1",
         "@type": "Interface",
         "contents": [
           {
@@ -56,7 +56,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:chi_gamma;1",
+        "@id": "dtmi:example:omega_gamma;1",
         "@type": "Interface",
         "contents": [
           {
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyRequestElementV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyRequestElementV2.json
index 24fa4ca9..0f23378a 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyRequestElementV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyRequestElementV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_spazz;1",
+        "@id": "dtmi:example:jogg_yekk;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:floob_thnad;1",
+          "@id": "dtmi:example:jogg_itch;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "floob_quan",
+            "name": "jogg_flunn",
             "request": {
-              "@id": "dtmi:example:floob_nuh;1",
-              "name": "floob_snee",
-              "schema": "dateTime"
+              "@id": "dtmi:example:jogg_zatz;1",
+              "name": "jogg_jogg",
+              "schema": "duration"
             }
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_itch;1",
+        "@id": "dtmi:example:flunn_gamma;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:floob_flunn;1",
+          "@id": "dtmi:example:flunn_beta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "floob_jogg",
+            "name": "flunn_alpha",
             "request": [
               {
-                "@id": "dtmi:example:floob_floob;1",
-                "name": "floob_zatz",
-                "schema": "double"
+                "@id": "dtmi:example:jogg_vroo;1",
+                "name": "jogg_hi",
+                "schema": "float"
               }
             ]
           }
@@ -61,21 +61,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_hi;1",
+        "@id": "dtmi:example:flunn_zeta;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Command",
-            "name": "floob_vroo",
+            "name": "flunn_epsilon",
             "request": {
               "@id": "dtmi:ex:dependentRef;1",
-              "name": "floob_yekk",
-              "schema": "duration"
+              "name": "flunn_delta",
+              "schema": "integer"
             }
           },
           {
             "@type": "Command",
-            "name": "zatz_alpha",
+            "name": "flunn_eta",
             "request": "dtmi:ex:dependentRef;1"
           }
         ]
@@ -90,21 +90,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_delta;1",
+        "@id": "dtmi:example:flunn_kappa;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Command",
-            "name": "zatz_gamma",
+            "name": "flunn_iota",
             "request": {
               "@id": "dtmi:ex:dependentRef;1",
-              "name": "zatz_beta",
-              "schema": "float"
+              "name": "flunn_theta",
+              "schema": "long"
             }
           },
           {
             "@type": "Command",
-            "name": "zatz_epsilon",
+            "name": "flunn_lambda",
             "request": [
               "dtmi:ex:dependentRef;1"
             ]
@@ -121,19 +121,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_kappa;1",
+        "@id": "dtmi:example:flunn_pi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zatz_iota;1",
+          "@id": "dtmi:example:flunn_omicron;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "zatz_theta",
+            "name": "flunn_xi",
             "request": {
-              "@id": "dtmi:example:zatz_zeta;1",
+              "@id": "dtmi:example:flunn_mu;1",
               "@type": "CommandPayload",
-              "name": "zatz_eta",
-              "schema": "integer",
+              "name": "flunn_nu",
+              "schema": "string",
               "@context": "dtmi:dtdl:context;3"
             }
           }
@@ -149,20 +149,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_omicron;1",
+        "@id": "dtmi:example:flunn_phi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zatz_xi;1",
+          "@id": "dtmi:example:flunn_upsilon;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Command",
-            "name": "zatz_nu",
+            "name": "flunn_tau",
             "request": {
-              "@id": "dtmi:example:zatz_lambda;1",
+              "@id": "dtmi:example:flunn_rho;1",
               "@type": "CommandPayload",
-              "name": "zatz_mu",
-              "schema": "long",
+              "name": "flunn_sigma",
+              "schema": "time",
               "@context": "dtmi:dtdl:context;3"
             }
           }
@@ -170,6 +170,63 @@
       }
     ]
   },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:flunn_wum;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:flunn_yuzz;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "flunn_omega",
+            "request": {
+              "@id": "dtmi:example:flunn_chi;1",
+              "@type": "CommandPayload",
+              "name": "flunn_psi",
+              "schema": "unsignedByte",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:flunn_nuh;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:flunn_glikk;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Command",
+            "name": "flunn_fuddle",
+            "request": {
+              "@id": "dtmi:example:flunn_um;1",
+              "@type": "CommandPayload",
+              "name": "flunn_humpf",
+              "schema": "unsignedInteger",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
   {
     "valid": true,
     "options": [
@@ -178,14 +235,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_sigma;1",
+        "@id": "dtmi:example:flunn_thnad;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zatz_rho;1",
+          "@id": "dtmi:example:flunn_quan;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "zatz_pi",
+            "name": "flunn_snee",
             "request": []
           }
         }
@@ -200,24 +257,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_yuzz;1",
+        "@id": "dtmi:example:flunn_yekk;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zatz_omega;1",
+          "@id": "dtmi:example:flunn_itch;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "zatz_psi",
+            "name": "flunn_flunn",
             "request": [
               {
-                "@id": "dtmi:example:zatz_tau;1",
-                "name": "zatz_upsilon",
-                "schema": "string"
+                "@id": "dtmi:example:flunn_spazz;1",
+                "name": "flunn_floob",
+                "schema": "dateTime"
               },
               {
-                "@id": "dtmi:example:zatz_phi;1",
-                "name": "zatz_chi",
-                "schema": "time"
+                "@id": "dtmi:example:flunn_zatz;1",
+                "name": "flunn_jogg",
+                "schema": "double"
               }
             ]
           }
@@ -233,25 +290,25 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_snee;1",
+        "@id": "dtmi:example:itch_epsilon;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zatz_nuh;1",
+          "@id": "dtmi:example:itch_delta;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Command",
-            "name": "zatz_glikk",
+            "name": "itch_gamma",
             "request": [
               {
-                "@id": "dtmi:example:zatz_wum;1",
-                "name": "zatz_um",
-                "schema": "boolean"
+                "@id": "dtmi:example:flunn_vroo;1",
+                "name": "flunn_hi",
+                "schema": "duration"
               },
               {
-                "@id": "dtmi:example:zatz_humpf;1",
-                "name": "zatz_fuddle",
-                "schema": "date"
+                "@id": "dtmi:example:itch_alpha;1",
+                "name": "itch_beta",
+                "schema": "float"
               }
             ]
           }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyRequestTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyRequestTermAndDtmiV2.json
index d01f4fc9..6c17bd73 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyRequestTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyRequestTermAndDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_jogg;1",
+        "@id": "dtmi:example:hi_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "itch_spazz",
+          "name": "hi_theta",
           "request": {
-            "name": "itch_floob",
-            "schema": "boolean"
+            "name": "hi_iota",
+            "schema": "duration"
           },
           "dtmi:dtdl:property:request;2": {
-            "name": "itch_zatz",
-            "schema": "date"
+            "name": "hi_kappa",
+            "schema": "float"
           }
         }
       }
@@ -32,19 +32,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_vroo;1",
+        "@id": "dtmi:example:hi_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "itch_flunn",
+          "name": "hi_mu",
           "request": {
-            "name": "itch_itch",
-            "schema": "dateTime"
+            "name": "hi_nu",
+            "schema": "integer"
           },
           "dtmi:dtdl:property:request;2": {
-            "name": "itch_yekk",
-            "schema": "double"
+            "name": "hi_xi",
+            "schema": "long"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyRequestTypeConformanceV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyRequestTypeConformanceV2.json
index e98ae986..04d2e3ca 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyRequestTypeConformanceV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyRequestTypeConformanceV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_yekk;1",
+        "@id": "dtmi:example:itch_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zatz_itch",
+          "name": "itch_nu",
           "request": {
-            "@id": "dtmi:example:zatz_flunn;1",
-            "elementSchema": "dateTime",
+            "@id": "dtmi:example:itch_mu;1",
+            "elementSchema": "integer",
             "@type": "Array"
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_alpha;1",
+        "@id": "dtmi:example:itch_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "zatz_hi",
+          "name": "itch_pi",
           "request": {
-            "@id": "dtmi:example:zatz_vroo;1",
-            "elementSchema": "double",
+            "@id": "dtmi:example:itch_omicron;1",
+            "elementSchema": "long",
             "@type": "Array"
           }
         }
@@ -52,14 +52,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_epsilon;1",
+        "@id": "dtmi:example:itch_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "jogg_delta",
+          "name": "itch_upsilon",
           "request": {
-            "@id": "dtmi:example:jogg_beta;1",
-            "name": "jogg_gamma",
+            "@id": "dtmi:example:itch_sigma;1",
+            "name": "itch_tau",
             "@type": "Command"
           }
         }
@@ -74,15 +74,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_iota;1",
+        "@id": "dtmi:example:itch_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "jogg_theta",
+          "name": "itch_omega",
           "request": {
-            "@id": "dtmi:example:jogg_zeta;1",
-            "name": "jogg_eta",
+            "@id": "dtmi:example:itch_chi;1",
+            "name": "itch_psi",
             "@type": "Command"
           }
         }
@@ -97,15 +97,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_nu;1",
+        "@id": "dtmi:example:itch_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "jogg_mu",
+          "name": "itch_humpf",
           "request": {
-            "@id": "dtmi:example:jogg_kappa;1",
-            "name": "jogg_lambda",
-            "schema": "duration",
+            "@id": "dtmi:example:itch_wum;1",
+            "name": "itch_um",
+            "schema": "string",
             "@type": "CommandPayload"
           }
         }
@@ -120,16 +120,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_sigma;1",
+        "@id": "dtmi:example:itch_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "jogg_rho",
+          "name": "itch_quan",
           "request": {
-            "@id": "dtmi:example:jogg_xi;1",
-            "name": "jogg_omicron",
+            "@id": "dtmi:example:itch_glikk;1",
+            "name": "itch_nuh",
             "schema": {
-              "@id": "dtmi:example:jogg_pi;1",
+              "@id": "dtmi:example:itch_snee;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -146,17 +146,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_psi;1",
+        "@id": "dtmi:example:itch_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "jogg_chi",
+          "name": "itch_jogg",
           "request": {
-            "@id": "dtmi:example:jogg_tau;1",
-            "name": "jogg_upsilon",
+            "@id": "dtmi:example:itch_spazz;1",
+            "name": "itch_floob",
             "schema": {
-              "@id": "dtmi:example:jogg_phi;1",
+              "@id": "dtmi:example:itch_zatz;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -173,17 +173,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_um;1",
+        "@id": "dtmi:example:itch_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "jogg_wum",
+          "name": "itch_vroo",
           "request": {
-            "@id": "dtmi:example:jogg_omega;1",
+            "@id": "dtmi:example:itch_itch;1",
             "enumValues": [
               {
-                "enumValue": 28,
-                "name": "jogg_yuzz"
+                "enumValue": 35,
+                "name": "itch_yekk"
               }
             ],
             "valueSchema": "integer",
@@ -201,18 +201,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_nuh;1",
+        "@id": "dtmi:example:yekk_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "jogg_glikk",
+          "name": "yekk_gamma",
           "request": {
-            "@id": "dtmi:example:jogg_humpf;1",
+            "@id": "dtmi:example:yekk_alpha;1",
             "enumValues": [
               {
-                "enumValue": 29,
-                "name": "jogg_fuddle"
+                "enumValue": 36,
+                "name": "yekk_beta"
               }
             ],
             "valueSchema": "integer",
@@ -230,15 +230,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_spazz;1",
+        "@id": "dtmi:example:yekk_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "jogg_thnad",
+          "name": "yekk_eta",
           "request": {
-            "@id": "dtmi:example:jogg_snee;1",
-            "enumValue": 30,
-            "name": "jogg_quan",
+            "@id": "dtmi:example:yekk_epsilon;1",
+            "enumValue": 37,
+            "name": "yekk_zeta",
             "@type": "EnumValue"
           }
         }
@@ -253,16 +253,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_flunn;1",
+        "@id": "dtmi:example:yekk_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "jogg_jogg",
+          "name": "yekk_lambda",
           "request": {
-            "@id": "dtmi:example:jogg_floob;1",
-            "enumValue": 31,
-            "name": "jogg_zatz",
+            "@id": "dtmi:example:yekk_iota;1",
+            "enumValue": 38,
+            "name": "yekk_kappa",
             "@type": "EnumValue"
           }
         }
@@ -277,15 +277,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_hi;1",
+        "@id": "dtmi:example:yekk_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "jogg_vroo",
+          "name": "yekk_omicron",
           "request": {
-            "@id": "dtmi:example:jogg_itch;1",
-            "name": "jogg_yekk",
-            "schema": "float",
+            "@id": "dtmi:example:yekk_nu;1",
+            "name": "yekk_xi",
+            "schema": "time",
             "@type": "Field"
           }
         }
@@ -300,16 +300,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_delta;1",
+        "@id": "dtmi:example:yekk_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "flunn_gamma",
+          "name": "yekk_tau",
           "request": {
-            "@id": "dtmi:example:flunn_alpha;1",
-            "name": "flunn_beta",
-            "schema": "integer",
+            "@id": "dtmi:example:yekk_rho;1",
+            "name": "yekk_sigma",
+            "schema": "boolean",
             "@type": "Field"
           }
         }
@@ -324,13 +324,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_eta;1",
+        "@id": "dtmi:example:yekk_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "flunn_zeta",
+          "name": "yekk_chi",
           "request": {
-            "@id": "dtmi:example:flunn_epsilon;1",
+            "@id": "dtmi:example:yekk_phi;1",
             "@type": "Interface"
           }
         }
@@ -345,14 +345,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_kappa;1",
+        "@id": "dtmi:example:yekk_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "flunn_iota",
+          "name": "yekk_yuzz",
           "request": {
-            "@id": "dtmi:example:flunn_theta;1",
+            "@id": "dtmi:example:yekk_omega;1",
             "@type": "Interface"
           }
         }
@@ -367,20 +367,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_omicron;1",
+        "@id": "dtmi:example:yekk_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "flunn_xi",
+          "name": "yekk_glikk",
           "request": {
-            "@id": "dtmi:example:flunn_lambda;1",
+            "@id": "dtmi:example:yekk_um;1",
             "mapKey": {
-              "name": "flunn_mu",
+              "name": "yekk_humpf",
               "schema": "string"
             },
             "mapValue": {
-              "name": "flunn_nu",
-              "schema": "long"
+              "name": "yekk_fuddle",
+              "schema": "date"
             },
             "@type": "Map"
           }
@@ -396,21 +396,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_upsilon;1",
+        "@id": "dtmi:example:yekk_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "flunn_tau",
+          "name": "yekk_spazz",
           "request": {
-            "@id": "dtmi:example:flunn_pi;1",
+            "@id": "dtmi:example:yekk_snee;1",
             "mapKey": {
-              "name": "flunn_rho",
+              "name": "yekk_quan",
               "schema": "string"
             },
             "mapValue": {
-              "name": "flunn_sigma",
-              "schema": "string"
+              "name": "yekk_thnad",
+              "schema": "dateTime"
             },
             "@type": "Map"
           }
@@ -426,14 +426,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_omega;1",
+        "@id": "dtmi:example:yekk_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "flunn_psi",
+          "name": "yekk_flunn",
           "request": {
-            "@id": "dtmi:example:flunn_phi;1",
-            "name": "flunn_chi",
+            "@id": "dtmi:example:yekk_zatz;1",
+            "name": "yekk_jogg",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -449,15 +449,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_humpf;1",
+        "@id": "dtmi:example:vroo_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "flunn_um",
+          "name": "yekk_hi",
           "request": {
-            "@id": "dtmi:example:flunn_yuzz;1",
-            "name": "flunn_wum",
+            "@id": "dtmi:example:yekk_yekk;1",
+            "name": "yekk_vroo",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -473,15 +473,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_snee;1",
+        "@id": "dtmi:example:vroo_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "flunn_nuh",
+          "name": "vroo_delta",
           "request": {
-            "@id": "dtmi:example:flunn_fuddle;1",
-            "name": "flunn_glikk",
-            "schema": "time",
+            "@id": "dtmi:example:vroo_beta;1",
+            "name": "vroo_gamma",
+            "schema": "double",
             "@type": "MapValue"
           }
         }
@@ -496,16 +496,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_floob;1",
+        "@id": "dtmi:example:vroo_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "flunn_spazz",
+          "name": "vroo_theta",
           "request": {
-            "@id": "dtmi:example:flunn_quan;1",
-            "name": "flunn_thnad",
-            "schema": "boolean",
+            "@id": "dtmi:example:vroo_zeta;1",
+            "name": "vroo_eta",
+            "schema": "duration",
             "@type": "MapValue"
           }
         }
@@ -520,17 +520,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_itch;1",
+        "@id": "dtmi:example:vroo_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "flunn_flunn",
+          "name": "vroo_mu",
           "request": {
-            "@id": "dtmi:example:flunn_zatz;1",
+            "@id": "dtmi:example:vroo_kappa;1",
             "fields": [
               {
-                "name": "flunn_jogg",
-                "schema": "date"
+                "name": "vroo_lambda",
+                "schema": "float"
               }
             ],
             "@type": "Object"
@@ -547,18 +547,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_alpha;1",
+        "@id": "dtmi:example:vroo_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "flunn_hi",
+          "name": "vroo_pi",
           "request": {
-            "@id": "dtmi:example:flunn_yekk;1",
+            "@id": "dtmi:example:vroo_xi;1",
             "fields": [
               {
-                "name": "flunn_vroo",
-                "schema": "dateTime"
+                "name": "vroo_omicron",
+                "schema": "integer"
               }
             ],
             "@type": "Object"
@@ -575,15 +575,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_epsilon;1",
+        "@id": "dtmi:example:vroo_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "itch_delta",
+          "name": "vroo_upsilon",
           "request": {
-            "@id": "dtmi:example:itch_beta;1",
-            "name": "itch_gamma",
-            "schema": "double",
+            "@id": "dtmi:example:vroo_sigma;1",
+            "name": "vroo_tau",
+            "schema": "long",
             "@type": "Property"
           }
         }
@@ -598,16 +598,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_iota;1",
+        "@id": "dtmi:example:vroo_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "itch_theta",
+          "name": "vroo_omega",
           "request": {
-            "@id": "dtmi:example:itch_zeta;1",
-            "name": "itch_eta",
-            "schema": "duration",
+            "@id": "dtmi:example:vroo_chi;1",
+            "name": "vroo_psi",
+            "schema": "string",
             "@type": "Property"
           }
         }
@@ -622,14 +622,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_nu;1",
+        "@id": "dtmi:example:vroo_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "itch_mu",
+          "name": "vroo_humpf",
           "request": {
-            "@id": "dtmi:example:itch_kappa;1",
-            "name": "itch_lambda",
+            "@id": "dtmi:example:vroo_wum;1",
+            "name": "vroo_um",
             "@type": "Relationship"
           }
         }
@@ -644,15 +644,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_rho;1",
+        "@id": "dtmi:example:vroo_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "itch_pi",
+          "name": "vroo_snee",
           "request": {
-            "@id": "dtmi:example:itch_xi;1",
-            "name": "itch_omicron",
+            "@id": "dtmi:example:vroo_glikk;1",
+            "name": "vroo_nuh",
             "@type": "Relationship"
           }
         }
@@ -667,15 +667,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_phi;1",
+        "@id": "dtmi:example:vroo_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "itch_upsilon",
+          "name": "vroo_floob",
           "request": {
-            "@id": "dtmi:example:itch_sigma;1",
-            "name": "itch_tau",
-            "schema": "float",
+            "@id": "dtmi:example:vroo_thnad;1",
+            "name": "vroo_spazz",
+            "schema": "time",
             "@type": "Telemetry"
           }
         }
@@ -690,16 +690,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_yuzz;1",
+        "@id": "dtmi:example:vroo_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "itch_omega",
+          "name": "vroo_itch",
           "request": {
-            "@id": "dtmi:example:itch_chi;1",
-            "name": "itch_psi",
-            "schema": "integer",
+            "@id": "dtmi:example:vroo_jogg;1",
+            "name": "vroo_flunn",
+            "schema": "boolean",
             "@type": "Telemetry"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyResponseElementV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyResponseElementV2.json
index 11cb57e4..60dbadd9 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyResponseElementV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyResponseElementV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_delta;1",
+        "@id": "dtmi:example:hi_upsilon;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:yekk_gamma;1",
+          "@id": "dtmi:example:hi_tau;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "yekk_beta",
+            "name": "hi_sigma",
             "response": {
-              "@id": "dtmi:example:itch_hi;1",
-              "name": "yekk_alpha",
-              "schema": "duration"
+              "@id": "dtmi:example:hi_pi;1",
+              "name": "hi_rho",
+              "schema": "string"
             }
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_iota;1",
+        "@id": "dtmi:example:hi_yuzz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:yekk_theta;1",
+          "@id": "dtmi:example:hi_omega;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "yekk_eta",
+            "name": "hi_psi",
             "response": [
               {
-                "@id": "dtmi:example:yekk_epsilon;1",
-                "name": "yekk_zeta",
-                "schema": "float"
+                "@id": "dtmi:example:hi_phi;1",
+                "name": "hi_chi",
+                "schema": "time"
               }
             ]
           }
@@ -61,21 +61,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_mu;1",
+        "@id": "dtmi:example:hi_humpf;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Command",
-            "name": "yekk_lambda",
+            "name": "hi_um",
             "request": {
               "@id": "dtmi:ex:dependentRef;1",
-              "name": "yekk_kappa",
-              "schema": "integer"
+              "name": "hi_wum",
+              "schema": "boolean"
             }
           },
           {
             "@type": "Command",
-            "name": "yekk_nu",
+            "name": "hi_fuddle",
             "response": "dtmi:ex:dependentRef;1"
           }
         ]
@@ -90,21 +90,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_pi;1",
+        "@id": "dtmi:example:hi_snee;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Command",
-            "name": "yekk_omicron",
+            "name": "hi_nuh",
             "request": {
               "@id": "dtmi:ex:dependentRef;1",
-              "name": "yekk_xi",
-              "schema": "long"
+              "name": "hi_glikk",
+              "schema": "date"
             }
           },
           {
             "@type": "Command",
-            "name": "yekk_rho",
+            "name": "hi_quan",
             "response": [
               "dtmi:ex:dependentRef;1"
             ]
@@ -121,19 +121,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_chi;1",
+        "@id": "dtmi:example:hi_jogg;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:yekk_phi;1",
+          "@id": "dtmi:example:hi_zatz;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "yekk_upsilon",
+            "name": "hi_floob",
             "response": {
-              "@id": "dtmi:example:yekk_sigma;1",
+              "@id": "dtmi:example:hi_thnad;1",
               "@type": "CommandPayload",
-              "name": "yekk_tau",
-              "schema": "string",
+              "name": "hi_spazz",
+              "schema": "dateTime",
               "@context": "dtmi:dtdl:context;3"
             }
           }
@@ -149,20 +149,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_um;1",
+        "@id": "dtmi:example:hi_hi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:yekk_wum;1",
+          "@id": "dtmi:example:hi_vroo;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Command",
-            "name": "yekk_yuzz",
+            "name": "hi_yekk",
             "response": {
-              "@id": "dtmi:example:yekk_psi;1",
+              "@id": "dtmi:example:hi_flunn;1",
               "@type": "CommandPayload",
-              "name": "yekk_omega",
-              "schema": "time",
+              "name": "hi_itch",
+              "schema": "double",
               "@context": "dtmi:dtdl:context;3"
             }
           }
@@ -170,6 +170,63 @@
       }
     ]
   },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:alpha_epsilon;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:alpha_delta;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "alpha_gamma",
+            "response": {
+              "@id": "dtmi:example:alpha_alpha;1",
+              "@type": "CommandPayload",
+              "name": "alpha_beta",
+              "schema": "long",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:alpha_kappa;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:alpha_iota;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Command",
+            "name": "alpha_theta",
+            "response": {
+              "@id": "dtmi:example:alpha_zeta;1",
+              "@type": "CommandPayload",
+              "name": "alpha_eta",
+              "schema": "short",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
   {
     "valid": true,
     "options": [
@@ -178,14 +235,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_glikk;1",
+        "@id": "dtmi:example:alpha_nu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:yekk_fuddle;1",
+          "@id": "dtmi:example:alpha_mu;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "yekk_humpf",
+            "name": "alpha_lambda",
             "response": []
           }
         }
@@ -200,24 +257,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_zatz;1",
+        "@id": "dtmi:example:alpha_upsilon;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:yekk_floob;1",
+          "@id": "dtmi:example:alpha_tau;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "yekk_spazz",
+            "name": "alpha_sigma",
             "response": [
               {
-                "@id": "dtmi:example:yekk_nuh;1",
-                "name": "yekk_snee",
-                "schema": "boolean"
+                "@id": "dtmi:example:alpha_xi;1",
+                "name": "alpha_omicron",
+                "schema": "integer"
               },
               {
-                "@id": "dtmi:example:yekk_quan;1",
-                "name": "yekk_thnad",
-                "schema": "date"
+                "@id": "dtmi:example:alpha_pi;1",
+                "name": "alpha_rho",
+                "schema": "long"
               }
             ]
           }
@@ -233,25 +290,25 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_alpha;1",
+        "@id": "dtmi:example:alpha_um;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:yekk_hi;1",
+          "@id": "dtmi:example:alpha_wum;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Command",
-            "name": "yekk_vroo",
+            "name": "alpha_yuzz",
             "response": [
               {
-                "@id": "dtmi:example:yekk_jogg;1",
-                "name": "yekk_flunn",
-                "schema": "dateTime"
+                "@id": "dtmi:example:alpha_phi;1",
+                "name": "alpha_chi",
+                "schema": "string"
               },
               {
-                "@id": "dtmi:example:yekk_itch;1",
-                "name": "yekk_yekk",
-                "schema": "double"
+                "@id": "dtmi:example:alpha_psi;1",
+                "name": "alpha_omega",
+                "schema": "time"
               }
             ]
           }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyResponseTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyResponseTermAndDtmiV2.json
index 04c54d7f..7ee5c9fa 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyResponseTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyResponseTermAndDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_eta;1",
+        "@id": "dtmi:example:delta_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "beta_delta",
+          "name": "delta_glikk",
           "response": {
-            "name": "beta_epsilon",
-            "schema": "dateTime"
+            "name": "delta_nuh",
+            "schema": "string"
           },
           "dtmi:dtdl:property:response;2": {
-            "name": "beta_zeta",
-            "schema": "double"
+            "name": "delta_snee",
+            "schema": "time"
           }
         }
       }
@@ -32,19 +32,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_lambda;1",
+        "@id": "dtmi:example:delta_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "beta_theta",
+          "name": "delta_thnad",
           "response": {
-            "name": "beta_iota",
-            "schema": "duration"
+            "name": "delta_spazz",
+            "schema": "boolean"
           },
           "dtmi:dtdl:property:response;2": {
-            "name": "beta_kappa",
-            "schema": "float"
+            "name": "delta_floob",
+            "schema": "date"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandPropertyResponseTypeConformanceV2.json b/DTDL/v2/spec/Requirement-ClassCommandPropertyResponseTypeConformanceV2.json
index 70421e18..49479414 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandPropertyResponseTypeConformanceV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandPropertyResponseTypeConformanceV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_kappa;1",
+        "@id": "dtmi:example:alpha_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "vroo_iota",
+          "name": "alpha_spazz",
           "response": {
-            "@id": "dtmi:example:vroo_theta;1",
-            "elementSchema": "duration",
+            "@id": "dtmi:example:alpha_thnad;1",
+            "elementSchema": "boolean",
             "@type": "Array"
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_nu;1",
+        "@id": "dtmi:example:alpha_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "vroo_mu",
+          "name": "alpha_jogg",
           "response": {
-            "@id": "dtmi:example:vroo_lambda;1",
-            "elementSchema": "float",
+            "@id": "dtmi:example:alpha_zatz;1",
+            "elementSchema": "date",
             "@type": "Array"
           }
         }
@@ -52,14 +52,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_rho;1",
+        "@id": "dtmi:example:alpha_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "vroo_pi",
+          "name": "alpha_vroo",
           "response": {
-            "@id": "dtmi:example:vroo_xi;1",
-            "name": "vroo_omicron",
+            "@id": "dtmi:example:alpha_itch;1",
+            "name": "alpha_yekk",
             "@type": "Command"
           }
         }
@@ -74,15 +74,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_phi;1",
+        "@id": "dtmi:example:beta_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "vroo_upsilon",
+          "name": "beta_gamma",
           "response": {
-            "@id": "dtmi:example:vroo_sigma;1",
-            "name": "vroo_tau",
+            "@id": "dtmi:example:beta_alpha;1",
+            "name": "beta_beta",
             "@type": "Command"
           }
         }
@@ -97,15 +97,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_yuzz;1",
+        "@id": "dtmi:example:beta_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "vroo_omega",
+          "name": "beta_eta",
           "response": {
-            "@id": "dtmi:example:vroo_chi;1",
-            "name": "vroo_psi",
-            "schema": "integer",
+            "@id": "dtmi:example:beta_epsilon;1",
+            "name": "beta_zeta",
+            "schema": "dateTime",
             "@type": "CommandPayload"
           }
         }
@@ -120,16 +120,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_glikk;1",
+        "@id": "dtmi:example:beta_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "vroo_fuddle",
+          "name": "beta_mu",
           "response": {
-            "@id": "dtmi:example:vroo_wum;1",
-            "name": "vroo_um",
+            "@id": "dtmi:example:beta_iota;1",
+            "name": "beta_kappa",
             "schema": {
-              "@id": "dtmi:example:vroo_humpf;1",
+              "@id": "dtmi:example:beta_lambda;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -146,17 +146,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_spazz;1",
+        "@id": "dtmi:example:beta_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "vroo_thnad",
+          "name": "beta_rho",
           "response": {
-            "@id": "dtmi:example:vroo_nuh;1",
-            "name": "vroo_snee",
+            "@id": "dtmi:example:beta_xi;1",
+            "name": "beta_omicron",
             "schema": {
-              "@id": "dtmi:example:vroo_quan;1",
+              "@id": "dtmi:example:beta_pi;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -173,17 +173,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_flunn;1",
+        "@id": "dtmi:example:beta_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "vroo_jogg",
+          "name": "beta_phi",
           "response": {
-            "@id": "dtmi:example:vroo_floob;1",
+            "@id": "dtmi:example:beta_tau;1",
             "enumValues": [
               {
-                "enumValue": 32,
-                "name": "vroo_zatz"
+                "enumValue": 39,
+                "name": "beta_upsilon"
               }
             ],
             "valueSchema": "integer",
@@ -201,18 +201,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_hi;1",
+        "@id": "dtmi:example:beta_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "vroo_vroo",
+          "name": "beta_yuzz",
           "response": {
-            "@id": "dtmi:example:vroo_itch;1",
+            "@id": "dtmi:example:beta_psi;1",
             "enumValues": [
               {
-                "enumValue": 33,
-                "name": "vroo_yekk"
+                "enumValue": 40,
+                "name": "beta_omega"
               }
             ],
             "valueSchema": "integer",
@@ -230,15 +230,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_delta;1",
+        "@id": "dtmi:example:beta_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_gamma",
+          "name": "beta_fuddle",
           "response": {
-            "@id": "dtmi:example:hi_alpha;1",
-            "enumValue": 34,
-            "name": "hi_beta",
+            "@id": "dtmi:example:beta_um;1",
+            "enumValue": 41,
+            "name": "beta_humpf",
             "@type": "EnumValue"
           }
         }
@@ -253,16 +253,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_theta;1",
+        "@id": "dtmi:example:beta_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "hi_eta",
+          "name": "beta_quan",
           "response": {
-            "@id": "dtmi:example:hi_epsilon;1",
-            "enumValue": 35,
-            "name": "hi_zeta",
+            "@id": "dtmi:example:beta_nuh;1",
+            "enumValue": 42,
+            "name": "beta_snee",
             "@type": "EnumValue"
           }
         }
@@ -277,15 +277,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_mu;1",
+        "@id": "dtmi:example:beta_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_lambda",
+          "name": "beta_zatz",
           "response": {
-            "@id": "dtmi:example:hi_iota;1",
-            "name": "hi_kappa",
-            "schema": "long",
+            "@id": "dtmi:example:beta_spazz;1",
+            "name": "beta_floob",
+            "schema": "double",
             "@type": "Field"
           }
         }
@@ -300,16 +300,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_pi;1",
+        "@id": "dtmi:example:beta_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "hi_omicron",
+          "name": "beta_yekk",
           "response": {
-            "@id": "dtmi:example:hi_nu;1",
-            "name": "hi_xi",
-            "schema": "string",
+            "@id": "dtmi:example:beta_flunn;1",
+            "name": "beta_itch",
+            "schema": "duration",
             "@type": "Field"
           }
         }
@@ -324,13 +324,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_tau;1",
+        "@id": "dtmi:example:gamma_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_sigma",
+          "name": "gamma_alpha",
           "response": {
-            "@id": "dtmi:example:hi_rho;1",
+            "@id": "dtmi:example:beta_hi;1",
             "@type": "Interface"
           }
         }
@@ -345,14 +345,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_chi;1",
+        "@id": "dtmi:example:gamma_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "hi_phi",
+          "name": "gamma_delta",
           "response": {
-            "@id": "dtmi:example:hi_upsilon;1",
+            "@id": "dtmi:example:gamma_gamma;1",
             "@type": "Interface"
           }
         }
@@ -367,20 +367,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_um;1",
+        "@id": "dtmi:example:gamma_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_wum",
+          "name": "gamma_iota",
           "response": {
-            "@id": "dtmi:example:hi_psi;1",
+            "@id": "dtmi:example:gamma_zeta;1",
             "mapKey": {
-              "name": "hi_omega",
+              "name": "gamma_eta",
               "schema": "string"
             },
             "mapValue": {
-              "name": "hi_yuzz",
-              "schema": "time"
+              "name": "gamma_theta",
+              "schema": "float"
             },
             "@type": "Map"
           }
@@ -396,21 +396,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_snee;1",
+        "@id": "dtmi:example:gamma_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "hi_nuh",
+          "name": "gamma_xi",
           "response": {
-            "@id": "dtmi:example:hi_humpf;1",
+            "@id": "dtmi:example:gamma_lambda;1",
             "mapKey": {
-              "name": "hi_fuddle",
+              "name": "gamma_mu",
               "schema": "string"
             },
             "mapValue": {
-              "name": "hi_glikk",
-              "schema": "boolean"
+              "name": "gamma_nu",
+              "schema": "integer"
             },
             "@type": "Map"
           }
@@ -426,14 +426,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_floob;1",
+        "@id": "dtmi:example:gamma_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_spazz",
+          "name": "gamma_sigma",
           "response": {
-            "@id": "dtmi:example:hi_quan;1",
-            "name": "hi_thnad",
+            "@id": "dtmi:example:gamma_pi;1",
+            "name": "gamma_rho",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -449,15 +449,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_itch;1",
+        "@id": "dtmi:example:gamma_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "hi_flunn",
+          "name": "gamma_chi",
           "response": {
-            "@id": "dtmi:example:hi_zatz;1",
-            "name": "hi_jogg",
+            "@id": "dtmi:example:gamma_upsilon;1",
+            "name": "gamma_phi",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -473,15 +473,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_alpha;1",
+        "@id": "dtmi:example:gamma_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_hi",
+          "name": "gamma_wum",
           "response": {
-            "@id": "dtmi:example:hi_yekk;1",
-            "name": "hi_vroo",
-            "schema": "date",
+            "@id": "dtmi:example:gamma_omega;1",
+            "name": "gamma_yuzz",
+            "schema": "long",
             "@type": "MapValue"
           }
         }
@@ -496,16 +496,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_epsilon;1",
+        "@id": "dtmi:example:gamma_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "alpha_delta",
+          "name": "gamma_glikk",
           "response": {
-            "@id": "dtmi:example:alpha_beta;1",
-            "name": "alpha_gamma",
-            "schema": "dateTime",
+            "@id": "dtmi:example:gamma_humpf;1",
+            "name": "gamma_fuddle",
+            "schema": "string",
             "@type": "MapValue"
           }
         }
@@ -520,17 +520,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_iota;1",
+        "@id": "dtmi:example:gamma_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "alpha_theta",
+          "name": "gamma_thnad",
           "response": {
-            "@id": "dtmi:example:alpha_zeta;1",
+            "@id": "dtmi:example:gamma_snee;1",
             "fields": [
               {
-                "name": "alpha_eta",
-                "schema": "double"
+                "name": "gamma_quan",
+                "schema": "time"
               }
             ],
             "@type": "Object"
@@ -547,18 +547,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_nu;1",
+        "@id": "dtmi:example:gamma_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "alpha_mu",
+          "name": "gamma_jogg",
           "response": {
-            "@id": "dtmi:example:alpha_kappa;1",
+            "@id": "dtmi:example:gamma_floob;1",
             "fields": [
               {
-                "name": "alpha_lambda",
-                "schema": "duration"
+                "name": "gamma_zatz",
+                "schema": "boolean"
               }
             ],
             "@type": "Object"
@@ -575,15 +575,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_rho;1",
+        "@id": "dtmi:example:gamma_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "alpha_pi",
+          "name": "gamma_vroo",
           "response": {
-            "@id": "dtmi:example:alpha_xi;1",
-            "name": "alpha_omicron",
-            "schema": "float",
+            "@id": "dtmi:example:gamma_itch;1",
+            "name": "gamma_yekk",
+            "schema": "date",
             "@type": "Property"
           }
         }
@@ -598,16 +598,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_phi;1",
+        "@id": "dtmi:example:delta_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "alpha_upsilon",
+          "name": "delta_gamma",
           "response": {
-            "@id": "dtmi:example:alpha_sigma;1",
-            "name": "alpha_tau",
-            "schema": "integer",
+            "@id": "dtmi:example:delta_alpha;1",
+            "name": "delta_beta",
+            "schema": "dateTime",
             "@type": "Property"
           }
         }
@@ -622,14 +622,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_yuzz;1",
+        "@id": "dtmi:example:delta_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "alpha_omega",
+          "name": "delta_eta",
           "response": {
-            "@id": "dtmi:example:alpha_chi;1",
-            "name": "alpha_psi",
+            "@id": "dtmi:example:delta_epsilon;1",
+            "name": "delta_zeta",
             "@type": "Relationship"
           }
         }
@@ -644,15 +644,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_fuddle;1",
+        "@id": "dtmi:example:delta_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "alpha_humpf",
+          "name": "delta_lambda",
           "response": {
-            "@id": "dtmi:example:alpha_wum;1",
-            "name": "alpha_um",
+            "@id": "dtmi:example:delta_iota;1",
+            "name": "delta_kappa",
             "@type": "Relationship"
           }
         }
@@ -667,15 +667,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_quan;1",
+        "@id": "dtmi:example:delta_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "alpha_snee",
+          "name": "delta_omicron",
           "response": {
-            "@id": "dtmi:example:alpha_glikk;1",
-            "name": "alpha_nuh",
-            "schema": "long",
+            "@id": "dtmi:example:delta_nu;1",
+            "name": "delta_xi",
+            "schema": "double",
             "@type": "Telemetry"
           }
         }
@@ -690,16 +690,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_zatz;1",
+        "@id": "dtmi:example:delta_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "alpha_floob",
+          "name": "delta_tau",
           "response": {
-            "@id": "dtmi:example:alpha_thnad;1",
-            "name": "alpha_spazz",
-            "schema": "string",
+            "@id": "dtmi:example:delta_rho;1",
+            "name": "delta_sigma",
+            "schema": "duration",
             "@type": "Telemetry"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassCommandRequiredPropertiesV2.json b/DTDL/v2/spec/Requirement-ClassCommandRequiredPropertiesV2.json
index 2095fcb0..4c57455b 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandRequiredPropertiesV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandRequiredPropertiesV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_alpha;1",
+        "@id": "dtmi:example:phi_alpha;1",
         "@type": "Interface",
         "contents": {
-          "name": "sigma_hi"
+          "name": "upsilon_hi"
         }
       }
     ]
@@ -23,11 +23,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_gamma;1",
+        "@id": "dtmi:example:phi_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "tau_beta"
+          "name": "phi_beta"
         }
       }
     ]
@@ -40,7 +40,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_delta;1",
+        "@id": "dtmi:example:phi_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command"
@@ -56,7 +56,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_epsilon;1",
+        "@id": "dtmi:example:phi_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v2/spec/Requirement-ClassCommandTypeIncludesInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassCommandTypeIncludesInvalidDtmiV2.json
index 93a707e0..62c1c93e 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandTypeIncludesInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandTypeIncludesInvalidDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_glikk;1",
+        "@id": "dtmi:example:chi_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Command",
             "dtmi:foo//bar"
           ],
-          "name": "upsilon_fuddle"
+          "name": "chi_fuddle"
         }
       }
     ]
@@ -27,7 +27,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_snee;1",
+        "@id": "dtmi:example:chi_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -35,7 +35,7 @@
             "Command",
             "dtmi:foo//bar"
           ],
-          "name": "upsilon_nuh"
+          "name": "chi_nuh"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassCommandTypeIncludesMaterialV2.json b/DTDL/v2/spec/Requirement-ClassCommandTypeIncludesMaterialV2.json
index ac985833..1474fc95 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandTypeIncludesMaterialV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandTypeIncludesMaterialV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_flunn;1",
+        "@id": "dtmi:example:phi_flunn;1",
         "@type": "Interface",
         "contents": {
-          "name": "tau_jogg",
+          "name": "phi_jogg",
           "@type": "Command"
         }
       }
@@ -24,10 +24,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_yekk;1",
+        "@id": "dtmi:example:phi_yekk;1",
         "@type": "Interface",
         "contents": {
-          "name": "tau_itch",
+          "name": "phi_itch",
           "@type": [
             "Command"
           ]
@@ -43,10 +43,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_hi;1",
+        "@id": "dtmi:example:phi_hi;1",
         "@type": "Interface",
         "contents": {
-          "name": "tau_vroo",
+          "name": "phi_vroo",
           "@type": "dtmi:dtdl:class:Command;2"
         }
       }
@@ -60,10 +60,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_beta;1",
+        "@id": "dtmi:example:chi_beta;1",
         "@type": "Interface",
         "contents": {
-          "name": "upsilon_alpha",
+          "name": "chi_alpha",
           "@type": [
             "dtmi:dtdl:class:Command;2"
           ]
@@ -79,10 +79,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_delta;1",
+        "@id": "dtmi:example:chi_delta;1",
         "@type": "Interface",
         "contents": {
-          "name": "upsilon_gamma",
+          "name": "chi_gamma",
           "@type": "Something"
         }
       }
@@ -96,11 +96,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_zeta;1",
+        "@id": "dtmi:example:chi_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "upsilon_epsilon",
+          "name": "chi_epsilon",
           "@type": "Something"
         }
       }
@@ -114,10 +114,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_theta;1",
+        "@id": "dtmi:example:chi_theta;1",
         "@type": "Interface",
         "contents": {
-          "name": "upsilon_eta",
+          "name": "chi_eta",
           "@type": [
             "Something"
           ]
@@ -133,11 +133,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_kappa;1",
+        "@id": "dtmi:example:chi_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "upsilon_iota",
+          "name": "chi_iota",
           "@type": [
             "Something"
           ]
diff --git a/DTDL/v2/spec/Requirement-ClassCommandTypeStringOrArrayV2.json b/DTDL/v2/spec/Requirement-ClassCommandTypeStringOrArrayV2.json
index dbef73e8..28b2f347 100644
--- a/DTDL/v2/spec/Requirement-ClassCommandTypeStringOrArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassCommandTypeStringOrArrayV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_eta;1",
+        "@id": "dtmi:example:phi_eta;1",
         "@type": "Interface",
         "contents": {
-          "name": "tau_zeta",
+          "name": "phi_zeta",
           "@type": 626
         }
       }
@@ -24,11 +24,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_iota;1",
+        "@id": "dtmi:example:phi_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "tau_theta",
+          "name": "phi_theta",
           "@type": 626
         }
       }
@@ -42,10 +42,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_lambda;1",
+        "@id": "dtmi:example:phi_lambda;1",
         "@type": "Interface",
         "contents": {
-          "name": "tau_kappa",
+          "name": "phi_kappa",
           "@type": null
         }
       }
@@ -59,11 +59,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_nu;1",
+        "@id": "dtmi:example:phi_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "tau_mu",
+          "name": "phi_mu",
           "@type": null
         }
       }
@@ -77,10 +77,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_omicron;1",
+        "@id": "dtmi:example:phi_omicron;1",
         "@type": "Interface",
         "contents": {
-          "name": "tau_xi",
+          "name": "phi_xi",
           "@type": true
         }
       }
@@ -94,11 +94,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_rho;1",
+        "@id": "dtmi:example:phi_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "tau_pi",
+          "name": "phi_pi",
           "@type": true
         }
       }
@@ -112,10 +112,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_tau;1",
+        "@id": "dtmi:example:phi_tau;1",
         "@type": "Interface",
         "contents": {
-          "name": "tau_sigma",
+          "name": "phi_sigma",
           "@type": {}
         }
       }
@@ -129,11 +129,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_phi;1",
+        "@id": "dtmi:example:phi_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "tau_upsilon",
+          "name": "phi_upsilon",
           "@type": {}
         }
       }
@@ -147,10 +147,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_psi;1",
+        "@id": "dtmi:example:phi_psi;1",
         "@type": "Interface",
         "contents": {
-          "name": "tau_chi",
+          "name": "phi_chi",
           "@type": [
             626
           ]
@@ -166,11 +166,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_yuzz;1",
+        "@id": "dtmi:example:phi_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "tau_omega",
+          "name": "phi_omega",
           "@type": [
             626
           ]
@@ -186,10 +186,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_um;1",
+        "@id": "dtmi:example:phi_um;1",
         "@type": "Interface",
         "contents": {
-          "name": "tau_wum",
+          "name": "phi_wum",
           "@type": [
             null
           ]
@@ -205,11 +205,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_fuddle;1",
+        "@id": "dtmi:example:phi_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "tau_humpf",
+          "name": "phi_humpf",
           "@type": [
             null
           ]
@@ -225,10 +225,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_nuh;1",
+        "@id": "dtmi:example:phi_nuh;1",
         "@type": "Interface",
         "contents": {
-          "name": "tau_glikk",
+          "name": "phi_glikk",
           "@type": [
             true
           ]
@@ -244,11 +244,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_quan;1",
+        "@id": "dtmi:example:phi_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "tau_snee",
+          "name": "phi_snee",
           "@type": [
             true
           ]
@@ -264,10 +264,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_spazz;1",
+        "@id": "dtmi:example:phi_spazz;1",
         "@type": "Interface",
         "contents": {
-          "name": "tau_thnad",
+          "name": "phi_thnad",
           "@type": [
             {}
           ]
@@ -283,11 +283,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_zatz;1",
+        "@id": "dtmi:example:phi_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "tau_floob",
+          "name": "phi_floob",
           "@type": [
             {}
           ]
diff --git a/DTDL/v2/spec/Requirement-ClassComponentContextConformsV2.json b/DTDL/v2/spec/Requirement-ClassComponentContextConformsV2.json
index 70d552cb..3b5bc8b3 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentContextConformsV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentContextConformsV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_snee;1",
+        "@id": "dtmi:example:hi_yekk;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:itch_nuh;1",
+          "@id": "dtmi:example:hi_itch;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "itch_fuddle",
+            "name": "hi_jogg",
             "schema": {
-              "@id": "dtmi:example:itch_glikk;1",
+              "@id": "dtmi:example:hi_flunn;1",
               "@type": "Interface"
             },
             "@context": "dtmi:iotcentral:context;2"
@@ -33,16 +33,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_floob;1",
+        "@id": "dtmi:example:alpha_beta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:itch_spazz;1",
+          "@id": "dtmi:example:alpha_alpha;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "itch_quan",
+            "name": "hi_vroo",
             "schema": {
-              "@id": "dtmi:example:itch_thnad;1",
+              "@id": "dtmi:example:hi_hi;1",
               "@type": "Interface"
             },
             "@context": []
@@ -59,16 +59,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_itch;1",
+        "@id": "dtmi:example:alpha_zeta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:itch_flunn;1",
+          "@id": "dtmi:example:alpha_epsilon;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "itch_zatz",
+            "name": "alpha_gamma",
             "schema": {
-              "@id": "dtmi:example:itch_jogg;1",
+              "@id": "dtmi:example:alpha_delta;1",
               "@type": "Interface"
             },
             "@context": [
@@ -87,16 +87,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_alpha;1",
+        "@id": "dtmi:example:alpha_kappa;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:itch_hi;1",
+          "@id": "dtmi:example:alpha_iota;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "itch_yekk",
+            "name": "alpha_eta",
             "schema": {
-              "@id": "dtmi:example:itch_vroo;1",
+              "@id": "dtmi:example:alpha_theta;1",
               "@type": "Interface"
             },
             "@context": null
@@ -113,16 +113,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_epsilon;1",
+        "@id": "dtmi:example:alpha_xi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:yekk_delta;1",
+          "@id": "dtmi:example:alpha_nu;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "yekk_beta",
+            "name": "alpha_lambda",
             "schema": {
-              "@id": "dtmi:example:yekk_gamma;1",
+              "@id": "dtmi:example:alpha_mu;1",
               "@type": "Interface"
             },
             "@context": 626
@@ -139,16 +139,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_iota;1",
+        "@id": "dtmi:example:alpha_sigma;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:yekk_theta;1",
+          "@id": "dtmi:example:alpha_rho;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "yekk_zeta",
+            "name": "alpha_omicron",
             "schema": {
-              "@id": "dtmi:example:yekk_eta;1",
+              "@id": "dtmi:example:alpha_pi;1",
               "@type": "Interface"
             },
             "@context": true
@@ -165,16 +165,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_nu;1",
+        "@id": "dtmi:example:alpha_chi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:yekk_mu;1",
+          "@id": "dtmi:example:alpha_phi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "yekk_kappa",
+            "name": "alpha_tau",
             "schema": {
-              "@id": "dtmi:example:yekk_lambda;1",
+              "@id": "dtmi:example:alpha_upsilon;1",
               "@type": "Interface"
             },
             "@context": [
@@ -193,16 +193,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_rho;1",
+        "@id": "dtmi:example:alpha_wum;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:yekk_pi;1",
+          "@id": "dtmi:example:alpha_yuzz;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "yekk_xi",
+            "name": "alpha_psi",
             "schema": {
-              "@id": "dtmi:example:yekk_omicron;1",
+              "@id": "dtmi:example:alpha_omega;1",
               "@type": "Interface"
             },
             "@context": [
@@ -221,16 +221,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_phi;1",
+        "@id": "dtmi:example:alpha_glikk;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:yekk_upsilon;1",
+          "@id": "dtmi:example:alpha_fuddle;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "yekk_sigma",
+            "name": "alpha_um",
             "schema": {
-              "@id": "dtmi:example:yekk_tau;1",
+              "@id": "dtmi:example:alpha_humpf;1",
               "@type": "Interface"
             },
             "@context": [
@@ -249,19 +249,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_yuzz;1",
+        "@id": "dtmi:example:alpha_thnad;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:yekk_omega;1",
+          "@id": "dtmi:example:alpha_quan;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "yekk_chi",
+            "name": "alpha_nuh",
             "schema": {
-              "@id": "dtmi:example:yekk_psi;1",
+              "@id": "dtmi:example:alpha_snee;1",
               "@type": "Interface"
             },
-            "@context": {}
+            "@context": "dtmi:iotcentral:context"
           }
         }
       }
@@ -275,21 +275,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_fuddle;1",
+        "@id": "dtmi:example:alpha_jogg;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:yekk_humpf;1",
+          "@id": "dtmi:example:alpha_zatz;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "yekk_wum",
+            "name": "alpha_spazz",
             "schema": {
-              "@id": "dtmi:example:yekk_um;1",
+              "@id": "dtmi:example:alpha_floob;1",
               "@type": "Interface"
             },
-            "@context": [
-              {}
-            ]
+            "@context": "http://iotcentral/context/2"
           }
         }
       }
@@ -303,19 +301,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_quan;1",
+        "@id": "dtmi:example:alpha_vroo;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:yekk_snee;1",
+          "@id": "dtmi:example:alpha_yekk;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "yekk_glikk",
+            "name": "alpha_flunn",
             "schema": {
-              "@id": "dtmi:example:yekk_nuh;1",
+              "@id": "dtmi:example:alpha_itch;1",
               "@type": "Interface"
             },
-            "@context": "dtmi:iotcentral:context"
+            "@context": "iotcentral;2"
           }
         }
       }
@@ -329,19 +327,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_zatz;1",
+        "@id": "dtmi:example:beta_gamma;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:yekk_floob;1",
+          "@id": "dtmi:example:beta_beta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "yekk_thnad",
+            "name": "alpha_hi",
             "schema": {
-              "@id": "dtmi:example:yekk_spazz;1",
+              "@id": "dtmi:example:beta_alpha;1",
               "@type": "Interface"
             },
-            "@context": "http://iotcentral/context/2"
+            "@context": {}
           }
         }
       }
@@ -355,19 +353,79 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_yekk;1",
+        "@id": "dtmi:example:beta_eta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:yekk_itch;1",
+          "@id": "dtmi:example:beta_zeta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "yekk_jogg",
+            "name": "beta_delta",
             "schema": {
-              "@id": "dtmi:example:yekk_flunn;1",
+              "@id": "dtmi:example:beta_epsilon;1",
               "@type": "Interface"
             },
-            "@context": "iotcentral;2"
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:beta_lambda;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:beta_kappa;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "beta_theta",
+            "schema": {
+              "@id": "dtmi:example:beta_iota;1",
+              "@type": "Interface"
+            },
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:beta_omicron;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:beta_xi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "beta_mu",
+            "schema": {
+              "@id": "dtmi:example:beta_nu;1",
+              "@type": "Interface"
+            },
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassComponentGraphKeywordV2.json b/DTDL/v2/spec/Requirement-ClassComponentGraphKeywordV2.json
index 5c2d50e3..0a9ae77c 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentGraphKeywordV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentGraphKeywordV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_snee;1",
+        "@id": "dtmi:example:xi_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "kappa_glikk",
+          "name": "xi_delta",
           "schema": {
-            "@id": "dtmi:example:kappa_nuh;1",
+            "@id": "dtmi:example:xi_epsilon;1",
             "@type": "Interface"
           },
           "@graph": {}
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_spazz;1",
+        "@id": "dtmi:example:xi_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "kappa_quan",
+          "name": "xi_eta",
           "schema": {
-            "@id": "dtmi:example:kappa_thnad;1",
+            "@id": "dtmi:example:xi_theta;1",
             "@type": "Interface"
           },
           "@graph": {}
diff --git a/DTDL/v2/spec/Requirement-ClassComponentIdDuplicateV2.json b/DTDL/v2/spec/Requirement-ClassComponentIdDuplicateV2.json
index b845d207..47967d5f 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentIdDuplicateV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentIdDuplicateV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_yuzz;1",
+        "@id": "dtmi:example:zeta_vroo;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:gamma_yuzz;1",
+          "@id": "dtmi:example:zeta_vroo;1",
           "@type": "Interface",
           "contents": {
-            "@id": "dtmi:example:gamma_yuzz;1",
+            "@id": "dtmi:example:zeta_vroo;1",
             "@type": "Component",
-            "name": "gamma_wum",
+            "name": "zeta_hi",
             "schema": {
-              "@id": "dtmi:example:gamma_um;1",
+              "@id": "dtmi:example:eta_alpha;1",
               "@type": "Interface"
             }
           }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_humpf;1",
+        "@id": "dtmi:example:eta_beta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:gamma_humpf;1",
+          "@id": "dtmi:example:eta_beta;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "@id": "dtmi:example:gamma_humpf;1",
+            "@id": "dtmi:example:eta_beta;1",
             "@type": "Component",
-            "name": "gamma_fuddle",
+            "name": "eta_gamma",
             "schema": {
-              "@id": "dtmi:example:gamma_glikk;1",
+              "@id": "dtmi:example:eta_delta;1",
               "@type": "Interface"
             }
           }
diff --git a/DTDL/v2/spec/Requirement-ClassComponentIdIsDtmiV2.json b/DTDL/v2/spec/Requirement-ClassComponentIdIsDtmiV2.json
index 7b68c21d..a0b1d5f1 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentIdIsDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentIdIsDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_alpha;1",
+        "@id": "dtmi:example:beta_sigma;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;7",
           "@type": "Component",
-          "name": "yekk_vroo",
+          "name": "beta_pi",
           "schema": {
-            "@id": "dtmi:example:yekk_hi;1",
+            "@id": "dtmi:example:beta_rho;1",
             "@type": "Interface"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_delta;1",
+        "@id": "dtmi:example:beta_phi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;108675309",
           "@type": "Component",
-          "name": "vroo_beta",
+          "name": "beta_tau",
           "schema": {
-            "@id": "dtmi:example:vroo_gamma;1",
+            "@id": "dtmi:example:beta_upsilon;1",
             "@type": "Interface"
           }
         }
@@ -51,14 +51,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_eta;1",
+        "@id": "dtmi:example:beta_omega;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;999999999",
           "@type": "Component",
-          "name": "vroo_epsilon",
+          "name": "beta_chi",
           "schema": {
-            "@id": "dtmi:example:vroo_zeta;1",
+            "@id": "dtmi:example:beta_psi;1",
             "@type": "Interface"
           }
         }
@@ -73,14 +73,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_kappa;1",
+        "@id": "dtmi:example:beta_um;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo;1",
           "@type": "Component",
-          "name": "vroo_theta",
+          "name": "beta_yuzz",
           "schema": {
-            "@id": "dtmi:example:vroo_iota;1",
+            "@id": "dtmi:example:beta_wum;1",
             "@type": "Interface"
           }
         }
@@ -95,14 +95,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_nu;1",
+        "@id": "dtmi:example:beta_glikk;1",
         "@type": "Interface",
         "contents": {
           "@id": null,
           "@type": "Component",
-          "name": "vroo_lambda",
+          "name": "beta_humpf",
           "schema": {
-            "@id": "dtmi:example:vroo_mu;1",
+            "@id": "dtmi:example:beta_fuddle;1",
             "@type": "Interface"
           }
         }
@@ -117,15 +117,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_pi;1",
+        "@id": "dtmi:example:beta_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": null,
           "@type": "Component",
-          "name": "vroo_xi",
+          "name": "beta_nuh",
           "schema": {
-            "@id": "dtmi:example:vroo_omicron;1",
+            "@id": "dtmi:example:beta_snee;1",
             "@type": "Interface"
           }
         }
@@ -140,14 +140,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_tau;1",
+        "@id": "dtmi:example:beta_floob;1",
         "@type": "Interface",
         "contents": {
           "@id": 626,
           "@type": "Component",
-          "name": "vroo_rho",
+          "name": "beta_thnad",
           "schema": {
-            "@id": "dtmi:example:vroo_sigma;1",
+            "@id": "dtmi:example:beta_spazz;1",
             "@type": "Interface"
           }
         }
@@ -162,15 +162,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_chi;1",
+        "@id": "dtmi:example:beta_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": 626,
           "@type": "Component",
-          "name": "vroo_upsilon",
+          "name": "beta_zatz",
           "schema": {
-            "@id": "dtmi:example:vroo_phi;1",
+            "@id": "dtmi:example:beta_jogg;1",
             "@type": "Interface"
           }
         }
@@ -185,14 +185,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_yuzz;1",
+        "@id": "dtmi:example:beta_vroo;1",
         "@type": "Interface",
         "contents": {
           "@id": true,
           "@type": "Component",
-          "name": "vroo_psi",
+          "name": "beta_itch",
           "schema": {
-            "@id": "dtmi:example:vroo_omega;1",
+            "@id": "dtmi:example:beta_yekk;1",
             "@type": "Interface"
           }
         }
@@ -207,15 +207,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_humpf;1",
+        "@id": "dtmi:example:gamma_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": true,
           "@type": "Component",
-          "name": "vroo_wum",
+          "name": "beta_hi",
           "schema": {
-            "@id": "dtmi:example:vroo_um;1",
+            "@id": "dtmi:example:gamma_alpha;1",
             "@type": "Interface"
           }
         }
@@ -230,16 +230,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_nuh;1",
+        "@id": "dtmi:example:gamma_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@id": {
             "@value": "dtmi:apparently:valid:identifier;3"
           },
           "@type": "Component",
-          "name": "vroo_fuddle",
+          "name": "gamma_gamma",
           "schema": {
-            "@id": "dtmi:example:vroo_glikk;1",
+            "@id": "dtmi:example:gamma_delta;1",
             "@type": "Interface"
           }
         }
@@ -254,7 +254,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_thnad;1",
+        "@id": "dtmi:example:gamma_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -262,9 +262,9 @@
             "@value": "dtmi:apparently:valid:identifier;3"
           },
           "@type": "Component",
-          "name": "vroo_snee",
+          "name": "gamma_zeta",
           "schema": {
-            "@id": "dtmi:example:vroo_quan;1",
+            "@id": "dtmi:example:gamma_eta;1",
             "@type": "Interface"
           }
         }
@@ -279,14 +279,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_zatz;1",
+        "@id": "dtmi:example:gamma_lambda;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0",
           "@type": "Component",
-          "name": "vroo_spazz",
+          "name": "gamma_iota",
           "schema": {
-            "@id": "dtmi:example:vroo_floob;1",
+            "@id": "dtmi:example:gamma_kappa;1",
             "@type": "Interface"
           }
         }
@@ -301,15 +301,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_itch;1",
+        "@id": "dtmi:example:gamma_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0",
           "@type": "Component",
-          "name": "vroo_jogg",
+          "name": "gamma_mu",
           "schema": {
-            "@id": "dtmi:example:vroo_flunn;1",
+            "@id": "dtmi:example:gamma_nu;1",
             "@type": "Interface"
           }
         }
@@ -324,14 +324,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_hi;1",
+        "@id": "dtmi:example:gamma_rho;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Component",
-          "name": "vroo_yekk",
+          "name": "gamma_omicron",
           "schema": {
-            "@id": "dtmi:example:vroo_vroo;1",
+            "@id": "dtmi:example:gamma_pi;1",
             "@type": "Interface"
           }
         }
@@ -346,15 +346,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_gamma;1",
+        "@id": "dtmi:example:gamma_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Component",
-          "name": "hi_alpha",
+          "name": "gamma_sigma",
           "schema": {
-            "@id": "dtmi:example:hi_beta;1",
+            "@id": "dtmi:example:gamma_tau;1",
             "@type": "Interface"
           }
         }
@@ -369,14 +369,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_zeta;1",
+        "@id": "dtmi:example:gamma_psi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Component",
-          "name": "hi_delta",
+          "name": "gamma_phi",
           "schema": {
-            "@id": "dtmi:example:hi_epsilon;1",
+            "@id": "dtmi:example:gamma_chi;1",
             "@type": "Interface"
           }
         }
@@ -391,15 +391,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_iota;1",
+        "@id": "dtmi:example:gamma_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Component",
-          "name": "hi_eta",
+          "name": "gamma_omega",
           "schema": {
-            "@id": "dtmi:example:hi_theta;1",
+            "@id": "dtmi:example:gamma_yuzz;1",
             "@type": "Interface"
           }
         }
@@ -414,14 +414,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_mu;1",
+        "@id": "dtmi:example:gamma_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;1a",
           "@type": "Component",
-          "name": "hi_kappa",
+          "name": "gamma_um",
           "schema": {
-            "@id": "dtmi:example:hi_lambda;1",
+            "@id": "dtmi:example:gamma_humpf;1",
             "@type": "Interface"
           }
         }
@@ -436,15 +436,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_omicron;1",
+        "@id": "dtmi:example:gamma_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1a",
           "@type": "Component",
-          "name": "hi_nu",
+          "name": "gamma_glikk",
           "schema": {
-            "@id": "dtmi:example:hi_xi;1",
+            "@id": "dtmi:example:gamma_nuh;1",
             "@type": "Interface"
           }
         }
@@ -459,14 +459,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_sigma;1",
+        "@id": "dtmi:example:gamma_spazz;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Component",
-          "name": "hi_pi",
+          "name": "gamma_quan",
           "schema": {
-            "@id": "dtmi:example:hi_rho;1",
+            "@id": "dtmi:example:gamma_thnad;1",
             "@type": "Interface"
           }
         }
@@ -481,15 +481,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_phi;1",
+        "@id": "dtmi:example:gamma_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Component",
-          "name": "hi_tau",
+          "name": "gamma_floob",
           "schema": {
-            "@id": "dtmi:example:hi_upsilon;1",
+            "@id": "dtmi:example:gamma_zatz;1",
             "@type": "Interface"
           }
         }
@@ -504,14 +504,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_omega;1",
+        "@id": "dtmi:example:gamma_yekk;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Component",
-          "name": "hi_chi",
+          "name": "gamma_flunn",
           "schema": {
-            "@id": "dtmi:example:hi_psi;1",
+            "@id": "dtmi:example:gamma_itch;1",
             "@type": "Interface"
           }
         }
@@ -526,15 +526,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_um;1",
+        "@id": "dtmi:example:delta_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Component",
-          "name": "hi_yuzz",
+          "name": "gamma_vroo",
           "schema": {
-            "@id": "dtmi:example:hi_wum;1",
+            "@id": "dtmi:example:gamma_hi;1",
             "@type": "Interface"
           }
         }
@@ -549,14 +549,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_glikk;1",
+        "@id": "dtmi:example:delta_delta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Component",
-          "name": "hi_humpf",
+          "name": "delta_beta",
           "schema": {
-            "@id": "dtmi:example:hi_fuddle;1",
+            "@id": "dtmi:example:delta_gamma;1",
             "@type": "Interface"
           }
         }
@@ -571,15 +571,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_quan;1",
+        "@id": "dtmi:example:delta_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Component",
-          "name": "hi_nuh",
+          "name": "delta_epsilon",
           "schema": {
-            "@id": "dtmi:example:hi_snee;1",
+            "@id": "dtmi:example:delta_zeta;1",
             "@type": "Interface"
           }
         }
@@ -594,14 +594,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_floob;1",
+        "@id": "dtmi:example:delta_kappa;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Component",
-          "name": "hi_thnad",
+          "name": "delta_theta",
           "schema": {
-            "@id": "dtmi:example:hi_spazz;1",
+            "@id": "dtmi:example:delta_iota;1",
             "@type": "Interface"
           }
         }
@@ -616,15 +616,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_flunn;1",
+        "@id": "dtmi:example:delta_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Component",
-          "name": "hi_zatz",
+          "name": "delta_lambda",
           "schema": {
-            "@id": "dtmi:example:hi_jogg;1",
+            "@id": "dtmi:example:delta_mu;1",
             "@type": "Interface"
           }
         }
@@ -639,14 +639,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_vroo;1",
+        "@id": "dtmi:example:delta_pi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;01",
           "@type": "Component",
-          "name": "hi_itch",
+          "name": "delta_xi",
           "schema": {
-            "@id": "dtmi:example:hi_yekk;1",
+            "@id": "dtmi:example:delta_omicron;1",
             "@type": "Interface"
           }
         }
@@ -661,15 +661,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_beta;1",
+        "@id": "dtmi:example:delta_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;01",
           "@type": "Component",
-          "name": "hi_hi",
+          "name": "delta_rho",
           "schema": {
-            "@id": "dtmi:example:alpha_alpha;1",
+            "@id": "dtmi:example:delta_sigma;1",
             "@type": "Interface"
           }
         }
@@ -684,14 +684,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_epsilon;1",
+        "@id": "dtmi:example:delta_chi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;",
           "@type": "Component",
-          "name": "alpha_gamma",
+          "name": "delta_upsilon",
           "schema": {
-            "@id": "dtmi:example:alpha_delta;1",
+            "@id": "dtmi:example:delta_phi;1",
             "@type": "Interface"
           }
         }
@@ -706,15 +706,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_theta;1",
+        "@id": "dtmi:example:delta_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;",
           "@type": "Component",
-          "name": "alpha_zeta",
+          "name": "delta_psi",
           "schema": {
-            "@id": "dtmi:example:alpha_eta;1",
+            "@id": "dtmi:example:delta_omega;1",
             "@type": "Interface"
           }
         }
@@ -729,14 +729,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_lambda;1",
+        "@id": "dtmi:example:delta_humpf;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Component",
-          "name": "alpha_iota",
+          "name": "delta_wum",
           "schema": {
-            "@id": "dtmi:example:alpha_kappa;1",
+            "@id": "dtmi:example:delta_um;1",
             "@type": "Interface"
           }
         }
@@ -751,15 +751,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_xi;1",
+        "@id": "dtmi:example:delta_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Component",
-          "name": "alpha_mu",
+          "name": "delta_fuddle",
           "schema": {
-            "@id": "dtmi:example:alpha_nu;1",
+            "@id": "dtmi:example:delta_glikk;1",
             "@type": "Interface"
           }
         }
@@ -774,14 +774,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_rho;1",
+        "@id": "dtmi:example:delta_thnad;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Component",
-          "name": "alpha_omicron",
+          "name": "delta_snee",
           "schema": {
-            "@id": "dtmi:example:alpha_pi;1",
+            "@id": "dtmi:example:delta_quan;1",
             "@type": "Interface"
           }
         }
@@ -796,15 +796,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_upsilon;1",
+        "@id": "dtmi:example:delta_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Component",
-          "name": "alpha_sigma",
+          "name": "delta_spazz",
           "schema": {
-            "@id": "dtmi:example:alpha_tau;1",
+            "@id": "dtmi:example:delta_floob;1",
             "@type": "Interface"
           }
         }
@@ -819,14 +819,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_psi;1",
+        "@id": "dtmi:example:delta_itch;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:1seg;1",
           "@type": "Component",
-          "name": "alpha_phi",
+          "name": "delta_jogg",
           "schema": {
-            "@id": "dtmi:example:alpha_chi;1",
+            "@id": "dtmi:example:delta_flunn;1",
             "@type": "Interface"
           }
         }
@@ -841,15 +841,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_wum;1",
+        "@id": "dtmi:example:delta_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:1seg;1",
           "@type": "Component",
-          "name": "alpha_omega",
+          "name": "delta_yekk",
           "schema": {
-            "@id": "dtmi:example:alpha_yuzz;1",
+            "@id": "dtmi:example:delta_vroo;1",
             "@type": "Interface"
           }
         }
@@ -864,14 +864,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_fuddle;1",
+        "@id": "dtmi:example:epsilon_gamma;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Component",
-          "name": "alpha_um",
+          "name": "epsilon_alpha",
           "schema": {
-            "@id": "dtmi:example:alpha_humpf;1",
+            "@id": "dtmi:example:epsilon_beta;1",
             "@type": "Interface"
           }
         }
@@ -886,15 +886,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_snee;1",
+        "@id": "dtmi:example:epsilon_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Component",
-          "name": "alpha_glikk",
+          "name": "epsilon_delta",
           "schema": {
-            "@id": "dtmi:example:alpha_nuh;1",
+            "@id": "dtmi:example:epsilon_epsilon;1",
             "@type": "Interface"
           }
         }
@@ -909,14 +909,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_spazz;1",
+        "@id": "dtmi:example:epsilon_iota;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo::bar;1",
           "@type": "Component",
-          "name": "alpha_quan",
+          "name": "epsilon_eta",
           "schema": {
-            "@id": "dtmi:example:alpha_thnad;1",
+            "@id": "dtmi:example:epsilon_theta;1",
             "@type": "Interface"
           }
         }
@@ -931,15 +931,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_jogg;1",
+        "@id": "dtmi:example:epsilon_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo::bar;1",
           "@type": "Component",
-          "name": "alpha_floob",
+          "name": "epsilon_kappa",
           "schema": {
-            "@id": "dtmi:example:alpha_zatz;1",
+            "@id": "dtmi:example:epsilon_lambda;1",
             "@type": "Interface"
           }
         }
@@ -954,14 +954,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_yekk;1",
+        "@id": "dtmi:example:epsilon_omicron;1",
         "@type": "Interface",
         "contents": {
           "@id": "urn:foo:bar:1",
           "@type": "Component",
-          "name": "alpha_flunn",
+          "name": "epsilon_nu",
           "schema": {
-            "@id": "dtmi:example:alpha_itch;1",
+            "@id": "dtmi:example:epsilon_xi;1",
             "@type": "Interface"
           }
         }
@@ -976,15 +976,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_alpha;1",
+        "@id": "dtmi:example:epsilon_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "urn:foo:bar:1",
           "@type": "Component",
-          "name": "alpha_vroo",
+          "name": "epsilon_pi",
           "schema": {
-            "@id": "dtmi:example:alpha_hi;1",
+            "@id": "dtmi:example:epsilon_rho;1",
             "@type": "Interface"
           }
         }
@@ -999,14 +999,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_delta;1",
+        "@id": "dtmi:example:epsilon_phi;1",
         "@type": "Interface",
         "contents": {
           "@id": "http://foo/bar/baz",
           "@type": "Component",
-          "name": "beta_beta",
+          "name": "epsilon_tau",
           "schema": {
-            "@id": "dtmi:example:beta_gamma;1",
+            "@id": "dtmi:example:epsilon_upsilon;1",
             "@type": "Interface"
           }
         }
@@ -1021,15 +1021,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_eta;1",
+        "@id": "dtmi:example:epsilon_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "http://foo/bar/baz",
           "@type": "Component",
-          "name": "beta_epsilon",
+          "name": "epsilon_chi",
           "schema": {
-            "@id": "dtmi:example:beta_zeta;1",
+            "@id": "dtmi:example:epsilon_psi;1",
             "@type": "Interface"
           }
         }
@@ -1044,14 +1044,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_kappa;1",
+        "@id": "dtmi:example:epsilon_um;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:;1",
           "@type": "Component",
-          "name": "beta_theta",
+          "name": "epsilon_yuzz",
           "schema": {
-            "@id": "dtmi:example:beta_iota;1",
+            "@id": "dtmi:example:epsilon_wum;1",
             "@type": "Interface"
           }
         }
@@ -1066,15 +1066,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_nu;1",
+        "@id": "dtmi:example:epsilon_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:;1",
           "@type": "Component",
-          "name": "beta_lambda",
+          "name": "epsilon_humpf",
           "schema": {
-            "@id": "dtmi:example:beta_mu;1",
+            "@id": "dtmi:example:epsilon_fuddle;1",
             "@type": "Interface"
           }
         }
@@ -1089,14 +1089,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_pi;1",
+        "@id": "dtmi:example:epsilon_quan;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar",
           "@type": "Component",
-          "name": "beta_xi",
+          "name": "epsilon_nuh",
           "schema": {
-            "@id": "dtmi:example:beta_omicron;1",
+            "@id": "dtmi:example:epsilon_snee;1",
             "@type": "Interface"
           }
         }
@@ -1111,15 +1111,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_tau;1",
+        "@id": "dtmi:example:epsilon_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar",
           "@type": "Component",
-          "name": "beta_rho",
+          "name": "epsilon_thnad",
           "schema": {
-            "@id": "dtmi:example:beta_sigma;1",
+            "@id": "dtmi:example:epsilon_spazz;1",
             "@type": "Interface"
           }
         }
@@ -1134,14 +1134,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_chi;1",
+        "@id": "dtmi:example:epsilon_flunn;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.14",
           "@type": "Component",
-          "name": "beta_upsilon",
+          "name": "epsilon_zatz",
           "schema": {
-            "@id": "dtmi:example:beta_phi;1",
+            "@id": "dtmi:example:epsilon_jogg;1",
             "@type": "Interface"
           }
         }
@@ -1156,15 +1156,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_yuzz;1",
+        "@id": "dtmi:example:epsilon_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.14",
           "@type": "Component",
-          "name": "beta_psi",
+          "name": "epsilon_itch",
           "schema": {
-            "@id": "dtmi:example:beta_omega;1",
+            "@id": "dtmi:example:epsilon_yekk;1",
             "@type": "Interface"
           }
         }
@@ -1179,14 +1179,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_humpf;1",
+        "@id": "dtmi:example:zeta_beta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.141592",
           "@type": "Component",
-          "name": "beta_wum",
+          "name": "epsilon_hi",
           "schema": {
-            "@id": "dtmi:example:beta_um;1",
+            "@id": "dtmi:example:zeta_alpha;1",
             "@type": "Interface"
           }
         }
@@ -1201,15 +1201,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_nuh;1",
+        "@id": "dtmi:example:zeta_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.141592",
           "@type": "Component",
-          "name": "beta_fuddle",
+          "name": "zeta_gamma",
           "schema": {
-            "@id": "dtmi:example:beta_glikk;1",
+            "@id": "dtmi:example:zeta_delta;1",
             "@type": "Interface"
           }
         }
@@ -1224,14 +1224,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_thnad;1",
+        "@id": "dtmi:example:zeta_theta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:dtdl:example;1",
           "@type": "Component",
-          "name": "beta_snee",
+          "name": "zeta_zeta",
           "schema": {
-            "@id": "dtmi:example:beta_quan;1",
+            "@id": "dtmi:example:zeta_eta;1",
             "@type": "Interface"
           }
         }
@@ -1246,15 +1246,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_zatz;1",
+        "@id": "dtmi:example:zeta_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:dtdl:example;1",
           "@type": "Component",
-          "name": "beta_spazz",
+          "name": "zeta_iota",
           "schema": {
-            "@id": "dtmi:example:beta_floob;1",
+            "@id": "dtmi:example:zeta_kappa;1",
             "@type": "Interface"
           }
         }
@@ -1269,14 +1269,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_itch;1",
+        "@id": "dtmi:example:zeta_xi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:standard:example;1",
           "@type": "Component",
-          "name": "beta_jogg",
+          "name": "zeta_mu",
           "schema": {
-            "@id": "dtmi:example:beta_flunn;1",
+            "@id": "dtmi:example:zeta_nu;1",
             "@type": "Interface"
           }
         }
@@ -1291,15 +1291,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_hi;1",
+        "@id": "dtmi:example:zeta_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:standard:example;1",
           "@type": "Component",
-          "name": "beta_yekk",
+          "name": "zeta_omicron",
           "schema": {
-            "@id": "dtmi:example:beta_vroo;1",
+            "@id": "dtmi:example:zeta_pi;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassComponentIdNotArrayV2.json b/DTDL/v2/spec/Requirement-ClassComponentIdNotArrayV2.json
index db98f3bf..85cfc1de 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentIdNotArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentIdNotArrayV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_gamma;1",
+        "@id": "dtmi:example:zeta_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;7"
           ],
           "@type": "Component",
-          "name": "gamma_alpha",
+          "name": "zeta_sigma",
           "schema": {
-            "@id": "dtmi:example:gamma_beta;1",
+            "@id": "dtmi:example:zeta_tau;1",
             "@type": "Interface"
           }
         }
@@ -31,7 +31,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_zeta;1",
+        "@id": "dtmi:example:zeta_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -39,9 +39,9 @@
             "dtmi:foo:bar;7"
           ],
           "@type": "Component",
-          "name": "gamma_delta",
+          "name": "zeta_phi",
           "schema": {
-            "@id": "dtmi:example:gamma_epsilon;1",
+            "@id": "dtmi:example:zeta_chi;1",
             "@type": "Interface"
           }
         }
@@ -56,16 +56,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_iota;1",
+        "@id": "dtmi:example:zeta_wum;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;108675309"
           ],
           "@type": "Component",
-          "name": "gamma_eta",
+          "name": "zeta_omega",
           "schema": {
-            "@id": "dtmi:example:gamma_theta;1",
+            "@id": "dtmi:example:zeta_yuzz;1",
             "@type": "Interface"
           }
         }
@@ -80,7 +80,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_mu;1",
+        "@id": "dtmi:example:zeta_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -88,9 +88,9 @@
             "dtmi:foo:bar;108675309"
           ],
           "@type": "Component",
-          "name": "gamma_kappa",
+          "name": "zeta_um",
           "schema": {
-            "@id": "dtmi:example:gamma_lambda;1",
+            "@id": "dtmi:example:zeta_humpf;1",
             "@type": "Interface"
           }
         }
@@ -105,16 +105,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_omicron;1",
+        "@id": "dtmi:example:zeta_snee;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;999999999"
           ],
           "@type": "Component",
-          "name": "gamma_nu",
+          "name": "zeta_glikk",
           "schema": {
-            "@id": "dtmi:example:gamma_xi;1",
+            "@id": "dtmi:example:zeta_nuh;1",
             "@type": "Interface"
           }
         }
@@ -129,7 +129,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_sigma;1",
+        "@id": "dtmi:example:zeta_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -137,9 +137,9 @@
             "dtmi:foo:bar;999999999"
           ],
           "@type": "Component",
-          "name": "gamma_pi",
+          "name": "zeta_quan",
           "schema": {
-            "@id": "dtmi:example:gamma_rho;1",
+            "@id": "dtmi:example:zeta_thnad;1",
             "@type": "Interface"
           }
         }
@@ -154,16 +154,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_phi;1",
+        "@id": "dtmi:example:zeta_jogg;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo;1"
           ],
           "@type": "Component",
-          "name": "gamma_tau",
+          "name": "zeta_floob",
           "schema": {
-            "@id": "dtmi:example:gamma_upsilon;1",
+            "@id": "dtmi:example:zeta_zatz;1",
             "@type": "Interface"
           }
         }
@@ -178,7 +178,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_omega;1",
+        "@id": "dtmi:example:zeta_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -186,9 +186,9 @@
             "dtmi:foo;1"
           ],
           "@type": "Component",
-          "name": "gamma_chi",
+          "name": "zeta_flunn",
           "schema": {
-            "@id": "dtmi:example:gamma_psi;1",
+            "@id": "dtmi:example:zeta_itch;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassComponentPropertiesSchemaContentsExcludeComponentV2.json b/DTDL/v2/spec/Requirement-ClassComponentPropertiesSchemaContentsExcludeComponentV2.json
index 8735c2bb..fd44fa43 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentPropertiesSchemaContentsExcludeComponentV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentPropertiesSchemaContentsExcludeComponentV2.json
@@ -7,22 +7,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_jogg;1",
+        "@id": "dtmi:example:fuddle_xi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:phi_zatz;1",
+          "@id": "dtmi:example:fuddle_nu;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "phi_floob",
+            "name": "fuddle_mu",
             "schema": {
-              "@id": "dtmi:example:phi_spazz;1",
+              "@id": "dtmi:example:fuddle_lambda;1",
               "@type": "Interface",
               "contents": {
                 "@type": "Component",
-                "name": "phi_quan",
+                "name": "fuddle_iota",
                 "schema": {
-                  "@id": "dtmi:example:phi_thnad;1",
+                  "@id": "dtmi:example:fuddle_kappa;1",
                   "@type": "Interface"
                 }
               }
@@ -40,23 +40,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_alpha;1",
+        "@id": "dtmi:example:fuddle_upsilon;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:phi_hi;1",
+          "@id": "dtmi:example:fuddle_tau;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Component",
-            "name": "phi_vroo",
+            "name": "fuddle_sigma",
             "schema": {
-              "@id": "dtmi:example:phi_yekk;1",
+              "@id": "dtmi:example:fuddle_rho;1",
               "@type": "Interface",
               "contents": {
                 "@type": "Component",
-                "name": "phi_flunn",
+                "name": "fuddle_omicron",
                 "schema": {
-                  "@id": "dtmi:example:phi_itch;1",
+                  "@id": "dtmi:example:fuddle_pi;1",
                   "@type": "Interface"
                 }
               }
diff --git a/DTDL/v2/spec/Requirement-ClassComponentPropertyCommentStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassComponentPropertyCommentStringLengthV2.json
index 935d6ad3..d0ecf4f2 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentPropertyCommentStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentPropertyCommentStringLengthV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_kappa;1",
+        "@id": "dtmi:example:theta_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "epsilon_theta",
+          "name": "theta_yuzz",
           "schema": {
-            "@id": "dtmi:example:epsilon_iota;1",
+            "@id": "dtmi:example:theta_wum;1",
             "@type": "Interface"
           },
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_nu;1",
+        "@id": "dtmi:example:theta_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "epsilon_lambda",
+          "name": "theta_humpf",
           "schema": {
-            "@id": "dtmi:example:epsilon_mu;1",
+            "@id": "dtmi:example:theta_fuddle;1",
             "@type": "Interface"
           },
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
@@ -51,14 +51,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_pi;1",
+        "@id": "dtmi:example:theta_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "epsilon_xi",
+          "name": "theta_nuh",
           "schema": {
-            "@id": "dtmi:example:epsilon_omicron;1",
+            "@id": "dtmi:example:theta_snee;1",
             "@type": "Interface"
           },
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
diff --git a/DTDL/v2/spec/Requirement-ClassComponentPropertyCommentStringV2.json b/DTDL/v2/spec/Requirement-ClassComponentPropertyCommentStringV2.json
index d4838b50..9cb9724d 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentPropertyCommentStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentPropertyCommentStringV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_quan;1",
+        "@id": "dtmi:example:eta_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "gamma_nuh",
+          "name": "eta_epsilon",
           "schema": {
-            "@id": "dtmi:example:gamma_snee;1",
+            "@id": "dtmi:example:eta_zeta;1",
             "@type": "Interface"
           },
           "comment": "hello"
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_floob;1",
+        "@id": "dtmi:example:eta_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "gamma_thnad",
+          "name": "eta_theta",
           "schema": {
-            "@id": "dtmi:example:gamma_spazz;1",
+            "@id": "dtmi:example:eta_iota;1",
             "@type": "Interface"
           },
           "comment": [
@@ -53,13 +53,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_flunn;1",
+        "@id": "dtmi:example:eta_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "gamma_zatz",
+          "name": "eta_lambda",
           "schema": {
-            "@id": "dtmi:example:gamma_jogg;1",
+            "@id": "dtmi:example:eta_mu;1",
             "@type": "Interface"
           },
           "comment": {
@@ -78,13 +78,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_vroo;1",
+        "@id": "dtmi:example:eta_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "gamma_itch",
+          "name": "eta_xi",
           "schema": {
-            "@id": "dtmi:example:gamma_yekk;1",
+            "@id": "dtmi:example:eta_omicron;1",
             "@type": "Interface"
           },
           "comment": [
@@ -105,13 +105,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_beta;1",
+        "@id": "dtmi:example:eta_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "gamma_hi",
+          "name": "eta_rho",
           "schema": {
-            "@id": "dtmi:example:delta_alpha;1",
+            "@id": "dtmi:example:eta_sigma;1",
             "@type": "Interface"
           },
           "comment": []
@@ -127,13 +127,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_epsilon;1",
+        "@id": "dtmi:example:eta_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "delta_gamma",
+          "name": "eta_upsilon",
           "schema": {
-            "@id": "dtmi:example:delta_delta;1",
+            "@id": "dtmi:example:eta_phi;1",
             "@type": "Interface"
           },
           "comment": null
@@ -149,14 +149,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_theta;1",
+        "@id": "dtmi:example:eta_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "delta_zeta",
+          "name": "eta_psi",
           "schema": {
-            "@id": "dtmi:example:delta_eta;1",
+            "@id": "dtmi:example:eta_omega;1",
             "@type": "Interface"
           },
           "comment": null
@@ -172,13 +172,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_lambda;1",
+        "@id": "dtmi:example:eta_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "delta_iota",
+          "name": "eta_wum",
           "schema": {
-            "@id": "dtmi:example:delta_kappa;1",
+            "@id": "dtmi:example:eta_um;1",
             "@type": "Interface"
           },
           "comment": true
@@ -194,14 +194,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_xi;1",
+        "@id": "dtmi:example:eta_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "delta_mu",
+          "name": "eta_fuddle",
           "schema": {
-            "@id": "dtmi:example:delta_nu;1",
+            "@id": "dtmi:example:eta_glikk;1",
             "@type": "Interface"
           },
           "comment": true
@@ -217,13 +217,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_rho;1",
+        "@id": "dtmi:example:eta_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "delta_omicron",
+          "name": "eta_snee",
           "schema": {
-            "@id": "dtmi:example:delta_pi;1",
+            "@id": "dtmi:example:eta_quan;1",
             "@type": "Interface"
           },
           "comment": 626
@@ -239,14 +239,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_upsilon;1",
+        "@id": "dtmi:example:eta_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "delta_sigma",
+          "name": "eta_spazz",
           "schema": {
-            "@id": "dtmi:example:delta_tau;1",
+            "@id": "dtmi:example:eta_floob;1",
             "@type": "Interface"
           },
           "comment": 626
@@ -262,13 +262,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_psi;1",
+        "@id": "dtmi:example:eta_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "delta_phi",
+          "name": "eta_jogg",
           "schema": {
-            "@id": "dtmi:example:delta_chi;1",
+            "@id": "dtmi:example:eta_flunn;1",
             "@type": "Interface"
           },
           "comment": [
@@ -286,14 +286,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_wum;1",
+        "@id": "dtmi:example:eta_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "delta_omega",
+          "name": "eta_yekk",
           "schema": {
-            "@id": "dtmi:example:delta_yuzz;1",
+            "@id": "dtmi:example:eta_vroo;1",
             "@type": "Interface"
           },
           "comment": [
@@ -311,13 +311,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_fuddle;1",
+        "@id": "dtmi:example:theta_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "delta_um",
+          "name": "theta_alpha",
           "schema": {
-            "@id": "dtmi:example:delta_humpf;1",
+            "@id": "dtmi:example:theta_beta;1",
             "@type": "Interface"
           },
           "comment": [
@@ -335,14 +335,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_snee;1",
+        "@id": "dtmi:example:theta_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "delta_glikk",
+          "name": "theta_delta",
           "schema": {
-            "@id": "dtmi:example:delta_nuh;1",
+            "@id": "dtmi:example:theta_epsilon;1",
             "@type": "Interface"
           },
           "comment": [
@@ -360,13 +360,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_spazz;1",
+        "@id": "dtmi:example:theta_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "delta_quan",
+          "name": "theta_eta",
           "schema": {
-            "@id": "dtmi:example:delta_thnad;1",
+            "@id": "dtmi:example:theta_theta;1",
             "@type": "Interface"
           },
           "comment": [
@@ -384,14 +384,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_jogg;1",
+        "@id": "dtmi:example:theta_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "delta_floob",
+          "name": "theta_kappa",
           "schema": {
-            "@id": "dtmi:example:delta_zatz;1",
+            "@id": "dtmi:example:theta_lambda;1",
             "@type": "Interface"
           },
           "comment": [
@@ -409,13 +409,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_yekk;1",
+        "@id": "dtmi:example:theta_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "delta_flunn",
+          "name": "theta_nu",
           "schema": {
-            "@id": "dtmi:example:delta_itch;1",
+            "@id": "dtmi:example:theta_xi;1",
             "@type": "Interface"
           },
           "comment": {}
@@ -431,14 +431,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_alpha;1",
+        "@id": "dtmi:example:theta_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "delta_vroo",
+          "name": "theta_pi",
           "schema": {
-            "@id": "dtmi:example:delta_hi;1",
+            "@id": "dtmi:example:theta_rho;1",
             "@type": "Interface"
           },
           "comment": {}
@@ -454,13 +454,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_delta;1",
+        "@id": "dtmi:example:theta_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "epsilon_beta",
+          "name": "theta_tau",
           "schema": {
-            "@id": "dtmi:example:epsilon_gamma;1",
+            "@id": "dtmi:example:theta_upsilon;1",
             "@type": "Interface"
           },
           "comment": [
@@ -478,14 +478,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_eta;1",
+        "@id": "dtmi:example:theta_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "epsilon_epsilon",
+          "name": "theta_chi",
           "schema": {
-            "@id": "dtmi:example:epsilon_zeta;1",
+            "@id": "dtmi:example:theta_psi;1",
             "@type": "Interface"
           },
           "comment": [
diff --git a/DTDL/v2/spec/Requirement-ClassComponentPropertyCommentTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassComponentPropertyCommentTermAndDtmiV2.json
index 65192e6e..584add85 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentPropertyCommentTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentPropertyCommentTermAndDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_quan;1",
+        "@id": "dtmi:example:iota_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "comment": "epsilon_fuddle",
-          "dtmi:dtdl:property:comment;2": "epsilon_glikk",
-          "name": "epsilon_nuh",
+          "comment": "iota_gamma",
+          "dtmi:dtdl:property:comment;2": "iota_delta",
+          "name": "iota_epsilon",
           "schema": {
-            "@id": "dtmi:example:epsilon_snee;1",
+            "@id": "dtmi:example:iota_zeta;1",
             "@type": "Interface"
           }
         }
@@ -30,16 +30,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_jogg;1",
+        "@id": "dtmi:example:iota_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "comment": "epsilon_thnad",
-          "dtmi:dtdl:property:comment;2": "epsilon_spazz",
-          "name": "epsilon_floob",
+          "comment": "iota_theta",
+          "dtmi:dtdl:property:comment;2": "iota_iota",
+          "name": "iota_kappa",
           "schema": {
-            "@id": "dtmi:example:epsilon_zatz;1",
+            "@id": "dtmi:example:iota_lambda;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassComponentPropertyDescriptionLangStringV2.json b/DTDL/v2/spec/Requirement-ClassComponentPropertyDescriptionLangStringV2.json
index 36f17014..89d63a2a 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentPropertyDescriptionLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentPropertyDescriptionLangStringV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_yekk;1",
+        "@id": "dtmi:example:iota_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "epsilon_flunn",
+          "name": "iota_nu",
           "schema": {
-            "@id": "dtmi:example:epsilon_itch;1",
+            "@id": "dtmi:example:iota_xi;1",
             "@type": "Interface"
           },
           "description": "hello"
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_alpha;1",
+        "@id": "dtmi:example:iota_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "epsilon_vroo",
+          "name": "iota_pi",
           "schema": {
-            "@id": "dtmi:example:epsilon_hi;1",
+            "@id": "dtmi:example:iota_rho;1",
             "@type": "Interface"
           },
           "description": [
@@ -53,13 +53,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_delta;1",
+        "@id": "dtmi:example:iota_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "zeta_beta",
+          "name": "iota_tau",
           "schema": {
-            "@id": "dtmi:example:zeta_gamma;1",
+            "@id": "dtmi:example:iota_upsilon;1",
             "@type": "Interface"
           },
           "description": {
@@ -77,13 +77,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_eta;1",
+        "@id": "dtmi:example:iota_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "zeta_epsilon",
+          "name": "iota_chi",
           "schema": {
-            "@id": "dtmi:example:zeta_zeta;1",
+            "@id": "dtmi:example:iota_psi;1",
             "@type": "Interface"
           },
           "description": [
@@ -104,13 +104,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_kappa;1",
+        "@id": "dtmi:example:iota_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "zeta_theta",
+          "name": "iota_yuzz",
           "schema": {
-            "@id": "dtmi:example:zeta_iota;1",
+            "@id": "dtmi:example:iota_wum;1",
             "@type": "Interface"
           },
           "description": {}
@@ -126,13 +126,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_nu;1",
+        "@id": "dtmi:example:iota_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "zeta_lambda",
+          "name": "iota_humpf",
           "schema": {
-            "@id": "dtmi:example:zeta_mu;1",
+            "@id": "dtmi:example:iota_fuddle;1",
             "@type": "Interface"
           },
           "description": []
@@ -148,13 +148,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_pi;1",
+        "@id": "dtmi:example:iota_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "zeta_xi",
+          "name": "iota_nuh",
           "schema": {
-            "@id": "dtmi:example:zeta_omicron;1",
+            "@id": "dtmi:example:iota_snee;1",
             "@type": "Interface"
           },
           "description": null
@@ -170,14 +170,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_tau;1",
+        "@id": "dtmi:example:iota_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "zeta_rho",
+          "name": "iota_thnad",
           "schema": {
-            "@id": "dtmi:example:zeta_sigma;1",
+            "@id": "dtmi:example:iota_spazz;1",
             "@type": "Interface"
           },
           "description": null
@@ -193,13 +193,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_chi;1",
+        "@id": "dtmi:example:iota_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "zeta_upsilon",
+          "name": "iota_zatz",
           "schema": {
-            "@id": "dtmi:example:zeta_phi;1",
+            "@id": "dtmi:example:iota_jogg;1",
             "@type": "Interface"
           },
           "description": true
@@ -215,14 +215,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_yuzz;1",
+        "@id": "dtmi:example:iota_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "zeta_psi",
+          "name": "iota_itch",
           "schema": {
-            "@id": "dtmi:example:zeta_omega;1",
+            "@id": "dtmi:example:iota_yekk;1",
             "@type": "Interface"
           },
           "description": true
@@ -238,13 +238,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_humpf;1",
+        "@id": "dtmi:example:kappa_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "zeta_wum",
+          "name": "iota_hi",
           "schema": {
-            "@id": "dtmi:example:zeta_um;1",
+            "@id": "dtmi:example:kappa_alpha;1",
             "@type": "Interface"
           },
           "description": 626
@@ -260,14 +260,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_nuh;1",
+        "@id": "dtmi:example:kappa_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "zeta_fuddle",
+          "name": "kappa_gamma",
           "schema": {
-            "@id": "dtmi:example:zeta_glikk;1",
+            "@id": "dtmi:example:kappa_delta;1",
             "@type": "Interface"
           },
           "description": 626
@@ -283,13 +283,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_thnad;1",
+        "@id": "dtmi:example:kappa_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "zeta_snee",
+          "name": "kappa_zeta",
           "schema": {
-            "@id": "dtmi:example:zeta_quan;1",
+            "@id": "dtmi:example:kappa_eta;1",
             "@type": "Interface"
           },
           "description": [
@@ -307,14 +307,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_zatz;1",
+        "@id": "dtmi:example:kappa_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "zeta_spazz",
+          "name": "kappa_iota",
           "schema": {
-            "@id": "dtmi:example:zeta_floob;1",
+            "@id": "dtmi:example:kappa_kappa;1",
             "@type": "Interface"
           },
           "description": [
@@ -332,13 +332,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_itch;1",
+        "@id": "dtmi:example:kappa_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "zeta_jogg",
+          "name": "kappa_mu",
           "schema": {
-            "@id": "dtmi:example:zeta_flunn;1",
+            "@id": "dtmi:example:kappa_nu;1",
             "@type": "Interface"
           },
           "description": [
@@ -356,14 +356,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_hi;1",
+        "@id": "dtmi:example:kappa_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "zeta_yekk",
+          "name": "kappa_omicron",
           "schema": {
-            "@id": "dtmi:example:zeta_vroo;1",
+            "@id": "dtmi:example:kappa_pi;1",
             "@type": "Interface"
           },
           "description": [
@@ -381,13 +381,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_gamma;1",
+        "@id": "dtmi:example:kappa_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "eta_alpha",
+          "name": "kappa_sigma",
           "schema": {
-            "@id": "dtmi:example:eta_beta;1",
+            "@id": "dtmi:example:kappa_tau;1",
             "@type": "Interface"
           },
           "description": [
@@ -405,14 +405,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_zeta;1",
+        "@id": "dtmi:example:kappa_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "eta_delta",
+          "name": "kappa_phi",
           "schema": {
-            "@id": "dtmi:example:eta_epsilon;1",
+            "@id": "dtmi:example:kappa_chi;1",
             "@type": "Interface"
           },
           "description": [
@@ -430,13 +430,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_iota;1",
+        "@id": "dtmi:example:kappa_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "eta_eta",
+          "name": "kappa_omega",
           "schema": {
-            "@id": "dtmi:example:eta_theta;1",
+            "@id": "dtmi:example:kappa_yuzz;1",
             "@type": "Interface"
           },
           "description": [
@@ -454,14 +454,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_mu;1",
+        "@id": "dtmi:example:kappa_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "eta_kappa",
+          "name": "kappa_um",
           "schema": {
-            "@id": "dtmi:example:eta_lambda;1",
+            "@id": "dtmi:example:kappa_humpf;1",
             "@type": "Interface"
           },
           "description": [
@@ -479,13 +479,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_omicron;1",
+        "@id": "dtmi:example:kappa_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "eta_nu",
+          "name": "kappa_glikk",
           "schema": {
-            "@id": "dtmi:example:eta_xi;1",
+            "@id": "dtmi:example:kappa_nuh;1",
             "@type": "Interface"
           },
           "description": {
@@ -504,14 +504,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_sigma;1",
+        "@id": "dtmi:example:kappa_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "eta_pi",
+          "name": "kappa_quan",
           "schema": {
-            "@id": "dtmi:example:eta_rho;1",
+            "@id": "dtmi:example:kappa_thnad;1",
             "@type": "Interface"
           },
           "description": {
@@ -530,13 +530,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_phi;1",
+        "@id": "dtmi:example:kappa_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "eta_tau",
+          "name": "kappa_floob",
           "schema": {
-            "@id": "dtmi:example:eta_upsilon;1",
+            "@id": "dtmi:example:kappa_zatz;1",
             "@type": "Interface"
           },
           "description": [
@@ -556,14 +556,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_omega;1",
+        "@id": "dtmi:example:kappa_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "eta_chi",
+          "name": "kappa_flunn",
           "schema": {
-            "@id": "dtmi:example:eta_psi;1",
+            "@id": "dtmi:example:kappa_itch;1",
             "@type": "Interface"
           },
           "description": [
diff --git a/DTDL/v2/spec/Requirement-ClassComponentPropertyDescriptionStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassComponentPropertyDescriptionStringLengthV2.json
index fb3ab33a..1434e0a2 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentPropertyDescriptionStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentPropertyDescriptionStringLengthV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_um;1",
+        "@id": "dtmi:example:lambda_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "eta_yuzz",
+          "name": "kappa_vroo",
           "schema": {
-            "@id": "dtmi:example:eta_wum;1",
+            "@id": "dtmi:example:kappa_hi;1",
             "@type": "Interface"
           },
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_glikk;1",
+        "@id": "dtmi:example:lambda_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "eta_humpf",
+          "name": "lambda_beta",
           "schema": {
-            "@id": "dtmi:example:eta_fuddle;1",
+            "@id": "dtmi:example:lambda_gamma;1",
             "@type": "Interface"
           },
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
@@ -51,14 +51,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_quan;1",
+        "@id": "dtmi:example:lambda_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "eta_nuh",
+          "name": "lambda_epsilon",
           "schema": {
-            "@id": "dtmi:example:eta_snee;1",
+            "@id": "dtmi:example:lambda_zeta;1",
             "@type": "Interface"
           },
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
diff --git a/DTDL/v2/spec/Requirement-ClassComponentPropertyDescriptionTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassComponentPropertyDescriptionTermAndDtmiV2.json
index bf9ae1b2..1d98f904 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentPropertyDescriptionTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentPropertyDescriptionTermAndDtmiV2.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_eta;1",
+        "@id": "dtmi:example:lambda_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "description": [
-            "theta_gamma"
+            "lambda_upsilon"
           ],
           "dtmi:dtdl:property:description;2": [
-            "theta_delta"
+            "lambda_phi"
           ],
-          "name": "theta_epsilon",
+          "name": "lambda_chi",
           "schema": {
-            "@id": "dtmi:example:theta_zeta;1",
+            "@id": "dtmi:example:lambda_psi;1",
             "@type": "Interface"
           }
         }
@@ -34,20 +34,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_mu;1",
+        "@id": "dtmi:example:lambda_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "description": [
-            "theta_theta"
+            "lambda_yuzz"
           ],
           "dtmi:dtdl:property:description;2": [
-            "theta_iota"
+            "lambda_wum"
           ],
-          "name": "theta_kappa",
+          "name": "lambda_um",
           "schema": {
-            "@id": "dtmi:example:theta_lambda;1",
+            "@id": "dtmi:example:lambda_humpf;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassComponentPropertyDisplayNameLangStringV2.json b/DTDL/v2/spec/Requirement-ClassComponentPropertyDisplayNameLangStringV2.json
index d94e7cfe..4dde8c0a 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentPropertyDisplayNameLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentPropertyDisplayNameLangStringV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_omicron;1",
+        "@id": "dtmi:example:lambda_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "theta_nu",
+          "name": "lambda_glikk",
           "schema": {
-            "@id": "dtmi:example:theta_xi;1",
+            "@id": "dtmi:example:lambda_nuh;1",
             "@type": "Interface"
           },
           "displayName": "hello"
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_sigma;1",
+        "@id": "dtmi:example:lambda_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "theta_pi",
+          "name": "lambda_quan",
           "schema": {
-            "@id": "dtmi:example:theta_rho;1",
+            "@id": "dtmi:example:lambda_thnad;1",
             "@type": "Interface"
           },
           "displayName": [
@@ -53,13 +53,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_phi;1",
+        "@id": "dtmi:example:lambda_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "theta_tau",
+          "name": "lambda_floob",
           "schema": {
-            "@id": "dtmi:example:theta_upsilon;1",
+            "@id": "dtmi:example:lambda_zatz;1",
             "@type": "Interface"
           },
           "displayName": {
@@ -77,13 +77,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_omega;1",
+        "@id": "dtmi:example:lambda_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "theta_chi",
+          "name": "lambda_flunn",
           "schema": {
-            "@id": "dtmi:example:theta_psi;1",
+            "@id": "dtmi:example:lambda_itch;1",
             "@type": "Interface"
           },
           "displayName": [
@@ -104,13 +104,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_um;1",
+        "@id": "dtmi:example:mu_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "theta_yuzz",
+          "name": "lambda_vroo",
           "schema": {
-            "@id": "dtmi:example:theta_wum;1",
+            "@id": "dtmi:example:lambda_hi;1",
             "@type": "Interface"
           },
           "displayName": {}
@@ -126,13 +126,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_glikk;1",
+        "@id": "dtmi:example:mu_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "theta_humpf",
+          "name": "mu_beta",
           "schema": {
-            "@id": "dtmi:example:theta_fuddle;1",
+            "@id": "dtmi:example:mu_gamma;1",
             "@type": "Interface"
           },
           "displayName": []
@@ -148,13 +148,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_quan;1",
+        "@id": "dtmi:example:mu_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "theta_nuh",
+          "name": "mu_epsilon",
           "schema": {
-            "@id": "dtmi:example:theta_snee;1",
+            "@id": "dtmi:example:mu_zeta;1",
             "@type": "Interface"
           },
           "displayName": null
@@ -170,14 +170,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_floob;1",
+        "@id": "dtmi:example:mu_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "theta_thnad",
+          "name": "mu_theta",
           "schema": {
-            "@id": "dtmi:example:theta_spazz;1",
+            "@id": "dtmi:example:mu_iota;1",
             "@type": "Interface"
           },
           "displayName": null
@@ -193,13 +193,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_flunn;1",
+        "@id": "dtmi:example:mu_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "theta_zatz",
+          "name": "mu_lambda",
           "schema": {
-            "@id": "dtmi:example:theta_jogg;1",
+            "@id": "dtmi:example:mu_mu;1",
             "@type": "Interface"
           },
           "displayName": true
@@ -215,14 +215,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_vroo;1",
+        "@id": "dtmi:example:mu_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "theta_itch",
+          "name": "mu_xi",
           "schema": {
-            "@id": "dtmi:example:theta_yekk;1",
+            "@id": "dtmi:example:mu_omicron;1",
             "@type": "Interface"
           },
           "displayName": true
@@ -238,13 +238,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_beta;1",
+        "@id": "dtmi:example:mu_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "theta_hi",
+          "name": "mu_rho",
           "schema": {
-            "@id": "dtmi:example:iota_alpha;1",
+            "@id": "dtmi:example:mu_sigma;1",
             "@type": "Interface"
           },
           "displayName": 626
@@ -260,14 +260,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_epsilon;1",
+        "@id": "dtmi:example:mu_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "iota_gamma",
+          "name": "mu_upsilon",
           "schema": {
-            "@id": "dtmi:example:iota_delta;1",
+            "@id": "dtmi:example:mu_phi;1",
             "@type": "Interface"
           },
           "displayName": 626
@@ -283,13 +283,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_theta;1",
+        "@id": "dtmi:example:mu_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "iota_zeta",
+          "name": "mu_psi",
           "schema": {
-            "@id": "dtmi:example:iota_eta;1",
+            "@id": "dtmi:example:mu_omega;1",
             "@type": "Interface"
           },
           "displayName": [
@@ -307,14 +307,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_lambda;1",
+        "@id": "dtmi:example:mu_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "iota_iota",
+          "name": "mu_wum",
           "schema": {
-            "@id": "dtmi:example:iota_kappa;1",
+            "@id": "dtmi:example:mu_um;1",
             "@type": "Interface"
           },
           "displayName": [
@@ -332,13 +332,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_xi;1",
+        "@id": "dtmi:example:mu_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "iota_mu",
+          "name": "mu_fuddle",
           "schema": {
-            "@id": "dtmi:example:iota_nu;1",
+            "@id": "dtmi:example:mu_glikk;1",
             "@type": "Interface"
           },
           "displayName": [
@@ -356,14 +356,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_rho;1",
+        "@id": "dtmi:example:mu_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "iota_omicron",
+          "name": "mu_snee",
           "schema": {
-            "@id": "dtmi:example:iota_pi;1",
+            "@id": "dtmi:example:mu_quan;1",
             "@type": "Interface"
           },
           "displayName": [
@@ -381,13 +381,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_upsilon;1",
+        "@id": "dtmi:example:mu_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "iota_sigma",
+          "name": "mu_spazz",
           "schema": {
-            "@id": "dtmi:example:iota_tau;1",
+            "@id": "dtmi:example:mu_floob;1",
             "@type": "Interface"
           },
           "displayName": [
@@ -405,14 +405,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_psi;1",
+        "@id": "dtmi:example:mu_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "iota_phi",
+          "name": "mu_jogg",
           "schema": {
-            "@id": "dtmi:example:iota_chi;1",
+            "@id": "dtmi:example:mu_flunn;1",
             "@type": "Interface"
           },
           "displayName": [
@@ -430,13 +430,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_wum;1",
+        "@id": "dtmi:example:mu_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "iota_omega",
+          "name": "mu_yekk",
           "schema": {
-            "@id": "dtmi:example:iota_yuzz;1",
+            "@id": "dtmi:example:mu_vroo;1",
             "@type": "Interface"
           },
           "displayName": [
@@ -454,14 +454,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_fuddle;1",
+        "@id": "dtmi:example:nu_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "iota_um",
+          "name": "nu_alpha",
           "schema": {
-            "@id": "dtmi:example:iota_humpf;1",
+            "@id": "dtmi:example:nu_beta;1",
             "@type": "Interface"
           },
           "displayName": [
@@ -479,13 +479,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_snee;1",
+        "@id": "dtmi:example:nu_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "iota_glikk",
+          "name": "nu_delta",
           "schema": {
-            "@id": "dtmi:example:iota_nuh;1",
+            "@id": "dtmi:example:nu_epsilon;1",
             "@type": "Interface"
           },
           "displayName": {
@@ -504,14 +504,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_spazz;1",
+        "@id": "dtmi:example:nu_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "iota_quan",
+          "name": "nu_eta",
           "schema": {
-            "@id": "dtmi:example:iota_thnad;1",
+            "@id": "dtmi:example:nu_theta;1",
             "@type": "Interface"
           },
           "displayName": {
@@ -530,13 +530,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_jogg;1",
+        "@id": "dtmi:example:nu_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "iota_floob",
+          "name": "nu_kappa",
           "schema": {
-            "@id": "dtmi:example:iota_zatz;1",
+            "@id": "dtmi:example:nu_lambda;1",
             "@type": "Interface"
           },
           "displayName": [
@@ -556,14 +556,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_yekk;1",
+        "@id": "dtmi:example:nu_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "iota_flunn",
+          "name": "nu_nu",
           "schema": {
-            "@id": "dtmi:example:iota_itch;1",
+            "@id": "dtmi:example:nu_xi;1",
             "@type": "Interface"
           },
           "displayName": [
diff --git a/DTDL/v2/spec/Requirement-ClassComponentPropertyDisplayNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassComponentPropertyDisplayNameStringLengthV2.json
index 3f295b6c..155cce6e 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentPropertyDisplayNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentPropertyDisplayNameStringLengthV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_alpha;1",
+        "@id": "dtmi:example:nu_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "iota_vroo",
+          "name": "nu_pi",
           "schema": {
-            "@id": "dtmi:example:iota_hi;1",
+            "@id": "dtmi:example:nu_rho;1",
             "@type": "Interface"
           },
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSometh"
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_delta;1",
+        "@id": "dtmi:example:nu_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "kappa_beta",
+          "name": "nu_tau",
           "schema": {
-            "@id": "dtmi:example:kappa_gamma;1",
+            "@id": "dtmi:example:nu_upsilon;1",
             "@type": "Interface"
           },
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
@@ -51,14 +51,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_eta;1",
+        "@id": "dtmi:example:nu_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "kappa_epsilon",
+          "name": "nu_chi",
           "schema": {
-            "@id": "dtmi:example:kappa_zeta;1",
+            "@id": "dtmi:example:nu_psi;1",
             "@type": "Interface"
           },
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
diff --git a/DTDL/v2/spec/Requirement-ClassComponentPropertyDisplayNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassComponentPropertyDisplayNameTermAndDtmiV2.json
index f8316a07..a02b6888 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentPropertyDisplayNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentPropertyDisplayNameTermAndDtmiV2.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_omega;1",
+        "@id": "dtmi:example:nu_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "displayName": [
-            "kappa_upsilon"
+            "nu_zatz"
           ],
           "dtmi:dtdl:property:displayName;2": [
-            "kappa_phi"
+            "nu_jogg"
           ],
-          "name": "kappa_chi",
+          "name": "nu_flunn",
           "schema": {
-            "@id": "dtmi:example:kappa_psi;1",
+            "@id": "dtmi:example:nu_itch;1",
             "@type": "Interface"
           }
         }
@@ -34,20 +34,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_fuddle;1",
+        "@id": "dtmi:example:xi_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "displayName": [
-            "kappa_yuzz"
+            "nu_vroo"
           ],
           "dtmi:dtdl:property:displayName;2": [
-            "kappa_wum"
+            "nu_hi"
           ],
-          "name": "kappa_um",
+          "name": "xi_alpha",
           "schema": {
-            "@id": "dtmi:example:kappa_humpf;1",
+            "@id": "dtmi:example:xi_beta;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassComponentPropertyFormallyInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassComponentPropertyFormallyInvalidDtmiV2.json
index 0b237d02..34cfb3e2 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentPropertyFormallyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentPropertyFormallyInvalidDtmiV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_yuzz;1",
+        "@id": "dtmi:example:xi_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "lambda_psi",
+          "name": "xi_itch",
           "schema": {
-            "@id": "dtmi:example:lambda_omega;1",
+            "@id": "dtmi:example:xi_yekk;1",
             "@type": "Interface"
           },
           "dtmi:foo//bar": 626
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_humpf;1",
+        "@id": "dtmi:example:omicron_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "lambda_wum",
+          "name": "xi_hi",
           "schema": {
-            "@id": "dtmi:example:lambda_um;1",
+            "@id": "dtmi:example:omicron_alpha;1",
             "@type": "Interface"
           },
           "dtmi:foo//bar": 626
diff --git a/DTDL/v2/spec/Requirement-ClassComponentPropertyFormallyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Requirement-ClassComponentPropertyFormallyIrrelevantDtmiOrTermV2.json
index f4b5a26d..bf311297 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentPropertyFormallyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentPropertyFormallyIrrelevantDtmiOrTermV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_kappa;1",
+        "@id": "dtmi:example:xi_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "lambda_theta",
+          "name": "xi_yuzz",
           "schema": {
-            "@id": "dtmi:example:lambda_iota;1",
+            "@id": "dtmi:example:xi_wum;1",
             "@type": "Interface"
           },
           "dtmi:foo:bar;1": 626
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_nu;1",
+        "@id": "dtmi:example:xi_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "lambda_lambda",
+          "name": "xi_humpf",
           "schema": {
-            "@id": "dtmi:example:lambda_mu;1",
+            "@id": "dtmi:example:xi_fuddle;1",
             "@type": "Interface"
           },
           "dtmi:foo:bar;1": 626
@@ -52,13 +52,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_pi;1",
+        "@id": "dtmi:example:xi_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "lambda_xi",
+          "name": "xi_nuh",
           "schema": {
-            "@id": "dtmi:example:lambda_omicron;1",
+            "@id": "dtmi:example:xi_snee;1",
             "@type": "Interface"
           },
           "boolean": null
@@ -74,14 +74,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_tau;1",
+        "@id": "dtmi:example:xi_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "lambda_rho",
+          "name": "xi_thnad",
           "schema": {
-            "@id": "dtmi:example:lambda_sigma;1",
+            "@id": "dtmi:example:xi_spazz;1",
             "@type": "Interface"
           },
           "boolean": null
diff --git a/DTDL/v2/spec/Requirement-ClassComponentPropertyFormallyNotDtmiNorTermV2.json b/DTDL/v2/spec/Requirement-ClassComponentPropertyFormallyNotDtmiNorTermV2.json
index 684d9721..c605f752 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentPropertyFormallyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentPropertyFormallyNotDtmiNorTermV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_thnad;1",
+        "@id": "dtmi:example:omicron_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "lambda_snee",
+          "name": "omicron_zeta",
           "schema": {
-            "@id": "dtmi:example:lambda_quan;1",
+            "@id": "dtmi:example:omicron_eta;1",
             "@type": "Interface"
           },
           "http://foo.com/bar": true
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_zatz;1",
+        "@id": "dtmi:example:omicron_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "lambda_spazz",
+          "name": "omicron_iota",
           "schema": {
-            "@id": "dtmi:example:lambda_floob;1",
+            "@id": "dtmi:example:omicron_kappa;1",
             "@type": "Interface"
           },
           "http://foo.com/bar": true
diff --git a/DTDL/v2/spec/Requirement-ClassComponentPropertyFormallyUndefinedTermV2.json b/DTDL/v2/spec/Requirement-ClassComponentPropertyFormallyUndefinedTermV2.json
index a58e8f13..69440e60 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentPropertyFormallyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentPropertyFormallyUndefinedTermV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_hi;1",
+        "@id": "dtmi:example:omicron_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "lambda_yekk",
+          "name": "omicron_omicron",
           "schema": {
-            "@id": "dtmi:example:lambda_vroo;1",
+            "@id": "dtmi:example:omicron_pi;1",
             "@type": "Interface"
           },
           "foobar": {}
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_gamma;1",
+        "@id": "dtmi:example:omicron_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "mu_alpha",
+          "name": "omicron_sigma",
           "schema": {
-            "@id": "dtmi:example:mu_beta;1",
+            "@id": "dtmi:example:omicron_tau;1",
             "@type": "Interface"
           },
           "foobar": {}
diff --git a/DTDL/v2/spec/Requirement-ClassComponentPropertyNamePatternV2.json b/DTDL/v2/spec/Requirement-ClassComponentPropertyNamePatternV2.json
index aa46d1bd..fb4db131 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentPropertyNamePatternV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentPropertyNamePatternV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_rho;1",
+        "@id": "dtmi:example:zatz_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:thnad_pi;1",
+            "@id": "dtmi:example:zatz_rho;1",
             "@type": "Interface"
           },
           "name": "EARTH"
@@ -28,12 +28,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_tau;1",
+        "@id": "dtmi:example:zatz_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:thnad_sigma;1",
+            "@id": "dtmi:example:zatz_tau;1",
             "@type": "Interface"
           },
           "name": "Air"
@@ -49,12 +49,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_phi;1",
+        "@id": "dtmi:example:zatz_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:thnad_upsilon;1",
+            "@id": "dtmi:example:zatz_phi;1",
             "@type": "Interface"
           },
           "name": "fire"
@@ -70,12 +70,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_psi;1",
+        "@id": "dtmi:example:zatz_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:thnad_chi;1",
+            "@id": "dtmi:example:zatz_psi;1",
             "@type": "Interface"
           },
           "name": "hello_world"
@@ -91,12 +91,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_yuzz;1",
+        "@id": "dtmi:example:zatz_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:thnad_omega;1",
+            "@id": "dtmi:example:zatz_yuzz;1",
             "@type": "Interface"
           },
           "name": "Anarchy99"
@@ -112,12 +112,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_um;1",
+        "@id": "dtmi:example:zatz_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:thnad_wum;1",
+            "@id": "dtmi:example:zatz_um;1",
             "@type": "Interface"
           },
           "name": "23skidoo"
@@ -133,13 +133,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_fuddle;1",
+        "@id": "dtmi:example:zatz_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:thnad_humpf;1",
+            "@id": "dtmi:example:zatz_fuddle;1",
             "@type": "Interface"
           },
           "name": "23skidoo"
@@ -155,12 +155,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_nuh;1",
+        "@id": "dtmi:example:zatz_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:thnad_glikk;1",
+            "@id": "dtmi:example:zatz_nuh;1",
             "@type": "Interface"
           },
           "name": "626"
@@ -176,13 +176,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_quan;1",
+        "@id": "dtmi:example:zatz_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:thnad_snee;1",
+            "@id": "dtmi:example:zatz_quan;1",
             "@type": "Interface"
           },
           "name": "626"
@@ -198,12 +198,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_spazz;1",
+        "@id": "dtmi:example:zatz_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:thnad_thnad;1",
+            "@id": "dtmi:example:zatz_spazz;1",
             "@type": "Interface"
           },
           "name": "goodbye-world"
@@ -219,13 +219,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_zatz;1",
+        "@id": "dtmi:example:zatz_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:thnad_floob;1",
+            "@id": "dtmi:example:zatz_zatz;1",
             "@type": "Interface"
           },
           "name": "goodbye-world"
@@ -241,12 +241,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_flunn;1",
+        "@id": "dtmi:example:zatz_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:thnad_jogg;1",
+            "@id": "dtmi:example:zatz_flunn;1",
             "@type": "Interface"
           },
           "name": "_haha"
@@ -262,13 +262,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_yekk;1",
+        "@id": "dtmi:example:zatz_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:thnad_itch;1",
+            "@id": "dtmi:example:zatz_yekk;1",
             "@type": "Interface"
           },
           "name": "_haha"
@@ -284,12 +284,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_hi;1",
+        "@id": "dtmi:example:jogg_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:thnad_vroo;1",
+            "@id": "dtmi:example:zatz_hi;1",
             "@type": "Interface"
           },
           "name": "toodaloo_"
@@ -305,13 +305,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_beta;1",
+        "@id": "dtmi:example:jogg_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:spazz_alpha;1",
+            "@id": "dtmi:example:jogg_beta;1",
             "@type": "Interface"
           },
           "name": "toodaloo_"
@@ -327,12 +327,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_delta;1",
+        "@id": "dtmi:example:jogg_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:spazz_gamma;1",
+            "@id": "dtmi:example:jogg_delta;1",
             "@type": "Interface"
           },
           "name": "pro:con"
@@ -348,13 +348,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_zeta;1",
+        "@id": "dtmi:example:jogg_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:spazz_epsilon;1",
+            "@id": "dtmi:example:jogg_zeta;1",
             "@type": "Interface"
           },
           "name": "pro:con"
@@ -370,12 +370,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_theta;1",
+        "@id": "dtmi:example:jogg_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:spazz_eta;1",
+            "@id": "dtmi:example:jogg_theta;1",
             "@type": "Interface"
           },
           "name": "mish/mash"
@@ -391,13 +391,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_kappa;1",
+        "@id": "dtmi:example:jogg_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:spazz_iota;1",
+            "@id": "dtmi:example:jogg_kappa;1",
             "@type": "Interface"
           },
           "name": "mish/mash"
@@ -413,12 +413,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_mu;1",
+        "@id": "dtmi:example:jogg_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:spazz_lambda;1",
+            "@id": "dtmi:example:jogg_mu;1",
             "@type": "Interface"
           },
           "name": "#tag"
@@ -434,13 +434,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_xi;1",
+        "@id": "dtmi:example:jogg_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:spazz_nu;1",
+            "@id": "dtmi:example:jogg_xi;1",
             "@type": "Interface"
           },
           "name": "#tag"
@@ -456,12 +456,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_pi;1",
+        "@id": "dtmi:example:jogg_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:spazz_omicron;1",
+            "@id": "dtmi:example:jogg_pi;1",
             "@type": "Interface"
           },
           "name": "@tweet"
@@ -477,13 +477,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_sigma;1",
+        "@id": "dtmi:example:jogg_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:spazz_rho;1",
+            "@id": "dtmi:example:jogg_sigma;1",
             "@type": "Interface"
           },
           "name": "@tweet"
@@ -499,12 +499,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_upsilon;1",
+        "@id": "dtmi:example:jogg_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:spazz_tau;1",
+            "@id": "dtmi:example:jogg_upsilon;1",
             "@type": "Interface"
           },
           "name": "$money"
@@ -520,13 +520,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_chi;1",
+        "@id": "dtmi:example:jogg_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:spazz_phi;1",
+            "@id": "dtmi:example:jogg_chi;1",
             "@type": "Interface"
           },
           "name": "$money"
diff --git a/DTDL/v2/spec/Requirement-ClassComponentPropertyNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassComponentPropertyNameStringLengthV2.json
index cc78a41b..1d0dfa43 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentPropertyNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentPropertyNameStringLengthV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_lambda;1",
+        "@id": "dtmi:example:zatz_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:thnad_kappa;1",
+            "@id": "dtmi:example:zatz_lambda;1",
             "@type": "Interface"
           },
           "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSometh"
@@ -28,12 +28,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_nu;1",
+        "@id": "dtmi:example:zatz_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:thnad_mu;1",
+            "@id": "dtmi:example:zatz_nu;1",
             "@type": "Interface"
           },
           "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
@@ -49,13 +49,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_omicron;1",
+        "@id": "dtmi:example:zatz_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:thnad_xi;1",
+            "@id": "dtmi:example:zatz_omicron;1",
             "@type": "Interface"
           },
           "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
diff --git a/DTDL/v2/spec/Requirement-ClassComponentPropertyNameStringV2.json b/DTDL/v2/spec/Requirement-ClassComponentPropertyNameStringV2.json
index d370884f..f0c5515e 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentPropertyNameStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentPropertyNameStringV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_kappa;1",
+        "@id": "dtmi:example:floob_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:quan_iota;1",
+            "@id": "dtmi:example:floob_kappa;1",
             "@type": "Interface"
           },
           "name": "hello"
@@ -28,12 +28,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_mu;1",
+        "@id": "dtmi:example:floob_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:quan_lambda;1",
+            "@id": "dtmi:example:floob_mu;1",
             "@type": "Interface"
           },
           "name": [
@@ -51,12 +51,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_xi;1",
+        "@id": "dtmi:example:floob_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:quan_nu;1",
+            "@id": "dtmi:example:floob_xi;1",
             "@type": "Interface"
           },
           "name": {
@@ -75,12 +75,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_pi;1",
+        "@id": "dtmi:example:floob_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:quan_omicron;1",
+            "@id": "dtmi:example:floob_pi;1",
             "@type": "Interface"
           },
           "name": [
@@ -101,12 +101,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_sigma;1",
+        "@id": "dtmi:example:floob_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:quan_rho;1",
+            "@id": "dtmi:example:floob_sigma;1",
             "@type": "Interface"
           },
           "name": null
@@ -122,13 +122,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_upsilon;1",
+        "@id": "dtmi:example:floob_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:quan_tau;1",
+            "@id": "dtmi:example:floob_upsilon;1",
             "@type": "Interface"
           },
           "name": null
@@ -144,12 +144,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_chi;1",
+        "@id": "dtmi:example:floob_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:quan_phi;1",
+            "@id": "dtmi:example:floob_chi;1",
             "@type": "Interface"
           },
           "name": true
@@ -165,13 +165,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_omega;1",
+        "@id": "dtmi:example:floob_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:quan_psi;1",
+            "@id": "dtmi:example:floob_omega;1",
             "@type": "Interface"
           },
           "name": true
@@ -187,12 +187,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_wum;1",
+        "@id": "dtmi:example:floob_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:quan_yuzz;1",
+            "@id": "dtmi:example:floob_wum;1",
             "@type": "Interface"
           },
           "name": 626
@@ -208,13 +208,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_humpf;1",
+        "@id": "dtmi:example:floob_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:quan_um;1",
+            "@id": "dtmi:example:floob_humpf;1",
             "@type": "Interface"
           },
           "name": 626
@@ -230,12 +230,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_glikk;1",
+        "@id": "dtmi:example:floob_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:quan_fuddle;1",
+            "@id": "dtmi:example:floob_glikk;1",
             "@type": "Interface"
           },
           "name": [
@@ -253,13 +253,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_snee;1",
+        "@id": "dtmi:example:floob_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:quan_nuh;1",
+            "@id": "dtmi:example:floob_snee;1",
             "@type": "Interface"
           },
           "name": [
@@ -277,12 +277,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_thnad;1",
+        "@id": "dtmi:example:floob_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:quan_quan;1",
+            "@id": "dtmi:example:floob_thnad;1",
             "@type": "Interface"
           },
           "name": [
@@ -300,13 +300,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_floob;1",
+        "@id": "dtmi:example:floob_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:quan_spazz;1",
+            "@id": "dtmi:example:floob_floob;1",
             "@type": "Interface"
           },
           "name": [
@@ -324,12 +324,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_jogg;1",
+        "@id": "dtmi:example:floob_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:quan_zatz;1",
+            "@id": "dtmi:example:floob_jogg;1",
             "@type": "Interface"
           },
           "name": [
@@ -347,13 +347,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_itch;1",
+        "@id": "dtmi:example:floob_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:quan_flunn;1",
+            "@id": "dtmi:example:floob_itch;1",
             "@type": "Interface"
           },
           "name": [
@@ -371,12 +371,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_vroo;1",
+        "@id": "dtmi:example:floob_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:quan_yekk;1",
+            "@id": "dtmi:example:floob_vroo;1",
             "@type": "Interface"
           },
           "name": {}
@@ -392,13 +392,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_alpha;1",
+        "@id": "dtmi:example:zatz_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:quan_hi;1",
+            "@id": "dtmi:example:zatz_alpha;1",
             "@type": "Interface"
           },
           "name": {}
@@ -414,12 +414,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_gamma;1",
+        "@id": "dtmi:example:zatz_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:thnad_beta;1",
+            "@id": "dtmi:example:zatz_gamma;1",
             "@type": "Interface"
           },
           "name": [
@@ -437,13 +437,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_epsilon;1",
+        "@id": "dtmi:example:zatz_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:thnad_delta;1",
+            "@id": "dtmi:example:zatz_epsilon;1",
             "@type": "Interface"
           },
           "name": [
@@ -461,12 +461,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_eta;1",
+        "@id": "dtmi:example:zatz_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:thnad_zeta;1",
+            "@id": "dtmi:example:zatz_eta;1",
             "@type": "Interface"
           },
           "name": []
@@ -482,13 +482,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_iota;1",
+        "@id": "dtmi:example:zatz_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:thnad_theta;1",
+            "@id": "dtmi:example:zatz_iota;1",
             "@type": "Interface"
           },
           "name": []
diff --git a/DTDL/v2/spec/Requirement-ClassComponentPropertyNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassComponentPropertyNameTermAndDtmiV2.json
index c6ae4968..050d56bd 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentPropertyNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentPropertyNameTermAndDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_alpha;1",
+        "@id": "dtmi:example:flunn_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "spazz_yekk",
-          "dtmi:dtdl:property:name;2": "spazz_vroo",
+          "name": "jogg_vroo",
+          "dtmi:dtdl:property:name;2": "jogg_hi",
           "schema": {
-            "@id": "dtmi:example:spazz_hi;1",
+            "@id": "dtmi:example:flunn_alpha;1",
             "@type": "Interface"
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_epsilon;1",
+        "@id": "dtmi:example:flunn_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "floob_beta",
-          "dtmi:dtdl:property:name;2": "floob_gamma",
+          "name": "flunn_gamma",
+          "dtmi:dtdl:property:name;2": "flunn_delta",
           "schema": {
-            "@id": "dtmi:example:floob_delta;1",
+            "@id": "dtmi:example:flunn_epsilon;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassComponentPropertyNameUniqueAmongInterfaceContentsV2.json b/DTDL/v2/spec/Requirement-ClassComponentPropertyNameUniqueAmongInterfaceContentsV2.json
index 0209b02b..8f1ecd66 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentPropertyNameUniqueAmongInterfaceContentsV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentPropertyNameUniqueAmongInterfaceContentsV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_yuzz;1",
+        "@id": "dtmi:example:jogg_wum;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Component",
             "schema": {
-              "@id": "dtmi:example:spazz_psi;1",
+              "@id": "dtmi:example:jogg_omega;1",
               "@type": "Interface"
             },
             "name": "alpha_xi"
@@ -21,7 +21,7 @@
           {
             "@type": "Component",
             "schema": {
-              "@id": "dtmi:example:spazz_omega;1",
+              "@id": "dtmi:example:jogg_yuzz;1",
               "@type": "Interface"
             },
             "name": "alpha_omicron"
@@ -38,13 +38,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_humpf;1",
+        "@id": "dtmi:example:jogg_fuddle;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Component",
             "schema": {
-              "@id": "dtmi:example:spazz_wum;1",
+              "@id": "dtmi:example:jogg_um;1",
               "@type": "Interface"
             },
             "name": "alpha_xi"
@@ -52,7 +52,7 @@
           {
             "@type": "Component",
             "schema": {
-              "@id": "dtmi:example:spazz_um;1",
+              "@id": "dtmi:example:jogg_humpf;1",
               "@type": "Interface"
             },
             "name": "alpha_xi"
@@ -72,13 +72,13 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:spazz_nuh;1",
+        "@id": "dtmi:example:jogg_snee;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Component",
             "schema": {
-              "@id": "dtmi:example:spazz_fuddle;1",
+              "@id": "dtmi:example:jogg_glikk;1",
               "@type": "Interface"
             },
             "name": "alpha_xi"
@@ -86,7 +86,7 @@
           {
             "@type": "Component",
             "schema": {
-              "@id": "dtmi:example:spazz_glikk;1",
+              "@id": "dtmi:example:jogg_nuh;1",
               "@type": "Interface"
             },
             "name": "alpha_xi"
diff --git a/DTDL/v2/spec/Requirement-ClassComponentPropertySchemaElementV2.json b/DTDL/v2/spec/Requirement-ClassComponentPropertySchemaElementV2.json
index 55ae304c..6c77e84f 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentPropertySchemaElementV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentPropertySchemaElementV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_iota;1",
+        "@id": "dtmi:example:flunn_kappa;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:floob_theta;1",
+          "@id": "dtmi:example:flunn_iota;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "floob_eta",
+            "name": "flunn_theta",
             "schema": {
-              "@id": "dtmi:example:floob_zeta;1",
+              "@id": "dtmi:example:flunn_eta;1",
               "@type": "Interface"
             }
           }
@@ -32,17 +32,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_nu;1",
+        "@id": "dtmi:example:flunn_xi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:floob_mu;1",
+          "@id": "dtmi:example:flunn_nu;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "floob_lambda",
+            "name": "flunn_mu",
             "schema": [
               {
-                "@id": "dtmi:example:floob_kappa;1",
+                "@id": "dtmi:example:flunn_lambda;1",
                 "@type": "Interface"
               }
             ]
@@ -60,14 +60,14 @@
       [
         {
           "@context": "dtmi:dtdl:context;2",
-          "@id": "dtmi:example:floob_pi;1",
+          "@id": "dtmi:example:flunn_rho;1",
           "@type": "Interface",
           "extends": {
-            "@id": "dtmi:example:floob_omicron;1",
+            "@id": "dtmi:example:flunn_pi;1",
             "@type": "Interface",
             "contents": {
               "@type": "Component",
-              "name": "floob_xi",
+              "name": "flunn_omicron",
               "schema": "dtmi:ex:dependentRef;1"
             }
           }
@@ -89,14 +89,14 @@
       [
         {
           "@context": "dtmi:dtdl:context;2",
-          "@id": "dtmi:example:floob_tau;1",
+          "@id": "dtmi:example:flunn_upsilon;1",
           "@type": "Interface",
           "extends": {
-            "@id": "dtmi:example:floob_sigma;1",
+            "@id": "dtmi:example:flunn_tau;1",
             "@type": "Interface",
             "contents": {
               "@type": "Component",
-              "name": "floob_rho",
+              "name": "flunn_sigma",
               "schema": [
                 "dtmi:ex:dependentRef;1"
               ]
@@ -119,16 +119,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_psi;1",
+        "@id": "dtmi:example:flunn_omega;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:floob_chi;1",
+          "@id": "dtmi:example:flunn_psi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "floob_phi",
+            "name": "flunn_chi",
             "schema": {
-              "@id": "dtmi:example:floob_upsilon;1",
+              "@id": "dtmi:example:flunn_phi;1",
               "@type": "Interface",
               "@context": "dtmi:dtdl:context;3"
             }
@@ -145,17 +145,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_um;1",
+        "@id": "dtmi:example:flunn_humpf;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:floob_wum;1",
+          "@id": "dtmi:example:flunn_um;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Component",
-            "name": "floob_yuzz",
+            "name": "flunn_wum",
             "schema": {
-              "@id": "dtmi:example:floob_omega;1",
+              "@id": "dtmi:example:flunn_yuzz;1",
               "@type": "Interface",
               "@context": "dtmi:dtdl:context;3"
             }
@@ -172,14 +172,67 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_glikk;1",
+        "@id": "dtmi:example:flunn_snee;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:floob_fuddle;1",
+          "@id": "dtmi:example:flunn_nuh;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "floob_humpf",
+            "name": "flunn_glikk",
+            "schema": {
+              "@id": "dtmi:example:flunn_fuddle;1",
+              "@type": "Interface",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:flunn_floob;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:flunn_spazz;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Component",
+            "name": "flunn_thnad",
+            "schema": {
+              "@id": "dtmi:example:flunn_quan;1",
+              "@type": "Interface",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:flunn_flunn;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:flunn_jogg;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "flunn_zatz",
             "schema": []
           }
         }
@@ -194,15 +247,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_quan;1",
+        "@id": "dtmi:example:flunn_vroo;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:floob_snee;1",
+          "@id": "dtmi:example:flunn_yekk;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Component",
-            "name": "floob_nuh",
+            "name": "flunn_itch",
             "schema": []
           }
         }
@@ -217,21 +270,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_jogg;1",
+        "@id": "dtmi:example:itch_delta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:floob_zatz;1",
+          "@id": "dtmi:example:itch_gamma;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "floob_floob",
+            "name": "itch_beta",
             "schema": [
               {
-                "@id": "dtmi:example:floob_thnad;1",
+                "@id": "dtmi:example:flunn_hi;1",
                 "@type": "Interface"
               },
               {
-                "@id": "dtmi:example:floob_spazz;1",
+                "@id": "dtmi:example:itch_alpha;1",
                 "@type": "Interface"
               }
             ]
@@ -248,22 +301,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_hi;1",
+        "@id": "dtmi:example:itch_iota;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:floob_vroo;1",
+          "@id": "dtmi:example:itch_theta;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Component",
-            "name": "floob_yekk",
+            "name": "itch_eta",
             "schema": [
               {
-                "@id": "dtmi:example:floob_flunn;1",
+                "@id": "dtmi:example:itch_epsilon;1",
                 "@type": "Interface"
               },
               {
-                "@id": "dtmi:example:floob_itch;1",
+                "@id": "dtmi:example:itch_zeta;1",
                 "@type": "Interface"
               }
             ]
diff --git a/DTDL/v2/spec/Requirement-ClassComponentPropertySchemaTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassComponentPropertySchemaTermAndDtmiV2.json
index 0f7facd4..c3c0e36d 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentPropertySchemaTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentPropertySchemaTermAndDtmiV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_eta;1",
+        "@id": "dtmi:example:hi_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "itch_delta",
+          "name": "hi_nu",
           "schema": {
-            "@id": "dtmi:example:itch_epsilon;1",
+            "@id": "dtmi:example:hi_xi;1",
             "@type": "Interface"
           },
           "dtmi:dtdl:property:schema;2": {
-            "@id": "dtmi:example:itch_zeta;1",
+            "@id": "dtmi:example:hi_omicron;1",
             "@type": "Interface"
           }
         }
@@ -32,18 +32,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_lambda;1",
+        "@id": "dtmi:example:hi_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "itch_theta",
+          "name": "hi_rho",
           "schema": {
-            "@id": "dtmi:example:itch_iota;1",
+            "@id": "dtmi:example:hi_sigma;1",
             "@type": "Interface"
           },
           "dtmi:dtdl:property:schema;2": {
-            "@id": "dtmi:example:itch_kappa;1",
+            "@id": "dtmi:example:hi_tau;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassComponentPropertySchemaTypeConformanceV2.json b/DTDL/v2/spec/Requirement-ClassComponentPropertySchemaTypeConformanceV2.json
index 6a0578f6..3aab79e5 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentPropertySchemaTypeConformanceV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentPropertySchemaTypeConformanceV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_iota;1",
+        "@id": "dtmi:example:itch_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "zatz_theta",
+          "name": "itch_rho",
           "schema": {
-            "@id": "dtmi:example:zatz_eta;1",
-            "elementSchema": "date",
+            "@id": "dtmi:example:itch_pi;1",
+            "elementSchema": "time",
             "@type": "Array"
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_mu;1",
+        "@id": "dtmi:example:itch_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "zatz_lambda",
+          "name": "itch_upsilon",
           "schema": {
-            "@id": "dtmi:example:zatz_kappa;1",
-            "elementSchema": "dateTime",
+            "@id": "dtmi:example:itch_tau;1",
+            "elementSchema": "boolean",
             "@type": "Array"
           }
         }
@@ -52,14 +52,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_pi;1",
+        "@id": "dtmi:example:itch_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "zatz_omicron",
+          "name": "itch_omega",
           "schema": {
-            "@id": "dtmi:example:zatz_nu;1",
-            "name": "zatz_xi",
+            "@id": "dtmi:example:itch_chi;1",
+            "name": "itch_psi",
             "@type": "Command"
           }
         }
@@ -74,15 +74,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_upsilon;1",
+        "@id": "dtmi:example:itch_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "zatz_tau",
+          "name": "itch_humpf",
           "schema": {
-            "@id": "dtmi:example:zatz_rho;1",
-            "name": "zatz_sigma",
+            "@id": "dtmi:example:itch_wum;1",
+            "name": "itch_um",
             "@type": "Command"
           }
         }
@@ -97,15 +97,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_omega;1",
+        "@id": "dtmi:example:itch_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "zatz_psi",
+          "name": "itch_snee",
           "schema": {
-            "@id": "dtmi:example:zatz_phi;1",
-            "name": "zatz_chi",
-            "schema": "double",
+            "@id": "dtmi:example:itch_glikk;1",
+            "name": "itch_nuh",
+            "schema": "date",
             "@type": "CommandPayload"
           }
         }
@@ -120,16 +120,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_humpf;1",
+        "@id": "dtmi:example:itch_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "zatz_um",
+          "name": "itch_floob",
           "schema": {
-            "@id": "dtmi:example:zatz_yuzz;1",
-            "name": "zatz_wum",
-            "schema": "duration",
+            "@id": "dtmi:example:itch_thnad;1",
+            "name": "itch_spazz",
+            "schema": "dateTime",
             "@type": "CommandPayload"
           }
         }
@@ -144,16 +144,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_quan;1",
+        "@id": "dtmi:example:itch_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "zatz_snee",
+          "name": "itch_yekk",
           "schema": {
-            "@id": "dtmi:example:zatz_fuddle;1",
-            "name": "zatz_glikk",
+            "@id": "dtmi:example:itch_jogg;1",
+            "name": "itch_flunn",
             "schema": {
-              "@id": "dtmi:example:zatz_nuh;1",
+              "@id": "dtmi:example:itch_itch;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -170,17 +170,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_jogg;1",
+        "@id": "dtmi:example:yekk_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "zatz_zatz",
+          "name": "yekk_gamma",
           "schema": {
-            "@id": "dtmi:example:zatz_thnad;1",
-            "name": "zatz_spazz",
+            "@id": "dtmi:example:itch_hi;1",
+            "name": "yekk_alpha",
             "schema": {
-              "@id": "dtmi:example:zatz_floob;1",
+              "@id": "dtmi:example:yekk_beta;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -197,17 +197,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_vroo;1",
+        "@id": "dtmi:example:yekk_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "zatz_yekk",
+          "name": "yekk_eta",
           "schema": {
-            "@id": "dtmi:example:zatz_flunn;1",
+            "@id": "dtmi:example:yekk_epsilon;1",
             "enumValues": [
               {
-                "enumValue": 47,
-                "name": "zatz_itch"
+                "enumValue": 54,
+                "name": "yekk_zeta"
               }
             ],
             "valueSchema": "integer",
@@ -225,18 +225,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_gamma;1",
+        "@id": "dtmi:example:yekk_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "jogg_beta",
+          "name": "yekk_lambda",
           "schema": {
-            "@id": "dtmi:example:zatz_hi;1",
+            "@id": "dtmi:example:yekk_iota;1",
             "enumValues": [
               {
-                "enumValue": 48,
-                "name": "jogg_alpha"
+                "enumValue": 55,
+                "name": "yekk_kappa"
               }
             ],
             "valueSchema": "integer",
@@ -254,15 +254,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_eta;1",
+        "@id": "dtmi:example:yekk_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "jogg_zeta",
+          "name": "yekk_omicron",
           "schema": {
-            "@id": "dtmi:example:jogg_delta;1",
-            "enumValue": 49,
-            "name": "jogg_epsilon",
+            "@id": "dtmi:example:yekk_nu;1",
+            "enumValue": 56,
+            "name": "yekk_xi",
             "@type": "EnumValue"
           }
         }
@@ -277,16 +277,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_lambda;1",
+        "@id": "dtmi:example:yekk_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "jogg_kappa",
+          "name": "yekk_tau",
           "schema": {
-            "@id": "dtmi:example:jogg_theta;1",
-            "enumValue": 50,
-            "name": "jogg_iota",
+            "@id": "dtmi:example:yekk_rho;1",
+            "enumValue": 57,
+            "name": "yekk_sigma",
             "@type": "EnumValue"
           }
         }
@@ -301,15 +301,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_omicron;1",
+        "@id": "dtmi:example:yekk_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "jogg_xi",
+          "name": "yekk_psi",
           "schema": {
-            "@id": "dtmi:example:jogg_mu;1",
-            "name": "jogg_nu",
-            "schema": "float",
+            "@id": "dtmi:example:yekk_phi;1",
+            "name": "yekk_chi",
+            "schema": "double",
             "@type": "Field"
           }
         }
@@ -324,16 +324,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_tau;1",
+        "@id": "dtmi:example:yekk_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "jogg_sigma",
+          "name": "yekk_um",
           "schema": {
-            "@id": "dtmi:example:jogg_pi;1",
-            "name": "jogg_rho",
-            "schema": "integer",
+            "@id": "dtmi:example:yekk_yuzz;1",
+            "name": "yekk_wum",
+            "schema": "duration",
             "@type": "Field"
           }
         }
@@ -348,13 +348,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_chi;1",
+        "@id": "dtmi:example:yekk_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "jogg_phi",
+          "name": "yekk_glikk",
           "schema": {
-            "@id": "dtmi:example:jogg_upsilon;1",
+            "@id": "dtmi:example:yekk_fuddle;1",
             "@type": "Interface"
           }
         }
@@ -369,20 +369,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_um;1",
+        "@id": "dtmi:example:yekk_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "jogg_wum",
+          "name": "yekk_spazz",
           "schema": {
-            "@id": "dtmi:example:jogg_psi;1",
+            "@id": "dtmi:example:yekk_snee;1",
             "mapKey": {
-              "name": "jogg_omega",
+              "name": "yekk_quan",
               "schema": "string"
             },
             "mapValue": {
-              "name": "jogg_yuzz",
-              "schema": "long"
+              "name": "yekk_thnad",
+              "schema": "float"
             },
             "@type": "Map"
           }
@@ -398,21 +398,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_snee;1",
+        "@id": "dtmi:example:yekk_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "jogg_nuh",
+          "name": "yekk_itch",
           "schema": {
-            "@id": "dtmi:example:jogg_humpf;1",
+            "@id": "dtmi:example:yekk_zatz;1",
             "mapKey": {
-              "name": "jogg_fuddle",
+              "name": "yekk_jogg",
               "schema": "string"
             },
             "mapValue": {
-              "name": "jogg_glikk",
-              "schema": "string"
+              "name": "yekk_flunn",
+              "schema": "integer"
             },
             "@type": "Map"
           }
@@ -428,14 +428,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_floob;1",
+        "@id": "dtmi:example:vroo_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "jogg_spazz",
+          "name": "vroo_alpha",
           "schema": {
-            "@id": "dtmi:example:jogg_quan;1",
-            "name": "jogg_thnad",
+            "@id": "dtmi:example:yekk_vroo;1",
+            "name": "yekk_hi",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -451,15 +451,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_itch;1",
+        "@id": "dtmi:example:vroo_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "jogg_flunn",
+          "name": "vroo_epsilon",
           "schema": {
-            "@id": "dtmi:example:jogg_zatz;1",
-            "name": "jogg_jogg",
+            "@id": "dtmi:example:vroo_gamma;1",
+            "name": "vroo_delta",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -475,15 +475,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_alpha;1",
+        "@id": "dtmi:example:vroo_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "jogg_hi",
+          "name": "vroo_iota",
           "schema": {
-            "@id": "dtmi:example:jogg_yekk;1",
-            "name": "jogg_vroo",
-            "schema": "time",
+            "@id": "dtmi:example:vroo_eta;1",
+            "name": "vroo_theta",
+            "schema": "long",
             "@type": "MapValue"
           }
         }
@@ -498,16 +498,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_epsilon;1",
+        "@id": "dtmi:example:vroo_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "flunn_delta",
+          "name": "vroo_nu",
           "schema": {
-            "@id": "dtmi:example:flunn_beta;1",
-            "name": "flunn_gamma",
-            "schema": "boolean",
+            "@id": "dtmi:example:vroo_lambda;1",
+            "name": "vroo_mu",
+            "schema": "string",
             "@type": "MapValue"
           }
         }
@@ -522,17 +522,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_iota;1",
+        "@id": "dtmi:example:vroo_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "flunn_theta",
+          "name": "vroo_rho",
           "schema": {
-            "@id": "dtmi:example:flunn_zeta;1",
+            "@id": "dtmi:example:vroo_omicron;1",
             "fields": [
               {
-                "name": "flunn_eta",
-                "schema": "date"
+                "name": "vroo_pi",
+                "schema": "time"
               }
             ],
             "@type": "Object"
@@ -549,18 +549,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_nu;1",
+        "@id": "dtmi:example:vroo_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "flunn_mu",
+          "name": "vroo_phi",
           "schema": {
-            "@id": "dtmi:example:flunn_kappa;1",
+            "@id": "dtmi:example:vroo_tau;1",
             "fields": [
               {
-                "name": "flunn_lambda",
-                "schema": "dateTime"
+                "name": "vroo_upsilon",
+                "schema": "boolean"
               }
             ],
             "@type": "Object"
@@ -577,15 +577,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_rho;1",
+        "@id": "dtmi:example:vroo_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "flunn_pi",
+          "name": "vroo_yuzz",
           "schema": {
-            "@id": "dtmi:example:flunn_xi;1",
-            "name": "flunn_omicron",
-            "schema": "double",
+            "@id": "dtmi:example:vroo_psi;1",
+            "name": "vroo_omega",
+            "schema": "date",
             "@type": "Property"
           }
         }
@@ -600,16 +600,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_phi;1",
+        "@id": "dtmi:example:vroo_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "flunn_upsilon",
+          "name": "vroo_fuddle",
           "schema": {
-            "@id": "dtmi:example:flunn_sigma;1",
-            "name": "flunn_tau",
-            "schema": "duration",
+            "@id": "dtmi:example:vroo_um;1",
+            "name": "vroo_humpf",
+            "schema": "dateTime",
             "@type": "Property"
           }
         }
@@ -624,14 +624,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_yuzz;1",
+        "@id": "dtmi:example:vroo_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "flunn_omega",
+          "name": "vroo_quan",
           "schema": {
-            "@id": "dtmi:example:flunn_chi;1",
-            "name": "flunn_psi",
+            "@id": "dtmi:example:vroo_nuh;1",
+            "name": "vroo_snee",
             "@type": "Relationship"
           }
         }
@@ -646,15 +646,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_fuddle;1",
+        "@id": "dtmi:example:vroo_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "flunn_humpf",
+          "name": "vroo_zatz",
           "schema": {
-            "@id": "dtmi:example:flunn_wum;1",
-            "name": "flunn_um",
+            "@id": "dtmi:example:vroo_spazz;1",
+            "name": "vroo_floob",
             "@type": "Relationship"
           }
         }
@@ -669,15 +669,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_quan;1",
+        "@id": "dtmi:example:vroo_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "flunn_snee",
+          "name": "vroo_yekk",
           "schema": {
-            "@id": "dtmi:example:flunn_glikk;1",
-            "name": "flunn_nuh",
-            "schema": "float",
+            "@id": "dtmi:example:vroo_flunn;1",
+            "name": "vroo_itch",
+            "schema": "double",
             "@type": "Telemetry"
           }
         }
@@ -692,16 +692,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_zatz;1",
+        "@id": "dtmi:example:hi_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "flunn_floob",
+          "name": "hi_beta",
           "schema": {
-            "@id": "dtmi:example:flunn_thnad;1",
-            "name": "flunn_spazz",
-            "schema": "integer",
+            "@id": "dtmi:example:vroo_hi;1",
+            "name": "hi_alpha",
+            "schema": "duration",
             "@type": "Telemetry"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassComponentRequiredPropertiesV2.json b/DTDL/v2/spec/Requirement-ClassComponentRequiredPropertiesV2.json
index fba96e98..bcfa4edf 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentRequiredPropertiesV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentRequiredPropertiesV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_omicron;1",
+        "@id": "dtmi:example:quan_pi;1",
         "@type": "Interface",
         "contents": {
-          "name": "glikk_nu",
+          "name": "quan_xi",
           "schema": {
-            "@id": "dtmi:example:glikk_xi;1",
+            "@id": "dtmi:example:quan_omicron;1",
             "@type": "Interface"
           }
         }
@@ -27,13 +27,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_sigma;1",
+        "@id": "dtmi:example:quan_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "glikk_pi",
+          "name": "quan_rho",
           "schema": {
-            "@id": "dtmi:example:glikk_rho;1",
+            "@id": "dtmi:example:quan_sigma;1",
             "@type": "Interface"
           }
         }
@@ -48,12 +48,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_upsilon;1",
+        "@id": "dtmi:example:quan_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:glikk_tau;1",
+            "@id": "dtmi:example:quan_upsilon;1",
             "@type": "Interface"
           }
         }
@@ -68,13 +68,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_chi;1",
+        "@id": "dtmi:example:quan_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:glikk_phi;1",
+            "@id": "dtmi:example:quan_chi;1",
             "@type": "Interface"
           }
         }
@@ -89,11 +89,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_omega;1",
+        "@id": "dtmi:example:quan_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "glikk_psi"
+          "name": "quan_omega"
         }
       }
     ]
@@ -106,12 +106,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_wum;1",
+        "@id": "dtmi:example:quan_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "glikk_yuzz"
+          "name": "quan_wum"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassComponentTypeIncludesInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassComponentTypeIncludesInvalidDtmiV2.json
index 7023dce6..c30ee061 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentTypeIncludesInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentTypeIncludesInvalidDtmiV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_vroo;1",
+        "@id": "dtmi:example:spazz_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Component",
             "dtmi:foo//bar"
           ],
-          "name": "snee_itch",
+          "name": "spazz_yekk",
           "schema": {
-            "@id": "dtmi:example:snee_yekk;1",
+            "@id": "dtmi:example:spazz_vroo;1",
             "@type": "Interface"
           }
         }
@@ -31,7 +31,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_beta;1",
+        "@id": "dtmi:example:floob_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -39,9 +39,9 @@
             "Component",
             "dtmi:foo//bar"
           ],
-          "name": "snee_hi",
+          "name": "floob_alpha",
           "schema": {
-            "@id": "dtmi:example:quan_alpha;1",
+            "@id": "dtmi:example:floob_beta;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassComponentTypeIncludesMaterialV2.json b/DTDL/v2/spec/Requirement-ClassComponentTypeIncludesMaterialV2.json
index 60dc7cf1..162fe5c7 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentTypeIncludesMaterialV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentTypeIncludesMaterialV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_thnad;1",
+        "@id": "dtmi:example:thnad_spazz;1",
         "@type": "Interface",
         "contents": {
-          "name": "nuh_snee",
+          "name": "thnad_quan",
           "schema": {
-            "@id": "dtmi:example:nuh_quan;1",
+            "@id": "dtmi:example:thnad_thnad;1",
             "@type": "Interface"
           },
           "@type": "Component"
@@ -28,12 +28,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_zatz;1",
+        "@id": "dtmi:example:thnad_jogg;1",
         "@type": "Interface",
         "contents": {
-          "name": "nuh_spazz",
+          "name": "thnad_floob",
           "schema": {
-            "@id": "dtmi:example:nuh_floob;1",
+            "@id": "dtmi:example:thnad_zatz;1",
             "@type": "Interface"
           },
           "@type": [
@@ -51,12 +51,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_itch;1",
+        "@id": "dtmi:example:thnad_yekk;1",
         "@type": "Interface",
         "contents": {
-          "name": "nuh_jogg",
+          "name": "thnad_flunn",
           "schema": {
-            "@id": "dtmi:example:nuh_flunn;1",
+            "@id": "dtmi:example:thnad_itch;1",
             "@type": "Interface"
           },
           "@type": "dtmi:dtdl:class:Component;2"
@@ -72,12 +72,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_hi;1",
+        "@id": "dtmi:example:spazz_alpha;1",
         "@type": "Interface",
         "contents": {
-          "name": "nuh_yekk",
+          "name": "thnad_vroo",
           "schema": {
-            "@id": "dtmi:example:nuh_vroo;1",
+            "@id": "dtmi:example:thnad_hi;1",
             "@type": "Interface"
           },
           "@type": [
@@ -95,12 +95,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_gamma;1",
+        "@id": "dtmi:example:spazz_delta;1",
         "@type": "Interface",
         "contents": {
-          "name": "snee_alpha",
+          "name": "spazz_beta",
           "schema": {
-            "@id": "dtmi:example:snee_beta;1",
+            "@id": "dtmi:example:spazz_gamma;1",
             "@type": "Interface"
           },
           "@type": "Something"
@@ -116,13 +116,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_zeta;1",
+        "@id": "dtmi:example:spazz_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "snee_delta",
+          "name": "spazz_epsilon",
           "schema": {
-            "@id": "dtmi:example:snee_epsilon;1",
+            "@id": "dtmi:example:spazz_zeta;1",
             "@type": "Interface"
           },
           "@type": "Something"
@@ -138,12 +138,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_iota;1",
+        "@id": "dtmi:example:spazz_kappa;1",
         "@type": "Interface",
         "contents": {
-          "name": "snee_eta",
+          "name": "spazz_theta",
           "schema": {
-            "@id": "dtmi:example:snee_theta;1",
+            "@id": "dtmi:example:spazz_iota;1",
             "@type": "Interface"
           },
           "@type": [
@@ -161,13 +161,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_mu;1",
+        "@id": "dtmi:example:spazz_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "snee_kappa",
+          "name": "spazz_lambda",
           "schema": {
-            "@id": "dtmi:example:snee_lambda;1",
+            "@id": "dtmi:example:spazz_mu;1",
             "@type": "Interface"
           },
           "@type": [
diff --git a/DTDL/v2/spec/Requirement-ClassComponentTypeStringOrArrayV2.json b/DTDL/v2/spec/Requirement-ClassComponentTypeStringOrArrayV2.json
index de7bc10b..71ba7e63 100644
--- a/DTDL/v2/spec/Requirement-ClassComponentTypeStringOrArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassComponentTypeStringOrArrayV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_fuddle;1",
+        "@id": "dtmi:example:quan_glikk;1",
         "@type": "Interface",
         "contents": {
-          "name": "glikk_um",
+          "name": "quan_humpf",
           "schema": {
-            "@id": "dtmi:example:glikk_humpf;1",
+            "@id": "dtmi:example:quan_fuddle;1",
             "@type": "Interface"
           },
           "@type": 626
@@ -28,13 +28,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_snee;1",
+        "@id": "dtmi:example:quan_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "glikk_glikk",
+          "name": "quan_nuh",
           "schema": {
-            "@id": "dtmi:example:glikk_nuh;1",
+            "@id": "dtmi:example:quan_snee;1",
             "@type": "Interface"
           },
           "@type": 626
@@ -50,12 +50,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_spazz;1",
+        "@id": "dtmi:example:quan_floob;1",
         "@type": "Interface",
         "contents": {
-          "name": "glikk_quan",
+          "name": "quan_thnad",
           "schema": {
-            "@id": "dtmi:example:glikk_thnad;1",
+            "@id": "dtmi:example:quan_spazz;1",
             "@type": "Interface"
           },
           "@type": null
@@ -71,13 +71,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_jogg;1",
+        "@id": "dtmi:example:quan_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "glikk_floob",
+          "name": "quan_zatz",
           "schema": {
-            "@id": "dtmi:example:glikk_zatz;1",
+            "@id": "dtmi:example:quan_jogg;1",
             "@type": "Interface"
           },
           "@type": null
@@ -93,12 +93,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_yekk;1",
+        "@id": "dtmi:example:quan_vroo;1",
         "@type": "Interface",
         "contents": {
-          "name": "glikk_flunn",
+          "name": "quan_itch",
           "schema": {
-            "@id": "dtmi:example:glikk_itch;1",
+            "@id": "dtmi:example:quan_yekk;1",
             "@type": "Interface"
           },
           "@type": true
@@ -114,13 +114,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_alpha;1",
+        "@id": "dtmi:example:thnad_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "glikk_vroo",
+          "name": "quan_hi",
           "schema": {
-            "@id": "dtmi:example:glikk_hi;1",
+            "@id": "dtmi:example:thnad_alpha;1",
             "@type": "Interface"
           },
           "@type": true
@@ -136,12 +136,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_delta;1",
+        "@id": "dtmi:example:thnad_epsilon;1",
         "@type": "Interface",
         "contents": {
-          "name": "nuh_beta",
+          "name": "thnad_gamma",
           "schema": {
-            "@id": "dtmi:example:nuh_gamma;1",
+            "@id": "dtmi:example:thnad_delta;1",
             "@type": "Interface"
           },
           "@type": {}
@@ -157,13 +157,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_eta;1",
+        "@id": "dtmi:example:thnad_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "nuh_epsilon",
+          "name": "thnad_zeta",
           "schema": {
-            "@id": "dtmi:example:nuh_zeta;1",
+            "@id": "dtmi:example:thnad_eta;1",
             "@type": "Interface"
           },
           "@type": {}
@@ -179,12 +179,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_kappa;1",
+        "@id": "dtmi:example:thnad_lambda;1",
         "@type": "Interface",
         "contents": {
-          "name": "nuh_theta",
+          "name": "thnad_iota",
           "schema": {
-            "@id": "dtmi:example:nuh_iota;1",
+            "@id": "dtmi:example:thnad_kappa;1",
             "@type": "Interface"
           },
           "@type": [
@@ -202,13 +202,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_nu;1",
+        "@id": "dtmi:example:thnad_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "nuh_lambda",
+          "name": "thnad_mu",
           "schema": {
-            "@id": "dtmi:example:nuh_mu;1",
+            "@id": "dtmi:example:thnad_nu;1",
             "@type": "Interface"
           },
           "@type": [
@@ -226,12 +226,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_pi;1",
+        "@id": "dtmi:example:thnad_rho;1",
         "@type": "Interface",
         "contents": {
-          "name": "nuh_xi",
+          "name": "thnad_omicron",
           "schema": {
-            "@id": "dtmi:example:nuh_omicron;1",
+            "@id": "dtmi:example:thnad_pi;1",
             "@type": "Interface"
           },
           "@type": [
@@ -249,13 +249,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_tau;1",
+        "@id": "dtmi:example:thnad_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "nuh_rho",
+          "name": "thnad_sigma",
           "schema": {
-            "@id": "dtmi:example:nuh_sigma;1",
+            "@id": "dtmi:example:thnad_tau;1",
             "@type": "Interface"
           },
           "@type": [
@@ -273,12 +273,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_chi;1",
+        "@id": "dtmi:example:thnad_psi;1",
         "@type": "Interface",
         "contents": {
-          "name": "nuh_upsilon",
+          "name": "thnad_phi",
           "schema": {
-            "@id": "dtmi:example:nuh_phi;1",
+            "@id": "dtmi:example:thnad_chi;1",
             "@type": "Interface"
           },
           "@type": [
@@ -296,13 +296,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_yuzz;1",
+        "@id": "dtmi:example:thnad_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "nuh_psi",
+          "name": "thnad_omega",
           "schema": {
-            "@id": "dtmi:example:nuh_omega;1",
+            "@id": "dtmi:example:thnad_yuzz;1",
             "@type": "Interface"
           },
           "@type": [
@@ -320,12 +320,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_humpf;1",
+        "@id": "dtmi:example:thnad_fuddle;1",
         "@type": "Interface",
         "contents": {
-          "name": "nuh_wum",
+          "name": "thnad_um",
           "schema": {
-            "@id": "dtmi:example:nuh_um;1",
+            "@id": "dtmi:example:thnad_humpf;1",
             "@type": "Interface"
           },
           "@type": [
@@ -343,13 +343,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_nuh;1",
+        "@id": "dtmi:example:thnad_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "nuh_fuddle",
+          "name": "thnad_glikk",
           "schema": {
-            "@id": "dtmi:example:nuh_glikk;1",
+            "@id": "dtmi:example:thnad_nuh;1",
             "@type": "Interface"
           },
           "@type": [
diff --git a/DTDL/v2/spec/Requirement-ClassEnumContextConformsV2.json b/DTDL/v2/spec/Requirement-ClassEnumContextConformsV2.json
index c4326bba..08816dc5 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumContextConformsV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumContextConformsV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_phi;1",
+        "@id": "dtmi:example:jogg_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_upsilon",
+          "name": "jogg_beta",
           "schema": {
             "@type": "Enum",
             "enumValues": [
               {
-                "enumValue": 513,
-                "name": "thnad_tau"
+                "enumValue": 522,
+                "name": "jogg_alpha"
               }
             ],
             "valueSchema": "integer",
@@ -35,17 +35,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_omega;1",
+        "@id": "dtmi:example:jogg_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_psi",
+          "name": "jogg_epsilon",
           "schema": {
             "@type": "Enum",
             "enumValues": [
               {
-                "enumValue": 514,
-                "name": "thnad_chi"
+                "enumValue": 523,
+                "name": "jogg_delta"
               }
             ],
             "valueSchema": "integer",
@@ -63,17 +63,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_um;1",
+        "@id": "dtmi:example:jogg_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_wum",
+          "name": "jogg_theta",
           "schema": {
             "@type": "Enum",
             "enumValues": [
               {
-                "enumValue": 515,
-                "name": "thnad_yuzz"
+                "enumValue": 524,
+                "name": "jogg_eta"
               }
             ],
             "valueSchema": "integer",
@@ -93,17 +93,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_glikk;1",
+        "@id": "dtmi:example:jogg_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_fuddle",
+          "name": "jogg_lambda",
           "schema": {
             "@type": "Enum",
             "enumValues": [
               {
-                "enumValue": 516,
-                "name": "thnad_humpf"
+                "enumValue": 525,
+                "name": "jogg_kappa"
               }
             ],
             "valueSchema": "integer",
@@ -121,17 +121,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_quan;1",
+        "@id": "dtmi:example:jogg_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_snee",
+          "name": "jogg_xi",
           "schema": {
             "@type": "Enum",
             "enumValues": [
               {
-                "enumValue": 517,
-                "name": "thnad_nuh"
+                "enumValue": 526,
+                "name": "jogg_nu"
               }
             ],
             "valueSchema": "integer",
@@ -149,17 +149,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_floob;1",
+        "@id": "dtmi:example:jogg_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_spazz",
+          "name": "jogg_rho",
           "schema": {
             "@type": "Enum",
             "enumValues": [
               {
-                "enumValue": 518,
-                "name": "thnad_thnad"
+                "enumValue": 527,
+                "name": "jogg_pi"
               }
             ],
             "valueSchema": "integer",
@@ -177,17 +177,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_flunn;1",
+        "@id": "dtmi:example:jogg_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_jogg",
+          "name": "jogg_upsilon",
           "schema": {
             "@type": "Enum",
             "enumValues": [
               {
-                "enumValue": 519,
-                "name": "thnad_zatz"
+                "enumValue": 528,
+                "name": "jogg_tau"
               }
             ],
             "valueSchema": "integer",
@@ -207,17 +207,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_vroo;1",
+        "@id": "dtmi:example:jogg_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_yekk",
+          "name": "jogg_psi",
           "schema": {
             "@type": "Enum",
             "enumValues": [
               {
-                "enumValue": 520,
-                "name": "thnad_itch"
+                "enumValue": 529,
+                "name": "jogg_chi"
               }
             ],
             "valueSchema": "integer",
@@ -237,17 +237,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_beta;1",
+        "@id": "dtmi:example:jogg_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "spazz_alpha",
+          "name": "jogg_wum",
           "schema": {
             "@type": "Enum",
             "enumValues": [
               {
-                "enumValue": 521,
-                "name": "thnad_hi"
+                "enumValue": 530,
+                "name": "jogg_yuzz"
               }
             ],
             "valueSchema": "integer",
@@ -267,21 +267,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_epsilon;1",
+        "@id": "dtmi:example:jogg_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "spazz_delta",
+          "name": "jogg_fuddle",
           "schema": {
             "@type": "Enum",
             "enumValues": [
               {
-                "enumValue": 522,
-                "name": "spazz_gamma"
+                "enumValue": 531,
+                "name": "jogg_humpf"
               }
             ],
             "valueSchema": "integer",
-            "@context": {}
+            "@context": "dtmi:iotcentral:context"
           }
         }
       }
@@ -295,23 +295,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_theta;1",
+        "@id": "dtmi:example:jogg_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "spazz_eta",
+          "name": "jogg_snee",
           "schema": {
             "@type": "Enum",
             "enumValues": [
               {
-                "enumValue": 523,
-                "name": "spazz_zeta"
+                "enumValue": 532,
+                "name": "jogg_nuh"
               }
             ],
             "valueSchema": "integer",
-            "@context": [
-              {}
-            ]
+            "@context": "http://iotcentral/context/2"
           }
         }
       }
@@ -325,21 +323,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_lambda;1",
+        "@id": "dtmi:example:jogg_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "spazz_kappa",
+          "name": "jogg_spazz",
           "schema": {
             "@type": "Enum",
             "enumValues": [
               {
-                "enumValue": 524,
-                "name": "spazz_iota"
+                "enumValue": 533,
+                "name": "jogg_thnad"
               }
             ],
             "valueSchema": "integer",
-            "@context": "dtmi:iotcentral:context"
+            "@context": "iotcentral;2"
           }
         }
       }
@@ -353,21 +351,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_xi;1",
+        "@id": "dtmi:example:jogg_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "spazz_nu",
+          "name": "jogg_jogg",
           "schema": {
             "@type": "Enum",
             "enumValues": [
               {
-                "enumValue": 525,
-                "name": "spazz_mu"
+                "enumValue": 534,
+                "name": "jogg_zatz"
               }
             ],
             "valueSchema": "integer",
-            "@context": "http://iotcentral/context/2"
+            "@context": {}
           }
         }
       }
@@ -381,21 +379,85 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_rho;1",
+        "@id": "dtmi:example:jogg_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "spazz_pi",
+          "name": "jogg_yekk",
           "schema": {
             "@type": "Enum",
             "enumValues": [
               {
-                "enumValue": 526,
-                "name": "spazz_omicron"
+                "enumValue": 535,
+                "name": "jogg_itch"
               }
             ],
             "valueSchema": "integer",
-            "@context": "iotcentral;2"
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:flunn_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "flunn_alpha",
+          "schema": {
+            "@type": "Enum",
+            "enumValues": [
+              {
+                "enumValue": 536,
+                "name": "jogg_hi"
+              }
+            ],
+            "valueSchema": "integer",
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:flunn_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "flunn_delta",
+          "schema": {
+            "@type": "Enum",
+            "enumValues": [
+              {
+                "enumValue": 537,
+                "name": "flunn_gamma"
+              }
+            ],
+            "valueSchema": "integer",
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumGraphKeywordV2.json b/DTDL/v2/spec/Requirement-ClassEnumGraphKeywordV2.json
index 88cbfabd..63d99087 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumGraphKeywordV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumGraphKeywordV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_jogg;1",
+        "@id": "dtmi:example:zeta_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_floob;1",
+          "@id": "dtmi:example:zeta_omega;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 692,
-              "name": "beta_zatz"
+              "enumValue": 703,
+              "name": "zeta_yuzz"
             }
           ],
           "valueSchema": "integer",
@@ -32,16 +32,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_yekk;1",
+        "@id": "dtmi:example:zeta_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:beta_flunn;1",
+          "@id": "dtmi:example:zeta_um;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 693,
-              "name": "beta_itch"
+              "enumValue": 704,
+              "name": "zeta_humpf"
             }
           ],
           "valueSchema": "integer",
diff --git a/DTDL/v2/spec/Requirement-ClassEnumIdDuplicateV2.json b/DTDL/v2/spec/Requirement-ClassEnumIdDuplicateV2.json
index 9043728c..087963a7 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumIdDuplicateV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumIdDuplicateV2.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_nuh;1",
+        "@id": "dtmi:example:vroo_tau;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:jogg_nuh;1",
+          "@id": "dtmi:example:vroo_tau;1",
           "@type": "Property",
-          "name": "jogg_quan",
+          "name": "vroo_phi",
           "schema": {
-            "@id": "dtmi:example:jogg_nuh;1",
+            "@id": "dtmi:example:vroo_tau;1",
             "@type": "Enum",
             "enumValues": [
               {
-                "enumValue": 597,
-                "name": "jogg_snee"
+                "enumValue": 608,
+                "name": "vroo_upsilon"
               }
             ],
             "valueSchema": "integer"
@@ -36,20 +36,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_thnad;1",
+        "@id": "dtmi:example:vroo_chi;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:jogg_thnad;1",
+          "@id": "dtmi:example:vroo_chi;1",
           "@type": "Property",
-          "name": "jogg_floob",
+          "name": "vroo_omega",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "@id": "dtmi:example:jogg_thnad;1",
+            "@id": "dtmi:example:vroo_chi;1",
             "@type": "Enum",
             "enumValues": [
               {
-                "enumValue": 598,
-                "name": "jogg_spazz"
+                "enumValue": 609,
+                "name": "vroo_psi"
               }
             ],
             "valueSchema": "integer"
diff --git a/DTDL/v2/spec/Requirement-ClassEnumIdIsDtmiV2.json b/DTDL/v2/spec/Requirement-ClassEnumIdIsDtmiV2.json
index ce927fec..448969bb 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumIdIsDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumIdIsDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_fuddle;1",
+        "@id": "dtmi:example:flunn_rho;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;7",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 531,
-              "name": "spazz_humpf"
+              "enumValue": 542,
+              "name": "flunn_pi"
             }
           ],
           "valueSchema": "integer"
@@ -31,15 +31,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_nuh;1",
+        "@id": "dtmi:example:flunn_tau;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;108675309",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 532,
-              "name": "spazz_glikk"
+              "enumValue": 543,
+              "name": "flunn_sigma"
             }
           ],
           "valueSchema": "integer"
@@ -55,15 +55,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_quan;1",
+        "@id": "dtmi:example:flunn_phi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;999999999",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 533,
-              "name": "spazz_snee"
+              "enumValue": 544,
+              "name": "flunn_upsilon"
             }
           ],
           "valueSchema": "integer"
@@ -79,15 +79,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_spazz;1",
+        "@id": "dtmi:example:flunn_psi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 534,
-              "name": "spazz_thnad"
+              "enumValue": 545,
+              "name": "flunn_chi"
             }
           ],
           "valueSchema": "integer"
@@ -103,15 +103,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_zatz;1",
+        "@id": "dtmi:example:flunn_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@id": null,
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 535,
-              "name": "spazz_floob"
+              "enumValue": 546,
+              "name": "flunn_omega"
             }
           ],
           "valueSchema": "integer"
@@ -127,7 +127,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_flunn;1",
+        "@id": "dtmi:example:flunn_um;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -135,8 +135,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 536,
-              "name": "spazz_jogg"
+              "enumValue": 547,
+              "name": "flunn_wum"
             }
           ],
           "valueSchema": "integer"
@@ -152,15 +152,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_yekk;1",
+        "@id": "dtmi:example:flunn_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@id": 626,
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 537,
-              "name": "spazz_itch"
+              "enumValue": 548,
+              "name": "flunn_humpf"
             }
           ],
           "valueSchema": "integer"
@@ -176,7 +176,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_hi;1",
+        "@id": "dtmi:example:flunn_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -184,8 +184,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 538,
-              "name": "spazz_vroo"
+              "enumValue": 549,
+              "name": "flunn_glikk"
             }
           ],
           "valueSchema": "integer"
@@ -201,15 +201,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_beta;1",
+        "@id": "dtmi:example:flunn_quan;1",
         "@type": "Interface",
         "schemas": {
           "@id": true,
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 539,
-              "name": "floob_alpha"
+              "enumValue": 550,
+              "name": "flunn_snee"
             }
           ],
           "valueSchema": "integer"
@@ -225,7 +225,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_delta;1",
+        "@id": "dtmi:example:flunn_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -233,8 +233,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 540,
-              "name": "floob_gamma"
+              "enumValue": 551,
+              "name": "flunn_thnad"
             }
           ],
           "valueSchema": "integer"
@@ -250,7 +250,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_zeta;1",
+        "@id": "dtmi:example:flunn_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@id": {
@@ -259,8 +259,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 541,
-              "name": "floob_epsilon"
+              "enumValue": 552,
+              "name": "flunn_floob"
             }
           ],
           "valueSchema": "integer"
@@ -276,7 +276,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_theta;1",
+        "@id": "dtmi:example:flunn_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -286,8 +286,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 542,
-              "name": "floob_eta"
+              "enumValue": 553,
+              "name": "flunn_jogg"
             }
           ],
           "valueSchema": "integer"
@@ -303,15 +303,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_kappa;1",
+        "@id": "dtmi:example:flunn_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;0",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 543,
-              "name": "floob_iota"
+              "enumValue": 554,
+              "name": "flunn_itch"
             }
           ],
           "valueSchema": "integer"
@@ -327,7 +327,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_mu;1",
+        "@id": "dtmi:example:flunn_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -335,8 +335,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 544,
-              "name": "floob_lambda"
+              "enumValue": 555,
+              "name": "flunn_vroo"
             }
           ],
           "valueSchema": "integer"
@@ -352,15 +352,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_xi;1",
+        "@id": "dtmi:example:itch_beta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 545,
-              "name": "floob_nu"
+              "enumValue": 556,
+              "name": "itch_alpha"
             }
           ],
           "valueSchema": "integer"
@@ -376,7 +376,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_pi;1",
+        "@id": "dtmi:example:itch_delta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -384,8 +384,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 546,
-              "name": "floob_omicron"
+              "enumValue": 557,
+              "name": "itch_gamma"
             }
           ],
           "valueSchema": "integer"
@@ -401,15 +401,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_sigma;1",
+        "@id": "dtmi:example:itch_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 547,
-              "name": "floob_rho"
+              "enumValue": 558,
+              "name": "itch_epsilon"
             }
           ],
           "valueSchema": "integer"
@@ -425,7 +425,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_upsilon;1",
+        "@id": "dtmi:example:itch_theta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -433,8 +433,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 548,
-              "name": "floob_tau"
+              "enumValue": 559,
+              "name": "itch_eta"
             }
           ],
           "valueSchema": "integer"
@@ -450,15 +450,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_chi;1",
+        "@id": "dtmi:example:itch_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;1a",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 549,
-              "name": "floob_phi"
+              "enumValue": 560,
+              "name": "itch_iota"
             }
           ],
           "valueSchema": "integer"
@@ -474,7 +474,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_omega;1",
+        "@id": "dtmi:example:itch_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -482,8 +482,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 550,
-              "name": "floob_psi"
+              "enumValue": 561,
+              "name": "itch_lambda"
             }
           ],
           "valueSchema": "integer"
@@ -499,15 +499,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_wum;1",
+        "@id": "dtmi:example:itch_xi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 551,
-              "name": "floob_yuzz"
+              "enumValue": 562,
+              "name": "itch_nu"
             }
           ],
           "valueSchema": "integer"
@@ -523,7 +523,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_humpf;1",
+        "@id": "dtmi:example:itch_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -531,8 +531,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 552,
-              "name": "floob_um"
+              "enumValue": 563,
+              "name": "itch_omicron"
             }
           ],
           "valueSchema": "integer"
@@ -548,15 +548,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_glikk;1",
+        "@id": "dtmi:example:itch_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 553,
-              "name": "floob_fuddle"
+              "enumValue": 564,
+              "name": "itch_rho"
             }
           ],
           "valueSchema": "integer"
@@ -572,7 +572,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_snee;1",
+        "@id": "dtmi:example:itch_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -580,8 +580,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 554,
-              "name": "floob_nuh"
+              "enumValue": 565,
+              "name": "itch_tau"
             }
           ],
           "valueSchema": "integer"
@@ -597,15 +597,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_thnad;1",
+        "@id": "dtmi:example:itch_chi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 555,
-              "name": "floob_quan"
+              "enumValue": 566,
+              "name": "itch_phi"
             }
           ],
           "valueSchema": "integer"
@@ -621,7 +621,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_floob;1",
+        "@id": "dtmi:example:itch_omega;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -629,8 +629,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 556,
-              "name": "floob_spazz"
+              "enumValue": 567,
+              "name": "itch_psi"
             }
           ],
           "valueSchema": "integer"
@@ -646,15 +646,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_jogg;1",
+        "@id": "dtmi:example:itch_wum;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 557,
-              "name": "floob_zatz"
+              "enumValue": 568,
+              "name": "itch_yuzz"
             }
           ],
           "valueSchema": "integer"
@@ -670,7 +670,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_itch;1",
+        "@id": "dtmi:example:itch_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -678,8 +678,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 558,
-              "name": "floob_flunn"
+              "enumValue": 569,
+              "name": "itch_um"
             }
           ],
           "valueSchema": "integer"
@@ -695,15 +695,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_vroo;1",
+        "@id": "dtmi:example:itch_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;01",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 559,
-              "name": "floob_yekk"
+              "enumValue": 570,
+              "name": "itch_fuddle"
             }
           ],
           "valueSchema": "integer"
@@ -719,7 +719,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_alpha;1",
+        "@id": "dtmi:example:itch_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -727,8 +727,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 560,
-              "name": "floob_hi"
+              "enumValue": 571,
+              "name": "itch_nuh"
             }
           ],
           "valueSchema": "integer"
@@ -744,15 +744,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_gamma;1",
+        "@id": "dtmi:example:itch_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 561,
-              "name": "zatz_beta"
+              "enumValue": 572,
+              "name": "itch_quan"
             }
           ],
           "valueSchema": "integer"
@@ -768,7 +768,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_epsilon;1",
+        "@id": "dtmi:example:itch_floob;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -776,8 +776,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 562,
-              "name": "zatz_delta"
+              "enumValue": 573,
+              "name": "itch_spazz"
             }
           ],
           "valueSchema": "integer"
@@ -793,15 +793,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_eta;1",
+        "@id": "dtmi:example:itch_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 563,
-              "name": "zatz_zeta"
+              "enumValue": 574,
+              "name": "itch_zatz"
             }
           ],
           "valueSchema": "integer"
@@ -817,7 +817,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_iota;1",
+        "@id": "dtmi:example:itch_itch;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -825,8 +825,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 564,
-              "name": "zatz_theta"
+              "enumValue": 575,
+              "name": "itch_flunn"
             }
           ],
           "valueSchema": "integer"
@@ -842,15 +842,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_lambda;1",
+        "@id": "dtmi:example:itch_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 565,
-              "name": "zatz_kappa"
+              "enumValue": 576,
+              "name": "itch_yekk"
             }
           ],
           "valueSchema": "integer"
@@ -866,7 +866,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_nu;1",
+        "@id": "dtmi:example:yekk_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -874,8 +874,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 566,
-              "name": "zatz_mu"
+              "enumValue": 577,
+              "name": "itch_hi"
             }
           ],
           "valueSchema": "integer"
@@ -891,15 +891,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_omicron;1",
+        "@id": "dtmi:example:yekk_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:test:1seg;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 567,
-              "name": "zatz_xi"
+              "enumValue": 578,
+              "name": "yekk_beta"
             }
           ],
           "valueSchema": "integer"
@@ -915,7 +915,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_rho;1",
+        "@id": "dtmi:example:yekk_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -923,8 +923,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 568,
-              "name": "zatz_pi"
+              "enumValue": 579,
+              "name": "yekk_delta"
             }
           ],
           "valueSchema": "integer"
@@ -940,15 +940,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_tau;1",
+        "@id": "dtmi:example:yekk_eta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 569,
-              "name": "zatz_sigma"
+              "enumValue": 580,
+              "name": "yekk_zeta"
             }
           ],
           "valueSchema": "integer"
@@ -964,7 +964,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_phi;1",
+        "@id": "dtmi:example:yekk_iota;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -972,8 +972,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 570,
-              "name": "zatz_upsilon"
+              "enumValue": 581,
+              "name": "yekk_theta"
             }
           ],
           "valueSchema": "integer"
@@ -989,15 +989,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_psi;1",
+        "@id": "dtmi:example:yekk_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo::bar;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 571,
-              "name": "zatz_chi"
+              "enumValue": 582,
+              "name": "yekk_kappa"
             }
           ],
           "valueSchema": "integer"
@@ -1013,7 +1013,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_yuzz;1",
+        "@id": "dtmi:example:yekk_nu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1021,8 +1021,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 572,
-              "name": "zatz_omega"
+              "enumValue": 583,
+              "name": "yekk_mu"
             }
           ],
           "valueSchema": "integer"
@@ -1038,15 +1038,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_um;1",
+        "@id": "dtmi:example:yekk_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@id": "urn:foo:bar:1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 573,
-              "name": "zatz_wum"
+              "enumValue": 584,
+              "name": "yekk_xi"
             }
           ],
           "valueSchema": "integer"
@@ -1062,7 +1062,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_fuddle;1",
+        "@id": "dtmi:example:yekk_rho;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1070,8 +1070,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 574,
-              "name": "zatz_humpf"
+              "enumValue": 585,
+              "name": "yekk_pi"
             }
           ],
           "valueSchema": "integer"
@@ -1087,15 +1087,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_nuh;1",
+        "@id": "dtmi:example:yekk_tau;1",
         "@type": "Interface",
         "schemas": {
           "@id": "http://foo/bar/baz",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 575,
-              "name": "zatz_glikk"
+              "enumValue": 586,
+              "name": "yekk_sigma"
             }
           ],
           "valueSchema": "integer"
@@ -1111,7 +1111,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_quan;1",
+        "@id": "dtmi:example:yekk_phi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1119,8 +1119,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 576,
-              "name": "zatz_snee"
+              "enumValue": 587,
+              "name": "yekk_upsilon"
             }
           ],
           "valueSchema": "integer"
@@ -1136,15 +1136,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_spazz;1",
+        "@id": "dtmi:example:yekk_psi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 577,
-              "name": "zatz_thnad"
+              "enumValue": 588,
+              "name": "yekk_chi"
             }
           ],
           "valueSchema": "integer"
@@ -1160,7 +1160,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_zatz;1",
+        "@id": "dtmi:example:yekk_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1168,8 +1168,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 578,
-              "name": "zatz_floob"
+              "enumValue": 589,
+              "name": "yekk_omega"
             }
           ],
           "valueSchema": "integer"
@@ -1185,15 +1185,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_flunn;1",
+        "@id": "dtmi:example:yekk_um;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 579,
-              "name": "zatz_jogg"
+              "enumValue": 590,
+              "name": "yekk_wum"
             }
           ],
           "valueSchema": "integer"
@@ -1209,7 +1209,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_yekk;1",
+        "@id": "dtmi:example:yekk_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1217,8 +1217,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 580,
-              "name": "zatz_itch"
+              "enumValue": 591,
+              "name": "yekk_humpf"
             }
           ],
           "valueSchema": "integer"
@@ -1234,15 +1234,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_hi;1",
+        "@id": "dtmi:example:yekk_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.14",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 581,
-              "name": "zatz_vroo"
+              "enumValue": 592,
+              "name": "yekk_glikk"
             }
           ],
           "valueSchema": "integer"
@@ -1258,7 +1258,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_beta;1",
+        "@id": "dtmi:example:yekk_quan;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1266,8 +1266,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 582,
-              "name": "jogg_alpha"
+              "enumValue": 593,
+              "name": "yekk_snee"
             }
           ],
           "valueSchema": "integer"
@@ -1283,15 +1283,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_delta;1",
+        "@id": "dtmi:example:yekk_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.141592",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 583,
-              "name": "jogg_gamma"
+              "enumValue": 594,
+              "name": "yekk_thnad"
             }
           ],
           "valueSchema": "integer"
@@ -1307,7 +1307,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_zeta;1",
+        "@id": "dtmi:example:yekk_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1315,8 +1315,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 584,
-              "name": "jogg_epsilon"
+              "enumValue": 595,
+              "name": "yekk_floob"
             }
           ],
           "valueSchema": "integer"
@@ -1332,15 +1332,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_theta;1",
+        "@id": "dtmi:example:yekk_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:dtdl:example;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 585,
-              "name": "jogg_eta"
+              "enumValue": 596,
+              "name": "yekk_jogg"
             }
           ],
           "valueSchema": "integer"
@@ -1356,7 +1356,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_kappa;1",
+        "@id": "dtmi:example:yekk_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1364,8 +1364,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 586,
-              "name": "jogg_iota"
+              "enumValue": 597,
+              "name": "yekk_itch"
             }
           ],
           "valueSchema": "integer"
@@ -1381,15 +1381,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_mu;1",
+        "@id": "dtmi:example:yekk_hi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:standard:example;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 587,
-              "name": "jogg_lambda"
+              "enumValue": 598,
+              "name": "yekk_vroo"
             }
           ],
           "valueSchema": "integer"
@@ -1405,7 +1405,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_xi;1",
+        "@id": "dtmi:example:vroo_beta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1413,8 +1413,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 588,
-              "name": "jogg_nu"
+              "enumValue": 599,
+              "name": "vroo_alpha"
             }
           ],
           "valueSchema": "integer"
diff --git a/DTDL/v2/spec/Requirement-ClassEnumIdNotArrayV2.json b/DTDL/v2/spec/Requirement-ClassEnumIdNotArrayV2.json
index f0200464..ebbd9fb1 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumIdNotArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumIdNotArrayV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_pi;1",
+        "@id": "dtmi:example:vroo_delta;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -16,8 +16,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 589,
-              "name": "jogg_omicron"
+              "enumValue": 600,
+              "name": "vroo_gamma"
             }
           ],
           "valueSchema": "integer"
@@ -33,7 +33,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_sigma;1",
+        "@id": "dtmi:example:vroo_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -43,8 +43,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 590,
-              "name": "jogg_rho"
+              "enumValue": 601,
+              "name": "vroo_epsilon"
             }
           ],
           "valueSchema": "integer"
@@ -60,7 +60,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_upsilon;1",
+        "@id": "dtmi:example:vroo_theta;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -69,8 +69,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 591,
-              "name": "jogg_tau"
+              "enumValue": 602,
+              "name": "vroo_eta"
             }
           ],
           "valueSchema": "integer"
@@ -86,7 +86,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_chi;1",
+        "@id": "dtmi:example:vroo_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -96,8 +96,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 592,
-              "name": "jogg_phi"
+              "enumValue": 603,
+              "name": "vroo_iota"
             }
           ],
           "valueSchema": "integer"
@@ -113,7 +113,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_omega;1",
+        "@id": "dtmi:example:vroo_mu;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -122,8 +122,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 593,
-              "name": "jogg_psi"
+              "enumValue": 604,
+              "name": "vroo_lambda"
             }
           ],
           "valueSchema": "integer"
@@ -139,7 +139,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_wum;1",
+        "@id": "dtmi:example:vroo_xi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -149,8 +149,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 594,
-              "name": "jogg_yuzz"
+              "enumValue": 605,
+              "name": "vroo_nu"
             }
           ],
           "valueSchema": "integer"
@@ -166,7 +166,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_humpf;1",
+        "@id": "dtmi:example:vroo_pi;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -175,8 +175,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 595,
-              "name": "jogg_um"
+              "enumValue": 606,
+              "name": "vroo_omicron"
             }
           ],
           "valueSchema": "integer"
@@ -192,7 +192,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_glikk;1",
+        "@id": "dtmi:example:vroo_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -202,8 +202,8 @@
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 596,
-              "name": "jogg_fuddle"
+              "enumValue": 607,
+              "name": "vroo_rho"
             }
           ],
           "valueSchema": "integer"
diff --git a/DTDL/v2/spec/Requirement-ClassEnumIdRequiredV2.json b/DTDL/v2/spec/Requirement-ClassEnumIdRequiredV2.json
index 00404bdc..8b239063 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumIdRequiredV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumIdRequiredV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_upsilon;1",
+        "@id": "dtmi:example:flunn_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "spazz_tau",
+          "name": "flunn_eta",
           "schema": {
             "@type": "Enum",
             "enumValues": [
               {
-                "enumValue": 527,
-                "name": "spazz_sigma"
+                "enumValue": 538,
+                "name": "flunn_zeta"
               }
             ],
             "valueSchema": "integer"
@@ -34,15 +34,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_psi;1",
+        "@id": "dtmi:example:flunn_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_phi;1",
+          "@id": "dtmi:example:flunn_iota;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 528,
-              "name": "spazz_chi"
+              "enumValue": 539,
+              "name": "flunn_kappa"
             }
           ],
           "valueSchema": "integer"
@@ -58,14 +58,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_yuzz;1",
+        "@id": "dtmi:example:flunn_nu;1",
         "@type": "Interface",
         "schemas": {
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 529,
-              "name": "spazz_omega"
+              "enumValue": 540,
+              "name": "flunn_mu"
             }
           ],
           "valueSchema": "integer"
@@ -81,15 +81,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_um;1",
+        "@id": "dtmi:example:flunn_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 530,
-              "name": "spazz_wum"
+              "enumValue": 541,
+              "name": "flunn_xi"
             }
           ],
           "valueSchema": "integer"
diff --git a/DTDL/v2/spec/Requirement-ClassEnumPropertyCommentStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassEnumPropertyCommentStringLengthV2.json
index 1ed39663..c0521ecb 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumPropertyCommentStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumPropertyCommentStringLengthV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_pi;1",
+        "@id": "dtmi:example:alpha_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_xi;1",
+          "@id": "dtmi:example:alpha_beta;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 620,
-              "name": "itch_omicron"
+              "enumValue": 631,
+              "name": "alpha_gamma"
             }
           ],
           "valueSchema": "integer",
@@ -32,15 +32,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_tau;1",
+        "@id": "dtmi:example:alpha_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_rho;1",
+          "@id": "dtmi:example:alpha_epsilon;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 621,
-              "name": "itch_sigma"
+              "enumValue": 632,
+              "name": "alpha_zeta"
             }
           ],
           "valueSchema": "integer",
@@ -57,16 +57,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_chi;1",
+        "@id": "dtmi:example:alpha_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:itch_upsilon;1",
+          "@id": "dtmi:example:alpha_theta;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 622,
-              "name": "itch_phi"
+              "enumValue": 633,
+              "name": "alpha_iota"
             }
           ],
           "valueSchema": "integer",
diff --git a/DTDL/v2/spec/Requirement-ClassEnumPropertyCommentStringV2.json b/DTDL/v2/spec/Requirement-ClassEnumPropertyCommentStringV2.json
index 77041dab..32239fa4 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumPropertyCommentStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumPropertyCommentStringV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_flunn;1",
+        "@id": "dtmi:example:vroo_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_zatz;1",
+          "@id": "dtmi:example:vroo_yuzz;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 599,
-              "name": "jogg_jogg"
+              "enumValue": 610,
+              "name": "vroo_wum"
             }
           ],
           "valueSchema": "integer",
@@ -32,15 +32,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_vroo;1",
+        "@id": "dtmi:example:vroo_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_itch;1",
+          "@id": "dtmi:example:vroo_humpf;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 600,
-              "name": "jogg_yekk"
+              "enumValue": 611,
+              "name": "vroo_fuddle"
             }
           ],
           "valueSchema": "integer",
@@ -59,15 +59,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_beta;1",
+        "@id": "dtmi:example:vroo_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_hi;1",
+          "@id": "dtmi:example:vroo_nuh;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 601,
-              "name": "flunn_alpha"
+              "enumValue": 612,
+              "name": "vroo_snee"
             }
           ],
           "valueSchema": "integer",
@@ -87,15 +87,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_epsilon;1",
+        "@id": "dtmi:example:vroo_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_gamma;1",
+          "@id": "dtmi:example:vroo_thnad;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 602,
-              "name": "flunn_delta"
+              "enumValue": 613,
+              "name": "vroo_spazz"
             }
           ],
           "valueSchema": "integer",
@@ -117,15 +117,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_theta;1",
+        "@id": "dtmi:example:vroo_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_zeta;1",
+          "@id": "dtmi:example:vroo_zatz;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 603,
-              "name": "flunn_eta"
+              "enumValue": 614,
+              "name": "vroo_jogg"
             }
           ],
           "valueSchema": "integer",
@@ -142,15 +142,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_lambda;1",
+        "@id": "dtmi:example:vroo_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_iota;1",
+          "@id": "dtmi:example:vroo_itch;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 604,
-              "name": "flunn_kappa"
+              "enumValue": 615,
+              "name": "vroo_yekk"
             }
           ],
           "valueSchema": "integer",
@@ -167,16 +167,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_xi;1",
+        "@id": "dtmi:example:hi_beta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_mu;1",
+          "@id": "dtmi:example:vroo_hi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 605,
-              "name": "flunn_nu"
+              "enumValue": 616,
+              "name": "hi_alpha"
             }
           ],
           "valueSchema": "integer",
@@ -193,15 +193,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_rho;1",
+        "@id": "dtmi:example:hi_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_omicron;1",
+          "@id": "dtmi:example:hi_gamma;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 606,
-              "name": "flunn_pi"
+              "enumValue": 617,
+              "name": "hi_delta"
             }
           ],
           "valueSchema": "integer",
@@ -218,16 +218,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_upsilon;1",
+        "@id": "dtmi:example:hi_theta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_sigma;1",
+          "@id": "dtmi:example:hi_zeta;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 607,
-              "name": "flunn_tau"
+              "enumValue": 618,
+              "name": "hi_eta"
             }
           ],
           "valueSchema": "integer",
@@ -244,15 +244,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_psi;1",
+        "@id": "dtmi:example:hi_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_phi;1",
+          "@id": "dtmi:example:hi_iota;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 608,
-              "name": "flunn_chi"
+              "enumValue": 619,
+              "name": "hi_kappa"
             }
           ],
           "valueSchema": "integer",
@@ -269,16 +269,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_wum;1",
+        "@id": "dtmi:example:hi_xi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_omega;1",
+          "@id": "dtmi:example:hi_mu;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 609,
-              "name": "flunn_yuzz"
+              "enumValue": 620,
+              "name": "hi_nu"
             }
           ],
           "valueSchema": "integer",
@@ -295,15 +295,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_fuddle;1",
+        "@id": "dtmi:example:hi_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_um;1",
+          "@id": "dtmi:example:hi_omicron;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 610,
-              "name": "flunn_humpf"
+              "enumValue": 621,
+              "name": "hi_pi"
             }
           ],
           "valueSchema": "integer",
@@ -322,16 +322,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_snee;1",
+        "@id": "dtmi:example:hi_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_glikk;1",
+          "@id": "dtmi:example:hi_sigma;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 611,
-              "name": "flunn_nuh"
+              "enumValue": 622,
+              "name": "hi_tau"
             }
           ],
           "valueSchema": "integer",
@@ -350,15 +350,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_spazz;1",
+        "@id": "dtmi:example:hi_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_quan;1",
+          "@id": "dtmi:example:hi_phi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 612,
-              "name": "flunn_thnad"
+              "enumValue": 623,
+              "name": "hi_chi"
             }
           ],
           "valueSchema": "integer",
@@ -377,16 +377,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_jogg;1",
+        "@id": "dtmi:example:hi_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_floob;1",
+          "@id": "dtmi:example:hi_omega;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 613,
-              "name": "flunn_zatz"
+              "enumValue": 624,
+              "name": "hi_yuzz"
             }
           ],
           "valueSchema": "integer",
@@ -405,15 +405,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_yekk;1",
+        "@id": "dtmi:example:hi_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_flunn;1",
+          "@id": "dtmi:example:hi_um;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 614,
-              "name": "flunn_itch"
+              "enumValue": 625,
+              "name": "hi_humpf"
             }
           ],
           "valueSchema": "integer",
@@ -432,16 +432,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_alpha;1",
+        "@id": "dtmi:example:hi_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_vroo;1",
+          "@id": "dtmi:example:hi_glikk;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 615,
-              "name": "flunn_hi"
+              "enumValue": 626,
+              "name": "hi_nuh"
             }
           ],
           "valueSchema": "integer",
@@ -460,15 +460,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_delta;1",
+        "@id": "dtmi:example:hi_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_beta;1",
+          "@id": "dtmi:example:hi_quan;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 616,
-              "name": "itch_gamma"
+              "enumValue": 627,
+              "name": "hi_thnad"
             }
           ],
           "valueSchema": "integer",
@@ -485,16 +485,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_eta;1",
+        "@id": "dtmi:example:hi_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:itch_epsilon;1",
+          "@id": "dtmi:example:hi_floob;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 617,
-              "name": "itch_zeta"
+              "enumValue": 628,
+              "name": "hi_zatz"
             }
           ],
           "valueSchema": "integer",
@@ -511,15 +511,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_kappa;1",
+        "@id": "dtmi:example:hi_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_theta;1",
+          "@id": "dtmi:example:hi_flunn;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 618,
-              "name": "itch_iota"
+              "enumValue": 629,
+              "name": "hi_itch"
             }
           ],
           "valueSchema": "integer",
@@ -538,16 +538,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_nu;1",
+        "@id": "dtmi:example:alpha_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:itch_lambda;1",
+          "@id": "dtmi:example:hi_vroo;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 619,
-              "name": "itch_mu"
+              "enumValue": 630,
+              "name": "hi_hi"
             }
           ],
           "valueSchema": "integer",
diff --git a/DTDL/v2/spec/Requirement-ClassEnumPropertyCommentTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassEnumPropertyCommentTermAndDtmiV2.json
index cd003d42..491a4a38 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumPropertyCommentTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumPropertyCommentTermAndDtmiV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_flunn;1",
+        "@id": "dtmi:example:alpha_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_spazz;1",
+          "@id": "dtmi:example:alpha_psi;1",
           "@type": "Enum",
-          "comment": "itch_floob",
-          "dtmi:dtdl:property:comment;2": "itch_zatz",
+          "comment": "alpha_omega",
+          "dtmi:dtdl:property:comment;2": "alpha_yuzz",
           "enumValues": [
             {
-              "enumValue": 626,
-              "name": "itch_jogg"
+              "enumValue": 637,
+              "name": "alpha_wum"
             }
           ],
           "valueSchema": "integer"
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_alpha;1",
+        "@id": "dtmi:example:alpha_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:itch_itch;1",
+          "@id": "dtmi:example:alpha_humpf;1",
           "@type": "Enum",
-          "comment": "itch_yekk",
-          "dtmi:dtdl:property:comment;2": "itch_vroo",
+          "comment": "alpha_fuddle",
+          "dtmi:dtdl:property:comment;2": "alpha_glikk",
           "enumValues": [
             {
-              "enumValue": 627,
-              "name": "itch_hi"
+              "enumValue": 638,
+              "name": "alpha_nuh"
             }
           ],
           "valueSchema": "integer"
diff --git a/DTDL/v2/spec/Requirement-ClassEnumPropertyDescriptionLangStringV2.json b/DTDL/v2/spec/Requirement-ClassEnumPropertyDescriptionLangStringV2.json
index c07525ad..c036ed4d 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumPropertyDescriptionLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumPropertyDescriptionLangStringV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_delta;1",
+        "@id": "dtmi:example:alpha_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_beta;1",
+          "@id": "dtmi:example:alpha_quan;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 628,
-              "name": "yekk_gamma"
+              "enumValue": 639,
+              "name": "alpha_thnad"
             }
           ],
           "valueSchema": "integer",
@@ -32,15 +32,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_eta;1",
+        "@id": "dtmi:example:alpha_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_epsilon;1",
+          "@id": "dtmi:example:alpha_floob;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 629,
-              "name": "yekk_zeta"
+              "enumValue": 640,
+              "name": "alpha_zatz"
             }
           ],
           "valueSchema": "integer",
@@ -59,15 +59,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_kappa;1",
+        "@id": "dtmi:example:alpha_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_theta;1",
+          "@id": "dtmi:example:alpha_flunn;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 630,
-              "name": "yekk_iota"
+              "enumValue": 641,
+              "name": "alpha_itch"
             }
           ],
           "valueSchema": "integer",
@@ -86,15 +86,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_nu;1",
+        "@id": "dtmi:example:beta_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_lambda;1",
+          "@id": "dtmi:example:alpha_vroo;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 631,
-              "name": "yekk_mu"
+              "enumValue": 642,
+              "name": "alpha_hi"
             }
           ],
           "valueSchema": "integer",
@@ -116,15 +116,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_pi;1",
+        "@id": "dtmi:example:beta_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_xi;1",
+          "@id": "dtmi:example:beta_beta;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 632,
-              "name": "yekk_omicron"
+              "enumValue": 643,
+              "name": "beta_gamma"
             }
           ],
           "valueSchema": "integer",
@@ -141,15 +141,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_tau;1",
+        "@id": "dtmi:example:beta_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_rho;1",
+          "@id": "dtmi:example:beta_epsilon;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 633,
-              "name": "yekk_sigma"
+              "enumValue": 644,
+              "name": "beta_zeta"
             }
           ],
           "valueSchema": "integer",
@@ -166,15 +166,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_chi;1",
+        "@id": "dtmi:example:beta_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_upsilon;1",
+          "@id": "dtmi:example:beta_theta;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 634,
-              "name": "yekk_phi"
+              "enumValue": 645,
+              "name": "beta_iota"
             }
           ],
           "valueSchema": "integer",
@@ -191,16 +191,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_yuzz;1",
+        "@id": "dtmi:example:beta_nu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yekk_psi;1",
+          "@id": "dtmi:example:beta_lambda;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 635,
-              "name": "yekk_omega"
+              "enumValue": 646,
+              "name": "beta_mu"
             }
           ],
           "valueSchema": "integer",
@@ -217,15 +217,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_humpf;1",
+        "@id": "dtmi:example:beta_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_wum;1",
+          "@id": "dtmi:example:beta_xi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 636,
-              "name": "yekk_um"
+              "enumValue": 647,
+              "name": "beta_omicron"
             }
           ],
           "valueSchema": "integer",
@@ -242,16 +242,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_nuh;1",
+        "@id": "dtmi:example:beta_tau;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yekk_fuddle;1",
+          "@id": "dtmi:example:beta_rho;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 637,
-              "name": "yekk_glikk"
+              "enumValue": 648,
+              "name": "beta_sigma"
             }
           ],
           "valueSchema": "integer",
@@ -268,15 +268,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_thnad;1",
+        "@id": "dtmi:example:beta_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_snee;1",
+          "@id": "dtmi:example:beta_upsilon;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 638,
-              "name": "yekk_quan"
+              "enumValue": 649,
+              "name": "beta_phi"
             }
           ],
           "valueSchema": "integer",
@@ -293,16 +293,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_zatz;1",
+        "@id": "dtmi:example:beta_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yekk_spazz;1",
+          "@id": "dtmi:example:beta_psi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 639,
-              "name": "yekk_floob"
+              "enumValue": 650,
+              "name": "beta_omega"
             }
           ],
           "valueSchema": "integer",
@@ -319,15 +319,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_itch;1",
+        "@id": "dtmi:example:beta_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_jogg;1",
+          "@id": "dtmi:example:beta_wum;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 640,
-              "name": "yekk_flunn"
+              "enumValue": 651,
+              "name": "beta_um"
             }
           ],
           "valueSchema": "integer",
@@ -346,16 +346,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_hi;1",
+        "@id": "dtmi:example:beta_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yekk_yekk;1",
+          "@id": "dtmi:example:beta_fuddle;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 641,
-              "name": "yekk_vroo"
+              "enumValue": 652,
+              "name": "beta_glikk"
             }
           ],
           "valueSchema": "integer",
@@ -374,15 +374,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_gamma;1",
+        "@id": "dtmi:example:beta_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_alpha;1",
+          "@id": "dtmi:example:beta_snee;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 642,
-              "name": "vroo_beta"
+              "enumValue": 653,
+              "name": "beta_quan"
             }
           ],
           "valueSchema": "integer",
@@ -401,16 +401,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_zeta;1",
+        "@id": "dtmi:example:beta_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:vroo_delta;1",
+          "@id": "dtmi:example:beta_spazz;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 643,
-              "name": "vroo_epsilon"
+              "enumValue": 654,
+              "name": "beta_floob"
             }
           ],
           "valueSchema": "integer",
@@ -429,15 +429,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_iota;1",
+        "@id": "dtmi:example:beta_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_eta;1",
+          "@id": "dtmi:example:beta_jogg;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 644,
-              "name": "vroo_theta"
+              "enumValue": 655,
+              "name": "beta_flunn"
             }
           ],
           "valueSchema": "integer",
@@ -456,16 +456,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_mu;1",
+        "@id": "dtmi:example:beta_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:vroo_kappa;1",
+          "@id": "dtmi:example:beta_yekk;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 645,
-              "name": "vroo_lambda"
+              "enumValue": 656,
+              "name": "beta_vroo"
             }
           ],
           "valueSchema": "integer",
@@ -484,15 +484,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_omicron;1",
+        "@id": "dtmi:example:gamma_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_nu;1",
+          "@id": "dtmi:example:gamma_alpha;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 646,
-              "name": "vroo_xi"
+              "enumValue": 657,
+              "name": "gamma_beta"
             }
           ],
           "valueSchema": "integer",
@@ -511,16 +511,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_sigma;1",
+        "@id": "dtmi:example:gamma_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:vroo_pi;1",
+          "@id": "dtmi:example:gamma_delta;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 647,
-              "name": "vroo_rho"
+              "enumValue": 658,
+              "name": "gamma_epsilon"
             }
           ],
           "valueSchema": "integer",
@@ -539,15 +539,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_phi;1",
+        "@id": "dtmi:example:gamma_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_tau;1",
+          "@id": "dtmi:example:gamma_eta;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 648,
-              "name": "vroo_upsilon"
+              "enumValue": 659,
+              "name": "gamma_theta"
             }
           ],
           "valueSchema": "integer",
@@ -567,16 +567,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_omega;1",
+        "@id": "dtmi:example:gamma_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:vroo_chi;1",
+          "@id": "dtmi:example:gamma_kappa;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 649,
-              "name": "vroo_psi"
+              "enumValue": 660,
+              "name": "gamma_lambda"
             }
           ],
           "valueSchema": "integer",
@@ -596,15 +596,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_um;1",
+        "@id": "dtmi:example:gamma_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_yuzz;1",
+          "@id": "dtmi:example:gamma_nu;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 650,
-              "name": "vroo_wum"
+              "enumValue": 661,
+              "name": "gamma_xi"
             }
           ],
           "valueSchema": "integer",
@@ -625,16 +625,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_glikk;1",
+        "@id": "dtmi:example:gamma_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:vroo_humpf;1",
+          "@id": "dtmi:example:gamma_pi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 651,
-              "name": "vroo_fuddle"
+              "enumValue": 662,
+              "name": "gamma_rho"
             }
           ],
           "valueSchema": "integer",
diff --git a/DTDL/v2/spec/Requirement-ClassEnumPropertyDescriptionStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassEnumPropertyDescriptionStringLengthV2.json
index 0f7ddbec..e10f6d35 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumPropertyDescriptionStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumPropertyDescriptionStringLengthV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_quan;1",
+        "@id": "dtmi:example:gamma_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_nuh;1",
+          "@id": "dtmi:example:gamma_tau;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 652,
-              "name": "vroo_snee"
+              "enumValue": 663,
+              "name": "gamma_upsilon"
             }
           ],
           "valueSchema": "integer",
@@ -32,15 +32,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_floob;1",
+        "@id": "dtmi:example:gamma_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_thnad;1",
+          "@id": "dtmi:example:gamma_chi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 653,
-              "name": "vroo_spazz"
+              "enumValue": 664,
+              "name": "gamma_psi"
             }
           ],
           "valueSchema": "integer",
@@ -57,16 +57,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_flunn;1",
+        "@id": "dtmi:example:gamma_um;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:vroo_zatz;1",
+          "@id": "dtmi:example:gamma_yuzz;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 654,
-              "name": "vroo_jogg"
+              "enumValue": 665,
+              "name": "gamma_wum"
             }
           ],
           "valueSchema": "integer",
diff --git a/DTDL/v2/spec/Requirement-ClassEnumPropertyDescriptionTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassEnumPropertyDescriptionTermAndDtmiV2.json
index f031d39f..d11e8caa 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumPropertyDescriptionTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumPropertyDescriptionTermAndDtmiV2.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_nu;1",
+        "@id": "dtmi:example:delta_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_iota;1",
+          "@id": "dtmi:example:gamma_itch;1",
           "@type": "Enum",
           "description": [
-            "hi_kappa"
+            "gamma_yekk"
           ],
           "dtmi:dtdl:property:description;2": [
-            "hi_lambda"
+            "gamma_vroo"
           ],
           "enumValues": [
             {
-              "enumValue": 658,
-              "name": "hi_mu"
+              "enumValue": 669,
+              "name": "gamma_hi"
             }
           ],
           "valueSchema": "integer"
@@ -37,22 +37,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_sigma;1",
+        "@id": "dtmi:example:delta_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:hi_xi;1",
+          "@id": "dtmi:example:delta_beta;1",
           "@type": "Enum",
           "description": [
-            "hi_omicron"
+            "delta_gamma"
           ],
           "dtmi:dtdl:property:description;2": [
-            "hi_pi"
+            "delta_delta"
           ],
           "enumValues": [
             {
-              "enumValue": 659,
-              "name": "hi_rho"
+              "enumValue": 670,
+              "name": "delta_epsilon"
             }
           ],
           "valueSchema": "integer"
diff --git a/DTDL/v2/spec/Requirement-ClassEnumPropertyDisplayNameLangStringV2.json b/DTDL/v2/spec/Requirement-ClassEnumPropertyDisplayNameLangStringV2.json
index c2ceafe4..395cd757 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumPropertyDisplayNameLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumPropertyDisplayNameLangStringV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_phi;1",
+        "@id": "dtmi:example:delta_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_tau;1",
+          "@id": "dtmi:example:delta_eta;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 660,
-              "name": "hi_upsilon"
+              "enumValue": 671,
+              "name": "delta_theta"
             }
           ],
           "valueSchema": "integer",
@@ -32,15 +32,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_omega;1",
+        "@id": "dtmi:example:delta_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_chi;1",
+          "@id": "dtmi:example:delta_kappa;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 661,
-              "name": "hi_psi"
+              "enumValue": 672,
+              "name": "delta_lambda"
             }
           ],
           "valueSchema": "integer",
@@ -59,15 +59,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_um;1",
+        "@id": "dtmi:example:delta_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_yuzz;1",
+          "@id": "dtmi:example:delta_nu;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 662,
-              "name": "hi_wum"
+              "enumValue": 673,
+              "name": "delta_xi"
             }
           ],
           "valueSchema": "integer",
@@ -86,15 +86,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_glikk;1",
+        "@id": "dtmi:example:delta_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_humpf;1",
+          "@id": "dtmi:example:delta_pi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 663,
-              "name": "hi_fuddle"
+              "enumValue": 674,
+              "name": "delta_rho"
             }
           ],
           "valueSchema": "integer",
@@ -116,15 +116,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_quan;1",
+        "@id": "dtmi:example:delta_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_nuh;1",
+          "@id": "dtmi:example:delta_tau;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 664,
-              "name": "hi_snee"
+              "enumValue": 675,
+              "name": "delta_upsilon"
             }
           ],
           "valueSchema": "integer",
@@ -141,15 +141,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_floob;1",
+        "@id": "dtmi:example:delta_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_thnad;1",
+          "@id": "dtmi:example:delta_chi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 665,
-              "name": "hi_spazz"
+              "enumValue": 676,
+              "name": "delta_psi"
             }
           ],
           "valueSchema": "integer",
@@ -166,15 +166,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_flunn;1",
+        "@id": "dtmi:example:delta_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_zatz;1",
+          "@id": "dtmi:example:delta_yuzz;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 666,
-              "name": "hi_jogg"
+              "enumValue": 677,
+              "name": "delta_wum"
             }
           ],
           "valueSchema": "integer",
@@ -191,16 +191,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_vroo;1",
+        "@id": "dtmi:example:delta_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:hi_itch;1",
+          "@id": "dtmi:example:delta_humpf;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 667,
-              "name": "hi_yekk"
+              "enumValue": 678,
+              "name": "delta_fuddle"
             }
           ],
           "valueSchema": "integer",
@@ -217,15 +217,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_beta;1",
+        "@id": "dtmi:example:delta_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_hi;1",
+          "@id": "dtmi:example:delta_nuh;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 668,
-              "name": "alpha_alpha"
+              "enumValue": 679,
+              "name": "delta_snee"
             }
           ],
           "valueSchema": "integer",
@@ -242,16 +242,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_epsilon;1",
+        "@id": "dtmi:example:delta_floob;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:alpha_gamma;1",
+          "@id": "dtmi:example:delta_thnad;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 669,
-              "name": "alpha_delta"
+              "enumValue": 680,
+              "name": "delta_spazz"
             }
           ],
           "valueSchema": "integer",
@@ -268,15 +268,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_theta;1",
+        "@id": "dtmi:example:delta_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_zeta;1",
+          "@id": "dtmi:example:delta_zatz;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 670,
-              "name": "alpha_eta"
+              "enumValue": 681,
+              "name": "delta_jogg"
             }
           ],
           "valueSchema": "integer",
@@ -293,16 +293,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_lambda;1",
+        "@id": "dtmi:example:delta_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:alpha_iota;1",
+          "@id": "dtmi:example:delta_itch;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 671,
-              "name": "alpha_kappa"
+              "enumValue": 682,
+              "name": "delta_yekk"
             }
           ],
           "valueSchema": "integer",
@@ -319,15 +319,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_xi;1",
+        "@id": "dtmi:example:epsilon_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_mu;1",
+          "@id": "dtmi:example:delta_hi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 672,
-              "name": "alpha_nu"
+              "enumValue": 683,
+              "name": "epsilon_alpha"
             }
           ],
           "valueSchema": "integer",
@@ -346,16 +346,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_rho;1",
+        "@id": "dtmi:example:epsilon_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:alpha_omicron;1",
+          "@id": "dtmi:example:epsilon_gamma;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 673,
-              "name": "alpha_pi"
+              "enumValue": 684,
+              "name": "epsilon_delta"
             }
           ],
           "valueSchema": "integer",
@@ -374,15 +374,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_upsilon;1",
+        "@id": "dtmi:example:epsilon_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_sigma;1",
+          "@id": "dtmi:example:epsilon_zeta;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 674,
-              "name": "alpha_tau"
+              "enumValue": 685,
+              "name": "epsilon_eta"
             }
           ],
           "valueSchema": "integer",
@@ -401,16 +401,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_psi;1",
+        "@id": "dtmi:example:epsilon_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:alpha_phi;1",
+          "@id": "dtmi:example:epsilon_iota;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 675,
-              "name": "alpha_chi"
+              "enumValue": 686,
+              "name": "epsilon_kappa"
             }
           ],
           "valueSchema": "integer",
@@ -429,15 +429,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_wum;1",
+        "@id": "dtmi:example:epsilon_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_omega;1",
+          "@id": "dtmi:example:epsilon_mu;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 676,
-              "name": "alpha_yuzz"
+              "enumValue": 687,
+              "name": "epsilon_nu"
             }
           ],
           "valueSchema": "integer",
@@ -456,16 +456,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_fuddle;1",
+        "@id": "dtmi:example:epsilon_rho;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:alpha_um;1",
+          "@id": "dtmi:example:epsilon_omicron;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 677,
-              "name": "alpha_humpf"
+              "enumValue": 688,
+              "name": "epsilon_pi"
             }
           ],
           "valueSchema": "integer",
@@ -484,15 +484,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_snee;1",
+        "@id": "dtmi:example:epsilon_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_glikk;1",
+          "@id": "dtmi:example:epsilon_sigma;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 678,
-              "name": "alpha_nuh"
+              "enumValue": 689,
+              "name": "epsilon_tau"
             }
           ],
           "valueSchema": "integer",
@@ -511,16 +511,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_spazz;1",
+        "@id": "dtmi:example:epsilon_psi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:alpha_quan;1",
+          "@id": "dtmi:example:epsilon_phi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 679,
-              "name": "alpha_thnad"
+              "enumValue": 690,
+              "name": "epsilon_chi"
             }
           ],
           "valueSchema": "integer",
@@ -539,15 +539,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_jogg;1",
+        "@id": "dtmi:example:epsilon_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_floob;1",
+          "@id": "dtmi:example:epsilon_omega;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 680,
-              "name": "alpha_zatz"
+              "enumValue": 691,
+              "name": "epsilon_yuzz"
             }
           ],
           "valueSchema": "integer",
@@ -567,16 +567,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_yekk;1",
+        "@id": "dtmi:example:epsilon_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:alpha_flunn;1",
+          "@id": "dtmi:example:epsilon_um;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 681,
-              "name": "alpha_itch"
+              "enumValue": 692,
+              "name": "epsilon_humpf"
             }
           ],
           "valueSchema": "integer",
@@ -596,15 +596,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_alpha;1",
+        "@id": "dtmi:example:epsilon_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_vroo;1",
+          "@id": "dtmi:example:epsilon_glikk;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 682,
-              "name": "alpha_hi"
+              "enumValue": 693,
+              "name": "epsilon_nuh"
             }
           ],
           "valueSchema": "integer",
@@ -625,16 +625,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_delta;1",
+        "@id": "dtmi:example:epsilon_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:beta_beta;1",
+          "@id": "dtmi:example:epsilon_quan;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 683,
-              "name": "beta_gamma"
+              "enumValue": 694,
+              "name": "epsilon_thnad"
             }
           ],
           "valueSchema": "integer",
diff --git a/DTDL/v2/spec/Requirement-ClassEnumPropertyDisplayNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassEnumPropertyDisplayNameStringLengthV2.json
index 5ffad8a2..ed6161ea 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumPropertyDisplayNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumPropertyDisplayNameStringLengthV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_eta;1",
+        "@id": "dtmi:example:epsilon_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_epsilon;1",
+          "@id": "dtmi:example:epsilon_floob;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 684,
-              "name": "beta_zeta"
+              "enumValue": 695,
+              "name": "epsilon_zatz"
             }
           ],
           "valueSchema": "integer",
@@ -32,15 +32,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_kappa;1",
+        "@id": "dtmi:example:epsilon_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_theta;1",
+          "@id": "dtmi:example:epsilon_flunn;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 685,
-              "name": "beta_iota"
+              "enumValue": 696,
+              "name": "epsilon_itch"
             }
           ],
           "valueSchema": "integer",
@@ -57,16 +57,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_nu;1",
+        "@id": "dtmi:example:zeta_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:beta_lambda;1",
+          "@id": "dtmi:example:epsilon_vroo;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 686,
-              "name": "beta_mu"
+              "enumValue": 697,
+              "name": "epsilon_hi"
             }
           ],
           "valueSchema": "integer",
diff --git a/DTDL/v2/spec/Requirement-ClassEnumPropertyDisplayNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassEnumPropertyDisplayNameTermAndDtmiV2.json
index e9214580..aac19e6a 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumPropertyDisplayNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumPropertyDisplayNameTermAndDtmiV2.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_glikk;1",
+        "@id": "dtmi:example:zeta_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_wum;1",
+          "@id": "dtmi:example:zeta_xi;1",
           "@type": "Enum",
           "displayName": [
-            "beta_um"
+            "zeta_omicron"
           ],
           "dtmi:dtdl:property:displayName;2": [
-            "beta_humpf"
+            "zeta_pi"
           ],
           "enumValues": [
             {
-              "enumValue": 690,
-              "name": "beta_fuddle"
+              "enumValue": 701,
+              "name": "zeta_rho"
             }
           ],
           "valueSchema": "integer"
@@ -37,22 +37,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_spazz;1",
+        "@id": "dtmi:example:zeta_psi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:beta_nuh;1",
+          "@id": "dtmi:example:zeta_tau;1",
           "@type": "Enum",
           "displayName": [
-            "beta_snee"
+            "zeta_upsilon"
           ],
           "dtmi:dtdl:property:displayName;2": [
-            "beta_quan"
+            "zeta_phi"
           ],
           "enumValues": [
             {
-              "enumValue": 691,
-              "name": "beta_thnad"
+              "enumValue": 702,
+              "name": "zeta_chi"
             }
           ],
           "valueSchema": "integer"
diff --git a/DTDL/v2/spec/Requirement-ClassEnumPropertyEnumValuesElementV2.json b/DTDL/v2/spec/Requirement-ClassEnumPropertyEnumValuesElementV2.json
index 736d3b99..66c516ea 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumPropertyEnumValuesElementV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumPropertyEnumValuesElementV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_epsilon;1",
+        "@id": "dtmi:example:sigma_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omicron_delta",
+          "name": "sigma_phi",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "@id": "dtmi:example:omicron_beta;1",
-              "enumValue": 92,
-              "name": "omicron_gamma"
+              "@id": "dtmi:example:sigma_tau;1",
+              "enumValue": 99,
+              "name": "sigma_upsilon"
             }
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_iota;1",
+        "@id": "dtmi:example:sigma_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omicron_theta",
+          "name": "sigma_yuzz",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": [
               {
-                "@id": "dtmi:example:omicron_zeta;1",
-                "enumValue": 93,
-                "name": "omicron_eta"
+                "@id": "dtmi:example:sigma_psi;1",
+                "enumValue": 100,
+                "name": "sigma_omega"
               }
             ]
           }
@@ -61,21 +61,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_mu;1",
+        "@id": "dtmi:example:sigma_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_lambda;1",
+          "@id": "dtmi:example:sigma_humpf;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:ex:dependentRef;1",
-            "enumValue": 94,
-            "name": "omicron_kappa"
+            "enumValue": 101,
+            "name": "sigma_um"
           }
         },
         "contents": {
           "@type": "Property",
-          "name": "omicron_nu",
+          "name": "sigma_glikk",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
@@ -93,21 +93,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_pi;1",
+        "@id": "dtmi:example:sigma_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_omicron;1",
+          "@id": "dtmi:example:sigma_snee;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:ex:dependentRef;1",
-            "enumValue": 95,
-            "name": "omicron_xi"
+            "enumValue": 102,
+            "name": "sigma_nuh"
           }
         },
         "contents": {
           "@type": "Property",
-          "name": "omicron_rho",
+          "name": "sigma_thnad",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
@@ -127,18 +127,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_phi;1",
+        "@id": "dtmi:example:sigma_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omicron_upsilon",
+          "name": "sigma_zatz",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "@id": "dtmi:example:omicron_sigma;1",
-              "enumValue": 96,
-              "name": "omicron_tau",
+              "@id": "dtmi:example:sigma_spazz;1",
+              "enumValue": 103,
+              "name": "sigma_floob",
               "@context": "dtmi:dtdl:context;3"
             }
           }
@@ -154,19 +154,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_yuzz;1",
+        "@id": "dtmi:example:sigma_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omicron_omega",
+          "name": "sigma_yekk",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "@id": "dtmi:example:omicron_chi;1",
-              "enumValue": 97,
-              "name": "omicron_psi",
+              "@id": "dtmi:example:sigma_flunn;1",
+              "enumValue": 104,
+              "name": "sigma_itch",
               "@context": "dtmi:dtdl:context;3"
             }
           }
@@ -182,11 +182,66 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_um;1",
+        "@id": "dtmi:example:tau_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omicron_wum",
+          "name": "tau_beta",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "@id": "dtmi:example:sigma_hi;1",
+              "enumValue": 105,
+              "name": "tau_alpha",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:tau_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "tau_zeta",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "@id": "dtmi:example:tau_delta;1",
+              "enumValue": 106,
+              "name": "tau_epsilon",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:tau_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "tau_theta",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
@@ -204,11 +259,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_fuddle;1",
+        "@id": "dtmi:example:tau_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omicron_humpf",
+          "name": "tau_kappa",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Enum",
@@ -227,24 +282,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_spazz;1",
+        "@id": "dtmi:example:tau_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omicron_thnad",
+          "name": "tau_pi",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": [
               {
-                "@id": "dtmi:example:omicron_glikk;1",
-                "enumValue": 98,
-                "name": "omicron_nuh"
+                "@id": "dtmi:example:tau_mu;1",
+                "enumValue": 107,
+                "name": "tau_nu"
               },
               {
-                "@id": "dtmi:example:omicron_snee;1",
-                "enumValue": 99,
-                "name": "omicron_quan"
+                "@id": "dtmi:example:tau_xi;1",
+                "enumValue": 108,
+                "name": "tau_omicron"
               }
             ]
           }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumPropertyEnumValuesMaxCountV2.json b/DTDL/v2/spec/Requirement-ClassEnumPropertyEnumValuesMaxCountV2.json
index 814dd994..6dceead7 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumPropertyEnumValuesMaxCountV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumPropertyEnumValuesMaxCountV2.json
@@ -7,1261 +7,1261 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_zeta;1",
+        "@id": "dtmi:example:omega_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_epsilon;1",
+          "@id": "dtmi:example:omega_glikk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": [
-            {
-              "enumValue": 104,
-              "name": "sigma_thnad"
-            },
-            {
-              "enumValue": 105,
-              "name": "sigma_spazz"
-            },
-            {
-              "enumValue": 106,
-              "name": "sigma_floob"
-            },
-            {
-              "enumValue": 107,
-              "name": "sigma_zatz"
-            },
-            {
-              "enumValue": 108,
-              "name": "sigma_jogg"
-            },
-            {
-              "enumValue": 109,
-              "name": "sigma_flunn"
-            },
-            {
-              "enumValue": 110,
-              "name": "sigma_itch"
-            },
-            {
-              "enumValue": 111,
-              "name": "sigma_yekk"
-            },
-            {
-              "enumValue": 112,
-              "name": "sigma_vroo"
-            },
             {
               "enumValue": 113,
-              "name": "sigma_hi"
+              "name": "chi_pi"
             },
             {
               "enumValue": 114,
-              "name": "tau_alpha"
+              "name": "chi_rho"
             },
             {
               "enumValue": 115,
-              "name": "tau_beta"
+              "name": "chi_sigma"
             },
             {
               "enumValue": 116,
-              "name": "tau_gamma"
+              "name": "chi_tau"
             },
             {
               "enumValue": 117,
-              "name": "tau_delta"
+              "name": "chi_upsilon"
             },
             {
               "enumValue": 118,
-              "name": "tau_epsilon"
+              "name": "chi_phi"
             },
             {
               "enumValue": 119,
-              "name": "tau_zeta"
+              "name": "chi_chi"
             },
             {
               "enumValue": 120,
-              "name": "tau_eta"
+              "name": "chi_psi"
             },
             {
               "enumValue": 121,
-              "name": "tau_theta"
+              "name": "chi_omega"
             },
             {
               "enumValue": 122,
-              "name": "tau_iota"
+              "name": "chi_yuzz"
             },
             {
               "enumValue": 123,
-              "name": "tau_kappa"
+              "name": "chi_wum"
             },
             {
               "enumValue": 124,
-              "name": "tau_lambda"
+              "name": "chi_um"
             },
             {
               "enumValue": 125,
-              "name": "tau_mu"
+              "name": "chi_humpf"
             },
             {
               "enumValue": 126,
-              "name": "tau_nu"
+              "name": "chi_fuddle"
             },
             {
               "enumValue": 127,
-              "name": "tau_xi"
+              "name": "chi_glikk"
             },
             {
               "enumValue": 128,
-              "name": "tau_omicron"
+              "name": "chi_nuh"
             },
             {
               "enumValue": 129,
-              "name": "tau_pi"
+              "name": "chi_snee"
             },
             {
               "enumValue": 130,
-              "name": "tau_rho"
+              "name": "chi_quan"
             },
             {
               "enumValue": 131,
-              "name": "tau_sigma"
+              "name": "chi_thnad"
             },
             {
               "enumValue": 132,
-              "name": "tau_tau"
+              "name": "chi_spazz"
             },
             {
               "enumValue": 133,
-              "name": "tau_upsilon"
+              "name": "chi_floob"
             },
             {
               "enumValue": 134,
-              "name": "tau_phi"
+              "name": "chi_zatz"
             },
             {
               "enumValue": 135,
-              "name": "tau_chi"
+              "name": "chi_jogg"
             },
             {
               "enumValue": 136,
-              "name": "tau_psi"
+              "name": "chi_flunn"
             },
             {
               "enumValue": 137,
-              "name": "tau_omega"
+              "name": "chi_itch"
             },
             {
               "enumValue": 138,
-              "name": "tau_yuzz"
+              "name": "chi_yekk"
             },
             {
               "enumValue": 139,
-              "name": "tau_wum"
+              "name": "chi_vroo"
             },
             {
               "enumValue": 140,
-              "name": "tau_um"
+              "name": "chi_hi"
             },
             {
               "enumValue": 141,
-              "name": "tau_humpf"
+              "name": "psi_alpha"
             },
             {
               "enumValue": 142,
-              "name": "tau_fuddle"
+              "name": "psi_beta"
             },
             {
               "enumValue": 143,
-              "name": "tau_glikk"
+              "name": "psi_gamma"
             },
             {
               "enumValue": 144,
-              "name": "tau_nuh"
+              "name": "psi_delta"
             },
             {
               "enumValue": 145,
-              "name": "tau_snee"
+              "name": "psi_epsilon"
             },
             {
               "enumValue": 146,
-              "name": "tau_quan"
+              "name": "psi_zeta"
             },
             {
               "enumValue": 147,
-              "name": "tau_thnad"
+              "name": "psi_eta"
             },
             {
               "enumValue": 148,
-              "name": "tau_spazz"
+              "name": "psi_theta"
             },
             {
               "enumValue": 149,
-              "name": "tau_floob"
+              "name": "psi_iota"
             },
             {
               "enumValue": 150,
-              "name": "tau_zatz"
+              "name": "psi_kappa"
             },
             {
               "enumValue": 151,
-              "name": "tau_jogg"
+              "name": "psi_lambda"
             },
             {
               "enumValue": 152,
-              "name": "tau_flunn"
+              "name": "psi_mu"
             },
             {
               "enumValue": 153,
-              "name": "tau_itch"
+              "name": "psi_nu"
             },
             {
               "enumValue": 154,
-              "name": "tau_yekk"
+              "name": "psi_xi"
             },
             {
               "enumValue": 155,
-              "name": "tau_vroo"
+              "name": "psi_omicron"
             },
             {
               "enumValue": 156,
-              "name": "tau_hi"
+              "name": "psi_pi"
             },
             {
               "enumValue": 157,
-              "name": "upsilon_alpha"
+              "name": "psi_rho"
             },
             {
               "enumValue": 158,
-              "name": "upsilon_beta"
+              "name": "psi_sigma"
             },
             {
               "enumValue": 159,
-              "name": "upsilon_gamma"
+              "name": "psi_tau"
             },
             {
               "enumValue": 160,
-              "name": "upsilon_delta"
+              "name": "psi_upsilon"
             },
             {
               "enumValue": 161,
-              "name": "upsilon_epsilon"
+              "name": "psi_phi"
             },
             {
               "enumValue": 162,
-              "name": "upsilon_zeta"
+              "name": "psi_chi"
             },
             {
               "enumValue": 163,
-              "name": "upsilon_eta"
+              "name": "psi_psi"
             },
             {
               "enumValue": 164,
-              "name": "upsilon_theta"
+              "name": "psi_omega"
             },
             {
               "enumValue": 165,
-              "name": "upsilon_iota"
+              "name": "psi_yuzz"
             },
             {
               "enumValue": 166,
-              "name": "upsilon_kappa"
+              "name": "psi_wum"
             },
             {
               "enumValue": 167,
-              "name": "upsilon_lambda"
+              "name": "psi_um"
             },
             {
               "enumValue": 168,
-              "name": "upsilon_mu"
+              "name": "psi_humpf"
             },
             {
               "enumValue": 169,
-              "name": "upsilon_nu"
+              "name": "psi_fuddle"
             },
             {
               "enumValue": 170,
-              "name": "upsilon_xi"
+              "name": "psi_glikk"
             },
             {
               "enumValue": 171,
-              "name": "upsilon_omicron"
+              "name": "psi_nuh"
             },
             {
               "enumValue": 172,
-              "name": "upsilon_pi"
+              "name": "psi_snee"
             },
             {
               "enumValue": 173,
-              "name": "upsilon_rho"
+              "name": "psi_quan"
             },
             {
               "enumValue": 174,
-              "name": "upsilon_sigma"
+              "name": "psi_thnad"
             },
             {
               "enumValue": 175,
-              "name": "upsilon_tau"
+              "name": "psi_spazz"
             },
             {
               "enumValue": 176,
-              "name": "upsilon_upsilon"
+              "name": "psi_floob"
             },
             {
               "enumValue": 177,
-              "name": "upsilon_phi"
+              "name": "psi_zatz"
             },
             {
               "enumValue": 178,
-              "name": "upsilon_chi"
+              "name": "psi_jogg"
             },
             {
               "enumValue": 179,
-              "name": "upsilon_psi"
+              "name": "psi_flunn"
             },
             {
               "enumValue": 180,
-              "name": "upsilon_omega"
+              "name": "psi_itch"
             },
             {
               "enumValue": 181,
-              "name": "upsilon_yuzz"
+              "name": "psi_yekk"
             },
             {
               "enumValue": 182,
-              "name": "upsilon_wum"
+              "name": "psi_vroo"
             },
             {
               "enumValue": 183,
-              "name": "upsilon_um"
+              "name": "psi_hi"
             },
             {
               "enumValue": 184,
-              "name": "upsilon_humpf"
+              "name": "omega_alpha"
             },
             {
               "enumValue": 185,
-              "name": "upsilon_fuddle"
+              "name": "omega_beta"
             },
             {
               "enumValue": 186,
-              "name": "upsilon_glikk"
+              "name": "omega_gamma"
             },
             {
               "enumValue": 187,
-              "name": "upsilon_nuh"
+              "name": "omega_delta"
             },
             {
               "enumValue": 188,
-              "name": "upsilon_snee"
+              "name": "omega_epsilon"
             },
             {
               "enumValue": 189,
-              "name": "upsilon_quan"
+              "name": "omega_zeta"
             },
             {
               "enumValue": 190,
-              "name": "upsilon_thnad"
+              "name": "omega_eta"
             },
             {
               "enumValue": 191,
-              "name": "upsilon_spazz"
+              "name": "omega_theta"
             },
             {
               "enumValue": 192,
-              "name": "upsilon_floob"
+              "name": "omega_iota"
             },
             {
               "enumValue": 193,
-              "name": "upsilon_zatz"
+              "name": "omega_kappa"
             },
             {
               "enumValue": 194,
-              "name": "upsilon_jogg"
+              "name": "omega_lambda"
             },
             {
               "enumValue": 195,
-              "name": "upsilon_flunn"
+              "name": "omega_mu"
             },
             {
               "enumValue": 196,
-              "name": "upsilon_itch"
+              "name": "omega_nu"
             },
             {
               "enumValue": 197,
-              "name": "upsilon_yekk"
+              "name": "omega_xi"
             },
             {
               "enumValue": 198,
-              "name": "upsilon_vroo"
+              "name": "omega_omicron"
             },
             {
               "enumValue": 199,
-              "name": "upsilon_hi"
+              "name": "omega_pi"
             },
             {
               "enumValue": 200,
-              "name": "phi_alpha"
+              "name": "omega_rho"
             },
             {
               "enumValue": 201,
-              "name": "phi_beta"
+              "name": "omega_sigma"
             },
             {
               "enumValue": 202,
-              "name": "phi_gamma"
+              "name": "omega_tau"
             },
             {
               "enumValue": 203,
-              "name": "phi_delta"
-            }
-          ]
-        }
-      }
-    ]
-  },
-  {
-    "valid": false,
-    "options": [
-      "DisallowUndefinedExtensions"
-    ],
-    "input": [
-      {
-        "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_psi;1",
-        "@type": "Interface",
-        "schemas": {
-          "@id": "dtmi:example:psi_chi;1",
-          "@type": "Enum",
-          "valueSchema": "integer",
-          "enumValues": [
+              "name": "omega_upsilon"
+            },
             {
               "enumValue": 204,
-              "name": "phi_eta"
+              "name": "omega_phi"
             },
             {
               "enumValue": 205,
-              "name": "phi_theta"
+              "name": "omega_chi"
             },
             {
               "enumValue": 206,
-              "name": "phi_iota"
+              "name": "omega_psi"
             },
             {
               "enumValue": 207,
-              "name": "phi_kappa"
+              "name": "omega_omega"
             },
             {
               "enumValue": 208,
-              "name": "phi_lambda"
+              "name": "omega_yuzz"
             },
             {
               "enumValue": 209,
-              "name": "phi_mu"
+              "name": "omega_wum"
             },
             {
               "enumValue": 210,
-              "name": "phi_nu"
+              "name": "omega_um"
             },
             {
               "enumValue": 211,
-              "name": "phi_xi"
+              "name": "omega_humpf"
             },
             {
               "enumValue": 212,
-              "name": "phi_omicron"
-            },
+              "name": "omega_fuddle"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:um_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_delta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": [
             {
               "enumValue": 213,
-              "name": "phi_pi"
+              "name": "omega_snee"
             },
             {
               "enumValue": 214,
-              "name": "phi_rho"
+              "name": "omega_quan"
             },
             {
               "enumValue": 215,
-              "name": "phi_sigma"
+              "name": "omega_thnad"
             },
             {
               "enumValue": 216,
-              "name": "phi_tau"
+              "name": "omega_spazz"
             },
             {
               "enumValue": 217,
-              "name": "phi_upsilon"
+              "name": "omega_floob"
             },
             {
               "enumValue": 218,
-              "name": "phi_phi"
+              "name": "omega_zatz"
             },
             {
               "enumValue": 219,
-              "name": "phi_chi"
+              "name": "omega_jogg"
             },
             {
               "enumValue": 220,
-              "name": "phi_psi"
+              "name": "omega_flunn"
             },
             {
               "enumValue": 221,
-              "name": "phi_omega"
+              "name": "omega_itch"
             },
             {
               "enumValue": 222,
-              "name": "phi_yuzz"
+              "name": "omega_yekk"
             },
             {
               "enumValue": 223,
-              "name": "phi_wum"
+              "name": "omega_vroo"
             },
             {
               "enumValue": 224,
-              "name": "phi_um"
+              "name": "omega_hi"
             },
             {
               "enumValue": 225,
-              "name": "phi_humpf"
+              "name": "yuzz_alpha"
             },
             {
               "enumValue": 226,
-              "name": "phi_fuddle"
+              "name": "yuzz_beta"
             },
             {
               "enumValue": 227,
-              "name": "phi_glikk"
+              "name": "yuzz_gamma"
             },
             {
               "enumValue": 228,
-              "name": "phi_nuh"
+              "name": "yuzz_delta"
             },
             {
               "enumValue": 229,
-              "name": "phi_snee"
+              "name": "yuzz_epsilon"
             },
             {
               "enumValue": 230,
-              "name": "phi_quan"
+              "name": "yuzz_zeta"
             },
             {
               "enumValue": 231,
-              "name": "phi_thnad"
+              "name": "yuzz_eta"
             },
             {
               "enumValue": 232,
-              "name": "phi_spazz"
+              "name": "yuzz_theta"
             },
             {
               "enumValue": 233,
-              "name": "phi_floob"
+              "name": "yuzz_iota"
             },
             {
               "enumValue": 234,
-              "name": "phi_zatz"
+              "name": "yuzz_kappa"
             },
             {
               "enumValue": 235,
-              "name": "phi_jogg"
+              "name": "yuzz_lambda"
             },
             {
               "enumValue": 236,
-              "name": "phi_flunn"
+              "name": "yuzz_mu"
             },
             {
               "enumValue": 237,
-              "name": "phi_itch"
+              "name": "yuzz_nu"
             },
             {
               "enumValue": 238,
-              "name": "phi_yekk"
+              "name": "yuzz_xi"
             },
             {
               "enumValue": 239,
-              "name": "phi_vroo"
+              "name": "yuzz_omicron"
             },
             {
               "enumValue": 240,
-              "name": "phi_hi"
+              "name": "yuzz_pi"
             },
             {
               "enumValue": 241,
-              "name": "chi_alpha"
+              "name": "yuzz_rho"
             },
             {
               "enumValue": 242,
-              "name": "chi_beta"
+              "name": "yuzz_sigma"
             },
             {
               "enumValue": 243,
-              "name": "chi_gamma"
+              "name": "yuzz_tau"
             },
             {
               "enumValue": 244,
-              "name": "chi_delta"
+              "name": "yuzz_upsilon"
             },
             {
               "enumValue": 245,
-              "name": "chi_epsilon"
+              "name": "yuzz_phi"
             },
             {
               "enumValue": 246,
-              "name": "chi_zeta"
+              "name": "yuzz_chi"
             },
             {
               "enumValue": 247,
-              "name": "chi_eta"
+              "name": "yuzz_psi"
             },
             {
               "enumValue": 248,
-              "name": "chi_theta"
+              "name": "yuzz_omega"
             },
             {
               "enumValue": 249,
-              "name": "chi_iota"
+              "name": "yuzz_yuzz"
             },
             {
               "enumValue": 250,
-              "name": "chi_kappa"
+              "name": "yuzz_wum"
             },
             {
               "enumValue": 251,
-              "name": "chi_lambda"
+              "name": "yuzz_um"
             },
             {
               "enumValue": 252,
-              "name": "chi_mu"
+              "name": "yuzz_humpf"
             },
             {
               "enumValue": 253,
-              "name": "chi_nu"
+              "name": "yuzz_fuddle"
             },
             {
               "enumValue": 254,
-              "name": "chi_xi"
+              "name": "yuzz_glikk"
             },
             {
               "enumValue": 255,
-              "name": "chi_omicron"
+              "name": "yuzz_nuh"
             },
             {
               "enumValue": 256,
-              "name": "chi_pi"
+              "name": "yuzz_snee"
             },
             {
               "enumValue": 257,
-              "name": "chi_rho"
+              "name": "yuzz_quan"
             },
             {
               "enumValue": 258,
-              "name": "chi_sigma"
+              "name": "yuzz_thnad"
             },
             {
               "enumValue": 259,
-              "name": "chi_tau"
+              "name": "yuzz_spazz"
             },
             {
               "enumValue": 260,
-              "name": "chi_upsilon"
+              "name": "yuzz_floob"
             },
             {
               "enumValue": 261,
-              "name": "chi_phi"
+              "name": "yuzz_zatz"
             },
             {
               "enumValue": 262,
-              "name": "chi_chi"
+              "name": "yuzz_jogg"
             },
             {
               "enumValue": 263,
-              "name": "chi_psi"
+              "name": "yuzz_flunn"
             },
             {
               "enumValue": 264,
-              "name": "chi_omega"
+              "name": "yuzz_itch"
             },
             {
               "enumValue": 265,
-              "name": "chi_yuzz"
+              "name": "yuzz_yekk"
             },
             {
               "enumValue": 266,
-              "name": "chi_wum"
+              "name": "yuzz_vroo"
             },
             {
               "enumValue": 267,
-              "name": "chi_um"
+              "name": "yuzz_hi"
             },
             {
               "enumValue": 268,
-              "name": "chi_humpf"
+              "name": "wum_alpha"
             },
             {
               "enumValue": 269,
-              "name": "chi_fuddle"
+              "name": "wum_beta"
             },
             {
               "enumValue": 270,
-              "name": "chi_glikk"
+              "name": "wum_gamma"
             },
             {
               "enumValue": 271,
-              "name": "chi_nuh"
+              "name": "wum_delta"
             },
             {
               "enumValue": 272,
-              "name": "chi_snee"
+              "name": "wum_epsilon"
             },
             {
               "enumValue": 273,
-              "name": "chi_quan"
+              "name": "wum_zeta"
             },
             {
               "enumValue": 274,
-              "name": "chi_thnad"
+              "name": "wum_eta"
             },
             {
               "enumValue": 275,
-              "name": "chi_spazz"
+              "name": "wum_theta"
             },
             {
               "enumValue": 276,
-              "name": "chi_floob"
+              "name": "wum_iota"
             },
             {
               "enumValue": 277,
-              "name": "chi_zatz"
+              "name": "wum_kappa"
             },
             {
               "enumValue": 278,
-              "name": "chi_jogg"
+              "name": "wum_lambda"
             },
             {
               "enumValue": 279,
-              "name": "chi_flunn"
+              "name": "wum_mu"
             },
             {
               "enumValue": 280,
-              "name": "chi_itch"
+              "name": "wum_nu"
             },
             {
               "enumValue": 281,
-              "name": "chi_yekk"
+              "name": "wum_xi"
             },
             {
               "enumValue": 282,
-              "name": "chi_vroo"
+              "name": "wum_omicron"
             },
             {
               "enumValue": 283,
-              "name": "chi_hi"
+              "name": "wum_pi"
             },
             {
               "enumValue": 284,
-              "name": "psi_alpha"
+              "name": "wum_rho"
             },
             {
               "enumValue": 285,
-              "name": "psi_beta"
+              "name": "wum_sigma"
             },
             {
               "enumValue": 286,
-              "name": "psi_gamma"
+              "name": "wum_tau"
             },
             {
               "enumValue": 287,
-              "name": "psi_delta"
+              "name": "wum_upsilon"
             },
             {
               "enumValue": 288,
-              "name": "psi_epsilon"
+              "name": "wum_phi"
             },
             {
               "enumValue": 289,
-              "name": "psi_zeta"
+              "name": "wum_chi"
             },
             {
               "enumValue": 290,
-              "name": "psi_eta"
+              "name": "wum_psi"
             },
             {
               "enumValue": 291,
-              "name": "psi_theta"
+              "name": "wum_omega"
             },
             {
               "enumValue": 292,
-              "name": "psi_iota"
+              "name": "wum_yuzz"
             },
             {
               "enumValue": 293,
-              "name": "psi_kappa"
+              "name": "wum_wum"
             },
             {
               "enumValue": 294,
-              "name": "psi_lambda"
+              "name": "wum_um"
             },
             {
               "enumValue": 295,
-              "name": "psi_mu"
+              "name": "wum_humpf"
             },
             {
               "enumValue": 296,
-              "name": "psi_nu"
+              "name": "wum_fuddle"
             },
             {
               "enumValue": 297,
-              "name": "psi_xi"
+              "name": "wum_glikk"
             },
             {
               "enumValue": 298,
-              "name": "psi_omicron"
+              "name": "wum_nuh"
             },
             {
               "enumValue": 299,
-              "name": "psi_pi"
+              "name": "wum_snee"
             },
             {
               "enumValue": 300,
-              "name": "psi_rho"
+              "name": "wum_quan"
             },
             {
               "enumValue": 301,
-              "name": "psi_sigma"
+              "name": "wum_thnad"
             },
             {
               "enumValue": 302,
-              "name": "psi_tau"
+              "name": "wum_spazz"
             },
             {
               "enumValue": 303,
-              "name": "psi_upsilon"
+              "name": "wum_floob"
             },
             {
               "enumValue": 304,
-              "name": "psi_phi"
-            }
-          ]
-        }
-      }
-    ]
-  },
-  {
-    "valid": false,
-    "options": [
-      "AllowUndefinedExtensions"
-    ],
-    "input": [
-      {
-        "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_itch;1",
-        "@type": "Interface",
-        "schemas": {
-          "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yuzz_flunn;1",
-          "@type": "Enum",
-          "valueSchema": "integer",
-          "enumValues": [
+              "name": "wum_zatz"
+            },
             {
               "enumValue": 305,
-              "name": "psi_omega"
+              "name": "wum_jogg"
             },
             {
               "enumValue": 306,
-              "name": "psi_yuzz"
+              "name": "wum_flunn"
             },
             {
               "enumValue": 307,
-              "name": "psi_wum"
+              "name": "wum_itch"
             },
             {
               "enumValue": 308,
-              "name": "psi_um"
+              "name": "wum_yekk"
             },
             {
               "enumValue": 309,
-              "name": "psi_humpf"
+              "name": "wum_vroo"
             },
             {
               "enumValue": 310,
-              "name": "psi_fuddle"
+              "name": "wum_hi"
             },
             {
               "enumValue": 311,
-              "name": "psi_glikk"
+              "name": "um_alpha"
             },
             {
               "enumValue": 312,
-              "name": "psi_nuh"
+              "name": "um_beta"
             },
             {
               "enumValue": 313,
-              "name": "psi_snee"
-            },
+              "name": "um_gamma"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:fuddle_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:fuddle_phi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": [
             {
               "enumValue": 314,
-              "name": "psi_quan"
+              "name": "um_zeta"
             },
             {
               "enumValue": 315,
-              "name": "psi_thnad"
+              "name": "um_eta"
             },
             {
               "enumValue": 316,
-              "name": "psi_spazz"
+              "name": "um_theta"
             },
             {
               "enumValue": 317,
-              "name": "psi_floob"
+              "name": "um_iota"
             },
             {
               "enumValue": 318,
-              "name": "psi_zatz"
+              "name": "um_kappa"
             },
             {
               "enumValue": 319,
-              "name": "psi_jogg"
+              "name": "um_lambda"
             },
             {
               "enumValue": 320,
-              "name": "psi_flunn"
+              "name": "um_mu"
             },
             {
               "enumValue": 321,
-              "name": "psi_itch"
+              "name": "um_nu"
             },
             {
               "enumValue": 322,
-              "name": "psi_yekk"
+              "name": "um_xi"
             },
             {
               "enumValue": 323,
-              "name": "psi_vroo"
+              "name": "um_omicron"
             },
             {
               "enumValue": 324,
-              "name": "psi_hi"
+              "name": "um_pi"
             },
             {
               "enumValue": 325,
-              "name": "omega_alpha"
+              "name": "um_rho"
             },
             {
               "enumValue": 326,
-              "name": "omega_beta"
+              "name": "um_sigma"
             },
             {
               "enumValue": 327,
-              "name": "omega_gamma"
+              "name": "um_tau"
             },
             {
               "enumValue": 328,
-              "name": "omega_delta"
+              "name": "um_upsilon"
             },
             {
               "enumValue": 329,
-              "name": "omega_epsilon"
+              "name": "um_phi"
             },
             {
               "enumValue": 330,
-              "name": "omega_zeta"
+              "name": "um_chi"
             },
             {
               "enumValue": 331,
-              "name": "omega_eta"
+              "name": "um_psi"
             },
             {
               "enumValue": 332,
-              "name": "omega_theta"
+              "name": "um_omega"
             },
             {
               "enumValue": 333,
-              "name": "omega_iota"
+              "name": "um_yuzz"
             },
             {
               "enumValue": 334,
-              "name": "omega_kappa"
+              "name": "um_wum"
             },
             {
               "enumValue": 335,
-              "name": "omega_lambda"
+              "name": "um_um"
             },
             {
               "enumValue": 336,
-              "name": "omega_mu"
+              "name": "um_humpf"
             },
             {
               "enumValue": 337,
-              "name": "omega_nu"
+              "name": "um_fuddle"
             },
             {
               "enumValue": 338,
-              "name": "omega_xi"
+              "name": "um_glikk"
             },
             {
               "enumValue": 339,
-              "name": "omega_omicron"
+              "name": "um_nuh"
             },
             {
               "enumValue": 340,
-              "name": "omega_pi"
+              "name": "um_snee"
             },
             {
               "enumValue": 341,
-              "name": "omega_rho"
+              "name": "um_quan"
             },
             {
               "enumValue": 342,
-              "name": "omega_sigma"
+              "name": "um_thnad"
             },
             {
               "enumValue": 343,
-              "name": "omega_tau"
+              "name": "um_spazz"
             },
             {
               "enumValue": 344,
-              "name": "omega_upsilon"
+              "name": "um_floob"
             },
             {
               "enumValue": 345,
-              "name": "omega_phi"
+              "name": "um_zatz"
             },
             {
               "enumValue": 346,
-              "name": "omega_chi"
+              "name": "um_jogg"
             },
             {
               "enumValue": 347,
-              "name": "omega_psi"
+              "name": "um_flunn"
             },
             {
               "enumValue": 348,
-              "name": "omega_omega"
+              "name": "um_itch"
             },
             {
               "enumValue": 349,
-              "name": "omega_yuzz"
+              "name": "um_yekk"
             },
             {
               "enumValue": 350,
-              "name": "omega_wum"
+              "name": "um_vroo"
             },
             {
               "enumValue": 351,
-              "name": "omega_um"
+              "name": "um_hi"
             },
             {
               "enumValue": 352,
-              "name": "omega_humpf"
+              "name": "humpf_alpha"
             },
             {
               "enumValue": 353,
-              "name": "omega_fuddle"
+              "name": "humpf_beta"
             },
             {
               "enumValue": 354,
-              "name": "omega_glikk"
+              "name": "humpf_gamma"
             },
             {
               "enumValue": 355,
-              "name": "omega_nuh"
+              "name": "humpf_delta"
             },
             {
               "enumValue": 356,
-              "name": "omega_snee"
+              "name": "humpf_epsilon"
             },
             {
               "enumValue": 357,
-              "name": "omega_quan"
+              "name": "humpf_zeta"
             },
             {
               "enumValue": 358,
-              "name": "omega_thnad"
+              "name": "humpf_eta"
             },
             {
               "enumValue": 359,
-              "name": "omega_spazz"
+              "name": "humpf_theta"
             },
             {
               "enumValue": 360,
-              "name": "omega_floob"
+              "name": "humpf_iota"
             },
             {
               "enumValue": 361,
-              "name": "omega_zatz"
+              "name": "humpf_kappa"
             },
             {
               "enumValue": 362,
-              "name": "omega_jogg"
+              "name": "humpf_lambda"
             },
             {
               "enumValue": 363,
-              "name": "omega_flunn"
+              "name": "humpf_mu"
             },
             {
               "enumValue": 364,
-              "name": "omega_itch"
+              "name": "humpf_nu"
             },
             {
               "enumValue": 365,
-              "name": "omega_yekk"
+              "name": "humpf_xi"
             },
             {
               "enumValue": 366,
-              "name": "omega_vroo"
+              "name": "humpf_omicron"
             },
             {
               "enumValue": 367,
-              "name": "omega_hi"
+              "name": "humpf_pi"
             },
             {
               "enumValue": 368,
-              "name": "yuzz_alpha"
+              "name": "humpf_rho"
             },
             {
               "enumValue": 369,
-              "name": "yuzz_beta"
+              "name": "humpf_sigma"
             },
             {
               "enumValue": 370,
-              "name": "yuzz_gamma"
+              "name": "humpf_tau"
             },
             {
               "enumValue": 371,
-              "name": "yuzz_delta"
+              "name": "humpf_upsilon"
             },
             {
               "enumValue": 372,
-              "name": "yuzz_epsilon"
+              "name": "humpf_phi"
             },
             {
               "enumValue": 373,
-              "name": "yuzz_zeta"
+              "name": "humpf_chi"
             },
             {
               "enumValue": 374,
-              "name": "yuzz_eta"
+              "name": "humpf_psi"
             },
             {
               "enumValue": 375,
-              "name": "yuzz_theta"
+              "name": "humpf_omega"
             },
             {
               "enumValue": 376,
-              "name": "yuzz_iota"
+              "name": "humpf_yuzz"
             },
             {
               "enumValue": 377,
-              "name": "yuzz_kappa"
+              "name": "humpf_wum"
             },
             {
               "enumValue": 378,
-              "name": "yuzz_lambda"
+              "name": "humpf_um"
             },
             {
               "enumValue": 379,
-              "name": "yuzz_mu"
+              "name": "humpf_humpf"
             },
             {
               "enumValue": 380,
-              "name": "yuzz_nu"
+              "name": "humpf_fuddle"
             },
             {
               "enumValue": 381,
-              "name": "yuzz_xi"
+              "name": "humpf_glikk"
             },
             {
               "enumValue": 382,
-              "name": "yuzz_omicron"
+              "name": "humpf_nuh"
             },
             {
               "enumValue": 383,
-              "name": "yuzz_pi"
+              "name": "humpf_snee"
             },
             {
               "enumValue": 384,
-              "name": "yuzz_rho"
+              "name": "humpf_quan"
             },
             {
               "enumValue": 385,
-              "name": "yuzz_sigma"
+              "name": "humpf_thnad"
             },
             {
               "enumValue": 386,
-              "name": "yuzz_tau"
+              "name": "humpf_spazz"
             },
             {
               "enumValue": 387,
-              "name": "yuzz_upsilon"
+              "name": "humpf_floob"
             },
             {
               "enumValue": 388,
-              "name": "yuzz_phi"
+              "name": "humpf_zatz"
             },
             {
               "enumValue": 389,
-              "name": "yuzz_chi"
+              "name": "humpf_jogg"
             },
             {
               "enumValue": 390,
-              "name": "yuzz_psi"
+              "name": "humpf_flunn"
             },
             {
               "enumValue": 391,
-              "name": "yuzz_omega"
+              "name": "humpf_itch"
             },
             {
               "enumValue": 392,
-              "name": "yuzz_yuzz"
+              "name": "humpf_yekk"
             },
             {
               "enumValue": 393,
-              "name": "yuzz_wum"
+              "name": "humpf_vroo"
             },
             {
               "enumValue": 394,
-              "name": "yuzz_um"
+              "name": "humpf_hi"
             },
             {
               "enumValue": 395,
-              "name": "yuzz_humpf"
+              "name": "fuddle_alpha"
             },
             {
               "enumValue": 396,
-              "name": "yuzz_fuddle"
+              "name": "fuddle_beta"
             },
             {
               "enumValue": 397,
-              "name": "yuzz_glikk"
+              "name": "fuddle_gamma"
             },
             {
               "enumValue": 398,
-              "name": "yuzz_nuh"
+              "name": "fuddle_delta"
             },
             {
               "enumValue": 399,
-              "name": "yuzz_snee"
+              "name": "fuddle_epsilon"
             },
             {
               "enumValue": 400,
-              "name": "yuzz_quan"
+              "name": "fuddle_zeta"
             },
             {
               "enumValue": 401,
-              "name": "yuzz_thnad"
+              "name": "fuddle_eta"
             },
             {
               "enumValue": 402,
-              "name": "yuzz_spazz"
+              "name": "fuddle_theta"
             },
             {
               "enumValue": 403,
-              "name": "yuzz_floob"
+              "name": "fuddle_iota"
             },
             {
               "enumValue": 404,
-              "name": "yuzz_zatz"
+              "name": "fuddle_kappa"
             },
             {
               "enumValue": 405,
-              "name": "yuzz_jogg"
+              "name": "fuddle_lambda"
+            },
+            {
+              "enumValue": 406,
+              "name": "fuddle_mu"
+            },
+            {
+              "enumValue": 407,
+              "name": "fuddle_nu"
+            },
+            {
+              "enumValue": 408,
+              "name": "fuddle_xi"
+            },
+            {
+              "enumValue": 409,
+              "name": "fuddle_omicron"
+            },
+            {
+              "enumValue": 410,
+              "name": "fuddle_pi"
+            },
+            {
+              "enumValue": 411,
+              "name": "fuddle_rho"
+            },
+            {
+              "enumValue": 412,
+              "name": "fuddle_sigma"
+            },
+            {
+              "enumValue": 413,
+              "name": "fuddle_tau"
+            },
+            {
+              "enumValue": 414,
+              "name": "fuddle_upsilon"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumPropertyEnumValuesMinCountV2.json b/DTDL/v2/spec/Requirement-ClassEnumPropertyEnumValuesMinCountV2.json
index 1cd9a233..61088bd0 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumPropertyEnumValuesMinCountV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumPropertyEnumValuesMinCountV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_humpf;1",
+        "@id": "dtmi:example:chi_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_um;1",
+          "@id": "dtmi:example:chi_iota;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": []
@@ -26,11 +26,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_glikk;1",
+        "@id": "dtmi:example:chi_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:sigma_fuddle;1",
+          "@id": "dtmi:example:chi_lambda;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": []
@@ -46,16 +46,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_quan;1",
+        "@id": "dtmi:example:chi_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_snee;1",
+          "@id": "dtmi:example:chi_xi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": [
             {
-              "enumValue": 103,
-              "name": "sigma_nuh"
+              "enumValue": 112,
+              "name": "chi_nu"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumPropertyEnumValuesTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassEnumPropertyEnumValuesTermAndDtmiV2.json
index 5a1a5f01..c3dad53e 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumPropertyEnumValuesTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumPropertyEnumValuesTermAndDtmiV2.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_kappa;1",
+        "@id": "dtmi:example:fuddle_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_eta;1",
+          "@id": "dtmi:example:fuddle_snee;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 409,
-              "name": "wum_theta"
+              "enumValue": 418,
+              "name": "fuddle_quan"
             }
           ],
           "dtmi:dtdl:property:enumValues;2": [
             {
-              "enumValue": 410,
-              "name": "wum_iota"
+              "enumValue": 419,
+              "name": "fuddle_thnad"
             }
           ],
           "valueSchema": "integer"
@@ -37,22 +37,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_xi;1",
+        "@id": "dtmi:example:fuddle_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:wum_lambda;1",
+          "@id": "dtmi:example:fuddle_floob;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 411,
-              "name": "wum_mu"
+              "enumValue": 420,
+              "name": "fuddle_zatz"
             }
           ],
           "dtmi:dtdl:property:enumValues;2": [
             {
-              "enumValue": 412,
-              "name": "wum_nu"
+              "enumValue": 421,
+              "name": "fuddle_jogg"
             }
           ],
           "valueSchema": "integer"
diff --git a/DTDL/v2/spec/Requirement-ClassEnumPropertyEnumValuesTypeConformanceV2.json b/DTDL/v2/spec/Requirement-ClassEnumPropertyEnumValuesTypeConformanceV2.json
index 3a5ee0da..4e5d722f 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumPropertyEnumValuesTypeConformanceV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumPropertyEnumValuesTypeConformanceV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_vroo;1",
+        "@id": "dtmi:example:tau_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_yekk;1",
+          "@id": "dtmi:example:tau_psi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:omicron_itch;1",
-            "elementSchema": "long",
+            "@id": "dtmi:example:tau_chi;1",
+            "elementSchema": "float",
             "@type": "Array"
           }
         }
@@ -30,16 +30,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_beta;1",
+        "@id": "dtmi:example:tau_um;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:pi_alpha;1",
+          "@id": "dtmi:example:tau_wum;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:omicron_hi;1",
-            "elementSchema": "string",
+            "@id": "dtmi:example:tau_yuzz;1",
+            "elementSchema": "integer",
             "@type": "Array"
           }
         }
@@ -54,15 +54,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_zeta;1",
+        "@id": "dtmi:example:tau_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_epsilon;1",
+          "@id": "dtmi:example:tau_glikk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:pi_gamma;1",
-            "name": "pi_delta",
+            "@id": "dtmi:example:tau_humpf;1",
+            "name": "tau_fuddle",
             "@type": "Command"
           }
         }
@@ -77,16 +77,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_kappa;1",
+        "@id": "dtmi:example:tau_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:pi_iota;1",
+          "@id": "dtmi:example:tau_thnad;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:pi_eta;1",
-            "name": "pi_theta",
+            "@id": "dtmi:example:tau_snee;1",
+            "name": "tau_quan",
             "@type": "Command"
           }
         }
@@ -101,16 +101,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_xi;1",
+        "@id": "dtmi:example:tau_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_nu;1",
+          "@id": "dtmi:example:tau_jogg;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:pi_lambda;1",
-            "name": "pi_mu",
-            "schema": "time",
+            "@id": "dtmi:example:tau_floob;1",
+            "name": "tau_zatz",
+            "schema": "long",
             "@type": "CommandPayload"
           }
         }
@@ -125,17 +125,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_sigma;1",
+        "@id": "dtmi:example:tau_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:pi_rho;1",
+          "@id": "dtmi:example:tau_vroo;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:pi_omicron;1",
-            "name": "pi_pi",
-            "schema": "boolean",
+            "@id": "dtmi:example:tau_itch;1",
+            "name": "tau_yekk",
+            "schema": "string",
             "@type": "CommandPayload"
           }
         }
@@ -150,17 +150,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_psi;1",
+        "@id": "dtmi:example:upsilon_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_chi;1",
+          "@id": "dtmi:example:upsilon_delta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:pi_tau;1",
-            "name": "pi_upsilon",
+            "@id": "dtmi:example:upsilon_alpha;1",
+            "name": "upsilon_beta",
             "schema": {
-              "@id": "dtmi:example:pi_phi;1",
+              "@id": "dtmi:example:upsilon_gamma;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -177,18 +177,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_humpf;1",
+        "@id": "dtmi:example:upsilon_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:pi_um;1",
+          "@id": "dtmi:example:upsilon_iota;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:pi_omega;1",
-            "name": "pi_yuzz",
+            "@id": "dtmi:example:upsilon_zeta;1",
+            "name": "upsilon_eta",
             "schema": {
-              "@id": "dtmi:example:pi_wum;1",
+              "@id": "dtmi:example:upsilon_theta;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -205,18 +205,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_snee;1",
+        "@id": "dtmi:example:upsilon_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_nuh;1",
+          "@id": "dtmi:example:upsilon_nu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:pi_fuddle;1",
+            "@id": "dtmi:example:upsilon_lambda;1",
             "enumValues": [
               {
-                "enumValue": 100,
-                "name": "pi_glikk"
+                "enumValue": 109,
+                "name": "upsilon_mu"
               }
             ],
             "valueSchema": "integer",
@@ -234,19 +234,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_floob;1",
+        "@id": "dtmi:example:upsilon_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:pi_spazz;1",
+          "@id": "dtmi:example:upsilon_rho;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:pi_quan;1",
+            "@id": "dtmi:example:upsilon_omicron;1",
             "enumValues": [
               {
-                "enumValue": 101,
-                "name": "pi_thnad"
+                "enumValue": 110,
+                "name": "upsilon_pi"
               }
             ],
             "valueSchema": "integer",
@@ -264,16 +264,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_itch;1",
+        "@id": "dtmi:example:upsilon_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_flunn;1",
+          "@id": "dtmi:example:upsilon_phi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:pi_zatz;1",
-            "enumValue": 102,
-            "name": "pi_jogg",
+            "@id": "dtmi:example:upsilon_tau;1",
+            "enumValue": 111,
+            "name": "upsilon_upsilon",
             "@type": "EnumValue"
           }
         }
@@ -288,16 +288,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_alpha;1",
+        "@id": "dtmi:example:upsilon_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_hi;1",
+          "@id": "dtmi:example:upsilon_yuzz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:pi_yekk;1",
-            "name": "pi_vroo",
-            "schema": "date",
+            "@id": "dtmi:example:upsilon_psi;1",
+            "name": "upsilon_omega",
+            "schema": "time",
             "@type": "Field"
           }
         }
@@ -312,17 +312,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_epsilon;1",
+        "@id": "dtmi:example:upsilon_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:rho_delta;1",
+          "@id": "dtmi:example:upsilon_fuddle;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:rho_beta;1",
-            "name": "rho_gamma",
-            "schema": "dateTime",
+            "@id": "dtmi:example:upsilon_um;1",
+            "name": "upsilon_humpf",
+            "schema": "boolean",
             "@type": "Field"
           }
         }
@@ -337,14 +337,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_theta;1",
+        "@id": "dtmi:example:upsilon_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_eta;1",
+          "@id": "dtmi:example:upsilon_snee;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:rho_zeta;1",
+            "@id": "dtmi:example:upsilon_nuh;1",
             "@type": "Interface"
           }
         }
@@ -359,15 +359,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_lambda;1",
+        "@id": "dtmi:example:upsilon_floob;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:rho_kappa;1",
+          "@id": "dtmi:example:upsilon_spazz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:rho_iota;1",
+            "@id": "dtmi:example:upsilon_thnad;1",
             "@type": "Interface"
           }
         }
@@ -382,21 +382,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_pi;1",
+        "@id": "dtmi:example:upsilon_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_omicron;1",
+          "@id": "dtmi:example:upsilon_itch;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:rho_mu;1",
+            "@id": "dtmi:example:upsilon_zatz;1",
             "mapKey": {
-              "name": "rho_nu",
+              "name": "upsilon_jogg",
               "schema": "string"
             },
             "mapValue": {
-              "name": "rho_xi",
-              "schema": "double"
+              "name": "upsilon_flunn",
+              "schema": "date"
             },
             "@type": "Map"
           }
@@ -412,22 +412,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_phi;1",
+        "@id": "dtmi:example:phi_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:rho_upsilon;1",
+          "@id": "dtmi:example:phi_beta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:rho_rho;1",
+            "@id": "dtmi:example:upsilon_vroo;1",
             "mapKey": {
-              "name": "rho_sigma",
+              "name": "upsilon_hi",
               "schema": "string"
             },
             "mapValue": {
-              "name": "rho_tau",
-              "schema": "duration"
+              "name": "phi_alpha",
+              "schema": "dateTime"
             },
             "@type": "Map"
           }
@@ -443,15 +443,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_yuzz;1",
+        "@id": "dtmi:example:phi_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_omega;1",
+          "@id": "dtmi:example:phi_zeta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:rho_chi;1",
-            "name": "rho_psi",
+            "@id": "dtmi:example:phi_delta;1",
+            "name": "phi_epsilon",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -467,16 +467,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_fuddle;1",
+        "@id": "dtmi:example:phi_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:rho_humpf;1",
+          "@id": "dtmi:example:phi_kappa;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:rho_wum;1",
-            "name": "rho_um",
+            "@id": "dtmi:example:phi_theta;1",
+            "name": "phi_iota",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -492,16 +492,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_quan;1",
+        "@id": "dtmi:example:phi_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_snee;1",
+          "@id": "dtmi:example:phi_xi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:rho_glikk;1",
-            "name": "rho_nuh",
-            "schema": "float",
+            "@id": "dtmi:example:phi_mu;1",
+            "name": "phi_nu",
+            "schema": "double",
             "@type": "MapValue"
           }
         }
@@ -516,17 +516,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_zatz;1",
+        "@id": "dtmi:example:phi_tau;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:rho_floob;1",
+          "@id": "dtmi:example:phi_sigma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:rho_thnad;1",
-            "name": "rho_spazz",
-            "schema": "integer",
+            "@id": "dtmi:example:phi_pi;1",
+            "name": "phi_rho",
+            "schema": "duration",
             "@type": "MapValue"
           }
         }
@@ -541,18 +541,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_yekk;1",
+        "@id": "dtmi:example:phi_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_itch;1",
+          "@id": "dtmi:example:phi_chi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:rho_jogg;1",
+            "@id": "dtmi:example:phi_upsilon;1",
             "fields": [
               {
-                "name": "rho_flunn",
-                "schema": "long"
+                "name": "phi_phi",
+                "schema": "float"
               }
             ],
             "@type": "Object"
@@ -569,19 +569,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_beta;1",
+        "@id": "dtmi:example:phi_um;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:sigma_alpha;1",
+          "@id": "dtmi:example:phi_wum;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:rho_vroo;1",
+            "@id": "dtmi:example:phi_omega;1",
             "fields": [
               {
-                "name": "rho_hi",
-                "schema": "string"
+                "name": "phi_yuzz",
+                "schema": "integer"
               }
             ],
             "@type": "Object"
@@ -598,16 +598,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_zeta;1",
+        "@id": "dtmi:example:phi_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_epsilon;1",
+          "@id": "dtmi:example:phi_glikk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:sigma_gamma;1",
-            "name": "sigma_delta",
-            "schema": "time",
+            "@id": "dtmi:example:phi_humpf;1",
+            "name": "phi_fuddle",
+            "schema": "long",
             "@type": "Property"
           }
         }
@@ -622,17 +622,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_kappa;1",
+        "@id": "dtmi:example:phi_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:sigma_iota;1",
+          "@id": "dtmi:example:phi_thnad;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:sigma_eta;1",
-            "name": "sigma_theta",
-            "schema": "boolean",
+            "@id": "dtmi:example:phi_snee;1",
+            "name": "phi_quan",
+            "schema": "string",
             "@type": "Property"
           }
         }
@@ -647,15 +647,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_xi;1",
+        "@id": "dtmi:example:phi_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_nu;1",
+          "@id": "dtmi:example:phi_jogg;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:sigma_lambda;1",
-            "name": "sigma_mu",
+            "@id": "dtmi:example:phi_floob;1",
+            "name": "phi_zatz",
             "@type": "Relationship"
           }
         }
@@ -670,16 +670,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_sigma;1",
+        "@id": "dtmi:example:phi_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:sigma_rho;1",
+          "@id": "dtmi:example:phi_vroo;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:sigma_omicron;1",
-            "name": "sigma_pi",
+            "@id": "dtmi:example:phi_itch;1",
+            "name": "phi_yekk",
             "@type": "Relationship"
           }
         }
@@ -694,16 +694,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_chi;1",
+        "@id": "dtmi:example:chi_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_phi;1",
+          "@id": "dtmi:example:chi_gamma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:sigma_tau;1",
-            "name": "sigma_upsilon",
-            "schema": "date",
+            "@id": "dtmi:example:chi_alpha;1",
+            "name": "chi_beta",
+            "schema": "time",
             "@type": "Telemetry"
           }
         }
@@ -718,17 +718,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_wum;1",
+        "@id": "dtmi:example:chi_theta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:sigma_yuzz;1",
+          "@id": "dtmi:example:chi_eta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:sigma_psi;1",
-            "name": "sigma_omega",
-            "schema": "dateTime",
+            "@id": "dtmi:example:chi_epsilon;1",
+            "name": "chi_zeta",
+            "schema": "boolean",
             "@type": "Telemetry"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumPropertyFormallyInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassEnumPropertyFormallyInvalidDtmiV2.json
index 0e13b6e3..9907bdd2 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumPropertyFormallyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumPropertyFormallyInvalidDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_nuh;1",
+        "@id": "dtmi:example:eta_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_fuddle;1",
+          "@id": "dtmi:example:eta_rho;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 704,
-              "name": "gamma_glikk"
+              "enumValue": 715,
+              "name": "eta_sigma"
             }
           ],
           "valueSchema": "integer",
@@ -32,16 +32,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_thnad;1",
+        "@id": "dtmi:example:eta_chi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:gamma_snee;1",
+          "@id": "dtmi:example:eta_upsilon;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 705,
-              "name": "gamma_quan"
+              "enumValue": 716,
+              "name": "eta_phi"
             }
           ],
           "valueSchema": "integer",
diff --git a/DTDL/v2/spec/Requirement-ClassEnumPropertyFormallyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Requirement-ClassEnumPropertyFormallyIrrelevantDtmiOrTermV2.json
index d6e15893..4e131748 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumPropertyFormallyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumPropertyFormallyIrrelevantDtmiOrTermV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_pi;1",
+        "@id": "dtmi:example:eta_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_xi;1",
+          "@id": "dtmi:example:eta_beta;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 699,
-              "name": "gamma_omicron"
+              "enumValue": 710,
+              "name": "eta_gamma"
             }
           ],
           "valueSchema": "integer",
@@ -32,16 +32,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_tau;1",
+        "@id": "dtmi:example:eta_eta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:gamma_rho;1",
+          "@id": "dtmi:example:eta_epsilon;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 700,
-              "name": "gamma_sigma"
+              "enumValue": 711,
+              "name": "eta_zeta"
             }
           ],
           "valueSchema": "integer",
@@ -58,15 +58,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_chi;1",
+        "@id": "dtmi:example:eta_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_upsilon;1",
+          "@id": "dtmi:example:eta_theta;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 701,
-              "name": "gamma_phi"
+              "enumValue": 712,
+              "name": "eta_iota"
             }
           ],
           "valueSchema": "integer",
@@ -83,16 +83,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_yuzz;1",
+        "@id": "dtmi:example:eta_nu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:gamma_psi;1",
+          "@id": "dtmi:example:eta_lambda;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 702,
-              "name": "gamma_omega"
+              "enumValue": 713,
+              "name": "eta_mu"
             }
           ],
           "valueSchema": "integer",
diff --git a/DTDL/v2/spec/Requirement-ClassEnumPropertyFormallyNotDtmiNorTermV2.json b/DTDL/v2/spec/Requirement-ClassEnumPropertyFormallyNotDtmiNorTermV2.json
index 158b882c..0ee75785 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumPropertyFormallyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumPropertyFormallyNotDtmiNorTermV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_itch;1",
+        "@id": "dtmi:example:eta_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_jogg;1",
+          "@id": "dtmi:example:eta_wum;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 707,
-              "name": "gamma_flunn"
+              "enumValue": 718,
+              "name": "eta_um"
             }
           ],
           "valueSchema": "integer",
@@ -32,16 +32,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_hi;1",
+        "@id": "dtmi:example:eta_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:gamma_yekk;1",
+          "@id": "dtmi:example:eta_fuddle;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 708,
-              "name": "gamma_vroo"
+              "enumValue": 719,
+              "name": "eta_glikk"
             }
           ],
           "valueSchema": "integer",
diff --git a/DTDL/v2/spec/Requirement-ClassEnumPropertyFormallyUndefinedTermV2.json b/DTDL/v2/spec/Requirement-ClassEnumPropertyFormallyUndefinedTermV2.json
index 24a41543..ee001430 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumPropertyFormallyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumPropertyFormallyUndefinedTermV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_zeta;1",
+        "@id": "dtmi:example:eta_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_delta;1",
+          "@id": "dtmi:example:eta_spazz;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 710,
-              "name": "delta_epsilon"
+              "enumValue": 721,
+              "name": "eta_floob"
             }
           ],
           "valueSchema": "integer",
@@ -32,16 +32,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_iota;1",
+        "@id": "dtmi:example:eta_itch;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_eta;1",
+          "@id": "dtmi:example:eta_jogg;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 711,
-              "name": "delta_theta"
+              "enumValue": 722,
+              "name": "eta_flunn"
             }
           ],
           "valueSchema": "integer",
diff --git a/DTDL/v2/spec/Requirement-ClassEnumPropertyValueSchemaSpecificValuesV2.json b/DTDL/v2/spec/Requirement-ClassEnumPropertyValueSchemaSpecificValuesV2.json
index fc018175..16c0f0b7 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumPropertyValueSchemaSpecificValuesV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumPropertyValueSchemaSpecificValuesV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_rho;1",
+        "@id": "dtmi:example:fuddle_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_pi;1",
+          "@id": "dtmi:example:fuddle_yekk;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "wum_omicron",
+            "name": "fuddle_itch",
             "enumValue": 3
           },
           "valueSchema": "integer"
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_upsilon;1",
+        "@id": "dtmi:example:glikk_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_tau;1",
+          "@id": "dtmi:example:glikk_alpha;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "wum_sigma",
+            "name": "fuddle_hi",
             "enumValue": 3
           },
           "valueSchema": [
@@ -53,13 +53,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_psi;1",
+        "@id": "dtmi:example:glikk_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_chi;1",
+          "@id": "dtmi:example:glikk_delta;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "wum_phi",
+            "name": "glikk_gamma",
             "enumValue": 3
           },
           "valueSchema": "dtmi:dtdl:instance:Schema:integer;2"
@@ -75,13 +75,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_wum;1",
+        "@id": "dtmi:example:glikk_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_yuzz;1",
+          "@id": "dtmi:example:glikk_eta;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "wum_omega",
+            "name": "glikk_zeta",
             "enumValue": 3
           },
           "valueSchema": [
@@ -99,13 +99,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_fuddle;1",
+        "@id": "dtmi:example:glikk_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_humpf;1",
+          "@id": "dtmi:example:glikk_kappa;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "wum_um",
+            "name": "glikk_iota",
             "enumValue": 3
           },
           "valueSchema": [
@@ -124,14 +124,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_snee;1",
+        "@id": "dtmi:example:glikk_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_nuh;1",
+          "@id": "dtmi:example:glikk_nu;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "wum_glikk",
+            "name": "glikk_mu",
             "enumValue": 3
           },
           "valueSchema": [
@@ -150,13 +150,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_spazz;1",
+        "@id": "dtmi:example:glikk_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_thnad;1",
+          "@id": "dtmi:example:glikk_pi;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "wum_quan",
+            "name": "glikk_omicron",
             "enumValue": "alpha_tau"
           },
           "valueSchema": "string"
@@ -172,13 +172,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_jogg;1",
+        "@id": "dtmi:example:glikk_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_zatz;1",
+          "@id": "dtmi:example:glikk_tau;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "wum_floob",
+            "name": "glikk_sigma",
             "enumValue": "alpha_tau"
           },
           "valueSchema": [
@@ -196,13 +196,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_yekk;1",
+        "@id": "dtmi:example:glikk_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_itch;1",
+          "@id": "dtmi:example:glikk_chi;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "wum_flunn",
+            "name": "glikk_phi",
             "enumValue": "alpha_tau"
           },
           "valueSchema": "dtmi:dtdl:instance:Schema:string;2"
@@ -218,13 +218,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_alpha;1",
+        "@id": "dtmi:example:glikk_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_hi;1",
+          "@id": "dtmi:example:glikk_yuzz;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "wum_vroo",
+            "name": "glikk_omega",
             "enumValue": "alpha_tau"
           },
           "valueSchema": [
@@ -242,13 +242,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_delta;1",
+        "@id": "dtmi:example:glikk_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_gamma;1",
+          "@id": "dtmi:example:glikk_humpf;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "um_beta",
+            "name": "glikk_um",
             "enumValue": "alpha_tau"
           },
           "valueSchema": [
@@ -267,14 +267,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_eta;1",
+        "@id": "dtmi:example:glikk_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_zeta;1",
+          "@id": "dtmi:example:glikk_nuh;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "um_epsilon",
+            "name": "glikk_glikk",
             "enumValue": "alpha_tau"
           },
           "valueSchema": [
@@ -293,15 +293,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_kappa;1",
+        "@id": "dtmi:example:glikk_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_theta;1",
+          "@id": "dtmi:example:glikk_quan;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 413,
-              "name": "um_iota"
+              "enumValue": 422,
+              "name": "glikk_thnad"
             }
           ],
           "valueSchema": []
@@ -317,16 +317,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_nu;1",
+        "@id": "dtmi:example:glikk_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:um_lambda;1",
+          "@id": "dtmi:example:glikk_floob;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 414,
-              "name": "um_mu"
+              "enumValue": 423,
+              "name": "glikk_zatz"
             }
           ],
           "valueSchema": []
@@ -342,15 +342,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_pi;1",
+        "@id": "dtmi:example:glikk_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_xi;1",
+          "@id": "dtmi:example:glikk_flunn;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 415,
-              "name": "um_omicron"
+              "enumValue": 424,
+              "name": "glikk_itch"
             }
           ],
           "valueSchema": null
@@ -366,16 +366,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_tau;1",
+        "@id": "dtmi:example:nuh_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:um_rho;1",
+          "@id": "dtmi:example:glikk_vroo;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 416,
-              "name": "um_sigma"
+              "enumValue": 425,
+              "name": "glikk_hi"
             }
           ],
           "valueSchema": null
@@ -391,15 +391,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_chi;1",
+        "@id": "dtmi:example:nuh_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_upsilon;1",
+          "@id": "dtmi:example:nuh_beta;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 417,
-              "name": "um_phi"
+              "enumValue": 426,
+              "name": "nuh_gamma"
             }
           ],
           "valueSchema": true
@@ -415,16 +415,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_yuzz;1",
+        "@id": "dtmi:example:nuh_eta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:um_psi;1",
+          "@id": "dtmi:example:nuh_epsilon;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 418,
-              "name": "um_omega"
+              "enumValue": 427,
+              "name": "nuh_zeta"
             }
           ],
           "valueSchema": true
@@ -440,15 +440,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_humpf;1",
+        "@id": "dtmi:example:nuh_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_wum;1",
+          "@id": "dtmi:example:nuh_theta;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 419,
-              "name": "um_um"
+              "enumValue": 428,
+              "name": "nuh_iota"
             }
           ],
           "valueSchema": 626
@@ -464,16 +464,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_nuh;1",
+        "@id": "dtmi:example:nuh_nu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:um_fuddle;1",
+          "@id": "dtmi:example:nuh_lambda;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 420,
-              "name": "um_glikk"
+              "enumValue": 429,
+              "name": "nuh_mu"
             }
           ],
           "valueSchema": 626
@@ -489,15 +489,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_thnad;1",
+        "@id": "dtmi:example:nuh_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_snee;1",
+          "@id": "dtmi:example:nuh_xi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 421,
-              "name": "um_quan"
+              "enumValue": 430,
+              "name": "nuh_omicron"
             }
           ],
           "valueSchema": [
@@ -515,16 +515,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_zatz;1",
+        "@id": "dtmi:example:nuh_tau;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:um_spazz;1",
+          "@id": "dtmi:example:nuh_rho;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 422,
-              "name": "um_floob"
+              "enumValue": 431,
+              "name": "nuh_sigma"
             }
           ],
           "valueSchema": [
@@ -542,15 +542,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_itch;1",
+        "@id": "dtmi:example:nuh_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_jogg;1",
+          "@id": "dtmi:example:nuh_upsilon;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 423,
-              "name": "um_flunn"
+              "enumValue": 432,
+              "name": "nuh_phi"
             }
           ],
           "valueSchema": [
@@ -568,16 +568,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_hi;1",
+        "@id": "dtmi:example:nuh_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:um_yekk;1",
+          "@id": "dtmi:example:nuh_psi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 424,
-              "name": "um_vroo"
+              "enumValue": 433,
+              "name": "nuh_omega"
             }
           ],
           "valueSchema": [
@@ -595,15 +595,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_gamma;1",
+        "@id": "dtmi:example:nuh_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_alpha;1",
+          "@id": "dtmi:example:nuh_wum;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 425,
-              "name": "humpf_beta"
+              "enumValue": 434,
+              "name": "nuh_um"
             }
           ],
           "valueSchema": [
@@ -621,16 +621,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_zeta;1",
+        "@id": "dtmi:example:nuh_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:humpf_delta;1",
+          "@id": "dtmi:example:nuh_fuddle;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 426,
-              "name": "humpf_epsilon"
+              "enumValue": 435,
+              "name": "nuh_glikk"
             }
           ],
           "valueSchema": [
@@ -648,15 +648,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_iota;1",
+        "@id": "dtmi:example:nuh_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_eta;1",
+          "@id": "dtmi:example:nuh_snee;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 427,
-              "name": "humpf_theta"
+              "enumValue": 436,
+              "name": "nuh_quan"
             }
           ],
           "valueSchema": {}
@@ -672,16 +672,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_mu;1",
+        "@id": "dtmi:example:nuh_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:humpf_kappa;1",
+          "@id": "dtmi:example:nuh_spazz;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 428,
-              "name": "humpf_lambda"
+              "enumValue": 437,
+              "name": "nuh_floob"
             }
           ],
           "valueSchema": {}
@@ -697,15 +697,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_omicron;1",
+        "@id": "dtmi:example:nuh_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_nu;1",
+          "@id": "dtmi:example:nuh_jogg;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 429,
-              "name": "humpf_xi"
+              "enumValue": 438,
+              "name": "nuh_flunn"
             }
           ],
           "valueSchema": [
@@ -723,16 +723,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_sigma;1",
+        "@id": "dtmi:example:nuh_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:humpf_pi;1",
+          "@id": "dtmi:example:nuh_yekk;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 430,
-              "name": "humpf_rho"
+              "enumValue": 439,
+              "name": "nuh_vroo"
             }
           ],
           "valueSchema": [
@@ -750,15 +750,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_phi;1",
+        "@id": "dtmi:example:snee_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_tau;1",
+          "@id": "dtmi:example:snee_alpha;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 431,
-              "name": "humpf_upsilon"
+              "enumValue": 440,
+              "name": "snee_beta"
             }
           ],
           "valueSchema": "asynchronous"
@@ -774,16 +774,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_omega;1",
+        "@id": "dtmi:example:snee_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:humpf_chi;1",
+          "@id": "dtmi:example:snee_delta;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 432,
-              "name": "humpf_psi"
+              "enumValue": 441,
+              "name": "snee_epsilon"
             }
           ],
           "valueSchema": "asynchronous"
@@ -799,15 +799,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_um;1",
+        "@id": "dtmi:example:snee_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_yuzz;1",
+          "@id": "dtmi:example:snee_eta;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 433,
-              "name": "humpf_wum"
+              "enumValue": 442,
+              "name": "snee_theta"
             }
           ],
           "valueSchema": "dtmi:dtdl:instance:CommandType:asynchronous;2"
@@ -823,16 +823,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_glikk;1",
+        "@id": "dtmi:example:snee_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:humpf_humpf;1",
+          "@id": "dtmi:example:snee_kappa;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 434,
-              "name": "humpf_fuddle"
+              "enumValue": 443,
+              "name": "snee_lambda"
             }
           ],
           "valueSchema": "dtmi:dtdl:instance:CommandType:asynchronous;2"
@@ -848,15 +848,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_quan;1",
+        "@id": "dtmi:example:snee_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_nuh;1",
+          "@id": "dtmi:example:snee_nu;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 435,
-              "name": "humpf_snee"
+              "enumValue": 444,
+              "name": "snee_xi"
             }
           ],
           "valueSchema": "synchronous"
@@ -872,16 +872,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_floob;1",
+        "@id": "dtmi:example:snee_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:humpf_thnad;1",
+          "@id": "dtmi:example:snee_pi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 436,
-              "name": "humpf_spazz"
+              "enumValue": 445,
+              "name": "snee_rho"
             }
           ],
           "valueSchema": "synchronous"
@@ -897,15 +897,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_flunn;1",
+        "@id": "dtmi:example:snee_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_zatz;1",
+          "@id": "dtmi:example:snee_tau;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 437,
-              "name": "humpf_jogg"
+              "enumValue": 446,
+              "name": "snee_upsilon"
             }
           ],
           "valueSchema": "dtmi:dtdl:instance:CommandType:synchronous;2"
@@ -921,16 +921,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_vroo;1",
+        "@id": "dtmi:example:snee_omega;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:humpf_itch;1",
+          "@id": "dtmi:example:snee_chi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 438,
-              "name": "humpf_yekk"
+              "enumValue": 447,
+              "name": "snee_psi"
             }
           ],
           "valueSchema": "dtmi:dtdl:instance:CommandType:synchronous;2"
@@ -946,15 +946,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_beta;1",
+        "@id": "dtmi:example:snee_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_hi;1",
+          "@id": "dtmi:example:snee_yuzz;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 439,
-              "name": "fuddle_alpha"
+              "enumValue": 448,
+              "name": "snee_wum"
             }
           ],
           "valueSchema": "boolean"
@@ -970,16 +970,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_epsilon;1",
+        "@id": "dtmi:example:snee_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_gamma;1",
+          "@id": "dtmi:example:snee_humpf;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 440,
-              "name": "fuddle_delta"
+              "enumValue": 449,
+              "name": "snee_fuddle"
             }
           ],
           "valueSchema": "boolean"
@@ -995,15 +995,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_theta;1",
+        "@id": "dtmi:example:snee_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_zeta;1",
+          "@id": "dtmi:example:snee_nuh;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 441,
-              "name": "fuddle_eta"
+              "enumValue": 450,
+              "name": "snee_snee"
             }
           ],
           "valueSchema": "dtmi:dtdl:instance:Schema:boolean;2"
@@ -1019,16 +1019,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_lambda;1",
+        "@id": "dtmi:example:snee_floob;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_iota;1",
+          "@id": "dtmi:example:snee_thnad;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 442,
-              "name": "fuddle_kappa"
+              "enumValue": 451,
+              "name": "snee_spazz"
             }
           ],
           "valueSchema": "dtmi:dtdl:instance:Schema:boolean;2"
@@ -1044,15 +1044,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_xi;1",
+        "@id": "dtmi:example:snee_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_mu;1",
+          "@id": "dtmi:example:snee_zatz;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 443,
-              "name": "fuddle_nu"
+              "enumValue": 452,
+              "name": "snee_jogg"
             }
           ],
           "valueSchema": "date"
@@ -1068,16 +1068,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_rho;1",
+        "@id": "dtmi:example:snee_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_omicron;1",
+          "@id": "dtmi:example:snee_itch;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 444,
-              "name": "fuddle_pi"
+              "enumValue": 453,
+              "name": "snee_yekk"
             }
           ],
           "valueSchema": "date"
@@ -1093,15 +1093,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_upsilon;1",
+        "@id": "dtmi:example:quan_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_sigma;1",
+          "@id": "dtmi:example:snee_hi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 445,
-              "name": "fuddle_tau"
+              "enumValue": 454,
+              "name": "quan_alpha"
             }
           ],
           "valueSchema": "dtmi:dtdl:instance:Schema:date;2"
@@ -1117,16 +1117,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_psi;1",
+        "@id": "dtmi:example:quan_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_phi;1",
+          "@id": "dtmi:example:quan_gamma;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 446,
-              "name": "fuddle_chi"
+              "enumValue": 455,
+              "name": "quan_delta"
             }
           ],
           "valueSchema": "dtmi:dtdl:instance:Schema:date;2"
@@ -1142,15 +1142,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_wum;1",
+        "@id": "dtmi:example:quan_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_omega;1",
+          "@id": "dtmi:example:quan_zeta;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 447,
-              "name": "fuddle_yuzz"
+              "enumValue": 456,
+              "name": "quan_eta"
             }
           ],
           "valueSchema": "dateTime"
@@ -1166,16 +1166,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_fuddle;1",
+        "@id": "dtmi:example:quan_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_um;1",
+          "@id": "dtmi:example:quan_iota;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 448,
-              "name": "fuddle_humpf"
+              "enumValue": 457,
+              "name": "quan_kappa"
             }
           ],
           "valueSchema": "dateTime"
@@ -1191,15 +1191,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_snee;1",
+        "@id": "dtmi:example:quan_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_glikk;1",
+          "@id": "dtmi:example:quan_mu;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 449,
-              "name": "fuddle_nuh"
+              "enumValue": 458,
+              "name": "quan_nu"
             }
           ],
           "valueSchema": "dtmi:dtdl:instance:Schema:dateTime;2"
@@ -1215,16 +1215,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_spazz;1",
+        "@id": "dtmi:example:quan_rho;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_quan;1",
+          "@id": "dtmi:example:quan_omicron;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 450,
-              "name": "fuddle_thnad"
+              "enumValue": 459,
+              "name": "quan_pi"
             }
           ],
           "valueSchema": "dtmi:dtdl:instance:Schema:dateTime;2"
@@ -1240,15 +1240,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_jogg;1",
+        "@id": "dtmi:example:quan_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_floob;1",
+          "@id": "dtmi:example:quan_sigma;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 451,
-              "name": "fuddle_zatz"
+              "enumValue": 460,
+              "name": "quan_tau"
             }
           ],
           "valueSchema": "double"
@@ -1264,16 +1264,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_yekk;1",
+        "@id": "dtmi:example:quan_psi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_flunn;1",
+          "@id": "dtmi:example:quan_phi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 452,
-              "name": "fuddle_itch"
+              "enumValue": 461,
+              "name": "quan_chi"
             }
           ],
           "valueSchema": "double"
@@ -1289,15 +1289,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_alpha;1",
+        "@id": "dtmi:example:quan_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_vroo;1",
+          "@id": "dtmi:example:quan_omega;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 453,
-              "name": "fuddle_hi"
+              "enumValue": 462,
+              "name": "quan_yuzz"
             }
           ],
           "valueSchema": "dtmi:dtdl:instance:Schema:double;2"
@@ -1313,16 +1313,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_delta;1",
+        "@id": "dtmi:example:quan_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_beta;1",
+          "@id": "dtmi:example:quan_um;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 454,
-              "name": "glikk_gamma"
+              "enumValue": 463,
+              "name": "quan_humpf"
             }
           ],
           "valueSchema": "dtmi:dtdl:instance:Schema:double;2"
@@ -1338,15 +1338,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_eta;1",
+        "@id": "dtmi:example:quan_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_epsilon;1",
+          "@id": "dtmi:example:quan_glikk;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 455,
-              "name": "glikk_zeta"
+              "enumValue": 464,
+              "name": "quan_nuh"
             }
           ],
           "valueSchema": "duration"
@@ -1362,16 +1362,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_kappa;1",
+        "@id": "dtmi:example:quan_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_theta;1",
+          "@id": "dtmi:example:quan_quan;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 456,
-              "name": "glikk_iota"
+              "enumValue": 465,
+              "name": "quan_thnad"
             }
           ],
           "valueSchema": "duration"
@@ -1387,15 +1387,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_nu;1",
+        "@id": "dtmi:example:quan_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_lambda;1",
+          "@id": "dtmi:example:quan_floob;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 457,
-              "name": "glikk_mu"
+              "enumValue": 466,
+              "name": "quan_zatz"
             }
           ],
           "valueSchema": "dtmi:dtdl:instance:Schema:duration;2"
@@ -1411,16 +1411,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_pi;1",
+        "@id": "dtmi:example:quan_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_xi;1",
+          "@id": "dtmi:example:quan_flunn;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 458,
-              "name": "glikk_omicron"
+              "enumValue": 467,
+              "name": "quan_itch"
             }
           ],
           "valueSchema": "dtmi:dtdl:instance:Schema:duration;2"
@@ -1436,15 +1436,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_tau;1",
+        "@id": "dtmi:example:thnad_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_rho;1",
+          "@id": "dtmi:example:quan_vroo;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 459,
-              "name": "glikk_sigma"
+              "enumValue": 468,
+              "name": "quan_hi"
             }
           ],
           "valueSchema": "float"
@@ -1460,16 +1460,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_chi;1",
+        "@id": "dtmi:example:thnad_delta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_upsilon;1",
+          "@id": "dtmi:example:thnad_beta;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 460,
-              "name": "glikk_phi"
+              "enumValue": 469,
+              "name": "thnad_gamma"
             }
           ],
           "valueSchema": "float"
@@ -1485,15 +1485,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_yuzz;1",
+        "@id": "dtmi:example:thnad_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_psi;1",
+          "@id": "dtmi:example:thnad_epsilon;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 461,
-              "name": "glikk_omega"
+              "enumValue": 470,
+              "name": "thnad_zeta"
             }
           ],
           "valueSchema": "dtmi:dtdl:instance:Schema:float;2"
@@ -1509,16 +1509,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_humpf;1",
+        "@id": "dtmi:example:thnad_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_wum;1",
+          "@id": "dtmi:example:thnad_theta;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 462,
-              "name": "glikk_um"
+              "enumValue": 471,
+              "name": "thnad_iota"
             }
           ],
           "valueSchema": "dtmi:dtdl:instance:Schema:float;2"
@@ -1534,15 +1534,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_nuh;1",
+        "@id": "dtmi:example:thnad_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_fuddle;1",
+          "@id": "dtmi:example:thnad_lambda;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 463,
-              "name": "glikk_glikk"
+              "enumValue": 472,
+              "name": "thnad_mu"
             }
           ],
           "valueSchema": "long"
@@ -1558,16 +1558,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_thnad;1",
+        "@id": "dtmi:example:thnad_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_snee;1",
+          "@id": "dtmi:example:thnad_xi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 464,
-              "name": "glikk_quan"
+              "enumValue": 473,
+              "name": "thnad_omicron"
             }
           ],
           "valueSchema": "long"
@@ -1583,15 +1583,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_zatz;1",
+        "@id": "dtmi:example:thnad_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_spazz;1",
+          "@id": "dtmi:example:thnad_rho;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 465,
-              "name": "glikk_floob"
+              "enumValue": 474,
+              "name": "thnad_sigma"
             }
           ],
           "valueSchema": "dtmi:dtdl:instance:Schema:long;2"
@@ -1607,16 +1607,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_itch;1",
+        "@id": "dtmi:example:thnad_chi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_jogg;1",
+          "@id": "dtmi:example:thnad_upsilon;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 466,
-              "name": "glikk_flunn"
+              "enumValue": 475,
+              "name": "thnad_phi"
             }
           ],
           "valueSchema": "dtmi:dtdl:instance:Schema:long;2"
@@ -1632,15 +1632,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_hi;1",
+        "@id": "dtmi:example:thnad_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_yekk;1",
+          "@id": "dtmi:example:thnad_psi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 467,
-              "name": "glikk_vroo"
+              "enumValue": 476,
+              "name": "thnad_omega"
             }
           ],
           "valueSchema": "time"
@@ -1656,16 +1656,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_gamma;1",
+        "@id": "dtmi:example:thnad_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_alpha;1",
+          "@id": "dtmi:example:thnad_wum;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 468,
-              "name": "nuh_beta"
+              "enumValue": 477,
+              "name": "thnad_um"
             }
           ],
           "valueSchema": "time"
@@ -1681,15 +1681,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_zeta;1",
+        "@id": "dtmi:example:thnad_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_delta;1",
+          "@id": "dtmi:example:thnad_fuddle;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 469,
-              "name": "nuh_epsilon"
+              "enumValue": 478,
+              "name": "thnad_glikk"
             }
           ],
           "valueSchema": "dtmi:dtdl:instance:Schema:time;2"
@@ -1705,16 +1705,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_iota;1",
+        "@id": "dtmi:example:thnad_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_eta;1",
+          "@id": "dtmi:example:thnad_snee;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 470,
-              "name": "nuh_theta"
+              "enumValue": 479,
+              "name": "thnad_quan"
             }
           ],
           "valueSchema": "dtmi:dtdl:instance:Schema:time;2"
@@ -1730,15 +1730,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_mu;1",
+        "@id": "dtmi:example:thnad_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_kappa;1",
+          "@id": "dtmi:example:thnad_spazz;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 471,
-              "name": "nuh_lambda"
+              "enumValue": 480,
+              "name": "thnad_floob"
             }
           ],
           "valueSchema": "geopoint"
@@ -1754,16 +1754,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_omicron;1",
+        "@id": "dtmi:example:thnad_itch;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_nu;1",
+          "@id": "dtmi:example:thnad_jogg;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 472,
-              "name": "nuh_xi"
+              "enumValue": 481,
+              "name": "thnad_flunn"
             }
           ],
           "valueSchema": "geopoint"
@@ -1779,15 +1779,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_sigma;1",
+        "@id": "dtmi:example:thnad_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_pi;1",
+          "@id": "dtmi:example:thnad_yekk;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 473,
-              "name": "nuh_rho"
+              "enumValue": 482,
+              "name": "thnad_vroo"
             }
           ],
           "valueSchema": "dtmi:iotcentral:schema:geopoint;2"
@@ -1803,16 +1803,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_phi;1",
+        "@id": "dtmi:example:spazz_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_tau;1",
+          "@id": "dtmi:example:spazz_alpha;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 474,
-              "name": "nuh_upsilon"
+              "enumValue": 483,
+              "name": "spazz_beta"
             }
           ],
           "valueSchema": "dtmi:iotcentral:schema:geopoint;2"
@@ -1828,15 +1828,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_omega;1",
+        "@id": "dtmi:example:spazz_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_chi;1",
+          "@id": "dtmi:example:spazz_delta;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 475,
-              "name": "nuh_psi"
+              "enumValue": 484,
+              "name": "spazz_epsilon"
             }
           ],
           "valueSchema": "vector"
@@ -1852,16 +1852,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_um;1",
+        "@id": "dtmi:example:spazz_iota;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_yuzz;1",
+          "@id": "dtmi:example:spazz_eta;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 476,
-              "name": "nuh_wum"
+              "enumValue": 485,
+              "name": "spazz_theta"
             }
           ],
           "valueSchema": "vector"
@@ -1877,15 +1877,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_glikk;1",
+        "@id": "dtmi:example:spazz_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_humpf;1",
+          "@id": "dtmi:example:spazz_kappa;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 477,
-              "name": "nuh_fuddle"
+              "enumValue": 486,
+              "name": "spazz_lambda"
             }
           ],
           "valueSchema": "dtmi:iotcentral:schema:vector;2"
@@ -1901,16 +1901,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_quan;1",
+        "@id": "dtmi:example:spazz_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_nuh;1",
+          "@id": "dtmi:example:spazz_nu;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 478,
-              "name": "nuh_snee"
+              "enumValue": 487,
+              "name": "spazz_xi"
             }
           ],
           "valueSchema": "dtmi:iotcentral:schema:vector;2"
@@ -1926,15 +1926,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_floob;1",
+        "@id": "dtmi:example:spazz_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_thnad;1",
+          "@id": "dtmi:example:spazz_pi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 479,
-              "name": "nuh_spazz"
+              "enumValue": 488,
+              "name": "spazz_rho"
             }
           ],
           "valueSchema": "lineString"
@@ -1950,16 +1950,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_flunn;1",
+        "@id": "dtmi:example:spazz_phi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_zatz;1",
+          "@id": "dtmi:example:spazz_tau;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 480,
-              "name": "nuh_jogg"
+              "enumValue": 489,
+              "name": "spazz_upsilon"
             }
           ],
           "valueSchema": "lineString"
@@ -1975,15 +1975,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_vroo;1",
+        "@id": "dtmi:example:spazz_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_itch;1",
+          "@id": "dtmi:example:spazz_chi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 481,
-              "name": "nuh_yekk"
+              "enumValue": 490,
+              "name": "spazz_psi"
             }
           ],
           "valueSchema": "dtmi:standard:schema:geospatial:lineString;2"
@@ -1999,16 +1999,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_beta;1",
+        "@id": "dtmi:example:spazz_um;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_hi;1",
+          "@id": "dtmi:example:spazz_yuzz;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 482,
-              "name": "snee_alpha"
+              "enumValue": 491,
+              "name": "spazz_wum"
             }
           ],
           "valueSchema": "dtmi:standard:schema:geospatial:lineString;2"
@@ -2024,15 +2024,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_epsilon;1",
+        "@id": "dtmi:example:spazz_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_gamma;1",
+          "@id": "dtmi:example:spazz_humpf;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 483,
-              "name": "snee_delta"
+              "enumValue": 492,
+              "name": "spazz_fuddle"
             }
           ],
           "valueSchema": "multiLineString"
@@ -2048,16 +2048,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_theta;1",
+        "@id": "dtmi:example:spazz_quan;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:snee_zeta;1",
+          "@id": "dtmi:example:spazz_nuh;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 484,
-              "name": "snee_eta"
+              "enumValue": 493,
+              "name": "spazz_snee"
             }
           ],
           "valueSchema": "multiLineString"
@@ -2073,15 +2073,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_lambda;1",
+        "@id": "dtmi:example:spazz_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_iota;1",
+          "@id": "dtmi:example:spazz_thnad;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 485,
-              "name": "snee_kappa"
+              "enumValue": 494,
+              "name": "spazz_spazz"
             }
           ],
           "valueSchema": "dtmi:standard:schema:geospatial:multiLineString;2"
@@ -2097,16 +2097,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_xi;1",
+        "@id": "dtmi:example:spazz_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:snee_mu;1",
+          "@id": "dtmi:example:spazz_zatz;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 486,
-              "name": "snee_nu"
+              "enumValue": 495,
+              "name": "spazz_jogg"
             }
           ],
           "valueSchema": "dtmi:standard:schema:geospatial:multiLineString;2"
@@ -2122,15 +2122,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_rho;1",
+        "@id": "dtmi:example:spazz_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_omicron;1",
+          "@id": "dtmi:example:spazz_itch;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 487,
-              "name": "snee_pi"
+              "enumValue": 496,
+              "name": "spazz_yekk"
             }
           ],
           "valueSchema": "multiPoint"
@@ -2146,16 +2146,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_upsilon;1",
+        "@id": "dtmi:example:floob_beta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:snee_sigma;1",
+          "@id": "dtmi:example:spazz_hi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 488,
-              "name": "snee_tau"
+              "enumValue": 497,
+              "name": "floob_alpha"
             }
           ],
           "valueSchema": "multiPoint"
@@ -2171,15 +2171,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_psi;1",
+        "@id": "dtmi:example:floob_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_phi;1",
+          "@id": "dtmi:example:floob_gamma;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 489,
-              "name": "snee_chi"
+              "enumValue": 498,
+              "name": "floob_delta"
             }
           ],
           "valueSchema": "dtmi:standard:schema:geospatial:multiPoint;2"
@@ -2195,16 +2195,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_wum;1",
+        "@id": "dtmi:example:floob_theta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:snee_omega;1",
+          "@id": "dtmi:example:floob_zeta;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 490,
-              "name": "snee_yuzz"
+              "enumValue": 499,
+              "name": "floob_eta"
             }
           ],
           "valueSchema": "dtmi:standard:schema:geospatial:multiPoint;2"
@@ -2220,15 +2220,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_fuddle;1",
+        "@id": "dtmi:example:floob_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_um;1",
+          "@id": "dtmi:example:floob_iota;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 491,
-              "name": "snee_humpf"
+              "enumValue": 500,
+              "name": "floob_kappa"
             }
           ],
           "valueSchema": "multiPolygon"
@@ -2244,16 +2244,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_snee;1",
+        "@id": "dtmi:example:floob_xi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:snee_glikk;1",
+          "@id": "dtmi:example:floob_mu;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 492,
-              "name": "snee_nuh"
+              "enumValue": 501,
+              "name": "floob_nu"
             }
           ],
           "valueSchema": "multiPolygon"
@@ -2269,15 +2269,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_spazz;1",
+        "@id": "dtmi:example:floob_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_quan;1",
+          "@id": "dtmi:example:floob_omicron;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 493,
-              "name": "snee_thnad"
+              "enumValue": 502,
+              "name": "floob_pi"
             }
           ],
           "valueSchema": "dtmi:standard:schema:geospatial:multiPolygon;2"
@@ -2293,16 +2293,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_jogg;1",
+        "@id": "dtmi:example:floob_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:snee_floob;1",
+          "@id": "dtmi:example:floob_sigma;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 494,
-              "name": "snee_zatz"
+              "enumValue": 503,
+              "name": "floob_tau"
             }
           ],
           "valueSchema": "dtmi:standard:schema:geospatial:multiPolygon;2"
@@ -2318,15 +2318,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_yekk;1",
+        "@id": "dtmi:example:floob_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_flunn;1",
+          "@id": "dtmi:example:floob_phi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 495,
-              "name": "snee_itch"
+              "enumValue": 504,
+              "name": "floob_chi"
             }
           ],
           "valueSchema": "point"
@@ -2342,16 +2342,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_alpha;1",
+        "@id": "dtmi:example:floob_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:snee_vroo;1",
+          "@id": "dtmi:example:floob_omega;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 496,
-              "name": "snee_hi"
+              "enumValue": 505,
+              "name": "floob_yuzz"
             }
           ],
           "valueSchema": "point"
@@ -2367,15 +2367,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_delta;1",
+        "@id": "dtmi:example:floob_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_beta;1",
+          "@id": "dtmi:example:floob_um;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 497,
-              "name": "quan_gamma"
+              "enumValue": 506,
+              "name": "floob_humpf"
             }
           ],
           "valueSchema": "dtmi:standard:schema:geospatial:point;2"
@@ -2391,16 +2391,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_eta;1",
+        "@id": "dtmi:example:floob_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:quan_epsilon;1",
+          "@id": "dtmi:example:floob_glikk;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 498,
-              "name": "quan_zeta"
+              "enumValue": 507,
+              "name": "floob_nuh"
             }
           ],
           "valueSchema": "dtmi:standard:schema:geospatial:point;2"
@@ -2416,15 +2416,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_kappa;1",
+        "@id": "dtmi:example:floob_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_theta;1",
+          "@id": "dtmi:example:floob_quan;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 499,
-              "name": "quan_iota"
+              "enumValue": 508,
+              "name": "floob_thnad"
             }
           ],
           "valueSchema": "polygon"
@@ -2440,16 +2440,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_nu;1",
+        "@id": "dtmi:example:floob_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:quan_lambda;1",
+          "@id": "dtmi:example:floob_floob;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 500,
-              "name": "quan_mu"
+              "enumValue": 509,
+              "name": "floob_zatz"
             }
           ],
           "valueSchema": "polygon"
@@ -2465,15 +2465,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_pi;1",
+        "@id": "dtmi:example:floob_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_xi;1",
+          "@id": "dtmi:example:floob_flunn;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 501,
-              "name": "quan_omicron"
+              "enumValue": 510,
+              "name": "floob_itch"
             }
           ],
           "valueSchema": "dtmi:standard:schema:geospatial:polygon;2"
@@ -2489,16 +2489,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_tau;1",
+        "@id": "dtmi:example:zatz_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:quan_rho;1",
+          "@id": "dtmi:example:floob_vroo;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 502,
-              "name": "quan_sigma"
+              "enumValue": 511,
+              "name": "floob_hi"
             }
           ],
           "valueSchema": "dtmi:standard:schema:geospatial:polygon;2"
diff --git a/DTDL/v2/spec/Requirement-ClassEnumPropertyValueSchemaTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassEnumPropertyValueSchemaTermAndDtmiV2.json
index 11af26c2..fd9b0917 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumPropertyValueSchemaTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumPropertyValueSchemaTermAndDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_hi;1",
+        "@id": "dtmi:example:zatz_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_yekk;1",
+          "@id": "dtmi:example:zatz_psi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 506,
-              "name": "quan_vroo"
+              "enumValue": 515,
+              "name": "zatz_omega"
             }
           ],
           "valueSchema": "integer",
@@ -32,16 +32,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_gamma;1",
+        "@id": "dtmi:example:zatz_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:thnad_alpha;1",
+          "@id": "dtmi:example:zatz_wum;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 507,
-              "name": "thnad_beta"
+              "enumValue": 516,
+              "name": "zatz_um"
             }
           ],
           "valueSchema": "integer",
diff --git a/DTDL/v2/spec/Requirement-ClassEnumRequiredPropertiesV2.json b/DTDL/v2/spec/Requirement-ClassEnumRequiredPropertiesV2.json
index 96184163..57413e38 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumRequiredPropertiesV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumRequiredPropertiesV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_zeta;1",
+        "@id": "dtmi:example:omicron_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_delta;1",
+          "@id": "dtmi:example:omicron_phi;1",
           "enumValues": [
             {
-              "enumValue": 51,
-              "name": "mu_epsilon"
+              "enumValue": 58,
+              "name": "omicron_chi"
             }
           ],
           "valueSchema": "integer"
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_iota;1",
+        "@id": "dtmi:example:omicron_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:mu_eta;1",
+          "@id": "dtmi:example:omicron_omega;1",
           "enumValues": [
             {
-              "enumValue": 52,
-              "name": "mu_theta"
+              "enumValue": 59,
+              "name": "omicron_yuzz"
             }
           ],
           "valueSchema": "integer"
@@ -54,10 +54,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_lambda;1",
+        "@id": "dtmi:example:omicron_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_kappa;1",
+          "@id": "dtmi:example:omicron_um;1",
           "@type": "Enum",
           "valueSchema": "integer"
         }
@@ -72,11 +72,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_nu;1",
+        "@id": "dtmi:example:omicron_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:mu_mu;1",
+          "@id": "dtmi:example:omicron_fuddle;1",
           "@type": "Enum",
           "valueSchema": "integer"
         }
@@ -91,15 +91,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_pi;1",
+        "@id": "dtmi:example:omicron_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_xi;1",
+          "@id": "dtmi:example:omicron_nuh;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 53,
-              "name": "mu_omicron"
+              "enumValue": 60,
+              "name": "omicron_snee"
             }
           ]
         }
@@ -114,16 +114,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_tau;1",
+        "@id": "dtmi:example:omicron_floob;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:mu_rho;1",
+          "@id": "dtmi:example:omicron_thnad;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 54,
-              "name": "mu_sigma"
+              "enumValue": 61,
+              "name": "omicron_spazz"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumTypeIncludesInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassEnumTypeIncludesInvalidDtmiV2.json
index 3776e345..19494a44 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumTypeIncludesInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumTypeIncludesInvalidDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_spazz;1",
+        "@id": "dtmi:example:sigma_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_quan;1",
+          "@id": "dtmi:example:sigma_eta;1",
           "@type": [
             "Enum",
             "dtmi:foo//bar"
           ],
           "enumValues": [
             {
-              "enumValue": 88,
-              "name": "xi_thnad"
+              "enumValue": 95,
+              "name": "sigma_theta"
             }
           ],
           "valueSchema": "integer"
@@ -34,19 +34,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_jogg;1",
+        "@id": "dtmi:example:sigma_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:xi_floob;1",
+          "@id": "dtmi:example:sigma_kappa;1",
           "@type": [
             "Enum",
             "dtmi:foo//bar"
           ],
           "enumValues": [
             {
-              "enumValue": 89,
-              "name": "xi_zatz"
+              "enumValue": 96,
+              "name": "sigma_lambda"
             }
           ],
           "valueSchema": "integer"
diff --git a/DTDL/v2/spec/Requirement-ClassEnumTypeIncludesMaterialV2.json b/DTDL/v2/spec/Requirement-ClassEnumTypeIncludesMaterialV2.json
index 19deb1aa..cb593259 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumTypeIncludesMaterialV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumTypeIncludesMaterialV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_um;1",
+        "@id": "dtmi:example:rho_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_yuzz;1",
+          "@id": "dtmi:example:pi_vroo;1",
           "enumValues": [
             {
-              "enumValue": 71,
-              "name": "nu_wum"
+              "enumValue": 78,
+              "name": "pi_hi"
             }
           ],
           "valueSchema": "integer",
@@ -31,14 +31,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_glikk;1",
+        "@id": "dtmi:example:rho_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_humpf;1",
+          "@id": "dtmi:example:rho_beta;1",
           "enumValues": [
             {
-              "enumValue": 72,
-              "name": "nu_fuddle"
+              "enumValue": 79,
+              "name": "rho_gamma"
             }
           ],
           "valueSchema": "integer",
@@ -57,14 +57,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_quan;1",
+        "@id": "dtmi:example:rho_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_nuh;1",
+          "@id": "dtmi:example:rho_epsilon;1",
           "enumValues": [
             {
-              "enumValue": 73,
-              "name": "nu_snee"
+              "enumValue": 80,
+              "name": "rho_zeta"
             }
           ],
           "valueSchema": "integer",
@@ -81,14 +81,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_floob;1",
+        "@id": "dtmi:example:rho_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_thnad;1",
+          "@id": "dtmi:example:rho_theta;1",
           "enumValues": [
             {
-              "enumValue": 74,
-              "name": "nu_spazz"
+              "enumValue": 81,
+              "name": "rho_iota"
             }
           ],
           "valueSchema": "integer",
@@ -107,14 +107,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_flunn;1",
+        "@id": "dtmi:example:rho_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_zatz;1",
+          "@id": "dtmi:example:rho_lambda;1",
           "enumValues": [
             {
-              "enumValue": 75,
-              "name": "nu_jogg"
+              "enumValue": 82,
+              "name": "rho_mu"
             }
           ],
           "valueSchema": "integer",
@@ -131,15 +131,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_vroo;1",
+        "@id": "dtmi:example:rho_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nu_itch;1",
+          "@id": "dtmi:example:rho_xi;1",
           "enumValues": [
             {
-              "enumValue": 76,
-              "name": "nu_yekk"
+              "enumValue": 83,
+              "name": "rho_omicron"
             }
           ],
           "valueSchema": "integer",
@@ -156,14 +156,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_beta;1",
+        "@id": "dtmi:example:rho_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_hi;1",
+          "@id": "dtmi:example:rho_rho;1",
           "enumValues": [
             {
-              "enumValue": 77,
-              "name": "xi_alpha"
+              "enumValue": 84,
+              "name": "rho_sigma"
             }
           ],
           "valueSchema": "integer",
@@ -182,15 +182,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_epsilon;1",
+        "@id": "dtmi:example:rho_chi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:xi_gamma;1",
+          "@id": "dtmi:example:rho_upsilon;1",
           "enumValues": [
             {
-              "enumValue": 78,
-              "name": "xi_delta"
+              "enumValue": 85,
+              "name": "rho_phi"
             }
           ],
           "valueSchema": "integer",
diff --git a/DTDL/v2/spec/Requirement-ClassEnumTypeStringOrArrayV2.json b/DTDL/v2/spec/Requirement-ClassEnumTypeStringOrArrayV2.json
index 43a84e79..3855e6d2 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumTypeStringOrArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumTypeStringOrArrayV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_chi;1",
+        "@id": "dtmi:example:omicron_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_upsilon;1",
+          "@id": "dtmi:example:omicron_zatz;1",
           "enumValues": [
             {
-              "enumValue": 55,
-              "name": "mu_phi"
+              "enumValue": 62,
+              "name": "omicron_jogg"
             }
           ],
           "valueSchema": "integer",
@@ -31,15 +31,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_yuzz;1",
+        "@id": "dtmi:example:omicron_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:mu_psi;1",
+          "@id": "dtmi:example:omicron_itch;1",
           "enumValues": [
             {
-              "enumValue": 56,
-              "name": "mu_omega"
+              "enumValue": 63,
+              "name": "omicron_yekk"
             }
           ],
           "valueSchema": "integer",
@@ -56,14 +56,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_humpf;1",
+        "@id": "dtmi:example:pi_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_wum;1",
+          "@id": "dtmi:example:omicron_hi;1",
           "enumValues": [
             {
-              "enumValue": 57,
-              "name": "mu_um"
+              "enumValue": 64,
+              "name": "pi_alpha"
             }
           ],
           "valueSchema": "integer",
@@ -80,15 +80,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_nuh;1",
+        "@id": "dtmi:example:pi_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:mu_fuddle;1",
+          "@id": "dtmi:example:pi_gamma;1",
           "enumValues": [
             {
-              "enumValue": 58,
-              "name": "mu_glikk"
+              "enumValue": 65,
+              "name": "pi_delta"
             }
           ],
           "valueSchema": "integer",
@@ -105,14 +105,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_thnad;1",
+        "@id": "dtmi:example:pi_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_snee;1",
+          "@id": "dtmi:example:pi_zeta;1",
           "enumValues": [
             {
-              "enumValue": 59,
-              "name": "mu_quan"
+              "enumValue": 66,
+              "name": "pi_eta"
             }
           ],
           "valueSchema": "integer",
@@ -129,15 +129,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_zatz;1",
+        "@id": "dtmi:example:pi_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:mu_spazz;1",
+          "@id": "dtmi:example:pi_iota;1",
           "enumValues": [
             {
-              "enumValue": 60,
-              "name": "mu_floob"
+              "enumValue": 67,
+              "name": "pi_kappa"
             }
           ],
           "valueSchema": "integer",
@@ -154,14 +154,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_itch;1",
+        "@id": "dtmi:example:pi_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_jogg;1",
+          "@id": "dtmi:example:pi_mu;1",
           "enumValues": [
             {
-              "enumValue": 61,
-              "name": "mu_flunn"
+              "enumValue": 68,
+              "name": "pi_nu"
             }
           ],
           "valueSchema": "integer",
@@ -178,15 +178,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_hi;1",
+        "@id": "dtmi:example:pi_rho;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:mu_yekk;1",
+          "@id": "dtmi:example:pi_omicron;1",
           "enumValues": [
             {
-              "enumValue": 62,
-              "name": "mu_vroo"
+              "enumValue": 69,
+              "name": "pi_pi"
             }
           ],
           "valueSchema": "integer",
@@ -203,14 +203,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_gamma;1",
+        "@id": "dtmi:example:pi_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_alpha;1",
+          "@id": "dtmi:example:pi_sigma;1",
           "enumValues": [
             {
-              "enumValue": 63,
-              "name": "nu_beta"
+              "enumValue": 70,
+              "name": "pi_tau"
             }
           ],
           "valueSchema": "integer",
@@ -229,15 +229,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_zeta;1",
+        "@id": "dtmi:example:pi_psi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nu_delta;1",
+          "@id": "dtmi:example:pi_phi;1",
           "enumValues": [
             {
-              "enumValue": 64,
-              "name": "nu_epsilon"
+              "enumValue": 71,
+              "name": "pi_chi"
             }
           ],
           "valueSchema": "integer",
@@ -256,14 +256,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_iota;1",
+        "@id": "dtmi:example:pi_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_eta;1",
+          "@id": "dtmi:example:pi_omega;1",
           "enumValues": [
             {
-              "enumValue": 65,
-              "name": "nu_theta"
+              "enumValue": 72,
+              "name": "pi_yuzz"
             }
           ],
           "valueSchema": "integer",
@@ -282,15 +282,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_mu;1",
+        "@id": "dtmi:example:pi_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nu_kappa;1",
+          "@id": "dtmi:example:pi_um;1",
           "enumValues": [
             {
-              "enumValue": 66,
-              "name": "nu_lambda"
+              "enumValue": 73,
+              "name": "pi_humpf"
             }
           ],
           "valueSchema": "integer",
@@ -309,14 +309,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_omicron;1",
+        "@id": "dtmi:example:pi_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_nu;1",
+          "@id": "dtmi:example:pi_glikk;1",
           "enumValues": [
             {
-              "enumValue": 67,
-              "name": "nu_xi"
+              "enumValue": 74,
+              "name": "pi_nuh"
             }
           ],
           "valueSchema": "integer",
@@ -335,15 +335,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_sigma;1",
+        "@id": "dtmi:example:pi_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nu_pi;1",
+          "@id": "dtmi:example:pi_quan;1",
           "enumValues": [
             {
-              "enumValue": 68,
-              "name": "nu_rho"
+              "enumValue": 75,
+              "name": "pi_thnad"
             }
           ],
           "valueSchema": "integer",
@@ -362,14 +362,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_phi;1",
+        "@id": "dtmi:example:pi_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_tau;1",
+          "@id": "dtmi:example:pi_floob;1",
           "enumValues": [
             {
-              "enumValue": 69,
-              "name": "nu_upsilon"
+              "enumValue": 76,
+              "name": "pi_zatz"
             }
           ],
           "valueSchema": "integer",
@@ -388,15 +388,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_omega;1",
+        "@id": "dtmi:example:pi_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nu_chi;1",
+          "@id": "dtmi:example:pi_flunn;1",
           "enumValues": [
             {
-              "enumValue": 70,
-              "name": "nu_psi"
+              "enumValue": 77,
+              "name": "pi_itch"
             }
           ],
           "valueSchema": "integer",
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValueContextConformsV2.json b/DTDL/v2/spec/Requirement-ClassEnumValueContextConformsV2.json
index cf413131..23cafe1c 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValueContextConformsV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValueContextConformsV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_quan;1",
+        "@id": "dtmi:example:omicron_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "lambda_snee",
+          "name": "omicron_upsilon",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 788,
-              "name": "lambda_nuh",
+              "enumValue": 799,
+              "name": "omicron_tau",
               "@context": "dtmi:iotcentral:context;2"
             }
           }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_floob;1",
+        "@id": "dtmi:example:omicron_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "lambda_spazz",
+          "name": "omicron_psi",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 789,
-              "name": "lambda_thnad",
+              "enumValue": 800,
+              "name": "omicron_chi",
               "@context": []
             }
           }
@@ -59,17 +59,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_flunn;1",
+        "@id": "dtmi:example:omicron_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "lambda_jogg",
+          "name": "omicron_wum",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 790,
-              "name": "lambda_zatz",
+              "enumValue": 801,
+              "name": "omicron_yuzz",
               "@context": [
                 "dtmi:iotcentral:context;2"
               ]
@@ -87,17 +87,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_vroo;1",
+        "@id": "dtmi:example:omicron_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "lambda_yekk",
+          "name": "omicron_fuddle",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 791,
-              "name": "lambda_itch",
+              "enumValue": 802,
+              "name": "omicron_humpf",
               "@context": null
             }
           }
@@ -113,17 +113,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_beta;1",
+        "@id": "dtmi:example:omicron_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_alpha",
+          "name": "omicron_snee",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 792,
-              "name": "lambda_hi",
+              "enumValue": 803,
+              "name": "omicron_nuh",
               "@context": 626
             }
           }
@@ -139,17 +139,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_epsilon;1",
+        "@id": "dtmi:example:omicron_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_delta",
+          "name": "omicron_spazz",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 793,
-              "name": "mu_gamma",
+              "enumValue": 804,
+              "name": "omicron_thnad",
               "@context": true
             }
           }
@@ -165,17 +165,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_theta;1",
+        "@id": "dtmi:example:omicron_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_eta",
+          "name": "omicron_jogg",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 794,
-              "name": "mu_zeta",
+              "enumValue": 805,
+              "name": "omicron_zatz",
               "@context": [
                 null
               ]
@@ -193,17 +193,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_lambda;1",
+        "@id": "dtmi:example:omicron_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_kappa",
+          "name": "omicron_yekk",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 795,
-              "name": "mu_iota",
+              "enumValue": 806,
+              "name": "omicron_itch",
               "@context": [
                 626
               ]
@@ -221,17 +221,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_xi;1",
+        "@id": "dtmi:example:pi_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_nu",
+          "name": "pi_alpha",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 796,
-              "name": "mu_mu",
+              "enumValue": 807,
+              "name": "omicron_hi",
               "@context": [
                 true
               ]
@@ -249,18 +249,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_rho;1",
+        "@id": "dtmi:example:pi_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_pi",
+          "name": "pi_delta",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 797,
-              "name": "mu_omicron",
-              "@context": {}
+              "enumValue": 808,
+              "name": "pi_gamma",
+              "@context": "dtmi:iotcentral:context"
             }
           }
         }
@@ -275,20 +275,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_upsilon;1",
+        "@id": "dtmi:example:pi_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_tau",
+          "name": "pi_eta",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 798,
-              "name": "mu_sigma",
-              "@context": [
-                {}
-              ]
+              "enumValue": 809,
+              "name": "pi_zeta",
+              "@context": "http://iotcentral/context/2"
             }
           }
         }
@@ -303,18 +301,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_psi;1",
+        "@id": "dtmi:example:pi_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_chi",
+          "name": "pi_kappa",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 799,
-              "name": "mu_phi",
-              "@context": "dtmi:iotcentral:context"
+              "enumValue": 810,
+              "name": "pi_iota",
+              "@context": "iotcentral;2"
             }
           }
         }
@@ -329,18 +327,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_wum;1",
+        "@id": "dtmi:example:pi_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_yuzz",
+          "name": "pi_nu",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 800,
-              "name": "mu_omega",
-              "@context": "http://iotcentral/context/2"
+              "enumValue": 811,
+              "name": "pi_mu",
+              "@context": {}
             }
           }
         }
@@ -355,18 +353,78 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_fuddle;1",
+        "@id": "dtmi:example:pi_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_humpf",
+          "name": "pi_pi",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 801,
-              "name": "mu_um",
-              "@context": "iotcentral;2"
+              "enumValue": 812,
+              "name": "pi_omicron",
+              "@context": {
+                "foo": "dtmi:foo:bar;1"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:pi_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "pi_tau",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "enumValue": 813,
+              "name": "pi_sigma",
+              "@context": [
+                {}
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:pi_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "pi_chi",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "enumValue": 814,
+              "name": "pi_phi",
+              "@context": [
+                {
+                  "foo": "dtmi:foo:bar;1"
+                }
+              ]
             }
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValueGraphKeywordV2.json b/DTDL/v2/spec/Requirement-ClassEnumValueGraphKeywordV2.json
index 55d57c5d..86334f69 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValueGraphKeywordV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValueGraphKeywordV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_beta;1",
+        "@id": "dtmi:example:glikk_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_alpha;1",
+          "@id": "dtmi:example:glikk_jogg;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1000,
-            "name": "wum_hi",
+            "enumValue": 1013,
+            "name": "glikk_zatz",
             "@graph": {}
           }
         }
@@ -30,16 +30,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_epsilon;1",
+        "@id": "dtmi:example:glikk_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_delta;1",
+          "@id": "dtmi:example:glikk_yekk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1001,
-            "name": "um_gamma",
+            "enumValue": 1014,
+            "name": "glikk_itch",
             "@graph": {}
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValueIdDuplicateV2.json b/DTDL/v2/spec/Requirement-ClassEnumValueIdDuplicateV2.json
index d073b4c9..8056a048 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValueIdDuplicateV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValueIdDuplicateV2.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_jogg;1",
+        "@id": "dtmi:example:psi_snee;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:tau_jogg;1",
+          "@id": "dtmi:example:psi_snee;1",
           "@type": "Property",
-          "name": "tau_itch",
+          "name": "psi_thnad",
           "schema": {
-            "@id": "dtmi:example:tau_jogg;1",
+            "@id": "dtmi:example:psi_snee;1",
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "@id": "dtmi:example:tau_jogg;1",
-              "enumValue": 905,
-              "name": "tau_flunn"
+              "@id": "dtmi:example:psi_snee;1",
+              "enumValue": 918,
+              "name": "psi_quan"
             }
           }
         }
@@ -35,21 +35,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_yekk;1",
+        "@id": "dtmi:example:psi_spazz;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:tau_yekk;1",
+          "@id": "dtmi:example:psi_spazz;1",
           "@type": "Property",
-          "name": "tau_hi",
+          "name": "psi_zatz",
           "schema": {
-            "@id": "dtmi:example:tau_yekk;1",
+            "@id": "dtmi:example:psi_spazz;1",
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
               "@context": "dtmi:undefinedExtension:context;1",
-              "@id": "dtmi:example:tau_yekk;1",
-              "enumValue": 906,
-              "name": "tau_vroo"
+              "@id": "dtmi:example:psi_spazz;1",
+              "enumValue": 919,
+              "name": "psi_floob"
             }
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValueIdIsDtmiV2.json b/DTDL/v2/spec/Requirement-ClassEnumValueIdIsDtmiV2.json
index e450b7f1..160d8d76 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValueIdIsDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValueIdIsDtmiV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_xi;1",
+        "@id": "dtmi:example:tau_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_nu;1",
+          "@id": "dtmi:example:tau_eta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;7",
-            "enumValue": 839,
-            "name": "omicron_mu"
+            "enumValue": 852,
+            "name": "tau_zeta"
           }
         }
       }
@@ -30,16 +30,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_rho;1",
+        "@id": "dtmi:example:tau_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_pi;1",
+          "@id": "dtmi:example:tau_kappa;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;108675309",
-            "enumValue": 840,
-            "name": "omicron_omicron"
+            "enumValue": 853,
+            "name": "tau_iota"
           }
         }
       }
@@ -53,16 +53,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_upsilon;1",
+        "@id": "dtmi:example:tau_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_tau;1",
+          "@id": "dtmi:example:tau_nu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;999999999",
-            "enumValue": 841,
-            "name": "omicron_sigma"
+            "enumValue": 854,
+            "name": "tau_mu"
           }
         }
       }
@@ -76,16 +76,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_psi;1",
+        "@id": "dtmi:example:tau_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_chi;1",
+          "@id": "dtmi:example:tau_pi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo;1",
-            "enumValue": 842,
-            "name": "omicron_phi"
+            "enumValue": 855,
+            "name": "tau_omicron"
           }
         }
       }
@@ -99,16 +99,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_wum;1",
+        "@id": "dtmi:example:tau_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_yuzz;1",
+          "@id": "dtmi:example:tau_tau;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": null,
-            "enumValue": 843,
-            "name": "omicron_omega"
+            "enumValue": 856,
+            "name": "tau_sigma"
           }
         }
       }
@@ -122,17 +122,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_fuddle;1",
+        "@id": "dtmi:example:tau_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_humpf;1",
+          "@id": "dtmi:example:tau_chi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": null,
-            "enumValue": 844,
-            "name": "omicron_um"
+            "enumValue": 857,
+            "name": "tau_phi"
           }
         }
       }
@@ -146,16 +146,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_snee;1",
+        "@id": "dtmi:example:tau_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_nuh;1",
+          "@id": "dtmi:example:tau_yuzz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": 626,
-            "enumValue": 845,
-            "name": "omicron_glikk"
+            "enumValue": 858,
+            "name": "tau_omega"
           }
         }
       }
@@ -169,17 +169,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_spazz;1",
+        "@id": "dtmi:example:tau_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_thnad;1",
+          "@id": "dtmi:example:tau_humpf;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": 626,
-            "enumValue": 846,
-            "name": "omicron_quan"
+            "enumValue": 859,
+            "name": "tau_um"
           }
         }
       }
@@ -193,16 +193,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_jogg;1",
+        "@id": "dtmi:example:tau_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_zatz;1",
+          "@id": "dtmi:example:tau_nuh;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": true,
-            "enumValue": 847,
-            "name": "omicron_floob"
+            "enumValue": 860,
+            "name": "tau_glikk"
           }
         }
       }
@@ -216,17 +216,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_yekk;1",
+        "@id": "dtmi:example:tau_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_itch;1",
+          "@id": "dtmi:example:tau_thnad;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": true,
-            "enumValue": 848,
-            "name": "omicron_flunn"
+            "enumValue": 861,
+            "name": "tau_quan"
           }
         }
       }
@@ -240,18 +240,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_alpha;1",
+        "@id": "dtmi:example:tau_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_hi;1",
+          "@id": "dtmi:example:tau_zatz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": {
               "@value": "dtmi:apparently:valid:identifier;3"
             },
-            "enumValue": 849,
-            "name": "omicron_vroo"
+            "enumValue": 862,
+            "name": "tau_floob"
           }
         }
       }
@@ -265,10 +265,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_delta;1",
+        "@id": "dtmi:example:tau_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_gamma;1",
+          "@id": "dtmi:example:tau_itch;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -276,8 +276,8 @@
             "@id": {
               "@value": "dtmi:apparently:valid:identifier;3"
             },
-            "enumValue": 850,
-            "name": "pi_beta"
+            "enumValue": 863,
+            "name": "tau_flunn"
           }
         }
       }
@@ -291,16 +291,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_eta;1",
+        "@id": "dtmi:example:upsilon_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_zeta;1",
+          "@id": "dtmi:example:tau_hi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;0",
-            "enumValue": 851,
-            "name": "pi_epsilon"
+            "enumValue": 864,
+            "name": "tau_vroo"
           }
         }
       }
@@ -314,17 +314,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_kappa;1",
+        "@id": "dtmi:example:upsilon_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_iota;1",
+          "@id": "dtmi:example:upsilon_gamma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0",
-            "enumValue": 852,
-            "name": "pi_theta"
+            "enumValue": 865,
+            "name": "upsilon_beta"
           }
         }
       }
@@ -338,16 +338,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_nu;1",
+        "@id": "dtmi:example:upsilon_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_mu;1",
+          "@id": "dtmi:example:upsilon_zeta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;0.0",
-            "enumValue": 853,
-            "name": "pi_lambda"
+            "enumValue": 866,
+            "name": "upsilon_epsilon"
           }
         }
       }
@@ -361,17 +361,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_pi;1",
+        "@id": "dtmi:example:upsilon_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_omicron;1",
+          "@id": "dtmi:example:upsilon_iota;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0.0",
-            "enumValue": 854,
-            "name": "pi_xi"
+            "enumValue": 867,
+            "name": "upsilon_theta"
           }
         }
       }
@@ -385,16 +385,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_tau;1",
+        "@id": "dtmi:example:upsilon_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_sigma;1",
+          "@id": "dtmi:example:upsilon_mu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;1234567890",
-            "enumValue": 855,
-            "name": "pi_rho"
+            "enumValue": 868,
+            "name": "upsilon_lambda"
           }
         }
       }
@@ -408,17 +408,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_chi;1",
+        "@id": "dtmi:example:upsilon_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_phi;1",
+          "@id": "dtmi:example:upsilon_omicron;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;1234567890",
-            "enumValue": 856,
-            "name": "pi_upsilon"
+            "enumValue": 869,
+            "name": "upsilon_xi"
           }
         }
       }
@@ -432,16 +432,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_yuzz;1",
+        "@id": "dtmi:example:upsilon_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_omega;1",
+          "@id": "dtmi:example:upsilon_sigma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;1a",
-            "enumValue": 857,
-            "name": "pi_psi"
+            "enumValue": 870,
+            "name": "upsilon_rho"
           }
         }
       }
@@ -455,17 +455,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_humpf;1",
+        "@id": "dtmi:example:upsilon_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_um;1",
+          "@id": "dtmi:example:upsilon_phi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;1a",
-            "enumValue": 858,
-            "name": "pi_wum"
+            "enumValue": 871,
+            "name": "upsilon_upsilon"
           }
         }
       }
@@ -479,16 +479,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_nuh;1",
+        "@id": "dtmi:example:upsilon_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_glikk;1",
+          "@id": "dtmi:example:upsilon_omega;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;3.0",
-            "enumValue": 859,
-            "name": "pi_fuddle"
+            "enumValue": 872,
+            "name": "upsilon_psi"
           }
         }
       }
@@ -502,17 +502,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_thnad;1",
+        "@id": "dtmi:example:upsilon_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_quan;1",
+          "@id": "dtmi:example:upsilon_um;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.0",
-            "enumValue": 860,
-            "name": "pi_snee"
+            "enumValue": 873,
+            "name": "upsilon_wum"
           }
         }
       }
@@ -526,16 +526,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_zatz;1",
+        "@id": "dtmi:example:upsilon_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_floob;1",
+          "@id": "dtmi:example:upsilon_glikk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;3.1415926",
-            "enumValue": 861,
-            "name": "pi_spazz"
+            "enumValue": 874,
+            "name": "upsilon_fuddle"
           }
         }
       }
@@ -549,17 +549,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_itch;1",
+        "@id": "dtmi:example:upsilon_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_flunn;1",
+          "@id": "dtmi:example:upsilon_quan;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.1415926",
-            "enumValue": 862,
-            "name": "pi_jogg"
+            "enumValue": 875,
+            "name": "upsilon_snee"
           }
         }
       }
@@ -573,16 +573,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_hi;1",
+        "@id": "dtmi:example:upsilon_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_vroo;1",
+          "@id": "dtmi:example:upsilon_floob;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;6.02",
-            "enumValue": 863,
-            "name": "pi_yekk"
+            "enumValue": 876,
+            "name": "upsilon_spazz"
           }
         }
       }
@@ -596,17 +596,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_gamma;1",
+        "@id": "dtmi:example:upsilon_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_beta;1",
+          "@id": "dtmi:example:upsilon_flunn;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;6.02",
-            "enumValue": 864,
-            "name": "rho_alpha"
+            "enumValue": 877,
+            "name": "upsilon_jogg"
           }
         }
       }
@@ -620,16 +620,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_zeta;1",
+        "@id": "dtmi:example:upsilon_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_epsilon;1",
+          "@id": "dtmi:example:upsilon_vroo;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;0.1",
-            "enumValue": 865,
-            "name": "rho_delta"
+            "enumValue": 878,
+            "name": "upsilon_yekk"
           }
         }
       }
@@ -643,17 +643,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_iota;1",
+        "@id": "dtmi:example:phi_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_theta;1",
+          "@id": "dtmi:example:phi_beta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0.1",
-            "enumValue": 866,
-            "name": "rho_eta"
+            "enumValue": 879,
+            "name": "phi_alpha"
           }
         }
       }
@@ -667,16 +667,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_mu;1",
+        "@id": "dtmi:example:phi_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_lambda;1",
+          "@id": "dtmi:example:phi_epsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;01",
-            "enumValue": 867,
-            "name": "rho_kappa"
+            "enumValue": 880,
+            "name": "phi_delta"
           }
         }
       }
@@ -690,17 +690,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_omicron;1",
+        "@id": "dtmi:example:phi_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_xi;1",
+          "@id": "dtmi:example:phi_theta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;01",
-            "enumValue": 868,
-            "name": "rho_nu"
+            "enumValue": 881,
+            "name": "phi_eta"
           }
         }
       }
@@ -714,16 +714,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_sigma;1",
+        "@id": "dtmi:example:phi_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_rho;1",
+          "@id": "dtmi:example:phi_lambda;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;",
-            "enumValue": 869,
-            "name": "rho_pi"
+            "enumValue": 882,
+            "name": "phi_kappa"
           }
         }
       }
@@ -737,17 +737,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_phi;1",
+        "@id": "dtmi:example:phi_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_upsilon;1",
+          "@id": "dtmi:example:phi_xi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;",
-            "enumValue": 870,
-            "name": "rho_tau"
+            "enumValue": 883,
+            "name": "phi_nu"
           }
         }
       }
@@ -761,16 +761,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_omega;1",
+        "@id": "dtmi:example:phi_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_psi;1",
+          "@id": "dtmi:example:phi_rho;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:test:invalidId_;1",
-            "enumValue": 871,
-            "name": "rho_chi"
+            "enumValue": 884,
+            "name": "phi_pi"
           }
         }
       }
@@ -784,17 +784,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_um;1",
+        "@id": "dtmi:example:phi_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_wum;1",
+          "@id": "dtmi:example:phi_upsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:invalidId_;1",
-            "enumValue": 872,
-            "name": "rho_yuzz"
+            "enumValue": 885,
+            "name": "phi_tau"
           }
         }
       }
@@ -808,16 +808,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_glikk;1",
+        "@id": "dtmi:example:phi_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_fuddle;1",
+          "@id": "dtmi:example:phi_psi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:test:_invalidUserId;1",
-            "enumValue": 873,
-            "name": "rho_humpf"
+            "enumValue": 886,
+            "name": "phi_chi"
           }
         }
       }
@@ -831,17 +831,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_quan;1",
+        "@id": "dtmi:example:phi_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_snee;1",
+          "@id": "dtmi:example:phi_wum;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:_invalidUserId;1",
-            "enumValue": 874,
-            "name": "rho_nuh"
+            "enumValue": 887,
+            "name": "phi_yuzz"
           }
         }
       }
@@ -855,16 +855,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_floob;1",
+        "@id": "dtmi:example:phi_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_spazz;1",
+          "@id": "dtmi:example:phi_fuddle;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:test:1seg;1",
-            "enumValue": 875,
-            "name": "rho_thnad"
+            "enumValue": 888,
+            "name": "phi_humpf"
           }
         }
       }
@@ -878,17 +878,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_flunn;1",
+        "@id": "dtmi:example:phi_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_jogg;1",
+          "@id": "dtmi:example:phi_snee;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:1seg;1",
-            "enumValue": 876,
-            "name": "rho_zatz"
+            "enumValue": 889,
+            "name": "phi_nuh"
           }
         }
       }
@@ -902,16 +902,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_vroo;1",
+        "@id": "dtmi:example:phi_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_yekk;1",
+          "@id": "dtmi:example:phi_spazz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar.baz;1",
-            "enumValue": 877,
-            "name": "rho_itch"
+            "enumValue": 890,
+            "name": "phi_thnad"
           }
         }
       }
@@ -925,17 +925,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_beta;1",
+        "@id": "dtmi:example:phi_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_alpha;1",
+          "@id": "dtmi:example:phi_jogg;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar.baz;1",
-            "enumValue": 878,
-            "name": "rho_hi"
+            "enumValue": 891,
+            "name": "phi_zatz"
           }
         }
       }
@@ -949,16 +949,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_epsilon;1",
+        "@id": "dtmi:example:phi_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_delta;1",
+          "@id": "dtmi:example:phi_yekk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo::bar;1",
-            "enumValue": 879,
-            "name": "sigma_gamma"
+            "enumValue": 892,
+            "name": "phi_itch"
           }
         }
       }
@@ -972,17 +972,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_theta;1",
+        "@id": "dtmi:example:chi_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_eta;1",
+          "@id": "dtmi:example:chi_alpha;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo::bar;1",
-            "enumValue": 880,
-            "name": "sigma_zeta"
+            "enumValue": 893,
+            "name": "phi_hi"
           }
         }
       }
@@ -996,16 +996,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_lambda;1",
+        "@id": "dtmi:example:chi_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_kappa;1",
+          "@id": "dtmi:example:chi_delta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "urn:foo:bar:1",
-            "enumValue": 881,
-            "name": "sigma_iota"
+            "enumValue": 894,
+            "name": "chi_gamma"
           }
         }
       }
@@ -1019,17 +1019,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_xi;1",
+        "@id": "dtmi:example:chi_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_nu;1",
+          "@id": "dtmi:example:chi_eta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "urn:foo:bar:1",
-            "enumValue": 882,
-            "name": "sigma_mu"
+            "enumValue": 895,
+            "name": "chi_zeta"
           }
         }
       }
@@ -1043,16 +1043,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_rho;1",
+        "@id": "dtmi:example:chi_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_pi;1",
+          "@id": "dtmi:example:chi_kappa;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "http://foo/bar/baz",
-            "enumValue": 883,
-            "name": "sigma_omicron"
+            "enumValue": 896,
+            "name": "chi_iota"
           }
         }
       }
@@ -1066,17 +1066,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_upsilon;1",
+        "@id": "dtmi:example:chi_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_tau;1",
+          "@id": "dtmi:example:chi_nu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "http://foo/bar/baz",
-            "enumValue": 884,
-            "name": "sigma_sigma"
+            "enumValue": 897,
+            "name": "chi_mu"
           }
         }
       }
@@ -1090,16 +1090,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_psi;1",
+        "@id": "dtmi:example:chi_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_chi;1",
+          "@id": "dtmi:example:chi_pi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:;1",
-            "enumValue": 885,
-            "name": "sigma_phi"
+            "enumValue": 898,
+            "name": "chi_omicron"
           }
         }
       }
@@ -1113,17 +1113,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_wum;1",
+        "@id": "dtmi:example:chi_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_yuzz;1",
+          "@id": "dtmi:example:chi_tau;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:;1",
-            "enumValue": 886,
-            "name": "sigma_omega"
+            "enumValue": 899,
+            "name": "chi_sigma"
           }
         }
       }
@@ -1137,16 +1137,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_fuddle;1",
+        "@id": "dtmi:example:chi_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_humpf;1",
+          "@id": "dtmi:example:chi_chi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar",
-            "enumValue": 887,
-            "name": "sigma_um"
+            "enumValue": 900,
+            "name": "chi_phi"
           }
         }
       }
@@ -1160,17 +1160,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_snee;1",
+        "@id": "dtmi:example:chi_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_nuh;1",
+          "@id": "dtmi:example:chi_yuzz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar",
-            "enumValue": 888,
-            "name": "sigma_glikk"
+            "enumValue": 901,
+            "name": "chi_omega"
           }
         }
       }
@@ -1184,16 +1184,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_spazz;1",
+        "@id": "dtmi:example:chi_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_thnad;1",
+          "@id": "dtmi:example:chi_humpf;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;3.14",
-            "enumValue": 889,
-            "name": "sigma_quan"
+            "enumValue": 902,
+            "name": "chi_um"
           }
         }
       }
@@ -1207,17 +1207,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_jogg;1",
+        "@id": "dtmi:example:chi_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_zatz;1",
+          "@id": "dtmi:example:chi_nuh;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.14",
-            "enumValue": 890,
-            "name": "sigma_floob"
+            "enumValue": 903,
+            "name": "chi_glikk"
           }
         }
       }
@@ -1231,16 +1231,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_yekk;1",
+        "@id": "dtmi:example:chi_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_itch;1",
+          "@id": "dtmi:example:chi_thnad;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;3.141592",
-            "enumValue": 891,
-            "name": "sigma_flunn"
+            "enumValue": 904,
+            "name": "chi_quan"
           }
         }
       }
@@ -1254,17 +1254,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_alpha;1",
+        "@id": "dtmi:example:chi_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_hi;1",
+          "@id": "dtmi:example:chi_zatz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.141592",
-            "enumValue": 892,
-            "name": "sigma_vroo"
+            "enumValue": 905,
+            "name": "chi_floob"
           }
         }
       }
@@ -1278,16 +1278,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_delta;1",
+        "@id": "dtmi:example:chi_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_gamma;1",
+          "@id": "dtmi:example:chi_itch;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:dtdl:example;1",
-            "enumValue": 893,
-            "name": "tau_beta"
+            "enumValue": 906,
+            "name": "chi_flunn"
           }
         }
       }
@@ -1301,17 +1301,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_eta;1",
+        "@id": "dtmi:example:psi_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_zeta;1",
+          "@id": "dtmi:example:chi_hi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:dtdl:example;1",
-            "enumValue": 894,
-            "name": "tau_epsilon"
+            "enumValue": 907,
+            "name": "chi_vroo"
           }
         }
       }
@@ -1325,16 +1325,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_kappa;1",
+        "@id": "dtmi:example:psi_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_iota;1",
+          "@id": "dtmi:example:psi_gamma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:standard:example;1",
-            "enumValue": 895,
-            "name": "tau_theta"
+            "enumValue": 908,
+            "name": "psi_beta"
           }
         }
       }
@@ -1348,17 +1348,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_nu;1",
+        "@id": "dtmi:example:psi_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_mu;1",
+          "@id": "dtmi:example:psi_zeta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:standard:example;1",
-            "enumValue": 896,
-            "name": "tau_lambda"
+            "enumValue": 909,
+            "name": "psi_epsilon"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValueIdNotArrayV2.json b/DTDL/v2/spec/Requirement-ClassEnumValueIdNotArrayV2.json
index def4c9f4..94cdb07b 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValueIdNotArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValueIdNotArrayV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_pi;1",
+        "@id": "dtmi:example:psi_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_omicron;1",
+          "@id": "dtmi:example:psi_iota;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": [
               "dtmi:foo:bar;7"
             ],
-            "enumValue": 897,
-            "name": "tau_xi"
+            "enumValue": 910,
+            "name": "psi_theta"
           }
         }
       }
@@ -32,10 +32,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_tau;1",
+        "@id": "dtmi:example:psi_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_sigma;1",
+          "@id": "dtmi:example:psi_mu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -43,8 +43,8 @@
             "@id": [
               "dtmi:foo:bar;7"
             ],
-            "enumValue": 898,
-            "name": "tau_rho"
+            "enumValue": 911,
+            "name": "psi_lambda"
           }
         }
       }
@@ -58,18 +58,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_chi;1",
+        "@id": "dtmi:example:psi_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_phi;1",
+          "@id": "dtmi:example:psi_omicron;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": [
               "dtmi:foo:bar;108675309"
             ],
-            "enumValue": 899,
-            "name": "tau_upsilon"
+            "enumValue": 912,
+            "name": "psi_xi"
           }
         }
       }
@@ -83,10 +83,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_yuzz;1",
+        "@id": "dtmi:example:psi_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_omega;1",
+          "@id": "dtmi:example:psi_sigma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -94,8 +94,8 @@
             "@id": [
               "dtmi:foo:bar;108675309"
             ],
-            "enumValue": 900,
-            "name": "tau_psi"
+            "enumValue": 913,
+            "name": "psi_rho"
           }
         }
       }
@@ -109,18 +109,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_humpf;1",
+        "@id": "dtmi:example:psi_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_um;1",
+          "@id": "dtmi:example:psi_phi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": [
               "dtmi:foo:bar;999999999"
             ],
-            "enumValue": 901,
-            "name": "tau_wum"
+            "enumValue": 914,
+            "name": "psi_upsilon"
           }
         }
       }
@@ -134,10 +134,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_nuh;1",
+        "@id": "dtmi:example:psi_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_glikk;1",
+          "@id": "dtmi:example:psi_omega;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -145,8 +145,8 @@
             "@id": [
               "dtmi:foo:bar;999999999"
             ],
-            "enumValue": 902,
-            "name": "tau_fuddle"
+            "enumValue": 915,
+            "name": "psi_psi"
           }
         }
       }
@@ -160,18 +160,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_thnad;1",
+        "@id": "dtmi:example:psi_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_quan;1",
+          "@id": "dtmi:example:psi_um;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": [
               "dtmi:foo;1"
             ],
-            "enumValue": 903,
-            "name": "tau_snee"
+            "enumValue": 916,
+            "name": "psi_wum"
           }
         }
       }
@@ -185,10 +185,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_zatz;1",
+        "@id": "dtmi:example:psi_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_floob;1",
+          "@id": "dtmi:example:psi_glikk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -196,8 +196,8 @@
             "@id": [
               "dtmi:foo;1"
             ],
-            "enumValue": 904,
-            "name": "tau_spazz"
+            "enumValue": 917,
+            "name": "psi_fuddle"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyCommentStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyCommentStringLengthV2.json
index da5f18f0..84b7cec0 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyCommentStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyCommentStringLengthV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_psi;1",
+        "@id": "dtmi:example:yuzz_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_chi;1",
+          "@id": "dtmi:example:yuzz_pi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 928,
-            "name": "phi_phi",
+            "enumValue": 941,
+            "name": "yuzz_omicron",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
         }
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_wum;1",
+        "@id": "dtmi:example:yuzz_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_yuzz;1",
+          "@id": "dtmi:example:yuzz_tau;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 929,
-            "name": "phi_omega",
+            "enumValue": 942,
+            "name": "yuzz_sigma",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
@@ -53,16 +53,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_fuddle;1",
+        "@id": "dtmi:example:yuzz_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_humpf;1",
+          "@id": "dtmi:example:yuzz_chi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 930,
-            "name": "phi_um",
+            "enumValue": 943,
+            "name": "yuzz_phi",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyCommentStringV2.json b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyCommentStringV2.json
index 8e86760b..84031393 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyCommentStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyCommentStringV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_gamma;1",
+        "@id": "dtmi:example:psi_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_beta;1",
+          "@id": "dtmi:example:psi_flunn;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 907,
-            "name": "upsilon_alpha",
+            "enumValue": 920,
+            "name": "psi_jogg",
             "comment": "hello"
           }
         }
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_zeta;1",
+        "@id": "dtmi:example:psi_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_epsilon;1",
+          "@id": "dtmi:example:psi_vroo;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 908,
-            "name": "upsilon_delta",
+            "enumValue": 921,
+            "name": "psi_yekk",
             "comment": [
               "hello"
             ]
@@ -55,15 +55,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_iota;1",
+        "@id": "dtmi:example:omega_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_theta;1",
+          "@id": "dtmi:example:omega_beta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 909,
-            "name": "upsilon_eta",
+            "enumValue": 922,
+            "name": "omega_alpha",
             "comment": {
               "@value": "hello",
               "@type": "xsd:string"
@@ -81,15 +81,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_mu;1",
+        "@id": "dtmi:example:omega_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_lambda;1",
+          "@id": "dtmi:example:omega_epsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 910,
-            "name": "upsilon_kappa",
+            "enumValue": 923,
+            "name": "omega_delta",
             "comment": [
               {
                 "@value": "hello",
@@ -109,15 +109,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_omicron;1",
+        "@id": "dtmi:example:omega_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_xi;1",
+          "@id": "dtmi:example:omega_theta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 911,
-            "name": "upsilon_nu",
+            "enumValue": 924,
+            "name": "omega_eta",
             "comment": []
           }
         }
@@ -132,15 +132,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_sigma;1",
+        "@id": "dtmi:example:omega_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_rho;1",
+          "@id": "dtmi:example:omega_lambda;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 912,
-            "name": "upsilon_pi",
+            "enumValue": 925,
+            "name": "omega_kappa",
             "comment": null
           }
         }
@@ -155,16 +155,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_phi;1",
+        "@id": "dtmi:example:omega_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_upsilon;1",
+          "@id": "dtmi:example:omega_xi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 913,
-            "name": "upsilon_tau",
+            "enumValue": 926,
+            "name": "omega_nu",
             "comment": null
           }
         }
@@ -179,15 +179,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_omega;1",
+        "@id": "dtmi:example:omega_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_psi;1",
+          "@id": "dtmi:example:omega_rho;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 914,
-            "name": "upsilon_chi",
+            "enumValue": 927,
+            "name": "omega_pi",
             "comment": true
           }
         }
@@ -202,16 +202,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_um;1",
+        "@id": "dtmi:example:omega_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_wum;1",
+          "@id": "dtmi:example:omega_upsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 915,
-            "name": "upsilon_yuzz",
+            "enumValue": 928,
+            "name": "omega_tau",
             "comment": true
           }
         }
@@ -226,15 +226,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_glikk;1",
+        "@id": "dtmi:example:omega_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_fuddle;1",
+          "@id": "dtmi:example:omega_psi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 916,
-            "name": "upsilon_humpf",
+            "enumValue": 929,
+            "name": "omega_chi",
             "comment": 626
           }
         }
@@ -249,16 +249,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_quan;1",
+        "@id": "dtmi:example:omega_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_snee;1",
+          "@id": "dtmi:example:omega_wum;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 917,
-            "name": "upsilon_nuh",
+            "enumValue": 930,
+            "name": "omega_yuzz",
             "comment": 626
           }
         }
@@ -273,15 +273,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_floob;1",
+        "@id": "dtmi:example:omega_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_spazz;1",
+          "@id": "dtmi:example:omega_fuddle;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 918,
-            "name": "upsilon_thnad",
+            "enumValue": 931,
+            "name": "omega_humpf",
             "comment": [
               null
             ]
@@ -298,16 +298,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_flunn;1",
+        "@id": "dtmi:example:omega_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_jogg;1",
+          "@id": "dtmi:example:omega_snee;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 919,
-            "name": "upsilon_zatz",
+            "enumValue": 932,
+            "name": "omega_nuh",
             "comment": [
               null
             ]
@@ -324,15 +324,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_vroo;1",
+        "@id": "dtmi:example:omega_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_yekk;1",
+          "@id": "dtmi:example:omega_spazz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 920,
-            "name": "upsilon_itch",
+            "enumValue": 933,
+            "name": "omega_thnad",
             "comment": [
               true
             ]
@@ -349,16 +349,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_beta;1",
+        "@id": "dtmi:example:omega_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_alpha;1",
+          "@id": "dtmi:example:omega_jogg;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 921,
-            "name": "upsilon_hi",
+            "enumValue": 934,
+            "name": "omega_zatz",
             "comment": [
               true
             ]
@@ -375,15 +375,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_epsilon;1",
+        "@id": "dtmi:example:omega_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_delta;1",
+          "@id": "dtmi:example:omega_yekk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 922,
-            "name": "phi_gamma",
+            "enumValue": 935,
+            "name": "omega_itch",
             "comment": [
               626
             ]
@@ -400,16 +400,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_theta;1",
+        "@id": "dtmi:example:yuzz_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_eta;1",
+          "@id": "dtmi:example:yuzz_alpha;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 923,
-            "name": "phi_zeta",
+            "enumValue": 936,
+            "name": "omega_hi",
             "comment": [
               626
             ]
@@ -426,15 +426,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_lambda;1",
+        "@id": "dtmi:example:yuzz_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_kappa;1",
+          "@id": "dtmi:example:yuzz_delta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 924,
-            "name": "phi_iota",
+            "enumValue": 937,
+            "name": "yuzz_gamma",
             "comment": {}
           }
         }
@@ -449,16 +449,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_xi;1",
+        "@id": "dtmi:example:yuzz_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_nu;1",
+          "@id": "dtmi:example:yuzz_eta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 925,
-            "name": "phi_mu",
+            "enumValue": 938,
+            "name": "yuzz_zeta",
             "comment": {}
           }
         }
@@ -473,15 +473,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_rho;1",
+        "@id": "dtmi:example:yuzz_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_pi;1",
+          "@id": "dtmi:example:yuzz_kappa;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 926,
-            "name": "phi_omicron",
+            "enumValue": 939,
+            "name": "yuzz_iota",
             "comment": [
               {}
             ]
@@ -498,16 +498,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_upsilon;1",
+        "@id": "dtmi:example:yuzz_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_tau;1",
+          "@id": "dtmi:example:yuzz_nu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 927,
-            "name": "phi_sigma",
+            "enumValue": 940,
+            "name": "yuzz_mu",
             "comment": [
               {}
             ]
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyCommentTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyCommentTermAndDtmiV2.json
index a2e3d7c3..70491b26 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyCommentTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyCommentTermAndDtmiV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_gamma;1",
+        "@id": "dtmi:example:yuzz_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_beta;1",
+          "@id": "dtmi:example:yuzz_flunn;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "comment": "phi_vroo",
-            "dtmi:dtdl:property:comment;2": "phi_hi",
-            "enumValue": 934,
-            "name": "chi_alpha"
+            "comment": "yuzz_floob",
+            "dtmi:dtdl:property:comment;2": "yuzz_zatz",
+            "enumValue": 947,
+            "name": "yuzz_jogg"
           }
         }
       }
@@ -31,18 +31,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_theta;1",
+        "@id": "dtmi:example:wum_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_eta;1",
+          "@id": "dtmi:example:wum_alpha;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "comment": "chi_delta",
-            "dtmi:dtdl:property:comment;2": "chi_epsilon",
-            "enumValue": 935,
-            "name": "chi_zeta"
+            "comment": "yuzz_yekk",
+            "dtmi:dtdl:property:comment;2": "yuzz_vroo",
+            "enumValue": 948,
+            "name": "yuzz_hi"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyDescriptionLangStringV2.json b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyDescriptionLangStringV2.json
index 6d77106f..54c788cb 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyDescriptionLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyDescriptionLangStringV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_lambda;1",
+        "@id": "dtmi:example:wum_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_kappa;1",
+          "@id": "dtmi:example:wum_delta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 936,
-            "name": "chi_iota",
+            "enumValue": 949,
+            "name": "wum_gamma",
             "description": "hello"
           }
         }
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_xi;1",
+        "@id": "dtmi:example:wum_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_nu;1",
+          "@id": "dtmi:example:wum_eta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 937,
-            "name": "chi_mu",
+            "enumValue": 950,
+            "name": "wum_zeta",
             "description": [
               "hello"
             ]
@@ -55,15 +55,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_rho;1",
+        "@id": "dtmi:example:wum_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_pi;1",
+          "@id": "dtmi:example:wum_kappa;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 938,
-            "name": "chi_omicron",
+            "enumValue": 951,
+            "name": "wum_iota",
             "description": {
               "en": "hello"
             }
@@ -80,15 +80,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_upsilon;1",
+        "@id": "dtmi:example:wum_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_tau;1",
+          "@id": "dtmi:example:wum_nu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 939,
-            "name": "chi_sigma",
+            "enumValue": 952,
+            "name": "wum_mu",
             "description": [
               {
                 "@value": "hello",
@@ -108,15 +108,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_psi;1",
+        "@id": "dtmi:example:wum_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_chi;1",
+          "@id": "dtmi:example:wum_pi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 940,
-            "name": "chi_phi",
+            "enumValue": 953,
+            "name": "wum_omicron",
             "description": {}
           }
         }
@@ -131,15 +131,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_wum;1",
+        "@id": "dtmi:example:wum_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_yuzz;1",
+          "@id": "dtmi:example:wum_tau;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 941,
-            "name": "chi_omega",
+            "enumValue": 954,
+            "name": "wum_sigma",
             "description": []
           }
         }
@@ -154,15 +154,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_fuddle;1",
+        "@id": "dtmi:example:wum_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_humpf;1",
+          "@id": "dtmi:example:wum_chi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 942,
-            "name": "chi_um",
+            "enumValue": 955,
+            "name": "wum_phi",
             "description": null
           }
         }
@@ -177,16 +177,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_snee;1",
+        "@id": "dtmi:example:wum_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_nuh;1",
+          "@id": "dtmi:example:wum_yuzz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 943,
-            "name": "chi_glikk",
+            "enumValue": 956,
+            "name": "wum_omega",
             "description": null
           }
         }
@@ -201,15 +201,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_spazz;1",
+        "@id": "dtmi:example:wum_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_thnad;1",
+          "@id": "dtmi:example:wum_humpf;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 944,
-            "name": "chi_quan",
+            "enumValue": 957,
+            "name": "wum_um",
             "description": true
           }
         }
@@ -224,16 +224,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_jogg;1",
+        "@id": "dtmi:example:wum_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_zatz;1",
+          "@id": "dtmi:example:wum_nuh;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 945,
-            "name": "chi_floob",
+            "enumValue": 958,
+            "name": "wum_glikk",
             "description": true
           }
         }
@@ -248,15 +248,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_yekk;1",
+        "@id": "dtmi:example:wum_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_itch;1",
+          "@id": "dtmi:example:wum_thnad;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 946,
-            "name": "chi_flunn",
+            "enumValue": 959,
+            "name": "wum_quan",
             "description": 626
           }
         }
@@ -271,16 +271,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_alpha;1",
+        "@id": "dtmi:example:wum_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_hi;1",
+          "@id": "dtmi:example:wum_zatz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 947,
-            "name": "chi_vroo",
+            "enumValue": 960,
+            "name": "wum_floob",
             "description": 626
           }
         }
@@ -295,15 +295,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_delta;1",
+        "@id": "dtmi:example:wum_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_gamma;1",
+          "@id": "dtmi:example:wum_itch;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 948,
-            "name": "psi_beta",
+            "enumValue": 961,
+            "name": "wum_flunn",
             "description": [
               null
             ]
@@ -320,16 +320,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_eta;1",
+        "@id": "dtmi:example:um_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_zeta;1",
+          "@id": "dtmi:example:wum_hi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 949,
-            "name": "psi_epsilon",
+            "enumValue": 962,
+            "name": "wum_vroo",
             "description": [
               null
             ]
@@ -346,15 +346,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_kappa;1",
+        "@id": "dtmi:example:um_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_iota;1",
+          "@id": "dtmi:example:um_gamma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 950,
-            "name": "psi_theta",
+            "enumValue": 963,
+            "name": "um_beta",
             "description": [
               true
             ]
@@ -371,16 +371,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_nu;1",
+        "@id": "dtmi:example:um_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_mu;1",
+          "@id": "dtmi:example:um_zeta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 951,
-            "name": "psi_lambda",
+            "enumValue": 964,
+            "name": "um_epsilon",
             "description": [
               true
             ]
@@ -397,15 +397,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_pi;1",
+        "@id": "dtmi:example:um_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_omicron;1",
+          "@id": "dtmi:example:um_iota;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 952,
-            "name": "psi_xi",
+            "enumValue": 965,
+            "name": "um_theta",
             "description": [
               626
             ]
@@ -422,16 +422,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_tau;1",
+        "@id": "dtmi:example:um_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_sigma;1",
+          "@id": "dtmi:example:um_mu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 953,
-            "name": "psi_rho",
+            "enumValue": 966,
+            "name": "um_lambda",
             "description": [
               626
             ]
@@ -448,15 +448,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_chi;1",
+        "@id": "dtmi:example:um_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_phi;1",
+          "@id": "dtmi:example:um_omicron;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 954,
-            "name": "psi_upsilon",
+            "enumValue": 967,
+            "name": "um_xi",
             "description": [
               {}
             ]
@@ -473,16 +473,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_yuzz;1",
+        "@id": "dtmi:example:um_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_omega;1",
+          "@id": "dtmi:example:um_sigma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 955,
-            "name": "psi_psi",
+            "enumValue": 968,
+            "name": "um_rho",
             "description": [
               {}
             ]
@@ -499,15 +499,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_humpf;1",
+        "@id": "dtmi:example:um_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_um;1",
+          "@id": "dtmi:example:um_phi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 956,
-            "name": "psi_wum",
+            "enumValue": 969,
+            "name": "um_upsilon",
             "description": {
               "@value": "hello",
               "@language": "en"
@@ -525,16 +525,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_nuh;1",
+        "@id": "dtmi:example:um_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_glikk;1",
+          "@id": "dtmi:example:um_omega;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 957,
-            "name": "psi_fuddle",
+            "enumValue": 970,
+            "name": "um_psi",
             "description": {
               "@value": "hello",
               "@language": "en"
@@ -552,15 +552,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_thnad;1",
+        "@id": "dtmi:example:um_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_quan;1",
+          "@id": "dtmi:example:um_um;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 958,
-            "name": "psi_snee",
+            "enumValue": 971,
+            "name": "um_wum",
             "description": [
               {
                 "en": "hello"
@@ -579,16 +579,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_zatz;1",
+        "@id": "dtmi:example:um_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_floob;1",
+          "@id": "dtmi:example:um_glikk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 959,
-            "name": "psi_spazz",
+            "enumValue": 972,
+            "name": "um_fuddle",
             "description": [
               {
                 "en": "hello"
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyDescriptionStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyDescriptionStringLengthV2.json
index 53f803eb..21930d76 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyDescriptionStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyDescriptionStringLengthV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_itch;1",
+        "@id": "dtmi:example:um_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_flunn;1",
+          "@id": "dtmi:example:um_quan;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 960,
-            "name": "psi_jogg",
+            "enumValue": 973,
+            "name": "um_snee",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
         }
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_hi;1",
+        "@id": "dtmi:example:um_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_vroo;1",
+          "@id": "dtmi:example:um_floob;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 961,
-            "name": "psi_yekk",
+            "enumValue": 974,
+            "name": "um_spazz",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
@@ -53,16 +53,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_gamma;1",
+        "@id": "dtmi:example:um_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_beta;1",
+          "@id": "dtmi:example:um_flunn;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 962,
-            "name": "omega_alpha",
+            "enumValue": 975,
+            "name": "um_jogg",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyDescriptionTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyDescriptionTermAndDtmiV2.json
index 83a2f631..96af5db9 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyDescriptionTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyDescriptionTermAndDtmiV2.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_upsilon;1",
+        "@id": "dtmi:example:humpf_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_tau;1",
+          "@id": "dtmi:example:humpf_nu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "description": [
-              "omega_pi"
+              "humpf_kappa"
             ],
             "dtmi:dtdl:property:description;2": [
-              "omega_rho"
+              "humpf_lambda"
             ],
-            "enumValue": 966,
-            "name": "omega_sigma"
+            "enumValue": 979,
+            "name": "humpf_mu"
           }
         }
       }
@@ -35,22 +35,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_yuzz;1",
+        "@id": "dtmi:example:humpf_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_omega;1",
+          "@id": "dtmi:example:humpf_sigma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "description": [
-              "omega_phi"
+              "humpf_omicron"
             ],
             "dtmi:dtdl:property:description;2": [
-              "omega_chi"
+              "humpf_pi"
             ],
-            "enumValue": 967,
-            "name": "omega_psi"
+            "enumValue": 980,
+            "name": "humpf_rho"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyDisplayNameLangStringV2.json b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyDisplayNameLangStringV2.json
index dd2d50cc..466284b7 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyDisplayNameLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyDisplayNameLangStringV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_humpf;1",
+        "@id": "dtmi:example:humpf_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_um;1",
+          "@id": "dtmi:example:humpf_phi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 968,
-            "name": "omega_wum",
+            "enumValue": 981,
+            "name": "humpf_upsilon",
             "displayName": "hello"
           }
         }
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_nuh;1",
+        "@id": "dtmi:example:humpf_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_glikk;1",
+          "@id": "dtmi:example:humpf_omega;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 969,
-            "name": "omega_fuddle",
+            "enumValue": 982,
+            "name": "humpf_psi",
             "displayName": [
               "hello"
             ]
@@ -55,15 +55,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_thnad;1",
+        "@id": "dtmi:example:humpf_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_quan;1",
+          "@id": "dtmi:example:humpf_um;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 970,
-            "name": "omega_snee",
+            "enumValue": 983,
+            "name": "humpf_wum",
             "displayName": {
               "en": "hello"
             }
@@ -80,15 +80,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_zatz;1",
+        "@id": "dtmi:example:humpf_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_floob;1",
+          "@id": "dtmi:example:humpf_glikk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 971,
-            "name": "omega_spazz",
+            "enumValue": 984,
+            "name": "humpf_fuddle",
             "displayName": [
               {
                 "@value": "hello",
@@ -108,15 +108,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_itch;1",
+        "@id": "dtmi:example:humpf_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_flunn;1",
+          "@id": "dtmi:example:humpf_quan;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 972,
-            "name": "omega_jogg",
+            "enumValue": 985,
+            "name": "humpf_snee",
             "displayName": {}
           }
         }
@@ -131,15 +131,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_hi;1",
+        "@id": "dtmi:example:humpf_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_vroo;1",
+          "@id": "dtmi:example:humpf_floob;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 973,
-            "name": "omega_yekk",
+            "enumValue": 986,
+            "name": "humpf_spazz",
             "displayName": []
           }
         }
@@ -154,15 +154,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_gamma;1",
+        "@id": "dtmi:example:humpf_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_beta;1",
+          "@id": "dtmi:example:humpf_flunn;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 974,
-            "name": "yuzz_alpha",
+            "enumValue": 987,
+            "name": "humpf_jogg",
             "displayName": null
           }
         }
@@ -177,16 +177,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_zeta;1",
+        "@id": "dtmi:example:humpf_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_epsilon;1",
+          "@id": "dtmi:example:humpf_vroo;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 975,
-            "name": "yuzz_delta",
+            "enumValue": 988,
+            "name": "humpf_yekk",
             "displayName": null
           }
         }
@@ -201,15 +201,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_iota;1",
+        "@id": "dtmi:example:fuddle_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_theta;1",
+          "@id": "dtmi:example:fuddle_beta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 976,
-            "name": "yuzz_eta",
+            "enumValue": 989,
+            "name": "fuddle_alpha",
             "displayName": true
           }
         }
@@ -224,16 +224,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_mu;1",
+        "@id": "dtmi:example:fuddle_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_lambda;1",
+          "@id": "dtmi:example:fuddle_epsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 977,
-            "name": "yuzz_kappa",
+            "enumValue": 990,
+            "name": "fuddle_delta",
             "displayName": true
           }
         }
@@ -248,15 +248,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_omicron;1",
+        "@id": "dtmi:example:fuddle_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_xi;1",
+          "@id": "dtmi:example:fuddle_theta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 978,
-            "name": "yuzz_nu",
+            "enumValue": 991,
+            "name": "fuddle_eta",
             "displayName": 626
           }
         }
@@ -271,16 +271,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_sigma;1",
+        "@id": "dtmi:example:fuddle_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_rho;1",
+          "@id": "dtmi:example:fuddle_lambda;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 979,
-            "name": "yuzz_pi",
+            "enumValue": 992,
+            "name": "fuddle_kappa",
             "displayName": 626
           }
         }
@@ -295,15 +295,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_phi;1",
+        "@id": "dtmi:example:fuddle_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_upsilon;1",
+          "@id": "dtmi:example:fuddle_xi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 980,
-            "name": "yuzz_tau",
+            "enumValue": 993,
+            "name": "fuddle_nu",
             "displayName": [
               null
             ]
@@ -320,16 +320,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_omega;1",
+        "@id": "dtmi:example:fuddle_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_psi;1",
+          "@id": "dtmi:example:fuddle_rho;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 981,
-            "name": "yuzz_chi",
+            "enumValue": 994,
+            "name": "fuddle_pi",
             "displayName": [
               null
             ]
@@ -346,15 +346,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_um;1",
+        "@id": "dtmi:example:fuddle_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_wum;1",
+          "@id": "dtmi:example:fuddle_upsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 982,
-            "name": "yuzz_yuzz",
+            "enumValue": 995,
+            "name": "fuddle_tau",
             "displayName": [
               true
             ]
@@ -371,16 +371,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_glikk;1",
+        "@id": "dtmi:example:fuddle_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_fuddle;1",
+          "@id": "dtmi:example:fuddle_psi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 983,
-            "name": "yuzz_humpf",
+            "enumValue": 996,
+            "name": "fuddle_chi",
             "displayName": [
               true
             ]
@@ -397,15 +397,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_quan;1",
+        "@id": "dtmi:example:fuddle_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_snee;1",
+          "@id": "dtmi:example:fuddle_wum;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 984,
-            "name": "yuzz_nuh",
+            "enumValue": 997,
+            "name": "fuddle_yuzz",
             "displayName": [
               626
             ]
@@ -422,16 +422,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_floob;1",
+        "@id": "dtmi:example:fuddle_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_spazz;1",
+          "@id": "dtmi:example:fuddle_fuddle;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 985,
-            "name": "yuzz_thnad",
+            "enumValue": 998,
+            "name": "fuddle_humpf",
             "displayName": [
               626
             ]
@@ -448,15 +448,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_flunn;1",
+        "@id": "dtmi:example:fuddle_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_jogg;1",
+          "@id": "dtmi:example:fuddle_snee;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 986,
-            "name": "yuzz_zatz",
+            "enumValue": 999,
+            "name": "fuddle_nuh",
             "displayName": [
               {}
             ]
@@ -473,16 +473,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_vroo;1",
+        "@id": "dtmi:example:fuddle_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_yekk;1",
+          "@id": "dtmi:example:fuddle_spazz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 987,
-            "name": "yuzz_itch",
+            "enumValue": 1000,
+            "name": "fuddle_thnad",
             "displayName": [
               {}
             ]
@@ -499,15 +499,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_beta;1",
+        "@id": "dtmi:example:fuddle_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_alpha;1",
+          "@id": "dtmi:example:fuddle_jogg;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 988,
-            "name": "yuzz_hi",
+            "enumValue": 1001,
+            "name": "fuddle_zatz",
             "displayName": {
               "@value": "hello",
               "@language": "en"
@@ -525,16 +525,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_epsilon;1",
+        "@id": "dtmi:example:fuddle_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_delta;1",
+          "@id": "dtmi:example:fuddle_yekk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 989,
-            "name": "wum_gamma",
+            "enumValue": 1002,
+            "name": "fuddle_itch",
             "displayName": {
               "@value": "hello",
               "@language": "en"
@@ -552,15 +552,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_theta;1",
+        "@id": "dtmi:example:glikk_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_eta;1",
+          "@id": "dtmi:example:glikk_alpha;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 990,
-            "name": "wum_zeta",
+            "enumValue": 1003,
+            "name": "fuddle_hi",
             "displayName": [
               {
                 "en": "hello"
@@ -579,16 +579,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_lambda;1",
+        "@id": "dtmi:example:glikk_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_kappa;1",
+          "@id": "dtmi:example:glikk_delta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 991,
-            "name": "wum_iota",
+            "enumValue": 1004,
+            "name": "glikk_gamma",
             "displayName": [
               {
                 "en": "hello"
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyDisplayNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyDisplayNameStringLengthV2.json
index 8a8b349e..0ab22ee8 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyDisplayNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyDisplayNameStringLengthV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_xi;1",
+        "@id": "dtmi:example:glikk_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_nu;1",
+          "@id": "dtmi:example:glikk_eta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 992,
-            "name": "wum_mu",
+            "enumValue": 1005,
+            "name": "glikk_zeta",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSometh"
           }
         }
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_rho;1",
+        "@id": "dtmi:example:glikk_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_pi;1",
+          "@id": "dtmi:example:glikk_kappa;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 993,
-            "name": "wum_omicron",
+            "enumValue": 1006,
+            "name": "glikk_iota",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
           }
         }
@@ -53,16 +53,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_upsilon;1",
+        "@id": "dtmi:example:glikk_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_tau;1",
+          "@id": "dtmi:example:glikk_nu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 994,
-            "name": "wum_sigma",
+            "enumValue": 1007,
+            "name": "glikk_mu",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyDisplayNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyDisplayNameTermAndDtmiV2.json
index b263d238..157a4844 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyDisplayNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyDisplayNameTermAndDtmiV2.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_zatz;1",
+        "@id": "dtmi:example:glikk_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_floob;1",
+          "@id": "dtmi:example:glikk_glikk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "displayName": [
-              "wum_quan"
+              "glikk_um"
             ],
             "dtmi:dtdl:property:displayName;2": [
-              "wum_thnad"
+              "glikk_humpf"
             ],
-            "enumValue": 998,
-            "name": "wum_spazz"
+            "enumValue": 1011,
+            "name": "glikk_fuddle"
           }
         }
       }
@@ -35,22 +35,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_vroo;1",
+        "@id": "dtmi:example:glikk_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_yekk;1",
+          "@id": "dtmi:example:glikk_spazz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "displayName": [
-              "wum_jogg"
+              "glikk_snee"
             ],
             "dtmi:dtdl:property:displayName;2": [
-              "wum_flunn"
+              "glikk_quan"
             ],
-            "enumValue": 999,
-            "name": "wum_itch"
+            "enumValue": 1012,
+            "name": "glikk_thnad"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyEnumValueIntegerV2.json b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyEnumValueIntegerV2.json
index b6e7b56f..ddf2f8ec 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyEnumValueIntegerV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyEnumValueIntegerV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_chi;1",
+        "@id": "dtmi:example:theta_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_phi;1",
+          "@id": "dtmi:example:theta_iota;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "delta_upsilon",
+            "name": "theta_theta",
             "enumValue": 5
           },
           "valueSchema": "integer"
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_yuzz;1",
+        "@id": "dtmi:example:theta_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_omega;1",
+          "@id": "dtmi:example:theta_mu;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "delta_psi",
+            "name": "theta_lambda",
             "enumValue": [
               5
             ]
@@ -53,13 +53,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_humpf;1",
+        "@id": "dtmi:example:theta_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_um;1",
+          "@id": "dtmi:example:theta_omicron;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "delta_wum",
+            "name": "theta_xi",
             "enumValue": {
               "@value": 5,
               "@type": "xsd:integer"
@@ -78,13 +78,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_nuh;1",
+        "@id": "dtmi:example:theta_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_glikk;1",
+          "@id": "dtmi:example:theta_sigma;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "delta_fuddle",
+            "name": "theta_rho",
             "enumValue": [
               {
                 "@value": 5,
@@ -105,13 +105,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_thnad;1",
+        "@id": "dtmi:example:theta_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_quan;1",
+          "@id": "dtmi:example:theta_phi;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "delta_snee",
+            "name": "theta_upsilon",
             "enumValue": null
           },
           "valueSchema": "integer"
@@ -127,14 +127,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_zatz;1",
+        "@id": "dtmi:example:theta_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_floob;1",
+          "@id": "dtmi:example:theta_omega;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "delta_spazz",
+            "name": "theta_psi",
             "enumValue": null
           },
           "valueSchema": "integer"
@@ -150,13 +150,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_itch;1",
+        "@id": "dtmi:example:theta_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_flunn;1",
+          "@id": "dtmi:example:theta_um;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "delta_jogg",
+            "name": "theta_wum",
             "enumValue": true
           },
           "valueSchema": "integer"
@@ -172,14 +172,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_hi;1",
+        "@id": "dtmi:example:theta_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_vroo;1",
+          "@id": "dtmi:example:theta_glikk;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "delta_yekk",
+            "name": "theta_fuddle",
             "enumValue": true
           },
           "valueSchema": "integer"
@@ -195,13 +195,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_gamma;1",
+        "@id": "dtmi:example:theta_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_beta;1",
+          "@id": "dtmi:example:theta_quan;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "epsilon_alpha",
+            "name": "theta_snee",
             "enumValue": "hello"
           },
           "valueSchema": "integer"
@@ -217,14 +217,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_zeta;1",
+        "@id": "dtmi:example:theta_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_epsilon;1",
+          "@id": "dtmi:example:theta_floob;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "epsilon_delta",
+            "name": "theta_spazz",
             "enumValue": "hello"
           },
           "valueSchema": "integer"
@@ -240,13 +240,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_iota;1",
+        "@id": "dtmi:example:theta_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_theta;1",
+          "@id": "dtmi:example:theta_flunn;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "epsilon_eta",
+            "name": "theta_jogg",
             "enumValue": [
               null
             ]
@@ -264,14 +264,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_mu;1",
+        "@id": "dtmi:example:theta_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_lambda;1",
+          "@id": "dtmi:example:theta_vroo;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "epsilon_kappa",
+            "name": "theta_yekk",
             "enumValue": [
               null
             ]
@@ -289,13 +289,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_omicron;1",
+        "@id": "dtmi:example:iota_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_xi;1",
+          "@id": "dtmi:example:iota_beta;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "epsilon_nu",
+            "name": "iota_alpha",
             "enumValue": [
               true
             ]
@@ -313,14 +313,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_sigma;1",
+        "@id": "dtmi:example:iota_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_rho;1",
+          "@id": "dtmi:example:iota_epsilon;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "epsilon_pi",
+            "name": "iota_delta",
             "enumValue": [
               true
             ]
@@ -338,13 +338,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_phi;1",
+        "@id": "dtmi:example:iota_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_upsilon;1",
+          "@id": "dtmi:example:iota_theta;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "epsilon_tau",
+            "name": "iota_eta",
             "enumValue": [
               "hello"
             ]
@@ -362,14 +362,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_omega;1",
+        "@id": "dtmi:example:iota_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_psi;1",
+          "@id": "dtmi:example:iota_lambda;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "epsilon_chi",
+            "name": "iota_kappa",
             "enumValue": [
               "hello"
             ]
@@ -387,13 +387,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_um;1",
+        "@id": "dtmi:example:iota_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_wum;1",
+          "@id": "dtmi:example:iota_xi;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "epsilon_yuzz",
+            "name": "iota_nu",
             "enumValue": {}
           },
           "valueSchema": "integer"
@@ -409,14 +409,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_glikk;1",
+        "@id": "dtmi:example:iota_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_fuddle;1",
+          "@id": "dtmi:example:iota_rho;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "epsilon_humpf",
+            "name": "iota_pi",
             "enumValue": {}
           },
           "valueSchema": "integer"
@@ -432,13 +432,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_quan;1",
+        "@id": "dtmi:example:iota_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_snee;1",
+          "@id": "dtmi:example:iota_upsilon;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "epsilon_nuh",
+            "name": "iota_tau",
             "enumValue": [
               {}
             ]
@@ -456,14 +456,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_floob;1",
+        "@id": "dtmi:example:iota_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_spazz;1",
+          "@id": "dtmi:example:iota_psi;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "epsilon_thnad",
+            "name": "iota_chi",
             "enumValue": [
               {}
             ]
@@ -481,13 +481,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_flunn;1",
+        "@id": "dtmi:example:iota_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_jogg;1",
+          "@id": "dtmi:example:iota_wum;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "epsilon_zatz",
+            "name": "iota_yuzz",
             "enumValue": []
           },
           "valueSchema": "integer"
@@ -503,14 +503,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_vroo;1",
+        "@id": "dtmi:example:iota_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_yekk;1",
+          "@id": "dtmi:example:iota_fuddle;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "epsilon_itch",
+            "name": "iota_humpf",
             "enumValue": []
           },
           "valueSchema": "integer"
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyEnumValueStringV2.json b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyEnumValueStringV2.json
index 3ee53beb..22de617f 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyEnumValueStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyEnumValueStringV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_beta;1",
+        "@id": "dtmi:example:iota_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_alpha;1",
+          "@id": "dtmi:example:iota_snee;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "epsilon_hi",
+            "name": "iota_nuh",
             "enumValue": "hello"
           },
           "valueSchema": "string"
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_epsilon;1",
+        "@id": "dtmi:example:iota_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_delta;1",
+          "@id": "dtmi:example:iota_spazz;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "zeta_gamma",
+            "name": "iota_thnad",
             "enumValue": [
               "hello"
             ]
@@ -53,13 +53,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_theta;1",
+        "@id": "dtmi:example:iota_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_eta;1",
+          "@id": "dtmi:example:iota_jogg;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "zeta_zeta",
+            "name": "iota_zatz",
             "enumValue": {
               "@value": "hello",
               "@type": "xsd:string"
@@ -78,13 +78,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_lambda;1",
+        "@id": "dtmi:example:iota_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_kappa;1",
+          "@id": "dtmi:example:iota_yekk;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "zeta_iota",
+            "name": "iota_itch",
             "enumValue": [
               {
                 "@value": "hello",
@@ -105,13 +105,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_xi;1",
+        "@id": "dtmi:example:kappa_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_nu;1",
+          "@id": "dtmi:example:kappa_alpha;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "zeta_mu",
+            "name": "iota_hi",
             "enumValue": null
           },
           "valueSchema": "string"
@@ -127,14 +127,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_rho;1",
+        "@id": "dtmi:example:kappa_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_pi;1",
+          "@id": "dtmi:example:kappa_delta;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_omicron",
+            "name": "kappa_gamma",
             "enumValue": null
           },
           "valueSchema": "string"
@@ -150,13 +150,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_upsilon;1",
+        "@id": "dtmi:example:kappa_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_tau;1",
+          "@id": "dtmi:example:kappa_eta;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "zeta_sigma",
+            "name": "kappa_zeta",
             "enumValue": true
           },
           "valueSchema": "string"
@@ -172,14 +172,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_psi;1",
+        "@id": "dtmi:example:kappa_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_chi;1",
+          "@id": "dtmi:example:kappa_kappa;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_phi",
+            "name": "kappa_iota",
             "enumValue": true
           },
           "valueSchema": "string"
@@ -195,13 +195,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_wum;1",
+        "@id": "dtmi:example:kappa_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_yuzz;1",
+          "@id": "dtmi:example:kappa_nu;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "zeta_omega",
+            "name": "kappa_mu",
             "enumValue": 626
           },
           "valueSchema": "string"
@@ -217,14 +217,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_fuddle;1",
+        "@id": "dtmi:example:kappa_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_humpf;1",
+          "@id": "dtmi:example:kappa_pi;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_um",
+            "name": "kappa_omicron",
             "enumValue": 626
           },
           "valueSchema": "string"
@@ -240,13 +240,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_snee;1",
+        "@id": "dtmi:example:kappa_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_nuh;1",
+          "@id": "dtmi:example:kappa_tau;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "zeta_glikk",
+            "name": "kappa_sigma",
             "enumValue": [
               null
             ]
@@ -264,14 +264,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_spazz;1",
+        "@id": "dtmi:example:kappa_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_thnad;1",
+          "@id": "dtmi:example:kappa_chi;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_quan",
+            "name": "kappa_phi",
             "enumValue": [
               null
             ]
@@ -289,13 +289,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_jogg;1",
+        "@id": "dtmi:example:kappa_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_zatz;1",
+          "@id": "dtmi:example:kappa_yuzz;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "zeta_floob",
+            "name": "kappa_omega",
             "enumValue": [
               true
             ]
@@ -313,14 +313,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_yekk;1",
+        "@id": "dtmi:example:kappa_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_itch;1",
+          "@id": "dtmi:example:kappa_humpf;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_flunn",
+            "name": "kappa_um",
             "enumValue": [
               true
             ]
@@ -338,13 +338,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_alpha;1",
+        "@id": "dtmi:example:kappa_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_hi;1",
+          "@id": "dtmi:example:kappa_nuh;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "zeta_vroo",
+            "name": "kappa_glikk",
             "enumValue": [
               626
             ]
@@ -362,14 +362,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_delta;1",
+        "@id": "dtmi:example:kappa_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_gamma;1",
+          "@id": "dtmi:example:kappa_thnad;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "eta_beta",
+            "name": "kappa_quan",
             "enumValue": [
               626
             ]
@@ -387,13 +387,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_eta;1",
+        "@id": "dtmi:example:kappa_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_zeta;1",
+          "@id": "dtmi:example:kappa_zatz;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "eta_epsilon",
+            "name": "kappa_floob",
             "enumValue": {}
           },
           "valueSchema": "string"
@@ -409,14 +409,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_kappa;1",
+        "@id": "dtmi:example:kappa_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_iota;1",
+          "@id": "dtmi:example:kappa_itch;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "eta_theta",
+            "name": "kappa_flunn",
             "enumValue": {}
           },
           "valueSchema": "string"
@@ -432,13 +432,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_nu;1",
+        "@id": "dtmi:example:lambda_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_mu;1",
+          "@id": "dtmi:example:kappa_hi;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "eta_lambda",
+            "name": "kappa_vroo",
             "enumValue": [
               {}
             ]
@@ -456,14 +456,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_pi;1",
+        "@id": "dtmi:example:lambda_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_omicron;1",
+          "@id": "dtmi:example:lambda_gamma;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "eta_xi",
+            "name": "lambda_beta",
             "enumValue": [
               {}
             ]
@@ -481,13 +481,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_tau;1",
+        "@id": "dtmi:example:lambda_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_sigma;1",
+          "@id": "dtmi:example:lambda_zeta;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "eta_rho",
+            "name": "lambda_epsilon",
             "enumValue": []
           },
           "valueSchema": "string"
@@ -503,14 +503,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_chi;1",
+        "@id": "dtmi:example:lambda_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_phi;1",
+          "@id": "dtmi:example:lambda_iota;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "eta_upsilon",
+            "name": "lambda_theta",
             "enumValue": []
           },
           "valueSchema": "string"
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyEnumValueTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyEnumValueTermAndDtmiV2.json
index ec71dcc6..ba00af96 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyEnumValueTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyEnumValueTermAndDtmiV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_omicron;1",
+        "@id": "dtmi:example:mu_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_xi;1",
+          "@id": "dtmi:example:mu_beta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 717,
-            "dtmi:dtdl:property:enumValue;2": 718,
-            "name": "theta_nu"
+            "enumValue": 728,
+            "dtmi:dtdl:property:enumValue;2": 729,
+            "name": "mu_alpha"
           }
         }
       }
@@ -30,17 +30,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_sigma;1",
+        "@id": "dtmi:example:mu_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_rho;1",
+          "@id": "dtmi:example:mu_epsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 719,
-            "dtmi:dtdl:property:enumValue;2": 720,
-            "name": "theta_pi"
+            "enumValue": 730,
+            "dtmi:dtdl:property:enumValue;2": 731,
+            "name": "mu_delta"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyEnumValueUniqueAmongEnumEnumValuesV2.json b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyEnumValueUniqueAmongEnumEnumValuesV2.json
index 0fa7e9fa..fb1200d9 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyEnumValueUniqueAmongEnumEnumValuesV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyEnumValueUniqueAmongEnumEnumValuesV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_wum;1",
+        "@id": "dtmi:example:lambda_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_yuzz;1",
+          "@id": "dtmi:example:lambda_nu;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "name": "eta_psi",
+              "name": "lambda_lambda",
               "enumValue": 6
             },
             {
-              "name": "eta_omega",
+              "name": "lambda_mu",
               "enumValue": 7
             }
           ],
@@ -35,18 +35,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_glikk;1",
+        "@id": "dtmi:example:lambda_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_fuddle;1",
+          "@id": "dtmi:example:lambda_rho;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "name": "eta_um",
+              "name": "lambda_omicron",
               "enumValue": 6
             },
             {
-              "name": "eta_humpf",
+              "name": "lambda_pi",
               "enumValue": 6
             }
           ],
@@ -63,19 +63,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_thnad;1",
+        "@id": "dtmi:example:lambda_chi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:eta_quan;1",
+          "@id": "dtmi:example:lambda_phi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "name": "eta_nuh",
+              "name": "lambda_tau",
               "enumValue": 6
             },
             {
-              "name": "eta_snee",
+              "name": "lambda_upsilon",
               "enumValue": 6
             }
           ],
@@ -92,18 +92,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_jogg;1",
+        "@id": "dtmi:example:lambda_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_zatz;1",
+          "@id": "dtmi:example:lambda_yuzz;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "name": "eta_spazz",
+              "name": "lambda_psi",
               "enumValue": "alpha_psi"
             },
             {
-              "name": "eta_floob",
+              "name": "lambda_omega",
               "enumValue": "alpha_omega"
             }
           ],
@@ -120,18 +120,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_vroo;1",
+        "@id": "dtmi:example:lambda_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_yekk;1",
+          "@id": "dtmi:example:lambda_fuddle;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "name": "eta_flunn",
+              "name": "lambda_um",
               "enumValue": "alpha_psi"
             },
             {
-              "name": "eta_itch",
+              "name": "lambda_humpf",
               "enumValue": "alpha_psi"
             }
           ],
@@ -148,19 +148,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_gamma;1",
+        "@id": "dtmi:example:lambda_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:theta_beta;1",
+          "@id": "dtmi:example:lambda_quan;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "name": "eta_hi",
+              "name": "lambda_nuh",
               "enumValue": "alpha_psi"
             },
             {
-              "name": "theta_alpha",
+              "name": "lambda_snee",
               "enumValue": "alpha_psi"
             }
           ],
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyFormallyInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyFormallyInvalidDtmiV2.json
index 3fec1a6c..deda1a21 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyFormallyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyFormallyInvalidDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_jogg;1",
+        "@id": "dtmi:example:nuh_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_zatz;1",
+          "@id": "dtmi:example:nuh_nuh;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1012,
-            "name": "um_floob",
+            "enumValue": 1025,
+            "name": "nuh_glikk",
             "dtmi:foo//bar": 626
           }
         }
@@ -30,16 +30,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_yekk;1",
+        "@id": "dtmi:example:nuh_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_itch;1",
+          "@id": "dtmi:example:nuh_thnad;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1013,
-            "name": "um_flunn",
+            "enumValue": 1026,
+            "name": "nuh_quan",
             "dtmi:foo//bar": 626
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyFormallyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyFormallyIrrelevantDtmiOrTermV2.json
index 46378a38..a793f5c8 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyFormallyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyFormallyIrrelevantDtmiOrTermV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_psi;1",
+        "@id": "dtmi:example:nuh_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_chi;1",
+          "@id": "dtmi:example:nuh_pi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1007,
-            "name": "um_phi",
+            "enumValue": 1020,
+            "name": "nuh_omicron",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -30,16 +30,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_wum;1",
+        "@id": "dtmi:example:nuh_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_yuzz;1",
+          "@id": "dtmi:example:nuh_tau;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1008,
-            "name": "um_omega",
+            "enumValue": 1021,
+            "name": "nuh_sigma",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -54,15 +54,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_fuddle;1",
+        "@id": "dtmi:example:nuh_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_humpf;1",
+          "@id": "dtmi:example:nuh_chi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1009,
-            "name": "um_um",
+            "enumValue": 1022,
+            "name": "nuh_phi",
             "boolean": null
           }
         }
@@ -77,16 +77,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_snee;1",
+        "@id": "dtmi:example:nuh_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_nuh;1",
+          "@id": "dtmi:example:nuh_yuzz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1010,
-            "name": "um_glikk",
+            "enumValue": 1023,
+            "name": "nuh_omega",
             "boolean": null
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyFormallyNotDtmiNorTermV2.json b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyFormallyNotDtmiNorTermV2.json
index 8a204332..e8152de0 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyFormallyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyFormallyNotDtmiNorTermV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_delta;1",
+        "@id": "dtmi:example:nuh_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_gamma;1",
+          "@id": "dtmi:example:nuh_itch;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1015,
-            "name": "humpf_beta",
+            "enumValue": 1028,
+            "name": "nuh_flunn",
             "http://foo.com/bar": true
           }
         }
@@ -30,16 +30,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_eta;1",
+        "@id": "dtmi:example:snee_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_zeta;1",
+          "@id": "dtmi:example:nuh_hi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1016,
-            "name": "humpf_epsilon",
+            "enumValue": 1029,
+            "name": "nuh_vroo",
             "http://foo.com/bar": true
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyFormallyUndefinedTermV2.json b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyFormallyUndefinedTermV2.json
index 2714da4b..e0dc3d06 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyFormallyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyFormallyUndefinedTermV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_nu;1",
+        "@id": "dtmi:example:snee_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_mu;1",
+          "@id": "dtmi:example:snee_zeta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1018,
-            "name": "humpf_lambda",
+            "enumValue": 1031,
+            "name": "snee_epsilon",
             "foobar": {}
           }
         }
@@ -30,16 +30,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_pi;1",
+        "@id": "dtmi:example:snee_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_omicron;1",
+          "@id": "dtmi:example:snee_iota;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1019,
-            "name": "humpf_xi",
+            "enumValue": 1032,
+            "name": "snee_theta",
             "foobar": {}
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyNamePatternV2.json b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyNamePatternV2.json
index 29a8a4db..d25fc1e2 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyNamePatternV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyNamePatternV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_um;1",
+        "@id": "dtmi:example:nu_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_wum;1",
+          "@id": "dtmi:example:nu_xi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 746,
+            "enumValue": 757,
             "name": "EARTH"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_fuddle;1",
+        "@id": "dtmi:example:nu_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_humpf;1",
+          "@id": "dtmi:example:nu_pi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 747,
+            "enumValue": 758,
             "name": "Air"
           }
         }
@@ -51,14 +51,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_nuh;1",
+        "@id": "dtmi:example:nu_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_glikk;1",
+          "@id": "dtmi:example:nu_sigma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 748,
+            "enumValue": 759,
             "name": "fire"
           }
         }
@@ -73,14 +73,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_quan;1",
+        "@id": "dtmi:example:nu_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_snee;1",
+          "@id": "dtmi:example:nu_upsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 749,
+            "enumValue": 760,
             "name": "hello_world"
           }
         }
@@ -95,14 +95,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_spazz;1",
+        "@id": "dtmi:example:nu_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_thnad;1",
+          "@id": "dtmi:example:nu_chi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 750,
+            "enumValue": 761,
             "name": "Anarchy99"
           }
         }
@@ -117,14 +117,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_zatz;1",
+        "@id": "dtmi:example:nu_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_floob;1",
+          "@id": "dtmi:example:nu_omega;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 751,
+            "enumValue": 762,
             "name": "23skidoo"
           }
         }
@@ -139,15 +139,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_flunn;1",
+        "@id": "dtmi:example:nu_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_jogg;1",
+          "@id": "dtmi:example:nu_wum;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 752,
+            "enumValue": 763,
             "name": "23skidoo"
           }
         }
@@ -162,14 +162,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_yekk;1",
+        "@id": "dtmi:example:nu_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_itch;1",
+          "@id": "dtmi:example:nu_humpf;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 753,
+            "enumValue": 764,
             "name": "626"
           }
         }
@@ -184,15 +184,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_hi;1",
+        "@id": "dtmi:example:nu_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_vroo;1",
+          "@id": "dtmi:example:nu_glikk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 754,
+            "enumValue": 765,
             "name": "626"
           }
         }
@@ -207,14 +207,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_beta;1",
+        "@id": "dtmi:example:nu_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_alpha;1",
+          "@id": "dtmi:example:nu_snee;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 755,
+            "enumValue": 766,
             "name": "goodbye-world"
           }
         }
@@ -229,15 +229,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_delta;1",
+        "@id": "dtmi:example:nu_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_gamma;1",
+          "@id": "dtmi:example:nu_thnad;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 756,
+            "enumValue": 767,
             "name": "goodbye-world"
           }
         }
@@ -252,14 +252,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_zeta;1",
+        "@id": "dtmi:example:nu_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_epsilon;1",
+          "@id": "dtmi:example:nu_floob;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 757,
+            "enumValue": 768,
             "name": "_haha"
           }
         }
@@ -274,15 +274,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_theta;1",
+        "@id": "dtmi:example:nu_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_eta;1",
+          "@id": "dtmi:example:nu_jogg;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 758,
+            "enumValue": 769,
             "name": "_haha"
           }
         }
@@ -297,14 +297,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_kappa;1",
+        "@id": "dtmi:example:nu_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_iota;1",
+          "@id": "dtmi:example:nu_itch;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 759,
+            "enumValue": 770,
             "name": "toodaloo_"
           }
         }
@@ -319,15 +319,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_mu;1",
+        "@id": "dtmi:example:nu_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_lambda;1",
+          "@id": "dtmi:example:nu_vroo;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 760,
+            "enumValue": 771,
             "name": "toodaloo_"
           }
         }
@@ -342,14 +342,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_xi;1",
+        "@id": "dtmi:example:xi_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_nu;1",
+          "@id": "dtmi:example:xi_alpha;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 761,
+            "enumValue": 772,
             "name": "pro:con"
           }
         }
@@ -364,15 +364,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_pi;1",
+        "@id": "dtmi:example:xi_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_omicron;1",
+          "@id": "dtmi:example:xi_gamma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 762,
+            "enumValue": 773,
             "name": "pro:con"
           }
         }
@@ -387,14 +387,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_sigma;1",
+        "@id": "dtmi:example:xi_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_rho;1",
+          "@id": "dtmi:example:xi_epsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 763,
+            "enumValue": 774,
             "name": "mish/mash"
           }
         }
@@ -409,15 +409,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_upsilon;1",
+        "@id": "dtmi:example:xi_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_tau;1",
+          "@id": "dtmi:example:xi_eta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 764,
+            "enumValue": 775,
             "name": "mish/mash"
           }
         }
@@ -432,14 +432,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_chi;1",
+        "@id": "dtmi:example:xi_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_phi;1",
+          "@id": "dtmi:example:xi_iota;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 765,
+            "enumValue": 776,
             "name": "#tag"
           }
         }
@@ -454,15 +454,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_omega;1",
+        "@id": "dtmi:example:xi_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_psi;1",
+          "@id": "dtmi:example:xi_lambda;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 766,
+            "enumValue": 777,
             "name": "#tag"
           }
         }
@@ -477,14 +477,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_wum;1",
+        "@id": "dtmi:example:xi_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_yuzz;1",
+          "@id": "dtmi:example:xi_nu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 767,
+            "enumValue": 778,
             "name": "@tweet"
           }
         }
@@ -499,15 +499,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_humpf;1",
+        "@id": "dtmi:example:xi_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_um;1",
+          "@id": "dtmi:example:xi_omicron;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 768,
+            "enumValue": 779,
             "name": "@tweet"
           }
         }
@@ -522,14 +522,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_glikk;1",
+        "@id": "dtmi:example:xi_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_fuddle;1",
+          "@id": "dtmi:example:xi_rho;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 769,
+            "enumValue": 780,
             "name": "$money"
           }
         }
@@ -544,15 +544,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_snee;1",
+        "@id": "dtmi:example:xi_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_nuh;1",
+          "@id": "dtmi:example:xi_tau;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 770,
+            "enumValue": 781,
             "name": "$money"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyNameStringLengthV2.json
index e6c6efa9..425d1f18 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyNameStringLengthV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_phi;1",
+        "@id": "dtmi:example:nu_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_upsilon;1",
+          "@id": "dtmi:example:nu_theta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 743,
+            "enumValue": 754,
             "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSometh"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_psi;1",
+        "@id": "dtmi:example:nu_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_chi;1",
+          "@id": "dtmi:example:nu_kappa;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 744,
+            "enumValue": 755,
             "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
           }
         }
@@ -51,15 +51,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_yuzz;1",
+        "@id": "dtmi:example:nu_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_omega;1",
+          "@id": "dtmi:example:nu_mu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 745,
+            "enumValue": 756,
             "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyNameStringV2.json b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyNameStringV2.json
index 9b6765b4..56579c76 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyNameStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyNameStringV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_upsilon;1",
+        "@id": "dtmi:example:mu_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_tau;1",
+          "@id": "dtmi:example:mu_eta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 721,
+            "enumValue": 732,
             "name": "hello"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_chi;1",
+        "@id": "dtmi:example:mu_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_phi;1",
+          "@id": "dtmi:example:mu_iota;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 722,
+            "enumValue": 733,
             "name": [
               "hello"
             ]
@@ -53,14 +53,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_omega;1",
+        "@id": "dtmi:example:mu_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_psi;1",
+          "@id": "dtmi:example:mu_lambda;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 723,
+            "enumValue": 734,
             "name": {
               "@value": "hello",
               "@type": "xsd:string"
@@ -78,14 +78,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_wum;1",
+        "@id": "dtmi:example:mu_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_yuzz;1",
+          "@id": "dtmi:example:mu_nu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 724,
+            "enumValue": 735,
             "name": [
               {
                 "@value": "hello",
@@ -105,14 +105,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_humpf;1",
+        "@id": "dtmi:example:mu_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_um;1",
+          "@id": "dtmi:example:mu_omicron;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 725,
+            "enumValue": 736,
             "name": null
           }
         }
@@ -127,15 +127,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_glikk;1",
+        "@id": "dtmi:example:mu_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_fuddle;1",
+          "@id": "dtmi:example:mu_rho;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 726,
+            "enumValue": 737,
             "name": null
           }
         }
@@ -150,14 +150,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_snee;1",
+        "@id": "dtmi:example:mu_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_nuh;1",
+          "@id": "dtmi:example:mu_tau;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 727,
+            "enumValue": 738,
             "name": true
           }
         }
@@ -172,15 +172,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_thnad;1",
+        "@id": "dtmi:example:mu_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_quan;1",
+          "@id": "dtmi:example:mu_phi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 728,
+            "enumValue": 739,
             "name": true
           }
         }
@@ -195,14 +195,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_floob;1",
+        "@id": "dtmi:example:mu_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_spazz;1",
+          "@id": "dtmi:example:mu_psi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 729,
+            "enumValue": 740,
             "name": 626
           }
         }
@@ -217,15 +217,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_jogg;1",
+        "@id": "dtmi:example:mu_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_zatz;1",
+          "@id": "dtmi:example:mu_yuzz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 730,
+            "enumValue": 741,
             "name": 626
           }
         }
@@ -240,14 +240,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_itch;1",
+        "@id": "dtmi:example:mu_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_flunn;1",
+          "@id": "dtmi:example:mu_um;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 731,
+            "enumValue": 742,
             "name": [
               null
             ]
@@ -264,15 +264,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_vroo;1",
+        "@id": "dtmi:example:mu_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_yekk;1",
+          "@id": "dtmi:example:mu_fuddle;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 732,
+            "enumValue": 743,
             "name": [
               null
             ]
@@ -289,14 +289,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_alpha;1",
+        "@id": "dtmi:example:mu_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_hi;1",
+          "@id": "dtmi:example:mu_nuh;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 733,
+            "enumValue": 744,
             "name": [
               true
             ]
@@ -313,15 +313,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_gamma;1",
+        "@id": "dtmi:example:mu_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_beta;1",
+          "@id": "dtmi:example:mu_quan;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 734,
+            "enumValue": 745,
             "name": [
               true
             ]
@@ -338,14 +338,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_epsilon;1",
+        "@id": "dtmi:example:mu_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_delta;1",
+          "@id": "dtmi:example:mu_spazz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 735,
+            "enumValue": 746,
             "name": [
               626
             ]
@@ -362,15 +362,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_eta;1",
+        "@id": "dtmi:example:mu_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_zeta;1",
+          "@id": "dtmi:example:mu_zatz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 736,
+            "enumValue": 747,
             "name": [
               626
             ]
@@ -387,14 +387,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_iota;1",
+        "@id": "dtmi:example:mu_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_theta;1",
+          "@id": "dtmi:example:mu_flunn;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 737,
+            "enumValue": 748,
             "name": {}
           }
         }
@@ -409,15 +409,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_lambda;1",
+        "@id": "dtmi:example:mu_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_kappa;1",
+          "@id": "dtmi:example:mu_yekk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 738,
+            "enumValue": 749,
             "name": {}
           }
         }
@@ -432,14 +432,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_nu;1",
+        "@id": "dtmi:example:nu_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_mu;1",
+          "@id": "dtmi:example:mu_hi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 739,
+            "enumValue": 750,
             "name": [
               {}
             ]
@@ -456,15 +456,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_omicron;1",
+        "@id": "dtmi:example:nu_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_xi;1",
+          "@id": "dtmi:example:nu_beta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 740,
+            "enumValue": 751,
             "name": [
               {}
             ]
@@ -481,14 +481,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_rho;1",
+        "@id": "dtmi:example:nu_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_pi;1",
+          "@id": "dtmi:example:nu_delta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 741,
+            "enumValue": 752,
             "name": []
           }
         }
@@ -503,15 +503,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_tau;1",
+        "@id": "dtmi:example:nu_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_sigma;1",
+          "@id": "dtmi:example:nu_zeta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 742,
+            "enumValue": 753,
             "name": []
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyNameTermAndDtmiV2.json
index 87b02139..fff81d4f 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyNameTermAndDtmiV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_theta;1",
+        "@id": "dtmi:example:xi_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_eta;1",
+          "@id": "dtmi:example:xi_jogg;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 780,
-            "name": "lambda_epsilon",
-            "dtmi:dtdl:property:name;2": "lambda_zeta"
+            "enumValue": 791,
+            "name": "xi_floob",
+            "dtmi:dtdl:property:name;2": "xi_zatz"
           }
         }
       }
@@ -30,17 +30,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_mu;1",
+        "@id": "dtmi:example:xi_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_lambda;1",
+          "@id": "dtmi:example:xi_vroo;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 781,
-            "name": "lambda_iota",
-            "dtmi:dtdl:property:name;2": "lambda_kappa"
+            "enumValue": 792,
+            "name": "xi_itch",
+            "dtmi:dtdl:property:name;2": "xi_yekk"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyNameUniqueAmongEnumEnumValuesV2.json b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyNameUniqueAmongEnumEnumValuesV2.json
index 6b7488d0..8b625caa 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValuePropertyNameUniqueAmongEnumEnumValuesV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValuePropertyNameUniqueAmongEnumEnumValuesV2.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_thnad;1",
+        "@id": "dtmi:example:xi_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_quan;1",
+          "@id": "dtmi:example:xi_phi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": [
             {
-              "enumValue": 771,
+              "enumValue": 782,
               "name": "alpha_yuzz"
             },
             {
-              "enumValue": 772,
+              "enumValue": 783,
               "name": "alpha_wum"
             }
           ]
@@ -35,19 +35,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_floob;1",
+        "@id": "dtmi:example:xi_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_spazz;1",
+          "@id": "dtmi:example:xi_psi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": [
             {
-              "enumValue": 773,
+              "enumValue": 784,
               "name": "alpha_yuzz"
             },
             {
-              "enumValue": 774,
+              "enumValue": 785,
               "name": "alpha_yuzz"
             }
           ]
@@ -63,20 +63,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_jogg;1",
+        "@id": "dtmi:example:xi_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:kappa_zatz;1",
+          "@id": "dtmi:example:xi_yuzz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": [
             {
-              "enumValue": 775,
+              "enumValue": 786,
               "name": "alpha_yuzz"
             },
             {
-              "enumValue": 776,
+              "enumValue": 787,
               "name": "alpha_yuzz"
             }
           ]
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValueRequiredPropertiesV2.json b/DTDL/v2/spec/Requirement-ClassEnumValueRequiredPropertiesV2.json
index 645ddf07..b7c71c0d 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValueRequiredPropertiesV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValueRequiredPropertiesV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_mu;1",
+        "@id": "dtmi:example:eta_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_lambda;1",
+          "@id": "dtmi:example:eta_vroo;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "name": "delta_kappa"
+            "name": "eta_yekk"
           }
         }
       }
@@ -28,15 +28,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_omicron;1",
+        "@id": "dtmi:example:theta_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_xi;1",
+          "@id": "dtmi:example:theta_beta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "delta_nu"
+            "name": "theta_alpha"
           }
         }
       }
@@ -50,14 +50,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_rho;1",
+        "@id": "dtmi:example:theta_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_pi;1",
+          "@id": "dtmi:example:theta_delta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 712
+            "enumValue": 723
           }
         }
       }
@@ -71,15 +71,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_tau;1",
+        "@id": "dtmi:example:theta_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_sigma;1",
+          "@id": "dtmi:example:theta_zeta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 713
+            "enumValue": 724
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValueTypeIncludesInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassEnumValueTypeIncludesInvalidDtmiV2.json
index 1dcd08e9..3e3ede6c 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValueTypeIncludesInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValueTypeIncludesInvalidDtmiV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_beta;1",
+        "@id": "dtmi:example:sigma_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_alpha;1",
+          "@id": "dtmi:example:sigma_jogg;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -18,8 +18,8 @@
               "EnumValue",
               "dtmi:foo//bar"
             ],
-            "enumValue": 835,
-            "name": "xi_hi"
+            "enumValue": 848,
+            "name": "sigma_zatz"
           }
         }
       }
@@ -33,10 +33,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_epsilon;1",
+        "@id": "dtmi:example:sigma_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_delta;1",
+          "@id": "dtmi:example:sigma_yekk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -45,8 +45,8 @@
               "EnumValue",
               "dtmi:foo//bar"
             ],
-            "enumValue": 836,
-            "name": "omicron_gamma"
+            "enumValue": 849,
+            "name": "sigma_itch"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValueTypeIncludesMaterialV2.json b/DTDL/v2/spec/Requirement-ClassEnumValueTypeIncludesMaterialV2.json
index 175fe12c..b05cca87 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValueTypeIncludesMaterialV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValueTypeIncludesMaterialV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_zatz;1",
+        "@id": "dtmi:example:rho_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_floob;1",
+          "@id": "dtmi:example:rho_glikk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 818,
-            "name": "nu_spazz",
+            "enumValue": 831,
+            "name": "rho_fuddle",
             "@type": "EnumValue"
           }
         }
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_itch;1",
+        "@id": "dtmi:example:rho_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_flunn;1",
+          "@id": "dtmi:example:rho_quan;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 819,
-            "name": "nu_jogg",
+            "enumValue": 832,
+            "name": "rho_snee",
             "@type": [
               "EnumValue"
             ]
@@ -55,15 +55,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_hi;1",
+        "@id": "dtmi:example:rho_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_vroo;1",
+          "@id": "dtmi:example:rho_floob;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 820,
-            "name": "nu_yekk",
+            "enumValue": 833,
+            "name": "rho_spazz",
             "@type": "dtmi:dtdl:class:EnumValue;2"
           }
         }
@@ -78,15 +78,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_gamma;1",
+        "@id": "dtmi:example:rho_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_beta;1",
+          "@id": "dtmi:example:rho_flunn;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 821,
-            "name": "xi_alpha",
+            "enumValue": 834,
+            "name": "rho_jogg",
             "@type": [
               "dtmi:dtdl:class:EnumValue;2"
             ]
@@ -103,15 +103,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_zeta;1",
+        "@id": "dtmi:example:rho_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_epsilon;1",
+          "@id": "dtmi:example:rho_vroo;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 822,
-            "name": "xi_delta",
+            "enumValue": 835,
+            "name": "rho_yekk",
             "@type": "Something"
           }
         }
@@ -126,16 +126,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_iota;1",
+        "@id": "dtmi:example:sigma_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_theta;1",
+          "@id": "dtmi:example:sigma_beta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 823,
-            "name": "xi_eta",
+            "enumValue": 836,
+            "name": "sigma_alpha",
             "@type": "Something"
           }
         }
@@ -150,15 +150,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_mu;1",
+        "@id": "dtmi:example:sigma_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_lambda;1",
+          "@id": "dtmi:example:sigma_epsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 824,
-            "name": "xi_kappa",
+            "enumValue": 837,
+            "name": "sigma_delta",
             "@type": [
               "Something"
             ]
@@ -175,16 +175,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_omicron;1",
+        "@id": "dtmi:example:sigma_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_xi;1",
+          "@id": "dtmi:example:sigma_theta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 825,
-            "name": "xi_nu",
+            "enumValue": 838,
+            "name": "sigma_eta",
             "@type": [
               "Something"
             ]
diff --git a/DTDL/v2/spec/Requirement-ClassEnumValueTypeStringOrArrayV2.json b/DTDL/v2/spec/Requirement-ClassEnumValueTypeStringOrArrayV2.json
index 13728791..82ca9ac3 100644
--- a/DTDL/v2/spec/Requirement-ClassEnumValueTypeStringOrArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassEnumValueTypeStringOrArrayV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_snee;1",
+        "@id": "dtmi:example:pi_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_nuh;1",
+          "@id": "dtmi:example:pi_yuzz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 802,
-            "name": "mu_glikk",
+            "enumValue": 815,
+            "name": "pi_omega",
             "@type": 626
           }
         }
@@ -30,16 +30,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_spazz;1",
+        "@id": "dtmi:example:pi_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_thnad;1",
+          "@id": "dtmi:example:pi_humpf;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 803,
-            "name": "mu_quan",
+            "enumValue": 816,
+            "name": "pi_um",
             "@type": 626
           }
         }
@@ -54,15 +54,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_jogg;1",
+        "@id": "dtmi:example:pi_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_zatz;1",
+          "@id": "dtmi:example:pi_nuh;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 804,
-            "name": "mu_floob",
+            "enumValue": 817,
+            "name": "pi_glikk",
             "@type": null
           }
         }
@@ -77,16 +77,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_yekk;1",
+        "@id": "dtmi:example:pi_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_itch;1",
+          "@id": "dtmi:example:pi_thnad;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 805,
-            "name": "mu_flunn",
+            "enumValue": 818,
+            "name": "pi_quan",
             "@type": null
           }
         }
@@ -101,15 +101,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_alpha;1",
+        "@id": "dtmi:example:pi_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_hi;1",
+          "@id": "dtmi:example:pi_zatz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 806,
-            "name": "mu_vroo",
+            "enumValue": 819,
+            "name": "pi_floob",
             "@type": true
           }
         }
@@ -124,16 +124,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_delta;1",
+        "@id": "dtmi:example:pi_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_gamma;1",
+          "@id": "dtmi:example:pi_itch;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 807,
-            "name": "nu_beta",
+            "enumValue": 820,
+            "name": "pi_flunn",
             "@type": true
           }
         }
@@ -148,15 +148,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_eta;1",
+        "@id": "dtmi:example:rho_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_zeta;1",
+          "@id": "dtmi:example:pi_hi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 808,
-            "name": "nu_epsilon",
+            "enumValue": 821,
+            "name": "pi_vroo",
             "@type": {}
           }
         }
@@ -171,16 +171,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_kappa;1",
+        "@id": "dtmi:example:rho_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_iota;1",
+          "@id": "dtmi:example:rho_gamma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 809,
-            "name": "nu_theta",
+            "enumValue": 822,
+            "name": "rho_beta",
             "@type": {}
           }
         }
@@ -195,15 +195,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_nu;1",
+        "@id": "dtmi:example:rho_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_mu;1",
+          "@id": "dtmi:example:rho_zeta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 810,
-            "name": "nu_lambda",
+            "enumValue": 823,
+            "name": "rho_epsilon",
             "@type": [
               626
             ]
@@ -220,16 +220,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_pi;1",
+        "@id": "dtmi:example:rho_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_omicron;1",
+          "@id": "dtmi:example:rho_iota;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 811,
-            "name": "nu_xi",
+            "enumValue": 824,
+            "name": "rho_theta",
             "@type": [
               626
             ]
@@ -246,15 +246,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_tau;1",
+        "@id": "dtmi:example:rho_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_sigma;1",
+          "@id": "dtmi:example:rho_mu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 812,
-            "name": "nu_rho",
+            "enumValue": 825,
+            "name": "rho_lambda",
             "@type": [
               null
             ]
@@ -271,16 +271,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_chi;1",
+        "@id": "dtmi:example:rho_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_phi;1",
+          "@id": "dtmi:example:rho_omicron;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 813,
-            "name": "nu_upsilon",
+            "enumValue": 826,
+            "name": "rho_xi",
             "@type": [
               null
             ]
@@ -297,15 +297,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_yuzz;1",
+        "@id": "dtmi:example:rho_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_omega;1",
+          "@id": "dtmi:example:rho_sigma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 814,
-            "name": "nu_psi",
+            "enumValue": 827,
+            "name": "rho_rho",
             "@type": [
               true
             ]
@@ -322,16 +322,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_humpf;1",
+        "@id": "dtmi:example:rho_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_um;1",
+          "@id": "dtmi:example:rho_phi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 815,
-            "name": "nu_wum",
+            "enumValue": 828,
+            "name": "rho_upsilon",
             "@type": [
               true
             ]
@@ -348,15 +348,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_nuh;1",
+        "@id": "dtmi:example:rho_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_glikk;1",
+          "@id": "dtmi:example:rho_omega;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 816,
-            "name": "nu_fuddle",
+            "enumValue": 829,
+            "name": "rho_psi",
             "@type": [
               {}
             ]
@@ -373,16 +373,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_thnad;1",
+        "@id": "dtmi:example:rho_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_quan;1",
+          "@id": "dtmi:example:rho_um;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 817,
-            "name": "nu_snee",
+            "enumValue": 830,
+            "name": "rho_wum",
             "@type": [
               {}
             ]
diff --git a/DTDL/v2/spec/Requirement-ClassFieldContextConformsV2.json b/DTDL/v2/spec/Requirement-ClassFieldContextConformsV2.json
index 194aa017..14754667 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldContextConformsV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldContextConformsV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_phi;1",
+        "@id": "dtmi:example:vroo_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "jogg_upsilon",
+          "name": "vroo_chi",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "jogg_tau",
-              "schema": "dateTime",
+              "name": "vroo_phi",
+              "schema": "boolean",
               "@context": "dtmi:iotcentral:context;2"
             }
           }
@@ -32,16 +32,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_omega;1",
+        "@id": "dtmi:example:vroo_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "jogg_psi",
+          "name": "vroo_yuzz",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "jogg_chi",
-              "schema": "double",
+              "name": "vroo_omega",
+              "schema": "date",
               "@context": []
             }
           }
@@ -57,16 +57,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_um;1",
+        "@id": "dtmi:example:vroo_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "jogg_wum",
+          "name": "vroo_humpf",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "jogg_yuzz",
-              "schema": "duration",
+              "name": "vroo_um",
+              "schema": "dateTime",
               "@context": [
                 "dtmi:iotcentral:context;2"
               ]
@@ -84,16 +84,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_glikk;1",
+        "@id": "dtmi:example:vroo_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "jogg_fuddle",
+          "name": "vroo_nuh",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "jogg_humpf",
-              "schema": "float",
+              "name": "vroo_glikk",
+              "schema": "double",
               "@context": null
             }
           }
@@ -109,16 +109,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_quan;1",
+        "@id": "dtmi:example:vroo_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "jogg_snee",
+          "name": "vroo_thnad",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "jogg_nuh",
-              "schema": "integer",
+              "name": "vroo_quan",
+              "schema": "duration",
               "@context": 626
             }
           }
@@ -134,16 +134,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_floob;1",
+        "@id": "dtmi:example:vroo_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "jogg_spazz",
+          "name": "vroo_zatz",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "jogg_thnad",
-              "schema": "long",
+              "name": "vroo_floob",
+              "schema": "float",
               "@context": true
             }
           }
@@ -159,16 +159,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_flunn;1",
+        "@id": "dtmi:example:vroo_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "jogg_jogg",
+          "name": "vroo_itch",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "jogg_zatz",
-              "schema": "string",
+              "name": "vroo_flunn",
+              "schema": "integer",
               "@context": [
                 null
               ]
@@ -186,16 +186,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_vroo;1",
+        "@id": "dtmi:example:hi_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "jogg_yekk",
+          "name": "vroo_hi",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "jogg_itch",
-              "schema": "time",
+              "name": "vroo_vroo",
+              "schema": "long",
               "@context": [
                 626
               ]
@@ -213,16 +213,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_beta;1",
+        "@id": "dtmi:example:hi_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "flunn_alpha",
+          "name": "hi_gamma",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "jogg_hi",
-              "schema": "boolean",
+              "name": "hi_beta",
+              "schema": "string",
               "@context": [
                 true
               ]
@@ -240,17 +240,67 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_epsilon;1",
+        "@id": "dtmi:example:hi_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "hi_zeta",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "hi_epsilon",
+              "schema": "time",
+              "@context": "dtmi:iotcentral:context"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:hi_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "hi_iota",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "hi_theta",
+              "schema": "boolean",
+              "@context": "http://iotcentral/context/2"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:hi_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "flunn_delta",
+          "name": "hi_mu",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "flunn_gamma",
+              "name": "hi_lambda",
               "schema": "date",
-              "@context": {}
+              "@context": "iotcentral;2"
             }
           }
         }
@@ -265,19 +315,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_theta;1",
+        "@id": "dtmi:example:hi_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "flunn_eta",
+          "name": "hi_omicron",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "flunn_zeta",
+              "name": "hi_xi",
               "schema": "dateTime",
-              "@context": [
-                {}
-              ]
+              "@context": {}
             }
           }
         }
@@ -292,17 +340,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_lambda;1",
+        "@id": "dtmi:example:hi_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "flunn_kappa",
+          "name": "hi_sigma",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "flunn_iota",
+              "name": "hi_rho",
               "schema": "double",
-              "@context": "dtmi:iotcentral:context"
+              "@context": {
+                "foo": "dtmi:foo:bar;1"
+              }
             }
           }
         }
@@ -317,17 +367,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_xi;1",
+        "@id": "dtmi:example:hi_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "flunn_nu",
+          "name": "hi_phi",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "flunn_mu",
+              "name": "hi_upsilon",
               "schema": "duration",
-              "@context": "http://iotcentral/context/2"
+              "@context": [
+                {}
+              ]
             }
           }
         }
@@ -342,17 +394,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_rho;1",
+        "@id": "dtmi:example:hi_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "flunn_pi",
+          "name": "hi_omega",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "flunn_omicron",
+              "name": "hi_psi",
               "schema": "float",
-              "@context": "iotcentral;2"
+              "@context": [
+                {
+                  "foo": "dtmi:foo:bar;1"
+                }
+              ]
             }
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassFieldGraphKeywordV2.json b/DTDL/v2/spec/Requirement-ClassFieldGraphKeywordV2.json
index ed4ae9dc..9bfef68a 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldGraphKeywordV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldGraphKeywordV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_quan;1",
+        "@id": "dtmi:example:xi_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_snee;1",
+          "@id": "dtmi:example:xi_itch;1",
           "@type": "Object",
           "fields": {
-            "name": "kappa_nuh",
+            "name": "xi_flunn",
             "schema": "duration",
             "@graph": {}
           }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_floob;1",
+        "@id": "dtmi:example:omicron_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_spazz;1",
+          "@id": "dtmi:example:xi_hi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "kappa_thnad",
+            "name": "xi_vroo",
             "schema": "float",
             "@graph": {}
           }
diff --git a/DTDL/v2/spec/Requirement-ClassFieldIdDuplicateV2.json b/DTDL/v2/spec/Requirement-ClassFieldIdDuplicateV2.json
index a75c33ee..5eb2fa78 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldIdDuplicateV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldIdDuplicateV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_wum;1",
+        "@id": "dtmi:example:eta_thnad;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:gamma_wum;1",
+          "@id": "dtmi:example:eta_thnad;1",
           "@type": "Property",
-          "name": "gamma_humpf",
+          "name": "eta_floob",
           "schema": {
-            "@id": "dtmi:example:gamma_wum;1",
+            "@id": "dtmi:example:eta_thnad;1",
             "@type": "Object",
             "fields": {
-              "@id": "dtmi:example:gamma_wum;1",
-              "name": "gamma_um",
+              "@id": "dtmi:example:eta_thnad;1",
+              "name": "eta_spazz",
               "schema": "time"
             }
           }
@@ -34,19 +34,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_fuddle;1",
+        "@id": "dtmi:example:eta_zatz;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:gamma_fuddle;1",
+          "@id": "dtmi:example:eta_zatz;1",
           "@type": "Property",
-          "name": "gamma_nuh",
+          "name": "eta_flunn",
           "schema": {
-            "@id": "dtmi:example:gamma_fuddle;1",
+            "@id": "dtmi:example:eta_zatz;1",
             "@type": "Object",
             "fields": {
               "@context": "dtmi:undefinedExtension:context;1",
-              "@id": "dtmi:example:gamma_fuddle;1",
-              "name": "gamma_glikk",
+              "@id": "dtmi:example:eta_zatz;1",
+              "name": "eta_jogg",
               "schema": "boolean"
             }
           }
diff --git a/DTDL/v2/spec/Requirement-ClassFieldIdIsDtmiV2.json b/DTDL/v2/spec/Requirement-ClassFieldIdIsDtmiV2.json
index 3bbc6cf0..8a6f591e 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldIdIsDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldIdIsDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_beta;1",
+        "@id": "dtmi:example:gamma_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_alpha;1",
+          "@id": "dtmi:example:gamma_iota;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;7",
-            "name": "yekk_hi",
+            "name": "gamma_theta",
             "schema": "double"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_epsilon;1",
+        "@id": "dtmi:example:gamma_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_delta;1",
+          "@id": "dtmi:example:gamma_mu;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;108675309",
-            "name": "vroo_gamma",
+            "name": "gamma_lambda",
             "schema": "duration"
           }
         }
@@ -51,14 +51,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_theta;1",
+        "@id": "dtmi:example:gamma_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_eta;1",
+          "@id": "dtmi:example:gamma_omicron;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;999999999",
-            "name": "vroo_zeta",
+            "name": "gamma_xi",
             "schema": "float"
           }
         }
@@ -73,14 +73,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_lambda;1",
+        "@id": "dtmi:example:gamma_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_kappa;1",
+          "@id": "dtmi:example:gamma_sigma;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo;1",
-            "name": "vroo_iota",
+            "name": "gamma_rho",
             "schema": "integer"
           }
         }
@@ -95,14 +95,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_xi;1",
+        "@id": "dtmi:example:gamma_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_nu;1",
+          "@id": "dtmi:example:gamma_phi;1",
           "@type": "Object",
           "fields": {
             "@id": null,
-            "name": "vroo_mu",
+            "name": "gamma_upsilon",
             "schema": "long"
           }
         }
@@ -117,15 +117,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_rho;1",
+        "@id": "dtmi:example:gamma_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_pi;1",
+          "@id": "dtmi:example:gamma_omega;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": null,
-            "name": "vroo_omicron",
+            "name": "gamma_psi",
             "schema": "string"
           }
         }
@@ -140,14 +140,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_upsilon;1",
+        "@id": "dtmi:example:gamma_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_tau;1",
+          "@id": "dtmi:example:gamma_um;1",
           "@type": "Object",
           "fields": {
             "@id": 626,
-            "name": "vroo_sigma",
+            "name": "gamma_wum",
             "schema": "time"
           }
         }
@@ -162,15 +162,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_psi;1",
+        "@id": "dtmi:example:gamma_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_chi;1",
+          "@id": "dtmi:example:gamma_glikk;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": 626,
-            "name": "vroo_phi",
+            "name": "gamma_fuddle",
             "schema": "boolean"
           }
         }
@@ -185,14 +185,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_wum;1",
+        "@id": "dtmi:example:gamma_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_yuzz;1",
+          "@id": "dtmi:example:gamma_quan;1",
           "@type": "Object",
           "fields": {
             "@id": true,
-            "name": "vroo_omega",
+            "name": "gamma_snee",
             "schema": "date"
           }
         }
@@ -207,15 +207,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_fuddle;1",
+        "@id": "dtmi:example:gamma_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_humpf;1",
+          "@id": "dtmi:example:gamma_floob;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": true,
-            "name": "vroo_um",
+            "name": "gamma_spazz",
             "schema": "dateTime"
           }
         }
@@ -230,16 +230,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_snee;1",
+        "@id": "dtmi:example:gamma_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_nuh;1",
+          "@id": "dtmi:example:gamma_flunn;1",
           "@type": "Object",
           "fields": {
             "@id": {
               "@value": "dtmi:apparently:valid:identifier;3"
             },
-            "name": "vroo_glikk",
+            "name": "gamma_jogg",
             "schema": "double"
           }
         }
@@ -254,17 +254,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_spazz;1",
+        "@id": "dtmi:example:gamma_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_thnad;1",
+          "@id": "dtmi:example:gamma_vroo;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": {
               "@value": "dtmi:apparently:valid:identifier;3"
             },
-            "name": "vroo_quan",
+            "name": "gamma_yekk",
             "schema": "duration"
           }
         }
@@ -279,14 +279,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_jogg;1",
+        "@id": "dtmi:example:delta_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_zatz;1",
+          "@id": "dtmi:example:delta_beta;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;0",
-            "name": "vroo_floob",
+            "name": "delta_alpha",
             "schema": "float"
           }
         }
@@ -301,15 +301,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_yekk;1",
+        "@id": "dtmi:example:delta_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_itch;1",
+          "@id": "dtmi:example:delta_epsilon;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0",
-            "name": "vroo_flunn",
+            "name": "delta_delta",
             "schema": "integer"
           }
         }
@@ -324,14 +324,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_alpha;1",
+        "@id": "dtmi:example:delta_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_hi;1",
+          "@id": "dtmi:example:delta_theta;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;0.0",
-            "name": "vroo_vroo",
+            "name": "delta_eta",
             "schema": "long"
           }
         }
@@ -346,15 +346,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_delta;1",
+        "@id": "dtmi:example:delta_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_gamma;1",
+          "@id": "dtmi:example:delta_lambda;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0.0",
-            "name": "hi_beta",
+            "name": "delta_kappa",
             "schema": "string"
           }
         }
@@ -369,14 +369,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_eta;1",
+        "@id": "dtmi:example:delta_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_zeta;1",
+          "@id": "dtmi:example:delta_xi;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;1234567890",
-            "name": "hi_epsilon",
+            "name": "delta_nu",
             "schema": "time"
           }
         }
@@ -391,15 +391,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_kappa;1",
+        "@id": "dtmi:example:delta_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_iota;1",
+          "@id": "dtmi:example:delta_rho;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;1234567890",
-            "name": "hi_theta",
+            "name": "delta_pi",
             "schema": "boolean"
           }
         }
@@ -414,14 +414,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_nu;1",
+        "@id": "dtmi:example:delta_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_mu;1",
+          "@id": "dtmi:example:delta_upsilon;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;1a",
-            "name": "hi_lambda",
+            "name": "delta_tau",
             "schema": "date"
           }
         }
@@ -436,15 +436,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_pi;1",
+        "@id": "dtmi:example:delta_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_omicron;1",
+          "@id": "dtmi:example:delta_psi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;1a",
-            "name": "hi_xi",
+            "name": "delta_chi",
             "schema": "dateTime"
           }
         }
@@ -459,14 +459,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_tau;1",
+        "@id": "dtmi:example:delta_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_sigma;1",
+          "@id": "dtmi:example:delta_wum;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;3.0",
-            "name": "hi_rho",
+            "name": "delta_yuzz",
             "schema": "double"
           }
         }
@@ -481,15 +481,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_chi;1",
+        "@id": "dtmi:example:delta_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_phi;1",
+          "@id": "dtmi:example:delta_fuddle;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.0",
-            "name": "hi_upsilon",
+            "name": "delta_humpf",
             "schema": "duration"
           }
         }
@@ -504,14 +504,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_yuzz;1",
+        "@id": "dtmi:example:delta_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_omega;1",
+          "@id": "dtmi:example:delta_snee;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;3.1415926",
-            "name": "hi_psi",
+            "name": "delta_nuh",
             "schema": "float"
           }
         }
@@ -526,15 +526,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_humpf;1",
+        "@id": "dtmi:example:delta_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_um;1",
+          "@id": "dtmi:example:delta_spazz;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.1415926",
-            "name": "hi_wum",
+            "name": "delta_thnad",
             "schema": "integer"
           }
         }
@@ -549,14 +549,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_nuh;1",
+        "@id": "dtmi:example:delta_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_glikk;1",
+          "@id": "dtmi:example:delta_jogg;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;6.02",
-            "name": "hi_fuddle",
+            "name": "delta_zatz",
             "schema": "long"
           }
         }
@@ -571,15 +571,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_thnad;1",
+        "@id": "dtmi:example:delta_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_quan;1",
+          "@id": "dtmi:example:delta_yekk;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;6.02",
-            "name": "hi_snee",
+            "name": "delta_itch",
             "schema": "string"
           }
         }
@@ -594,14 +594,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_zatz;1",
+        "@id": "dtmi:example:epsilon_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_floob;1",
+          "@id": "dtmi:example:epsilon_alpha;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;0.1",
-            "name": "hi_spazz",
+            "name": "delta_hi",
             "schema": "time"
           }
         }
@@ -616,15 +616,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_itch;1",
+        "@id": "dtmi:example:epsilon_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_flunn;1",
+          "@id": "dtmi:example:epsilon_delta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0.1",
-            "name": "hi_jogg",
+            "name": "epsilon_gamma",
             "schema": "boolean"
           }
         }
@@ -639,14 +639,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_hi;1",
+        "@id": "dtmi:example:epsilon_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_vroo;1",
+          "@id": "dtmi:example:epsilon_eta;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;01",
-            "name": "hi_yekk",
+            "name": "epsilon_zeta",
             "schema": "date"
           }
         }
@@ -661,15 +661,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_gamma;1",
+        "@id": "dtmi:example:epsilon_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_beta;1",
+          "@id": "dtmi:example:epsilon_kappa;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;01",
-            "name": "alpha_alpha",
+            "name": "epsilon_iota",
             "schema": "dateTime"
           }
         }
@@ -684,14 +684,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_zeta;1",
+        "@id": "dtmi:example:epsilon_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_epsilon;1",
+          "@id": "dtmi:example:epsilon_nu;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;",
-            "name": "alpha_delta",
+            "name": "epsilon_mu",
             "schema": "double"
           }
         }
@@ -706,15 +706,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_iota;1",
+        "@id": "dtmi:example:epsilon_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_theta;1",
+          "@id": "dtmi:example:epsilon_pi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;",
-            "name": "alpha_eta",
+            "name": "epsilon_omicron",
             "schema": "duration"
           }
         }
@@ -729,14 +729,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_mu;1",
+        "@id": "dtmi:example:epsilon_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_lambda;1",
+          "@id": "dtmi:example:epsilon_tau;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:test:invalidId_;1",
-            "name": "alpha_kappa",
+            "name": "epsilon_sigma",
             "schema": "float"
           }
         }
@@ -751,15 +751,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_omicron;1",
+        "@id": "dtmi:example:epsilon_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_xi;1",
+          "@id": "dtmi:example:epsilon_chi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:invalidId_;1",
-            "name": "alpha_nu",
+            "name": "epsilon_phi",
             "schema": "integer"
           }
         }
@@ -774,14 +774,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_sigma;1",
+        "@id": "dtmi:example:epsilon_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_rho;1",
+          "@id": "dtmi:example:epsilon_yuzz;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:test:_invalidUserId;1",
-            "name": "alpha_pi",
+            "name": "epsilon_omega",
             "schema": "long"
           }
         }
@@ -796,15 +796,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_phi;1",
+        "@id": "dtmi:example:epsilon_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_upsilon;1",
+          "@id": "dtmi:example:epsilon_humpf;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:_invalidUserId;1",
-            "name": "alpha_tau",
+            "name": "epsilon_um",
             "schema": "string"
           }
         }
@@ -819,14 +819,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_omega;1",
+        "@id": "dtmi:example:epsilon_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_psi;1",
+          "@id": "dtmi:example:epsilon_nuh;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:test:1seg;1",
-            "name": "alpha_chi",
+            "name": "epsilon_glikk",
             "schema": "time"
           }
         }
@@ -841,15 +841,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_um;1",
+        "@id": "dtmi:example:epsilon_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_wum;1",
+          "@id": "dtmi:example:epsilon_thnad;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:1seg;1",
-            "name": "alpha_yuzz",
+            "name": "epsilon_quan",
             "schema": "boolean"
           }
         }
@@ -864,14 +864,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_glikk;1",
+        "@id": "dtmi:example:epsilon_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_fuddle;1",
+          "@id": "dtmi:example:epsilon_zatz;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar.baz;1",
-            "name": "alpha_humpf",
+            "name": "epsilon_floob",
             "schema": "date"
           }
         }
@@ -886,15 +886,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_quan;1",
+        "@id": "dtmi:example:epsilon_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_snee;1",
+          "@id": "dtmi:example:epsilon_itch;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar.baz;1",
-            "name": "alpha_nuh",
+            "name": "epsilon_flunn",
             "schema": "dateTime"
           }
         }
@@ -909,14 +909,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_floob;1",
+        "@id": "dtmi:example:zeta_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_spazz;1",
+          "@id": "dtmi:example:epsilon_hi;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo::bar;1",
-            "name": "alpha_thnad",
+            "name": "epsilon_vroo",
             "schema": "double"
           }
         }
@@ -931,15 +931,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_flunn;1",
+        "@id": "dtmi:example:zeta_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_jogg;1",
+          "@id": "dtmi:example:zeta_gamma;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo::bar;1",
-            "name": "alpha_zatz",
+            "name": "zeta_beta",
             "schema": "duration"
           }
         }
@@ -954,14 +954,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_vroo;1",
+        "@id": "dtmi:example:zeta_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_yekk;1",
+          "@id": "dtmi:example:zeta_zeta;1",
           "@type": "Object",
           "fields": {
             "@id": "urn:foo:bar:1",
-            "name": "alpha_itch",
+            "name": "zeta_epsilon",
             "schema": "float"
           }
         }
@@ -976,15 +976,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_beta;1",
+        "@id": "dtmi:example:zeta_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_alpha;1",
+          "@id": "dtmi:example:zeta_iota;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "urn:foo:bar:1",
-            "name": "alpha_hi",
+            "name": "zeta_theta",
             "schema": "integer"
           }
         }
@@ -999,14 +999,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_epsilon;1",
+        "@id": "dtmi:example:zeta_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_delta;1",
+          "@id": "dtmi:example:zeta_mu;1",
           "@type": "Object",
           "fields": {
             "@id": "http://foo/bar/baz",
-            "name": "beta_gamma",
+            "name": "zeta_lambda",
             "schema": "long"
           }
         }
@@ -1021,15 +1021,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_theta;1",
+        "@id": "dtmi:example:zeta_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_eta;1",
+          "@id": "dtmi:example:zeta_omicron;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "http://foo/bar/baz",
-            "name": "beta_zeta",
+            "name": "zeta_xi",
             "schema": "string"
           }
         }
@@ -1044,14 +1044,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_lambda;1",
+        "@id": "dtmi:example:zeta_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_kappa;1",
+          "@id": "dtmi:example:zeta_sigma;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:;1",
-            "name": "beta_iota",
+            "name": "zeta_rho",
             "schema": "time"
           }
         }
@@ -1066,15 +1066,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_xi;1",
+        "@id": "dtmi:example:zeta_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_nu;1",
+          "@id": "dtmi:example:zeta_phi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:;1",
-            "name": "beta_mu",
+            "name": "zeta_upsilon",
             "schema": "boolean"
           }
         }
@@ -1089,14 +1089,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_rho;1",
+        "@id": "dtmi:example:zeta_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_pi;1",
+          "@id": "dtmi:example:zeta_omega;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar",
-            "name": "beta_omicron",
+            "name": "zeta_psi",
             "schema": "date"
           }
         }
@@ -1111,15 +1111,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_upsilon;1",
+        "@id": "dtmi:example:zeta_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_tau;1",
+          "@id": "dtmi:example:zeta_um;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar",
-            "name": "beta_sigma",
+            "name": "zeta_wum",
             "schema": "dateTime"
           }
         }
@@ -1134,14 +1134,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_psi;1",
+        "@id": "dtmi:example:zeta_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_chi;1",
+          "@id": "dtmi:example:zeta_glikk;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;3.14",
-            "name": "beta_phi",
+            "name": "zeta_fuddle",
             "schema": "double"
           }
         }
@@ -1156,15 +1156,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_wum;1",
+        "@id": "dtmi:example:zeta_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_yuzz;1",
+          "@id": "dtmi:example:zeta_quan;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.14",
-            "name": "beta_omega",
+            "name": "zeta_snee",
             "schema": "duration"
           }
         }
@@ -1179,14 +1179,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_fuddle;1",
+        "@id": "dtmi:example:zeta_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_humpf;1",
+          "@id": "dtmi:example:zeta_floob;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;3.141592",
-            "name": "beta_um",
+            "name": "zeta_spazz",
             "schema": "float"
           }
         }
@@ -1201,15 +1201,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_snee;1",
+        "@id": "dtmi:example:zeta_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_nuh;1",
+          "@id": "dtmi:example:zeta_flunn;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.141592",
-            "name": "beta_glikk",
+            "name": "zeta_jogg",
             "schema": "integer"
           }
         }
@@ -1224,14 +1224,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_spazz;1",
+        "@id": "dtmi:example:zeta_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_thnad;1",
+          "@id": "dtmi:example:zeta_vroo;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:dtdl:example;1",
-            "name": "beta_quan",
+            "name": "zeta_yekk",
             "schema": "long"
           }
         }
@@ -1246,15 +1246,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_jogg;1",
+        "@id": "dtmi:example:eta_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_zatz;1",
+          "@id": "dtmi:example:eta_beta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:dtdl:example;1",
-            "name": "beta_floob",
+            "name": "eta_alpha",
             "schema": "string"
           }
         }
@@ -1269,14 +1269,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_yekk;1",
+        "@id": "dtmi:example:eta_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_itch;1",
+          "@id": "dtmi:example:eta_epsilon;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:standard:example;1",
-            "name": "beta_flunn",
+            "name": "eta_delta",
             "schema": "time"
           }
         }
@@ -1291,15 +1291,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_alpha;1",
+        "@id": "dtmi:example:eta_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_hi;1",
+          "@id": "dtmi:example:eta_theta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:standard:example;1",
-            "name": "beta_vroo",
+            "name": "eta_eta",
             "schema": "boolean"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassFieldIdNotArrayV2.json b/DTDL/v2/spec/Requirement-ClassFieldIdNotArrayV2.json
index da54e484..f68fb718 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldIdNotArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldIdNotArrayV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_delta;1",
+        "@id": "dtmi:example:eta_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_gamma;1",
+          "@id": "dtmi:example:eta_lambda;1",
           "@type": "Object",
           "fields": {
             "@id": [
               "dtmi:foo:bar;7"
             ],
-            "name": "gamma_beta",
+            "name": "eta_kappa",
             "schema": "date"
           }
         }
@@ -31,17 +31,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_eta;1",
+        "@id": "dtmi:example:eta_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_zeta;1",
+          "@id": "dtmi:example:eta_xi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;7"
             ],
-            "name": "gamma_epsilon",
+            "name": "eta_nu",
             "schema": "dateTime"
           }
         }
@@ -56,16 +56,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_kappa;1",
+        "@id": "dtmi:example:eta_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_iota;1",
+          "@id": "dtmi:example:eta_rho;1",
           "@type": "Object",
           "fields": {
             "@id": [
               "dtmi:foo:bar;108675309"
             ],
-            "name": "gamma_theta",
+            "name": "eta_pi",
             "schema": "double"
           }
         }
@@ -80,17 +80,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_nu;1",
+        "@id": "dtmi:example:eta_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_mu;1",
+          "@id": "dtmi:example:eta_upsilon;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;108675309"
             ],
-            "name": "gamma_lambda",
+            "name": "eta_tau",
             "schema": "duration"
           }
         }
@@ -105,16 +105,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_pi;1",
+        "@id": "dtmi:example:eta_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_omicron;1",
+          "@id": "dtmi:example:eta_psi;1",
           "@type": "Object",
           "fields": {
             "@id": [
               "dtmi:foo:bar;999999999"
             ],
-            "name": "gamma_xi",
+            "name": "eta_chi",
             "schema": "float"
           }
         }
@@ -129,17 +129,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_tau;1",
+        "@id": "dtmi:example:eta_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_sigma;1",
+          "@id": "dtmi:example:eta_wum;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;999999999"
             ],
-            "name": "gamma_rho",
+            "name": "eta_yuzz",
             "schema": "integer"
           }
         }
@@ -154,16 +154,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_chi;1",
+        "@id": "dtmi:example:eta_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_phi;1",
+          "@id": "dtmi:example:eta_fuddle;1",
           "@type": "Object",
           "fields": {
             "@id": [
               "dtmi:foo;1"
             ],
-            "name": "gamma_upsilon",
+            "name": "eta_humpf",
             "schema": "long"
           }
         }
@@ -178,17 +178,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_yuzz;1",
+        "@id": "dtmi:example:eta_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_omega;1",
+          "@id": "dtmi:example:eta_snee;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo;1"
             ],
-            "name": "gamma_psi",
+            "name": "eta_nuh",
             "schema": "string"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassFieldPropertyCommentStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassFieldPropertyCommentStringLengthV2.json
index ea765a94..7dd17e4c 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldPropertyCommentStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldPropertyCommentStringLengthV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_lambda;1",
+        "@id": "dtmi:example:iota_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_kappa;1",
+          "@id": "dtmi:example:iota_sigma;1",
           "@type": "Object",
           "fields": {
-            "name": "epsilon_iota",
+            "name": "iota_rho",
             "schema": "dateTime",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_xi;1",
+        "@id": "dtmi:example:iota_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_nu;1",
+          "@id": "dtmi:example:iota_phi;1",
           "@type": "Object",
           "fields": {
-            "name": "epsilon_mu",
+            "name": "iota_upsilon",
             "schema": "double",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
@@ -51,14 +51,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_rho;1",
+        "@id": "dtmi:example:iota_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_pi;1",
+          "@id": "dtmi:example:iota_omega;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "epsilon_omicron",
+            "name": "iota_psi",
             "schema": "duration",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
diff --git a/DTDL/v2/spec/Requirement-ClassFieldPropertyCommentStringV2.json b/DTDL/v2/spec/Requirement-ClassFieldPropertyCommentStringV2.json
index 38cfa8b6..d2878d6a 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldPropertyCommentStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldPropertyCommentStringV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_thnad;1",
+        "@id": "dtmi:example:eta_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_quan;1",
+          "@id": "dtmi:example:eta_yekk;1",
           "@type": "Object",
           "fields": {
-            "name": "gamma_snee",
+            "name": "eta_itch",
             "schema": "date",
             "comment": "hello"
           }
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_zatz;1",
+        "@id": "dtmi:example:theta_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_floob;1",
+          "@id": "dtmi:example:theta_alpha;1",
           "@type": "Object",
           "fields": {
-            "name": "gamma_spazz",
+            "name": "eta_hi",
             "schema": "dateTime",
             "comment": [
               "hello"
@@ -53,13 +53,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_itch;1",
+        "@id": "dtmi:example:theta_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_flunn;1",
+          "@id": "dtmi:example:theta_delta;1",
           "@type": "Object",
           "fields": {
-            "name": "gamma_jogg",
+            "name": "theta_gamma",
             "schema": "double",
             "comment": {
               "@value": "hello",
@@ -78,13 +78,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_hi;1",
+        "@id": "dtmi:example:theta_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_vroo;1",
+          "@id": "dtmi:example:theta_eta;1",
           "@type": "Object",
           "fields": {
-            "name": "gamma_yekk",
+            "name": "theta_zeta",
             "schema": "duration",
             "comment": [
               {
@@ -105,13 +105,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_gamma;1",
+        "@id": "dtmi:example:theta_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_beta;1",
+          "@id": "dtmi:example:theta_kappa;1",
           "@type": "Object",
           "fields": {
-            "name": "delta_alpha",
+            "name": "theta_iota",
             "schema": "float",
             "comment": []
           }
@@ -127,13 +127,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_zeta;1",
+        "@id": "dtmi:example:theta_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_epsilon;1",
+          "@id": "dtmi:example:theta_nu;1",
           "@type": "Object",
           "fields": {
-            "name": "delta_delta",
+            "name": "theta_mu",
             "schema": "integer",
             "comment": null
           }
@@ -149,14 +149,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_iota;1",
+        "@id": "dtmi:example:theta_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_theta;1",
+          "@id": "dtmi:example:theta_pi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "delta_eta",
+            "name": "theta_omicron",
             "schema": "long",
             "comment": null
           }
@@ -172,13 +172,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_mu;1",
+        "@id": "dtmi:example:theta_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_lambda;1",
+          "@id": "dtmi:example:theta_tau;1",
           "@type": "Object",
           "fields": {
-            "name": "delta_kappa",
+            "name": "theta_sigma",
             "schema": "string",
             "comment": true
           }
@@ -194,14 +194,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_omicron;1",
+        "@id": "dtmi:example:theta_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_xi;1",
+          "@id": "dtmi:example:theta_chi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "delta_nu",
+            "name": "theta_phi",
             "schema": "time",
             "comment": true
           }
@@ -217,13 +217,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_sigma;1",
+        "@id": "dtmi:example:theta_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_rho;1",
+          "@id": "dtmi:example:theta_yuzz;1",
           "@type": "Object",
           "fields": {
-            "name": "delta_pi",
+            "name": "theta_omega",
             "schema": "boolean",
             "comment": 626
           }
@@ -239,14 +239,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_phi;1",
+        "@id": "dtmi:example:theta_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_upsilon;1",
+          "@id": "dtmi:example:theta_humpf;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "delta_tau",
+            "name": "theta_um",
             "schema": "date",
             "comment": 626
           }
@@ -262,13 +262,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_omega;1",
+        "@id": "dtmi:example:theta_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_psi;1",
+          "@id": "dtmi:example:theta_nuh;1",
           "@type": "Object",
           "fields": {
-            "name": "delta_chi",
+            "name": "theta_glikk",
             "schema": "dateTime",
             "comment": [
               null
@@ -286,14 +286,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_um;1",
+        "@id": "dtmi:example:theta_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_wum;1",
+          "@id": "dtmi:example:theta_thnad;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "delta_yuzz",
+            "name": "theta_quan",
             "schema": "double",
             "comment": [
               null
@@ -311,13 +311,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_glikk;1",
+        "@id": "dtmi:example:theta_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_fuddle;1",
+          "@id": "dtmi:example:theta_zatz;1",
           "@type": "Object",
           "fields": {
-            "name": "delta_humpf",
+            "name": "theta_floob",
             "schema": "duration",
             "comment": [
               true
@@ -335,14 +335,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_quan;1",
+        "@id": "dtmi:example:theta_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_snee;1",
+          "@id": "dtmi:example:theta_itch;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "delta_nuh",
+            "name": "theta_flunn",
             "schema": "float",
             "comment": [
               true
@@ -360,13 +360,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_floob;1",
+        "@id": "dtmi:example:iota_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_spazz;1",
+          "@id": "dtmi:example:theta_hi;1",
           "@type": "Object",
           "fields": {
-            "name": "delta_thnad",
+            "name": "theta_vroo",
             "schema": "integer",
             "comment": [
               626
@@ -384,14 +384,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_flunn;1",
+        "@id": "dtmi:example:iota_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_jogg;1",
+          "@id": "dtmi:example:iota_gamma;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "delta_zatz",
+            "name": "iota_beta",
             "schema": "long",
             "comment": [
               626
@@ -409,13 +409,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_vroo;1",
+        "@id": "dtmi:example:iota_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_yekk;1",
+          "@id": "dtmi:example:iota_zeta;1",
           "@type": "Object",
           "fields": {
-            "name": "delta_itch",
+            "name": "iota_epsilon",
             "schema": "string",
             "comment": {}
           }
@@ -431,14 +431,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_beta;1",
+        "@id": "dtmi:example:iota_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_alpha;1",
+          "@id": "dtmi:example:iota_iota;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "delta_hi",
+            "name": "iota_theta",
             "schema": "time",
             "comment": {}
           }
@@ -454,13 +454,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_epsilon;1",
+        "@id": "dtmi:example:iota_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_delta;1",
+          "@id": "dtmi:example:iota_mu;1",
           "@type": "Object",
           "fields": {
-            "name": "epsilon_gamma",
+            "name": "iota_lambda",
             "schema": "boolean",
             "comment": [
               {}
@@ -478,14 +478,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_theta;1",
+        "@id": "dtmi:example:iota_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_eta;1",
+          "@id": "dtmi:example:iota_omicron;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "epsilon_zeta",
+            "name": "iota_xi",
             "schema": "date",
             "comment": [
               {}
diff --git a/DTDL/v2/spec/Requirement-ClassFieldPropertyCommentTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassFieldPropertyCommentTermAndDtmiV2.json
index 9600abcd..9c38e47c 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldPropertyCommentTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldPropertyCommentTermAndDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_thnad;1",
+        "@id": "dtmi:example:iota_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_quan;1",
+          "@id": "dtmi:example:iota_yekk;1",
           "@type": "Object",
           "fields": {
-            "comment": "epsilon_glikk",
-            "dtmi:dtdl:property:comment;2": "epsilon_nuh",
-            "name": "epsilon_snee",
+            "comment": "iota_jogg",
+            "dtmi:dtdl:property:comment;2": "iota_flunn",
+            "name": "iota_itch",
             "schema": "string"
           }
         }
@@ -30,16 +30,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_flunn;1",
+        "@id": "dtmi:example:kappa_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_jogg;1",
+          "@id": "dtmi:example:kappa_gamma;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "comment": "epsilon_spazz",
-            "dtmi:dtdl:property:comment;2": "epsilon_floob",
-            "name": "epsilon_zatz",
+            "comment": "iota_hi",
+            "dtmi:dtdl:property:comment;2": "kappa_alpha",
+            "name": "kappa_beta",
             "schema": "time"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassFieldPropertyDescriptionLangStringV2.json b/DTDL/v2/spec/Requirement-ClassFieldPropertyDescriptionLangStringV2.json
index 58820216..86dd3807 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldPropertyDescriptionLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldPropertyDescriptionLangStringV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_vroo;1",
+        "@id": "dtmi:example:kappa_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_yekk;1",
+          "@id": "dtmi:example:kappa_zeta;1",
           "@type": "Object",
           "fields": {
-            "name": "epsilon_itch",
+            "name": "kappa_epsilon",
             "schema": "boolean",
             "description": "hello"
           }
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_beta;1",
+        "@id": "dtmi:example:kappa_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_alpha;1",
+          "@id": "dtmi:example:kappa_iota;1",
           "@type": "Object",
           "fields": {
-            "name": "epsilon_hi",
+            "name": "kappa_theta",
             "schema": "date",
             "description": [
               "hello"
@@ -53,13 +53,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_epsilon;1",
+        "@id": "dtmi:example:kappa_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_delta;1",
+          "@id": "dtmi:example:kappa_mu;1",
           "@type": "Object",
           "fields": {
-            "name": "zeta_gamma",
+            "name": "kappa_lambda",
             "schema": "dateTime",
             "description": {
               "en": "hello"
@@ -77,13 +77,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_theta;1",
+        "@id": "dtmi:example:kappa_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_eta;1",
+          "@id": "dtmi:example:kappa_omicron;1",
           "@type": "Object",
           "fields": {
-            "name": "zeta_zeta",
+            "name": "kappa_xi",
             "schema": "double",
             "description": [
               {
@@ -104,13 +104,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_lambda;1",
+        "@id": "dtmi:example:kappa_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_kappa;1",
+          "@id": "dtmi:example:kappa_sigma;1",
           "@type": "Object",
           "fields": {
-            "name": "zeta_iota",
+            "name": "kappa_rho",
             "schema": "duration",
             "description": {}
           }
@@ -126,13 +126,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_xi;1",
+        "@id": "dtmi:example:kappa_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_nu;1",
+          "@id": "dtmi:example:kappa_phi;1",
           "@type": "Object",
           "fields": {
-            "name": "zeta_mu",
+            "name": "kappa_upsilon",
             "schema": "float",
             "description": []
           }
@@ -148,13 +148,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_rho;1",
+        "@id": "dtmi:example:kappa_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_pi;1",
+          "@id": "dtmi:example:kappa_omega;1",
           "@type": "Object",
           "fields": {
-            "name": "zeta_omicron",
+            "name": "kappa_psi",
             "schema": "integer",
             "description": null
           }
@@ -170,14 +170,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_upsilon;1",
+        "@id": "dtmi:example:kappa_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_tau;1",
+          "@id": "dtmi:example:kappa_um;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_sigma",
+            "name": "kappa_wum",
             "schema": "long",
             "description": null
           }
@@ -193,13 +193,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_psi;1",
+        "@id": "dtmi:example:kappa_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_chi;1",
+          "@id": "dtmi:example:kappa_glikk;1",
           "@type": "Object",
           "fields": {
-            "name": "zeta_phi",
+            "name": "kappa_fuddle",
             "schema": "string",
             "description": true
           }
@@ -215,14 +215,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_wum;1",
+        "@id": "dtmi:example:kappa_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_yuzz;1",
+          "@id": "dtmi:example:kappa_quan;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_omega",
+            "name": "kappa_snee",
             "schema": "time",
             "description": true
           }
@@ -238,13 +238,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_fuddle;1",
+        "@id": "dtmi:example:kappa_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_humpf;1",
+          "@id": "dtmi:example:kappa_floob;1",
           "@type": "Object",
           "fields": {
-            "name": "zeta_um",
+            "name": "kappa_spazz",
             "schema": "boolean",
             "description": 626
           }
@@ -260,14 +260,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_snee;1",
+        "@id": "dtmi:example:kappa_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_nuh;1",
+          "@id": "dtmi:example:kappa_flunn;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_glikk",
+            "name": "kappa_jogg",
             "schema": "date",
             "description": 626
           }
@@ -283,13 +283,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_spazz;1",
+        "@id": "dtmi:example:kappa_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_thnad;1",
+          "@id": "dtmi:example:kappa_vroo;1",
           "@type": "Object",
           "fields": {
-            "name": "zeta_quan",
+            "name": "kappa_yekk",
             "schema": "dateTime",
             "description": [
               null
@@ -307,14 +307,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_jogg;1",
+        "@id": "dtmi:example:lambda_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_zatz;1",
+          "@id": "dtmi:example:lambda_beta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_floob",
+            "name": "lambda_alpha",
             "schema": "double",
             "description": [
               null
@@ -332,13 +332,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_yekk;1",
+        "@id": "dtmi:example:lambda_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_itch;1",
+          "@id": "dtmi:example:lambda_epsilon;1",
           "@type": "Object",
           "fields": {
-            "name": "zeta_flunn",
+            "name": "lambda_delta",
             "schema": "duration",
             "description": [
               true
@@ -356,14 +356,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_alpha;1",
+        "@id": "dtmi:example:lambda_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_hi;1",
+          "@id": "dtmi:example:lambda_theta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_vroo",
+            "name": "lambda_eta",
             "schema": "float",
             "description": [
               true
@@ -381,13 +381,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_delta;1",
+        "@id": "dtmi:example:lambda_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_gamma;1",
+          "@id": "dtmi:example:lambda_lambda;1",
           "@type": "Object",
           "fields": {
-            "name": "eta_beta",
+            "name": "lambda_kappa",
             "schema": "integer",
             "description": [
               626
@@ -405,14 +405,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_eta;1",
+        "@id": "dtmi:example:lambda_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_zeta;1",
+          "@id": "dtmi:example:lambda_xi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "eta_epsilon",
+            "name": "lambda_nu",
             "schema": "long",
             "description": [
               626
@@ -430,13 +430,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_kappa;1",
+        "@id": "dtmi:example:lambda_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_iota;1",
+          "@id": "dtmi:example:lambda_rho;1",
           "@type": "Object",
           "fields": {
-            "name": "eta_theta",
+            "name": "lambda_pi",
             "schema": "string",
             "description": [
               {}
@@ -454,14 +454,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_nu;1",
+        "@id": "dtmi:example:lambda_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_mu;1",
+          "@id": "dtmi:example:lambda_upsilon;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "eta_lambda",
+            "name": "lambda_tau",
             "schema": "time",
             "description": [
               {}
@@ -479,13 +479,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_pi;1",
+        "@id": "dtmi:example:lambda_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_omicron;1",
+          "@id": "dtmi:example:lambda_psi;1",
           "@type": "Object",
           "fields": {
-            "name": "eta_xi",
+            "name": "lambda_chi",
             "schema": "boolean",
             "description": {
               "@value": "hello",
@@ -504,14 +504,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_tau;1",
+        "@id": "dtmi:example:lambda_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_sigma;1",
+          "@id": "dtmi:example:lambda_wum;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "eta_rho",
+            "name": "lambda_yuzz",
             "schema": "date",
             "description": {
               "@value": "hello",
@@ -530,13 +530,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_chi;1",
+        "@id": "dtmi:example:lambda_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_phi;1",
+          "@id": "dtmi:example:lambda_fuddle;1",
           "@type": "Object",
           "fields": {
-            "name": "eta_upsilon",
+            "name": "lambda_humpf",
             "schema": "dateTime",
             "description": [
               {
@@ -556,14 +556,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_yuzz;1",
+        "@id": "dtmi:example:lambda_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_omega;1",
+          "@id": "dtmi:example:lambda_snee;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "eta_psi",
+            "name": "lambda_nuh",
             "schema": "double",
             "description": [
               {
diff --git a/DTDL/v2/spec/Requirement-ClassFieldPropertyDescriptionStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassFieldPropertyDescriptionStringLengthV2.json
index 7319fbe1..28873b47 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldPropertyDescriptionStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldPropertyDescriptionStringLengthV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_humpf;1",
+        "@id": "dtmi:example:lambda_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_um;1",
+          "@id": "dtmi:example:lambda_spazz;1",
           "@type": "Object",
           "fields": {
-            "name": "eta_wum",
+            "name": "lambda_thnad",
             "schema": "duration",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_nuh;1",
+        "@id": "dtmi:example:lambda_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_glikk;1",
+          "@id": "dtmi:example:lambda_jogg;1",
           "@type": "Object",
           "fields": {
-            "name": "eta_fuddle",
+            "name": "lambda_zatz",
             "schema": "float",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
@@ -51,14 +51,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_thnad;1",
+        "@id": "dtmi:example:lambda_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_quan;1",
+          "@id": "dtmi:example:lambda_yekk;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "eta_snee",
+            "name": "lambda_itch",
             "schema": "integer",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
diff --git a/DTDL/v2/spec/Requirement-ClassFieldPropertyDescriptionTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassFieldPropertyDescriptionTermAndDtmiV2.json
index 354373b8..b3529dba 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldPropertyDescriptionTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldPropertyDescriptionTermAndDtmiV2.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_theta;1",
+        "@id": "dtmi:example:mu_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_eta;1",
+          "@id": "dtmi:example:mu_omicron;1",
           "@type": "Object",
           "fields": {
             "description": [
-              "theta_delta"
+              "mu_mu"
             ],
             "dtmi:dtdl:property:description;2": [
-              "theta_epsilon"
+              "mu_nu"
             ],
-            "name": "theta_zeta",
+            "name": "mu_xi",
             "schema": "boolean"
           }
         }
@@ -34,20 +34,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_nu;1",
+        "@id": "dtmi:example:mu_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_mu;1",
+          "@id": "dtmi:example:mu_upsilon;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "description": [
-              "theta_iota"
+              "mu_rho"
             ],
             "dtmi:dtdl:property:description;2": [
-              "theta_kappa"
+              "mu_sigma"
             ],
-            "name": "theta_lambda",
+            "name": "mu_tau",
             "schema": "date"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassFieldPropertyDisplayNameLangStringV2.json b/DTDL/v2/spec/Requirement-ClassFieldPropertyDisplayNameLangStringV2.json
index 585f3ef2..27e72d8c 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldPropertyDisplayNameLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldPropertyDisplayNameLangStringV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_pi;1",
+        "@id": "dtmi:example:mu_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_omicron;1",
+          "@id": "dtmi:example:mu_psi;1",
           "@type": "Object",
           "fields": {
-            "name": "theta_xi",
+            "name": "mu_chi",
             "schema": "dateTime",
             "displayName": "hello"
           }
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_tau;1",
+        "@id": "dtmi:example:mu_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_sigma;1",
+          "@id": "dtmi:example:mu_wum;1",
           "@type": "Object",
           "fields": {
-            "name": "theta_rho",
+            "name": "mu_yuzz",
             "schema": "double",
             "displayName": [
               "hello"
@@ -53,13 +53,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_chi;1",
+        "@id": "dtmi:example:mu_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_phi;1",
+          "@id": "dtmi:example:mu_fuddle;1",
           "@type": "Object",
           "fields": {
-            "name": "theta_upsilon",
+            "name": "mu_humpf",
             "schema": "duration",
             "displayName": {
               "en": "hello"
@@ -77,13 +77,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_yuzz;1",
+        "@id": "dtmi:example:mu_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_omega;1",
+          "@id": "dtmi:example:mu_snee;1",
           "@type": "Object",
           "fields": {
-            "name": "theta_psi",
+            "name": "mu_nuh",
             "schema": "float",
             "displayName": [
               {
@@ -104,13 +104,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_humpf;1",
+        "@id": "dtmi:example:mu_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_um;1",
+          "@id": "dtmi:example:mu_spazz;1",
           "@type": "Object",
           "fields": {
-            "name": "theta_wum",
+            "name": "mu_thnad",
             "schema": "integer",
             "displayName": {}
           }
@@ -126,13 +126,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_nuh;1",
+        "@id": "dtmi:example:mu_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_glikk;1",
+          "@id": "dtmi:example:mu_jogg;1",
           "@type": "Object",
           "fields": {
-            "name": "theta_fuddle",
+            "name": "mu_zatz",
             "schema": "long",
             "displayName": []
           }
@@ -148,13 +148,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_thnad;1",
+        "@id": "dtmi:example:mu_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_quan;1",
+          "@id": "dtmi:example:mu_yekk;1",
           "@type": "Object",
           "fields": {
-            "name": "theta_snee",
+            "name": "mu_itch",
             "schema": "string",
             "displayName": null
           }
@@ -170,14 +170,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_zatz;1",
+        "@id": "dtmi:example:nu_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_floob;1",
+          "@id": "dtmi:example:nu_alpha;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "theta_spazz",
+            "name": "mu_hi",
             "schema": "time",
             "displayName": null
           }
@@ -193,13 +193,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_itch;1",
+        "@id": "dtmi:example:nu_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_flunn;1",
+          "@id": "dtmi:example:nu_delta;1",
           "@type": "Object",
           "fields": {
-            "name": "theta_jogg",
+            "name": "nu_gamma",
             "schema": "boolean",
             "displayName": true
           }
@@ -215,14 +215,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_hi;1",
+        "@id": "dtmi:example:nu_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_vroo;1",
+          "@id": "dtmi:example:nu_eta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "theta_yekk",
+            "name": "nu_zeta",
             "schema": "date",
             "displayName": true
           }
@@ -238,13 +238,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_gamma;1",
+        "@id": "dtmi:example:nu_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_beta;1",
+          "@id": "dtmi:example:nu_kappa;1",
           "@type": "Object",
           "fields": {
-            "name": "iota_alpha",
+            "name": "nu_iota",
             "schema": "dateTime",
             "displayName": 626
           }
@@ -260,14 +260,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_zeta;1",
+        "@id": "dtmi:example:nu_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_epsilon;1",
+          "@id": "dtmi:example:nu_nu;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "iota_delta",
+            "name": "nu_mu",
             "schema": "double",
             "displayName": 626
           }
@@ -283,13 +283,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_iota;1",
+        "@id": "dtmi:example:nu_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_theta;1",
+          "@id": "dtmi:example:nu_pi;1",
           "@type": "Object",
           "fields": {
-            "name": "iota_eta",
+            "name": "nu_omicron",
             "schema": "duration",
             "displayName": [
               null
@@ -307,14 +307,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_mu;1",
+        "@id": "dtmi:example:nu_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_lambda;1",
+          "@id": "dtmi:example:nu_tau;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "iota_kappa",
+            "name": "nu_sigma",
             "schema": "float",
             "displayName": [
               null
@@ -332,13 +332,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_omicron;1",
+        "@id": "dtmi:example:nu_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_xi;1",
+          "@id": "dtmi:example:nu_chi;1",
           "@type": "Object",
           "fields": {
-            "name": "iota_nu",
+            "name": "nu_phi",
             "schema": "integer",
             "displayName": [
               true
@@ -356,14 +356,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_sigma;1",
+        "@id": "dtmi:example:nu_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_rho;1",
+          "@id": "dtmi:example:nu_yuzz;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "iota_pi",
+            "name": "nu_omega",
             "schema": "long",
             "displayName": [
               true
@@ -381,13 +381,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_phi;1",
+        "@id": "dtmi:example:nu_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_upsilon;1",
+          "@id": "dtmi:example:nu_humpf;1",
           "@type": "Object",
           "fields": {
-            "name": "iota_tau",
+            "name": "nu_um",
             "schema": "string",
             "displayName": [
               626
@@ -405,14 +405,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_omega;1",
+        "@id": "dtmi:example:nu_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_psi;1",
+          "@id": "dtmi:example:nu_nuh;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "iota_chi",
+            "name": "nu_glikk",
             "schema": "time",
             "displayName": [
               626
@@ -430,13 +430,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_um;1",
+        "@id": "dtmi:example:nu_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_wum;1",
+          "@id": "dtmi:example:nu_thnad;1",
           "@type": "Object",
           "fields": {
-            "name": "iota_yuzz",
+            "name": "nu_quan",
             "schema": "boolean",
             "displayName": [
               {}
@@ -454,14 +454,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_glikk;1",
+        "@id": "dtmi:example:nu_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_fuddle;1",
+          "@id": "dtmi:example:nu_zatz;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "iota_humpf",
+            "name": "nu_floob",
             "schema": "date",
             "displayName": [
               {}
@@ -479,13 +479,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_quan;1",
+        "@id": "dtmi:example:nu_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_snee;1",
+          "@id": "dtmi:example:nu_itch;1",
           "@type": "Object",
           "fields": {
-            "name": "iota_nuh",
+            "name": "nu_flunn",
             "schema": "dateTime",
             "displayName": {
               "@value": "hello",
@@ -504,14 +504,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_floob;1",
+        "@id": "dtmi:example:xi_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_spazz;1",
+          "@id": "dtmi:example:nu_hi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "iota_thnad",
+            "name": "nu_vroo",
             "schema": "double",
             "displayName": {
               "@value": "hello",
@@ -530,13 +530,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_flunn;1",
+        "@id": "dtmi:example:xi_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_jogg;1",
+          "@id": "dtmi:example:xi_gamma;1",
           "@type": "Object",
           "fields": {
-            "name": "iota_zatz",
+            "name": "xi_beta",
             "schema": "duration",
             "displayName": [
               {
@@ -556,14 +556,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_vroo;1",
+        "@id": "dtmi:example:xi_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_yekk;1",
+          "@id": "dtmi:example:xi_zeta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "iota_itch",
+            "name": "xi_epsilon",
             "schema": "float",
             "displayName": [
               {
diff --git a/DTDL/v2/spec/Requirement-ClassFieldPropertyDisplayNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassFieldPropertyDisplayNameStringLengthV2.json
index 32d2ccab..b22e5983 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldPropertyDisplayNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldPropertyDisplayNameStringLengthV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_beta;1",
+        "@id": "dtmi:example:xi_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_alpha;1",
+          "@id": "dtmi:example:xi_iota;1",
           "@type": "Object",
           "fields": {
-            "name": "iota_hi",
+            "name": "xi_theta",
             "schema": "integer",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSometh"
           }
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_epsilon;1",
+        "@id": "dtmi:example:xi_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_delta;1",
+          "@id": "dtmi:example:xi_mu;1",
           "@type": "Object",
           "fields": {
-            "name": "kappa_gamma",
+            "name": "xi_lambda",
             "schema": "long",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
           }
@@ -51,14 +51,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_theta;1",
+        "@id": "dtmi:example:xi_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_eta;1",
+          "@id": "dtmi:example:xi_omicron;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "kappa_zeta",
+            "name": "xi_xi",
             "schema": "string",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
           }
diff --git a/DTDL/v2/spec/Requirement-ClassFieldPropertyDisplayNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassFieldPropertyDisplayNameTermAndDtmiV2.json
index c3c84330..62ebfaab 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldPropertyDisplayNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldPropertyDisplayNameTermAndDtmiV2.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_yuzz;1",
+        "@id": "dtmi:example:xi_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_omega;1",
+          "@id": "dtmi:example:xi_snee;1",
           "@type": "Object",
           "fields": {
             "displayName": [
-              "kappa_phi"
+              "xi_fuddle"
             ],
             "dtmi:dtdl:property:displayName;2": [
-              "kappa_chi"
+              "xi_glikk"
             ],
-            "name": "kappa_psi",
+            "name": "xi_nuh",
             "schema": "dateTime"
           }
         }
@@ -34,20 +34,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_glikk;1",
+        "@id": "dtmi:example:xi_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_fuddle;1",
+          "@id": "dtmi:example:xi_zatz;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "displayName": [
-              "kappa_wum"
+              "xi_thnad"
             ],
             "dtmi:dtdl:property:displayName;2": [
-              "kappa_um"
+              "xi_spazz"
             ],
-            "name": "kappa_humpf",
+            "name": "xi_floob",
             "schema": "double"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassFieldPropertyFormallyInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassFieldPropertyFormallyInvalidDtmiV2.json
index 84c1842f..1ea2b7e4 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldPropertyFormallyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldPropertyFormallyInvalidDtmiV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_wum;1",
+        "@id": "dtmi:example:omicron_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_yuzz;1",
+          "@id": "dtmi:example:omicron_quan;1",
           "@type": "Object",
           "fields": {
-            "name": "lambda_omega",
+            "name": "omicron_snee",
             "schema": "integer",
             "dtmi:foo//bar": 626
           }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_fuddle;1",
+        "@id": "dtmi:example:omicron_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_humpf;1",
+          "@id": "dtmi:example:omicron_floob;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "lambda_um",
+            "name": "omicron_spazz",
             "schema": "long",
             "dtmi:foo//bar": 626
           }
diff --git a/DTDL/v2/spec/Requirement-ClassFieldPropertyFormallyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Requirement-ClassFieldPropertyFormallyIrrelevantDtmiOrTermV2.json
index a801c8ba..12a7b0e0 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldPropertyFormallyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldPropertyFormallyIrrelevantDtmiOrTermV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_lambda;1",
+        "@id": "dtmi:example:omicron_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_kappa;1",
+          "@id": "dtmi:example:omicron_sigma;1",
           "@type": "Object",
           "fields": {
-            "name": "lambda_iota",
+            "name": "omicron_rho",
             "schema": "date",
             "dtmi:foo:bar;1": 626
           }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_xi;1",
+        "@id": "dtmi:example:omicron_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_nu;1",
+          "@id": "dtmi:example:omicron_phi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "lambda_mu",
+            "name": "omicron_upsilon",
             "schema": "dateTime",
             "dtmi:foo:bar;1": 626
           }
@@ -52,13 +52,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_rho;1",
+        "@id": "dtmi:example:omicron_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_pi;1",
+          "@id": "dtmi:example:omicron_omega;1",
           "@type": "Object",
           "fields": {
-            "name": "lambda_omicron",
+            "name": "omicron_psi",
             "schema": "double",
             "boolean": null
           }
@@ -74,14 +74,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_upsilon;1",
+        "@id": "dtmi:example:omicron_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_tau;1",
+          "@id": "dtmi:example:omicron_um;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "lambda_sigma",
+            "name": "omicron_wum",
             "schema": "duration",
             "boolean": null
           }
diff --git a/DTDL/v2/spec/Requirement-ClassFieldPropertyFormallyNotDtmiNorTermV2.json b/DTDL/v2/spec/Requirement-ClassFieldPropertyFormallyNotDtmiNorTermV2.json
index ac49ff26..82f4d2b9 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldPropertyFormallyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldPropertyFormallyNotDtmiNorTermV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_spazz;1",
+        "@id": "dtmi:example:omicron_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_thnad;1",
+          "@id": "dtmi:example:omicron_vroo;1",
           "@type": "Object",
           "fields": {
-            "name": "lambda_quan",
+            "name": "omicron_yekk",
             "schema": "time",
             "http://foo.com/bar": true
           }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_jogg;1",
+        "@id": "dtmi:example:pi_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_zatz;1",
+          "@id": "dtmi:example:pi_beta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "lambda_floob",
+            "name": "pi_alpha",
             "schema": "boolean",
             "http://foo.com/bar": true
           }
diff --git a/DTDL/v2/spec/Requirement-ClassFieldPropertyFormallyUndefinedTermV2.json b/DTDL/v2/spec/Requirement-ClassFieldPropertyFormallyUndefinedTermV2.json
index dd4ebeaa..e983e1da 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldPropertyFormallyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldPropertyFormallyUndefinedTermV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_alpha;1",
+        "@id": "dtmi:example:pi_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_hi;1",
+          "@id": "dtmi:example:pi_theta;1",
           "@type": "Object",
           "fields": {
-            "name": "lambda_vroo",
+            "name": "pi_eta",
             "schema": "dateTime",
             "foobar": {}
           }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_delta;1",
+        "@id": "dtmi:example:pi_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_gamma;1",
+          "@id": "dtmi:example:pi_lambda;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "mu_beta",
+            "name": "pi_kappa",
             "schema": "double",
             "foobar": {}
           }
diff --git a/DTDL/v2/spec/Requirement-ClassFieldPropertyNamePatternV2.json b/DTDL/v2/spec/Requirement-ClassFieldPropertyNamePatternV2.json
index 6dc6ff2c..ca5b0be5 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldPropertyNamePatternV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldPropertyNamePatternV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_spazz;1",
+        "@id": "dtmi:example:quan_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_thnad;1",
+          "@id": "dtmi:example:quan_humpf;1",
           "@type": "Object",
           "fields": {
-            "schema": "boolean",
+            "schema": "string",
             "name": "EARTH"
           }
         }
@@ -28,13 +28,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_zatz;1",
+        "@id": "dtmi:example:quan_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_floob;1",
+          "@id": "dtmi:example:quan_glikk;1",
           "@type": "Object",
           "fields": {
-            "schema": "date",
+            "schema": "time",
             "name": "Air"
           }
         }
@@ -49,13 +49,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_flunn;1",
+        "@id": "dtmi:example:quan_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_jogg;1",
+          "@id": "dtmi:example:quan_snee;1",
           "@type": "Object",
           "fields": {
-            "schema": "dateTime",
+            "schema": "boolean",
             "name": "fire"
           }
         }
@@ -70,13 +70,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_yekk;1",
+        "@id": "dtmi:example:quan_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_itch;1",
+          "@id": "dtmi:example:quan_thnad;1",
           "@type": "Object",
           "fields": {
-            "schema": "double",
+            "schema": "date",
             "name": "hello_world"
           }
         }
@@ -91,13 +91,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_hi;1",
+        "@id": "dtmi:example:quan_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_vroo;1",
+          "@id": "dtmi:example:quan_floob;1",
           "@type": "Object",
           "fields": {
-            "schema": "duration",
+            "schema": "dateTime",
             "name": "Anarchy99"
           }
         }
@@ -112,13 +112,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_beta;1",
+        "@id": "dtmi:example:quan_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_alpha;1",
+          "@id": "dtmi:example:quan_jogg;1",
           "@type": "Object",
           "fields": {
-            "schema": "float",
+            "schema": "double",
             "name": "23skidoo"
           }
         }
@@ -133,14 +133,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_delta;1",
+        "@id": "dtmi:example:quan_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_gamma;1",
+          "@id": "dtmi:example:quan_itch;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "integer",
+            "schema": "duration",
             "name": "23skidoo"
           }
         }
@@ -155,13 +155,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_zeta;1",
+        "@id": "dtmi:example:quan_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_epsilon;1",
+          "@id": "dtmi:example:quan_vroo;1",
           "@type": "Object",
           "fields": {
-            "schema": "long",
+            "schema": "float",
             "name": "626"
           }
         }
@@ -176,14 +176,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_theta;1",
+        "@id": "dtmi:example:thnad_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_eta;1",
+          "@id": "dtmi:example:thnad_alpha;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "string",
+            "schema": "integer",
             "name": "626"
           }
         }
@@ -198,13 +198,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_kappa;1",
+        "@id": "dtmi:example:thnad_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_iota;1",
+          "@id": "dtmi:example:thnad_gamma;1",
           "@type": "Object",
           "fields": {
-            "schema": "time",
+            "schema": "long",
             "name": "goodbye-world"
           }
         }
@@ -219,14 +219,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_mu;1",
+        "@id": "dtmi:example:thnad_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_lambda;1",
+          "@id": "dtmi:example:thnad_epsilon;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "boolean",
+            "schema": "string",
             "name": "goodbye-world"
           }
         }
@@ -241,13 +241,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_xi;1",
+        "@id": "dtmi:example:thnad_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_nu;1",
+          "@id": "dtmi:example:thnad_eta;1",
           "@type": "Object",
           "fields": {
-            "schema": "date",
+            "schema": "time",
             "name": "_haha"
           }
         }
@@ -262,14 +262,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_pi;1",
+        "@id": "dtmi:example:thnad_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_omicron;1",
+          "@id": "dtmi:example:thnad_iota;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "dateTime",
+            "schema": "boolean",
             "name": "_haha"
           }
         }
@@ -284,13 +284,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_sigma;1",
+        "@id": "dtmi:example:thnad_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_rho;1",
+          "@id": "dtmi:example:thnad_lambda;1",
           "@type": "Object",
           "fields": {
-            "schema": "double",
+            "schema": "date",
             "name": "toodaloo_"
           }
         }
@@ -305,14 +305,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_upsilon;1",
+        "@id": "dtmi:example:thnad_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_tau;1",
+          "@id": "dtmi:example:thnad_nu;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "duration",
+            "schema": "dateTime",
             "name": "toodaloo_"
           }
         }
@@ -327,13 +327,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_chi;1",
+        "@id": "dtmi:example:thnad_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_phi;1",
+          "@id": "dtmi:example:thnad_omicron;1",
           "@type": "Object",
           "fields": {
-            "schema": "float",
+            "schema": "double",
             "name": "pro:con"
           }
         }
@@ -348,14 +348,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_omega;1",
+        "@id": "dtmi:example:thnad_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_psi;1",
+          "@id": "dtmi:example:thnad_rho;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "integer",
+            "schema": "duration",
             "name": "pro:con"
           }
         }
@@ -370,13 +370,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_wum;1",
+        "@id": "dtmi:example:thnad_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_yuzz;1",
+          "@id": "dtmi:example:thnad_tau;1",
           "@type": "Object",
           "fields": {
-            "schema": "long",
+            "schema": "float",
             "name": "mish/mash"
           }
         }
@@ -391,14 +391,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_humpf;1",
+        "@id": "dtmi:example:thnad_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_um;1",
+          "@id": "dtmi:example:thnad_phi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "string",
+            "schema": "integer",
             "name": "mish/mash"
           }
         }
@@ -413,13 +413,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_glikk;1",
+        "@id": "dtmi:example:thnad_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_fuddle;1",
+          "@id": "dtmi:example:thnad_psi;1",
           "@type": "Object",
           "fields": {
-            "schema": "time",
+            "schema": "long",
             "name": "#tag"
           }
         }
@@ -434,14 +434,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_snee;1",
+        "@id": "dtmi:example:thnad_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_nuh;1",
+          "@id": "dtmi:example:thnad_yuzz;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "boolean",
+            "schema": "string",
             "name": "#tag"
           }
         }
@@ -456,13 +456,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_thnad;1",
+        "@id": "dtmi:example:thnad_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_quan;1",
+          "@id": "dtmi:example:thnad_um;1",
           "@type": "Object",
           "fields": {
-            "schema": "date",
+            "schema": "time",
             "name": "@tweet"
           }
         }
@@ -477,14 +477,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_floob;1",
+        "@id": "dtmi:example:thnad_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_spazz;1",
+          "@id": "dtmi:example:thnad_fuddle;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "dateTime",
+            "schema": "boolean",
             "name": "@tweet"
           }
         }
@@ -499,13 +499,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_jogg;1",
+        "@id": "dtmi:example:thnad_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_zatz;1",
+          "@id": "dtmi:example:thnad_nuh;1",
           "@type": "Object",
           "fields": {
-            "schema": "double",
+            "schema": "date",
             "name": "$money"
           }
         }
@@ -520,14 +520,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_itch;1",
+        "@id": "dtmi:example:thnad_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_flunn;1",
+          "@id": "dtmi:example:thnad_quan;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "duration",
+            "schema": "dateTime",
             "name": "$money"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassFieldPropertyNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassFieldPropertyNameStringLengthV2.json
index f6452405..f3949bd4 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldPropertyNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldPropertyNameStringLengthV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_fuddle;1",
+        "@id": "dtmi:example:quan_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_humpf;1",
+          "@id": "dtmi:example:quan_chi;1",
           "@type": "Object",
           "fields": {
-            "schema": "long",
+            "schema": "float",
             "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSometh"
           }
         }
@@ -28,13 +28,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_nuh;1",
+        "@id": "dtmi:example:quan_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_glikk;1",
+          "@id": "dtmi:example:quan_omega;1",
           "@type": "Object",
           "fields": {
-            "schema": "string",
+            "schema": "integer",
             "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
           }
         }
@@ -49,14 +49,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_quan;1",
+        "@id": "dtmi:example:quan_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_snee;1",
+          "@id": "dtmi:example:quan_wum;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "time",
+            "schema": "long",
             "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassFieldPropertyNameStringV2.json b/DTDL/v2/spec/Requirement-ClassFieldPropertyNameStringV2.json
index 7fdc8ecb..625abb5a 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldPropertyNameStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldPropertyNameStringV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_humpf;1",
+        "@id": "dtmi:example:snee_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_um;1",
+          "@id": "dtmi:example:snee_phi;1",
           "@type": "Object",
           "fields": {
-            "schema": "float",
+            "schema": "double",
             "name": "hello"
           }
         }
@@ -28,13 +28,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_glikk;1",
+        "@id": "dtmi:example:snee_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_fuddle;1",
+          "@id": "dtmi:example:snee_psi;1",
           "@type": "Object",
           "fields": {
-            "schema": "integer",
+            "schema": "duration",
             "name": [
               "hello"
             ]
@@ -51,13 +51,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_snee;1",
+        "@id": "dtmi:example:snee_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_nuh;1",
+          "@id": "dtmi:example:snee_yuzz;1",
           "@type": "Object",
           "fields": {
-            "schema": "long",
+            "schema": "float",
             "name": {
               "@value": "hello",
               "@type": "xsd:string"
@@ -75,13 +75,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_thnad;1",
+        "@id": "dtmi:example:snee_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_quan;1",
+          "@id": "dtmi:example:snee_um;1",
           "@type": "Object",
           "fields": {
-            "schema": "string",
+            "schema": "integer",
             "name": [
               {
                 "@value": "hello",
@@ -101,13 +101,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_floob;1",
+        "@id": "dtmi:example:snee_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_spazz;1",
+          "@id": "dtmi:example:snee_fuddle;1",
           "@type": "Object",
           "fields": {
-            "schema": "time",
+            "schema": "long",
             "name": null
           }
         }
@@ -122,14 +122,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_jogg;1",
+        "@id": "dtmi:example:snee_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_zatz;1",
+          "@id": "dtmi:example:snee_nuh;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "boolean",
+            "schema": "string",
             "name": null
           }
         }
@@ -144,13 +144,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_itch;1",
+        "@id": "dtmi:example:snee_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_flunn;1",
+          "@id": "dtmi:example:snee_quan;1",
           "@type": "Object",
           "fields": {
-            "schema": "date",
+            "schema": "time",
             "name": true
           }
         }
@@ -165,14 +165,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_vroo;1",
+        "@id": "dtmi:example:snee_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_yekk;1",
+          "@id": "dtmi:example:snee_spazz;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "dateTime",
+            "schema": "boolean",
             "name": true
           }
         }
@@ -187,13 +187,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_alpha;1",
+        "@id": "dtmi:example:snee_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_hi;1",
+          "@id": "dtmi:example:snee_zatz;1",
           "@type": "Object",
           "fields": {
-            "schema": "double",
+            "schema": "date",
             "name": 626
           }
         }
@@ -208,14 +208,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_gamma;1",
+        "@id": "dtmi:example:snee_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_beta;1",
+          "@id": "dtmi:example:snee_flunn;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "duration",
+            "schema": "dateTime",
             "name": 626
           }
         }
@@ -230,13 +230,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_epsilon;1",
+        "@id": "dtmi:example:snee_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_delta;1",
+          "@id": "dtmi:example:snee_yekk;1",
           "@type": "Object",
           "fields": {
-            "schema": "float",
+            "schema": "double",
             "name": [
               null
             ]
@@ -253,14 +253,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_eta;1",
+        "@id": "dtmi:example:quan_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_zeta;1",
+          "@id": "dtmi:example:snee_hi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "integer",
+            "schema": "duration",
             "name": [
               null
             ]
@@ -277,13 +277,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_iota;1",
+        "@id": "dtmi:example:quan_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_theta;1",
+          "@id": "dtmi:example:quan_beta;1",
           "@type": "Object",
           "fields": {
-            "schema": "long",
+            "schema": "float",
             "name": [
               true
             ]
@@ -300,14 +300,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_lambda;1",
+        "@id": "dtmi:example:quan_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_kappa;1",
+          "@id": "dtmi:example:quan_delta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "string",
+            "schema": "integer",
             "name": [
               true
             ]
@@ -324,13 +324,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_nu;1",
+        "@id": "dtmi:example:quan_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_mu;1",
+          "@id": "dtmi:example:quan_zeta;1",
           "@type": "Object",
           "fields": {
-            "schema": "time",
+            "schema": "long",
             "name": [
               626
             ]
@@ -347,14 +347,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_omicron;1",
+        "@id": "dtmi:example:quan_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_xi;1",
+          "@id": "dtmi:example:quan_theta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "boolean",
+            "schema": "string",
             "name": [
               626
             ]
@@ -371,13 +371,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_rho;1",
+        "@id": "dtmi:example:quan_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_pi;1",
+          "@id": "dtmi:example:quan_kappa;1",
           "@type": "Object",
           "fields": {
-            "schema": "date",
+            "schema": "time",
             "name": {}
           }
         }
@@ -392,14 +392,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_tau;1",
+        "@id": "dtmi:example:quan_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_sigma;1",
+          "@id": "dtmi:example:quan_mu;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "dateTime",
+            "schema": "boolean",
             "name": {}
           }
         }
@@ -414,13 +414,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_phi;1",
+        "@id": "dtmi:example:quan_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_upsilon;1",
+          "@id": "dtmi:example:quan_xi;1",
           "@type": "Object",
           "fields": {
-            "schema": "double",
+            "schema": "date",
             "name": [
               {}
             ]
@@ -437,14 +437,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_psi;1",
+        "@id": "dtmi:example:quan_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_chi;1",
+          "@id": "dtmi:example:quan_pi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "duration",
+            "schema": "dateTime",
             "name": [
               {}
             ]
@@ -461,13 +461,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_yuzz;1",
+        "@id": "dtmi:example:quan_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_omega;1",
+          "@id": "dtmi:example:quan_sigma;1",
           "@type": "Object",
           "fields": {
-            "schema": "float",
+            "schema": "double",
             "name": []
           }
         }
@@ -482,14 +482,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_um;1",
+        "@id": "dtmi:example:quan_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_wum;1",
+          "@id": "dtmi:example:quan_upsilon;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "integer",
+            "schema": "duration",
             "name": []
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassFieldPropertyNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassFieldPropertyNameTermAndDtmiV2.json
index 3ba0f433..77a2eb40 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldPropertyNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldPropertyNameTermAndDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_pi;1",
+        "@id": "dtmi:example:spazz_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_omicron;1",
+          "@id": "dtmi:example:spazz_iota;1",
           "@type": "Object",
           "fields": {
-            "name": "nuh_nu",
-            "dtmi:dtdl:property:name;2": "nuh_xi",
-            "schema": "duration"
+            "name": "spazz_eta",
+            "dtmi:dtdl:property:name;2": "spazz_theta",
+            "schema": "dateTime"
           }
         }
       }
@@ -29,16 +29,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_upsilon;1",
+        "@id": "dtmi:example:spazz_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_tau;1",
+          "@id": "dtmi:example:spazz_nu;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nuh_rho",
-            "dtmi:dtdl:property:name;2": "nuh_sigma",
-            "schema": "float"
+            "name": "spazz_lambda",
+            "dtmi:dtdl:property:name;2": "spazz_mu",
+            "schema": "double"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassFieldPropertyNameUniqueAmongObjectFieldsV2.json b/DTDL/v2/spec/Requirement-ClassFieldPropertyNameUniqueAmongObjectFieldsV2.json
index 9d51db3f..61dd4da2 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldPropertyNameUniqueAmongObjectFieldsV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldPropertyNameUniqueAmongObjectFieldsV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_vroo;1",
+        "@id": "dtmi:example:thnad_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_yekk;1",
+          "@id": "dtmi:example:thnad_spazz;1",
           "@type": "Object",
           "fields": [
             {
-              "schema": "float",
+              "schema": "double",
               "name": "alpha_glikk"
             },
             {
-              "schema": "integer",
+              "schema": "duration",
               "name": "alpha_nuh"
             }
           ]
@@ -34,18 +34,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_alpha;1",
+        "@id": "dtmi:example:thnad_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_hi;1",
+          "@id": "dtmi:example:thnad_zatz;1",
           "@type": "Object",
           "fields": [
             {
-              "schema": "long",
+              "schema": "float",
               "name": "alpha_glikk"
             },
             {
-              "schema": "string",
+              "schema": "integer",
               "name": "alpha_glikk"
             }
           ]
@@ -61,19 +61,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_gamma;1",
+        "@id": "dtmi:example:thnad_itch;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_beta;1",
+          "@id": "dtmi:example:thnad_flunn;1",
           "@type": "Object",
           "fields": [
             {
-              "schema": "time",
+              "schema": "long",
               "name": "alpha_glikk"
             },
             {
-              "schema": "boolean",
+              "schema": "string",
               "name": "alpha_glikk"
             }
           ]
diff --git a/DTDL/v2/spec/Requirement-ClassFieldPropertySchemaElementV2.json b/DTDL/v2/spec/Requirement-ClassFieldPropertySchemaElementV2.json
index 6a1ff15b..1ca29e3a 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldPropertySchemaElementV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldPropertySchemaElementV2.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_omega;1",
+        "@id": "dtmi:example:spazz_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nuh_psi",
+          "name": "spazz_rho",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "nuh_chi",
+              "name": "spazz_pi",
               "schema": {
                 "@type": "Enum",
                 "enumValues": [
                   {
-                    "enumValue": 1020,
-                    "name": "nuh_phi"
+                    "enumValue": 1033,
+                    "name": "spazz_omicron"
                   }
                 ],
                 "valueSchema": "integer"
@@ -40,22 +40,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_humpf;1",
+        "@id": "dtmi:example:spazz_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nuh_um",
+          "name": "spazz_phi",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "nuh_wum",
+              "name": "spazz_upsilon",
               "schema": [
                 {
                   "@type": "Enum",
                   "enumValues": [
                     {
-                      "enumValue": 1021,
-                      "name": "nuh_yuzz"
+                      "enumValue": 1034,
+                      "name": "spazz_tau"
                     }
                   ],
                   "valueSchema": "integer"
@@ -75,26 +75,26 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_glikk;1",
+        "@id": "dtmi:example:spazz_omega;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 1022,
-              "name": "nuh_fuddle"
+              "enumValue": 1035,
+              "name": "spazz_psi"
             }
           ],
           "valueSchema": "integer"
         },
         "contents": {
           "@type": "Property",
-          "name": "nuh_snee",
+          "name": "spazz_wum",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "nuh_nuh",
+              "name": "spazz_yuzz",
               "schema": "dtmi:ex:dependentRef;1"
             }
           }
@@ -110,26 +110,26 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_thnad;1",
+        "@id": "dtmi:example:spazz_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 1023,
-              "name": "nuh_quan"
+              "enumValue": 1036,
+              "name": "spazz_um"
             }
           ],
           "valueSchema": "integer"
         },
         "contents": {
           "@type": "Property",
-          "name": "nuh_floob",
+          "name": "spazz_glikk",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "nuh_spazz",
+              "name": "spazz_fuddle",
               "schema": [
                 "dtmi:ex:dependentRef;1"
               ]
@@ -147,17 +147,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_itch;1",
+        "@id": "dtmi:example:spazz_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nuh_flunn",
+          "name": "spazz_quan",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "nuh_jogg",
+              "name": "spazz_snee",
               "schema": {
-                "@id": "dtmi:example:nuh_zatz;1",
+                "@id": "dtmi:example:spazz_nuh;1",
                 "@type": "Enum",
                 "valueSchema": "integer",
                 "@context": "dtmi:dtdl:context;3"
@@ -176,18 +176,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_alpha;1",
+        "@id": "dtmi:example:spazz_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nuh_hi",
+          "name": "spazz_zatz",
           "schema": {
             "@type": "Object",
             "fields": {
               "@context": "dtmi:undefinedExtension:context;1",
-              "name": "nuh_vroo",
+              "name": "spazz_floob",
               "schema": {
-                "@id": "dtmi:example:nuh_yekk;1",
+                "@id": "dtmi:example:spazz_spazz;1",
                 "@type": "Enum",
                 "valueSchema": "integer",
                 "@context": "dtmi:dtdl:context;3"
@@ -206,33 +206,92 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_delta;1",
+        "@id": "dtmi:example:spazz_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "spazz_yekk",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "spazz_itch",
+              "schema": {
+                "@id": "dtmi:example:spazz_flunn;1",
+                "@type": "Enum",
+                "valueSchema": "integer",
+                "@context": "dtmi:dtdl:context;4"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:floob_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "floob_beta",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "@context": "dtmi:undefinedExtension:context;1",
+              "name": "floob_alpha",
+              "schema": {
+                "@id": "dtmi:example:spazz_hi;1",
+                "@type": "Enum",
+                "valueSchema": "integer",
+                "@context": "dtmi:dtdl:context;4"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:floob_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 1025,
-              "name": "snee_gamma"
+              "enumValue": 1038,
+              "name": "floob_epsilon"
             }
           ],
           "valueSchema": "integer"
         },
         "contents": {
           "@type": "Property",
-          "name": "snee_zeta",
+          "name": "floob_theta",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "snee_epsilon",
+              "name": "floob_eta",
               "schema": [
                 {
                   "@type": "Enum",
                   "enumValues": [
                     {
-                      "enumValue": 1024,
-                      "name": "snee_beta"
+                      "enumValue": 1037,
+                      "name": "floob_delta"
                     }
                   ],
                   "valueSchema": "integer"
@@ -253,34 +312,34 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_iota;1",
+        "@id": "dtmi:example:floob_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 1027,
-              "name": "snee_theta"
+              "enumValue": 1040,
+              "name": "floob_kappa"
             }
           ],
           "valueSchema": "integer"
         },
         "contents": {
           "@type": "Property",
-          "name": "snee_lambda",
+          "name": "floob_nu",
           "schema": {
             "@type": "Object",
             "fields": {
               "@context": "dtmi:undefinedExtension:context;1",
-              "name": "snee_kappa",
+              "name": "floob_mu",
               "schema": [
                 {
                   "@type": "Enum",
                   "enumValues": [
                     {
-                      "enumValue": 1026,
-                      "name": "snee_eta"
+                      "enumValue": 1039,
+                      "name": "floob_iota"
                     }
                   ],
                   "valueSchema": "integer"
@@ -301,13 +360,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_xi;1",
+        "@id": "dtmi:example:floob_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_nu;1",
+          "@id": "dtmi:example:floob_omicron;1",
           "@type": "Object",
           "fields": {
-            "name": "snee_mu",
+            "name": "floob_xi",
             "schema": "duration"
           }
         }
@@ -322,13 +381,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_rho;1",
+        "@id": "dtmi:example:floob_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_pi;1",
+          "@id": "dtmi:example:floob_sigma;1",
           "@type": "Object",
           "fields": {
-            "name": "snee_omicron",
+            "name": "floob_rho",
             "schema": [
               "duration"
             ]
@@ -345,13 +404,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_upsilon;1",
+        "@id": "dtmi:example:floob_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_tau;1",
+          "@id": "dtmi:example:floob_phi;1",
           "@type": "Object",
           "fields": {
-            "name": "snee_sigma",
+            "name": "floob_upsilon",
             "schema": "dtmi:dtdl:instance:Schema:duration;2"
           }
         }
@@ -366,13 +425,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_psi;1",
+        "@id": "dtmi:example:floob_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_chi;1",
+          "@id": "dtmi:example:floob_omega;1",
           "@type": "Object",
           "fields": {
-            "name": "snee_phi",
+            "name": "floob_psi",
             "schema": [
               "dtmi:dtdl:instance:Schema:duration;2"
             ]
@@ -389,13 +448,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_wum;1",
+        "@id": "dtmi:example:floob_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_yuzz;1",
+          "@id": "dtmi:example:floob_um;1",
           "@type": "Object",
           "fields": {
-            "name": "snee_omega",
+            "name": "floob_wum",
             "schema": "point"
           }
         }
@@ -410,13 +469,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_fuddle;1",
+        "@id": "dtmi:example:floob_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_humpf;1",
+          "@id": "dtmi:example:floob_glikk;1",
           "@type": "Object",
           "fields": {
-            "name": "snee_um",
+            "name": "floob_fuddle",
             "schema": [
               "point"
             ]
@@ -433,13 +492,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_snee;1",
+        "@id": "dtmi:example:floob_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_nuh;1",
+          "@id": "dtmi:example:floob_quan;1",
           "@type": "Object",
           "fields": {
-            "name": "snee_glikk",
+            "name": "floob_snee",
             "schema": "dtmi:standard:schema:geospatial:point;2"
           }
         }
@@ -454,13 +513,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_spazz;1",
+        "@id": "dtmi:example:floob_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_thnad;1",
+          "@id": "dtmi:example:floob_floob;1",
           "@type": "Object",
           "fields": {
-            "name": "snee_quan",
+            "name": "floob_spazz",
             "schema": [
               "dtmi:standard:schema:geospatial:point;2"
             ]
@@ -477,13 +536,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_jogg;1",
+        "@id": "dtmi:example:floob_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_zatz;1",
+          "@id": "dtmi:example:floob_flunn;1",
           "@type": "Object",
           "fields": {
-            "name": "snee_floob",
+            "name": "floob_jogg",
             "schema": "Foobar"
           }
         }
@@ -498,14 +557,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_yekk;1",
+        "@id": "dtmi:example:floob_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_itch;1",
+          "@id": "dtmi:example:floob_vroo;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "snee_flunn",
+            "name": "floob_yekk",
             "schema": "Foobar"
           }
         }
@@ -520,13 +579,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_alpha;1",
+        "@id": "dtmi:example:zatz_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_hi;1",
+          "@id": "dtmi:example:zatz_beta;1",
           "@type": "Object",
           "fields": {
-            "name": "snee_vroo",
+            "name": "zatz_alpha",
             "schema": null
           }
         }
@@ -541,14 +600,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_delta;1",
+        "@id": "dtmi:example:zatz_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_gamma;1",
+          "@id": "dtmi:example:zatz_epsilon;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "quan_beta",
+            "name": "zatz_delta",
             "schema": null
           }
         }
@@ -563,13 +622,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_eta;1",
+        "@id": "dtmi:example:zatz_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_zeta;1",
+          "@id": "dtmi:example:zatz_theta;1",
           "@type": "Object",
           "fields": {
-            "name": "quan_epsilon",
+            "name": "zatz_eta",
             "schema": true
           }
         }
@@ -584,14 +643,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_kappa;1",
+        "@id": "dtmi:example:zatz_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_iota;1",
+          "@id": "dtmi:example:zatz_lambda;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "quan_theta",
+            "name": "zatz_kappa",
             "schema": true
           }
         }
@@ -606,13 +665,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_nu;1",
+        "@id": "dtmi:example:zatz_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_mu;1",
+          "@id": "dtmi:example:zatz_xi;1",
           "@type": "Object",
           "fields": {
-            "name": "quan_lambda",
+            "name": "zatz_nu",
             "schema": 626
           }
         }
@@ -627,14 +686,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_pi;1",
+        "@id": "dtmi:example:zatz_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_omicron;1",
+          "@id": "dtmi:example:zatz_rho;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "quan_xi",
+            "name": "zatz_pi",
             "schema": 626
           }
         }
@@ -649,13 +708,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_tau;1",
+        "@id": "dtmi:example:zatz_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_sigma;1",
+          "@id": "dtmi:example:zatz_upsilon;1",
           "@type": "Object",
           "fields": {
-            "name": "quan_rho",
+            "name": "zatz_tau",
             "schema": [
               null
             ]
@@ -672,14 +731,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_chi;1",
+        "@id": "dtmi:example:zatz_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_phi;1",
+          "@id": "dtmi:example:zatz_psi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "quan_upsilon",
+            "name": "zatz_chi",
             "schema": [
               null
             ]
@@ -696,13 +755,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_yuzz;1",
+        "@id": "dtmi:example:zatz_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_omega;1",
+          "@id": "dtmi:example:zatz_wum;1",
           "@type": "Object",
           "fields": {
-            "name": "quan_psi",
+            "name": "zatz_yuzz",
             "schema": [
               true
             ]
@@ -719,14 +778,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_humpf;1",
+        "@id": "dtmi:example:zatz_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_um;1",
+          "@id": "dtmi:example:zatz_fuddle;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "quan_wum",
+            "name": "zatz_humpf",
             "schema": [
               true
             ]
@@ -743,13 +802,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_nuh;1",
+        "@id": "dtmi:example:zatz_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_glikk;1",
+          "@id": "dtmi:example:zatz_snee;1",
           "@type": "Object",
           "fields": {
-            "name": "quan_fuddle",
+            "name": "zatz_nuh",
             "schema": [
               626
             ]
@@ -766,14 +825,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_thnad;1",
+        "@id": "dtmi:example:zatz_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_quan;1",
+          "@id": "dtmi:example:zatz_spazz;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "quan_snee",
+            "name": "zatz_thnad",
             "schema": [
               626
             ]
@@ -790,13 +849,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_zatz;1",
+        "@id": "dtmi:example:zatz_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_floob;1",
+          "@id": "dtmi:example:zatz_jogg;1",
           "@type": "Object",
           "fields": {
-            "name": "quan_spazz",
+            "name": "zatz_zatz",
             "schema": {}
           }
         }
@@ -811,14 +870,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_itch;1",
+        "@id": "dtmi:example:zatz_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_flunn;1",
+          "@id": "dtmi:example:zatz_yekk;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "quan_jogg",
+            "name": "zatz_itch",
             "schema": {}
           }
         }
@@ -833,13 +892,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_hi;1",
+        "@id": "dtmi:example:jogg_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_vroo;1",
+          "@id": "dtmi:example:jogg_alpha;1",
           "@type": "Object",
           "fields": {
-            "name": "quan_yekk",
+            "name": "zatz_hi",
             "schema": [
               {}
             ]
@@ -856,14 +915,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_gamma;1",
+        "@id": "dtmi:example:jogg_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_beta;1",
+          "@id": "dtmi:example:jogg_delta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "thnad_alpha",
+            "name": "jogg_gamma",
             "schema": [
               {}
             ]
@@ -880,13 +939,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_zeta;1",
+        "@id": "dtmi:example:jogg_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_epsilon;1",
+          "@id": "dtmi:example:jogg_eta;1",
           "@type": "Object",
           "fields": {
-            "name": "thnad_delta",
+            "name": "jogg_zeta",
             "schema": []
           }
         }
@@ -901,14 +960,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_iota;1",
+        "@id": "dtmi:example:jogg_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_theta;1",
+          "@id": "dtmi:example:jogg_kappa;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "thnad_eta",
+            "name": "jogg_iota",
             "schema": []
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassFieldPropertySchemaTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassFieldPropertySchemaTermAndDtmiV2.json
index 4816b6b3..61ab9afc 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldPropertySchemaTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldPropertySchemaTermAndDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_itch;1",
+        "@id": "dtmi:example:yekk_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_flunn;1",
+          "@id": "dtmi:example:yekk_yekk;1",
           "@type": "Object",
           "fields": {
-            "name": "zatz_jogg",
-            "schema": "dateTime",
-            "dtmi:dtdl:property:schema;2": "double"
+            "name": "yekk_itch",
+            "schema": "boolean",
+            "dtmi:dtdl:property:schema;2": "date"
           }
         }
       }
@@ -29,16 +29,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_hi;1",
+        "@id": "dtmi:example:vroo_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_vroo;1",
+          "@id": "dtmi:example:vroo_alpha;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zatz_yekk",
-            "schema": "duration",
-            "dtmi:dtdl:property:schema;2": "float"
+            "name": "yekk_hi",
+            "schema": "dateTime",
+            "dtmi:dtdl:property:schema;2": "double"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassFieldPropertySchemaTypeConformanceV2.json b/DTDL/v2/spec/Requirement-ClassFieldPropertySchemaTypeConformanceV2.json
index 22238a29..6de8e256 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldPropertySchemaTypeConformanceV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldPropertySchemaTypeConformanceV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_tau;1",
+        "@id": "dtmi:example:jogg_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_sigma;1",
+          "@id": "dtmi:example:jogg_upsilon;1",
           "@type": "Object",
           "fields": {
-            "name": "thnad_rho",
+            "name": "jogg_tau",
             "schema": {
-              "@id": "dtmi:example:thnad_pi;1",
-              "elementSchema": "integer",
+              "@id": "dtmi:example:jogg_sigma;1",
+              "elementSchema": "duration",
               "@type": "Array"
             }
           }
@@ -32,16 +32,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_omega;1",
+        "@id": "dtmi:example:jogg_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_psi;1",
+          "@id": "dtmi:example:jogg_yuzz;1",
           "@type": "Object",
           "fields": {
-            "name": "thnad_chi",
+            "name": "jogg_omega",
             "schema": {
-              "@id": "dtmi:example:thnad_upsilon;1",
-              "name": "thnad_phi",
+              "@id": "dtmi:example:jogg_chi;1",
+              "name": "jogg_psi",
               "@type": "Command"
             }
           }
@@ -57,17 +57,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_fuddle;1",
+        "@id": "dtmi:example:jogg_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_humpf;1",
+          "@id": "dtmi:example:jogg_glikk;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "thnad_um",
+            "name": "jogg_fuddle",
             "schema": {
-              "@id": "dtmi:example:thnad_yuzz;1",
-              "name": "thnad_wum",
+              "@id": "dtmi:example:jogg_um;1",
+              "name": "jogg_humpf",
               "@type": "Command"
             }
           }
@@ -83,17 +83,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_thnad;1",
+        "@id": "dtmi:example:jogg_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_quan;1",
+          "@id": "dtmi:example:jogg_spazz;1",
           "@type": "Object",
           "fields": {
-            "name": "thnad_snee",
+            "name": "jogg_thnad",
             "schema": {
-              "@id": "dtmi:example:thnad_glikk;1",
-              "name": "thnad_nuh",
-              "schema": "long",
+              "@id": "dtmi:example:jogg_snee;1",
+              "name": "jogg_quan",
+              "schema": "float",
               "@type": "CommandPayload"
             }
           }
@@ -109,18 +109,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_flunn;1",
+        "@id": "dtmi:example:jogg_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_jogg;1",
+          "@id": "dtmi:example:jogg_itch;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "thnad_zatz",
+            "name": "jogg_flunn",
             "schema": {
-              "@id": "dtmi:example:thnad_spazz;1",
-              "name": "thnad_floob",
-              "schema": "string",
+              "@id": "dtmi:example:jogg_zatz;1",
+              "name": "jogg_jogg",
+              "schema": "integer",
               "@type": "CommandPayload"
             }
           }
@@ -136,18 +136,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_beta;1",
+        "@id": "dtmi:example:flunn_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_alpha;1",
+          "@id": "dtmi:example:flunn_gamma;1",
           "@type": "Object",
           "fields": {
-            "name": "thnad_hi",
+            "name": "flunn_beta",
             "schema": {
-              "@id": "dtmi:example:thnad_itch;1",
-              "name": "thnad_yekk",
+              "@id": "dtmi:example:jogg_vroo;1",
+              "name": "jogg_hi",
               "schema": {
-                "@id": "dtmi:example:thnad_vroo;1",
+                "@id": "dtmi:example:flunn_alpha;1",
                 "@type": "Interface"
               },
               "@type": "Component"
@@ -165,19 +165,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_theta;1",
+        "@id": "dtmi:example:flunn_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_eta;1",
+          "@id": "dtmi:example:flunn_iota;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "spazz_zeta",
+            "name": "flunn_theta",
             "schema": {
-              "@id": "dtmi:example:spazz_gamma;1",
-              "name": "spazz_delta",
+              "@id": "dtmi:example:flunn_epsilon;1",
+              "name": "flunn_zeta",
               "schema": {
-                "@id": "dtmi:example:spazz_epsilon;1",
+                "@id": "dtmi:example:flunn_eta;1",
                 "@type": "Interface"
               },
               "@type": "Component"
@@ -195,19 +195,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_nu;1",
+        "@id": "dtmi:example:flunn_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_mu;1",
+          "@id": "dtmi:example:flunn_xi;1",
           "@type": "Object",
           "fields": {
-            "name": "spazz_lambda",
+            "name": "flunn_nu",
             "schema": {
-              "@id": "dtmi:example:spazz_iota;1",
+              "@id": "dtmi:example:flunn_lambda;1",
               "enumValues": [
                 {
-                  "enumValue": 1028,
-                  "name": "spazz_kappa"
+                  "enumValue": 1041,
+                  "name": "flunn_mu"
                 }
               ],
               "valueSchema": "integer",
@@ -226,17 +226,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_sigma;1",
+        "@id": "dtmi:example:flunn_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_rho;1",
+          "@id": "dtmi:example:flunn_tau;1",
           "@type": "Object",
           "fields": {
-            "name": "spazz_pi",
+            "name": "flunn_sigma",
             "schema": {
-              "@id": "dtmi:example:spazz_xi;1",
-              "enumValue": 1029,
-              "name": "spazz_omicron",
+              "@id": "dtmi:example:flunn_pi;1",
+              "enumValue": 1042,
+              "name": "flunn_rho",
               "@type": "EnumValue"
             }
           }
@@ -252,18 +252,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_psi;1",
+        "@id": "dtmi:example:flunn_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_chi;1",
+          "@id": "dtmi:example:flunn_omega;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "spazz_phi",
+            "name": "flunn_psi",
             "schema": {
-              "@id": "dtmi:example:spazz_tau;1",
-              "enumValue": 1030,
-              "name": "spazz_upsilon",
+              "@id": "dtmi:example:flunn_phi;1",
+              "enumValue": 1043,
+              "name": "flunn_chi",
               "@type": "EnumValue"
             }
           }
@@ -279,17 +279,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_humpf;1",
+        "@id": "dtmi:example:flunn_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_um;1",
+          "@id": "dtmi:example:flunn_fuddle;1",
           "@type": "Object",
           "fields": {
-            "name": "spazz_wum",
+            "name": "flunn_humpf",
             "schema": {
-              "@id": "dtmi:example:spazz_omega;1",
-              "name": "spazz_yuzz",
-              "schema": "time",
+              "@id": "dtmi:example:flunn_wum;1",
+              "name": "flunn_um",
+              "schema": "long",
               "@type": "Field"
             }
           }
@@ -305,18 +305,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_quan;1",
+        "@id": "dtmi:example:flunn_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_snee;1",
+          "@id": "dtmi:example:flunn_thnad;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "spazz_nuh",
+            "name": "flunn_quan",
             "schema": {
-              "@id": "dtmi:example:spazz_fuddle;1",
-              "name": "spazz_glikk",
-              "schema": "boolean",
+              "@id": "dtmi:example:flunn_nuh;1",
+              "name": "flunn_snee",
+              "schema": "string",
               "@type": "Field"
             }
           }
@@ -332,15 +332,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_zatz;1",
+        "@id": "dtmi:example:flunn_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_floob;1",
+          "@id": "dtmi:example:flunn_jogg;1",
           "@type": "Object",
           "fields": {
-            "name": "spazz_spazz",
+            "name": "flunn_zatz",
             "schema": {
-              "@id": "dtmi:example:spazz_thnad;1",
+              "@id": "dtmi:example:flunn_floob;1",
               "@type": "Interface"
             }
           }
@@ -356,16 +356,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_yekk;1",
+        "@id": "dtmi:example:flunn_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_itch;1",
+          "@id": "dtmi:example:flunn_vroo;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "spazz_flunn",
+            "name": "flunn_yekk",
             "schema": {
-              "@id": "dtmi:example:spazz_jogg;1",
+              "@id": "dtmi:example:flunn_itch;1",
               "@type": "Interface"
             }
           }
@@ -381,22 +381,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_delta;1",
+        "@id": "dtmi:example:itch_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_gamma;1",
+          "@id": "dtmi:example:itch_epsilon;1",
           "@type": "Object",
           "fields": {
-            "name": "floob_beta",
+            "name": "itch_delta",
             "schema": {
-              "@id": "dtmi:example:spazz_vroo;1",
+              "@id": "dtmi:example:itch_alpha;1",
               "mapKey": {
-                "name": "spazz_hi",
+                "name": "itch_beta",
                 "schema": "string"
               },
               "mapValue": {
-                "name": "floob_alpha",
-                "schema": "date"
+                "name": "itch_gamma",
+                "schema": "time"
               },
               "@type": "Map"
             }
@@ -413,16 +413,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_iota;1",
+        "@id": "dtmi:example:itch_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_theta;1",
+          "@id": "dtmi:example:itch_kappa;1",
           "@type": "Object",
           "fields": {
-            "name": "floob_eta",
+            "name": "itch_iota",
             "schema": {
-              "@id": "dtmi:example:floob_epsilon;1",
-              "name": "floob_zeta",
+              "@id": "dtmi:example:itch_eta;1",
+              "name": "itch_theta",
               "schema": "string",
               "@type": "MapKey"
             }
@@ -439,17 +439,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_xi;1",
+        "@id": "dtmi:example:itch_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_nu;1",
+          "@id": "dtmi:example:itch_omicron;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "floob_mu",
+            "name": "itch_xi",
             "schema": {
-              "@id": "dtmi:example:floob_kappa;1",
-              "name": "floob_lambda",
+              "@id": "dtmi:example:itch_mu;1",
+              "name": "itch_nu",
               "schema": "string",
               "@type": "MapKey"
             }
@@ -466,17 +466,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_tau;1",
+        "@id": "dtmi:example:itch_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_sigma;1",
+          "@id": "dtmi:example:itch_upsilon;1",
           "@type": "Object",
           "fields": {
-            "name": "floob_rho",
+            "name": "itch_tau",
             "schema": {
-              "@id": "dtmi:example:floob_omicron;1",
-              "name": "floob_pi",
-              "schema": "dateTime",
+              "@id": "dtmi:example:itch_rho;1",
+              "name": "itch_sigma",
+              "schema": "boolean",
               "@type": "MapValue"
             }
           }
@@ -492,18 +492,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_omega;1",
+        "@id": "dtmi:example:itch_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_psi;1",
+          "@id": "dtmi:example:itch_yuzz;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "floob_chi",
+            "name": "itch_omega",
             "schema": {
-              "@id": "dtmi:example:floob_upsilon;1",
-              "name": "floob_phi",
-              "schema": "double",
+              "@id": "dtmi:example:itch_chi;1",
+              "name": "itch_psi",
+              "schema": "date",
               "@type": "MapValue"
             }
           }
@@ -519,19 +519,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_fuddle;1",
+        "@id": "dtmi:example:itch_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_humpf;1",
+          "@id": "dtmi:example:itch_glikk;1",
           "@type": "Object",
           "fields": {
-            "name": "floob_um",
+            "name": "itch_fuddle",
             "schema": {
-              "@id": "dtmi:example:floob_yuzz;1",
+              "@id": "dtmi:example:itch_um;1",
               "fields": [
                 {
-                  "name": "floob_wum",
-                  "schema": "duration"
+                  "name": "itch_humpf",
+                  "schema": "dateTime"
                 }
               ],
               "@type": "Object"
@@ -549,17 +549,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_thnad;1",
+        "@id": "dtmi:example:itch_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_quan;1",
+          "@id": "dtmi:example:itch_spazz;1",
           "@type": "Object",
           "fields": {
-            "name": "floob_snee",
+            "name": "itch_thnad",
             "schema": {
-              "@id": "dtmi:example:floob_glikk;1",
-              "name": "floob_nuh",
-              "schema": "float",
+              "@id": "dtmi:example:itch_snee;1",
+              "name": "itch_quan",
+              "schema": "double",
               "@type": "Property"
             }
           }
@@ -575,18 +575,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_flunn;1",
+        "@id": "dtmi:example:itch_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_jogg;1",
+          "@id": "dtmi:example:itch_itch;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "floob_zatz",
+            "name": "itch_flunn",
             "schema": {
-              "@id": "dtmi:example:floob_spazz;1",
-              "name": "floob_floob",
-              "schema": "integer",
+              "@id": "dtmi:example:itch_zatz;1",
+              "name": "itch_jogg",
+              "schema": "duration",
               "@type": "Property"
             }
           }
@@ -602,16 +602,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_alpha;1",
+        "@id": "dtmi:example:yekk_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_hi;1",
+          "@id": "dtmi:example:yekk_beta;1",
           "@type": "Object",
           "fields": {
-            "name": "floob_vroo",
+            "name": "yekk_alpha",
             "schema": {
-              "@id": "dtmi:example:floob_itch;1",
-              "name": "floob_yekk",
+              "@id": "dtmi:example:itch_vroo;1",
+              "name": "itch_hi",
               "@type": "Relationship"
             }
           }
@@ -627,17 +627,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_zeta;1",
+        "@id": "dtmi:example:yekk_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_epsilon;1",
+          "@id": "dtmi:example:yekk_eta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zatz_delta",
+            "name": "yekk_zeta",
             "schema": {
-              "@id": "dtmi:example:zatz_beta;1",
-              "name": "zatz_gamma",
+              "@id": "dtmi:example:yekk_delta;1",
+              "name": "yekk_epsilon",
               "@type": "Relationship"
             }
           }
@@ -653,17 +653,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_lambda;1",
+        "@id": "dtmi:example:yekk_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_kappa;1",
+          "@id": "dtmi:example:yekk_mu;1",
           "@type": "Object",
           "fields": {
-            "name": "zatz_iota",
+            "name": "yekk_lambda",
             "schema": {
-              "@id": "dtmi:example:zatz_eta;1",
-              "name": "zatz_theta",
-              "schema": "long",
+              "@id": "dtmi:example:yekk_iota;1",
+              "name": "yekk_kappa",
+              "schema": "float",
               "@type": "Telemetry"
             }
           }
@@ -679,18 +679,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_pi;1",
+        "@id": "dtmi:example:yekk_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_omicron;1",
+          "@id": "dtmi:example:yekk_rho;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zatz_xi",
+            "name": "yekk_pi",
             "schema": {
-              "@id": "dtmi:example:zatz_mu;1",
-              "name": "zatz_nu",
-              "schema": "string",
+              "@id": "dtmi:example:yekk_xi;1",
+              "name": "yekk_omicron",
+              "schema": "integer",
               "@type": "Telemetry"
             }
           }
diff --git a/DTDL/v2/spec/Requirement-ClassFieldRequiredPropertiesV2.json b/DTDL/v2/spec/Requirement-ClassFieldRequiredPropertiesV2.json
index 057db57c..1352fd63 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldRequiredPropertiesV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldRequiredPropertiesV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_sigma;1",
+        "@id": "dtmi:example:snee_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_rho;1",
+          "@id": "dtmi:example:snee_lambda;1",
           "@type": "Object",
           "fields": {
-            "schema": "double"
+            "schema": "date"
           }
         }
       }
@@ -27,14 +27,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_upsilon;1",
+        "@id": "dtmi:example:snee_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_tau;1",
+          "@id": "dtmi:example:snee_nu;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "duration"
+            "schema": "dateTime"
           }
         }
       }
@@ -48,13 +48,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_psi;1",
+        "@id": "dtmi:example:snee_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_chi;1",
+          "@id": "dtmi:example:snee_pi;1",
           "@type": "Object",
           "fields": {
-            "name": "humpf_phi"
+            "name": "snee_omicron"
           }
         }
       }
@@ -68,14 +68,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_wum;1",
+        "@id": "dtmi:example:snee_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_yuzz;1",
+          "@id": "dtmi:example:snee_tau;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "humpf_omega"
+            "name": "snee_sigma"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassFieldTypeIncludesInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassFieldTypeIncludesInvalidDtmiV2.json
index 36d4ecb0..4fd2865c 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldTypeIncludesInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldTypeIncludesInvalidDtmiV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_quan;1",
+        "@id": "dtmi:example:beta_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_snee;1",
+          "@id": "dtmi:example:beta_itch;1",
           "@type": "Object",
           "fields": {
             "@type": [
               "Field",
               "dtmi:foo//bar"
             ],
-            "name": "yekk_nuh",
+            "name": "beta_flunn",
             "schema": "time"
           }
         }
@@ -32,10 +32,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_floob;1",
+        "@id": "dtmi:example:gamma_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_spazz;1",
+          "@id": "dtmi:example:beta_hi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -43,7 +43,7 @@
               "Field",
               "dtmi:foo//bar"
             ],
-            "name": "yekk_thnad",
+            "name": "beta_vroo",
             "schema": "boolean"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassFieldTypeIncludesMaterialV2.json b/DTDL/v2/spec/Requirement-ClassFieldTypeIncludesMaterialV2.json
index 62898a0b..2efd7d24 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldTypeIncludesMaterialV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldTypeIncludesMaterialV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_yuzz;1",
+        "@id": "dtmi:example:alpha_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_omega;1",
+          "@id": "dtmi:example:alpha_snee;1",
           "@type": "Object",
           "fields": {
-            "name": "itch_psi",
+            "name": "alpha_nuh",
             "schema": "dateTime",
             "@type": "Field"
           }
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_humpf;1",
+        "@id": "dtmi:example:alpha_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_um;1",
+          "@id": "dtmi:example:alpha_spazz;1",
           "@type": "Object",
           "fields": {
-            "name": "itch_wum",
+            "name": "alpha_thnad",
             "schema": "double",
             "@type": [
               "Field"
@@ -53,13 +53,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_nuh;1",
+        "@id": "dtmi:example:alpha_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_glikk;1",
+          "@id": "dtmi:example:alpha_jogg;1",
           "@type": "Object",
           "fields": {
-            "name": "itch_fuddle",
+            "name": "alpha_zatz",
             "schema": "duration",
             "@type": "dtmi:dtdl:class:Field;2"
           }
@@ -75,13 +75,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_thnad;1",
+        "@id": "dtmi:example:alpha_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_quan;1",
+          "@id": "dtmi:example:alpha_yekk;1",
           "@type": "Object",
           "fields": {
-            "name": "itch_snee",
+            "name": "alpha_itch",
             "schema": "float",
             "@type": [
               "dtmi:dtdl:class:Field;2"
@@ -99,13 +99,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_zatz;1",
+        "@id": "dtmi:example:beta_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_floob;1",
+          "@id": "dtmi:example:beta_alpha;1",
           "@type": "Object",
           "fields": {
-            "name": "itch_spazz",
+            "name": "alpha_hi",
             "schema": "integer",
             "@type": "Something"
           }
@@ -121,14 +121,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_itch;1",
+        "@id": "dtmi:example:beta_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_flunn;1",
+          "@id": "dtmi:example:beta_delta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "itch_jogg",
+            "name": "beta_gamma",
             "schema": "long",
             "@type": "Something"
           }
@@ -144,13 +144,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_hi;1",
+        "@id": "dtmi:example:beta_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_vroo;1",
+          "@id": "dtmi:example:beta_eta;1",
           "@type": "Object",
           "fields": {
-            "name": "itch_yekk",
+            "name": "beta_zeta",
             "schema": "string",
             "@type": [
               "Something"
@@ -168,14 +168,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_gamma;1",
+        "@id": "dtmi:example:beta_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_beta;1",
+          "@id": "dtmi:example:beta_kappa;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yekk_alpha",
+            "name": "beta_iota",
             "schema": "time",
             "@type": [
               "Something"
diff --git a/DTDL/v2/spec/Requirement-ClassFieldTypeStringOrArrayV2.json b/DTDL/v2/spec/Requirement-ClassFieldTypeStringOrArrayV2.json
index 33034f1d..60f81671 100644
--- a/DTDL/v2/spec/Requirement-ClassFieldTypeStringOrArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassFieldTypeStringOrArrayV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_upsilon;1",
+        "@id": "dtmi:example:hi_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_tau;1",
+          "@id": "dtmi:example:hi_um;1",
           "@type": "Object",
           "fields": {
-            "name": "flunn_sigma",
+            "name": "hi_wum",
             "schema": "integer",
             "@type": 626
           }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_psi;1",
+        "@id": "dtmi:example:hi_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_chi;1",
+          "@id": "dtmi:example:hi_glikk;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "flunn_phi",
+            "name": "hi_fuddle",
             "schema": "long",
             "@type": 626
           }
@@ -52,13 +52,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_wum;1",
+        "@id": "dtmi:example:hi_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_yuzz;1",
+          "@id": "dtmi:example:hi_quan;1",
           "@type": "Object",
           "fields": {
-            "name": "flunn_omega",
+            "name": "hi_snee",
             "schema": "string",
             "@type": null
           }
@@ -74,14 +74,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_fuddle;1",
+        "@id": "dtmi:example:hi_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_humpf;1",
+          "@id": "dtmi:example:hi_floob;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "flunn_um",
+            "name": "hi_spazz",
             "schema": "time",
             "@type": null
           }
@@ -97,13 +97,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_snee;1",
+        "@id": "dtmi:example:hi_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_nuh;1",
+          "@id": "dtmi:example:hi_flunn;1",
           "@type": "Object",
           "fields": {
-            "name": "flunn_glikk",
+            "name": "hi_jogg",
             "schema": "boolean",
             "@type": true
           }
@@ -119,14 +119,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_spazz;1",
+        "@id": "dtmi:example:hi_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_thnad;1",
+          "@id": "dtmi:example:hi_vroo;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "flunn_quan",
+            "name": "hi_yekk",
             "schema": "date",
             "@type": true
           }
@@ -142,13 +142,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_jogg;1",
+        "@id": "dtmi:example:alpha_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_zatz;1",
+          "@id": "dtmi:example:alpha_beta;1",
           "@type": "Object",
           "fields": {
-            "name": "flunn_floob",
+            "name": "alpha_alpha",
             "schema": "dateTime",
             "@type": {}
           }
@@ -164,14 +164,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_yekk;1",
+        "@id": "dtmi:example:alpha_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_itch;1",
+          "@id": "dtmi:example:alpha_epsilon;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "flunn_flunn",
+            "name": "alpha_delta",
             "schema": "double",
             "@type": {}
           }
@@ -187,13 +187,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_alpha;1",
+        "@id": "dtmi:example:alpha_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_hi;1",
+          "@id": "dtmi:example:alpha_theta;1",
           "@type": "Object",
           "fields": {
-            "name": "flunn_vroo",
+            "name": "alpha_eta",
             "schema": "duration",
             "@type": [
               626
@@ -211,14 +211,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_delta;1",
+        "@id": "dtmi:example:alpha_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_gamma;1",
+          "@id": "dtmi:example:alpha_lambda;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "itch_beta",
+            "name": "alpha_kappa",
             "schema": "float",
             "@type": [
               626
@@ -236,13 +236,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_eta;1",
+        "@id": "dtmi:example:alpha_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_zeta;1",
+          "@id": "dtmi:example:alpha_xi;1",
           "@type": "Object",
           "fields": {
-            "name": "itch_epsilon",
+            "name": "alpha_nu",
             "schema": "integer",
             "@type": [
               null
@@ -260,14 +260,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_kappa;1",
+        "@id": "dtmi:example:alpha_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_iota;1",
+          "@id": "dtmi:example:alpha_rho;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "itch_theta",
+            "name": "alpha_pi",
             "schema": "long",
             "@type": [
               null
@@ -285,13 +285,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_nu;1",
+        "@id": "dtmi:example:alpha_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_mu;1",
+          "@id": "dtmi:example:alpha_upsilon;1",
           "@type": "Object",
           "fields": {
-            "name": "itch_lambda",
+            "name": "alpha_tau",
             "schema": "string",
             "@type": [
               true
@@ -309,14 +309,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_pi;1",
+        "@id": "dtmi:example:alpha_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_omicron;1",
+          "@id": "dtmi:example:alpha_psi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "itch_xi",
+            "name": "alpha_chi",
             "schema": "time",
             "@type": [
               true
@@ -334,13 +334,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_tau;1",
+        "@id": "dtmi:example:alpha_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_sigma;1",
+          "@id": "dtmi:example:alpha_wum;1",
           "@type": "Object",
           "fields": {
-            "name": "itch_rho",
+            "name": "alpha_yuzz",
             "schema": "boolean",
             "@type": [
               {}
@@ -358,14 +358,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_chi;1",
+        "@id": "dtmi:example:alpha_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_phi;1",
+          "@id": "dtmi:example:alpha_fuddle;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "itch_upsilon",
+            "name": "alpha_humpf",
             "schema": "date",
             "@type": [
               {}
diff --git a/DTDL/v2/spec/Requirement-ClassInterfaceContextAtTopLevelV2.json b/DTDL/v2/spec/Requirement-ClassInterfaceContextAtTopLevelV2.json
index 4cb043bc..a979536c 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfaceContextAtTopLevelV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfaceContextAtTopLevelV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_xi;1",
+        "@id": "dtmi:example:rho_chi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_nu;1",
+          "@id": "dtmi:example:rho_phi;1",
           "@type": "Interface"
         }
       }
@@ -23,7 +23,7 @@
     ],
     "input": [
       {
-        "@id": "dtmi:example:nu_omicron;1",
+        "@id": "dtmi:example:rho_psi;1",
         "@type": "Interface"
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassInterfaceContextConformsV2.json b/DTDL/v2/spec/Requirement-ClassInterfaceContextConformsV2.json
index 6cad847a..7580e524 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfaceContextConformsV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfaceContextConformsV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_chi;1",
+        "@id": "dtmi:example:rho_glikk;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_phi;1",
+          "@id": "dtmi:example:rho_fuddle;1",
           "@type": "Interface",
           "@context": "dtmi:iotcentral:context;2"
         }
@@ -25,10 +25,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_omega;1",
+        "@id": "dtmi:example:rho_snee;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_psi;1",
+          "@id": "dtmi:example:rho_nuh;1",
           "@type": "Interface",
           "@context": []
         }
@@ -43,10 +43,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_wum;1",
+        "@id": "dtmi:example:rho_thnad;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_yuzz;1",
+          "@id": "dtmi:example:rho_quan;1",
           "@type": "Interface",
           "@context": [
             "dtmi:iotcentral:context;2"
@@ -63,10 +63,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_humpf;1",
+        "@id": "dtmi:example:rho_floob;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_um;1",
+          "@id": "dtmi:example:rho_spazz;1",
           "@type": "Interface",
           "@context": null
         }
@@ -81,10 +81,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_glikk;1",
+        "@id": "dtmi:example:rho_jogg;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_fuddle;1",
+          "@id": "dtmi:example:rho_zatz;1",
           "@type": "Interface",
           "@context": 626
         }
@@ -99,10 +99,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_snee;1",
+        "@id": "dtmi:example:rho_itch;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_nuh;1",
+          "@id": "dtmi:example:rho_flunn;1",
           "@type": "Interface",
           "@context": true
         }
@@ -117,10 +117,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_thnad;1",
+        "@id": "dtmi:example:rho_vroo;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_quan;1",
+          "@id": "dtmi:example:rho_yekk;1",
           "@type": "Interface",
           "@context": [
             null
@@ -137,10 +137,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_floob;1",
+        "@id": "dtmi:example:sigma_alpha;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_spazz;1",
+          "@id": "dtmi:example:rho_hi;1",
           "@type": "Interface",
           "@context": [
             626
@@ -157,10 +157,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_jogg;1",
+        "@id": "dtmi:example:sigma_gamma;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_zatz;1",
+          "@id": "dtmi:example:sigma_beta;1",
           "@type": "Interface",
           "@context": [
             true
@@ -177,12 +177,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_itch;1",
+        "@id": "dtmi:example:sigma_epsilon;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_flunn;1",
+          "@id": "dtmi:example:sigma_delta;1",
           "@type": "Interface",
-          "@context": {}
+          "@context": "dtmi:iotcentral:context"
         }
       }
     ]
@@ -195,14 +195,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_vroo;1",
+        "@id": "dtmi:example:sigma_eta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_yekk;1",
+          "@id": "dtmi:example:sigma_zeta;1",
           "@type": "Interface",
-          "@context": [
-            {}
-          ]
+          "@context": "http://iotcentral/context/2"
         }
       }
     ]
@@ -215,12 +213,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_alpha;1",
+        "@id": "dtmi:example:sigma_iota;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_hi;1",
+          "@id": "dtmi:example:sigma_theta;1",
           "@type": "Interface",
-          "@context": "dtmi:iotcentral:context"
+          "@context": "iotcentral;2"
         }
       }
     ]
@@ -233,12 +231,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_gamma;1",
+        "@id": "dtmi:example:sigma_lambda;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_beta;1",
+          "@id": "dtmi:example:sigma_kappa;1",
           "@type": "Interface",
-          "@context": "http://iotcentral/context/2"
+          "@context": {}
         }
       }
     ]
@@ -251,12 +249,56 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_epsilon;1",
+        "@id": "dtmi:example:sigma_nu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_delta;1",
+          "@id": "dtmi:example:sigma_mu;1",
           "@type": "Interface",
-          "@context": "iotcentral;2"
+          "@context": {
+            "foo": "dtmi:foo:bar;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:sigma_omicron;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:sigma_xi;1",
+          "@type": "Interface",
+          "@context": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:sigma_rho;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:sigma_pi;1",
+          "@type": "Interface",
+          "@context": [
+            {
+              "foo": "dtmi:foo:bar;1"
+            }
+          ]
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassInterfaceContextDtdlTopLevelV2.json b/DTDL/v2/spec/Requirement-ClassInterfaceContextDtdlTopLevelV2.json
index b77bde01..f98f84b2 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfaceContextDtdlTopLevelV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfaceContextDtdlTopLevelV2.json
@@ -6,7 +6,7 @@
     ],
     "input": [
       {
-        "@id": "dtmi:example:nu_pi;1",
+        "@id": "dtmi:example:rho_omega;1",
         "@type": "Interface",
         "@context": []
       }
@@ -19,7 +19,7 @@
     ],
     "input": [
       {
-        "@id": "dtmi:example:nu_rho;1",
+        "@id": "dtmi:example:rho_yuzz;1",
         "@type": "Interface",
         "@context": "dtmi:iotcentral:context;2"
       }
@@ -33,10 +33,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_tau;1",
+        "@id": "dtmi:example:rho_um;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_sigma;1",
+          "@id": "dtmi:example:rho_wum;1",
           "@type": "Interface",
           "@context": "dtmi:iotcentral:context;2"
         }
@@ -50,7 +50,7 @@
     ],
     "input": [
       {
-        "@id": "dtmi:example:nu_upsilon;1",
+        "@id": "dtmi:example:rho_humpf;1",
         "@type": "Interface",
         "@context": [
           "dtmi:dtdl:context;2",
diff --git a/DTDL/v2/spec/Requirement-ClassInterfaceGraphKeywordV2.json b/DTDL/v2/spec/Requirement-ClassInterfaceGraphKeywordV2.json
index a2df903d..867c308e 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfaceGraphKeywordV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfaceGraphKeywordV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_chi;1",
+        "@id": "dtmi:example:mu_lambda;1",
         "@type": "Interface",
         "@graph": {}
       }
@@ -24,7 +24,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:eta_psi;1",
+        "@id": "dtmi:example:mu_mu;1",
         "@type": "Interface",
         "@graph": {}
       }
diff --git a/DTDL/v2/spec/Requirement-ClassInterfaceIdDuplicateV2.json b/DTDL/v2/spec/Requirement-ClassInterfaceIdDuplicateV2.json
index 113dbd57..f62a33cd 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfaceIdDuplicateV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfaceIdDuplicateV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_gamma;1",
+        "@id": "dtmi:example:rho_lambda;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_gamma;1",
+          "@id": "dtmi:example:rho_lambda;1",
           "@type": "Interface"
         }
       }
@@ -24,11 +24,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_delta;1",
+        "@id": "dtmi:example:rho_mu;1",
         "@type": "Interface",
         "extends": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nu_delta;1",
+          "@id": "dtmi:example:rho_mu;1",
           "@type": "Interface"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertiesExtendsMaxDepthV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertiesExtendsMaxDepthV2.json
index d6a9e0f0..a5e056bd 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertiesExtendsMaxDepthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertiesExtendsMaxDepthV2.json
@@ -7,37 +7,37 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_mu;1",
+        "@id": "dtmi:example:fuddle_nuh;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:chi_lambda;1",
+          "@id": "dtmi:example:fuddle_glikk;1",
           "@type": "Interface",
           "extends": {
-            "@id": "dtmi:example:chi_kappa;1",
+            "@id": "dtmi:example:fuddle_fuddle;1",
             "@type": "Interface",
             "extends": {
-              "@id": "dtmi:example:chi_iota;1",
+              "@id": "dtmi:example:fuddle_humpf;1",
               "@type": "Interface",
               "extends": {
-                "@id": "dtmi:example:chi_theta;1",
+                "@id": "dtmi:example:fuddle_um;1",
                 "@type": "Interface",
                 "extends": {
-                  "@id": "dtmi:example:chi_eta;1",
+                  "@id": "dtmi:example:fuddle_wum;1",
                   "@type": "Interface",
                   "extends": {
-                    "@id": "dtmi:example:chi_zeta;1",
+                    "@id": "dtmi:example:fuddle_yuzz;1",
                     "@type": "Interface",
                     "extends": {
-                      "@id": "dtmi:example:chi_epsilon;1",
+                      "@id": "dtmi:example:fuddle_omega;1",
                       "@type": "Interface",
                       "extends": {
-                        "@id": "dtmi:example:chi_delta;1",
+                        "@id": "dtmi:example:fuddle_psi;1",
                         "@type": "Interface",
                         "extends": {
-                          "@id": "dtmi:example:chi_gamma;1",
+                          "@id": "dtmi:example:fuddle_chi;1",
                           "@type": "Interface",
                           "extends": {
-                            "@id": "dtmi:example:chi_beta;1",
+                            "@id": "dtmi:example:fuddle_phi;1",
                             "@type": "Interface"
                           }
                         }
@@ -60,40 +60,40 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_omega;1",
+        "@id": "dtmi:example:fuddle_hi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:chi_psi;1",
+          "@id": "dtmi:example:fuddle_vroo;1",
           "@type": "Interface",
           "extends": {
-            "@id": "dtmi:example:chi_chi;1",
+            "@id": "dtmi:example:fuddle_yekk;1",
             "@type": "Interface",
             "extends": {
-              "@id": "dtmi:example:chi_phi;1",
+              "@id": "dtmi:example:fuddle_itch;1",
               "@type": "Interface",
               "extends": {
-                "@id": "dtmi:example:chi_upsilon;1",
+                "@id": "dtmi:example:fuddle_flunn;1",
                 "@type": "Interface",
                 "extends": {
-                  "@id": "dtmi:example:chi_tau;1",
+                  "@id": "dtmi:example:fuddle_jogg;1",
                   "@type": "Interface",
                   "extends": {
-                    "@id": "dtmi:example:chi_sigma;1",
+                    "@id": "dtmi:example:fuddle_zatz;1",
                     "@type": "Interface",
                     "extends": {
-                      "@id": "dtmi:example:chi_rho;1",
+                      "@id": "dtmi:example:fuddle_floob;1",
                       "@type": "Interface",
                       "extends": {
-                        "@id": "dtmi:example:chi_pi;1",
+                        "@id": "dtmi:example:fuddle_spazz;1",
                         "@type": "Interface",
                         "extends": {
-                          "@id": "dtmi:example:chi_omicron;1",
+                          "@id": "dtmi:example:fuddle_thnad;1",
                           "@type": "Interface",
                           "extends": {
-                            "@id": "dtmi:example:chi_xi;1",
+                            "@id": "dtmi:example:fuddle_quan;1",
                             "@type": "Interface",
                             "extends": {
-                              "@id": "dtmi:example:chi_nu;1",
+                              "@id": "dtmi:example:fuddle_snee;1",
                               "@type": "Interface"
                             }
                           }
@@ -117,41 +117,41 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_floob;1",
+        "@id": "dtmi:example:glikk_mu;1",
         "@type": "Interface",
         "extends": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:chi_spazz;1",
+          "@id": "dtmi:example:glikk_lambda;1",
           "@type": "Interface",
           "extends": {
-            "@id": "dtmi:example:chi_thnad;1",
+            "@id": "dtmi:example:glikk_kappa;1",
             "@type": "Interface",
             "extends": {
-              "@id": "dtmi:example:chi_quan;1",
+              "@id": "dtmi:example:glikk_iota;1",
               "@type": "Interface",
               "extends": {
-                "@id": "dtmi:example:chi_snee;1",
+                "@id": "dtmi:example:glikk_theta;1",
                 "@type": "Interface",
                 "extends": {
-                  "@id": "dtmi:example:chi_nuh;1",
+                  "@id": "dtmi:example:glikk_eta;1",
                   "@type": "Interface",
                   "extends": {
-                    "@id": "dtmi:example:chi_glikk;1",
+                    "@id": "dtmi:example:glikk_zeta;1",
                     "@type": "Interface",
                     "extends": {
-                      "@id": "dtmi:example:chi_fuddle;1",
+                      "@id": "dtmi:example:glikk_epsilon;1",
                       "@type": "Interface",
                       "extends": {
-                        "@id": "dtmi:example:chi_humpf;1",
+                        "@id": "dtmi:example:glikk_delta;1",
                         "@type": "Interface",
                         "extends": {
-                          "@id": "dtmi:example:chi_um;1",
+                          "@id": "dtmi:example:glikk_gamma;1",
                           "@type": "Interface",
                           "extends": {
-                            "@id": "dtmi:example:chi_wum;1",
+                            "@id": "dtmi:example:glikk_beta;1",
                             "@type": "Interface",
                             "extends": {
-                              "@id": "dtmi:example:chi_yuzz;1",
+                              "@id": "dtmi:example:glikk_alpha;1",
                               "@type": "Interface"
                             }
                           }
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertiesExtendsSelfReferenceV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertiesExtendsSelfReferenceV2.json
new file mode 100644
index 00000000..72569eef
--- /dev/null
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertiesExtendsSelfReferenceV2.json
@@ -0,0 +1,39 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:glikk_nu;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:foo:beta_phi;1",
+          "@type": "Interface",
+          "extends": "dtmi:foo:beta_phi;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:glikk_xi;1",
+        "@type": "Interface",
+        "extends": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:beta_phi;1",
+          "@type": "Interface",
+          "extends": "dtmi:foo:beta_phi;1"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertyCommentStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertyCommentStringLengthV2.json
index 37230483..f08ae3f8 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertyCommentStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertyCommentStringLengthV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_um;1",
+        "@id": "dtmi:example:sigma_flunn;1",
         "@type": "Interface",
         "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
       }
@@ -21,7 +21,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_humpf;1",
+        "@id": "dtmi:example:sigma_itch;1",
         "@type": "Interface",
         "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
       }
@@ -38,7 +38,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:xi_fuddle;1",
+        "@id": "dtmi:example:sigma_yekk;1",
         "@type": "Interface",
         "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
       }
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertyCommentStringV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertyCommentStringV2.json
index 0c726731..fa6f277e 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertyCommentStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertyCommentStringV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_zeta;1",
+        "@id": "dtmi:example:sigma_sigma;1",
         "@type": "Interface",
         "comment": "hello"
       }
@@ -21,7 +21,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_eta;1",
+        "@id": "dtmi:example:sigma_tau;1",
         "@type": "Interface",
         "comment": [
           "hello"
@@ -37,7 +37,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_theta;1",
+        "@id": "dtmi:example:sigma_upsilon;1",
         "@type": "Interface",
         "comment": {
           "@value": "hello",
@@ -54,7 +54,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_iota;1",
+        "@id": "dtmi:example:sigma_phi;1",
         "@type": "Interface",
         "comment": [
           {
@@ -73,7 +73,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_kappa;1",
+        "@id": "dtmi:example:sigma_chi;1",
         "@type": "Interface",
         "comment": []
       }
@@ -87,7 +87,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_lambda;1",
+        "@id": "dtmi:example:sigma_psi;1",
         "@type": "Interface",
         "comment": null
       }
@@ -104,7 +104,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:xi_mu;1",
+        "@id": "dtmi:example:sigma_omega;1",
         "@type": "Interface",
         "comment": null
       }
@@ -118,7 +118,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_nu;1",
+        "@id": "dtmi:example:sigma_yuzz;1",
         "@type": "Interface",
         "comment": true
       }
@@ -135,7 +135,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:xi_xi;1",
+        "@id": "dtmi:example:sigma_wum;1",
         "@type": "Interface",
         "comment": true
       }
@@ -149,7 +149,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_omicron;1",
+        "@id": "dtmi:example:sigma_um;1",
         "@type": "Interface",
         "comment": 626
       }
@@ -166,7 +166,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:xi_pi;1",
+        "@id": "dtmi:example:sigma_humpf;1",
         "@type": "Interface",
         "comment": 626
       }
@@ -180,7 +180,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_rho;1",
+        "@id": "dtmi:example:sigma_fuddle;1",
         "@type": "Interface",
         "comment": [
           null
@@ -199,7 +199,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:xi_sigma;1",
+        "@id": "dtmi:example:sigma_glikk;1",
         "@type": "Interface",
         "comment": [
           null
@@ -215,7 +215,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_tau;1",
+        "@id": "dtmi:example:sigma_nuh;1",
         "@type": "Interface",
         "comment": [
           true
@@ -234,7 +234,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:xi_upsilon;1",
+        "@id": "dtmi:example:sigma_snee;1",
         "@type": "Interface",
         "comment": [
           true
@@ -250,7 +250,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_phi;1",
+        "@id": "dtmi:example:sigma_quan;1",
         "@type": "Interface",
         "comment": [
           626
@@ -269,7 +269,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:xi_chi;1",
+        "@id": "dtmi:example:sigma_thnad;1",
         "@type": "Interface",
         "comment": [
           626
@@ -285,7 +285,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_psi;1",
+        "@id": "dtmi:example:sigma_spazz;1",
         "@type": "Interface",
         "comment": {}
       }
@@ -302,7 +302,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:xi_omega;1",
+        "@id": "dtmi:example:sigma_floob;1",
         "@type": "Interface",
         "comment": {}
       }
@@ -316,7 +316,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_yuzz;1",
+        "@id": "dtmi:example:sigma_zatz;1",
         "@type": "Interface",
         "comment": [
           {}
@@ -335,7 +335,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:xi_wum;1",
+        "@id": "dtmi:example:sigma_jogg;1",
         "@type": "Interface",
         "comment": [
           {}
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertyCommentTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertyCommentTermAndDtmiV2.json
index b628d300..3d61f605 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertyCommentTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertyCommentTermAndDtmiV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_floob;1",
+        "@id": "dtmi:example:tau_epsilon;1",
         "@type": "Interface",
-        "comment": "xi_zatz",
-        "dtmi:dtdl:property:comment;2": "xi_jogg"
+        "comment": "tau_zeta",
+        "dtmi:dtdl:property:comment;2": "tau_eta"
       }
     ]
   },
@@ -25,10 +25,10 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:xi_flunn;1",
+        "@id": "dtmi:example:tau_theta;1",
         "@type": "Interface",
-        "comment": "xi_itch",
-        "dtmi:dtdl:property:comment;2": "xi_yekk"
+        "comment": "tau_iota",
+        "dtmi:dtdl:property:comment;2": "tau_kappa"
       }
     ]
   }
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertyContentsElementV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertyContentsElementV2.json
index 5ef9028c..91f9b059 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertyContentsElementV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertyContentsElementV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_beta;1",
+        "@id": "dtmi:example:tau_xi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omicron_alpha;1",
+          "@id": "dtmi:example:tau_nu;1",
           "@type": "Interface",
           "contents": {
-            "@id": "dtmi:example:xi_vroo;1",
+            "@id": "dtmi:example:tau_lambda;1",
             "@type": "Command",
-            "name": "xi_hi"
+            "name": "tau_mu"
           }
         }
       }
@@ -29,16 +29,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_zeta;1",
+        "@id": "dtmi:example:tau_sigma;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omicron_epsilon;1",
+          "@id": "dtmi:example:tau_rho;1",
           "@type": "Interface",
           "contents": [
             {
-              "@id": "dtmi:example:omicron_gamma;1",
+              "@id": "dtmi:example:tau_omicron;1",
               "@type": "Command",
-              "name": "omicron_delta"
+              "name": "tau_pi"
             }
           ]
         }
@@ -53,15 +53,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_kappa;1",
+        "@id": "dtmi:example:tau_chi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omicron_iota;1",
+          "@id": "dtmi:example:tau_phi;1",
           "@type": "Interface",
           "contents": {
-            "@id": "dtmi:example:omicron_eta;1",
+            "@id": "dtmi:example:tau_tau;1",
             "@type": "Command",
-            "name": "omicron_theta",
+            "name": "tau_upsilon",
             "@context": "dtmi:dtdl:context;3"
           }
         }
@@ -76,22 +76,69 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_xi;1",
+        "@id": "dtmi:example:tau_wum;1",
         "@type": "Interface",
         "extends": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omicron_nu;1",
+          "@id": "dtmi:example:tau_yuzz;1",
           "@type": "Interface",
           "contents": {
-            "@id": "dtmi:example:omicron_lambda;1",
+            "@id": "dtmi:example:tau_psi;1",
             "@type": "Command",
-            "name": "omicron_mu",
+            "name": "tau_omega",
             "@context": "dtmi:dtdl:context;3"
           }
         }
       }
     ]
   },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:tau_glikk;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:tau_fuddle;1",
+          "@type": "Interface",
+          "contents": {
+            "@id": "dtmi:example:tau_um;1",
+            "@type": "Command",
+            "name": "tau_humpf",
+            "@context": "dtmi:dtdl:context;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:tau_thnad;1",
+        "@type": "Interface",
+        "extends": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:tau_quan;1",
+          "@type": "Interface",
+          "contents": {
+            "@id": "dtmi:example:tau_nuh;1",
+            "@type": "Command",
+            "name": "tau_snee",
+            "@context": "dtmi:dtdl:context;4"
+          }
+        }
+      }
+    ]
+  },
   {
     "valid": true,
     "options": [
@@ -100,10 +147,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_pi;1",
+        "@id": "dtmi:example:tau_floob;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omicron_omicron;1",
+          "@id": "dtmi:example:tau_spazz;1",
           "@type": "Interface",
           "contents": []
         }
@@ -118,23 +165,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_psi;1",
+        "@id": "dtmi:example:tau_hi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omicron_chi;1",
+          "@id": "dtmi:example:tau_vroo;1",
           "@type": "Interface",
           "contents": [
             {
-              "@id": "dtmi:example:omicron_rho;1",
+              "@id": "dtmi:example:tau_zatz;1",
               "@type": "Command",
-              "name": "omicron_sigma"
+              "name": "tau_jogg"
             },
             {
-              "@id": "dtmi:example:omicron_tau;1",
+              "@id": "dtmi:example:tau_flunn;1",
               "@type": "Component",
-              "name": "omicron_upsilon",
+              "name": "tau_itch",
               "schema": {
-                "@id": "dtmi:example:omicron_phi;1",
+                "@id": "dtmi:example:tau_yekk;1",
                 "@type": "Interface"
               }
             }
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertyContentsMaxCountV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertyContentsMaxCountV2.json
index f9afea23..d29a14bf 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertyContentsMaxCountV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertyContentsMaxCountV2.json
@@ -7,1567 +7,1567 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_snee;1",
+        "@id": "dtmi:example:glikk_iota;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Command",
-            "name": "rho_pi"
+            "name": "phi_floob"
           },
           {
             "@type": "Component",
-            "name": "rho_rho",
+            "name": "phi_zatz",
             "schema": {
-              "@id": "dtmi:example:rho_sigma;1",
+              "@id": "dtmi:example:phi_jogg;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "rho_tau",
+            "name": "phi_flunn",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "rho_upsilon"
+            "name": "phi_itch"
           },
           {
             "@type": "Telemetry",
-            "name": "rho_phi",
+            "name": "phi_yekk",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "rho_chi"
+            "name": "phi_vroo"
           },
           {
             "@type": "Component",
-            "name": "rho_psi",
+            "name": "phi_hi",
             "schema": {
-              "@id": "dtmi:example:rho_omega;1",
+              "@id": "dtmi:example:chi_alpha;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "rho_yuzz",
+            "name": "chi_beta",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "rho_wum"
+            "name": "chi_gamma"
           },
           {
             "@type": "Telemetry",
-            "name": "rho_um",
+            "name": "chi_delta",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "rho_humpf"
+            "name": "chi_epsilon"
           },
           {
             "@type": "Component",
-            "name": "rho_fuddle",
+            "name": "chi_zeta",
             "schema": {
-              "@id": "dtmi:example:rho_glikk;1",
+              "@id": "dtmi:example:chi_eta;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "rho_nuh",
+            "name": "chi_theta",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "rho_snee"
+            "name": "chi_iota"
           },
           {
             "@type": "Telemetry",
-            "name": "rho_quan",
+            "name": "chi_kappa",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "rho_thnad"
+            "name": "chi_lambda"
           },
           {
             "@type": "Component",
-            "name": "rho_spazz",
+            "name": "chi_mu",
             "schema": {
-              "@id": "dtmi:example:rho_floob;1",
+              "@id": "dtmi:example:chi_nu;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "rho_zatz",
+            "name": "chi_xi",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "rho_jogg"
+            "name": "chi_omicron"
           },
           {
             "@type": "Telemetry",
-            "name": "rho_flunn",
+            "name": "chi_pi",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "rho_itch"
+            "name": "chi_rho"
           },
           {
             "@type": "Component",
-            "name": "rho_yekk",
+            "name": "chi_sigma",
             "schema": {
-              "@id": "dtmi:example:rho_vroo;1",
+              "@id": "dtmi:example:chi_tau;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "rho_hi",
+            "name": "chi_upsilon",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "sigma_alpha"
+            "name": "chi_phi"
           },
           {
             "@type": "Telemetry",
-            "name": "sigma_beta",
+            "name": "chi_chi",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "sigma_gamma"
+            "name": "chi_psi"
           },
           {
             "@type": "Component",
-            "name": "sigma_delta",
+            "name": "chi_omega",
             "schema": {
-              "@id": "dtmi:example:sigma_epsilon;1",
+              "@id": "dtmi:example:chi_yuzz;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "sigma_zeta",
+            "name": "chi_wum",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "sigma_eta"
+            "name": "chi_um"
           },
           {
             "@type": "Telemetry",
-            "name": "sigma_theta",
+            "name": "chi_humpf",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "sigma_iota"
+            "name": "chi_fuddle"
           },
           {
             "@type": "Component",
-            "name": "sigma_kappa",
+            "name": "chi_glikk",
             "schema": {
-              "@id": "dtmi:example:sigma_lambda;1",
+              "@id": "dtmi:example:chi_nuh;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "sigma_mu",
+            "name": "chi_snee",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "sigma_nu"
+            "name": "chi_quan"
           },
           {
             "@type": "Telemetry",
-            "name": "sigma_xi",
+            "name": "chi_thnad",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "sigma_omicron"
+            "name": "chi_spazz"
           },
           {
             "@type": "Component",
-            "name": "sigma_pi",
+            "name": "chi_floob",
             "schema": {
-              "@id": "dtmi:example:sigma_rho;1",
+              "@id": "dtmi:example:chi_zatz;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "sigma_sigma",
+            "name": "chi_jogg",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "sigma_tau"
+            "name": "chi_flunn"
           },
           {
             "@type": "Telemetry",
-            "name": "sigma_upsilon",
+            "name": "chi_itch",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "sigma_phi"
+            "name": "chi_yekk"
           },
           {
             "@type": "Component",
-            "name": "sigma_chi",
+            "name": "chi_vroo",
             "schema": {
-              "@id": "dtmi:example:sigma_psi;1",
+              "@id": "dtmi:example:chi_hi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "sigma_omega",
+            "name": "psi_alpha",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "sigma_yuzz"
+            "name": "psi_beta"
           },
           {
             "@type": "Telemetry",
-            "name": "sigma_wum",
+            "name": "psi_gamma",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "sigma_um"
+            "name": "psi_delta"
           },
           {
             "@type": "Component",
-            "name": "sigma_humpf",
+            "name": "psi_epsilon",
             "schema": {
-              "@id": "dtmi:example:sigma_fuddle;1",
+              "@id": "dtmi:example:psi_zeta;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "sigma_glikk",
+            "name": "psi_eta",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "sigma_nuh"
+            "name": "psi_theta"
           },
           {
             "@type": "Telemetry",
-            "name": "sigma_snee",
+            "name": "psi_iota",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "sigma_quan"
+            "name": "psi_kappa"
           },
           {
             "@type": "Component",
-            "name": "sigma_thnad",
+            "name": "psi_lambda",
             "schema": {
-              "@id": "dtmi:example:sigma_spazz;1",
+              "@id": "dtmi:example:psi_mu;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "sigma_floob",
+            "name": "psi_nu",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "sigma_zatz"
+            "name": "psi_xi"
           },
           {
             "@type": "Telemetry",
-            "name": "sigma_jogg",
+            "name": "psi_omicron",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "sigma_flunn"
+            "name": "psi_pi"
           },
           {
             "@type": "Component",
-            "name": "sigma_itch",
+            "name": "psi_rho",
             "schema": {
-              "@id": "dtmi:example:sigma_yekk;1",
+              "@id": "dtmi:example:psi_sigma;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "sigma_vroo",
+            "name": "psi_tau",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "sigma_hi"
+            "name": "psi_upsilon"
           },
           {
             "@type": "Telemetry",
-            "name": "tau_alpha",
+            "name": "psi_phi",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "tau_beta"
+            "name": "psi_chi"
           },
           {
             "@type": "Component",
-            "name": "tau_gamma",
+            "name": "psi_psi",
             "schema": {
-              "@id": "dtmi:example:tau_delta;1",
+              "@id": "dtmi:example:psi_omega;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "tau_epsilon",
+            "name": "psi_yuzz",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "tau_zeta"
+            "name": "psi_wum"
           },
           {
             "@type": "Telemetry",
-            "name": "tau_eta",
+            "name": "psi_um",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "tau_theta"
+            "name": "psi_humpf"
           },
           {
             "@type": "Component",
-            "name": "tau_iota",
+            "name": "psi_fuddle",
             "schema": {
-              "@id": "dtmi:example:tau_kappa;1",
+              "@id": "dtmi:example:psi_glikk;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "tau_lambda",
+            "name": "psi_nuh",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "tau_mu"
+            "name": "psi_snee"
           },
           {
             "@type": "Telemetry",
-            "name": "tau_nu",
+            "name": "psi_quan",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "tau_xi"
+            "name": "psi_thnad"
           },
           {
             "@type": "Component",
-            "name": "tau_omicron",
+            "name": "psi_spazz",
             "schema": {
-              "@id": "dtmi:example:tau_pi;1",
+              "@id": "dtmi:example:psi_floob;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "tau_rho",
+            "name": "psi_zatz",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "tau_sigma"
+            "name": "psi_jogg"
           },
           {
             "@type": "Telemetry",
-            "name": "tau_tau",
+            "name": "psi_flunn",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "tau_upsilon"
+            "name": "psi_itch"
           },
           {
             "@type": "Component",
-            "name": "tau_phi",
+            "name": "psi_yekk",
             "schema": {
-              "@id": "dtmi:example:tau_chi;1",
+              "@id": "dtmi:example:psi_vroo;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "tau_psi",
+            "name": "psi_hi",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "tau_omega"
+            "name": "omega_alpha"
           },
           {
             "@type": "Telemetry",
-            "name": "tau_yuzz",
+            "name": "omega_beta",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "tau_wum"
+            "name": "omega_gamma"
           },
           {
             "@type": "Component",
-            "name": "tau_um",
+            "name": "omega_delta",
             "schema": {
-              "@id": "dtmi:example:tau_humpf;1",
+              "@id": "dtmi:example:omega_epsilon;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "tau_fuddle",
+            "name": "omega_zeta",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "tau_glikk"
+            "name": "omega_eta"
           },
           {
             "@type": "Telemetry",
-            "name": "tau_nuh",
+            "name": "omega_theta",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "tau_snee"
+            "name": "omega_iota"
           },
           {
             "@type": "Component",
-            "name": "tau_quan",
+            "name": "omega_kappa",
             "schema": {
-              "@id": "dtmi:example:tau_thnad;1",
+              "@id": "dtmi:example:omega_lambda;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "tau_spazz",
+            "name": "omega_mu",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "tau_floob"
+            "name": "omega_nu"
           },
           {
             "@type": "Telemetry",
-            "name": "tau_zatz",
+            "name": "omega_xi",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "tau_jogg"
+            "name": "omega_omicron"
           },
           {
             "@type": "Component",
-            "name": "tau_flunn",
+            "name": "omega_pi",
             "schema": {
-              "@id": "dtmi:example:tau_itch;1",
+              "@id": "dtmi:example:omega_rho;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "tau_yekk",
+            "name": "omega_sigma",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "tau_vroo"
+            "name": "omega_tau"
           },
           {
             "@type": "Telemetry",
-            "name": "tau_hi",
+            "name": "omega_upsilon",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "upsilon_alpha"
+            "name": "omega_phi"
           },
           {
             "@type": "Component",
-            "name": "upsilon_beta",
+            "name": "omega_chi",
             "schema": {
-              "@id": "dtmi:example:upsilon_gamma;1",
+              "@id": "dtmi:example:omega_psi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "upsilon_delta",
+            "name": "omega_omega",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "upsilon_epsilon"
+            "name": "omega_yuzz"
           },
           {
             "@type": "Telemetry",
-            "name": "upsilon_zeta",
+            "name": "omega_wum",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "upsilon_eta"
+            "name": "omega_um"
           },
           {
             "@type": "Component",
-            "name": "upsilon_theta",
+            "name": "omega_humpf",
             "schema": {
-              "@id": "dtmi:example:upsilon_iota;1",
+              "@id": "dtmi:example:omega_fuddle;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "upsilon_kappa",
+            "name": "omega_glikk",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "upsilon_lambda"
+            "name": "omega_nuh"
           },
           {
             "@type": "Telemetry",
-            "name": "upsilon_mu",
+            "name": "omega_snee",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "upsilon_nu"
+            "name": "omega_quan"
           },
           {
             "@type": "Component",
-            "name": "upsilon_xi",
+            "name": "omega_thnad",
             "schema": {
-              "@id": "dtmi:example:upsilon_omicron;1",
+              "@id": "dtmi:example:omega_spazz;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "upsilon_pi",
+            "name": "omega_floob",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "upsilon_rho"
+            "name": "omega_zatz"
           },
           {
             "@type": "Telemetry",
-            "name": "upsilon_sigma",
+            "name": "omega_jogg",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "upsilon_tau"
+            "name": "omega_flunn"
           },
           {
             "@type": "Component",
-            "name": "upsilon_upsilon",
+            "name": "omega_itch",
             "schema": {
-              "@id": "dtmi:example:upsilon_phi;1",
+              "@id": "dtmi:example:omega_yekk;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "upsilon_chi",
+            "name": "omega_vroo",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "upsilon_psi"
+            "name": "omega_hi"
           },
           {
             "@type": "Telemetry",
-            "name": "upsilon_omega",
+            "name": "yuzz_alpha",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "upsilon_yuzz"
+            "name": "yuzz_beta"
           },
           {
             "@type": "Component",
-            "name": "upsilon_wum",
+            "name": "yuzz_gamma",
             "schema": {
-              "@id": "dtmi:example:upsilon_um;1",
+              "@id": "dtmi:example:yuzz_delta;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "upsilon_humpf",
+            "name": "yuzz_epsilon",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "upsilon_fuddle"
+            "name": "yuzz_zeta"
           },
           {
             "@type": "Telemetry",
-            "name": "upsilon_glikk",
+            "name": "yuzz_eta",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "upsilon_nuh"
+            "name": "yuzz_theta"
           },
           {
             "@type": "Component",
-            "name": "upsilon_snee",
+            "name": "yuzz_iota",
             "schema": {
-              "@id": "dtmi:example:upsilon_quan;1",
+              "@id": "dtmi:example:yuzz_kappa;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "upsilon_thnad",
+            "name": "yuzz_lambda",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "upsilon_spazz"
+            "name": "yuzz_mu"
           },
           {
             "@type": "Telemetry",
-            "name": "upsilon_floob",
+            "name": "yuzz_nu",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "upsilon_zatz"
+            "name": "yuzz_xi"
           },
           {
             "@type": "Component",
-            "name": "upsilon_jogg",
+            "name": "yuzz_omicron",
             "schema": {
-              "@id": "dtmi:example:upsilon_flunn;1",
+              "@id": "dtmi:example:yuzz_pi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "upsilon_itch",
+            "name": "yuzz_rho",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "upsilon_yekk"
+            "name": "yuzz_sigma"
           },
           {
             "@type": "Telemetry",
-            "name": "upsilon_vroo",
+            "name": "yuzz_tau",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "upsilon_hi"
+            "name": "yuzz_upsilon"
           },
           {
             "@type": "Component",
-            "name": "phi_alpha",
+            "name": "yuzz_phi",
             "schema": {
-              "@id": "dtmi:example:phi_beta;1",
+              "@id": "dtmi:example:yuzz_chi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "phi_gamma",
+            "name": "yuzz_psi",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "phi_delta"
+            "name": "yuzz_omega"
           },
           {
             "@type": "Telemetry",
-            "name": "phi_epsilon",
+            "name": "yuzz_yuzz",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "phi_zeta"
+            "name": "yuzz_wum"
           },
           {
             "@type": "Component",
-            "name": "phi_eta",
+            "name": "yuzz_um",
             "schema": {
-              "@id": "dtmi:example:phi_theta;1",
+              "@id": "dtmi:example:yuzz_humpf;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "phi_iota",
+            "name": "yuzz_fuddle",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "phi_kappa"
+            "name": "yuzz_glikk"
           },
           {
             "@type": "Telemetry",
-            "name": "phi_lambda",
+            "name": "yuzz_nuh",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "phi_mu"
+            "name": "yuzz_snee"
           },
           {
             "@type": "Component",
-            "name": "phi_nu",
+            "name": "yuzz_quan",
             "schema": {
-              "@id": "dtmi:example:phi_xi;1",
+              "@id": "dtmi:example:yuzz_thnad;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "phi_omicron",
+            "name": "yuzz_spazz",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "phi_pi"
+            "name": "yuzz_floob"
           },
           {
             "@type": "Telemetry",
-            "name": "phi_rho",
+            "name": "yuzz_zatz",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "phi_sigma"
+            "name": "yuzz_jogg"
           },
           {
             "@type": "Component",
-            "name": "phi_tau",
+            "name": "yuzz_flunn",
             "schema": {
-              "@id": "dtmi:example:phi_upsilon;1",
+              "@id": "dtmi:example:yuzz_itch;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "phi_phi",
+            "name": "yuzz_yekk",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "phi_chi"
+            "name": "yuzz_vroo"
           },
           {
             "@type": "Telemetry",
-            "name": "phi_psi",
+            "name": "yuzz_hi",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "phi_omega"
+            "name": "wum_alpha"
           },
           {
             "@type": "Component",
-            "name": "phi_yuzz",
+            "name": "wum_beta",
             "schema": {
-              "@id": "dtmi:example:phi_wum;1",
+              "@id": "dtmi:example:wum_gamma;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "phi_um",
+            "name": "wum_delta",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "phi_humpf"
+            "name": "wum_epsilon"
           },
           {
             "@type": "Telemetry",
-            "name": "phi_fuddle",
+            "name": "wum_zeta",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "phi_glikk"
+            "name": "wum_eta"
           },
           {
             "@type": "Component",
-            "name": "phi_nuh",
+            "name": "wum_theta",
             "schema": {
-              "@id": "dtmi:example:phi_snee;1",
+              "@id": "dtmi:example:wum_iota;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "phi_quan",
+            "name": "wum_kappa",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "phi_thnad"
+            "name": "wum_lambda"
           },
           {
             "@type": "Telemetry",
-            "name": "phi_spazz",
+            "name": "wum_mu",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "phi_floob"
+            "name": "wum_nu"
           },
           {
             "@type": "Component",
-            "name": "phi_zatz",
+            "name": "wum_xi",
             "schema": {
-              "@id": "dtmi:example:phi_jogg;1",
+              "@id": "dtmi:example:wum_omicron;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "phi_flunn",
+            "name": "wum_pi",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "phi_itch"
+            "name": "wum_rho"
           },
           {
             "@type": "Telemetry",
-            "name": "phi_yekk",
+            "name": "wum_sigma",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "phi_vroo"
+            "name": "wum_tau"
           },
           {
             "@type": "Component",
-            "name": "phi_hi",
+            "name": "wum_upsilon",
             "schema": {
-              "@id": "dtmi:example:chi_alpha;1",
+              "@id": "dtmi:example:wum_phi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "chi_beta",
+            "name": "wum_chi",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "chi_gamma"
+            "name": "wum_psi"
           },
           {
             "@type": "Telemetry",
-            "name": "chi_delta",
+            "name": "wum_omega",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "chi_epsilon"
+            "name": "wum_yuzz"
           },
           {
             "@type": "Component",
-            "name": "chi_zeta",
+            "name": "wum_wum",
             "schema": {
-              "@id": "dtmi:example:chi_eta;1",
+              "@id": "dtmi:example:wum_um;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "chi_theta",
+            "name": "wum_humpf",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "chi_iota"
+            "name": "wum_fuddle"
           },
           {
             "@type": "Telemetry",
-            "name": "chi_kappa",
+            "name": "wum_glikk",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "chi_lambda"
+            "name": "wum_nuh"
           },
           {
             "@type": "Component",
-            "name": "chi_mu",
+            "name": "wum_snee",
             "schema": {
-              "@id": "dtmi:example:chi_nu;1",
+              "@id": "dtmi:example:wum_quan;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "chi_xi",
+            "name": "wum_thnad",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "chi_omicron"
+            "name": "wum_spazz"
           },
           {
             "@type": "Telemetry",
-            "name": "chi_pi",
+            "name": "wum_floob",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "chi_rho"
+            "name": "wum_zatz"
           },
           {
             "@type": "Component",
-            "name": "chi_sigma",
+            "name": "wum_jogg",
             "schema": {
-              "@id": "dtmi:example:chi_tau;1",
+              "@id": "dtmi:example:wum_flunn;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "chi_upsilon",
+            "name": "wum_itch",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "chi_phi"
+            "name": "wum_yekk"
           },
           {
             "@type": "Telemetry",
-            "name": "chi_chi",
+            "name": "wum_vroo",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "chi_psi"
+            "name": "wum_hi"
           },
           {
             "@type": "Component",
-            "name": "chi_omega",
+            "name": "um_alpha",
             "schema": {
-              "@id": "dtmi:example:chi_yuzz;1",
+              "@id": "dtmi:example:um_beta;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "chi_wum",
+            "name": "um_gamma",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "chi_um"
+            "name": "um_delta"
           },
           {
             "@type": "Telemetry",
-            "name": "chi_humpf",
+            "name": "um_epsilon",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "chi_fuddle"
+            "name": "um_zeta"
           },
           {
             "@type": "Component",
-            "name": "chi_glikk",
+            "name": "um_eta",
             "schema": {
-              "@id": "dtmi:example:chi_nuh;1",
+              "@id": "dtmi:example:um_theta;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "chi_snee",
+            "name": "um_iota",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "chi_quan"
+            "name": "um_kappa"
           },
           {
             "@type": "Telemetry",
-            "name": "chi_thnad",
+            "name": "um_lambda",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "chi_spazz"
+            "name": "um_mu"
           },
           {
             "@type": "Component",
-            "name": "chi_floob",
+            "name": "um_nu",
             "schema": {
-              "@id": "dtmi:example:chi_zatz;1",
+              "@id": "dtmi:example:um_xi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "chi_jogg",
+            "name": "um_omicron",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "chi_flunn"
+            "name": "um_pi"
           },
           {
             "@type": "Telemetry",
-            "name": "chi_itch",
+            "name": "um_rho",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "chi_yekk"
+            "name": "um_sigma"
           },
           {
             "@type": "Component",
-            "name": "chi_vroo",
+            "name": "um_tau",
             "schema": {
-              "@id": "dtmi:example:chi_hi;1",
+              "@id": "dtmi:example:um_upsilon;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "psi_alpha",
+            "name": "um_phi",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "psi_beta"
+            "name": "um_chi"
           },
           {
             "@type": "Telemetry",
-            "name": "psi_gamma",
+            "name": "um_psi",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "psi_delta"
+            "name": "um_omega"
           },
           {
             "@type": "Component",
-            "name": "psi_epsilon",
+            "name": "um_yuzz",
             "schema": {
-              "@id": "dtmi:example:psi_zeta;1",
+              "@id": "dtmi:example:um_wum;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "psi_eta",
+            "name": "um_um",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "psi_theta"
+            "name": "um_humpf"
           },
           {
             "@type": "Telemetry",
-            "name": "psi_iota",
+            "name": "um_fuddle",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "psi_kappa"
+            "name": "um_glikk"
           },
           {
             "@type": "Component",
-            "name": "psi_lambda",
+            "name": "um_nuh",
             "schema": {
-              "@id": "dtmi:example:psi_mu;1",
+              "@id": "dtmi:example:um_snee;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "psi_nu",
+            "name": "um_quan",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "psi_xi"
+            "name": "um_thnad"
           },
           {
             "@type": "Telemetry",
-            "name": "psi_omicron",
+            "name": "um_spazz",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "psi_pi"
+            "name": "um_floob"
           },
           {
             "@type": "Component",
-            "name": "psi_rho",
+            "name": "um_zatz",
             "schema": {
-              "@id": "dtmi:example:psi_sigma;1",
+              "@id": "dtmi:example:um_jogg;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "psi_tau",
+            "name": "um_flunn",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "psi_upsilon"
+            "name": "um_itch"
           },
           {
             "@type": "Telemetry",
-            "name": "psi_phi",
+            "name": "um_yekk",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "psi_chi"
+            "name": "um_vroo"
           },
           {
             "@type": "Component",
-            "name": "psi_psi",
+            "name": "um_hi",
             "schema": {
-              "@id": "dtmi:example:psi_omega;1",
+              "@id": "dtmi:example:humpf_alpha;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "psi_yuzz",
+            "name": "humpf_beta",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "psi_wum"
+            "name": "humpf_gamma"
           },
           {
             "@type": "Telemetry",
-            "name": "psi_um",
+            "name": "humpf_delta",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "psi_humpf"
+            "name": "humpf_epsilon"
           },
           {
             "@type": "Component",
-            "name": "psi_fuddle",
+            "name": "humpf_zeta",
             "schema": {
-              "@id": "dtmi:example:psi_glikk;1",
+              "@id": "dtmi:example:humpf_eta;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "psi_nuh",
+            "name": "humpf_theta",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "psi_snee"
+            "name": "humpf_iota"
           },
           {
             "@type": "Telemetry",
-            "name": "psi_quan",
+            "name": "humpf_kappa",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "psi_thnad"
+            "name": "humpf_lambda"
           },
           {
             "@type": "Component",
-            "name": "psi_spazz",
+            "name": "humpf_mu",
             "schema": {
-              "@id": "dtmi:example:psi_floob;1",
+              "@id": "dtmi:example:humpf_nu;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "psi_zatz",
+            "name": "humpf_xi",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "psi_jogg"
+            "name": "humpf_omicron"
           },
           {
             "@type": "Telemetry",
-            "name": "psi_flunn",
+            "name": "humpf_pi",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "psi_itch"
+            "name": "humpf_rho"
           },
           {
             "@type": "Component",
-            "name": "psi_yekk",
+            "name": "humpf_sigma",
             "schema": {
-              "@id": "dtmi:example:psi_vroo;1",
+              "@id": "dtmi:example:humpf_tau;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "psi_hi",
+            "name": "humpf_upsilon",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "omega_alpha"
+            "name": "humpf_phi"
           },
           {
             "@type": "Telemetry",
-            "name": "omega_beta",
+            "name": "humpf_chi",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "omega_gamma"
+            "name": "humpf_psi"
           },
           {
             "@type": "Component",
-            "name": "omega_delta",
+            "name": "humpf_omega",
             "schema": {
-              "@id": "dtmi:example:omega_epsilon;1",
+              "@id": "dtmi:example:humpf_yuzz;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "omega_zeta",
+            "name": "humpf_wum",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "omega_eta"
+            "name": "humpf_um"
           },
           {
             "@type": "Telemetry",
-            "name": "omega_theta",
+            "name": "humpf_humpf",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "omega_iota"
+            "name": "humpf_fuddle"
           },
           {
             "@type": "Component",
-            "name": "omega_kappa",
+            "name": "humpf_glikk",
             "schema": {
-              "@id": "dtmi:example:omega_lambda;1",
+              "@id": "dtmi:example:humpf_nuh;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "omega_mu",
+            "name": "humpf_snee",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "omega_nu"
+            "name": "humpf_quan"
           },
           {
             "@type": "Telemetry",
-            "name": "omega_xi",
+            "name": "humpf_thnad",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "omega_omicron"
+            "name": "humpf_spazz"
           },
           {
             "@type": "Component",
-            "name": "omega_pi",
+            "name": "humpf_floob",
             "schema": {
-              "@id": "dtmi:example:omega_rho;1",
+              "@id": "dtmi:example:humpf_zatz;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "omega_sigma",
+            "name": "humpf_jogg",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "omega_tau"
+            "name": "humpf_flunn"
           },
           {
             "@type": "Telemetry",
-            "name": "omega_upsilon",
+            "name": "humpf_itch",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "omega_phi"
+            "name": "humpf_yekk"
           },
           {
             "@type": "Component",
-            "name": "omega_chi",
+            "name": "humpf_vroo",
             "schema": {
-              "@id": "dtmi:example:omega_psi;1",
+              "@id": "dtmi:example:humpf_hi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "omega_omega",
+            "name": "fuddle_alpha",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "omega_yuzz"
+            "name": "fuddle_beta"
           },
           {
             "@type": "Telemetry",
-            "name": "omega_wum",
+            "name": "fuddle_gamma",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "omega_um"
+            "name": "fuddle_delta"
           },
           {
             "@type": "Component",
-            "name": "omega_humpf",
+            "name": "fuddle_epsilon",
             "schema": {
-              "@id": "dtmi:example:omega_fuddle;1",
+              "@id": "dtmi:example:fuddle_zeta;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "omega_glikk",
+            "name": "fuddle_eta",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "omega_nuh"
+            "name": "fuddle_theta"
           },
           {
             "@type": "Telemetry",
-            "name": "omega_snee",
+            "name": "fuddle_iota",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "omega_quan"
+            "name": "fuddle_kappa"
           },
           {
             "@type": "Component",
-            "name": "omega_thnad",
+            "name": "fuddle_lambda",
             "schema": {
-              "@id": "dtmi:example:omega_spazz;1",
+              "@id": "dtmi:example:fuddle_mu;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "omega_floob",
+            "name": "fuddle_nu",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "omega_zatz"
+            "name": "fuddle_xi"
           },
           {
             "@type": "Telemetry",
-            "name": "omega_jogg",
+            "name": "fuddle_omicron",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "omega_flunn"
+            "name": "fuddle_pi"
           },
           {
             "@type": "Component",
-            "name": "omega_itch",
+            "name": "fuddle_rho",
             "schema": {
-              "@id": "dtmi:example:omega_yekk;1",
+              "@id": "dtmi:example:fuddle_sigma;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "omega_vroo",
+            "name": "fuddle_tau",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "omega_hi"
+            "name": "fuddle_upsilon"
           },
           {
             "@type": "Telemetry",
-            "name": "yuzz_alpha",
+            "name": "fuddle_phi",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "yuzz_beta"
+            "name": "fuddle_chi"
           },
           {
             "@type": "Component",
-            "name": "yuzz_gamma",
+            "name": "fuddle_psi",
             "schema": {
-              "@id": "dtmi:example:yuzz_delta;1",
+              "@id": "dtmi:example:fuddle_omega;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "yuzz_epsilon",
+            "name": "fuddle_yuzz",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "yuzz_zeta"
+            "name": "fuddle_wum"
           },
           {
             "@type": "Telemetry",
-            "name": "yuzz_eta",
+            "name": "fuddle_um",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "yuzz_theta"
+            "name": "fuddle_humpf"
           },
           {
             "@type": "Component",
-            "name": "yuzz_iota",
+            "name": "fuddle_fuddle",
             "schema": {
-              "@id": "dtmi:example:yuzz_kappa;1",
+              "@id": "dtmi:example:fuddle_glikk;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "yuzz_lambda",
+            "name": "fuddle_nuh",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "yuzz_mu"
+            "name": "fuddle_snee"
           },
           {
             "@type": "Telemetry",
-            "name": "yuzz_nu",
+            "name": "fuddle_quan",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "yuzz_xi"
+            "name": "fuddle_thnad"
           },
           {
             "@type": "Component",
-            "name": "yuzz_omicron",
+            "name": "fuddle_spazz",
             "schema": {
-              "@id": "dtmi:example:yuzz_pi;1",
+              "@id": "dtmi:example:fuddle_floob;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "yuzz_rho",
+            "name": "fuddle_zatz",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "yuzz_sigma"
+            "name": "fuddle_jogg"
           },
           {
             "@type": "Telemetry",
-            "name": "yuzz_tau",
+            "name": "fuddle_flunn",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "yuzz_upsilon"
+            "name": "fuddle_itch"
           },
           {
             "@type": "Component",
-            "name": "yuzz_phi",
+            "name": "fuddle_yekk",
             "schema": {
-              "@id": "dtmi:example:yuzz_chi;1",
+              "@id": "dtmi:example:fuddle_vroo;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "yuzz_psi",
+            "name": "fuddle_hi",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "yuzz_omega"
+            "name": "glikk_alpha"
           },
           {
             "@type": "Telemetry",
-            "name": "yuzz_yuzz",
+            "name": "glikk_beta",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "yuzz_wum"
+            "name": "glikk_gamma"
           },
           {
             "@type": "Component",
-            "name": "yuzz_um",
+            "name": "glikk_delta",
             "schema": {
-              "@id": "dtmi:example:yuzz_humpf;1",
+              "@id": "dtmi:example:glikk_epsilon;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "yuzz_fuddle",
+            "name": "glikk_zeta",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "yuzz_glikk"
+            "name": "glikk_eta"
           },
           {
             "@type": "Telemetry",
-            "name": "yuzz_nuh",
+            "name": "glikk_theta",
             "schema": "long"
           }
         ]
@@ -1582,1572 +1582,1572 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_eta;1",
+        "@id": "dtmi:example:jogg_um;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Command",
-            "name": "yuzz_quan"
+            "name": "glikk_kappa"
           },
           {
             "@type": "Component",
-            "name": "yuzz_thnad",
+            "name": "glikk_lambda",
             "schema": {
-              "@id": "dtmi:example:yuzz_spazz;1",
+              "@id": "dtmi:example:glikk_mu;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "yuzz_floob",
+            "name": "glikk_nu",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "yuzz_zatz"
+            "name": "glikk_xi"
           },
           {
             "@type": "Telemetry",
-            "name": "yuzz_jogg",
+            "name": "glikk_omicron",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "yuzz_flunn"
+            "name": "glikk_pi"
           },
           {
             "@type": "Component",
-            "name": "yuzz_itch",
+            "name": "glikk_rho",
             "schema": {
-              "@id": "dtmi:example:yuzz_yekk;1",
+              "@id": "dtmi:example:glikk_sigma;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "yuzz_vroo",
+            "name": "glikk_tau",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "yuzz_hi"
+            "name": "glikk_upsilon"
           },
           {
             "@type": "Telemetry",
-            "name": "wum_alpha",
+            "name": "glikk_phi",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "wum_beta"
+            "name": "glikk_chi"
           },
           {
             "@type": "Component",
-            "name": "wum_gamma",
+            "name": "glikk_psi",
             "schema": {
-              "@id": "dtmi:example:wum_delta;1",
+              "@id": "dtmi:example:glikk_omega;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "wum_epsilon",
+            "name": "glikk_yuzz",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "wum_zeta"
+            "name": "glikk_wum"
           },
           {
             "@type": "Telemetry",
-            "name": "wum_eta",
+            "name": "glikk_um",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "wum_theta"
+            "name": "glikk_humpf"
           },
           {
             "@type": "Component",
-            "name": "wum_iota",
+            "name": "glikk_fuddle",
             "schema": {
-              "@id": "dtmi:example:wum_kappa;1",
+              "@id": "dtmi:example:glikk_glikk;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "wum_lambda",
+            "name": "glikk_nuh",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "wum_mu"
+            "name": "glikk_snee"
           },
           {
             "@type": "Telemetry",
-            "name": "wum_nu",
+            "name": "glikk_quan",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "wum_xi"
+            "name": "glikk_thnad"
           },
           {
             "@type": "Component",
-            "name": "wum_omicron",
+            "name": "glikk_spazz",
             "schema": {
-              "@id": "dtmi:example:wum_pi;1",
+              "@id": "dtmi:example:glikk_floob;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "wum_rho",
+            "name": "glikk_zatz",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "wum_sigma"
+            "name": "glikk_jogg"
           },
           {
             "@type": "Telemetry",
-            "name": "wum_tau",
+            "name": "glikk_flunn",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "wum_upsilon"
+            "name": "glikk_itch"
           },
           {
             "@type": "Component",
-            "name": "wum_phi",
+            "name": "glikk_yekk",
             "schema": {
-              "@id": "dtmi:example:wum_chi;1",
+              "@id": "dtmi:example:glikk_vroo;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "wum_psi",
+            "name": "glikk_hi",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "wum_omega"
+            "name": "nuh_alpha"
           },
           {
             "@type": "Telemetry",
-            "name": "wum_yuzz",
+            "name": "nuh_beta",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "wum_wum"
+            "name": "nuh_gamma"
           },
           {
             "@type": "Component",
-            "name": "wum_um",
+            "name": "nuh_delta",
             "schema": {
-              "@id": "dtmi:example:wum_humpf;1",
+              "@id": "dtmi:example:nuh_epsilon;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "wum_fuddle",
+            "name": "nuh_zeta",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "wum_glikk"
+            "name": "nuh_eta"
           },
           {
             "@type": "Telemetry",
-            "name": "wum_nuh",
+            "name": "nuh_theta",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "wum_snee"
+            "name": "nuh_iota"
           },
           {
             "@type": "Component",
-            "name": "wum_quan",
+            "name": "nuh_kappa",
             "schema": {
-              "@id": "dtmi:example:wum_thnad;1",
+              "@id": "dtmi:example:nuh_lambda;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "wum_spazz",
+            "name": "nuh_mu",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "wum_floob"
+            "name": "nuh_nu"
           },
           {
             "@type": "Telemetry",
-            "name": "wum_zatz",
+            "name": "nuh_xi",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "wum_jogg"
+            "name": "nuh_omicron"
           },
           {
             "@type": "Component",
-            "name": "wum_flunn",
+            "name": "nuh_pi",
             "schema": {
-              "@id": "dtmi:example:wum_itch;1",
+              "@id": "dtmi:example:nuh_rho;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "wum_yekk",
+            "name": "nuh_sigma",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "wum_vroo"
+            "name": "nuh_tau"
           },
           {
             "@type": "Telemetry",
-            "name": "wum_hi",
+            "name": "nuh_upsilon",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "um_alpha"
+            "name": "nuh_phi"
           },
           {
             "@type": "Component",
-            "name": "um_beta",
+            "name": "nuh_chi",
             "schema": {
-              "@id": "dtmi:example:um_gamma;1",
+              "@id": "dtmi:example:nuh_psi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "um_delta",
+            "name": "nuh_omega",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "um_epsilon"
+            "name": "nuh_yuzz"
           },
           {
             "@type": "Telemetry",
-            "name": "um_zeta",
+            "name": "nuh_wum",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "um_eta"
+            "name": "nuh_um"
           },
           {
             "@type": "Component",
-            "name": "um_theta",
+            "name": "nuh_humpf",
             "schema": {
-              "@id": "dtmi:example:um_iota;1",
+              "@id": "dtmi:example:nuh_fuddle;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "um_kappa",
+            "name": "nuh_glikk",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "um_lambda"
+            "name": "nuh_nuh"
           },
           {
             "@type": "Telemetry",
-            "name": "um_mu",
+            "name": "nuh_snee",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "um_nu"
+            "name": "nuh_quan"
           },
           {
             "@type": "Component",
-            "name": "um_xi",
+            "name": "nuh_thnad",
             "schema": {
-              "@id": "dtmi:example:um_omicron;1",
+              "@id": "dtmi:example:nuh_spazz;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "um_pi",
+            "name": "nuh_floob",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "um_rho"
+            "name": "nuh_zatz"
           },
           {
             "@type": "Telemetry",
-            "name": "um_sigma",
+            "name": "nuh_jogg",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "um_tau"
+            "name": "nuh_flunn"
           },
           {
             "@type": "Component",
-            "name": "um_upsilon",
+            "name": "nuh_itch",
             "schema": {
-              "@id": "dtmi:example:um_phi;1",
+              "@id": "dtmi:example:nuh_yekk;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "um_chi",
+            "name": "nuh_vroo",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "um_psi"
+            "name": "nuh_hi"
           },
           {
             "@type": "Telemetry",
-            "name": "um_omega",
+            "name": "snee_alpha",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "um_yuzz"
+            "name": "snee_beta"
           },
           {
             "@type": "Component",
-            "name": "um_wum",
+            "name": "snee_gamma",
             "schema": {
-              "@id": "dtmi:example:um_um;1",
+              "@id": "dtmi:example:snee_delta;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "um_humpf",
+            "name": "snee_epsilon",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "um_fuddle"
+            "name": "snee_zeta"
           },
           {
             "@type": "Telemetry",
-            "name": "um_glikk",
+            "name": "snee_eta",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "um_nuh"
+            "name": "snee_theta"
           },
           {
             "@type": "Component",
-            "name": "um_snee",
+            "name": "snee_iota",
             "schema": {
-              "@id": "dtmi:example:um_quan;1",
+              "@id": "dtmi:example:snee_kappa;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "um_thnad",
+            "name": "snee_lambda",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "um_spazz"
+            "name": "snee_mu"
           },
           {
             "@type": "Telemetry",
-            "name": "um_floob",
+            "name": "snee_nu",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "um_zatz"
+            "name": "snee_xi"
           },
           {
             "@type": "Component",
-            "name": "um_jogg",
+            "name": "snee_omicron",
             "schema": {
-              "@id": "dtmi:example:um_flunn;1",
+              "@id": "dtmi:example:snee_pi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "um_itch",
+            "name": "snee_rho",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "um_yekk"
+            "name": "snee_sigma"
           },
           {
             "@type": "Telemetry",
-            "name": "um_vroo",
+            "name": "snee_tau",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "um_hi"
+            "name": "snee_upsilon"
           },
           {
             "@type": "Component",
-            "name": "humpf_alpha",
+            "name": "snee_phi",
             "schema": {
-              "@id": "dtmi:example:humpf_beta;1",
+              "@id": "dtmi:example:snee_chi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "humpf_gamma",
+            "name": "snee_psi",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "humpf_delta"
+            "name": "snee_omega"
           },
           {
             "@type": "Telemetry",
-            "name": "humpf_epsilon",
+            "name": "snee_yuzz",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "humpf_zeta"
+            "name": "snee_wum"
           },
           {
             "@type": "Component",
-            "name": "humpf_eta",
+            "name": "snee_um",
             "schema": {
-              "@id": "dtmi:example:humpf_theta;1",
+              "@id": "dtmi:example:snee_humpf;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "humpf_iota",
+            "name": "snee_fuddle",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "humpf_kappa"
+            "name": "snee_glikk"
           },
           {
             "@type": "Telemetry",
-            "name": "humpf_lambda",
+            "name": "snee_nuh",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "humpf_mu"
+            "name": "snee_snee"
           },
           {
             "@type": "Component",
-            "name": "humpf_nu",
+            "name": "snee_quan",
             "schema": {
-              "@id": "dtmi:example:humpf_xi;1",
+              "@id": "dtmi:example:snee_thnad;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "humpf_omicron",
+            "name": "snee_spazz",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "humpf_pi"
+            "name": "snee_floob"
           },
           {
             "@type": "Telemetry",
-            "name": "humpf_rho",
+            "name": "snee_zatz",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "humpf_sigma"
+            "name": "snee_jogg"
           },
           {
             "@type": "Component",
-            "name": "humpf_tau",
+            "name": "snee_flunn",
             "schema": {
-              "@id": "dtmi:example:humpf_upsilon;1",
+              "@id": "dtmi:example:snee_itch;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "humpf_phi",
+            "name": "snee_yekk",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "humpf_chi"
+            "name": "snee_vroo"
           },
           {
             "@type": "Telemetry",
-            "name": "humpf_psi",
+            "name": "snee_hi",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "humpf_omega"
+            "name": "quan_alpha"
           },
           {
             "@type": "Component",
-            "name": "humpf_yuzz",
+            "name": "quan_beta",
             "schema": {
-              "@id": "dtmi:example:humpf_wum;1",
+              "@id": "dtmi:example:quan_gamma;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "humpf_um",
+            "name": "quan_delta",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "humpf_humpf"
+            "name": "quan_epsilon"
           },
           {
             "@type": "Telemetry",
-            "name": "humpf_fuddle",
+            "name": "quan_zeta",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "humpf_glikk"
+            "name": "quan_eta"
           },
           {
             "@type": "Component",
-            "name": "humpf_nuh",
+            "name": "quan_theta",
             "schema": {
-              "@id": "dtmi:example:humpf_snee;1",
+              "@id": "dtmi:example:quan_iota;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "humpf_quan",
+            "name": "quan_kappa",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "humpf_thnad"
+            "name": "quan_lambda"
           },
           {
             "@type": "Telemetry",
-            "name": "humpf_spazz",
+            "name": "quan_mu",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "humpf_floob"
+            "name": "quan_nu"
           },
           {
             "@type": "Component",
-            "name": "humpf_zatz",
+            "name": "quan_xi",
             "schema": {
-              "@id": "dtmi:example:humpf_jogg;1",
+              "@id": "dtmi:example:quan_omicron;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "humpf_flunn",
+            "name": "quan_pi",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "humpf_itch"
+            "name": "quan_rho"
           },
           {
             "@type": "Telemetry",
-            "name": "humpf_yekk",
+            "name": "quan_sigma",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "humpf_vroo"
+            "name": "quan_tau"
           },
           {
             "@type": "Component",
-            "name": "humpf_hi",
+            "name": "quan_upsilon",
             "schema": {
-              "@id": "dtmi:example:fuddle_alpha;1",
+              "@id": "dtmi:example:quan_phi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "fuddle_beta",
+            "name": "quan_chi",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "fuddle_gamma"
+            "name": "quan_psi"
           },
           {
             "@type": "Telemetry",
-            "name": "fuddle_delta",
+            "name": "quan_omega",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "fuddle_epsilon"
+            "name": "quan_yuzz"
           },
           {
             "@type": "Component",
-            "name": "fuddle_zeta",
+            "name": "quan_wum",
             "schema": {
-              "@id": "dtmi:example:fuddle_eta;1",
+              "@id": "dtmi:example:quan_um;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "fuddle_theta",
+            "name": "quan_humpf",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "fuddle_iota"
+            "name": "quan_fuddle"
           },
           {
             "@type": "Telemetry",
-            "name": "fuddle_kappa",
+            "name": "quan_glikk",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "fuddle_lambda"
+            "name": "quan_nuh"
           },
           {
             "@type": "Component",
-            "name": "fuddle_mu",
+            "name": "quan_snee",
             "schema": {
-              "@id": "dtmi:example:fuddle_nu;1",
+              "@id": "dtmi:example:quan_quan;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "fuddle_xi",
+            "name": "quan_thnad",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "fuddle_omicron"
+            "name": "quan_spazz"
           },
           {
             "@type": "Telemetry",
-            "name": "fuddle_pi",
+            "name": "quan_floob",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "fuddle_rho"
+            "name": "quan_zatz"
           },
           {
             "@type": "Component",
-            "name": "fuddle_sigma",
+            "name": "quan_jogg",
             "schema": {
-              "@id": "dtmi:example:fuddle_tau;1",
+              "@id": "dtmi:example:quan_flunn;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "fuddle_upsilon",
+            "name": "quan_itch",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "fuddle_phi"
+            "name": "quan_yekk"
           },
           {
             "@type": "Telemetry",
-            "name": "fuddle_chi",
+            "name": "quan_vroo",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "fuddle_psi"
+            "name": "quan_hi"
           },
           {
             "@type": "Component",
-            "name": "fuddle_omega",
+            "name": "thnad_alpha",
             "schema": {
-              "@id": "dtmi:example:fuddle_yuzz;1",
+              "@id": "dtmi:example:thnad_beta;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "fuddle_wum",
+            "name": "thnad_gamma",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "fuddle_um"
+            "name": "thnad_delta"
           },
           {
             "@type": "Telemetry",
-            "name": "fuddle_humpf",
+            "name": "thnad_epsilon",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "fuddle_fuddle"
+            "name": "thnad_zeta"
           },
           {
             "@type": "Component",
-            "name": "fuddle_glikk",
+            "name": "thnad_eta",
             "schema": {
-              "@id": "dtmi:example:fuddle_nuh;1",
+              "@id": "dtmi:example:thnad_theta;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "fuddle_snee",
+            "name": "thnad_iota",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "fuddle_quan"
+            "name": "thnad_kappa"
           },
           {
             "@type": "Telemetry",
-            "name": "fuddle_thnad",
+            "name": "thnad_lambda",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "fuddle_spazz"
+            "name": "thnad_mu"
           },
           {
             "@type": "Component",
-            "name": "fuddle_floob",
+            "name": "thnad_nu",
             "schema": {
-              "@id": "dtmi:example:fuddle_zatz;1",
+              "@id": "dtmi:example:thnad_xi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "fuddle_jogg",
+            "name": "thnad_omicron",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "fuddle_flunn"
+            "name": "thnad_pi"
           },
           {
             "@type": "Telemetry",
-            "name": "fuddle_itch",
+            "name": "thnad_rho",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "fuddle_yekk"
+            "name": "thnad_sigma"
           },
           {
             "@type": "Component",
-            "name": "fuddle_vroo",
+            "name": "thnad_tau",
             "schema": {
-              "@id": "dtmi:example:fuddle_hi;1",
+              "@id": "dtmi:example:thnad_upsilon;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "glikk_alpha",
+            "name": "thnad_phi",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "glikk_beta"
+            "name": "thnad_chi"
           },
           {
             "@type": "Telemetry",
-            "name": "glikk_gamma",
+            "name": "thnad_psi",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "glikk_delta"
+            "name": "thnad_omega"
           },
           {
             "@type": "Component",
-            "name": "glikk_epsilon",
+            "name": "thnad_yuzz",
             "schema": {
-              "@id": "dtmi:example:glikk_zeta;1",
+              "@id": "dtmi:example:thnad_wum;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "glikk_eta",
+            "name": "thnad_um",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "glikk_theta"
+            "name": "thnad_humpf"
           },
           {
             "@type": "Telemetry",
-            "name": "glikk_iota",
+            "name": "thnad_fuddle",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "glikk_kappa"
+            "name": "thnad_glikk"
           },
           {
             "@type": "Component",
-            "name": "glikk_lambda",
+            "name": "thnad_nuh",
             "schema": {
-              "@id": "dtmi:example:glikk_mu;1",
+              "@id": "dtmi:example:thnad_snee;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "glikk_nu",
+            "name": "thnad_quan",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "glikk_xi"
+            "name": "thnad_thnad"
           },
           {
             "@type": "Telemetry",
-            "name": "glikk_omicron",
+            "name": "thnad_spazz",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "glikk_pi"
+            "name": "thnad_floob"
           },
           {
             "@type": "Component",
-            "name": "glikk_rho",
+            "name": "thnad_zatz",
             "schema": {
-              "@id": "dtmi:example:glikk_sigma;1",
+              "@id": "dtmi:example:thnad_jogg;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "glikk_tau",
+            "name": "thnad_flunn",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "glikk_upsilon"
+            "name": "thnad_itch"
           },
           {
             "@type": "Telemetry",
-            "name": "glikk_phi",
+            "name": "thnad_yekk",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "glikk_chi"
+            "name": "thnad_vroo"
           },
           {
             "@type": "Component",
-            "name": "glikk_psi",
+            "name": "thnad_hi",
             "schema": {
-              "@id": "dtmi:example:glikk_omega;1",
+              "@id": "dtmi:example:spazz_alpha;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "glikk_yuzz",
+            "name": "spazz_beta",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "glikk_wum"
+            "name": "spazz_gamma"
           },
           {
             "@type": "Telemetry",
-            "name": "glikk_um",
+            "name": "spazz_delta",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "glikk_humpf"
+            "name": "spazz_epsilon"
           },
           {
             "@type": "Component",
-            "name": "glikk_fuddle",
+            "name": "spazz_zeta",
             "schema": {
-              "@id": "dtmi:example:glikk_glikk;1",
+              "@id": "dtmi:example:spazz_eta;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "glikk_nuh",
+            "name": "spazz_theta",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "glikk_snee"
+            "name": "spazz_iota"
           },
           {
             "@type": "Telemetry",
-            "name": "glikk_quan",
+            "name": "spazz_kappa",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "glikk_thnad"
+            "name": "spazz_lambda"
           },
           {
             "@type": "Component",
-            "name": "glikk_spazz",
+            "name": "spazz_mu",
             "schema": {
-              "@id": "dtmi:example:glikk_floob;1",
+              "@id": "dtmi:example:spazz_nu;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "glikk_zatz",
+            "name": "spazz_xi",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "glikk_jogg"
+            "name": "spazz_omicron"
           },
           {
             "@type": "Telemetry",
-            "name": "glikk_flunn",
+            "name": "spazz_pi",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "glikk_itch"
+            "name": "spazz_rho"
           },
           {
             "@type": "Component",
-            "name": "glikk_yekk",
+            "name": "spazz_sigma",
             "schema": {
-              "@id": "dtmi:example:glikk_vroo;1",
+              "@id": "dtmi:example:spazz_tau;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "glikk_hi",
+            "name": "spazz_upsilon",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "nuh_alpha"
+            "name": "spazz_phi"
           },
           {
             "@type": "Telemetry",
-            "name": "nuh_beta",
+            "name": "spazz_chi",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "nuh_gamma"
+            "name": "spazz_psi"
           },
           {
             "@type": "Component",
-            "name": "nuh_delta",
+            "name": "spazz_omega",
             "schema": {
-              "@id": "dtmi:example:nuh_epsilon;1",
+              "@id": "dtmi:example:spazz_yuzz;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "nuh_zeta",
+            "name": "spazz_wum",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "nuh_eta"
+            "name": "spazz_um"
           },
           {
             "@type": "Telemetry",
-            "name": "nuh_theta",
+            "name": "spazz_humpf",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "nuh_iota"
+            "name": "spazz_fuddle"
           },
           {
             "@type": "Component",
-            "name": "nuh_kappa",
+            "name": "spazz_glikk",
             "schema": {
-              "@id": "dtmi:example:nuh_lambda;1",
+              "@id": "dtmi:example:spazz_nuh;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "nuh_mu",
+            "name": "spazz_snee",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "nuh_nu"
+            "name": "spazz_quan"
           },
           {
             "@type": "Telemetry",
-            "name": "nuh_xi",
+            "name": "spazz_thnad",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "nuh_omicron"
+            "name": "spazz_spazz"
           },
           {
             "@type": "Component",
-            "name": "nuh_pi",
+            "name": "spazz_floob",
             "schema": {
-              "@id": "dtmi:example:nuh_rho;1",
+              "@id": "dtmi:example:spazz_zatz;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "nuh_sigma",
+            "name": "spazz_jogg",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "nuh_tau"
+            "name": "spazz_flunn"
           },
           {
             "@type": "Telemetry",
-            "name": "nuh_upsilon",
+            "name": "spazz_itch",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "nuh_phi"
+            "name": "spazz_yekk"
           },
           {
             "@type": "Component",
-            "name": "nuh_chi",
+            "name": "spazz_vroo",
             "schema": {
-              "@id": "dtmi:example:nuh_psi;1",
+              "@id": "dtmi:example:spazz_hi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "nuh_omega",
+            "name": "floob_alpha",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "nuh_yuzz"
+            "name": "floob_beta"
           },
           {
             "@type": "Telemetry",
-            "name": "nuh_wum",
+            "name": "floob_gamma",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "nuh_um"
+            "name": "floob_delta"
           },
           {
             "@type": "Component",
-            "name": "nuh_humpf",
+            "name": "floob_epsilon",
             "schema": {
-              "@id": "dtmi:example:nuh_fuddle;1",
+              "@id": "dtmi:example:floob_zeta;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "nuh_glikk",
+            "name": "floob_eta",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "nuh_nuh"
+            "name": "floob_theta"
           },
           {
             "@type": "Telemetry",
-            "name": "nuh_snee",
+            "name": "floob_iota",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "nuh_quan"
+            "name": "floob_kappa"
           },
           {
             "@type": "Component",
-            "name": "nuh_thnad",
+            "name": "floob_lambda",
             "schema": {
-              "@id": "dtmi:example:nuh_spazz;1",
+              "@id": "dtmi:example:floob_mu;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "nuh_floob",
+            "name": "floob_nu",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "nuh_zatz"
+            "name": "floob_xi"
           },
           {
             "@type": "Telemetry",
-            "name": "nuh_jogg",
+            "name": "floob_omicron",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "nuh_flunn"
+            "name": "floob_pi"
           },
           {
             "@type": "Component",
-            "name": "nuh_itch",
+            "name": "floob_rho",
             "schema": {
-              "@id": "dtmi:example:nuh_yekk;1",
+              "@id": "dtmi:example:floob_sigma;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "nuh_vroo",
+            "name": "floob_tau",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "nuh_hi"
+            "name": "floob_upsilon"
           },
           {
             "@type": "Telemetry",
-            "name": "snee_alpha",
+            "name": "floob_phi",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "snee_beta"
+            "name": "floob_chi"
           },
           {
             "@type": "Component",
-            "name": "snee_gamma",
+            "name": "floob_psi",
             "schema": {
-              "@id": "dtmi:example:snee_delta;1",
+              "@id": "dtmi:example:floob_omega;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "snee_epsilon",
+            "name": "floob_yuzz",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "snee_zeta"
+            "name": "floob_wum"
           },
           {
             "@type": "Telemetry",
-            "name": "snee_eta",
+            "name": "floob_um",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "snee_theta"
+            "name": "floob_humpf"
           },
           {
             "@type": "Component",
-            "name": "snee_iota",
+            "name": "floob_fuddle",
             "schema": {
-              "@id": "dtmi:example:snee_kappa;1",
+              "@id": "dtmi:example:floob_glikk;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "snee_lambda",
+            "name": "floob_nuh",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "snee_mu"
+            "name": "floob_snee"
           },
           {
             "@type": "Telemetry",
-            "name": "snee_nu",
+            "name": "floob_quan",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "snee_xi"
+            "name": "floob_thnad"
           },
           {
             "@type": "Component",
-            "name": "snee_omicron",
+            "name": "floob_spazz",
             "schema": {
-              "@id": "dtmi:example:snee_pi;1",
+              "@id": "dtmi:example:floob_floob;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "snee_rho",
+            "name": "floob_zatz",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "snee_sigma"
+            "name": "floob_jogg"
           },
           {
             "@type": "Telemetry",
-            "name": "snee_tau",
+            "name": "floob_flunn",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "snee_upsilon"
+            "name": "floob_itch"
           },
           {
             "@type": "Component",
-            "name": "snee_phi",
+            "name": "floob_yekk",
             "schema": {
-              "@id": "dtmi:example:snee_chi;1",
+              "@id": "dtmi:example:floob_vroo;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "snee_psi",
+            "name": "floob_hi",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "snee_omega"
+            "name": "zatz_alpha"
           },
           {
             "@type": "Telemetry",
-            "name": "snee_yuzz",
+            "name": "zatz_beta",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "snee_wum"
+            "name": "zatz_gamma"
           },
           {
             "@type": "Component",
-            "name": "snee_um",
+            "name": "zatz_delta",
             "schema": {
-              "@id": "dtmi:example:snee_humpf;1",
+              "@id": "dtmi:example:zatz_epsilon;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "snee_fuddle",
+            "name": "zatz_zeta",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "snee_glikk"
+            "name": "zatz_eta"
           },
           {
             "@type": "Telemetry",
-            "name": "snee_nuh",
+            "name": "zatz_theta",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "snee_snee"
+            "name": "zatz_iota"
           },
           {
             "@type": "Component",
-            "name": "snee_quan",
+            "name": "zatz_kappa",
             "schema": {
-              "@id": "dtmi:example:snee_thnad;1",
+              "@id": "dtmi:example:zatz_lambda;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "snee_spazz",
+            "name": "zatz_mu",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "snee_floob"
+            "name": "zatz_nu"
           },
           {
             "@type": "Telemetry",
-            "name": "snee_zatz",
+            "name": "zatz_xi",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "snee_jogg"
+            "name": "zatz_omicron"
           },
           {
             "@type": "Component",
-            "name": "snee_flunn",
+            "name": "zatz_pi",
             "schema": {
-              "@id": "dtmi:example:snee_itch;1",
+              "@id": "dtmi:example:zatz_rho;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "snee_yekk",
+            "name": "zatz_sigma",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "snee_vroo"
+            "name": "zatz_tau"
           },
           {
             "@type": "Telemetry",
-            "name": "snee_hi",
+            "name": "zatz_upsilon",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "quan_alpha"
+            "name": "zatz_phi"
           },
           {
             "@type": "Component",
-            "name": "quan_beta",
+            "name": "zatz_chi",
             "schema": {
-              "@id": "dtmi:example:quan_gamma;1",
+              "@id": "dtmi:example:zatz_psi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "quan_delta",
+            "name": "zatz_omega",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "quan_epsilon"
+            "name": "zatz_yuzz"
           },
           {
             "@type": "Telemetry",
-            "name": "quan_zeta",
+            "name": "zatz_wum",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "quan_eta"
+            "name": "zatz_um"
           },
           {
             "@type": "Component",
-            "name": "quan_theta",
+            "name": "zatz_humpf",
             "schema": {
-              "@id": "dtmi:example:quan_iota;1",
+              "@id": "dtmi:example:zatz_fuddle;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "quan_kappa",
+            "name": "zatz_glikk",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "quan_lambda"
+            "name": "zatz_nuh"
           },
           {
             "@type": "Telemetry",
-            "name": "quan_mu",
+            "name": "zatz_snee",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "quan_nu"
+            "name": "zatz_quan"
           },
           {
             "@type": "Component",
-            "name": "quan_xi",
+            "name": "zatz_thnad",
             "schema": {
-              "@id": "dtmi:example:quan_omicron;1",
+              "@id": "dtmi:example:zatz_spazz;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "quan_pi",
+            "name": "zatz_floob",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "quan_rho"
+            "name": "zatz_zatz"
           },
           {
             "@type": "Telemetry",
-            "name": "quan_sigma",
+            "name": "zatz_jogg",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "quan_tau"
+            "name": "zatz_flunn"
           },
           {
             "@type": "Component",
-            "name": "quan_upsilon",
+            "name": "zatz_itch",
             "schema": {
-              "@id": "dtmi:example:quan_phi;1",
+              "@id": "dtmi:example:zatz_yekk;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "quan_chi",
+            "name": "zatz_vroo",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "quan_psi"
+            "name": "zatz_hi"
           },
           {
             "@type": "Telemetry",
-            "name": "quan_omega",
+            "name": "jogg_alpha",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "quan_yuzz"
+            "name": "jogg_beta"
           },
           {
             "@type": "Component",
-            "name": "quan_wum",
+            "name": "jogg_gamma",
             "schema": {
-              "@id": "dtmi:example:quan_um;1",
+              "@id": "dtmi:example:jogg_delta;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "quan_humpf",
+            "name": "jogg_epsilon",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "quan_fuddle"
+            "name": "jogg_zeta"
           },
           {
             "@type": "Telemetry",
-            "name": "quan_glikk",
+            "name": "jogg_eta",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "quan_nuh"
+            "name": "jogg_theta"
           },
           {
             "@type": "Component",
-            "name": "quan_snee",
+            "name": "jogg_iota",
             "schema": {
-              "@id": "dtmi:example:quan_quan;1",
+              "@id": "dtmi:example:jogg_kappa;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "quan_thnad",
+            "name": "jogg_lambda",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "quan_spazz"
+            "name": "jogg_mu"
           },
           {
             "@type": "Telemetry",
-            "name": "quan_floob",
+            "name": "jogg_nu",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "quan_zatz"
+            "name": "jogg_xi"
           },
           {
             "@type": "Component",
-            "name": "quan_jogg",
+            "name": "jogg_omicron",
             "schema": {
-              "@id": "dtmi:example:quan_flunn;1",
+              "@id": "dtmi:example:jogg_pi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "quan_itch",
+            "name": "jogg_rho",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "quan_yekk"
+            "name": "jogg_sigma"
           },
           {
             "@type": "Telemetry",
-            "name": "quan_vroo",
+            "name": "jogg_tau",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "quan_hi"
+            "name": "jogg_upsilon"
           },
           {
             "@type": "Component",
-            "name": "thnad_alpha",
+            "name": "jogg_phi",
             "schema": {
-              "@id": "dtmi:example:thnad_beta;1",
+              "@id": "dtmi:example:jogg_chi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "thnad_gamma",
+            "name": "jogg_psi",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "thnad_delta"
+            "name": "jogg_omega"
           },
           {
             "@type": "Telemetry",
-            "name": "thnad_epsilon",
+            "name": "jogg_yuzz",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "thnad_zeta"
+            "name": "jogg_wum"
           }
         ]
       }
@@ -3164,1572 +3164,1572 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:vroo_yuzz;1",
+        "@id": "dtmi:example:delta_beta;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Command",
-            "name": "thnad_theta"
+            "name": "jogg_humpf"
           },
           {
             "@type": "Component",
-            "name": "thnad_iota",
+            "name": "jogg_fuddle",
             "schema": {
-              "@id": "dtmi:example:thnad_kappa;1",
+              "@id": "dtmi:example:jogg_glikk;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "thnad_lambda",
+            "name": "jogg_nuh",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "thnad_mu"
+            "name": "jogg_snee"
           },
           {
             "@type": "Telemetry",
-            "name": "thnad_nu",
+            "name": "jogg_quan",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "thnad_xi"
+            "name": "jogg_thnad"
           },
           {
             "@type": "Component",
-            "name": "thnad_omicron",
+            "name": "jogg_spazz",
             "schema": {
-              "@id": "dtmi:example:thnad_pi;1",
+              "@id": "dtmi:example:jogg_floob;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "thnad_rho",
+            "name": "jogg_zatz",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "thnad_sigma"
+            "name": "jogg_jogg"
           },
           {
             "@type": "Telemetry",
-            "name": "thnad_tau",
+            "name": "jogg_flunn",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "thnad_upsilon"
+            "name": "jogg_itch"
           },
           {
             "@type": "Component",
-            "name": "thnad_phi",
+            "name": "jogg_yekk",
             "schema": {
-              "@id": "dtmi:example:thnad_chi;1",
+              "@id": "dtmi:example:jogg_vroo;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "thnad_psi",
+            "name": "jogg_hi",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "thnad_omega"
+            "name": "flunn_alpha"
           },
           {
             "@type": "Telemetry",
-            "name": "thnad_yuzz",
+            "name": "flunn_beta",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "thnad_wum"
+            "name": "flunn_gamma"
           },
           {
             "@type": "Component",
-            "name": "thnad_um",
+            "name": "flunn_delta",
             "schema": {
-              "@id": "dtmi:example:thnad_humpf;1",
+              "@id": "dtmi:example:flunn_epsilon;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "thnad_fuddle",
+            "name": "flunn_zeta",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "thnad_glikk"
+            "name": "flunn_eta"
           },
           {
             "@type": "Telemetry",
-            "name": "thnad_nuh",
+            "name": "flunn_theta",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "thnad_snee"
+            "name": "flunn_iota"
           },
           {
             "@type": "Component",
-            "name": "thnad_quan",
+            "name": "flunn_kappa",
             "schema": {
-              "@id": "dtmi:example:thnad_thnad;1",
+              "@id": "dtmi:example:flunn_lambda;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "thnad_spazz",
+            "name": "flunn_mu",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "thnad_floob"
+            "name": "flunn_nu"
           },
           {
             "@type": "Telemetry",
-            "name": "thnad_zatz",
+            "name": "flunn_xi",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "thnad_jogg"
+            "name": "flunn_omicron"
           },
           {
             "@type": "Component",
-            "name": "thnad_flunn",
+            "name": "flunn_pi",
             "schema": {
-              "@id": "dtmi:example:thnad_itch;1",
+              "@id": "dtmi:example:flunn_rho;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "thnad_yekk",
+            "name": "flunn_sigma",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "thnad_vroo"
+            "name": "flunn_tau"
           },
           {
             "@type": "Telemetry",
-            "name": "thnad_hi",
+            "name": "flunn_upsilon",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "spazz_alpha"
+            "name": "flunn_phi"
           },
           {
             "@type": "Component",
-            "name": "spazz_beta",
+            "name": "flunn_chi",
             "schema": {
-              "@id": "dtmi:example:spazz_gamma;1",
+              "@id": "dtmi:example:flunn_psi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "spazz_delta",
+            "name": "flunn_omega",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "spazz_epsilon"
+            "name": "flunn_yuzz"
           },
           {
             "@type": "Telemetry",
-            "name": "spazz_zeta",
+            "name": "flunn_wum",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "spazz_eta"
+            "name": "flunn_um"
           },
           {
             "@type": "Component",
-            "name": "spazz_theta",
+            "name": "flunn_humpf",
             "schema": {
-              "@id": "dtmi:example:spazz_iota;1",
+              "@id": "dtmi:example:flunn_fuddle;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "spazz_kappa",
+            "name": "flunn_glikk",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "spazz_lambda"
+            "name": "flunn_nuh"
           },
           {
             "@type": "Telemetry",
-            "name": "spazz_mu",
+            "name": "flunn_snee",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "spazz_nu"
+            "name": "flunn_quan"
           },
           {
             "@type": "Component",
-            "name": "spazz_xi",
+            "name": "flunn_thnad",
             "schema": {
-              "@id": "dtmi:example:spazz_omicron;1",
+              "@id": "dtmi:example:flunn_spazz;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "spazz_pi",
+            "name": "flunn_floob",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "spazz_rho"
+            "name": "flunn_zatz"
           },
           {
             "@type": "Telemetry",
-            "name": "spazz_sigma",
+            "name": "flunn_jogg",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "spazz_tau"
+            "name": "flunn_flunn"
           },
           {
             "@type": "Component",
-            "name": "spazz_upsilon",
+            "name": "flunn_itch",
             "schema": {
-              "@id": "dtmi:example:spazz_phi;1",
+              "@id": "dtmi:example:flunn_yekk;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "spazz_chi",
+            "name": "flunn_vroo",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "spazz_psi"
+            "name": "flunn_hi"
           },
           {
             "@type": "Telemetry",
-            "name": "spazz_omega",
+            "name": "itch_alpha",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "spazz_yuzz"
+            "name": "itch_beta"
           },
           {
             "@type": "Component",
-            "name": "spazz_wum",
+            "name": "itch_gamma",
             "schema": {
-              "@id": "dtmi:example:spazz_um;1",
+              "@id": "dtmi:example:itch_delta;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "spazz_humpf",
+            "name": "itch_epsilon",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "spazz_fuddle"
+            "name": "itch_zeta"
           },
           {
             "@type": "Telemetry",
-            "name": "spazz_glikk",
+            "name": "itch_eta",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "spazz_nuh"
+            "name": "itch_theta"
           },
           {
             "@type": "Component",
-            "name": "spazz_snee",
+            "name": "itch_iota",
             "schema": {
-              "@id": "dtmi:example:spazz_quan;1",
+              "@id": "dtmi:example:itch_kappa;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "spazz_thnad",
+            "name": "itch_lambda",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "spazz_spazz"
+            "name": "itch_mu"
           },
           {
             "@type": "Telemetry",
-            "name": "spazz_floob",
+            "name": "itch_nu",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "spazz_zatz"
+            "name": "itch_xi"
           },
           {
             "@type": "Component",
-            "name": "spazz_jogg",
+            "name": "itch_omicron",
             "schema": {
-              "@id": "dtmi:example:spazz_flunn;1",
+              "@id": "dtmi:example:itch_pi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "spazz_itch",
+            "name": "itch_rho",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "spazz_yekk"
+            "name": "itch_sigma"
           },
           {
             "@type": "Telemetry",
-            "name": "spazz_vroo",
+            "name": "itch_tau",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "spazz_hi"
+            "name": "itch_upsilon"
           },
           {
             "@type": "Component",
-            "name": "floob_alpha",
+            "name": "itch_phi",
             "schema": {
-              "@id": "dtmi:example:floob_beta;1",
+              "@id": "dtmi:example:itch_chi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "floob_gamma",
+            "name": "itch_psi",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "floob_delta"
+            "name": "itch_omega"
           },
           {
             "@type": "Telemetry",
-            "name": "floob_epsilon",
+            "name": "itch_yuzz",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "floob_zeta"
+            "name": "itch_wum"
           },
           {
             "@type": "Component",
-            "name": "floob_eta",
+            "name": "itch_um",
             "schema": {
-              "@id": "dtmi:example:floob_theta;1",
+              "@id": "dtmi:example:itch_humpf;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "floob_iota",
+            "name": "itch_fuddle",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "floob_kappa"
+            "name": "itch_glikk"
           },
           {
             "@type": "Telemetry",
-            "name": "floob_lambda",
+            "name": "itch_nuh",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "floob_mu"
+            "name": "itch_snee"
           },
           {
             "@type": "Component",
-            "name": "floob_nu",
+            "name": "itch_quan",
             "schema": {
-              "@id": "dtmi:example:floob_xi;1",
+              "@id": "dtmi:example:itch_thnad;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "floob_omicron",
+            "name": "itch_spazz",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "floob_pi"
+            "name": "itch_floob"
           },
           {
             "@type": "Telemetry",
-            "name": "floob_rho",
+            "name": "itch_zatz",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "floob_sigma"
+            "name": "itch_jogg"
           },
           {
             "@type": "Component",
-            "name": "floob_tau",
+            "name": "itch_flunn",
             "schema": {
-              "@id": "dtmi:example:floob_upsilon;1",
+              "@id": "dtmi:example:itch_itch;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "floob_phi",
+            "name": "itch_yekk",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "floob_chi"
+            "name": "itch_vroo"
           },
           {
             "@type": "Telemetry",
-            "name": "floob_psi",
+            "name": "itch_hi",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "floob_omega"
+            "name": "yekk_alpha"
           },
           {
             "@type": "Component",
-            "name": "floob_yuzz",
+            "name": "yekk_beta",
             "schema": {
-              "@id": "dtmi:example:floob_wum;1",
+              "@id": "dtmi:example:yekk_gamma;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "floob_um",
+            "name": "yekk_delta",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "floob_humpf"
+            "name": "yekk_epsilon"
           },
           {
             "@type": "Telemetry",
-            "name": "floob_fuddle",
+            "name": "yekk_zeta",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "floob_glikk"
+            "name": "yekk_eta"
           },
           {
             "@type": "Component",
-            "name": "floob_nuh",
+            "name": "yekk_theta",
             "schema": {
-              "@id": "dtmi:example:floob_snee;1",
+              "@id": "dtmi:example:yekk_iota;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "floob_quan",
+            "name": "yekk_kappa",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "floob_thnad"
+            "name": "yekk_lambda"
           },
           {
             "@type": "Telemetry",
-            "name": "floob_spazz",
+            "name": "yekk_mu",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "floob_floob"
+            "name": "yekk_nu"
           },
           {
             "@type": "Component",
-            "name": "floob_zatz",
+            "name": "yekk_xi",
             "schema": {
-              "@id": "dtmi:example:floob_jogg;1",
+              "@id": "dtmi:example:yekk_omicron;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "floob_flunn",
+            "name": "yekk_pi",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "floob_itch"
+            "name": "yekk_rho"
           },
           {
             "@type": "Telemetry",
-            "name": "floob_yekk",
+            "name": "yekk_sigma",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "floob_vroo"
+            "name": "yekk_tau"
           },
           {
             "@type": "Component",
-            "name": "floob_hi",
+            "name": "yekk_upsilon",
             "schema": {
-              "@id": "dtmi:example:zatz_alpha;1",
+              "@id": "dtmi:example:yekk_phi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "zatz_beta",
+            "name": "yekk_chi",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "zatz_gamma"
+            "name": "yekk_psi"
           },
           {
             "@type": "Telemetry",
-            "name": "zatz_delta",
+            "name": "yekk_omega",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "zatz_epsilon"
+            "name": "yekk_yuzz"
           },
           {
             "@type": "Component",
-            "name": "zatz_zeta",
+            "name": "yekk_wum",
             "schema": {
-              "@id": "dtmi:example:zatz_eta;1",
+              "@id": "dtmi:example:yekk_um;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "zatz_theta",
+            "name": "yekk_humpf",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "zatz_iota"
+            "name": "yekk_fuddle"
           },
           {
             "@type": "Telemetry",
-            "name": "zatz_kappa",
+            "name": "yekk_glikk",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "zatz_lambda"
+            "name": "yekk_nuh"
           },
           {
             "@type": "Component",
-            "name": "zatz_mu",
+            "name": "yekk_snee",
             "schema": {
-              "@id": "dtmi:example:zatz_nu;1",
+              "@id": "dtmi:example:yekk_quan;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "zatz_xi",
+            "name": "yekk_thnad",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "zatz_omicron"
+            "name": "yekk_spazz"
           },
           {
             "@type": "Telemetry",
-            "name": "zatz_pi",
+            "name": "yekk_floob",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "zatz_rho"
+            "name": "yekk_zatz"
           },
           {
             "@type": "Component",
-            "name": "zatz_sigma",
+            "name": "yekk_jogg",
             "schema": {
-              "@id": "dtmi:example:zatz_tau;1",
+              "@id": "dtmi:example:yekk_flunn;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "zatz_upsilon",
+            "name": "yekk_itch",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "zatz_phi"
+            "name": "yekk_yekk"
           },
           {
             "@type": "Telemetry",
-            "name": "zatz_chi",
+            "name": "yekk_vroo",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "zatz_psi"
+            "name": "yekk_hi"
           },
           {
             "@type": "Component",
-            "name": "zatz_omega",
+            "name": "vroo_alpha",
             "schema": {
-              "@id": "dtmi:example:zatz_yuzz;1",
+              "@id": "dtmi:example:vroo_beta;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "zatz_wum",
+            "name": "vroo_gamma",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "zatz_um"
+            "name": "vroo_delta"
           },
           {
             "@type": "Telemetry",
-            "name": "zatz_humpf",
+            "name": "vroo_epsilon",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "zatz_fuddle"
+            "name": "vroo_zeta"
           },
           {
             "@type": "Component",
-            "name": "zatz_glikk",
+            "name": "vroo_eta",
             "schema": {
-              "@id": "dtmi:example:zatz_nuh;1",
+              "@id": "dtmi:example:vroo_theta;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "zatz_snee",
+            "name": "vroo_iota",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "zatz_quan"
+            "name": "vroo_kappa"
           },
           {
             "@type": "Telemetry",
-            "name": "zatz_thnad",
+            "name": "vroo_lambda",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "zatz_spazz"
+            "name": "vroo_mu"
           },
           {
             "@type": "Component",
-            "name": "zatz_floob",
+            "name": "vroo_nu",
             "schema": {
-              "@id": "dtmi:example:zatz_zatz;1",
+              "@id": "dtmi:example:vroo_xi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "zatz_jogg",
+            "name": "vroo_omicron",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "zatz_flunn"
+            "name": "vroo_pi"
           },
           {
             "@type": "Telemetry",
-            "name": "zatz_itch",
+            "name": "vroo_rho",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "zatz_yekk"
+            "name": "vroo_sigma"
           },
           {
             "@type": "Component",
-            "name": "zatz_vroo",
+            "name": "vroo_tau",
             "schema": {
-              "@id": "dtmi:example:zatz_hi;1",
+              "@id": "dtmi:example:vroo_upsilon;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "jogg_alpha",
+            "name": "vroo_phi",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "jogg_beta"
+            "name": "vroo_chi"
           },
           {
             "@type": "Telemetry",
-            "name": "jogg_gamma",
+            "name": "vroo_psi",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "jogg_delta"
+            "name": "vroo_omega"
           },
           {
             "@type": "Component",
-            "name": "jogg_epsilon",
+            "name": "vroo_yuzz",
             "schema": {
-              "@id": "dtmi:example:jogg_zeta;1",
+              "@id": "dtmi:example:vroo_wum;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "jogg_eta",
+            "name": "vroo_um",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "jogg_theta"
+            "name": "vroo_humpf"
           },
           {
             "@type": "Telemetry",
-            "name": "jogg_iota",
+            "name": "vroo_fuddle",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "jogg_kappa"
+            "name": "vroo_glikk"
           },
           {
             "@type": "Component",
-            "name": "jogg_lambda",
+            "name": "vroo_nuh",
             "schema": {
-              "@id": "dtmi:example:jogg_mu;1",
+              "@id": "dtmi:example:vroo_snee;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "jogg_nu",
+            "name": "vroo_quan",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "jogg_xi"
+            "name": "vroo_thnad"
           },
           {
             "@type": "Telemetry",
-            "name": "jogg_omicron",
+            "name": "vroo_spazz",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "jogg_pi"
+            "name": "vroo_floob"
           },
           {
             "@type": "Component",
-            "name": "jogg_rho",
+            "name": "vroo_zatz",
             "schema": {
-              "@id": "dtmi:example:jogg_sigma;1",
+              "@id": "dtmi:example:vroo_jogg;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "jogg_tau",
+            "name": "vroo_flunn",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "jogg_upsilon"
+            "name": "vroo_itch"
           },
           {
             "@type": "Telemetry",
-            "name": "jogg_phi",
+            "name": "vroo_yekk",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "jogg_chi"
+            "name": "vroo_vroo"
           },
           {
             "@type": "Component",
-            "name": "jogg_psi",
+            "name": "vroo_hi",
             "schema": {
-              "@id": "dtmi:example:jogg_omega;1",
+              "@id": "dtmi:example:hi_alpha;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "jogg_yuzz",
+            "name": "hi_beta",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "jogg_wum"
+            "name": "hi_gamma"
           },
           {
             "@type": "Telemetry",
-            "name": "jogg_um",
+            "name": "hi_delta",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "jogg_humpf"
+            "name": "hi_epsilon"
           },
           {
             "@type": "Component",
-            "name": "jogg_fuddle",
+            "name": "hi_zeta",
             "schema": {
-              "@id": "dtmi:example:jogg_glikk;1",
+              "@id": "dtmi:example:hi_eta;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "jogg_nuh",
+            "name": "hi_theta",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "jogg_snee"
+            "name": "hi_iota"
           },
           {
             "@type": "Telemetry",
-            "name": "jogg_quan",
+            "name": "hi_kappa",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "jogg_thnad"
+            "name": "hi_lambda"
           },
           {
             "@type": "Component",
-            "name": "jogg_spazz",
+            "name": "hi_mu",
             "schema": {
-              "@id": "dtmi:example:jogg_floob;1",
+              "@id": "dtmi:example:hi_nu;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "jogg_zatz",
+            "name": "hi_xi",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "jogg_jogg"
+            "name": "hi_omicron"
           },
           {
             "@type": "Telemetry",
-            "name": "jogg_flunn",
+            "name": "hi_pi",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "jogg_itch"
+            "name": "hi_rho"
           },
           {
             "@type": "Component",
-            "name": "jogg_yekk",
+            "name": "hi_sigma",
             "schema": {
-              "@id": "dtmi:example:jogg_vroo;1",
+              "@id": "dtmi:example:hi_tau;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "jogg_hi",
+            "name": "hi_upsilon",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "flunn_alpha"
+            "name": "hi_phi"
           },
           {
             "@type": "Telemetry",
-            "name": "flunn_beta",
+            "name": "hi_chi",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "flunn_gamma"
+            "name": "hi_psi"
           },
           {
             "@type": "Component",
-            "name": "flunn_delta",
+            "name": "hi_omega",
             "schema": {
-              "@id": "dtmi:example:flunn_epsilon;1",
+              "@id": "dtmi:example:hi_yuzz;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "flunn_zeta",
+            "name": "hi_wum",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "flunn_eta"
+            "name": "hi_um"
           },
           {
             "@type": "Telemetry",
-            "name": "flunn_theta",
+            "name": "hi_humpf",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "flunn_iota"
+            "name": "hi_fuddle"
           },
           {
             "@type": "Component",
-            "name": "flunn_kappa",
+            "name": "hi_glikk",
             "schema": {
-              "@id": "dtmi:example:flunn_lambda;1",
+              "@id": "dtmi:example:hi_nuh;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "flunn_mu",
+            "name": "hi_snee",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "flunn_nu"
+            "name": "hi_quan"
           },
           {
             "@type": "Telemetry",
-            "name": "flunn_xi",
+            "name": "hi_thnad",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "flunn_omicron"
+            "name": "hi_spazz"
           },
           {
             "@type": "Component",
-            "name": "flunn_pi",
+            "name": "hi_floob",
             "schema": {
-              "@id": "dtmi:example:flunn_rho;1",
+              "@id": "dtmi:example:hi_zatz;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "flunn_sigma",
+            "name": "hi_jogg",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "flunn_tau"
+            "name": "hi_flunn"
           },
           {
             "@type": "Telemetry",
-            "name": "flunn_upsilon",
+            "name": "hi_itch",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "flunn_phi"
+            "name": "hi_yekk"
           },
           {
             "@type": "Component",
-            "name": "flunn_chi",
+            "name": "hi_vroo",
             "schema": {
-              "@id": "dtmi:example:flunn_psi;1",
+              "@id": "dtmi:example:hi_hi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "flunn_omega",
+            "name": "alpha_alpha",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "flunn_yuzz"
+            "name": "alpha_beta"
           },
           {
             "@type": "Telemetry",
-            "name": "flunn_wum",
+            "name": "alpha_gamma",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "flunn_um"
+            "name": "alpha_delta"
           },
           {
             "@type": "Component",
-            "name": "flunn_humpf",
+            "name": "alpha_epsilon",
             "schema": {
-              "@id": "dtmi:example:flunn_fuddle;1",
+              "@id": "dtmi:example:alpha_zeta;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "flunn_glikk",
+            "name": "alpha_eta",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "flunn_nuh"
+            "name": "alpha_theta"
           },
           {
             "@type": "Telemetry",
-            "name": "flunn_snee",
+            "name": "alpha_iota",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "flunn_quan"
+            "name": "alpha_kappa"
           },
           {
             "@type": "Component",
-            "name": "flunn_thnad",
+            "name": "alpha_lambda",
             "schema": {
-              "@id": "dtmi:example:flunn_spazz;1",
+              "@id": "dtmi:example:alpha_mu;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "flunn_floob",
+            "name": "alpha_nu",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "flunn_zatz"
+            "name": "alpha_xi"
           },
           {
             "@type": "Telemetry",
-            "name": "flunn_jogg",
+            "name": "alpha_omicron",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "flunn_flunn"
+            "name": "alpha_pi"
           },
           {
             "@type": "Component",
-            "name": "flunn_itch",
+            "name": "alpha_rho",
             "schema": {
-              "@id": "dtmi:example:flunn_yekk;1",
+              "@id": "dtmi:example:alpha_sigma;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "flunn_vroo",
+            "name": "alpha_tau",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "flunn_hi"
+            "name": "alpha_upsilon"
           },
           {
             "@type": "Telemetry",
-            "name": "itch_alpha",
+            "name": "alpha_phi",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "itch_beta"
+            "name": "alpha_chi"
           },
           {
             "@type": "Component",
-            "name": "itch_gamma",
+            "name": "alpha_psi",
             "schema": {
-              "@id": "dtmi:example:itch_delta;1",
+              "@id": "dtmi:example:alpha_omega;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "itch_epsilon",
+            "name": "alpha_yuzz",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "itch_zeta"
+            "name": "alpha_wum"
           },
           {
             "@type": "Telemetry",
-            "name": "itch_eta",
+            "name": "alpha_um",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "itch_theta"
+            "name": "alpha_humpf"
           },
           {
             "@type": "Component",
-            "name": "itch_iota",
+            "name": "alpha_fuddle",
             "schema": {
-              "@id": "dtmi:example:itch_kappa;1",
+              "@id": "dtmi:example:alpha_glikk;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "itch_lambda",
+            "name": "alpha_nuh",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "itch_mu"
+            "name": "alpha_snee"
           },
           {
             "@type": "Telemetry",
-            "name": "itch_nu",
+            "name": "alpha_quan",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "itch_xi"
+            "name": "alpha_thnad"
           },
           {
             "@type": "Component",
-            "name": "itch_omicron",
+            "name": "alpha_spazz",
             "schema": {
-              "@id": "dtmi:example:itch_pi;1",
+              "@id": "dtmi:example:alpha_floob;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "itch_rho",
+            "name": "alpha_zatz",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "itch_sigma"
+            "name": "alpha_jogg"
           },
           {
             "@type": "Telemetry",
-            "name": "itch_tau",
+            "name": "alpha_flunn",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "itch_upsilon"
+            "name": "alpha_itch"
           },
           {
             "@type": "Component",
-            "name": "itch_phi",
+            "name": "alpha_yekk",
             "schema": {
-              "@id": "dtmi:example:itch_chi;1",
+              "@id": "dtmi:example:alpha_vroo;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "itch_psi",
+            "name": "alpha_hi",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "itch_omega"
+            "name": "beta_alpha"
           },
           {
             "@type": "Telemetry",
-            "name": "itch_yuzz",
+            "name": "beta_beta",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "itch_wum"
+            "name": "beta_gamma"
           },
           {
             "@type": "Component",
-            "name": "itch_um",
+            "name": "beta_delta",
             "schema": {
-              "@id": "dtmi:example:itch_humpf;1",
+              "@id": "dtmi:example:beta_epsilon;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "itch_fuddle",
+            "name": "beta_zeta",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "itch_glikk"
+            "name": "beta_eta"
           },
           {
             "@type": "Telemetry",
-            "name": "itch_nuh",
+            "name": "beta_theta",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "itch_snee"
+            "name": "beta_iota"
           },
           {
             "@type": "Component",
-            "name": "itch_quan",
+            "name": "beta_kappa",
             "schema": {
-              "@id": "dtmi:example:itch_thnad;1",
+              "@id": "dtmi:example:beta_lambda;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "itch_spazz",
+            "name": "beta_mu",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "itch_floob"
+            "name": "beta_nu"
           },
           {
             "@type": "Telemetry",
-            "name": "itch_zatz",
+            "name": "beta_xi",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "itch_jogg"
+            "name": "beta_omicron"
           },
           {
             "@type": "Component",
-            "name": "itch_flunn",
+            "name": "beta_pi",
             "schema": {
-              "@id": "dtmi:example:itch_itch;1",
+              "@id": "dtmi:example:beta_rho;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "itch_yekk",
+            "name": "beta_sigma",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "itch_vroo"
+            "name": "beta_tau"
           },
           {
             "@type": "Telemetry",
-            "name": "itch_hi",
+            "name": "beta_upsilon",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "yekk_alpha"
+            "name": "beta_phi"
           },
           {
             "@type": "Component",
-            "name": "yekk_beta",
+            "name": "beta_chi",
             "schema": {
-              "@id": "dtmi:example:yekk_gamma;1",
+              "@id": "dtmi:example:beta_psi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "yekk_delta",
+            "name": "beta_omega",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "yekk_epsilon"
+            "name": "beta_yuzz"
           },
           {
             "@type": "Telemetry",
-            "name": "yekk_zeta",
+            "name": "beta_wum",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "yekk_eta"
+            "name": "beta_um"
           },
           {
             "@type": "Component",
-            "name": "yekk_theta",
+            "name": "beta_humpf",
             "schema": {
-              "@id": "dtmi:example:yekk_iota;1",
+              "@id": "dtmi:example:beta_fuddle;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "yekk_kappa",
+            "name": "beta_glikk",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "yekk_lambda"
+            "name": "beta_nuh"
           },
           {
             "@type": "Telemetry",
-            "name": "yekk_mu",
+            "name": "beta_snee",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "yekk_nu"
+            "name": "beta_quan"
           },
           {
             "@type": "Component",
-            "name": "yekk_xi",
+            "name": "beta_thnad",
             "schema": {
-              "@id": "dtmi:example:yekk_omicron;1",
+              "@id": "dtmi:example:beta_spazz;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "yekk_pi",
+            "name": "beta_floob",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "yekk_rho"
+            "name": "beta_zatz"
           },
           {
             "@type": "Telemetry",
-            "name": "yekk_sigma",
+            "name": "beta_jogg",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "yekk_tau"
+            "name": "beta_flunn"
           },
           {
             "@type": "Component",
-            "name": "yekk_upsilon",
+            "name": "beta_itch",
             "schema": {
-              "@id": "dtmi:example:yekk_phi;1",
+              "@id": "dtmi:example:beta_yekk;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "yekk_chi",
+            "name": "beta_vroo",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "yekk_psi"
+            "name": "beta_hi"
           },
           {
             "@type": "Telemetry",
-            "name": "yekk_omega",
+            "name": "gamma_alpha",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "yekk_yuzz"
+            "name": "gamma_beta"
           },
           {
             "@type": "Component",
-            "name": "yekk_wum",
+            "name": "gamma_gamma",
             "schema": {
-              "@id": "dtmi:example:yekk_um;1",
+              "@id": "dtmi:example:gamma_delta;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "yekk_humpf",
+            "name": "gamma_epsilon",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "yekk_fuddle"
+            "name": "gamma_zeta"
           },
           {
             "@type": "Telemetry",
-            "name": "yekk_glikk",
+            "name": "gamma_eta",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "yekk_nuh"
+            "name": "gamma_theta"
           },
           {
             "@type": "Component",
-            "name": "yekk_snee",
+            "name": "gamma_iota",
             "schema": {
-              "@id": "dtmi:example:yekk_quan;1",
+              "@id": "dtmi:example:gamma_kappa;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "yekk_thnad",
+            "name": "gamma_lambda",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "yekk_spazz"
+            "name": "gamma_mu"
           },
           {
             "@type": "Telemetry",
-            "name": "yekk_floob",
+            "name": "gamma_nu",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "yekk_zatz"
+            "name": "gamma_xi"
           },
           {
             "@type": "Component",
-            "name": "yekk_jogg",
+            "name": "gamma_omicron",
             "schema": {
-              "@id": "dtmi:example:yekk_flunn;1",
+              "@id": "dtmi:example:gamma_pi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "yekk_itch",
+            "name": "gamma_rho",
             "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "yekk_yekk"
+            "name": "gamma_sigma"
           },
           {
             "@type": "Telemetry",
-            "name": "yekk_vroo",
+            "name": "gamma_tau",
             "schema": "time"
           },
           {
             "@type": "Command",
-            "name": "yekk_hi"
+            "name": "gamma_upsilon"
           },
           {
             "@type": "Component",
-            "name": "vroo_alpha",
+            "name": "gamma_phi",
             "schema": {
-              "@id": "dtmi:example:vroo_beta;1",
+              "@id": "dtmi:example:gamma_chi;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "vroo_gamma",
+            "name": "gamma_psi",
             "schema": "boolean"
           },
           {
             "@type": "Relationship",
-            "name": "vroo_delta"
+            "name": "gamma_omega"
           },
           {
             "@type": "Telemetry",
-            "name": "vroo_epsilon",
+            "name": "gamma_yuzz",
             "schema": "date"
           },
           {
             "@type": "Command",
-            "name": "vroo_zeta"
+            "name": "gamma_wum"
           },
           {
             "@type": "Component",
-            "name": "vroo_eta",
+            "name": "gamma_um",
             "schema": {
-              "@id": "dtmi:example:vroo_theta;1",
+              "@id": "dtmi:example:gamma_humpf;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "vroo_iota",
+            "name": "gamma_fuddle",
             "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "vroo_kappa"
+            "name": "gamma_glikk"
           },
           {
             "@type": "Telemetry",
-            "name": "vroo_lambda",
+            "name": "gamma_nuh",
             "schema": "double"
           },
           {
             "@type": "Command",
-            "name": "vroo_mu"
+            "name": "gamma_snee"
           },
           {
             "@type": "Component",
-            "name": "vroo_nu",
+            "name": "gamma_quan",
             "schema": {
-              "@id": "dtmi:example:vroo_xi;1",
+              "@id": "dtmi:example:gamma_thnad;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "vroo_omicron",
+            "name": "gamma_spazz",
             "schema": "duration"
           },
           {
             "@type": "Relationship",
-            "name": "vroo_pi"
+            "name": "gamma_floob"
           },
           {
             "@type": "Telemetry",
-            "name": "vroo_rho",
+            "name": "gamma_zatz",
             "schema": "float"
           },
           {
             "@type": "Command",
-            "name": "vroo_sigma"
+            "name": "gamma_jogg"
           },
           {
             "@type": "Component",
-            "name": "vroo_tau",
+            "name": "gamma_flunn",
             "schema": {
-              "@id": "dtmi:example:vroo_upsilon;1",
+              "@id": "dtmi:example:gamma_itch;1",
               "@type": "Interface"
             }
           },
           {
             "@type": "Property",
-            "name": "vroo_phi",
+            "name": "gamma_yekk",
             "schema": "integer"
           },
           {
             "@type": "Relationship",
-            "name": "vroo_chi"
+            "name": "gamma_vroo"
           },
           {
             "@type": "Telemetry",
-            "name": "vroo_psi",
+            "name": "gamma_hi",
             "schema": "long"
           },
           {
             "@type": "Command",
-            "name": "vroo_omega"
+            "name": "delta_alpha"
           }
         ]
       }
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertyContentsTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertyContentsTermAndDtmiV2.json
index 13c2ddfb..38246253 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertyContentsTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertyContentsTermAndDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_snee;1",
+        "@id": "dtmi:example:delta_iota;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Command",
-            "name": "vroo_quan"
+            "name": "delta_kappa"
           }
         ],
         "dtmi:dtdl:property:contents;2": [
           {
             "@type": "Command",
-            "name": "vroo_thnad"
+            "name": "delta_lambda"
           }
         ]
       }
@@ -35,18 +35,18 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:vroo_spazz;1",
+        "@id": "dtmi:example:delta_mu;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Command",
-            "name": "vroo_floob"
+            "name": "delta_nu"
           }
         ],
         "dtmi:dtdl:property:contents;2": [
           {
             "@type": "Command",
-            "name": "vroo_zatz"
+            "name": "delta_xi"
           }
         ]
       }
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertyContentsTypeConformanceV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertyContentsTypeConformanceV2.json
index 95f4d62c..ae0224cb 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertyContentsTypeConformanceV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertyContentsTypeConformanceV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_fuddle;1",
+        "@id": "dtmi:example:upsilon_zeta;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:omicron_humpf;1",
+          "@id": "dtmi:example:upsilon_epsilon;1",
           "elementSchema": "duration",
           "@type": "Array"
         }
@@ -28,10 +28,10 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:omicron_nuh;1",
+        "@id": "dtmi:example:upsilon_theta;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:omicron_glikk;1",
+          "@id": "dtmi:example:upsilon_eta;1",
           "elementSchema": "float",
           "@type": "Array"
         }
@@ -46,11 +46,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_thnad;1",
+        "@id": "dtmi:example:upsilon_lambda;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:omicron_snee;1",
-          "name": "omicron_quan",
+          "@id": "dtmi:example:upsilon_iota;1",
+          "name": "upsilon_kappa",
           "@type": "Command"
         }
       }
@@ -64,11 +64,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_zatz;1",
+        "@id": "dtmi:example:upsilon_xi;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:omicron_spazz;1",
-          "name": "omicron_floob",
+          "@id": "dtmi:example:upsilon_mu;1",
+          "name": "upsilon_nu",
           "schema": "integer",
           "@type": "CommandPayload"
         }
@@ -86,11 +86,11 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:omicron_itch;1",
+        "@id": "dtmi:example:upsilon_rho;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:omicron_jogg;1",
-          "name": "omicron_flunn",
+          "@id": "dtmi:example:upsilon_omicron;1",
+          "name": "upsilon_pi",
           "schema": "long",
           "@type": "CommandPayload"
         }
@@ -105,13 +105,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_alpha;1",
+        "@id": "dtmi:example:upsilon_phi;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:omicron_yekk;1",
-          "name": "omicron_vroo",
+          "@id": "dtmi:example:upsilon_sigma;1",
+          "name": "upsilon_tau",
           "schema": {
-            "@id": "dtmi:example:omicron_hi;1",
+            "@id": "dtmi:example:upsilon_upsilon;1",
             "@type": "Interface"
           },
           "@type": "Component"
@@ -127,14 +127,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_delta;1",
+        "@id": "dtmi:example:upsilon_omega;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:pi_beta;1",
+          "@id": "dtmi:example:upsilon_chi;1",
           "enumValues": [
             {
-              "enumValue": 1031,
-              "name": "pi_gamma"
+              "enumValue": 1044,
+              "name": "upsilon_psi"
             }
           ],
           "valueSchema": "integer",
@@ -154,14 +154,14 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:pi_eta;1",
+        "@id": "dtmi:example:upsilon_um;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:pi_epsilon;1",
+          "@id": "dtmi:example:upsilon_yuzz;1",
           "enumValues": [
             {
-              "enumValue": 1032,
-              "name": "pi_zeta"
+              "enumValue": 1045,
+              "name": "upsilon_wum"
             }
           ],
           "valueSchema": "integer",
@@ -178,12 +178,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_kappa;1",
+        "@id": "dtmi:example:upsilon_glikk;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:pi_theta;1",
-          "enumValue": 1033,
-          "name": "pi_iota",
+          "@id": "dtmi:example:upsilon_humpf;1",
+          "enumValue": 1046,
+          "name": "upsilon_fuddle",
           "@type": "EnumValue"
         }
       }
@@ -200,12 +200,12 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:pi_nu;1",
+        "@id": "dtmi:example:upsilon_quan;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:pi_lambda;1",
-          "enumValue": 1034,
-          "name": "pi_mu",
+          "@id": "dtmi:example:upsilon_nuh;1",
+          "enumValue": 1047,
+          "name": "upsilon_snee",
           "@type": "EnumValue"
         }
       }
@@ -219,11 +219,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_pi;1",
+        "@id": "dtmi:example:upsilon_floob;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:pi_xi;1",
-          "name": "pi_omicron",
+          "@id": "dtmi:example:upsilon_thnad;1",
+          "name": "upsilon_spazz",
           "schema": "string",
           "@type": "Field"
         }
@@ -241,11 +241,11 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:pi_tau;1",
+        "@id": "dtmi:example:upsilon_flunn;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:pi_rho;1",
-          "name": "pi_sigma",
+          "@id": "dtmi:example:upsilon_zatz;1",
+          "name": "upsilon_jogg",
           "schema": "time",
           "@type": "Field"
         }
@@ -260,10 +260,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_phi;1",
+        "@id": "dtmi:example:upsilon_yekk;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:pi_upsilon;1",
+          "@id": "dtmi:example:upsilon_itch;1",
           "@type": "Interface"
         }
       }
@@ -280,10 +280,10 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:pi_psi;1",
+        "@id": "dtmi:example:upsilon_hi;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:pi_chi;1",
+          "@id": "dtmi:example:upsilon_vroo;1",
           "@type": "Interface"
         }
       }
@@ -297,16 +297,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_um;1",
+        "@id": "dtmi:example:phi_delta;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:pi_omega;1",
+          "@id": "dtmi:example:phi_alpha;1",
           "mapKey": {
-            "name": "pi_yuzz",
+            "name": "phi_beta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "pi_wum",
+            "name": "phi_gamma",
             "schema": "boolean"
           },
           "@type": "Map"
@@ -325,16 +325,16 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:pi_nuh;1",
+        "@id": "dtmi:example:phi_theta;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:pi_humpf;1",
+          "@id": "dtmi:example:phi_epsilon;1",
           "mapKey": {
-            "name": "pi_fuddle",
+            "name": "phi_zeta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "pi_glikk",
+            "name": "phi_eta",
             "schema": "date"
           },
           "@type": "Map"
@@ -350,11 +350,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_thnad;1",
+        "@id": "dtmi:example:phi_lambda;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:pi_snee;1",
-          "name": "pi_quan",
+          "@id": "dtmi:example:phi_iota;1",
+          "name": "phi_kappa",
           "schema": "string",
           "@type": "MapKey"
         }
@@ -372,11 +372,11 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:pi_zatz;1",
+        "@id": "dtmi:example:phi_xi;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:pi_spazz;1",
-          "name": "pi_floob",
+          "@id": "dtmi:example:phi_mu;1",
+          "name": "phi_nu",
           "schema": "string",
           "@type": "MapKey"
         }
@@ -391,11 +391,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_itch;1",
+        "@id": "dtmi:example:phi_rho;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:pi_jogg;1",
-          "name": "pi_flunn",
+          "@id": "dtmi:example:phi_omicron;1",
+          "name": "phi_pi",
           "schema": "dateTime",
           "@type": "MapValue"
         }
@@ -413,11 +413,11 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:pi_hi;1",
+        "@id": "dtmi:example:phi_upsilon;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:pi_yekk;1",
-          "name": "pi_vroo",
+          "@id": "dtmi:example:phi_sigma;1",
+          "name": "phi_tau",
           "schema": "double",
           "@type": "MapValue"
         }
@@ -432,13 +432,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_gamma;1",
+        "@id": "dtmi:example:phi_psi;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:rho_alpha;1",
+          "@id": "dtmi:example:phi_phi;1",
           "fields": [
             {
-              "name": "rho_beta",
+              "name": "phi_chi",
               "schema": "duration"
             }
           ],
@@ -458,13 +458,13 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:rho_zeta;1",
+        "@id": "dtmi:example:phi_wum;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:rho_delta;1",
+          "@id": "dtmi:example:phi_omega;1",
           "fields": [
             {
-              "name": "rho_epsilon",
+              "name": "phi_yuzz",
               "schema": "float"
             }
           ],
@@ -481,11 +481,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_iota;1",
+        "@id": "dtmi:example:phi_fuddle;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:rho_eta;1",
-          "name": "rho_theta",
+          "@id": "dtmi:example:phi_um;1",
+          "name": "phi_humpf",
           "schema": "integer",
           "@type": "Property"
         }
@@ -500,11 +500,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_mu;1",
+        "@id": "dtmi:example:phi_snee;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:rho_kappa;1",
-          "name": "rho_lambda",
+          "@id": "dtmi:example:phi_glikk;1",
+          "name": "phi_nuh",
           "@type": "Relationship"
         }
       }
@@ -518,11 +518,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_omicron;1",
+        "@id": "dtmi:example:phi_spazz;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:rho_nu;1",
-          "name": "rho_xi",
+          "@id": "dtmi:example:phi_quan;1",
+          "name": "phi_thnad",
           "schema": "long",
           "@type": "Telemetry"
         }
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertyDescriptionLangStringV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertyDescriptionLangStringV2.json
index 6422765f..aba61b53 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertyDescriptionLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertyDescriptionLangStringV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_jogg;1",
+        "@id": "dtmi:example:delta_omicron;1",
         "@type": "Interface",
         "description": "hello"
       }
@@ -21,7 +21,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_flunn;1",
+        "@id": "dtmi:example:delta_pi;1",
         "@type": "Interface",
         "description": [
           "hello"
@@ -37,7 +37,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_itch;1",
+        "@id": "dtmi:example:delta_rho;1",
         "@type": "Interface",
         "description": {
           "en": "hello"
@@ -53,7 +53,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_yekk;1",
+        "@id": "dtmi:example:delta_sigma;1",
         "@type": "Interface",
         "description": [
           {
@@ -72,7 +72,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_vroo;1",
+        "@id": "dtmi:example:delta_tau;1",
         "@type": "Interface",
         "description": {}
       }
@@ -86,7 +86,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_hi;1",
+        "@id": "dtmi:example:delta_upsilon;1",
         "@type": "Interface",
         "description": []
       }
@@ -100,7 +100,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_alpha;1",
+        "@id": "dtmi:example:delta_phi;1",
         "@type": "Interface",
         "description": null
       }
@@ -117,7 +117,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:hi_beta;1",
+        "@id": "dtmi:example:delta_chi;1",
         "@type": "Interface",
         "description": null
       }
@@ -131,7 +131,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_gamma;1",
+        "@id": "dtmi:example:delta_psi;1",
         "@type": "Interface",
         "description": true
       }
@@ -148,7 +148,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:hi_delta;1",
+        "@id": "dtmi:example:delta_omega;1",
         "@type": "Interface",
         "description": true
       }
@@ -162,7 +162,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_epsilon;1",
+        "@id": "dtmi:example:delta_yuzz;1",
         "@type": "Interface",
         "description": 626
       }
@@ -179,7 +179,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:hi_zeta;1",
+        "@id": "dtmi:example:delta_wum;1",
         "@type": "Interface",
         "description": 626
       }
@@ -193,7 +193,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_eta;1",
+        "@id": "dtmi:example:delta_um;1",
         "@type": "Interface",
         "description": [
           null
@@ -212,7 +212,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:hi_theta;1",
+        "@id": "dtmi:example:delta_humpf;1",
         "@type": "Interface",
         "description": [
           null
@@ -228,7 +228,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_iota;1",
+        "@id": "dtmi:example:delta_fuddle;1",
         "@type": "Interface",
         "description": [
           true
@@ -247,7 +247,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:hi_kappa;1",
+        "@id": "dtmi:example:delta_glikk;1",
         "@type": "Interface",
         "description": [
           true
@@ -263,7 +263,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_lambda;1",
+        "@id": "dtmi:example:delta_nuh;1",
         "@type": "Interface",
         "description": [
           626
@@ -282,7 +282,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:hi_mu;1",
+        "@id": "dtmi:example:delta_snee;1",
         "@type": "Interface",
         "description": [
           626
@@ -298,7 +298,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_nu;1",
+        "@id": "dtmi:example:delta_quan;1",
         "@type": "Interface",
         "description": [
           {}
@@ -317,7 +317,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:hi_xi;1",
+        "@id": "dtmi:example:delta_thnad;1",
         "@type": "Interface",
         "description": [
           {}
@@ -333,7 +333,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_omicron;1",
+        "@id": "dtmi:example:delta_spazz;1",
         "@type": "Interface",
         "description": {
           "@value": "hello",
@@ -353,7 +353,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:hi_pi;1",
+        "@id": "dtmi:example:delta_floob;1",
         "@type": "Interface",
         "description": {
           "@value": "hello",
@@ -370,7 +370,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_rho;1",
+        "@id": "dtmi:example:delta_zatz;1",
         "@type": "Interface",
         "description": [
           {
@@ -391,7 +391,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:hi_sigma;1",
+        "@id": "dtmi:example:delta_jogg;1",
         "@type": "Interface",
         "description": [
           {
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertyDescriptionStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertyDescriptionStringLengthV2.json
index eae0ffec..6baa1570 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertyDescriptionStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertyDescriptionStringLengthV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_tau;1",
+        "@id": "dtmi:example:delta_flunn;1",
         "@type": "Interface",
         "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
       }
@@ -21,7 +21,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_upsilon;1",
+        "@id": "dtmi:example:delta_itch;1",
         "@type": "Interface",
         "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
       }
@@ -38,7 +38,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:hi_phi;1",
+        "@id": "dtmi:example:delta_yekk;1",
         "@type": "Interface",
         "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
       }
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertyDescriptionTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertyDescriptionTermAndDtmiV2.json
index 51e57060..ab3fce3b 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertyDescriptionTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertyDescriptionTermAndDtmiV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_humpf;1",
+        "@id": "dtmi:example:epsilon_epsilon;1",
         "@type": "Interface",
         "description": [
-          "hi_fuddle"
+          "epsilon_zeta"
         ],
         "dtmi:dtdl:property:description;2": [
-          "hi_glikk"
+          "epsilon_eta"
         ]
       }
     ]
@@ -29,13 +29,13 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:hi_nuh;1",
+        "@id": "dtmi:example:epsilon_theta;1",
         "@type": "Interface",
         "description": [
-          "hi_snee"
+          "epsilon_iota"
         ],
         "dtmi:dtdl:property:description;2": [
-          "hi_quan"
+          "epsilon_kappa"
         ]
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertyDisplayNameLangStringV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertyDisplayNameLangStringV2.json
index c54bb659..eb062a8e 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertyDisplayNameLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertyDisplayNameLangStringV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_thnad;1",
+        "@id": "dtmi:example:epsilon_lambda;1",
         "@type": "Interface",
         "displayName": "hello"
       }
@@ -21,7 +21,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_spazz;1",
+        "@id": "dtmi:example:epsilon_mu;1",
         "@type": "Interface",
         "displayName": [
           "hello"
@@ -37,7 +37,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_floob;1",
+        "@id": "dtmi:example:epsilon_nu;1",
         "@type": "Interface",
         "displayName": {
           "en": "hello"
@@ -53,7 +53,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_zatz;1",
+        "@id": "dtmi:example:epsilon_xi;1",
         "@type": "Interface",
         "displayName": [
           {
@@ -72,7 +72,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_jogg;1",
+        "@id": "dtmi:example:epsilon_omicron;1",
         "@type": "Interface",
         "displayName": {}
       }
@@ -86,7 +86,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_flunn;1",
+        "@id": "dtmi:example:epsilon_pi;1",
         "@type": "Interface",
         "displayName": []
       }
@@ -100,7 +100,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_itch;1",
+        "@id": "dtmi:example:epsilon_rho;1",
         "@type": "Interface",
         "displayName": null
       }
@@ -117,7 +117,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:hi_yekk;1",
+        "@id": "dtmi:example:epsilon_sigma;1",
         "@type": "Interface",
         "displayName": null
       }
@@ -131,7 +131,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_vroo;1",
+        "@id": "dtmi:example:epsilon_tau;1",
         "@type": "Interface",
         "displayName": true
       }
@@ -148,7 +148,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:hi_hi;1",
+        "@id": "dtmi:example:epsilon_upsilon;1",
         "@type": "Interface",
         "displayName": true
       }
@@ -162,7 +162,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_alpha;1",
+        "@id": "dtmi:example:epsilon_phi;1",
         "@type": "Interface",
         "displayName": 626
       }
@@ -179,7 +179,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:alpha_beta;1",
+        "@id": "dtmi:example:epsilon_chi;1",
         "@type": "Interface",
         "displayName": 626
       }
@@ -193,7 +193,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_gamma;1",
+        "@id": "dtmi:example:epsilon_psi;1",
         "@type": "Interface",
         "displayName": [
           null
@@ -212,7 +212,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:alpha_delta;1",
+        "@id": "dtmi:example:epsilon_omega;1",
         "@type": "Interface",
         "displayName": [
           null
@@ -228,7 +228,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_epsilon;1",
+        "@id": "dtmi:example:epsilon_yuzz;1",
         "@type": "Interface",
         "displayName": [
           true
@@ -247,7 +247,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:alpha_zeta;1",
+        "@id": "dtmi:example:epsilon_wum;1",
         "@type": "Interface",
         "displayName": [
           true
@@ -263,7 +263,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_eta;1",
+        "@id": "dtmi:example:epsilon_um;1",
         "@type": "Interface",
         "displayName": [
           626
@@ -282,7 +282,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:alpha_theta;1",
+        "@id": "dtmi:example:epsilon_humpf;1",
         "@type": "Interface",
         "displayName": [
           626
@@ -298,7 +298,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_iota;1",
+        "@id": "dtmi:example:epsilon_fuddle;1",
         "@type": "Interface",
         "displayName": [
           {}
@@ -317,7 +317,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:alpha_kappa;1",
+        "@id": "dtmi:example:epsilon_glikk;1",
         "@type": "Interface",
         "displayName": [
           {}
@@ -333,7 +333,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_lambda;1",
+        "@id": "dtmi:example:epsilon_nuh;1",
         "@type": "Interface",
         "displayName": {
           "@value": "hello",
@@ -353,7 +353,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:alpha_mu;1",
+        "@id": "dtmi:example:epsilon_snee;1",
         "@type": "Interface",
         "displayName": {
           "@value": "hello",
@@ -370,7 +370,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_nu;1",
+        "@id": "dtmi:example:epsilon_quan;1",
         "@type": "Interface",
         "displayName": [
           {
@@ -391,7 +391,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:alpha_xi;1",
+        "@id": "dtmi:example:epsilon_thnad;1",
         "@type": "Interface",
         "displayName": [
           {
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertyDisplayNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertyDisplayNameStringLengthV2.json
index b702c261..a822b5df 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertyDisplayNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertyDisplayNameStringLengthV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_omicron;1",
+        "@id": "dtmi:example:epsilon_spazz;1",
         "@type": "Interface",
         "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSometh"
       }
@@ -21,7 +21,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_pi;1",
+        "@id": "dtmi:example:epsilon_floob;1",
         "@type": "Interface",
         "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
       }
@@ -38,7 +38,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:alpha_rho;1",
+        "@id": "dtmi:example:epsilon_zatz;1",
         "@type": "Interface",
         "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
       }
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertyDisplayNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertyDisplayNameTermAndDtmiV2.json
index d7c6c722..64f68509 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertyDisplayNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertyDisplayNameTermAndDtmiV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_omega;1",
+        "@id": "dtmi:example:zeta_alpha;1",
         "@type": "Interface",
         "displayName": [
-          "alpha_yuzz"
+          "zeta_beta"
         ],
         "dtmi:dtdl:property:displayName;2": [
-          "alpha_wum"
+          "zeta_gamma"
         ]
       }
     ]
@@ -29,13 +29,13 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:alpha_um;1",
+        "@id": "dtmi:example:zeta_delta;1",
         "@type": "Interface",
         "displayName": [
-          "alpha_humpf"
+          "zeta_epsilon"
         ],
         "dtmi:dtdl:property:displayName;2": [
-          "alpha_fuddle"
+          "zeta_zeta"
         ]
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertyExtendsElementV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertyExtendsElementV2.json
index 81953712..4b21cd41 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertyExtendsElementV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertyExtendsElementV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_snee;1",
+        "@id": "dtmi:example:zeta_iota;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:alpha_nuh;1",
+          "@id": "dtmi:example:zeta_theta;1",
           "@type": "Interface",
           "extends": {
-            "@id": "dtmi:example:alpha_glikk;1",
+            "@id": "dtmi:example:zeta_eta;1",
             "@type": "Interface"
           }
         }
@@ -28,14 +28,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_spazz;1",
+        "@id": "dtmi:example:zeta_mu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:alpha_thnad;1",
+          "@id": "dtmi:example:zeta_lambda;1",
           "@type": "Interface",
           "extends": [
             {
-              "@id": "dtmi:example:alpha_quan;1",
+              "@id": "dtmi:example:zeta_kappa;1",
               "@type": "Interface"
             }
           ]
@@ -52,10 +52,10 @@
       [
         {
           "@context": "dtmi:dtdl:context;2",
-          "@id": "dtmi:example:alpha_zatz;1",
+          "@id": "dtmi:example:zeta_xi;1",
           "@type": "Interface",
           "extends": {
-            "@id": "dtmi:example:alpha_floob;1",
+            "@id": "dtmi:example:zeta_nu;1",
             "@type": "Interface",
             "extends": "dtmi:ex:dependentRef;1"
           }
@@ -77,10 +77,10 @@
       [
         {
           "@context": "dtmi:dtdl:context;2",
-          "@id": "dtmi:example:alpha_flunn;1",
+          "@id": "dtmi:example:zeta_pi;1",
           "@type": "Interface",
           "extends": {
-            "@id": "dtmi:example:alpha_jogg;1",
+            "@id": "dtmi:example:zeta_omicron;1",
             "@type": "Interface",
             "extends": [
               "dtmi:ex:dependentRef;1"
@@ -103,13 +103,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_vroo;1",
+        "@id": "dtmi:example:zeta_tau;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:alpha_yekk;1",
+          "@id": "dtmi:example:zeta_sigma;1",
           "@type": "Interface",
           "extends": {
-            "@id": "dtmi:example:alpha_itch;1",
+            "@id": "dtmi:example:zeta_rho;1",
             "@type": "Interface",
             "@context": "dtmi:dtdl:context;3"
           }
@@ -125,14 +125,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_beta;1",
+        "@id": "dtmi:example:zeta_chi;1",
         "@type": "Interface",
         "extends": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:beta_alpha;1",
+          "@id": "dtmi:example:zeta_phi;1",
           "@type": "Interface",
           "extends": {
-            "@id": "dtmi:example:alpha_hi;1",
+            "@id": "dtmi:example:zeta_upsilon;1",
             "@type": "Interface",
             "@context": "dtmi:dtdl:context;3"
           }
@@ -140,6 +140,51 @@
       }
     ]
   },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:zeta_yuzz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:zeta_omega;1",
+          "@type": "Interface",
+          "extends": {
+            "@id": "dtmi:example:zeta_psi;1",
+            "@type": "Interface",
+            "@context": "dtmi:dtdl:context;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:zeta_humpf;1",
+        "@type": "Interface",
+        "extends": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zeta_um;1",
+          "@type": "Interface",
+          "extends": {
+            "@id": "dtmi:example:zeta_wum;1",
+            "@type": "Interface",
+            "@context": "dtmi:dtdl:context;4"
+          }
+        }
+      }
+    ]
+  },
   {
     "valid": true,
     "options": [
@@ -148,10 +193,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_delta;1",
+        "@id": "dtmi:example:zeta_glikk;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:beta_gamma;1",
+          "@id": "dtmi:example:zeta_fuddle;1",
           "@type": "Interface",
           "extends": []
         }
@@ -166,18 +211,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_theta;1",
+        "@id": "dtmi:example:zeta_thnad;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:beta_eta;1",
+          "@id": "dtmi:example:zeta_quan;1",
           "@type": "Interface",
           "extends": [
             {
-              "@id": "dtmi:example:beta_epsilon;1",
+              "@id": "dtmi:example:zeta_nuh;1",
               "@type": "Interface"
             },
             {
-              "@id": "dtmi:example:beta_zeta;1",
+              "@id": "dtmi:example:zeta_snee;1",
               "@type": "Interface"
             }
           ]
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertyExtendsMaxCountV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertyExtendsMaxCountV2.json
index e7183641..9232fb01 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertyExtendsMaxCountV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertyExtendsMaxCountV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_rho;1",
+        "@id": "dtmi:example:theta_hi;1",
         "@type": "Interface",
         "extends": [
           {
-            "@id": "dtmi:example:delta_omicron;1",
+            "@id": "dtmi:example:theta_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_pi;1",
+            "@id": "dtmi:example:theta_vroo;1",
             "@type": "Interface"
           }
         ]
@@ -30,19 +30,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_phi;1",
+        "@id": "dtmi:example:iota_delta;1",
         "@type": "Interface",
         "extends": [
           {
-            "@id": "dtmi:example:delta_sigma;1",
+            "@id": "dtmi:example:iota_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_tau;1",
+            "@id": "dtmi:example:iota_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_upsilon;1",
+            "@id": "dtmi:example:iota_gamma;1",
             "@type": "Interface"
           }
         ]
@@ -60,19 +60,19 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:delta_yuzz;1",
+        "@id": "dtmi:example:iota_theta;1",
         "@type": "Interface",
         "extends": [
           {
-            "@id": "dtmi:example:delta_chi;1",
+            "@id": "dtmi:example:iota_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_psi;1",
+            "@id": "dtmi:example:iota_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_omega;1",
+            "@id": "dtmi:example:iota_eta;1",
             "@type": "Interface"
           }
         ]
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertyExtendsTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertyExtendsTermAndDtmiV2.json
index 11bf7137..9a55f3eb 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertyExtendsTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertyExtendsTermAndDtmiV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_snee;1",
+        "@id": "dtmi:example:iota_omicron;1",
         "@type": "Interface",
         "extends": [
           {
-            "@id": "dtmi:example:delta_quan;1",
+            "@id": "dtmi:example:iota_pi;1",
             "@type": "Interface"
           }
         ],
         "dtmi:dtdl:property:extends;2": [
           {
-            "@id": "dtmi:example:delta_thnad;1",
+            "@id": "dtmi:example:iota_rho;1",
             "@type": "Interface"
           }
         ]
@@ -35,17 +35,17 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:delta_spazz;1",
+        "@id": "dtmi:example:iota_sigma;1",
         "@type": "Interface",
         "extends": [
           {
-            "@id": "dtmi:example:delta_floob;1",
+            "@id": "dtmi:example:iota_tau;1",
             "@type": "Interface"
           }
         ],
         "dtmi:dtdl:property:extends;2": [
           {
-            "@id": "dtmi:example:delta_zatz;1",
+            "@id": "dtmi:example:iota_upsilon;1",
             "@type": "Interface"
           }
         ]
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertyExtendsTypeConformanceV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertyExtendsTypeConformanceV2.json
index 22429abc..d8267b9b 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertyExtendsTypeConformanceV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertyExtendsTypeConformanceV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_xi;1",
+        "@id": "dtmi:example:zeta_itch;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:beta_nu;1",
+          "@id": "dtmi:example:zeta_flunn;1",
           "elementSchema": "string",
           "@type": "Array"
         }
@@ -28,10 +28,10 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:beta_pi;1",
+        "@id": "dtmi:example:zeta_vroo;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:beta_omicron;1",
+          "@id": "dtmi:example:zeta_yekk;1",
           "elementSchema": "time",
           "@type": "Array"
         }
@@ -46,11 +46,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_tau;1",
+        "@id": "dtmi:example:eta_beta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:beta_rho;1",
-          "name": "beta_sigma",
+          "@id": "dtmi:example:zeta_hi;1",
+          "name": "eta_alpha",
           "@type": "Command"
         }
       }
@@ -67,11 +67,11 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:beta_chi;1",
+        "@id": "dtmi:example:eta_epsilon;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:beta_upsilon;1",
-          "name": "beta_phi",
+          "@id": "dtmi:example:eta_gamma;1",
+          "name": "eta_delta",
           "@type": "Command"
         }
       }
@@ -85,11 +85,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_yuzz;1",
+        "@id": "dtmi:example:eta_theta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:beta_psi;1",
-          "name": "beta_omega",
+          "@id": "dtmi:example:eta_zeta;1",
+          "name": "eta_eta",
           "schema": "boolean",
           "@type": "CommandPayload"
         }
@@ -107,11 +107,11 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:beta_humpf;1",
+        "@id": "dtmi:example:eta_lambda;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:beta_wum;1",
-          "name": "beta_um",
+          "@id": "dtmi:example:eta_iota;1",
+          "name": "eta_kappa",
           "schema": "date",
           "@type": "CommandPayload"
         }
@@ -126,13 +126,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_snee;1",
+        "@id": "dtmi:example:eta_omicron;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:beta_fuddle;1",
-          "name": "beta_glikk",
+          "@id": "dtmi:example:eta_mu;1",
+          "name": "eta_nu",
           "schema": {
-            "@id": "dtmi:example:beta_nuh;1",
+            "@id": "dtmi:example:eta_xi;1",
             "@type": "Interface"
           },
           "@type": "Component"
@@ -151,13 +151,13 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:beta_floob;1",
+        "@id": "dtmi:example:eta_tau;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:beta_quan;1",
-          "name": "beta_thnad",
+          "@id": "dtmi:example:eta_pi;1",
+          "name": "eta_rho",
           "schema": {
-            "@id": "dtmi:example:beta_spazz;1",
+            "@id": "dtmi:example:eta_sigma;1",
             "@type": "Interface"
           },
           "@type": "Component"
@@ -173,14 +173,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_flunn;1",
+        "@id": "dtmi:example:eta_chi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:beta_zatz;1",
+          "@id": "dtmi:example:eta_upsilon;1",
           "enumValues": [
             {
-              "enumValue": 1035,
-              "name": "beta_jogg"
+              "enumValue": 1048,
+              "name": "eta_phi"
             }
           ],
           "valueSchema": "integer",
@@ -200,14 +200,14 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:beta_vroo;1",
+        "@id": "dtmi:example:eta_yuzz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:beta_itch;1",
+          "@id": "dtmi:example:eta_psi;1",
           "enumValues": [
             {
-              "enumValue": 1036,
-              "name": "beta_yekk"
+              "enumValue": 1049,
+              "name": "eta_omega"
             }
           ],
           "valueSchema": "integer",
@@ -224,12 +224,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_beta;1",
+        "@id": "dtmi:example:eta_humpf;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:beta_hi;1",
-          "enumValue": 1037,
-          "name": "gamma_alpha",
+          "@id": "dtmi:example:eta_wum;1",
+          "enumValue": 1050,
+          "name": "eta_um",
           "@type": "EnumValue"
         }
       }
@@ -246,12 +246,12 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:gamma_epsilon;1",
+        "@id": "dtmi:example:eta_nuh;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:gamma_gamma;1",
-          "enumValue": 1038,
-          "name": "gamma_delta",
+          "@id": "dtmi:example:eta_fuddle;1",
+          "enumValue": 1051,
+          "name": "eta_glikk",
           "@type": "EnumValue"
         }
       }
@@ -265,11 +265,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_theta;1",
+        "@id": "dtmi:example:eta_thnad;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:gamma_zeta;1",
-          "name": "gamma_eta",
+          "@id": "dtmi:example:eta_snee;1",
+          "name": "eta_quan",
           "schema": "dateTime",
           "@type": "Field"
         }
@@ -287,11 +287,11 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:gamma_lambda;1",
+        "@id": "dtmi:example:eta_zatz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:gamma_iota;1",
-          "name": "gamma_kappa",
+          "@id": "dtmi:example:eta_spazz;1",
+          "name": "eta_floob",
           "schema": "double",
           "@type": "Field"
         }
@@ -306,10 +306,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_nu;1",
+        "@id": "dtmi:example:eta_flunn;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:gamma_mu;1",
+          "@id": "dtmi:example:eta_jogg;1",
           "@type": "Interface"
         }
       }
@@ -323,16 +323,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_rho;1",
+        "@id": "dtmi:example:eta_hi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:gamma_xi;1",
+          "@id": "dtmi:example:eta_itch;1",
           "mapKey": {
-            "name": "gamma_omicron",
+            "name": "eta_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "gamma_pi",
+            "name": "eta_vroo",
             "schema": "duration"
           },
           "@type": "Map"
@@ -351,16 +351,16 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:gamma_phi;1",
+        "@id": "dtmi:example:theta_delta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:gamma_sigma;1",
+          "@id": "dtmi:example:theta_alpha;1",
           "mapKey": {
-            "name": "gamma_tau",
+            "name": "theta_beta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "gamma_upsilon",
+            "name": "theta_gamma",
             "schema": "float"
           },
           "@type": "Map"
@@ -376,11 +376,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_omega;1",
+        "@id": "dtmi:example:theta_eta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:gamma_chi;1",
-          "name": "gamma_psi",
+          "@id": "dtmi:example:theta_epsilon;1",
+          "name": "theta_zeta",
           "schema": "string",
           "@type": "MapKey"
         }
@@ -398,11 +398,11 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:gamma_um;1",
+        "@id": "dtmi:example:theta_kappa;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:gamma_yuzz;1",
-          "name": "gamma_wum",
+          "@id": "dtmi:example:theta_theta;1",
+          "name": "theta_iota",
           "schema": "string",
           "@type": "MapKey"
         }
@@ -417,11 +417,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_glikk;1",
+        "@id": "dtmi:example:theta_nu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:gamma_humpf;1",
-          "name": "gamma_fuddle",
+          "@id": "dtmi:example:theta_lambda;1",
+          "name": "theta_mu",
           "schema": "integer",
           "@type": "MapValue"
         }
@@ -439,11 +439,11 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:gamma_quan;1",
+        "@id": "dtmi:example:theta_pi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:gamma_nuh;1",
-          "name": "gamma_snee",
+          "@id": "dtmi:example:theta_xi;1",
+          "name": "theta_omicron",
           "schema": "long",
           "@type": "MapValue"
         }
@@ -458,13 +458,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_floob;1",
+        "@id": "dtmi:example:theta_tau;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:gamma_thnad;1",
+          "@id": "dtmi:example:theta_rho;1",
           "fields": [
             {
-              "name": "gamma_spazz",
+              "name": "theta_sigma",
               "schema": "string"
             }
           ],
@@ -484,13 +484,13 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:gamma_flunn;1",
+        "@id": "dtmi:example:theta_chi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:gamma_zatz;1",
+          "@id": "dtmi:example:theta_upsilon;1",
           "fields": [
             {
-              "name": "gamma_jogg",
+              "name": "theta_phi",
               "schema": "time"
             }
           ],
@@ -507,11 +507,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_vroo;1",
+        "@id": "dtmi:example:theta_yuzz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:gamma_itch;1",
-          "name": "gamma_yekk",
+          "@id": "dtmi:example:theta_psi;1",
+          "name": "theta_omega",
           "schema": "boolean",
           "@type": "Property"
         }
@@ -529,11 +529,11 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:delta_beta;1",
+        "@id": "dtmi:example:theta_humpf;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:gamma_hi;1",
-          "name": "delta_alpha",
+          "@id": "dtmi:example:theta_wum;1",
+          "name": "theta_um",
           "schema": "date",
           "@type": "Property"
         }
@@ -548,11 +548,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_epsilon;1",
+        "@id": "dtmi:example:theta_nuh;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:delta_gamma;1",
-          "name": "delta_delta",
+          "@id": "dtmi:example:theta_fuddle;1",
+          "name": "theta_glikk",
           "@type": "Relationship"
         }
       }
@@ -569,11 +569,11 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:delta_theta;1",
+        "@id": "dtmi:example:theta_thnad;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:delta_zeta;1",
-          "name": "delta_eta",
+          "@id": "dtmi:example:theta_snee;1",
+          "name": "theta_quan",
           "@type": "Relationship"
         }
       }
@@ -587,11 +587,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_lambda;1",
+        "@id": "dtmi:example:theta_zatz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:delta_iota;1",
-          "name": "delta_kappa",
+          "@id": "dtmi:example:theta_spazz;1",
+          "name": "theta_floob",
           "schema": "dateTime",
           "@type": "Telemetry"
         }
@@ -609,11 +609,11 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:delta_xi;1",
+        "@id": "dtmi:example:theta_itch;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:delta_mu;1",
-          "name": "delta_nu",
+          "@id": "dtmi:example:theta_jogg;1",
+          "name": "theta_flunn",
           "schema": "double",
           "@type": "Telemetry"
         }
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertyFormallyInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertyFormallyInvalidDtmiV2.json
index d579e604..61db4ed3 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertyFormallyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertyFormallyInvalidDtmiV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_thnad;1",
+        "@id": "dtmi:example:mu_psi;1",
         "@type": "Interface",
         "dtmi:foo//bar": 626
       }
@@ -24,7 +24,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:eta_spazz;1",
+        "@id": "dtmi:example:mu_omega;1",
         "@type": "Interface",
         "dtmi:foo//bar": 626
       }
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertyFormallyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertyFormallyIrrelevantDtmiOrTermV2.json
index aaeff068..2151be30 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertyFormallyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertyFormallyIrrelevantDtmiOrTermV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_fuddle;1",
+        "@id": "dtmi:example:mu_sigma;1",
         "@type": "Interface",
         "dtmi:foo:bar;1": 626
       }
@@ -24,7 +24,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:eta_glikk;1",
+        "@id": "dtmi:example:mu_tau;1",
         "@type": "Interface",
         "dtmi:foo:bar;1": 626
       }
@@ -38,7 +38,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_nuh;1",
+        "@id": "dtmi:example:mu_upsilon;1",
         "@type": "Interface",
         "boolean": null
       }
@@ -55,7 +55,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:eta_snee;1",
+        "@id": "dtmi:example:mu_phi;1",
         "@type": "Interface",
         "boolean": null
       }
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertyFormallyNotDtmiNorTermV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertyFormallyNotDtmiNorTermV2.json
index 3d680675..909967d9 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertyFormallyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertyFormallyNotDtmiNorTermV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_zatz;1",
+        "@id": "dtmi:example:mu_wum;1",
         "@type": "Interface",
         "http://foo.com/bar": true
       }
@@ -24,7 +24,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:eta_jogg;1",
+        "@id": "dtmi:example:mu_um;1",
         "@type": "Interface",
         "http://foo.com/bar": true
       }
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertyFormallyUndefinedTermV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertyFormallyUndefinedTermV2.json
index 9f7eff7a..5e5842a3 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertyFormallyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertyFormallyUndefinedTermV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_itch;1",
+        "@id": "dtmi:example:mu_fuddle;1",
         "@type": "Interface",
         "foobar": {}
       }
@@ -24,7 +24,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:eta_yekk;1",
+        "@id": "dtmi:example:mu_glikk;1",
         "@type": "Interface",
         "foobar": {}
       }
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertySchemasElementV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertySchemasElementV2.json
index 2dfbb1ff..e4e26b92 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertySchemasElementV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertySchemasElementV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_itch;1",
+        "@id": "dtmi:example:iota_psi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:delta_flunn;1",
+          "@id": "dtmi:example:iota_chi;1",
           "@type": "Interface",
           "schemas": {
-            "@id": "dtmi:example:delta_jogg;1",
+            "@id": "dtmi:example:iota_phi;1",
             "@type": "Array",
             "elementSchema": "duration"
           }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_hi;1",
+        "@id": "dtmi:example:iota_wum;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:delta_vroo;1",
+          "@id": "dtmi:example:iota_yuzz;1",
           "@type": "Interface",
           "schemas": [
             {
-              "@id": "dtmi:example:delta_yekk;1",
+              "@id": "dtmi:example:iota_omega;1",
               "@type": "Array",
               "elementSchema": "float"
             }
@@ -53,13 +53,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_gamma;1",
+        "@id": "dtmi:example:iota_fuddle;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:epsilon_beta;1",
+          "@id": "dtmi:example:iota_humpf;1",
           "@type": "Interface",
           "schemas": {
-            "@id": "dtmi:example:epsilon_alpha;1",
+            "@id": "dtmi:example:iota_um;1",
             "@type": "Array",
             "elementSchema": "integer",
             "@context": "dtmi:dtdl:context;3"
@@ -76,14 +76,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_zeta;1",
+        "@id": "dtmi:example:iota_snee;1",
         "@type": "Interface",
         "extends": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:epsilon_epsilon;1",
+          "@id": "dtmi:example:iota_nuh;1",
           "@type": "Interface",
           "schemas": {
-            "@id": "dtmi:example:epsilon_delta;1",
+            "@id": "dtmi:example:iota_glikk;1",
             "@type": "Array",
             "elementSchema": "long",
             "@context": "dtmi:dtdl:context;3"
@@ -92,6 +92,53 @@
       }
     ]
   },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:iota_spazz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:iota_thnad;1",
+          "@type": "Interface",
+          "schemas": {
+            "@id": "dtmi:example:iota_quan;1",
+            "@type": "Array",
+            "elementSchema": "bytes",
+            "@context": "dtmi:dtdl:context;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:iota_jogg;1",
+        "@type": "Interface",
+        "extends": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:iota_zatz;1",
+          "@type": "Interface",
+          "schemas": {
+            "@id": "dtmi:example:iota_floob;1",
+            "@type": "Array",
+            "elementSchema": "date",
+            "@context": "dtmi:dtdl:context;4"
+          }
+        }
+      }
+    ]
+  },
   {
     "valid": true,
     "options": [
@@ -100,10 +147,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_theta;1",
+        "@id": "dtmi:example:iota_itch;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:epsilon_eta;1",
+          "@id": "dtmi:example:iota_flunn;1",
           "@type": "Interface",
           "schemas": []
         }
@@ -118,24 +165,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_nu;1",
+        "@id": "dtmi:example:kappa_beta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:epsilon_mu;1",
+          "@id": "dtmi:example:kappa_alpha;1",
           "@type": "Interface",
           "schemas": [
             {
-              "@id": "dtmi:example:epsilon_iota;1",
+              "@id": "dtmi:example:iota_yekk;1",
               "@type": "Array",
-              "elementSchema": "string"
+              "elementSchema": "boolean"
             },
             {
-              "@id": "dtmi:example:epsilon_kappa;1",
+              "@id": "dtmi:example:iota_vroo;1",
               "@type": "Enum",
               "enumValues": [
                 {
-                  "enumValue": 1039,
-                  "name": "epsilon_lambda"
+                  "enumValue": 1052,
+                  "name": "iota_hi"
                 }
               ],
               "valueSchema": "integer"
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertySchemasTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertySchemasTermAndDtmiV2.json
index e064d454..5a972f88 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertySchemasTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertySchemasTermAndDtmiV2.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_pi;1",
+        "@id": "dtmi:example:mu_epsilon;1",
         "@type": "Interface",
         "schemas": [
           {
-            "@id": "dtmi:example:eta_rho;1",
+            "@id": "dtmi:example:mu_zeta;1",
             "@type": "Array",
-            "elementSchema": "float"
+            "elementSchema": "long"
           }
         ],
         "dtmi:dtdl:property:schemas;2": [
           {
-            "@id": "dtmi:example:eta_sigma;1",
+            "@id": "dtmi:example:mu_eta;1",
             "@type": "Array",
-            "elementSchema": "integer"
+            "elementSchema": "string"
           }
         ]
       }
@@ -37,20 +37,20 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:eta_tau;1",
+        "@id": "dtmi:example:mu_theta;1",
         "@type": "Interface",
         "schemas": [
           {
-            "@id": "dtmi:example:eta_upsilon;1",
+            "@id": "dtmi:example:mu_iota;1",
             "@type": "Array",
-            "elementSchema": "long"
+            "elementSchema": "time"
           }
         ],
         "dtmi:dtdl:property:schemas;2": [
           {
-            "@id": "dtmi:example:eta_phi;1",
+            "@id": "dtmi:example:mu_kappa;1",
             "@type": "Array",
-            "elementSchema": "string"
+            "elementSchema": "boolean"
           }
         ]
       }
diff --git a/DTDL/v2/spec/Requirement-ClassInterfacePropertySchemasTypeConformanceV2.json b/DTDL/v2/spec/Requirement-ClassInterfacePropertySchemasTypeConformanceV2.json
index 6c1fd9a0..6626bc96 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfacePropertySchemasTypeConformanceV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfacePropertySchemasTypeConformanceV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_tau;1",
+        "@id": "dtmi:example:kappa_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_sigma;1",
-          "elementSchema": "time",
+          "@id": "dtmi:example:kappa_eta;1",
+          "elementSchema": "date",
           "@type": "Array"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_chi;1",
+        "@id": "dtmi:example:kappa_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_upsilon;1",
-          "name": "epsilon_phi",
+          "@id": "dtmi:example:kappa_iota;1",
+          "name": "kappa_kappa",
           "@type": "Command"
         }
       }
@@ -46,11 +46,11 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:epsilon_yuzz;1",
+        "@id": "dtmi:example:kappa_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_psi;1",
-          "name": "epsilon_omega",
+          "@id": "dtmi:example:kappa_mu;1",
+          "name": "kappa_nu",
           "@type": "Command"
         }
       }
@@ -64,12 +64,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_humpf;1",
+        "@id": "dtmi:example:kappa_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_wum;1",
-          "name": "epsilon_um",
-          "schema": "boolean",
+          "@id": "dtmi:example:kappa_omicron;1",
+          "name": "kappa_pi",
+          "schema": "dateTime",
           "@type": "CommandPayload"
         }
       }
@@ -86,12 +86,12 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:epsilon_nuh;1",
+        "@id": "dtmi:example:kappa_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_fuddle;1",
-          "name": "epsilon_glikk",
-          "schema": "date",
+          "@id": "dtmi:example:kappa_sigma;1",
+          "name": "kappa_tau",
+          "schema": "double",
           "@type": "CommandPayload"
         }
       }
@@ -105,13 +105,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_spazz;1",
+        "@id": "dtmi:example:kappa_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_snee;1",
-          "name": "epsilon_quan",
+          "@id": "dtmi:example:kappa_phi;1",
+          "name": "kappa_chi",
           "schema": {
-            "@id": "dtmi:example:epsilon_thnad;1",
+            "@id": "dtmi:example:kappa_psi;1",
             "@type": "Interface"
           },
           "@type": "Component"
@@ -130,13 +130,13 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:epsilon_flunn;1",
+        "@id": "dtmi:example:kappa_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_floob;1",
-          "name": "epsilon_zatz",
+          "@id": "dtmi:example:kappa_yuzz;1",
+          "name": "kappa_wum",
           "schema": {
-            "@id": "dtmi:example:epsilon_jogg;1",
+            "@id": "dtmi:example:kappa_um;1",
             "@type": "Interface"
           },
           "@type": "Component"
@@ -152,14 +152,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_vroo;1",
+        "@id": "dtmi:example:kappa_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_itch;1",
+          "@id": "dtmi:example:kappa_fuddle;1",
           "enumValues": [
             {
-              "enumValue": 1040,
-              "name": "epsilon_yekk"
+              "enumValue": 1053,
+              "name": "kappa_glikk"
             }
           ],
           "valueSchema": "integer",
@@ -176,12 +176,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_beta;1",
+        "@id": "dtmi:example:kappa_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_hi;1",
-          "enumValue": 1041,
-          "name": "zeta_alpha",
+          "@id": "dtmi:example:kappa_snee;1",
+          "enumValue": 1054,
+          "name": "kappa_quan",
           "@type": "EnumValue"
         }
       }
@@ -198,12 +198,12 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:zeta_epsilon;1",
+        "@id": "dtmi:example:kappa_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_gamma;1",
-          "enumValue": 1042,
-          "name": "zeta_delta",
+          "@id": "dtmi:example:kappa_spazz;1",
+          "enumValue": 1055,
+          "name": "kappa_floob",
           "@type": "EnumValue"
         }
       }
@@ -217,12 +217,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_theta;1",
+        "@id": "dtmi:example:kappa_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_zeta;1",
-          "name": "zeta_eta",
-          "schema": "dateTime",
+          "@id": "dtmi:example:kappa_jogg;1",
+          "name": "kappa_flunn",
+          "schema": "duration",
           "@type": "Field"
         }
       }
@@ -239,12 +239,12 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:zeta_lambda;1",
+        "@id": "dtmi:example:kappa_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_iota;1",
-          "name": "zeta_kappa",
-          "schema": "double",
+          "@id": "dtmi:example:kappa_yekk;1",
+          "name": "kappa_vroo",
+          "schema": "float",
           "@type": "Field"
         }
       }
@@ -258,10 +258,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_nu;1",
+        "@id": "dtmi:example:lambda_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_mu;1",
+          "@id": "dtmi:example:lambda_alpha;1",
           "@type": "Interface"
         }
       }
@@ -278,10 +278,10 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:zeta_omicron;1",
+        "@id": "dtmi:example:lambda_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_xi;1",
+          "@id": "dtmi:example:lambda_gamma;1",
           "@type": "Interface"
         }
       }
@@ -295,17 +295,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_tau;1",
+        "@id": "dtmi:example:lambda_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_pi;1",
+          "@id": "dtmi:example:lambda_epsilon;1",
           "mapKey": {
-            "name": "zeta_rho",
+            "name": "lambda_zeta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zeta_sigma",
-            "schema": "duration"
+            "name": "lambda_eta",
+            "schema": "integer"
           },
           "@type": "Map"
         }
@@ -320,11 +320,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_chi;1",
+        "@id": "dtmi:example:lambda_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_upsilon;1",
-          "name": "zeta_phi",
+          "@id": "dtmi:example:lambda_iota;1",
+          "name": "lambda_kappa",
           "schema": "string",
           "@type": "MapKey"
         }
@@ -342,11 +342,11 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:zeta_yuzz;1",
+        "@id": "dtmi:example:lambda_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_psi;1",
-          "name": "zeta_omega",
+          "@id": "dtmi:example:lambda_mu;1",
+          "name": "lambda_nu",
           "schema": "string",
           "@type": "MapKey"
         }
@@ -361,12 +361,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_humpf;1",
+        "@id": "dtmi:example:lambda_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_wum;1",
-          "name": "zeta_um",
-          "schema": "float",
+          "@id": "dtmi:example:lambda_omicron;1",
+          "name": "lambda_pi",
+          "schema": "long",
           "@type": "MapValue"
         }
       }
@@ -383,12 +383,12 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:zeta_nuh;1",
+        "@id": "dtmi:example:lambda_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_fuddle;1",
-          "name": "zeta_glikk",
-          "schema": "integer",
+          "@id": "dtmi:example:lambda_sigma;1",
+          "name": "lambda_tau",
+          "schema": "string",
           "@type": "MapValue"
         }
       }
@@ -402,14 +402,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_thnad;1",
+        "@id": "dtmi:example:lambda_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_snee;1",
+          "@id": "dtmi:example:lambda_phi;1",
           "fields": [
             {
-              "name": "zeta_quan",
-              "schema": "long"
+              "name": "lambda_chi",
+              "schema": "time"
             }
           ],
           "@type": "Object"
@@ -425,12 +425,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_zatz;1",
+        "@id": "dtmi:example:lambda_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_spazz;1",
-          "name": "zeta_floob",
-          "schema": "string",
+          "@id": "dtmi:example:lambda_omega;1",
+          "name": "lambda_yuzz",
+          "schema": "boolean",
           "@type": "Property"
         }
       }
@@ -447,12 +447,12 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:zeta_itch;1",
+        "@id": "dtmi:example:lambda_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_jogg;1",
-          "name": "zeta_flunn",
-          "schema": "time",
+          "@id": "dtmi:example:lambda_um;1",
+          "name": "lambda_humpf",
+          "schema": "date",
           "@type": "Property"
         }
       }
@@ -466,11 +466,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_hi;1",
+        "@id": "dtmi:example:lambda_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_yekk;1",
-          "name": "zeta_vroo",
+          "@id": "dtmi:example:lambda_glikk;1",
+          "name": "lambda_nuh",
           "@type": "Relationship"
         }
       }
@@ -487,11 +487,11 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:eta_gamma;1",
+        "@id": "dtmi:example:lambda_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_alpha;1",
-          "name": "eta_beta",
+          "@id": "dtmi:example:lambda_quan;1",
+          "name": "lambda_thnad",
           "@type": "Relationship"
         }
       }
@@ -505,12 +505,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_zeta;1",
+        "@id": "dtmi:example:lambda_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_delta;1",
-          "name": "eta_epsilon",
-          "schema": "boolean",
+          "@id": "dtmi:example:lambda_floob;1",
+          "name": "lambda_zatz",
+          "schema": "dateTime",
           "@type": "Telemetry"
         }
       }
@@ -527,12 +527,12 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:eta_iota;1",
+        "@id": "dtmi:example:lambda_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_eta;1",
-          "name": "eta_theta",
-          "schema": "date",
+          "@id": "dtmi:example:lambda_flunn;1",
+          "name": "lambda_itch",
+          "schema": "double",
           "@type": "Telemetry"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassInterfaceRequiredPropertiesV2.json b/DTDL/v2/spec/Requirement-ClassInterfaceRequiredPropertiesV2.json
index 7ede77e8..1c17a6b6 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfaceRequiredPropertiesV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfaceRequiredPropertiesV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_epsilon;1"
+        "@id": "dtmi:example:pi_nu;1"
       }
     ]
   },
@@ -22,7 +22,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:mu_zeta;1"
+        "@id": "dtmi:example:pi_xi;1"
       }
     ]
   },
@@ -34,7 +34,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_eta;1",
+        "@id": "dtmi:example:pi_omicron;1",
         "@type": "Interface",
         "extends": {
           "@type": "Interface"
@@ -50,7 +50,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_theta;1",
+        "@id": "dtmi:example:pi_pi;1",
         "@type": "Interface",
         "extends": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v2/spec/Requirement-ClassInterfaceTypeIncludesInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassInterfaceTypeIncludesInvalidDtmiV2.json
index 9ca9c360..15ee8fd2 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfaceTypeIncludesInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfaceTypeIncludesInvalidDtmiV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_vroo;1",
+        "@id": "dtmi:example:rho_eta;1",
         "@type": [
           "Interface",
           "dtmi:foo//bar"
@@ -26,7 +26,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:mu_hi;1",
+        "@id": "dtmi:example:rho_theta;1",
         "@type": [
           "Interface",
           "dtmi:foo//bar"
diff --git a/DTDL/v2/spec/Requirement-ClassInterfaceTypeIncludesMaterialV2.json b/DTDL/v2/spec/Requirement-ClassInterfaceTypeIncludesMaterialV2.json
index fc81f4e6..3e73b902 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfaceTypeIncludesMaterialV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfaceTypeIncludesMaterialV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_yuzz;1",
+        "@id": "dtmi:example:pi_quan;1",
         "@type": "Interface"
       }
     ]
@@ -20,7 +20,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_wum;1",
+        "@id": "dtmi:example:pi_thnad;1",
         "@type": [
           "Interface"
         ]
@@ -35,7 +35,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_um;1",
+        "@id": "dtmi:example:pi_spazz;1",
         "@type": "dtmi:dtdl:class:Interface;2"
       }
     ]
@@ -48,7 +48,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_humpf;1",
+        "@id": "dtmi:example:pi_floob;1",
         "@type": [
           "dtmi:dtdl:class:Interface;2"
         ]
@@ -63,7 +63,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_fuddle;1",
+        "@id": "dtmi:example:pi_zatz;1",
         "@type": "Something"
       }
     ]
@@ -79,7 +79,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:mu_glikk;1",
+        "@id": "dtmi:example:pi_jogg;1",
         "@type": "Something"
       }
     ]
@@ -92,7 +92,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_nuh;1",
+        "@id": "dtmi:example:pi_flunn;1",
         "@type": [
           "Something"
         ]
@@ -110,7 +110,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:mu_snee;1",
+        "@id": "dtmi:example:pi_itch;1",
         "@type": [
           "Something"
         ]
diff --git a/DTDL/v2/spec/Requirement-ClassInterfaceTypeStringOrArrayV2.json b/DTDL/v2/spec/Requirement-ClassInterfaceTypeStringOrArrayV2.json
index 5054c8f4..aa73b039 100644
--- a/DTDL/v2/spec/Requirement-ClassInterfaceTypeStringOrArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassInterfaceTypeStringOrArrayV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_iota;1",
+        "@id": "dtmi:example:pi_rho;1",
         "@type": 626
       }
     ]
@@ -23,7 +23,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:mu_kappa;1",
+        "@id": "dtmi:example:pi_sigma;1",
         "@type": 626
       }
     ]
@@ -36,7 +36,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_lambda;1",
+        "@id": "dtmi:example:pi_tau;1",
         "@type": null
       }
     ]
@@ -52,7 +52,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:mu_mu;1",
+        "@id": "dtmi:example:pi_upsilon;1",
         "@type": null
       }
     ]
@@ -65,7 +65,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_nu;1",
+        "@id": "dtmi:example:pi_phi;1",
         "@type": true
       }
     ]
@@ -81,7 +81,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:mu_xi;1",
+        "@id": "dtmi:example:pi_chi;1",
         "@type": true
       }
     ]
@@ -94,7 +94,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_omicron;1",
+        "@id": "dtmi:example:pi_psi;1",
         "@type": {}
       }
     ]
@@ -110,7 +110,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:mu_pi;1",
+        "@id": "dtmi:example:pi_omega;1",
         "@type": {}
       }
     ]
@@ -123,7 +123,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_rho;1",
+        "@id": "dtmi:example:pi_yuzz;1",
         "@type": [
           626
         ]
@@ -141,7 +141,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:mu_sigma;1",
+        "@id": "dtmi:example:pi_wum;1",
         "@type": [
           626
         ]
@@ -156,7 +156,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_tau;1",
+        "@id": "dtmi:example:pi_um;1",
         "@type": [
           null
         ]
@@ -174,7 +174,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:mu_upsilon;1",
+        "@id": "dtmi:example:pi_humpf;1",
         "@type": [
           null
         ]
@@ -189,7 +189,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_phi;1",
+        "@id": "dtmi:example:pi_fuddle;1",
         "@type": [
           true
         ]
@@ -207,7 +207,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:mu_chi;1",
+        "@id": "dtmi:example:pi_glikk;1",
         "@type": [
           true
         ]
@@ -222,7 +222,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_psi;1",
+        "@id": "dtmi:example:pi_nuh;1",
         "@type": [
           {}
         ]
@@ -240,7 +240,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:mu_omega;1",
+        "@id": "dtmi:example:pi_snee;1",
         "@type": [
           {}
         ]
diff --git a/DTDL/v2/spec/Requirement-ClassMapContextConformsV2.json b/DTDL/v2/spec/Requirement-ClassMapContextConformsV2.json
index c01e758f..797dc62e 100644
--- a/DTDL/v2/spec/Requirement-ClassMapContextConformsV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapContextConformsV2.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_jogg;1",
+        "@id": "dtmi:example:humpf_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "chi_zatz",
+          "name": "humpf_gamma",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "chi_spazz",
+              "name": "humpf_alpha",
               "schema": "string"
             },
             "mapValue": {
-              "name": "chi_floob",
-              "schema": "date"
+              "name": "humpf_beta",
+              "schema": "long"
             },
             "@context": "dtmi:iotcentral:context;2"
           }
@@ -36,20 +36,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_vroo;1",
+        "@id": "dtmi:example:humpf_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "chi_yekk",
+          "name": "humpf_eta",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "chi_flunn",
+              "name": "humpf_epsilon",
               "schema": "string"
             },
             "mapValue": {
-              "name": "chi_itch",
-              "schema": "dateTime"
+              "name": "humpf_zeta",
+              "schema": "string"
             },
             "@context": []
           }
@@ -65,20 +65,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_gamma;1",
+        "@id": "dtmi:example:humpf_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_beta",
+          "name": "humpf_lambda",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "chi_hi",
+              "name": "humpf_iota",
               "schema": "string"
             },
             "mapValue": {
-              "name": "psi_alpha",
-              "schema": "double"
+              "name": "humpf_kappa",
+              "schema": "time"
             },
             "@context": [
               "dtmi:iotcentral:context;2"
@@ -96,20 +96,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_eta;1",
+        "@id": "dtmi:example:humpf_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_zeta",
+          "name": "humpf_omicron",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "psi_delta",
+              "name": "humpf_nu",
               "schema": "string"
             },
             "mapValue": {
-              "name": "psi_epsilon",
-              "schema": "duration"
+              "name": "humpf_xi",
+              "schema": "boolean"
             },
             "@context": null
           }
@@ -125,20 +125,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_lambda;1",
+        "@id": "dtmi:example:humpf_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_kappa",
+          "name": "humpf_tau",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "psi_theta",
+              "name": "humpf_rho",
               "schema": "string"
             },
             "mapValue": {
-              "name": "psi_iota",
-              "schema": "float"
+              "name": "humpf_sigma",
+              "schema": "date"
             },
             "@context": 626
           }
@@ -154,20 +154,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_omicron;1",
+        "@id": "dtmi:example:humpf_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_xi",
+          "name": "humpf_psi",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "psi_mu",
+              "name": "humpf_phi",
               "schema": "string"
             },
             "mapValue": {
-              "name": "psi_nu",
-              "schema": "integer"
+              "name": "humpf_chi",
+              "schema": "dateTime"
             },
             "@context": true
           }
@@ -183,20 +183,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_tau;1",
+        "@id": "dtmi:example:humpf_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_sigma",
+          "name": "humpf_um",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "psi_pi",
+              "name": "humpf_yuzz",
               "schema": "string"
             },
             "mapValue": {
-              "name": "psi_rho",
-              "schema": "long"
+              "name": "humpf_wum",
+              "schema": "double"
             },
             "@context": [
               null
@@ -214,20 +214,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_psi;1",
+        "@id": "dtmi:example:humpf_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_chi",
+          "name": "humpf_nuh",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "psi_upsilon",
+              "name": "humpf_fuddle",
               "schema": "string"
             },
             "mapValue": {
-              "name": "psi_phi",
-              "schema": "string"
+              "name": "humpf_glikk",
+              "schema": "duration"
             },
             "@context": [
               626
@@ -245,20 +245,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_um;1",
+        "@id": "dtmi:example:humpf_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_wum",
+          "name": "humpf_spazz",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "psi_omega",
+              "name": "humpf_quan",
               "schema": "string"
             },
             "mapValue": {
-              "name": "psi_yuzz",
-              "schema": "time"
+              "name": "humpf_thnad",
+              "schema": "float"
             },
             "@context": [
               true
@@ -276,22 +276,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_nuh;1",
+        "@id": "dtmi:example:humpf_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_glikk",
+          "name": "humpf_flunn",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "psi_humpf",
+              "name": "humpf_zatz",
               "schema": "string"
             },
             "mapValue": {
-              "name": "psi_fuddle",
-              "schema": "boolean"
+              "name": "humpf_jogg",
+              "schema": "integer"
             },
-            "@context": {}
+            "@context": "dtmi:iotcentral:context"
           }
         }
       }
@@ -305,24 +305,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_spazz;1",
+        "@id": "dtmi:example:fuddle_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_thnad",
+          "name": "humpf_hi",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "psi_snee",
+              "name": "humpf_yekk",
               "schema": "string"
             },
             "mapValue": {
-              "name": "psi_quan",
-              "schema": "date"
+              "name": "humpf_vroo",
+              "schema": "long"
             },
-            "@context": [
-              {}
-            ]
+            "@context": "http://iotcentral/context/2"
           }
         }
       }
@@ -336,22 +334,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_flunn;1",
+        "@id": "dtmi:example:fuddle_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_jogg",
+          "name": "fuddle_delta",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "psi_floob",
+              "name": "fuddle_beta",
               "schema": "string"
             },
             "mapValue": {
-              "name": "psi_zatz",
-              "schema": "dateTime"
+              "name": "fuddle_gamma",
+              "schema": "string"
             },
-            "@context": "dtmi:iotcentral:context"
+            "@context": "iotcentral;2"
           }
         }
       }
@@ -365,22 +363,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_hi;1",
+        "@id": "dtmi:example:fuddle_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_vroo",
+          "name": "fuddle_theta",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "psi_itch",
+              "name": "fuddle_zeta",
               "schema": "string"
             },
             "mapValue": {
-              "name": "psi_yekk",
-              "schema": "double"
+              "name": "fuddle_eta",
+              "schema": "time"
             },
-            "@context": "http://iotcentral/context/2"
+            "@context": {}
           }
         }
       }
@@ -394,22 +392,88 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_delta;1",
+        "@id": "dtmi:example:fuddle_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_gamma",
+          "name": "fuddle_mu",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "omega_alpha",
+              "name": "fuddle_kappa",
               "schema": "string"
             },
             "mapValue": {
-              "name": "omega_beta",
-              "schema": "duration"
+              "name": "fuddle_lambda",
+              "schema": "boolean"
             },
-            "@context": "iotcentral;2"
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:fuddle_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "fuddle_pi",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "fuddle_xi",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "fuddle_omicron",
+              "schema": "date"
+            },
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:fuddle_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "fuddle_upsilon",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "fuddle_sigma",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "fuddle_tau",
+              "schema": "dateTime"
+            },
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassMapGraphKeywordV2.json b/DTDL/v2/spec/Requirement-ClassMapGraphKeywordV2.json
index e163ab03..a6c97257 100644
--- a/DTDL/v2/spec/Requirement-ClassMapGraphKeywordV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapGraphKeywordV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_tau;1",
+        "@id": "dtmi:example:hi_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_pi;1",
+          "@id": "dtmi:example:hi_quan;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_rho",
+            "name": "hi_thnad",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_sigma",
-            "schema": "boolean"
+            "name": "hi_spazz",
+            "schema": "string"
           },
           "@graph": {}
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_psi;1",
+        "@id": "dtmi:example:hi_itch;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:jogg_upsilon;1",
+          "@id": "dtmi:example:hi_zatz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_phi",
+            "name": "hi_jogg",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_chi",
-            "schema": "date"
+            "name": "hi_flunn",
+            "schema": "time"
           },
           "@graph": {}
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapIdDuplicateV2.json b/DTDL/v2/spec/Requirement-ClassMapIdDuplicateV2.json
index afffe48d..81579d44 100644
--- a/DTDL/v2/spec/Requirement-ClassMapIdDuplicateV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapIdDuplicateV2.json
@@ -7,22 +7,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_beta;1",
+        "@id": "dtmi:example:thnad_tau;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:fuddle_beta;1",
+          "@id": "dtmi:example:thnad_tau;1",
           "@type": "Property",
-          "name": "fuddle_epsilon",
+          "name": "thnad_chi",
           "schema": {
-            "@id": "dtmi:example:fuddle_beta;1",
+            "@id": "dtmi:example:thnad_tau;1",
             "@type": "Map",
             "mapKey": {
-              "name": "fuddle_gamma",
+              "name": "thnad_upsilon",
               "schema": "string"
             },
             "mapValue": {
-              "name": "fuddle_delta",
-              "schema": "float"
+              "name": "thnad_phi",
+              "schema": "double"
             }
           }
         }
@@ -37,23 +37,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_zeta;1",
+        "@id": "dtmi:example:thnad_psi;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:fuddle_zeta;1",
+          "@id": "dtmi:example:thnad_psi;1",
           "@type": "Property",
-          "name": "fuddle_iota",
+          "name": "thnad_wum",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "@id": "dtmi:example:fuddle_zeta;1",
+            "@id": "dtmi:example:thnad_psi;1",
             "@type": "Map",
             "mapKey": {
-              "name": "fuddle_eta",
+              "name": "thnad_omega",
               "schema": "string"
             },
             "mapValue": {
-              "name": "fuddle_theta",
-              "schema": "integer"
+              "name": "thnad_yuzz",
+              "schema": "duration"
             }
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapIdIsDtmiV2.json b/DTDL/v2/spec/Requirement-ClassMapIdIsDtmiV2.json
index 2d11d078..655b5b52 100644
--- a/DTDL/v2/spec/Requirement-ClassMapIdIsDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapIdIsDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_phi;1",
+        "@id": "dtmi:example:fuddle_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;7",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_tau",
+            "name": "fuddle_floob",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omega_upsilon",
-            "schema": "time"
+            "name": "fuddle_zatz",
+            "schema": "long"
           }
         }
       }
@@ -32,18 +32,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_omega;1",
+        "@id": "dtmi:example:fuddle_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;108675309",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_chi",
+            "name": "fuddle_flunn",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omega_psi",
-            "schema": "boolean"
+            "name": "fuddle_itch",
+            "schema": "string"
           }
         }
       }
@@ -57,18 +57,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_um;1",
+        "@id": "dtmi:example:glikk_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;999999999",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_yuzz",
+            "name": "fuddle_vroo",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omega_wum",
-            "schema": "date"
+            "name": "fuddle_hi",
+            "schema": "time"
           }
         }
       }
@@ -82,18 +82,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_glikk;1",
+        "@id": "dtmi:example:glikk_delta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_humpf",
+            "name": "glikk_beta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omega_fuddle",
-            "schema": "dateTime"
+            "name": "glikk_gamma",
+            "schema": "boolean"
           }
         }
       }
@@ -107,18 +107,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_quan;1",
+        "@id": "dtmi:example:glikk_eta;1",
         "@type": "Interface",
         "schemas": {
           "@id": null,
           "@type": "Map",
           "mapKey": {
-            "name": "omega_nuh",
+            "name": "glikk_epsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omega_snee",
-            "schema": "double"
+            "name": "glikk_zeta",
+            "schema": "date"
           }
         }
       }
@@ -132,19 +132,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_floob;1",
+        "@id": "dtmi:example:glikk_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": null,
           "@type": "Map",
           "mapKey": {
-            "name": "omega_thnad",
+            "name": "glikk_theta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omega_spazz",
-            "schema": "duration"
+            "name": "glikk_iota",
+            "schema": "dateTime"
           }
         }
       }
@@ -158,18 +158,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_flunn;1",
+        "@id": "dtmi:example:glikk_nu;1",
         "@type": "Interface",
         "schemas": {
           "@id": 626,
           "@type": "Map",
           "mapKey": {
-            "name": "omega_zatz",
+            "name": "glikk_lambda",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omega_jogg",
-            "schema": "float"
+            "name": "glikk_mu",
+            "schema": "double"
           }
         }
       }
@@ -183,19 +183,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_vroo;1",
+        "@id": "dtmi:example:glikk_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": 626,
           "@type": "Map",
           "mapKey": {
-            "name": "omega_itch",
+            "name": "glikk_xi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omega_yekk",
-            "schema": "integer"
+            "name": "glikk_omicron",
+            "schema": "duration"
           }
         }
       }
@@ -209,18 +209,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_beta;1",
+        "@id": "dtmi:example:glikk_tau;1",
         "@type": "Interface",
         "schemas": {
           "@id": true,
           "@type": "Map",
           "mapKey": {
-            "name": "omega_hi",
+            "name": "glikk_rho",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yuzz_alpha",
-            "schema": "long"
+            "name": "glikk_sigma",
+            "schema": "float"
           }
         }
       }
@@ -234,19 +234,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_epsilon;1",
+        "@id": "dtmi:example:glikk_chi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": true,
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_gamma",
+            "name": "glikk_upsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yuzz_delta",
-            "schema": "string"
+            "name": "glikk_phi",
+            "schema": "integer"
           }
         }
       }
@@ -260,7 +260,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_theta;1",
+        "@id": "dtmi:example:glikk_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@id": {
@@ -268,12 +268,12 @@
           },
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_zeta",
+            "name": "glikk_psi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yuzz_eta",
-            "schema": "time"
+            "name": "glikk_omega",
+            "schema": "long"
           }
         }
       }
@@ -287,7 +287,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_lambda;1",
+        "@id": "dtmi:example:glikk_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -296,12 +296,12 @@
           },
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_iota",
+            "name": "glikk_wum",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yuzz_kappa",
-            "schema": "boolean"
+            "name": "glikk_um",
+            "schema": "string"
           }
         }
       }
@@ -315,18 +315,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_xi;1",
+        "@id": "dtmi:example:glikk_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;0",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_mu",
+            "name": "glikk_fuddle",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yuzz_nu",
-            "schema": "date"
+            "name": "glikk_glikk",
+            "schema": "time"
           }
         }
       }
@@ -340,19 +340,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_rho;1",
+        "@id": "dtmi:example:glikk_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_omicron",
+            "name": "glikk_snee",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yuzz_pi",
-            "schema": "dateTime"
+            "name": "glikk_quan",
+            "schema": "boolean"
           }
         }
       }
@@ -366,18 +366,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_upsilon;1",
+        "@id": "dtmi:example:glikk_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_sigma",
+            "name": "glikk_spazz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yuzz_tau",
-            "schema": "double"
+            "name": "glikk_floob",
+            "schema": "date"
           }
         }
       }
@@ -391,19 +391,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_psi;1",
+        "@id": "dtmi:example:glikk_itch;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_phi",
+            "name": "glikk_jogg",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yuzz_chi",
-            "schema": "duration"
+            "name": "glikk_flunn",
+            "schema": "dateTime"
           }
         }
       }
@@ -417,18 +417,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_wum;1",
+        "@id": "dtmi:example:glikk_hi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_omega",
+            "name": "glikk_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yuzz_yuzz",
-            "schema": "float"
+            "name": "glikk_vroo",
+            "schema": "double"
           }
         }
       }
@@ -442,19 +442,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_fuddle;1",
+        "@id": "dtmi:example:nuh_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_um",
+            "name": "nuh_alpha",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yuzz_humpf",
-            "schema": "integer"
+            "name": "nuh_beta",
+            "schema": "duration"
           }
         }
       }
@@ -468,18 +468,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_snee;1",
+        "@id": "dtmi:example:nuh_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;1a",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_glikk",
+            "name": "nuh_delta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yuzz_nuh",
-            "schema": "long"
+            "name": "nuh_epsilon",
+            "schema": "float"
           }
         }
       }
@@ -493,19 +493,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_spazz;1",
+        "@id": "dtmi:example:nuh_iota;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1a",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_quan",
+            "name": "nuh_eta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yuzz_thnad",
-            "schema": "string"
+            "name": "nuh_theta",
+            "schema": "integer"
           }
         }
       }
@@ -519,18 +519,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_jogg;1",
+        "@id": "dtmi:example:nuh_mu;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_floob",
+            "name": "nuh_kappa",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yuzz_zatz",
-            "schema": "time"
+            "name": "nuh_lambda",
+            "schema": "long"
           }
         }
       }
@@ -544,19 +544,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_yekk;1",
+        "@id": "dtmi:example:nuh_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_flunn",
+            "name": "nuh_nu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yuzz_itch",
-            "schema": "boolean"
+            "name": "nuh_xi",
+            "schema": "string"
           }
         }
       }
@@ -570,18 +570,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_alpha;1",
+        "@id": "dtmi:example:nuh_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_vroo",
+            "name": "nuh_pi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yuzz_hi",
-            "schema": "date"
+            "name": "nuh_rho",
+            "schema": "time"
           }
         }
       }
@@ -595,19 +595,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_delta;1",
+        "@id": "dtmi:example:nuh_phi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_beta",
+            "name": "nuh_tau",
             "schema": "string"
           },
           "mapValue": {
-            "name": "wum_gamma",
-            "schema": "dateTime"
+            "name": "nuh_upsilon",
+            "schema": "boolean"
           }
         }
       }
@@ -621,18 +621,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_eta;1",
+        "@id": "dtmi:example:nuh_omega;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_epsilon",
+            "name": "nuh_chi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "wum_zeta",
-            "schema": "double"
+            "name": "nuh_psi",
+            "schema": "date"
           }
         }
       }
@@ -646,19 +646,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_kappa;1",
+        "@id": "dtmi:example:nuh_um;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_theta",
+            "name": "nuh_yuzz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "wum_iota",
-            "schema": "duration"
+            "name": "nuh_wum",
+            "schema": "dateTime"
           }
         }
       }
@@ -672,18 +672,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_nu;1",
+        "@id": "dtmi:example:nuh_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_lambda",
+            "name": "nuh_humpf",
             "schema": "string"
           },
           "mapValue": {
-            "name": "wum_mu",
-            "schema": "float"
+            "name": "nuh_fuddle",
+            "schema": "double"
           }
         }
       }
@@ -697,19 +697,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_pi;1",
+        "@id": "dtmi:example:nuh_quan;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_xi",
+            "name": "nuh_nuh",
             "schema": "string"
           },
           "mapValue": {
-            "name": "wum_omicron",
-            "schema": "integer"
+            "name": "nuh_snee",
+            "schema": "duration"
           }
         }
       }
@@ -723,18 +723,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_tau;1",
+        "@id": "dtmi:example:nuh_floob;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;01",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_rho",
+            "name": "nuh_thnad",
             "schema": "string"
           },
           "mapValue": {
-            "name": "wum_sigma",
-            "schema": "long"
+            "name": "nuh_spazz",
+            "schema": "float"
           }
         }
       }
@@ -748,19 +748,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_chi;1",
+        "@id": "dtmi:example:nuh_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;01",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_upsilon",
+            "name": "nuh_zatz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "wum_phi",
-            "schema": "string"
+            "name": "nuh_jogg",
+            "schema": "integer"
           }
         }
       }
@@ -774,18 +774,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_yuzz;1",
+        "@id": "dtmi:example:nuh_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_psi",
+            "name": "nuh_itch",
             "schema": "string"
           },
           "mapValue": {
-            "name": "wum_omega",
-            "schema": "time"
+            "name": "nuh_yekk",
+            "schema": "long"
           }
         }
       }
@@ -799,19 +799,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_humpf;1",
+        "@id": "dtmi:example:snee_beta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_wum",
+            "name": "nuh_hi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "wum_um",
-            "schema": "boolean"
+            "name": "snee_alpha",
+            "schema": "string"
           }
         }
       }
@@ -825,18 +825,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_nuh;1",
+        "@id": "dtmi:example:snee_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_fuddle",
+            "name": "snee_gamma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "wum_glikk",
-            "schema": "date"
+            "name": "snee_delta",
+            "schema": "time"
           }
         }
       }
@@ -850,19 +850,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_thnad;1",
+        "@id": "dtmi:example:snee_theta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_snee",
+            "name": "snee_zeta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "wum_quan",
-            "schema": "dateTime"
+            "name": "snee_eta",
+            "schema": "boolean"
           }
         }
       }
@@ -876,18 +876,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_zatz;1",
+        "@id": "dtmi:example:snee_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_spazz",
+            "name": "snee_iota",
             "schema": "string"
           },
           "mapValue": {
-            "name": "wum_floob",
-            "schema": "double"
+            "name": "snee_kappa",
+            "schema": "date"
           }
         }
       }
@@ -901,19 +901,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_itch;1",
+        "@id": "dtmi:example:snee_xi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_jogg",
+            "name": "snee_mu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "wum_flunn",
-            "schema": "duration"
+            "name": "snee_nu",
+            "schema": "dateTime"
           }
         }
       }
@@ -927,18 +927,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_hi;1",
+        "@id": "dtmi:example:snee_rho;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:test:1seg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_yekk",
+            "name": "snee_omicron",
             "schema": "string"
           },
           "mapValue": {
-            "name": "wum_vroo",
-            "schema": "float"
+            "name": "snee_pi",
+            "schema": "double"
           }
         }
       }
@@ -952,19 +952,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_gamma;1",
+        "@id": "dtmi:example:snee_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:1seg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "um_alpha",
+            "name": "snee_sigma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_beta",
-            "schema": "integer"
+            "name": "snee_tau",
+            "schema": "duration"
           }
         }
       }
@@ -978,18 +978,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_zeta;1",
+        "@id": "dtmi:example:snee_psi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "um_delta",
+            "name": "snee_phi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_epsilon",
-            "schema": "long"
+            "name": "snee_chi",
+            "schema": "float"
           }
         }
       }
@@ -1003,19 +1003,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_iota;1",
+        "@id": "dtmi:example:snee_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "um_eta",
+            "name": "snee_omega",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_theta",
-            "schema": "string"
+            "name": "snee_yuzz",
+            "schema": "integer"
           }
         }
       }
@@ -1029,18 +1029,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_mu;1",
+        "@id": "dtmi:example:snee_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo::bar;1",
           "@type": "Map",
           "mapKey": {
-            "name": "um_kappa",
+            "name": "snee_um",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_lambda",
-            "schema": "time"
+            "name": "snee_humpf",
+            "schema": "long"
           }
         }
       }
@@ -1054,19 +1054,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_omicron;1",
+        "@id": "dtmi:example:snee_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo::bar;1",
           "@type": "Map",
           "mapKey": {
-            "name": "um_nu",
+            "name": "snee_glikk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_xi",
-            "schema": "boolean"
+            "name": "snee_nuh",
+            "schema": "string"
           }
         }
       }
@@ -1080,18 +1080,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_sigma;1",
+        "@id": "dtmi:example:snee_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@id": "urn:foo:bar:1",
           "@type": "Map",
           "mapKey": {
-            "name": "um_pi",
+            "name": "snee_quan",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_rho",
-            "schema": "date"
+            "name": "snee_thnad",
+            "schema": "time"
           }
         }
       }
@@ -1105,19 +1105,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_phi;1",
+        "@id": "dtmi:example:snee_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "urn:foo:bar:1",
           "@type": "Map",
           "mapKey": {
-            "name": "um_tau",
+            "name": "snee_floob",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_upsilon",
-            "schema": "dateTime"
+            "name": "snee_zatz",
+            "schema": "boolean"
           }
         }
       }
@@ -1131,18 +1131,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_omega;1",
+        "@id": "dtmi:example:snee_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@id": "http://foo/bar/baz",
           "@type": "Map",
           "mapKey": {
-            "name": "um_chi",
+            "name": "snee_flunn",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_psi",
-            "schema": "double"
+            "name": "snee_itch",
+            "schema": "date"
           }
         }
       }
@@ -1156,19 +1156,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_um;1",
+        "@id": "dtmi:example:quan_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "http://foo/bar/baz",
           "@type": "Map",
           "mapKey": {
-            "name": "um_yuzz",
+            "name": "snee_vroo",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_wum",
-            "schema": "duration"
+            "name": "snee_hi",
+            "schema": "dateTime"
           }
         }
       }
@@ -1182,18 +1182,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_glikk;1",
+        "@id": "dtmi:example:quan_delta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:;1",
           "@type": "Map",
           "mapKey": {
-            "name": "um_humpf",
+            "name": "quan_beta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_fuddle",
-            "schema": "float"
+            "name": "quan_gamma",
+            "schema": "double"
           }
         }
       }
@@ -1207,19 +1207,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_quan;1",
+        "@id": "dtmi:example:quan_eta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:;1",
           "@type": "Map",
           "mapKey": {
-            "name": "um_nuh",
+            "name": "quan_epsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_snee",
-            "schema": "integer"
+            "name": "quan_zeta",
+            "schema": "duration"
           }
         }
       }
@@ -1233,18 +1233,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_floob;1",
+        "@id": "dtmi:example:quan_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar",
           "@type": "Map",
           "mapKey": {
-            "name": "um_thnad",
+            "name": "quan_theta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_spazz",
-            "schema": "long"
+            "name": "quan_iota",
+            "schema": "float"
           }
         }
       }
@@ -1258,19 +1258,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_flunn;1",
+        "@id": "dtmi:example:quan_nu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar",
           "@type": "Map",
           "mapKey": {
-            "name": "um_zatz",
+            "name": "quan_lambda",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_jogg",
-            "schema": "string"
+            "name": "quan_mu",
+            "schema": "integer"
           }
         }
       }
@@ -1284,18 +1284,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_vroo;1",
+        "@id": "dtmi:example:quan_pi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.14",
           "@type": "Map",
           "mapKey": {
-            "name": "um_itch",
+            "name": "quan_xi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_yekk",
-            "schema": "time"
+            "name": "quan_omicron",
+            "schema": "long"
           }
         }
       }
@@ -1309,19 +1309,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_beta;1",
+        "@id": "dtmi:example:quan_tau;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.14",
           "@type": "Map",
           "mapKey": {
-            "name": "um_hi",
+            "name": "quan_rho",
             "schema": "string"
           },
           "mapValue": {
-            "name": "humpf_alpha",
-            "schema": "boolean"
+            "name": "quan_sigma",
+            "schema": "string"
           }
         }
       }
@@ -1335,18 +1335,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_epsilon;1",
+        "@id": "dtmi:example:quan_chi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.141592",
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_gamma",
+            "name": "quan_upsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "humpf_delta",
-            "schema": "date"
+            "name": "quan_phi",
+            "schema": "time"
           }
         }
       }
@@ -1360,19 +1360,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_theta;1",
+        "@id": "dtmi:example:quan_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.141592",
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_zeta",
+            "name": "quan_psi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "humpf_eta",
-            "schema": "dateTime"
+            "name": "quan_omega",
+            "schema": "boolean"
           }
         }
       }
@@ -1386,18 +1386,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_lambda;1",
+        "@id": "dtmi:example:quan_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:dtdl:example;1",
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_iota",
+            "name": "quan_wum",
             "schema": "string"
           },
           "mapValue": {
-            "name": "humpf_kappa",
-            "schema": "double"
+            "name": "quan_um",
+            "schema": "date"
           }
         }
       }
@@ -1411,19 +1411,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_xi;1",
+        "@id": "dtmi:example:quan_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:dtdl:example;1",
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_mu",
+            "name": "quan_fuddle",
             "schema": "string"
           },
           "mapValue": {
-            "name": "humpf_nu",
-            "schema": "duration"
+            "name": "quan_glikk",
+            "schema": "dateTime"
           }
         }
       }
@@ -1437,18 +1437,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_rho;1",
+        "@id": "dtmi:example:quan_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:standard:example;1",
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_omicron",
+            "name": "quan_snee",
             "schema": "string"
           },
           "mapValue": {
-            "name": "humpf_pi",
-            "schema": "float"
+            "name": "quan_quan",
+            "schema": "double"
           }
         }
       }
@@ -1462,19 +1462,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_upsilon;1",
+        "@id": "dtmi:example:quan_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:standard:example;1",
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_sigma",
+            "name": "quan_spazz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "humpf_tau",
-            "schema": "integer"
+            "name": "quan_floob",
+            "schema": "duration"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassMapIdNotArrayV2.json b/DTDL/v2/spec/Requirement-ClassMapIdNotArrayV2.json
index b4e77cb2..338cb943 100644
--- a/DTDL/v2/spec/Requirement-ClassMapIdNotArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapIdNotArrayV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_psi;1",
+        "@id": "dtmi:example:quan_itch;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -15,12 +15,12 @@
           ],
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_phi",
+            "name": "quan_jogg",
             "schema": "string"
           },
           "mapValue": {
-            "name": "humpf_chi",
-            "schema": "long"
+            "name": "quan_flunn",
+            "schema": "float"
           }
         }
       }
@@ -34,7 +34,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_wum;1",
+        "@id": "dtmi:example:quan_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -43,12 +43,12 @@
           ],
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_omega",
+            "name": "quan_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "humpf_yuzz",
-            "schema": "string"
+            "name": "quan_vroo",
+            "schema": "integer"
           }
         }
       }
@@ -62,7 +62,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_fuddle;1",
+        "@id": "dtmi:example:thnad_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -70,12 +70,12 @@
           ],
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_um",
+            "name": "thnad_alpha",
             "schema": "string"
           },
           "mapValue": {
-            "name": "humpf_humpf",
-            "schema": "time"
+            "name": "thnad_beta",
+            "schema": "long"
           }
         }
       }
@@ -89,7 +89,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_snee;1",
+        "@id": "dtmi:example:thnad_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -98,12 +98,12 @@
           ],
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_glikk",
+            "name": "thnad_delta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "humpf_nuh",
-            "schema": "boolean"
+            "name": "thnad_epsilon",
+            "schema": "string"
           }
         }
       }
@@ -117,7 +117,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_spazz;1",
+        "@id": "dtmi:example:thnad_iota;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -125,12 +125,12 @@
           ],
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_quan",
+            "name": "thnad_eta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "humpf_thnad",
-            "schema": "date"
+            "name": "thnad_theta",
+            "schema": "time"
           }
         }
       }
@@ -144,7 +144,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_jogg;1",
+        "@id": "dtmi:example:thnad_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -153,12 +153,12 @@
           ],
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_floob",
+            "name": "thnad_kappa",
             "schema": "string"
           },
           "mapValue": {
-            "name": "humpf_zatz",
-            "schema": "dateTime"
+            "name": "thnad_lambda",
+            "schema": "boolean"
           }
         }
       }
@@ -172,7 +172,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_yekk;1",
+        "@id": "dtmi:example:thnad_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -180,12 +180,12 @@
           ],
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_flunn",
+            "name": "thnad_nu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "humpf_itch",
-            "schema": "double"
+            "name": "thnad_xi",
+            "schema": "date"
           }
         }
       }
@@ -199,7 +199,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_alpha;1",
+        "@id": "dtmi:example:thnad_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -208,12 +208,12 @@
           ],
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_vroo",
+            "name": "thnad_pi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "humpf_hi",
-            "schema": "duration"
+            "name": "thnad_rho",
+            "schema": "dateTime"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassMapIdRequiredV2.json b/DTDL/v2/spec/Requirement-ClassMapIdRequiredV2.json
index 42d75309..04b0e395 100644
--- a/DTDL/v2/spec/Requirement-ClassMapIdRequiredV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapIdRequiredV2.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_theta;1",
+        "@id": "dtmi:example:fuddle_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_eta",
+          "name": "fuddle_omega",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "omega_epsilon",
+              "name": "fuddle_chi",
               "schema": "string"
             },
             "mapValue": {
-              "name": "omega_zeta",
-              "schema": "float"
+              "name": "fuddle_psi",
+              "schema": "double"
             }
           }
         }
@@ -35,18 +35,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_mu;1",
+        "@id": "dtmi:example:fuddle_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_iota;1",
+          "@id": "dtmi:example:fuddle_wum;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_kappa",
+            "name": "fuddle_um",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omega_lambda",
-            "schema": "integer"
+            "name": "fuddle_humpf",
+            "schema": "duration"
           }
         }
       }
@@ -60,17 +60,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_omicron;1",
+        "@id": "dtmi:example:fuddle_snee;1",
         "@type": "Interface",
         "schemas": {
           "@type": "Map",
           "mapKey": {
-            "name": "omega_nu",
+            "name": "fuddle_glikk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omega_xi",
-            "schema": "long"
+            "name": "fuddle_nuh",
+            "schema": "float"
           }
         }
       }
@@ -84,18 +84,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_sigma;1",
+        "@id": "dtmi:example:fuddle_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_pi",
+            "name": "fuddle_quan",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omega_rho",
-            "schema": "string"
+            "name": "fuddle_thnad",
+            "schema": "integer"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyContextConformsV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyContextConformsV2.json
index 151a3a96..46b8703c 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyContextConformsV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyContextConformsV2.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_zeta;1",
+        "@id": "dtmi:example:rho_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_epsilon",
+          "name": "rho_chi",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "mu_delta",
-              "schema": "dateTime"
+              "name": "rho_phi",
+              "schema": "boolean"
             },
             "mapKey": {
-              "name": "mu_gamma",
+              "name": "rho_upsilon",
               "schema": "string",
               "@context": "dtmi:iotcentral:context;2"
             }
@@ -36,19 +36,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_kappa;1",
+        "@id": "dtmi:example:rho_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_iota",
+          "name": "rho_wum",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "mu_theta",
-              "schema": "double"
+              "name": "rho_yuzz",
+              "schema": "date"
             },
             "mapKey": {
-              "name": "mu_eta",
+              "name": "rho_omega",
               "schema": "string",
               "@context": []
             }
@@ -65,19 +65,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_xi;1",
+        "@id": "dtmi:example:rho_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_nu",
+          "name": "rho_glikk",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "mu_mu",
-              "schema": "duration"
+              "name": "rho_fuddle",
+              "schema": "dateTime"
             },
             "mapKey": {
-              "name": "mu_lambda",
+              "name": "rho_humpf",
               "schema": "string",
               "@context": [
                 "dtmi:iotcentral:context;2"
@@ -96,19 +96,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_sigma;1",
+        "@id": "dtmi:example:rho_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_rho",
+          "name": "rho_thnad",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "mu_pi",
-              "schema": "float"
+              "name": "rho_quan",
+              "schema": "double"
             },
             "mapKey": {
-              "name": "mu_omicron",
+              "name": "rho_snee",
               "schema": "string",
               "@context": null
             }
@@ -125,19 +125,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_chi;1",
+        "@id": "dtmi:example:rho_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_phi",
+          "name": "rho_jogg",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "mu_upsilon",
-              "schema": "integer"
+              "name": "rho_zatz",
+              "schema": "duration"
             },
             "mapKey": {
-              "name": "mu_tau",
+              "name": "rho_floob",
               "schema": "string",
               "@context": 626
             }
@@ -154,19 +154,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_wum;1",
+        "@id": "dtmi:example:rho_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_yuzz",
+          "name": "rho_vroo",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "mu_omega",
-              "schema": "long"
+              "name": "rho_yekk",
+              "schema": "float"
             },
             "mapKey": {
-              "name": "mu_psi",
+              "name": "rho_itch",
               "schema": "string",
               "@context": true
             }
@@ -183,19 +183,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_glikk;1",
+        "@id": "dtmi:example:sigma_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_fuddle",
+          "name": "sigma_gamma",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "mu_humpf",
-              "schema": "string"
+              "name": "sigma_beta",
+              "schema": "integer"
             },
             "mapKey": {
-              "name": "mu_um",
+              "name": "sigma_alpha",
               "schema": "string",
               "@context": [
                 null
@@ -214,19 +214,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_thnad;1",
+        "@id": "dtmi:example:sigma_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_quan",
+          "name": "sigma_eta",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "mu_snee",
-              "schema": "time"
+              "name": "sigma_zeta",
+              "schema": "long"
             },
             "mapKey": {
-              "name": "mu_nuh",
+              "name": "sigma_epsilon",
               "schema": "string",
               "@context": [
                 626
@@ -245,19 +245,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_jogg;1",
+        "@id": "dtmi:example:sigma_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_zatz",
+          "name": "sigma_lambda",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "mu_floob",
-              "schema": "boolean"
+              "name": "sigma_kappa",
+              "schema": "string"
             },
             "mapKey": {
-              "name": "mu_spazz",
+              "name": "sigma_iota",
               "schema": "string",
               "@context": [
                 true
@@ -276,21 +276,79 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_vroo;1",
+        "@id": "dtmi:example:sigma_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "sigma_omicron",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "sigma_xi",
+              "schema": "time"
+            },
+            "mapKey": {
+              "name": "sigma_nu",
+              "schema": "string",
+              "@context": "dtmi:iotcentral:context"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:sigma_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_yekk",
+          "name": "sigma_tau",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "mu_itch",
+              "name": "sigma_sigma",
+              "schema": "boolean"
+            },
+            "mapKey": {
+              "name": "sigma_rho",
+              "schema": "string",
+              "@context": "http://iotcentral/context/2"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:sigma_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "sigma_psi",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "sigma_chi",
               "schema": "date"
             },
             "mapKey": {
-              "name": "mu_flunn",
+              "name": "sigma_phi",
               "schema": "string",
-              "@context": {}
+              "@context": "iotcentral;2"
             }
           }
         }
@@ -305,23 +363,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_gamma;1",
+        "@id": "dtmi:example:sigma_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nu_beta",
+          "name": "sigma_um",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "nu_alpha",
+              "name": "sigma_wum",
               "schema": "dateTime"
             },
             "mapKey": {
-              "name": "mu_hi",
+              "name": "sigma_yuzz",
               "schema": "string",
-              "@context": [
-                {}
-              ]
+              "@context": {}
             }
           }
         }
@@ -336,21 +392,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_eta;1",
+        "@id": "dtmi:example:sigma_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nu_zeta",
+          "name": "sigma_nuh",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "nu_epsilon",
+              "name": "sigma_glikk",
               "schema": "double"
             },
             "mapKey": {
-              "name": "nu_delta",
+              "name": "sigma_fuddle",
               "schema": "string",
-              "@context": "dtmi:iotcentral:context"
+              "@context": {
+                "foo": "dtmi:foo:bar;1"
+              }
             }
           }
         }
@@ -365,21 +423,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_lambda;1",
+        "@id": "dtmi:example:sigma_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nu_kappa",
+          "name": "sigma_spazz",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "nu_iota",
+              "name": "sigma_thnad",
               "schema": "duration"
             },
             "mapKey": {
-              "name": "nu_theta",
+              "name": "sigma_quan",
               "schema": "string",
-              "@context": "http://iotcentral/context/2"
+              "@context": [
+                {}
+              ]
             }
           }
         }
@@ -394,21 +454,25 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_omicron;1",
+        "@id": "dtmi:example:sigma_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nu_xi",
+          "name": "sigma_flunn",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "nu_nu",
+              "name": "sigma_jogg",
               "schema": "float"
             },
             "mapKey": {
-              "name": "nu_mu",
+              "name": "sigma_zatz",
               "schema": "string",
-              "@context": "iotcentral;2"
+              "@context": [
+                {
+                  "foo": "dtmi:foo:bar;1"
+                }
+              ]
             }
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyGraphKeywordV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyGraphKeywordV2.json
index be1f646c..26317b07 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyGraphKeywordV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyGraphKeywordV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_omicron;1",
+        "@id": "dtmi:example:zatz_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_nu;1",
+          "@id": "dtmi:example:zatz_jogg;1",
           "@type": "Map",
           "mapValue": {
-            "name": "snee_xi",
+            "name": "zatz_flunn",
             "schema": "duration"
           },
           "mapKey": {
-            "name": "snee_mu",
+            "name": "zatz_zatz",
             "schema": "string",
             "@graph": {}
           }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_tau;1",
+        "@id": "dtmi:example:jogg_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_rho;1",
+          "@id": "dtmi:example:zatz_vroo;1",
           "@type": "Map",
           "mapValue": {
-            "name": "snee_sigma",
+            "name": "zatz_hi",
             "schema": "float"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "snee_pi",
+            "name": "zatz_yekk",
             "schema": "string",
             "@graph": {}
           }
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyIdDuplicateV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyIdDuplicateV2.json
index 56ea8e63..eb5f58b1 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyIdDuplicateV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyIdDuplicateV2.json
@@ -7,22 +7,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_yekk;1",
+        "@id": "dtmi:example:humpf_psi;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:chi_yekk;1",
+          "@id": "dtmi:example:humpf_psi;1",
           "@type": "Property",
-          "name": "psi_alpha",
+          "name": "humpf_wum",
           "schema": {
-            "@id": "dtmi:example:chi_yekk;1",
+            "@id": "dtmi:example:humpf_psi;1",
             "@type": "Map",
             "mapValue": {
-              "name": "chi_hi",
+              "name": "humpf_yuzz",
               "schema": "time"
             },
             "mapKey": {
-              "@id": "dtmi:example:chi_yekk;1",
-              "name": "chi_vroo",
+              "@id": "dtmi:example:humpf_psi;1",
+              "name": "humpf_omega",
               "schema": "string"
             }
           }
@@ -38,23 +38,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_beta;1",
+        "@id": "dtmi:example:humpf_um;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:psi_beta;1",
+          "@id": "dtmi:example:humpf_um;1",
           "@type": "Property",
-          "name": "psi_epsilon",
+          "name": "humpf_glikk",
           "schema": {
-            "@id": "dtmi:example:psi_beta;1",
+            "@id": "dtmi:example:humpf_um;1",
             "@type": "Map",
             "mapValue": {
-              "name": "psi_delta",
+              "name": "humpf_fuddle",
               "schema": "boolean"
             },
             "mapKey": {
               "@context": "dtmi:undefinedExtension:context;1",
-              "@id": "dtmi:example:psi_beta;1",
-              "name": "psi_gamma",
+              "@id": "dtmi:example:humpf_um;1",
+              "name": "humpf_humpf",
               "schema": "string"
             }
           }
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyIdIsDtmiV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyIdIsDtmiV2.json
index 511f5f17..16bb4929 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyIdIsDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyIdIsDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_jogg;1",
+        "@id": "dtmi:example:chi_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_floob;1",
+          "@id": "dtmi:example:chi_sigma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_zatz",
+            "name": "chi_tau",
             "schema": "double"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;7",
-            "name": "pi_spazz",
+            "name": "chi_rho",
             "schema": "string"
           }
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_vroo;1",
+        "@id": "dtmi:example:chi_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_itch;1",
+          "@id": "dtmi:example:chi_chi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_yekk",
+            "name": "chi_psi",
             "schema": "duration"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;108675309",
-            "name": "pi_flunn",
+            "name": "chi_phi",
             "schema": "string"
           }
         }
@@ -59,18 +59,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_gamma;1",
+        "@id": "dtmi:example:chi_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_alpha;1",
+          "@id": "dtmi:example:chi_wum;1",
           "@type": "Map",
           "mapValue": {
-            "name": "rho_beta",
+            "name": "chi_um",
             "schema": "float"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;999999999",
-            "name": "pi_hi",
+            "name": "chi_yuzz",
             "schema": "string"
           }
         }
@@ -85,18 +85,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_eta;1",
+        "@id": "dtmi:example:chi_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_epsilon;1",
+          "@id": "dtmi:example:chi_glikk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "rho_zeta",
+            "name": "chi_nuh",
             "schema": "integer"
           },
           "mapKey": {
             "@id": "dtmi:foo;1",
-            "name": "rho_delta",
+            "name": "chi_fuddle",
             "schema": "string"
           }
         }
@@ -111,18 +111,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_lambda;1",
+        "@id": "dtmi:example:chi_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_iota;1",
+          "@id": "dtmi:example:chi_thnad;1",
           "@type": "Map",
           "mapValue": {
-            "name": "rho_kappa",
+            "name": "chi_spazz",
             "schema": "long"
           },
           "mapKey": {
             "@id": null,
-            "name": "rho_theta",
+            "name": "chi_quan",
             "schema": "string"
           }
         }
@@ -137,19 +137,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_omicron;1",
+        "@id": "dtmi:example:chi_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_nu;1",
+          "@id": "dtmi:example:chi_jogg;1",
           "@type": "Map",
           "mapValue": {
-            "name": "rho_xi",
+            "name": "chi_flunn",
             "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": null,
-            "name": "rho_mu",
+            "name": "chi_zatz",
             "schema": "string"
           }
         }
@@ -164,18 +164,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_tau;1",
+        "@id": "dtmi:example:psi_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_rho;1",
+          "@id": "dtmi:example:chi_vroo;1",
           "@type": "Map",
           "mapValue": {
-            "name": "rho_sigma",
+            "name": "chi_hi",
             "schema": "time"
           },
           "mapKey": {
             "@id": 626,
-            "name": "rho_pi",
+            "name": "chi_yekk",
             "schema": "string"
           }
         }
@@ -190,19 +190,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_psi;1",
+        "@id": "dtmi:example:psi_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_phi;1",
+          "@id": "dtmi:example:psi_gamma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "rho_chi",
+            "name": "psi_delta",
             "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": 626,
-            "name": "rho_upsilon",
+            "name": "psi_beta",
             "schema": "string"
           }
         }
@@ -217,18 +217,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_um;1",
+        "@id": "dtmi:example:psi_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_yuzz;1",
+          "@id": "dtmi:example:psi_eta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "rho_wum",
+            "name": "psi_theta",
             "schema": "date"
           },
           "mapKey": {
             "@id": true,
-            "name": "rho_omega",
+            "name": "psi_zeta",
             "schema": "string"
           }
         }
@@ -243,19 +243,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_nuh;1",
+        "@id": "dtmi:example:psi_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_fuddle;1",
+          "@id": "dtmi:example:psi_lambda;1",
           "@type": "Map",
           "mapValue": {
-            "name": "rho_glikk",
+            "name": "psi_mu",
             "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": true,
-            "name": "rho_humpf",
+            "name": "psi_kappa",
             "schema": "string"
           }
         }
@@ -270,20 +270,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_spazz;1",
+        "@id": "dtmi:example:psi_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_quan;1",
+          "@id": "dtmi:example:psi_omicron;1",
           "@type": "Map",
           "mapValue": {
-            "name": "rho_thnad",
+            "name": "psi_pi",
             "schema": "double"
           },
           "mapKey": {
             "@id": {
               "@value": "dtmi:apparently:valid:identifier;3"
             },
-            "name": "rho_snee",
+            "name": "psi_xi",
             "schema": "string"
           }
         }
@@ -298,13 +298,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_flunn;1",
+        "@id": "dtmi:example:psi_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_zatz;1",
+          "@id": "dtmi:example:psi_tau;1",
           "@type": "Map",
           "mapValue": {
-            "name": "rho_jogg",
+            "name": "psi_upsilon",
             "schema": "duration"
           },
           "mapKey": {
@@ -312,7 +312,7 @@
             "@id": {
               "@value": "dtmi:apparently:valid:identifier;3"
             },
-            "name": "rho_floob",
+            "name": "psi_sigma",
             "schema": "string"
           }
         }
@@ -327,18 +327,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_hi;1",
+        "@id": "dtmi:example:psi_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_yekk;1",
+          "@id": "dtmi:example:psi_psi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "rho_vroo",
+            "name": "psi_omega",
             "schema": "float"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;0",
-            "name": "rho_itch",
+            "name": "psi_chi",
             "schema": "string"
           }
         }
@@ -353,19 +353,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_delta;1",
+        "@id": "dtmi:example:psi_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_beta;1",
+          "@id": "dtmi:example:psi_um;1",
           "@type": "Map",
           "mapValue": {
-            "name": "sigma_gamma",
+            "name": "psi_humpf",
             "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0",
-            "name": "sigma_alpha",
+            "name": "psi_wum",
             "schema": "string"
           }
         }
@@ -380,18 +380,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_theta;1",
+        "@id": "dtmi:example:psi_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_zeta;1",
+          "@id": "dtmi:example:psi_nuh;1",
           "@type": "Map",
           "mapValue": {
-            "name": "sigma_eta",
+            "name": "psi_snee",
             "schema": "long"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;0.0",
-            "name": "sigma_epsilon",
+            "name": "psi_glikk",
             "schema": "string"
           }
         }
@@ -406,19 +406,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_mu;1",
+        "@id": "dtmi:example:psi_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_kappa;1",
+          "@id": "dtmi:example:psi_spazz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "sigma_lambda",
+            "name": "psi_floob",
             "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0.0",
-            "name": "sigma_iota",
+            "name": "psi_thnad",
             "schema": "string"
           }
         }
@@ -433,18 +433,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_pi;1",
+        "@id": "dtmi:example:psi_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_xi;1",
+          "@id": "dtmi:example:psi_flunn;1",
           "@type": "Map",
           "mapValue": {
-            "name": "sigma_omicron",
+            "name": "psi_itch",
             "schema": "time"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;1234567890",
-            "name": "sigma_nu",
+            "name": "psi_jogg",
             "schema": "string"
           }
         }
@@ -459,19 +459,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_upsilon;1",
+        "@id": "dtmi:example:omega_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_sigma;1",
+          "@id": "dtmi:example:psi_hi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "sigma_tau",
+            "name": "omega_alpha",
             "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;1234567890",
-            "name": "sigma_rho",
+            "name": "psi_vroo",
             "schema": "string"
           }
         }
@@ -486,18 +486,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_omega;1",
+        "@id": "dtmi:example:omega_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_chi;1",
+          "@id": "dtmi:example:omega_delta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "sigma_psi",
+            "name": "omega_epsilon",
             "schema": "date"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;1a",
-            "name": "sigma_phi",
+            "name": "omega_gamma",
             "schema": "string"
           }
         }
@@ -512,19 +512,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_humpf;1",
+        "@id": "dtmi:example:omega_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_wum;1",
+          "@id": "dtmi:example:omega_theta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "sigma_um",
+            "name": "omega_iota",
             "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;1a",
-            "name": "sigma_yuzz",
+            "name": "omega_eta",
             "schema": "string"
           }
         }
@@ -539,18 +539,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_snee;1",
+        "@id": "dtmi:example:omega_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_glikk;1",
+          "@id": "dtmi:example:omega_mu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "sigma_nuh",
+            "name": "omega_nu",
             "schema": "double"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;3.0",
-            "name": "sigma_fuddle",
+            "name": "omega_lambda",
             "schema": "string"
           }
         }
@@ -565,19 +565,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_floob;1",
+        "@id": "dtmi:example:omega_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_thnad;1",
+          "@id": "dtmi:example:omega_pi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "sigma_spazz",
+            "name": "omega_rho",
             "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.0",
-            "name": "sigma_quan",
+            "name": "omega_omicron",
             "schema": "string"
           }
         }
@@ -592,18 +592,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_itch;1",
+        "@id": "dtmi:example:omega_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_jogg;1",
+          "@id": "dtmi:example:omega_upsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "sigma_flunn",
+            "name": "omega_phi",
             "schema": "float"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;3.1415926",
-            "name": "sigma_zatz",
+            "name": "omega_tau",
             "schema": "string"
           }
         }
@@ -618,19 +618,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_alpha;1",
+        "@id": "dtmi:example:omega_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_vroo;1",
+          "@id": "dtmi:example:omega_omega;1",
           "@type": "Map",
           "mapValue": {
-            "name": "sigma_hi",
+            "name": "omega_yuzz",
             "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.1415926",
-            "name": "sigma_yekk",
+            "name": "omega_psi",
             "schema": "string"
           }
         }
@@ -645,18 +645,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_epsilon;1",
+        "@id": "dtmi:example:omega_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_gamma;1",
+          "@id": "dtmi:example:omega_humpf;1",
           "@type": "Map",
           "mapValue": {
-            "name": "tau_delta",
+            "name": "omega_fuddle",
             "schema": "long"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;6.02",
-            "name": "tau_beta",
+            "name": "omega_um",
             "schema": "string"
           }
         }
@@ -671,19 +671,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_iota;1",
+        "@id": "dtmi:example:omega_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_eta;1",
+          "@id": "dtmi:example:omega_snee;1",
           "@type": "Map",
           "mapValue": {
-            "name": "tau_theta",
+            "name": "omega_quan",
             "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;6.02",
-            "name": "tau_zeta",
+            "name": "omega_nuh",
             "schema": "string"
           }
         }
@@ -698,18 +698,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_nu;1",
+        "@id": "dtmi:example:omega_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_lambda;1",
+          "@id": "dtmi:example:omega_floob;1",
           "@type": "Map",
           "mapValue": {
-            "name": "tau_mu",
+            "name": "omega_zatz",
             "schema": "time"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;0.1",
-            "name": "tau_kappa",
+            "name": "omega_spazz",
             "schema": "string"
           }
         }
@@ -724,19 +724,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_rho;1",
+        "@id": "dtmi:example:omega_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_omicron;1",
+          "@id": "dtmi:example:omega_itch;1",
           "@type": "Map",
           "mapValue": {
-            "name": "tau_pi",
+            "name": "omega_yekk",
             "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0.1",
-            "name": "tau_xi",
+            "name": "omega_flunn",
             "schema": "string"
           }
         }
@@ -751,18 +751,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_phi;1",
+        "@id": "dtmi:example:yuzz_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_tau;1",
+          "@id": "dtmi:example:yuzz_alpha;1",
           "@type": "Map",
           "mapValue": {
-            "name": "tau_upsilon",
+            "name": "yuzz_beta",
             "schema": "date"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;01",
-            "name": "tau_sigma",
+            "name": "omega_hi",
             "schema": "string"
           }
         }
@@ -777,19 +777,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_yuzz;1",
+        "@id": "dtmi:example:yuzz_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_psi;1",
+          "@id": "dtmi:example:yuzz_epsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "tau_omega",
+            "name": "yuzz_zeta",
             "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;01",
-            "name": "tau_chi",
+            "name": "yuzz_delta",
             "schema": "string"
           }
         }
@@ -804,18 +804,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_fuddle;1",
+        "@id": "dtmi:example:yuzz_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_um;1",
+          "@id": "dtmi:example:yuzz_iota;1",
           "@type": "Map",
           "mapValue": {
-            "name": "tau_humpf",
+            "name": "yuzz_kappa",
             "schema": "double"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;",
-            "name": "tau_wum",
+            "name": "yuzz_theta",
             "schema": "string"
           }
         }
@@ -830,19 +830,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_quan;1",
+        "@id": "dtmi:example:yuzz_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_nuh;1",
+          "@id": "dtmi:example:yuzz_nu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "tau_snee",
+            "name": "yuzz_xi",
             "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;",
-            "name": "tau_glikk",
+            "name": "yuzz_mu",
             "schema": "string"
           }
         }
@@ -857,18 +857,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_zatz;1",
+        "@id": "dtmi:example:yuzz_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_spazz;1",
+          "@id": "dtmi:example:yuzz_rho;1",
           "@type": "Map",
           "mapValue": {
-            "name": "tau_floob",
+            "name": "yuzz_sigma",
             "schema": "float"
           },
           "mapKey": {
             "@id": "dtmi:test:invalidId_;1",
-            "name": "tau_thnad",
+            "name": "yuzz_pi",
             "schema": "string"
           }
         }
@@ -883,19 +883,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_yekk;1",
+        "@id": "dtmi:example:yuzz_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_flunn;1",
+          "@id": "dtmi:example:yuzz_phi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "tau_itch",
+            "name": "yuzz_chi",
             "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:invalidId_;1",
-            "name": "tau_jogg",
+            "name": "yuzz_upsilon",
             "schema": "string"
           }
         }
@@ -910,18 +910,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_beta;1",
+        "@id": "dtmi:example:yuzz_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_hi;1",
+          "@id": "dtmi:example:yuzz_yuzz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "upsilon_alpha",
+            "name": "yuzz_wum",
             "schema": "long"
           },
           "mapKey": {
             "@id": "dtmi:test:_invalidUserId;1",
-            "name": "tau_vroo",
+            "name": "yuzz_omega",
             "schema": "string"
           }
         }
@@ -936,19 +936,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_zeta;1",
+        "@id": "dtmi:example:yuzz_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_delta;1",
+          "@id": "dtmi:example:yuzz_fuddle;1",
           "@type": "Map",
           "mapValue": {
-            "name": "upsilon_epsilon",
+            "name": "yuzz_glikk",
             "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:_invalidUserId;1",
-            "name": "upsilon_gamma",
+            "name": "yuzz_humpf",
             "schema": "string"
           }
         }
@@ -963,18 +963,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_kappa;1",
+        "@id": "dtmi:example:yuzz_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_theta;1",
+          "@id": "dtmi:example:yuzz_quan;1",
           "@type": "Map",
           "mapValue": {
-            "name": "upsilon_iota",
+            "name": "yuzz_thnad",
             "schema": "time"
           },
           "mapKey": {
             "@id": "dtmi:test:1seg;1",
-            "name": "upsilon_eta",
+            "name": "yuzz_snee",
             "schema": "string"
           }
         }
@@ -989,19 +989,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_xi;1",
+        "@id": "dtmi:example:yuzz_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_mu;1",
+          "@id": "dtmi:example:yuzz_zatz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "upsilon_nu",
+            "name": "yuzz_jogg",
             "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:1seg;1",
-            "name": "upsilon_lambda",
+            "name": "yuzz_floob",
             "schema": "string"
           }
         }
@@ -1016,18 +1016,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_sigma;1",
+        "@id": "dtmi:example:yuzz_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_pi;1",
+          "@id": "dtmi:example:yuzz_yekk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "upsilon_rho",
+            "name": "yuzz_vroo",
             "schema": "date"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar.baz;1",
-            "name": "upsilon_omicron",
+            "name": "yuzz_itch",
             "schema": "string"
           }
         }
@@ -1042,19 +1042,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_chi;1",
+        "@id": "dtmi:example:wum_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_upsilon;1",
+          "@id": "dtmi:example:wum_beta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "upsilon_phi",
+            "name": "wum_gamma",
             "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar.baz;1",
-            "name": "upsilon_tau",
+            "name": "wum_alpha",
             "schema": "string"
           }
         }
@@ -1069,18 +1069,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_wum;1",
+        "@id": "dtmi:example:wum_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_omega;1",
+          "@id": "dtmi:example:wum_zeta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "upsilon_yuzz",
+            "name": "wum_eta",
             "schema": "double"
           },
           "mapKey": {
             "@id": "dtmi:foo::bar;1",
-            "name": "upsilon_psi",
+            "name": "wum_epsilon",
             "schema": "string"
           }
         }
@@ -1095,19 +1095,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_glikk;1",
+        "@id": "dtmi:example:wum_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_humpf;1",
+          "@id": "dtmi:example:wum_kappa;1",
           "@type": "Map",
           "mapValue": {
-            "name": "upsilon_fuddle",
+            "name": "wum_lambda",
             "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo::bar;1",
-            "name": "upsilon_um",
+            "name": "wum_iota",
             "schema": "string"
           }
         }
@@ -1122,18 +1122,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_thnad;1",
+        "@id": "dtmi:example:wum_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_snee;1",
+          "@id": "dtmi:example:wum_xi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "upsilon_quan",
+            "name": "wum_omicron",
             "schema": "float"
           },
           "mapKey": {
             "@id": "urn:foo:bar:1",
-            "name": "upsilon_nuh",
+            "name": "wum_nu",
             "schema": "string"
           }
         }
@@ -1148,19 +1148,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_jogg;1",
+        "@id": "dtmi:example:wum_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_floob;1",
+          "@id": "dtmi:example:wum_sigma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "upsilon_zatz",
+            "name": "wum_tau",
             "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "urn:foo:bar:1",
-            "name": "upsilon_spazz",
+            "name": "wum_rho",
             "schema": "string"
           }
         }
@@ -1175,18 +1175,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_vroo;1",
+        "@id": "dtmi:example:wum_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_itch;1",
+          "@id": "dtmi:example:wum_chi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "upsilon_yekk",
+            "name": "wum_psi",
             "schema": "long"
           },
           "mapKey": {
             "@id": "http://foo/bar/baz",
-            "name": "upsilon_flunn",
+            "name": "wum_phi",
             "schema": "string"
           }
         }
@@ -1201,19 +1201,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_gamma;1",
+        "@id": "dtmi:example:wum_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_alpha;1",
+          "@id": "dtmi:example:wum_wum;1",
           "@type": "Map",
           "mapValue": {
-            "name": "phi_beta",
+            "name": "wum_um",
             "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "http://foo/bar/baz",
-            "name": "upsilon_hi",
+            "name": "wum_yuzz",
             "schema": "string"
           }
         }
@@ -1228,18 +1228,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_eta;1",
+        "@id": "dtmi:example:wum_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_epsilon;1",
+          "@id": "dtmi:example:wum_glikk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "phi_zeta",
+            "name": "wum_nuh",
             "schema": "time"
           },
           "mapKey": {
             "@id": "dtmi:;1",
-            "name": "phi_delta",
+            "name": "wum_fuddle",
             "schema": "string"
           }
         }
@@ -1254,19 +1254,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_lambda;1",
+        "@id": "dtmi:example:wum_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_iota;1",
+          "@id": "dtmi:example:wum_thnad;1",
           "@type": "Map",
           "mapValue": {
-            "name": "phi_kappa",
+            "name": "wum_spazz",
             "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:;1",
-            "name": "phi_theta",
+            "name": "wum_quan",
             "schema": "string"
           }
         }
@@ -1281,18 +1281,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_omicron;1",
+        "@id": "dtmi:example:wum_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_nu;1",
+          "@id": "dtmi:example:wum_jogg;1",
           "@type": "Map",
           "mapValue": {
-            "name": "phi_xi",
+            "name": "wum_flunn",
             "schema": "date"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar",
-            "name": "phi_mu",
+            "name": "wum_zatz",
             "schema": "string"
           }
         }
@@ -1307,19 +1307,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_tau;1",
+        "@id": "dtmi:example:um_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_rho;1",
+          "@id": "dtmi:example:wum_vroo;1",
           "@type": "Map",
           "mapValue": {
-            "name": "phi_sigma",
+            "name": "wum_hi",
             "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar",
-            "name": "phi_pi",
+            "name": "wum_yekk",
             "schema": "string"
           }
         }
@@ -1334,18 +1334,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_psi;1",
+        "@id": "dtmi:example:um_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_phi;1",
+          "@id": "dtmi:example:um_gamma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "phi_chi",
+            "name": "um_delta",
             "schema": "double"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;3.14",
-            "name": "phi_upsilon",
+            "name": "um_beta",
             "schema": "string"
           }
         }
@@ -1360,19 +1360,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_um;1",
+        "@id": "dtmi:example:um_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_yuzz;1",
+          "@id": "dtmi:example:um_eta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "phi_wum",
+            "name": "um_theta",
             "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.14",
-            "name": "phi_omega",
+            "name": "um_zeta",
             "schema": "string"
           }
         }
@@ -1387,18 +1387,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_nuh;1",
+        "@id": "dtmi:example:um_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_fuddle;1",
+          "@id": "dtmi:example:um_lambda;1",
           "@type": "Map",
           "mapValue": {
-            "name": "phi_glikk",
+            "name": "um_mu",
             "schema": "float"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;3.141592",
-            "name": "phi_humpf",
+            "name": "um_kappa",
             "schema": "string"
           }
         }
@@ -1413,19 +1413,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_spazz;1",
+        "@id": "dtmi:example:um_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_quan;1",
+          "@id": "dtmi:example:um_omicron;1",
           "@type": "Map",
           "mapValue": {
-            "name": "phi_thnad",
+            "name": "um_pi",
             "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.141592",
-            "name": "phi_snee",
+            "name": "um_xi",
             "schema": "string"
           }
         }
@@ -1440,18 +1440,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_flunn;1",
+        "@id": "dtmi:example:um_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_zatz;1",
+          "@id": "dtmi:example:um_tau;1",
           "@type": "Map",
           "mapValue": {
-            "name": "phi_jogg",
+            "name": "um_upsilon",
             "schema": "long"
           },
           "mapKey": {
             "@id": "dtmi:dtdl:example;1",
-            "name": "phi_floob",
+            "name": "um_sigma",
             "schema": "string"
           }
         }
@@ -1466,19 +1466,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_hi;1",
+        "@id": "dtmi:example:um_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_yekk;1",
+          "@id": "dtmi:example:um_psi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "phi_vroo",
+            "name": "um_omega",
             "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:dtdl:example;1",
-            "name": "phi_itch",
+            "name": "um_chi",
             "schema": "string"
           }
         }
@@ -1493,18 +1493,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_delta;1",
+        "@id": "dtmi:example:um_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_beta;1",
+          "@id": "dtmi:example:um_um;1",
           "@type": "Map",
           "mapValue": {
-            "name": "chi_gamma",
+            "name": "um_humpf",
             "schema": "time"
           },
           "mapKey": {
             "@id": "dtmi:standard:example;1",
-            "name": "chi_alpha",
+            "name": "um_wum",
             "schema": "string"
           }
         }
@@ -1519,19 +1519,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_theta;1",
+        "@id": "dtmi:example:um_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_zeta;1",
+          "@id": "dtmi:example:um_nuh;1",
           "@type": "Map",
           "mapValue": {
-            "name": "chi_eta",
+            "name": "um_snee",
             "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:standard:example;1",
-            "name": "chi_epsilon",
+            "name": "um_glikk",
             "schema": "string"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyIdNotArrayV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyIdNotArrayV2.json
index 0c16aaa8..bf6de23d 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyIdNotArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyIdNotArrayV2.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_mu;1",
+        "@id": "dtmi:example:um_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_kappa;1",
+          "@id": "dtmi:example:um_spazz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "chi_lambda",
+            "name": "um_floob",
             "schema": "date"
           },
           "mapKey": {
             "@id": [
               "dtmi:foo:bar;7"
             ],
-            "name": "chi_iota",
+            "name": "um_thnad",
             "schema": "string"
           }
         }
@@ -35,13 +35,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_pi;1",
+        "@id": "dtmi:example:um_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_xi;1",
+          "@id": "dtmi:example:um_flunn;1",
           "@type": "Map",
           "mapValue": {
-            "name": "chi_omicron",
+            "name": "um_itch",
             "schema": "dateTime"
           },
           "mapKey": {
@@ -49,7 +49,7 @@
             "@id": [
               "dtmi:foo:bar;7"
             ],
-            "name": "chi_nu",
+            "name": "um_jogg",
             "schema": "string"
           }
         }
@@ -64,20 +64,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_upsilon;1",
+        "@id": "dtmi:example:humpf_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_sigma;1",
+          "@id": "dtmi:example:um_hi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "chi_tau",
+            "name": "humpf_alpha",
             "schema": "double"
           },
           "mapKey": {
             "@id": [
               "dtmi:foo:bar;108675309"
             ],
-            "name": "chi_rho",
+            "name": "um_vroo",
             "schema": "string"
           }
         }
@@ -92,13 +92,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_omega;1",
+        "@id": "dtmi:example:humpf_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_chi;1",
+          "@id": "dtmi:example:humpf_delta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "chi_psi",
+            "name": "humpf_epsilon",
             "schema": "duration"
           },
           "mapKey": {
@@ -106,7 +106,7 @@
             "@id": [
               "dtmi:foo:bar;108675309"
             ],
-            "name": "chi_phi",
+            "name": "humpf_gamma",
             "schema": "string"
           }
         }
@@ -121,20 +121,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_humpf;1",
+        "@id": "dtmi:example:humpf_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_wum;1",
+          "@id": "dtmi:example:humpf_theta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "chi_um",
+            "name": "humpf_iota",
             "schema": "float"
           },
           "mapKey": {
             "@id": [
               "dtmi:foo:bar;999999999"
             ],
-            "name": "chi_yuzz",
+            "name": "humpf_eta",
             "schema": "string"
           }
         }
@@ -149,13 +149,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_snee;1",
+        "@id": "dtmi:example:humpf_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_glikk;1",
+          "@id": "dtmi:example:humpf_mu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "chi_nuh",
+            "name": "humpf_nu",
             "schema": "integer"
           },
           "mapKey": {
@@ -163,7 +163,7 @@
             "@id": [
               "dtmi:foo:bar;999999999"
             ],
-            "name": "chi_fuddle",
+            "name": "humpf_lambda",
             "schema": "string"
           }
         }
@@ -178,20 +178,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_floob;1",
+        "@id": "dtmi:example:humpf_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_thnad;1",
+          "@id": "dtmi:example:humpf_pi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "chi_spazz",
+            "name": "humpf_rho",
             "schema": "long"
           },
           "mapKey": {
             "@id": [
               "dtmi:foo;1"
             ],
-            "name": "chi_quan",
+            "name": "humpf_omicron",
             "schema": "string"
           }
         }
@@ -206,13 +206,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_itch;1",
+        "@id": "dtmi:example:humpf_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_jogg;1",
+          "@id": "dtmi:example:humpf_upsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "chi_flunn",
+            "name": "humpf_phi",
             "schema": "string"
           },
           "mapKey": {
@@ -220,7 +220,7 @@
             "@id": [
               "dtmi:foo;1"
             ],
-            "name": "chi_zatz",
+            "name": "humpf_tau",
             "schema": "string"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyCommentStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyCommentStringLengthV2.json
index 28fdaf7f..9e52fe11 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyCommentStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyCommentStringLengthV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_eta;1",
+        "@id": "dtmi:example:glikk_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_epsilon;1",
+          "@id": "dtmi:example:glikk_glikk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_zeta",
+            "name": "glikk_nuh",
             "schema": "dateTime"
           },
           "mapKey": {
-            "name": "yuzz_delta",
+            "name": "glikk_fuddle",
             "schema": "string",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_lambda;1",
+        "@id": "dtmi:example:glikk_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_iota;1",
+          "@id": "dtmi:example:glikk_thnad;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_kappa",
+            "name": "glikk_spazz",
             "schema": "double"
           },
           "mapKey": {
-            "name": "yuzz_theta",
+            "name": "glikk_quan",
             "schema": "string",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
@@ -59,18 +59,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_omicron;1",
+        "@id": "dtmi:example:glikk_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_nu;1",
+          "@id": "dtmi:example:glikk_jogg;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_xi",
+            "name": "glikk_flunn",
             "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yuzz_mu",
+            "name": "glikk_zatz",
             "schema": "string",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyCommentStringV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyCommentStringV2.json
index d0d7de34..8832133c 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyCommentStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyCommentStringV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_iota;1",
+        "@id": "dtmi:example:humpf_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_eta;1",
+          "@id": "dtmi:example:humpf_snee;1",
           "@type": "Map",
           "mapValue": {
-            "name": "psi_theta",
+            "name": "humpf_quan",
             "schema": "date"
           },
           "mapKey": {
-            "name": "psi_zeta",
+            "name": "humpf_nuh",
             "schema": "string",
             "comment": "hello"
           }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_nu;1",
+        "@id": "dtmi:example:humpf_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_lambda;1",
+          "@id": "dtmi:example:humpf_floob;1",
           "@type": "Map",
           "mapValue": {
-            "name": "psi_mu",
+            "name": "humpf_zatz",
             "schema": "dateTime"
           },
           "mapKey": {
-            "name": "psi_kappa",
+            "name": "humpf_spazz",
             "schema": "string",
             "comment": [
               "hello"
@@ -61,17 +61,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_rho;1",
+        "@id": "dtmi:example:humpf_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_omicron;1",
+          "@id": "dtmi:example:humpf_itch;1",
           "@type": "Map",
           "mapValue": {
-            "name": "psi_pi",
+            "name": "humpf_yekk",
             "schema": "double"
           },
           "mapKey": {
-            "name": "psi_xi",
+            "name": "humpf_flunn",
             "schema": "string",
             "comment": {
               "@value": "hello",
@@ -90,17 +90,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_phi;1",
+        "@id": "dtmi:example:fuddle_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_tau;1",
+          "@id": "dtmi:example:fuddle_alpha;1",
           "@type": "Map",
           "mapValue": {
-            "name": "psi_upsilon",
+            "name": "fuddle_beta",
             "schema": "duration"
           },
           "mapKey": {
-            "name": "psi_sigma",
+            "name": "humpf_hi",
             "schema": "string",
             "comment": [
               {
@@ -121,17 +121,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_yuzz;1",
+        "@id": "dtmi:example:fuddle_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_psi;1",
+          "@id": "dtmi:example:fuddle_epsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "psi_omega",
+            "name": "fuddle_zeta",
             "schema": "float"
           },
           "mapKey": {
-            "name": "psi_chi",
+            "name": "fuddle_delta",
             "schema": "string",
             "comment": []
           }
@@ -147,17 +147,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_fuddle;1",
+        "@id": "dtmi:example:fuddle_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_um;1",
+          "@id": "dtmi:example:fuddle_iota;1",
           "@type": "Map",
           "mapValue": {
-            "name": "psi_humpf",
+            "name": "fuddle_kappa",
             "schema": "integer"
           },
           "mapKey": {
-            "name": "psi_wum",
+            "name": "fuddle_theta",
             "schema": "string",
             "comment": null
           }
@@ -173,18 +173,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_quan;1",
+        "@id": "dtmi:example:fuddle_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_nuh;1",
+          "@id": "dtmi:example:fuddle_nu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "psi_snee",
+            "name": "fuddle_xi",
             "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "psi_glikk",
+            "name": "fuddle_mu",
             "schema": "string",
             "comment": null
           }
@@ -200,17 +200,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_zatz;1",
+        "@id": "dtmi:example:fuddle_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_spazz;1",
+          "@id": "dtmi:example:fuddle_rho;1",
           "@type": "Map",
           "mapValue": {
-            "name": "psi_floob",
+            "name": "fuddle_sigma",
             "schema": "string"
           },
           "mapKey": {
-            "name": "psi_thnad",
+            "name": "fuddle_pi",
             "schema": "string",
             "comment": true
           }
@@ -226,18 +226,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_yekk;1",
+        "@id": "dtmi:example:fuddle_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_flunn;1",
+          "@id": "dtmi:example:fuddle_phi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "psi_itch",
+            "name": "fuddle_chi",
             "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "psi_jogg",
+            "name": "fuddle_upsilon",
             "schema": "string",
             "comment": true
           }
@@ -253,17 +253,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_beta;1",
+        "@id": "dtmi:example:fuddle_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_hi;1",
+          "@id": "dtmi:example:fuddle_yuzz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_alpha",
+            "name": "fuddle_wum",
             "schema": "boolean"
           },
           "mapKey": {
-            "name": "psi_vroo",
+            "name": "fuddle_omega",
             "schema": "string",
             "comment": 626
           }
@@ -279,18 +279,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_zeta;1",
+        "@id": "dtmi:example:fuddle_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_delta;1",
+          "@id": "dtmi:example:fuddle_fuddle;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_epsilon",
+            "name": "fuddle_glikk",
             "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omega_gamma",
+            "name": "fuddle_humpf",
             "schema": "string",
             "comment": 626
           }
@@ -306,17 +306,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_kappa;1",
+        "@id": "dtmi:example:fuddle_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_theta;1",
+          "@id": "dtmi:example:fuddle_quan;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_iota",
+            "name": "fuddle_thnad",
             "schema": "dateTime"
           },
           "mapKey": {
-            "name": "omega_eta",
+            "name": "fuddle_snee",
             "schema": "string",
             "comment": [
               null
@@ -334,18 +334,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_xi;1",
+        "@id": "dtmi:example:fuddle_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_mu;1",
+          "@id": "dtmi:example:fuddle_zatz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_nu",
+            "name": "fuddle_jogg",
             "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omega_lambda",
+            "name": "fuddle_floob",
             "schema": "string",
             "comment": [
               null
@@ -363,17 +363,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_sigma;1",
+        "@id": "dtmi:example:fuddle_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_pi;1",
+          "@id": "dtmi:example:fuddle_yekk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_rho",
+            "name": "fuddle_vroo",
             "schema": "duration"
           },
           "mapKey": {
-            "name": "omega_omicron",
+            "name": "fuddle_itch",
             "schema": "string",
             "comment": [
               true
@@ -391,18 +391,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_chi;1",
+        "@id": "dtmi:example:glikk_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_upsilon;1",
+          "@id": "dtmi:example:glikk_beta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_phi",
+            "name": "glikk_gamma",
             "schema": "float"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omega_tau",
+            "name": "glikk_alpha",
             "schema": "string",
             "comment": [
               true
@@ -420,17 +420,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_wum;1",
+        "@id": "dtmi:example:glikk_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_omega;1",
+          "@id": "dtmi:example:glikk_zeta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_yuzz",
+            "name": "glikk_eta",
             "schema": "integer"
           },
           "mapKey": {
-            "name": "omega_psi",
+            "name": "glikk_epsilon",
             "schema": "string",
             "comment": [
               626
@@ -448,18 +448,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_glikk;1",
+        "@id": "dtmi:example:glikk_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_humpf;1",
+          "@id": "dtmi:example:glikk_kappa;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_fuddle",
+            "name": "glikk_lambda",
             "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omega_um",
+            "name": "glikk_iota",
             "schema": "string",
             "comment": [
               626
@@ -477,17 +477,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_thnad;1",
+        "@id": "dtmi:example:glikk_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_snee;1",
+          "@id": "dtmi:example:glikk_xi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_quan",
+            "name": "glikk_omicron",
             "schema": "string"
           },
           "mapKey": {
-            "name": "omega_nuh",
+            "name": "glikk_nu",
             "schema": "string",
             "comment": {}
           }
@@ -503,18 +503,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_jogg;1",
+        "@id": "dtmi:example:glikk_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_floob;1",
+          "@id": "dtmi:example:glikk_sigma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_zatz",
+            "name": "glikk_tau",
             "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omega_spazz",
+            "name": "glikk_rho",
             "schema": "string",
             "comment": {}
           }
@@ -530,17 +530,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_vroo;1",
+        "@id": "dtmi:example:glikk_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_itch;1",
+          "@id": "dtmi:example:glikk_chi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_yekk",
+            "name": "glikk_psi",
             "schema": "boolean"
           },
           "mapKey": {
-            "name": "omega_flunn",
+            "name": "glikk_phi",
             "schema": "string",
             "comment": [
               {}
@@ -558,18 +558,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_gamma;1",
+        "@id": "dtmi:example:glikk_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_alpha;1",
+          "@id": "dtmi:example:glikk_wum;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_beta",
+            "name": "glikk_um",
             "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omega_hi",
+            "name": "glikk_yuzz",
             "schema": "string",
             "comment": [
               {}
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyCommentTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyCommentTermAndDtmiV2.json
index 1abdece2..9f679d3b 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyCommentTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyCommentTermAndDtmiV2.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_floob;1",
+        "@id": "dtmi:example:nuh_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_thnad;1",
+          "@id": "dtmi:example:nuh_pi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_spazz",
+            "name": "nuh_rho",
             "schema": "string"
           },
           "mapKey": {
-            "comment": "yuzz_nuh",
-            "dtmi:dtdl:property:comment;2": "yuzz_snee",
-            "name": "yuzz_quan",
+            "comment": "nuh_nu",
+            "dtmi:dtdl:property:comment;2": "nuh_xi",
+            "name": "nuh_omicron",
             "schema": "string"
           }
         }
@@ -34,20 +34,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_vroo;1",
+        "@id": "dtmi:example:nuh_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_itch;1",
+          "@id": "dtmi:example:nuh_chi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_yekk",
+            "name": "nuh_psi",
             "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "comment": "yuzz_zatz",
-            "dtmi:dtdl:property:comment;2": "yuzz_jogg",
-            "name": "yuzz_flunn",
+            "comment": "nuh_tau",
+            "dtmi:dtdl:property:comment;2": "nuh_upsilon",
+            "name": "nuh_phi",
             "schema": "string"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyDescriptionLangStringV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyDescriptionLangStringV2.json
index ebde706c..b72db627 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyDescriptionLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyDescriptionLangStringV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_gamma;1",
+        "@id": "dtmi:example:nuh_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_alpha;1",
+          "@id": "dtmi:example:nuh_wum;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_beta",
+            "name": "nuh_um",
             "schema": "boolean"
           },
           "mapKey": {
-            "name": "yuzz_hi",
+            "name": "nuh_yuzz",
             "schema": "string",
             "description": "hello"
           }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_eta;1",
+        "@id": "dtmi:example:nuh_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_epsilon;1",
+          "@id": "dtmi:example:nuh_glikk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_zeta",
+            "name": "nuh_nuh",
             "schema": "date"
           },
           "mapKey": {
-            "name": "wum_delta",
+            "name": "nuh_fuddle",
             "schema": "string",
             "description": [
               "hello"
@@ -61,17 +61,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_lambda;1",
+        "@id": "dtmi:example:nuh_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_iota;1",
+          "@id": "dtmi:example:nuh_thnad;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_kappa",
+            "name": "nuh_spazz",
             "schema": "dateTime"
           },
           "mapKey": {
-            "name": "wum_theta",
+            "name": "nuh_quan",
             "schema": "string",
             "description": {
               "en": "hello"
@@ -89,17 +89,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_omicron;1",
+        "@id": "dtmi:example:nuh_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_nu;1",
+          "@id": "dtmi:example:nuh_jogg;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_xi",
+            "name": "nuh_flunn",
             "schema": "double"
           },
           "mapKey": {
-            "name": "wum_mu",
+            "name": "nuh_zatz",
             "schema": "string",
             "description": [
               {
@@ -120,17 +120,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_tau;1",
+        "@id": "dtmi:example:snee_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_rho;1",
+          "@id": "dtmi:example:nuh_vroo;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_sigma",
+            "name": "nuh_hi",
             "schema": "duration"
           },
           "mapKey": {
-            "name": "wum_pi",
+            "name": "nuh_yekk",
             "schema": "string",
             "description": {}
           }
@@ -146,17 +146,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_psi;1",
+        "@id": "dtmi:example:snee_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_phi;1",
+          "@id": "dtmi:example:snee_gamma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_chi",
+            "name": "snee_delta",
             "schema": "float"
           },
           "mapKey": {
-            "name": "wum_upsilon",
+            "name": "snee_beta",
             "schema": "string",
             "description": []
           }
@@ -172,17 +172,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_um;1",
+        "@id": "dtmi:example:snee_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_yuzz;1",
+          "@id": "dtmi:example:snee_eta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_wum",
+            "name": "snee_theta",
             "schema": "integer"
           },
           "mapKey": {
-            "name": "wum_omega",
+            "name": "snee_zeta",
             "schema": "string",
             "description": null
           }
@@ -198,18 +198,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_nuh;1",
+        "@id": "dtmi:example:snee_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_fuddle;1",
+          "@id": "dtmi:example:snee_lambda;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_glikk",
+            "name": "snee_mu",
             "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "wum_humpf",
+            "name": "snee_kappa",
             "schema": "string",
             "description": null
           }
@@ -225,17 +225,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_spazz;1",
+        "@id": "dtmi:example:snee_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_quan;1",
+          "@id": "dtmi:example:snee_omicron;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_thnad",
+            "name": "snee_pi",
             "schema": "string"
           },
           "mapKey": {
-            "name": "wum_snee",
+            "name": "snee_xi",
             "schema": "string",
             "description": true
           }
@@ -251,18 +251,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_flunn;1",
+        "@id": "dtmi:example:snee_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_zatz;1",
+          "@id": "dtmi:example:snee_tau;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_jogg",
+            "name": "snee_upsilon",
             "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "wum_floob",
+            "name": "snee_sigma",
             "schema": "string",
             "description": true
           }
@@ -278,17 +278,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_hi;1",
+        "@id": "dtmi:example:snee_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_yekk;1",
+          "@id": "dtmi:example:snee_psi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_vroo",
+            "name": "snee_omega",
             "schema": "boolean"
           },
           "mapKey": {
-            "name": "wum_itch",
+            "name": "snee_chi",
             "schema": "string",
             "description": 626
           }
@@ -304,18 +304,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_delta;1",
+        "@id": "dtmi:example:snee_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_beta;1",
+          "@id": "dtmi:example:snee_um;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_gamma",
+            "name": "snee_humpf",
             "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "um_alpha",
+            "name": "snee_wum",
             "schema": "string",
             "description": 626
           }
@@ -331,17 +331,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_theta;1",
+        "@id": "dtmi:example:snee_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_zeta;1",
+          "@id": "dtmi:example:snee_nuh;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_eta",
+            "name": "snee_snee",
             "schema": "dateTime"
           },
           "mapKey": {
-            "name": "um_epsilon",
+            "name": "snee_glikk",
             "schema": "string",
             "description": [
               null
@@ -359,18 +359,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_mu;1",
+        "@id": "dtmi:example:snee_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_kappa;1",
+          "@id": "dtmi:example:snee_spazz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_lambda",
+            "name": "snee_floob",
             "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "um_iota",
+            "name": "snee_thnad",
             "schema": "string",
             "description": [
               null
@@ -388,17 +388,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_pi;1",
+        "@id": "dtmi:example:snee_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_xi;1",
+          "@id": "dtmi:example:snee_flunn;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_omicron",
+            "name": "snee_itch",
             "schema": "duration"
           },
           "mapKey": {
-            "name": "um_nu",
+            "name": "snee_jogg",
             "schema": "string",
             "description": [
               true
@@ -416,18 +416,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_upsilon;1",
+        "@id": "dtmi:example:quan_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_sigma;1",
+          "@id": "dtmi:example:snee_hi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_tau",
+            "name": "quan_alpha",
             "schema": "float"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "um_rho",
+            "name": "snee_vroo",
             "schema": "string",
             "description": [
               true
@@ -445,17 +445,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_omega;1",
+        "@id": "dtmi:example:quan_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_chi;1",
+          "@id": "dtmi:example:quan_delta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_psi",
+            "name": "quan_epsilon",
             "schema": "integer"
           },
           "mapKey": {
-            "name": "um_phi",
+            "name": "quan_gamma",
             "schema": "string",
             "description": [
               626
@@ -473,18 +473,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_humpf;1",
+        "@id": "dtmi:example:quan_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_wum;1",
+          "@id": "dtmi:example:quan_theta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_um",
+            "name": "quan_iota",
             "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "um_yuzz",
+            "name": "quan_eta",
             "schema": "string",
             "description": [
               626
@@ -502,17 +502,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_snee;1",
+        "@id": "dtmi:example:quan_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_glikk;1",
+          "@id": "dtmi:example:quan_mu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_nuh",
+            "name": "quan_nu",
             "schema": "string"
           },
           "mapKey": {
-            "name": "um_fuddle",
+            "name": "quan_lambda",
             "schema": "string",
             "description": [
               {}
@@ -530,18 +530,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_floob;1",
+        "@id": "dtmi:example:quan_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_thnad;1",
+          "@id": "dtmi:example:quan_pi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_spazz",
+            "name": "quan_rho",
             "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "um_quan",
+            "name": "quan_omicron",
             "schema": "string",
             "description": [
               {}
@@ -559,17 +559,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_itch;1",
+        "@id": "dtmi:example:quan_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_jogg;1",
+          "@id": "dtmi:example:quan_upsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_flunn",
+            "name": "quan_phi",
             "schema": "boolean"
           },
           "mapKey": {
-            "name": "um_zatz",
+            "name": "quan_tau",
             "schema": "string",
             "description": {
               "@value": "hello",
@@ -588,18 +588,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_alpha;1",
+        "@id": "dtmi:example:quan_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_vroo;1",
+          "@id": "dtmi:example:quan_omega;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_hi",
+            "name": "quan_yuzz",
             "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "um_yekk",
+            "name": "quan_psi",
             "schema": "string",
             "description": {
               "@value": "hello",
@@ -618,17 +618,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_epsilon;1",
+        "@id": "dtmi:example:quan_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_gamma;1",
+          "@id": "dtmi:example:quan_humpf;1",
           "@type": "Map",
           "mapValue": {
-            "name": "humpf_delta",
+            "name": "quan_fuddle",
             "schema": "dateTime"
           },
           "mapKey": {
-            "name": "humpf_beta",
+            "name": "quan_um",
             "schema": "string",
             "description": [
               {
@@ -648,18 +648,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_iota;1",
+        "@id": "dtmi:example:quan_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_eta;1",
+          "@id": "dtmi:example:quan_snee;1",
           "@type": "Map",
           "mapValue": {
-            "name": "humpf_theta",
+            "name": "quan_quan",
             "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "humpf_zeta",
+            "name": "quan_nuh",
             "schema": "string",
             "description": [
               {
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyDescriptionStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyDescriptionStringLengthV2.json
index 3406dcf0..e7e9e01a 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyDescriptionStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyDescriptionStringLengthV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_nu;1",
+        "@id": "dtmi:example:quan_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_lambda;1",
+          "@id": "dtmi:example:quan_floob;1",
           "@type": "Map",
           "mapValue": {
-            "name": "humpf_mu",
+            "name": "quan_zatz",
             "schema": "duration"
           },
           "mapKey": {
-            "name": "humpf_kappa",
+            "name": "quan_spazz",
             "schema": "string",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_rho;1",
+        "@id": "dtmi:example:quan_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_omicron;1",
+          "@id": "dtmi:example:quan_itch;1",
           "@type": "Map",
           "mapValue": {
-            "name": "humpf_pi",
+            "name": "quan_yekk",
             "schema": "float"
           },
           "mapKey": {
-            "name": "humpf_xi",
+            "name": "quan_flunn",
             "schema": "string",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
@@ -59,18 +59,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_phi;1",
+        "@id": "dtmi:example:thnad_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_tau;1",
+          "@id": "dtmi:example:thnad_alpha;1",
           "@type": "Map",
           "mapValue": {
-            "name": "humpf_upsilon",
+            "name": "thnad_beta",
             "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "humpf_sigma",
+            "name": "quan_hi",
             "schema": "string",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyDescriptionTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyDescriptionTermAndDtmiV2.json
index 4f91f33f..dd6cb058 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyDescriptionTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyDescriptionTermAndDtmiV2.json
@@ -7,23 +7,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_vroo;1",
+        "@id": "dtmi:example:thnad_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_itch;1",
+          "@id": "dtmi:example:thnad_chi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "humpf_yekk",
+            "name": "thnad_psi",
             "schema": "boolean"
           },
           "mapKey": {
             "description": [
-              "humpf_zatz"
+              "thnad_tau"
             ],
             "dtmi:dtdl:property:description;2": [
-              "humpf_jogg"
+              "thnad_upsilon"
             ],
-            "name": "humpf_flunn",
+            "name": "thnad_phi",
             "schema": "string"
           }
         }
@@ -38,24 +38,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_epsilon;1",
+        "@id": "dtmi:example:thnad_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_gamma;1",
+          "@id": "dtmi:example:thnad_humpf;1",
           "@type": "Map",
           "mapValue": {
-            "name": "fuddle_delta",
+            "name": "thnad_fuddle",
             "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "description": [
-              "humpf_hi"
+              "thnad_yuzz"
             ],
             "dtmi:dtdl:property:description;2": [
-              "fuddle_alpha"
+              "thnad_wum"
             ],
-            "name": "fuddle_beta",
+            "name": "thnad_um",
             "schema": "string"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyDisplayNameLangStringV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyDisplayNameLangStringV2.json
index 31216707..49360869 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyDisplayNameLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyDisplayNameLangStringV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_iota;1",
+        "@id": "dtmi:example:thnad_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_eta;1",
+          "@id": "dtmi:example:thnad_snee;1",
           "@type": "Map",
           "mapValue": {
-            "name": "fuddle_theta",
+            "name": "thnad_quan",
             "schema": "dateTime"
           },
           "mapKey": {
-            "name": "fuddle_zeta",
+            "name": "thnad_nuh",
             "schema": "string",
             "displayName": "hello"
           }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_nu;1",
+        "@id": "dtmi:example:thnad_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_lambda;1",
+          "@id": "dtmi:example:thnad_floob;1",
           "@type": "Map",
           "mapValue": {
-            "name": "fuddle_mu",
+            "name": "thnad_zatz",
             "schema": "double"
           },
           "mapKey": {
-            "name": "fuddle_kappa",
+            "name": "thnad_spazz",
             "schema": "string",
             "displayName": [
               "hello"
@@ -61,17 +61,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_rho;1",
+        "@id": "dtmi:example:thnad_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_omicron;1",
+          "@id": "dtmi:example:thnad_itch;1",
           "@type": "Map",
           "mapValue": {
-            "name": "fuddle_pi",
+            "name": "thnad_yekk",
             "schema": "duration"
           },
           "mapKey": {
-            "name": "fuddle_xi",
+            "name": "thnad_flunn",
             "schema": "string",
             "displayName": {
               "en": "hello"
@@ -89,17 +89,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_phi;1",
+        "@id": "dtmi:example:spazz_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_tau;1",
+          "@id": "dtmi:example:spazz_alpha;1",
           "@type": "Map",
           "mapValue": {
-            "name": "fuddle_upsilon",
+            "name": "spazz_beta",
             "schema": "float"
           },
           "mapKey": {
-            "name": "fuddle_sigma",
+            "name": "thnad_hi",
             "schema": "string",
             "displayName": [
               {
@@ -120,17 +120,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_yuzz;1",
+        "@id": "dtmi:example:spazz_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_psi;1",
+          "@id": "dtmi:example:spazz_epsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "fuddle_omega",
+            "name": "spazz_zeta",
             "schema": "integer"
           },
           "mapKey": {
-            "name": "fuddle_chi",
+            "name": "spazz_delta",
             "schema": "string",
             "displayName": {}
           }
@@ -146,17 +146,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_fuddle;1",
+        "@id": "dtmi:example:spazz_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_um;1",
+          "@id": "dtmi:example:spazz_iota;1",
           "@type": "Map",
           "mapValue": {
-            "name": "fuddle_humpf",
+            "name": "spazz_kappa",
             "schema": "long"
           },
           "mapKey": {
-            "name": "fuddle_wum",
+            "name": "spazz_theta",
             "schema": "string",
             "displayName": []
           }
@@ -172,17 +172,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_quan;1",
+        "@id": "dtmi:example:spazz_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_nuh;1",
+          "@id": "dtmi:example:spazz_nu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "fuddle_snee",
+            "name": "spazz_xi",
             "schema": "string"
           },
           "mapKey": {
-            "name": "fuddle_glikk",
+            "name": "spazz_mu",
             "schema": "string",
             "displayName": null
           }
@@ -198,18 +198,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_zatz;1",
+        "@id": "dtmi:example:spazz_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_spazz;1",
+          "@id": "dtmi:example:spazz_rho;1",
           "@type": "Map",
           "mapValue": {
-            "name": "fuddle_floob",
+            "name": "spazz_sigma",
             "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "fuddle_thnad",
+            "name": "spazz_pi",
             "schema": "string",
             "displayName": null
           }
@@ -225,17 +225,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_yekk;1",
+        "@id": "dtmi:example:spazz_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_flunn;1",
+          "@id": "dtmi:example:spazz_phi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "fuddle_itch",
+            "name": "spazz_chi",
             "schema": "boolean"
           },
           "mapKey": {
-            "name": "fuddle_jogg",
+            "name": "spazz_upsilon",
             "schema": "string",
             "displayName": true
           }
@@ -251,18 +251,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_beta;1",
+        "@id": "dtmi:example:spazz_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_hi;1",
+          "@id": "dtmi:example:spazz_yuzz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "glikk_alpha",
+            "name": "spazz_wum",
             "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "fuddle_vroo",
+            "name": "spazz_omega",
             "schema": "string",
             "displayName": true
           }
@@ -278,17 +278,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_zeta;1",
+        "@id": "dtmi:example:spazz_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_delta;1",
+          "@id": "dtmi:example:spazz_fuddle;1",
           "@type": "Map",
           "mapValue": {
-            "name": "glikk_epsilon",
+            "name": "spazz_glikk",
             "schema": "dateTime"
           },
           "mapKey": {
-            "name": "glikk_gamma",
+            "name": "spazz_humpf",
             "schema": "string",
             "displayName": 626
           }
@@ -304,18 +304,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_kappa;1",
+        "@id": "dtmi:example:spazz_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_theta;1",
+          "@id": "dtmi:example:spazz_quan;1",
           "@type": "Map",
           "mapValue": {
-            "name": "glikk_iota",
+            "name": "spazz_thnad",
             "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "glikk_eta",
+            "name": "spazz_snee",
             "schema": "string",
             "displayName": 626
           }
@@ -331,17 +331,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_xi;1",
+        "@id": "dtmi:example:spazz_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_mu;1",
+          "@id": "dtmi:example:spazz_zatz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "glikk_nu",
+            "name": "spazz_jogg",
             "schema": "duration"
           },
           "mapKey": {
-            "name": "glikk_lambda",
+            "name": "spazz_floob",
             "schema": "string",
             "displayName": [
               null
@@ -359,18 +359,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_sigma;1",
+        "@id": "dtmi:example:spazz_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_pi;1",
+          "@id": "dtmi:example:spazz_yekk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "glikk_rho",
+            "name": "spazz_vroo",
             "schema": "float"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "glikk_omicron",
+            "name": "spazz_itch",
             "schema": "string",
             "displayName": [
               null
@@ -388,17 +388,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_chi;1",
+        "@id": "dtmi:example:floob_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_upsilon;1",
+          "@id": "dtmi:example:floob_beta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "glikk_phi",
+            "name": "floob_gamma",
             "schema": "integer"
           },
           "mapKey": {
-            "name": "glikk_tau",
+            "name": "floob_alpha",
             "schema": "string",
             "displayName": [
               true
@@ -416,18 +416,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_wum;1",
+        "@id": "dtmi:example:floob_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_omega;1",
+          "@id": "dtmi:example:floob_zeta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "glikk_yuzz",
+            "name": "floob_eta",
             "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "glikk_psi",
+            "name": "floob_epsilon",
             "schema": "string",
             "displayName": [
               true
@@ -445,17 +445,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_glikk;1",
+        "@id": "dtmi:example:floob_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_humpf;1",
+          "@id": "dtmi:example:floob_kappa;1",
           "@type": "Map",
           "mapValue": {
-            "name": "glikk_fuddle",
+            "name": "floob_lambda",
             "schema": "string"
           },
           "mapKey": {
-            "name": "glikk_um",
+            "name": "floob_iota",
             "schema": "string",
             "displayName": [
               626
@@ -473,18 +473,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_thnad;1",
+        "@id": "dtmi:example:floob_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_snee;1",
+          "@id": "dtmi:example:floob_xi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "glikk_quan",
+            "name": "floob_omicron",
             "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "glikk_nuh",
+            "name": "floob_nu",
             "schema": "string",
             "displayName": [
               626
@@ -502,17 +502,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_jogg;1",
+        "@id": "dtmi:example:floob_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_floob;1",
+          "@id": "dtmi:example:floob_sigma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "glikk_zatz",
+            "name": "floob_tau",
             "schema": "boolean"
           },
           "mapKey": {
-            "name": "glikk_spazz",
+            "name": "floob_rho",
             "schema": "string",
             "displayName": [
               {}
@@ -530,18 +530,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_vroo;1",
+        "@id": "dtmi:example:floob_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_itch;1",
+          "@id": "dtmi:example:floob_chi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "glikk_yekk",
+            "name": "floob_psi",
             "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "glikk_flunn",
+            "name": "floob_phi",
             "schema": "string",
             "displayName": [
               {}
@@ -559,17 +559,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_gamma;1",
+        "@id": "dtmi:example:floob_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_alpha;1",
+          "@id": "dtmi:example:floob_wum;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nuh_beta",
+            "name": "floob_um",
             "schema": "dateTime"
           },
           "mapKey": {
-            "name": "glikk_hi",
+            "name": "floob_yuzz",
             "schema": "string",
             "displayName": {
               "@value": "hello",
@@ -588,18 +588,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_eta;1",
+        "@id": "dtmi:example:floob_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_epsilon;1",
+          "@id": "dtmi:example:floob_glikk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nuh_zeta",
+            "name": "floob_nuh",
             "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nuh_delta",
+            "name": "floob_fuddle",
             "schema": "string",
             "displayName": {
               "@value": "hello",
@@ -618,17 +618,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_lambda;1",
+        "@id": "dtmi:example:floob_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_iota;1",
+          "@id": "dtmi:example:floob_thnad;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nuh_kappa",
+            "name": "floob_spazz",
             "schema": "duration"
           },
           "mapKey": {
-            "name": "nuh_theta",
+            "name": "floob_quan",
             "schema": "string",
             "displayName": [
               {
@@ -648,18 +648,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_omicron;1",
+        "@id": "dtmi:example:floob_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_nu;1",
+          "@id": "dtmi:example:floob_jogg;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nuh_xi",
+            "name": "floob_flunn",
             "schema": "float"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nuh_mu",
+            "name": "floob_zatz",
             "schema": "string",
             "displayName": [
               {
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyDisplayNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyDisplayNameStringLengthV2.json
index 46ece543..b87be0c6 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyDisplayNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyDisplayNameStringLengthV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_tau;1",
+        "@id": "dtmi:example:zatz_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_rho;1",
+          "@id": "dtmi:example:floob_vroo;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nuh_sigma",
+            "name": "floob_hi",
             "schema": "integer"
           },
           "mapKey": {
-            "name": "nuh_pi",
+            "name": "floob_yekk",
             "schema": "string",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSometh"
           }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_psi;1",
+        "@id": "dtmi:example:zatz_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_phi;1",
+          "@id": "dtmi:example:zatz_gamma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nuh_chi",
+            "name": "zatz_delta",
             "schema": "long"
           },
           "mapKey": {
-            "name": "nuh_upsilon",
+            "name": "zatz_beta",
             "schema": "string",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
           }
@@ -59,18 +59,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_um;1",
+        "@id": "dtmi:example:zatz_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_yuzz;1",
+          "@id": "dtmi:example:zatz_eta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nuh_wum",
+            "name": "zatz_theta",
             "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nuh_omega",
+            "name": "zatz_zeta",
             "schema": "string",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
           }
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyDisplayNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyDisplayNameTermAndDtmiV2.json
index 7c29ad15..5d9829bf 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyDisplayNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyDisplayNameTermAndDtmiV2.json
@@ -7,23 +7,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_epsilon;1",
+        "@id": "dtmi:example:zatz_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_gamma;1",
+          "@id": "dtmi:example:zatz_humpf;1",
           "@type": "Map",
           "mapValue": {
-            "name": "snee_delta",
+            "name": "zatz_fuddle",
             "schema": "dateTime"
           },
           "mapKey": {
             "displayName": [
-              "nuh_hi"
+              "zatz_yuzz"
             ],
             "dtmi:dtdl:property:displayName;2": [
-              "snee_alpha"
+              "zatz_wum"
             ],
-            "name": "snee_beta",
+            "name": "zatz_um",
             "schema": "string"
           }
         }
@@ -38,24 +38,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_lambda;1",
+        "@id": "dtmi:example:zatz_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_iota;1",
+          "@id": "dtmi:example:zatz_thnad;1",
           "@type": "Map",
           "mapValue": {
-            "name": "snee_kappa",
+            "name": "zatz_spazz",
             "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "displayName": [
-              "snee_zeta"
+              "zatz_nuh"
             ],
             "dtmi:dtdl:property:displayName;2": [
-              "snee_eta"
+              "zatz_snee"
             ],
-            "name": "snee_theta",
+            "name": "zatz_quan",
             "schema": "string"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyFormallyInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyFormallyInvalidDtmiV2.json
index 859454df..7f4a04a5 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyFormallyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyFormallyInvalidDtmiV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_upsilon;1",
+        "@id": "dtmi:example:flunn_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_sigma;1",
+          "@id": "dtmi:example:jogg_hi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "quan_tau",
+            "name": "flunn_alpha",
             "schema": "integer"
           },
           "mapKey": {
-            "name": "quan_rho",
+            "name": "jogg_vroo",
             "schema": "string",
             "dtmi:foo//bar": 626
           }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_omega;1",
+        "@id": "dtmi:example:flunn_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_chi;1",
+          "@id": "dtmi:example:flunn_delta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "quan_psi",
+            "name": "flunn_epsilon",
             "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "quan_phi",
+            "name": "flunn_gamma",
             "schema": "string",
             "dtmi:foo//bar": 626
           }
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyFormallyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyFormallyIrrelevantDtmiOrTermV2.json
index b6326e04..4372f4ab 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyFormallyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyFormallyIrrelevantDtmiOrTermV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_hi;1",
+        "@id": "dtmi:example:jogg_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_yekk;1",
+          "@id": "dtmi:example:jogg_psi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "snee_vroo",
+            "name": "jogg_omega",
             "schema": "date"
           },
           "mapKey": {
-            "name": "snee_itch",
+            "name": "jogg_chi",
             "schema": "string",
             "dtmi:foo:bar;1": 626
           }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_delta;1",
+        "@id": "dtmi:example:jogg_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_beta;1",
+          "@id": "dtmi:example:jogg_um;1",
           "@type": "Map",
           "mapValue": {
-            "name": "quan_gamma",
+            "name": "jogg_humpf",
             "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "quan_alpha",
+            "name": "jogg_wum",
             "schema": "string",
             "dtmi:foo:bar;1": 626
           }
@@ -60,17 +60,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_theta;1",
+        "@id": "dtmi:example:jogg_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_zeta;1",
+          "@id": "dtmi:example:jogg_nuh;1",
           "@type": "Map",
           "mapValue": {
-            "name": "quan_eta",
+            "name": "jogg_snee",
             "schema": "double"
           },
           "mapKey": {
-            "name": "quan_epsilon",
+            "name": "jogg_glikk",
             "schema": "string",
             "boolean": null
           }
@@ -86,18 +86,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_mu;1",
+        "@id": "dtmi:example:jogg_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_kappa;1",
+          "@id": "dtmi:example:jogg_spazz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "quan_lambda",
+            "name": "jogg_floob",
             "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "quan_iota",
+            "name": "jogg_thnad",
             "schema": "string",
             "boolean": null
           }
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyFormallyNotDtmiNorTermV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyFormallyNotDtmiNorTermV2.json
index c4a6006d..092baa36 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyFormallyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyFormallyNotDtmiNorTermV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_snee;1",
+        "@id": "dtmi:example:flunn_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_glikk;1",
+          "@id": "dtmi:example:flunn_mu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "quan_nuh",
+            "name": "flunn_nu",
             "schema": "time"
           },
           "mapKey": {
-            "name": "quan_fuddle",
+            "name": "flunn_lambda",
             "schema": "string",
             "http://foo.com/bar": true
           }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_floob;1",
+        "@id": "dtmi:example:flunn_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_thnad;1",
+          "@id": "dtmi:example:flunn_pi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "quan_spazz",
+            "name": "flunn_rho",
             "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "quan_quan",
+            "name": "flunn_omicron",
             "schema": "string",
             "http://foo.com/bar": true
           }
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyFormallyUndefinedTermV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyFormallyUndefinedTermV2.json
index 5961e184..0936ff34 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyFormallyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyFormallyUndefinedTermV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_alpha;1",
+        "@id": "dtmi:example:flunn_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_vroo;1",
+          "@id": "dtmi:example:flunn_omega;1",
           "@type": "Map",
           "mapValue": {
-            "name": "quan_hi",
+            "name": "flunn_yuzz",
             "schema": "dateTime"
           },
           "mapKey": {
-            "name": "quan_yekk",
+            "name": "flunn_psi",
             "schema": "string",
             "foobar": {}
           }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_epsilon;1",
+        "@id": "dtmi:example:flunn_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_gamma;1",
+          "@id": "dtmi:example:flunn_humpf;1",
           "@type": "Map",
           "mapValue": {
-            "name": "thnad_delta",
+            "name": "flunn_fuddle",
             "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "thnad_beta",
+            "name": "flunn_um",
             "schema": "string",
             "foobar": {}
           }
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyNamePatternV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyNamePatternV2.json
index 5d91f80b..144d7145 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyNamePatternV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyNamePatternV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_omicron;1",
+        "@id": "dtmi:example:delta_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_nu;1",
+          "@id": "dtmi:example:delta_glikk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "vroo_xi",
-            "schema": "time"
+            "name": "delta_nuh",
+            "schema": "long"
           },
           "mapKey": {
             "schema": "string",
@@ -32,14 +32,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_sigma;1",
+        "@id": "dtmi:example:delta_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_pi;1",
+          "@id": "dtmi:example:delta_quan;1",
           "@type": "Map",
           "mapValue": {
-            "name": "vroo_rho",
-            "schema": "boolean"
+            "name": "delta_thnad",
+            "schema": "string"
           },
           "mapKey": {
             "schema": "string",
@@ -57,14 +57,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_phi;1",
+        "@id": "dtmi:example:delta_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_tau;1",
+          "@id": "dtmi:example:delta_floob;1",
           "@type": "Map",
           "mapValue": {
-            "name": "vroo_upsilon",
-            "schema": "date"
+            "name": "delta_zatz",
+            "schema": "time"
           },
           "mapKey": {
             "schema": "string",
@@ -82,14 +82,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_omega;1",
+        "@id": "dtmi:example:delta_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_chi;1",
+          "@id": "dtmi:example:delta_flunn;1",
           "@type": "Map",
           "mapValue": {
-            "name": "vroo_psi",
-            "schema": "dateTime"
+            "name": "delta_itch",
+            "schema": "boolean"
           },
           "mapKey": {
             "schema": "string",
@@ -107,14 +107,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_um;1",
+        "@id": "dtmi:example:epsilon_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_yuzz;1",
+          "@id": "dtmi:example:delta_vroo;1",
           "@type": "Map",
           "mapValue": {
-            "name": "vroo_wum",
-            "schema": "double"
+            "name": "delta_hi",
+            "schema": "date"
           },
           "mapKey": {
             "schema": "string",
@@ -132,14 +132,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_glikk;1",
+        "@id": "dtmi:example:epsilon_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_humpf;1",
+          "@id": "dtmi:example:epsilon_beta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "vroo_fuddle",
-            "schema": "duration"
+            "name": "epsilon_gamma",
+            "schema": "dateTime"
           },
           "mapKey": {
             "schema": "string",
@@ -157,14 +157,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_quan;1",
+        "@id": "dtmi:example:epsilon_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_nuh;1",
+          "@id": "dtmi:example:epsilon_epsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "vroo_snee",
-            "schema": "float"
+            "name": "epsilon_zeta",
+            "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -183,14 +183,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_floob;1",
+        "@id": "dtmi:example:epsilon_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_thnad;1",
+          "@id": "dtmi:example:epsilon_theta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "vroo_spazz",
-            "schema": "integer"
+            "name": "epsilon_iota",
+            "schema": "duration"
           },
           "mapKey": {
             "schema": "string",
@@ -208,14 +208,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_flunn;1",
+        "@id": "dtmi:example:epsilon_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_zatz;1",
+          "@id": "dtmi:example:epsilon_lambda;1",
           "@type": "Map",
           "mapValue": {
-            "name": "vroo_jogg",
-            "schema": "long"
+            "name": "epsilon_mu",
+            "schema": "float"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -234,14 +234,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_vroo;1",
+        "@id": "dtmi:example:epsilon_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_itch;1",
+          "@id": "dtmi:example:epsilon_xi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "vroo_yekk",
-            "schema": "string"
+            "name": "epsilon_omicron",
+            "schema": "integer"
           },
           "mapKey": {
             "schema": "string",
@@ -259,14 +259,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_beta;1",
+        "@id": "dtmi:example:epsilon_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_hi;1",
+          "@id": "dtmi:example:epsilon_rho;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_alpha",
-            "schema": "time"
+            "name": "epsilon_sigma",
+            "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -285,14 +285,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_epsilon;1",
+        "@id": "dtmi:example:epsilon_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_gamma;1",
+          "@id": "dtmi:example:epsilon_upsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_delta",
-            "schema": "boolean"
+            "name": "epsilon_phi",
+            "schema": "string"
           },
           "mapKey": {
             "schema": "string",
@@ -310,14 +310,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_theta;1",
+        "@id": "dtmi:example:epsilon_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_zeta;1",
+          "@id": "dtmi:example:epsilon_psi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_eta",
-            "schema": "date"
+            "name": "epsilon_omega",
+            "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -336,14 +336,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_lambda;1",
+        "@id": "dtmi:example:epsilon_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_iota;1",
+          "@id": "dtmi:example:epsilon_wum;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_kappa",
-            "schema": "dateTime"
+            "name": "epsilon_um",
+            "schema": "boolean"
           },
           "mapKey": {
             "schema": "string",
@@ -361,14 +361,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_xi;1",
+        "@id": "dtmi:example:epsilon_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_mu;1",
+          "@id": "dtmi:example:epsilon_fuddle;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_nu",
-            "schema": "double"
+            "name": "epsilon_glikk",
+            "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -387,14 +387,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_rho;1",
+        "@id": "dtmi:example:epsilon_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_omicron;1",
+          "@id": "dtmi:example:epsilon_snee;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_pi",
-            "schema": "duration"
+            "name": "epsilon_quan",
+            "schema": "dateTime"
           },
           "mapKey": {
             "schema": "string",
@@ -412,14 +412,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_upsilon;1",
+        "@id": "dtmi:example:epsilon_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_sigma;1",
+          "@id": "dtmi:example:epsilon_spazz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_tau",
-            "schema": "float"
+            "name": "epsilon_floob",
+            "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -438,14 +438,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_psi;1",
+        "@id": "dtmi:example:epsilon_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_phi;1",
+          "@id": "dtmi:example:epsilon_jogg;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_chi",
-            "schema": "integer"
+            "name": "epsilon_flunn",
+            "schema": "duration"
           },
           "mapKey": {
             "schema": "string",
@@ -463,14 +463,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_wum;1",
+        "@id": "dtmi:example:epsilon_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_omega;1",
+          "@id": "dtmi:example:epsilon_yekk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_yuzz",
-            "schema": "long"
+            "name": "epsilon_vroo",
+            "schema": "float"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -489,14 +489,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_fuddle;1",
+        "@id": "dtmi:example:zeta_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_um;1",
+          "@id": "dtmi:example:zeta_alpha;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_humpf",
-            "schema": "string"
+            "name": "zeta_beta",
+            "schema": "integer"
           },
           "mapKey": {
             "schema": "string",
@@ -514,14 +514,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_snee;1",
+        "@id": "dtmi:example:zeta_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_glikk;1",
+          "@id": "dtmi:example:zeta_delta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_nuh",
-            "schema": "time"
+            "name": "zeta_epsilon",
+            "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -540,14 +540,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_spazz;1",
+        "@id": "dtmi:example:zeta_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_quan;1",
+          "@id": "dtmi:example:zeta_eta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_thnad",
-            "schema": "boolean"
+            "name": "zeta_theta",
+            "schema": "string"
           },
           "mapKey": {
             "schema": "string",
@@ -565,14 +565,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_jogg;1",
+        "@id": "dtmi:example:zeta_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_floob;1",
+          "@id": "dtmi:example:zeta_kappa;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_zatz",
-            "schema": "date"
+            "name": "zeta_lambda",
+            "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -591,14 +591,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_yekk;1",
+        "@id": "dtmi:example:zeta_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_flunn;1",
+          "@id": "dtmi:example:zeta_nu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_itch",
-            "schema": "dateTime"
+            "name": "zeta_xi",
+            "schema": "boolean"
           },
           "mapKey": {
             "schema": "string",
@@ -616,14 +616,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_alpha;1",
+        "@id": "dtmi:example:zeta_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_vroo;1",
+          "@id": "dtmi:example:zeta_pi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_hi",
-            "schema": "double"
+            "name": "zeta_rho",
+            "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyNameStringLengthV2.json
index 67a69bf3..288df22e 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyNameStringLengthV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_zeta;1",
+        "@id": "dtmi:example:delta_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_delta;1",
+          "@id": "dtmi:example:delta_phi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "vroo_epsilon",
-            "schema": "integer"
+            "name": "delta_chi",
+            "schema": "duration"
           },
           "mapKey": {
             "schema": "string",
@@ -32,14 +32,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_iota;1",
+        "@id": "dtmi:example:delta_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_eta;1",
+          "@id": "dtmi:example:delta_omega;1",
           "@type": "Map",
           "mapValue": {
-            "name": "vroo_theta",
-            "schema": "long"
+            "name": "delta_yuzz",
+            "schema": "float"
           },
           "mapKey": {
             "schema": "string",
@@ -57,14 +57,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_mu;1",
+        "@id": "dtmi:example:delta_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_kappa;1",
+          "@id": "dtmi:example:delta_um;1",
           "@type": "Map",
           "mapValue": {
-            "name": "vroo_lambda",
-            "schema": "string"
+            "name": "delta_humpf",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyNameStringV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyNameStringV2.json
index ff7f7a81..2807e47e 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyNameStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyNameStringV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_wum;1",
+        "@id": "dtmi:example:beta_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_omega;1",
+          "@id": "dtmi:example:beta_yekk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "itch_yuzz",
-            "schema": "duration"
+            "name": "beta_vroo",
+            "schema": "dateTime"
           },
           "mapKey": {
             "schema": "string",
@@ -32,14 +32,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_fuddle;1",
+        "@id": "dtmi:example:gamma_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_um;1",
+          "@id": "dtmi:example:gamma_alpha;1",
           "@type": "Map",
           "mapValue": {
-            "name": "itch_humpf",
-            "schema": "float"
+            "name": "gamma_beta",
+            "schema": "double"
           },
           "mapKey": {
             "schema": "string",
@@ -59,14 +59,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_snee;1",
+        "@id": "dtmi:example:gamma_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_glikk;1",
+          "@id": "dtmi:example:gamma_delta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "itch_nuh",
-            "schema": "integer"
+            "name": "gamma_epsilon",
+            "schema": "duration"
           },
           "mapKey": {
             "schema": "string",
@@ -87,14 +87,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_spazz;1",
+        "@id": "dtmi:example:gamma_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_quan;1",
+          "@id": "dtmi:example:gamma_eta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "itch_thnad",
-            "schema": "long"
+            "name": "gamma_theta",
+            "schema": "float"
           },
           "mapKey": {
             "schema": "string",
@@ -117,14 +117,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_jogg;1",
+        "@id": "dtmi:example:gamma_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_floob;1",
+          "@id": "dtmi:example:gamma_kappa;1",
           "@type": "Map",
           "mapValue": {
-            "name": "itch_zatz",
-            "schema": "string"
+            "name": "gamma_lambda",
+            "schema": "integer"
           },
           "mapKey": {
             "schema": "string",
@@ -142,14 +142,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_yekk;1",
+        "@id": "dtmi:example:gamma_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_flunn;1",
+          "@id": "dtmi:example:gamma_nu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "itch_itch",
-            "schema": "time"
+            "name": "gamma_xi",
+            "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -168,14 +168,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_alpha;1",
+        "@id": "dtmi:example:gamma_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_vroo;1",
+          "@id": "dtmi:example:gamma_pi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "itch_hi",
-            "schema": "boolean"
+            "name": "gamma_rho",
+            "schema": "string"
           },
           "mapKey": {
             "schema": "string",
@@ -193,14 +193,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_delta;1",
+        "@id": "dtmi:example:gamma_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_beta;1",
+          "@id": "dtmi:example:gamma_tau;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_gamma",
-            "schema": "date"
+            "name": "gamma_upsilon",
+            "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -219,14 +219,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_eta;1",
+        "@id": "dtmi:example:gamma_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_epsilon;1",
+          "@id": "dtmi:example:gamma_chi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_zeta",
-            "schema": "dateTime"
+            "name": "gamma_psi",
+            "schema": "boolean"
           },
           "mapKey": {
             "schema": "string",
@@ -244,14 +244,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_kappa;1",
+        "@id": "dtmi:example:gamma_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_theta;1",
+          "@id": "dtmi:example:gamma_yuzz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_iota",
-            "schema": "double"
+            "name": "gamma_wum",
+            "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -270,14 +270,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_nu;1",
+        "@id": "dtmi:example:gamma_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_lambda;1",
+          "@id": "dtmi:example:gamma_humpf;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_mu",
-            "schema": "duration"
+            "name": "gamma_fuddle",
+            "schema": "dateTime"
           },
           "mapKey": {
             "schema": "string",
@@ -297,14 +297,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_pi;1",
+        "@id": "dtmi:example:gamma_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_xi;1",
+          "@id": "dtmi:example:gamma_nuh;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_omicron",
-            "schema": "float"
+            "name": "gamma_snee",
+            "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -325,14 +325,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_tau;1",
+        "@id": "dtmi:example:gamma_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_rho;1",
+          "@id": "dtmi:example:gamma_thnad;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_sigma",
-            "schema": "integer"
+            "name": "gamma_spazz",
+            "schema": "duration"
           },
           "mapKey": {
             "schema": "string",
@@ -352,14 +352,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_chi;1",
+        "@id": "dtmi:example:gamma_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_upsilon;1",
+          "@id": "dtmi:example:gamma_zatz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_phi",
-            "schema": "long"
+            "name": "gamma_jogg",
+            "schema": "float"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -380,14 +380,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_yuzz;1",
+        "@id": "dtmi:example:gamma_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_psi;1",
+          "@id": "dtmi:example:gamma_itch;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_omega",
-            "schema": "string"
+            "name": "gamma_yekk",
+            "schema": "integer"
           },
           "mapKey": {
             "schema": "string",
@@ -407,14 +407,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_humpf;1",
+        "@id": "dtmi:example:delta_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_wum;1",
+          "@id": "dtmi:example:gamma_hi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_um",
-            "schema": "time"
+            "name": "delta_alpha",
+            "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -435,14 +435,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_nuh;1",
+        "@id": "dtmi:example:delta_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_fuddle;1",
+          "@id": "dtmi:example:delta_gamma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_glikk",
-            "schema": "boolean"
+            "name": "delta_delta",
+            "schema": "string"
           },
           "mapKey": {
             "schema": "string",
@@ -460,14 +460,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_thnad;1",
+        "@id": "dtmi:example:delta_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_snee;1",
+          "@id": "dtmi:example:delta_zeta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_quan",
-            "schema": "date"
+            "name": "delta_eta",
+            "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -486,14 +486,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_zatz;1",
+        "@id": "dtmi:example:delta_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_spazz;1",
+          "@id": "dtmi:example:delta_iota;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_floob",
-            "schema": "dateTime"
+            "name": "delta_kappa",
+            "schema": "boolean"
           },
           "mapKey": {
             "schema": "string",
@@ -513,14 +513,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_itch;1",
+        "@id": "dtmi:example:delta_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_jogg;1",
+          "@id": "dtmi:example:delta_mu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_flunn",
-            "schema": "double"
+            "name": "delta_nu",
+            "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -541,14 +541,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_hi;1",
+        "@id": "dtmi:example:delta_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_yekk;1",
+          "@id": "dtmi:example:delta_omicron;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_vroo",
-            "schema": "duration"
+            "name": "delta_pi",
+            "schema": "dateTime"
           },
           "mapKey": {
             "schema": "string",
@@ -566,14 +566,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_gamma;1",
+        "@id": "dtmi:example:delta_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_alpha;1",
+          "@id": "dtmi:example:delta_sigma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "vroo_beta",
-            "schema": "float"
+            "name": "delta_tau",
+            "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyNameTermAndDtmiV2.json
index 6913797d..4ef306b3 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyPropertyNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyPropertyNameTermAndDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_sigma;1",
+        "@id": "dtmi:example:zeta_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_pi;1",
+          "@id": "dtmi:example:zeta_quan;1",
           "@type": "Map",
           "mapValue": {
-            "name": "alpha_rho",
-            "schema": "long"
+            "name": "zeta_thnad",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "alpha_xi",
-            "dtmi:dtdl:property:name;2": "alpha_omicron",
+            "name": "zeta_nuh",
+            "dtmi:dtdl:property:name;2": "zeta_snee",
             "schema": "string"
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_psi;1",
+        "@id": "dtmi:example:zeta_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_phi;1",
+          "@id": "dtmi:example:zeta_jogg;1",
           "@type": "Map",
           "mapValue": {
-            "name": "alpha_chi",
-            "schema": "string"
+            "name": "zeta_flunn",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "alpha_tau",
-            "dtmi:dtdl:property:name;2": "alpha_upsilon",
+            "name": "zeta_floob",
+            "dtmi:dtdl:property:name;2": "zeta_zatz",
             "schema": "string"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyPropertySchemaSpecificValuesV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyPropertySchemaSpecificValuesV2.json
index b4187e30..a024e060 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyPropertySchemaSpecificValuesV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyPropertySchemaSpecificValuesV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_um;1",
+        "@id": "dtmi:example:eta_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_yuzz;1",
+          "@id": "dtmi:example:zeta_vroo;1",
           "@type": "Map",
           "mapValue": {
-            "name": "alpha_wum",
-            "schema": "time"
+            "name": "zeta_hi",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "alpha_omega",
+            "name": "zeta_yekk",
             "schema": "string"
           }
         }
@@ -32,17 +32,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_nuh;1",
+        "@id": "dtmi:example:eta_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_fuddle;1",
+          "@id": "dtmi:example:eta_gamma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "alpha_glikk",
-            "schema": "boolean"
+            "name": "eta_delta",
+            "schema": "string"
           },
           "mapKey": {
-            "name": "alpha_humpf",
+            "name": "eta_beta",
             "schema": [
               "string"
             ]
@@ -59,17 +59,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_spazz;1",
+        "@id": "dtmi:example:eta_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_quan;1",
+          "@id": "dtmi:example:eta_eta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "alpha_thnad",
-            "schema": "date"
+            "name": "eta_theta",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "alpha_snee",
+            "name": "eta_zeta",
             "schema": "dtmi:dtdl:instance:Schema:string;2"
           }
         }
@@ -84,17 +84,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_flunn;1",
+        "@id": "dtmi:example:eta_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_zatz;1",
+          "@id": "dtmi:example:eta_lambda;1",
           "@type": "Map",
           "mapValue": {
-            "name": "alpha_jogg",
-            "schema": "dateTime"
+            "name": "eta_mu",
+            "schema": "boolean"
           },
           "mapKey": {
-            "name": "alpha_floob",
+            "name": "eta_kappa",
             "schema": [
               "dtmi:dtdl:instance:Schema:string;2"
             ]
@@ -111,17 +111,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_hi;1",
+        "@id": "dtmi:example:eta_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_yekk;1",
+          "@id": "dtmi:example:eta_omicron;1",
           "@type": "Map",
           "mapValue": {
-            "name": "alpha_vroo",
-            "schema": "double"
+            "name": "eta_pi",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "alpha_itch",
+            "name": "eta_xi",
             "schema": [
               "string",
               "dtmi:dtdl:instance:Schema:string;2"
@@ -139,18 +139,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_delta;1",
+        "@id": "dtmi:example:eta_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_beta;1",
+          "@id": "dtmi:example:eta_tau;1",
           "@type": "Map",
           "mapValue": {
-            "name": "beta_gamma",
-            "schema": "duration"
+            "name": "eta_upsilon",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "beta_alpha",
+            "name": "eta_sigma",
             "schema": [
               "string",
               "dtmi:dtdl:instance:Schema:string;2"
@@ -168,17 +168,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_theta;1",
+        "@id": "dtmi:example:eta_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_zeta;1",
+          "@id": "dtmi:example:eta_psi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "beta_eta",
-            "schema": "float"
+            "name": "eta_omega",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "beta_epsilon",
+            "name": "eta_chi",
             "schema": []
           }
         }
@@ -193,18 +193,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_mu;1",
+        "@id": "dtmi:example:eta_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_kappa;1",
+          "@id": "dtmi:example:eta_um;1",
           "@type": "Map",
           "mapValue": {
-            "name": "beta_lambda",
-            "schema": "integer"
+            "name": "eta_humpf",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "beta_iota",
+            "name": "eta_wum",
             "schema": []
           }
         }
@@ -219,17 +219,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_pi;1",
+        "@id": "dtmi:example:eta_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_xi;1",
+          "@id": "dtmi:example:eta_nuh;1",
           "@type": "Map",
           "mapValue": {
-            "name": "beta_omicron",
-            "schema": "long"
+            "name": "eta_snee",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "beta_nu",
+            "name": "eta_glikk",
             "schema": null
           }
         }
@@ -244,18 +244,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_upsilon;1",
+        "@id": "dtmi:example:eta_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_sigma;1",
+          "@id": "dtmi:example:eta_spazz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "beta_tau",
-            "schema": "string"
+            "name": "eta_floob",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "beta_rho",
+            "name": "eta_thnad",
             "schema": null
           }
         }
@@ -270,17 +270,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_omega;1",
+        "@id": "dtmi:example:eta_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_chi;1",
+          "@id": "dtmi:example:eta_flunn;1",
           "@type": "Map",
           "mapValue": {
-            "name": "beta_psi",
-            "schema": "time"
+            "name": "eta_itch",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "beta_phi",
+            "name": "eta_jogg",
             "schema": true
           }
         }
@@ -295,18 +295,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_humpf;1",
+        "@id": "dtmi:example:theta_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_wum;1",
+          "@id": "dtmi:example:eta_hi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "beta_um",
-            "schema": "boolean"
+            "name": "theta_alpha",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "beta_yuzz",
+            "name": "eta_vroo",
             "schema": true
           }
         }
@@ -321,17 +321,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_snee;1",
+        "@id": "dtmi:example:theta_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_glikk;1",
+          "@id": "dtmi:example:theta_delta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "beta_nuh",
-            "schema": "date"
+            "name": "theta_epsilon",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "beta_fuddle",
+            "name": "theta_gamma",
             "schema": 626
           }
         }
@@ -346,18 +346,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_floob;1",
+        "@id": "dtmi:example:theta_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_thnad;1",
+          "@id": "dtmi:example:theta_theta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "beta_spazz",
-            "schema": "dateTime"
+            "name": "theta_iota",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "beta_quan",
+            "name": "theta_eta",
             "schema": 626
           }
         }
@@ -372,17 +372,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_itch;1",
+        "@id": "dtmi:example:theta_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_jogg;1",
+          "@id": "dtmi:example:theta_mu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "beta_flunn",
-            "schema": "double"
+            "name": "theta_nu",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "beta_zatz",
+            "name": "theta_lambda",
             "schema": [
               null
             ]
@@ -399,18 +399,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_alpha;1",
+        "@id": "dtmi:example:theta_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_vroo;1",
+          "@id": "dtmi:example:theta_pi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "beta_hi",
-            "schema": "duration"
+            "name": "theta_rho",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "beta_yekk",
+            "name": "theta_omicron",
             "schema": [
               null
             ]
@@ -427,17 +427,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_epsilon;1",
+        "@id": "dtmi:example:theta_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_gamma;1",
+          "@id": "dtmi:example:theta_upsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "gamma_delta",
-            "schema": "float"
+            "name": "theta_phi",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "gamma_beta",
+            "name": "theta_tau",
             "schema": [
               true
             ]
@@ -454,18 +454,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_iota;1",
+        "@id": "dtmi:example:theta_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_eta;1",
+          "@id": "dtmi:example:theta_omega;1",
           "@type": "Map",
           "mapValue": {
-            "name": "gamma_theta",
-            "schema": "integer"
+            "name": "theta_yuzz",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "gamma_zeta",
+            "name": "theta_psi",
             "schema": [
               true
             ]
@@ -482,17 +482,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_nu;1",
+        "@id": "dtmi:example:theta_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_lambda;1",
+          "@id": "dtmi:example:theta_humpf;1",
           "@type": "Map",
           "mapValue": {
-            "name": "gamma_mu",
-            "schema": "long"
+            "name": "theta_fuddle",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "gamma_kappa",
+            "name": "theta_um",
             "schema": [
               626
             ]
@@ -509,18 +509,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_rho;1",
+        "@id": "dtmi:example:theta_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_omicron;1",
+          "@id": "dtmi:example:theta_snee;1",
           "@type": "Map",
           "mapValue": {
-            "name": "gamma_pi",
-            "schema": "string"
+            "name": "theta_quan",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "gamma_xi",
+            "name": "theta_nuh",
             "schema": [
               626
             ]
@@ -537,17 +537,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_phi;1",
+        "@id": "dtmi:example:theta_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_tau;1",
+          "@id": "dtmi:example:theta_floob;1",
           "@type": "Map",
           "mapValue": {
-            "name": "gamma_upsilon",
-            "schema": "time"
+            "name": "theta_zatz",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "gamma_sigma",
+            "name": "theta_spazz",
             "schema": {}
           }
         }
@@ -562,18 +562,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_yuzz;1",
+        "@id": "dtmi:example:theta_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_psi;1",
+          "@id": "dtmi:example:theta_itch;1",
           "@type": "Map",
           "mapValue": {
-            "name": "gamma_omega",
-            "schema": "boolean"
+            "name": "theta_yekk",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "gamma_chi",
+            "name": "theta_flunn",
             "schema": {}
           }
         }
@@ -588,17 +588,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_fuddle;1",
+        "@id": "dtmi:example:iota_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_um;1",
+          "@id": "dtmi:example:iota_alpha;1",
           "@type": "Map",
           "mapValue": {
-            "name": "gamma_humpf",
-            "schema": "date"
+            "name": "iota_beta",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "gamma_wum",
+            "name": "theta_hi",
             "schema": [
               {}
             ]
@@ -615,18 +615,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_quan;1",
+        "@id": "dtmi:example:iota_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_nuh;1",
+          "@id": "dtmi:example:iota_epsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "gamma_snee",
-            "schema": "dateTime"
+            "name": "iota_zeta",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "gamma_glikk",
+            "name": "iota_delta",
             "schema": [
               {}
             ]
@@ -643,17 +643,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_zatz;1",
+        "@id": "dtmi:example:iota_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_spazz;1",
+          "@id": "dtmi:example:iota_iota;1",
           "@type": "Map",
           "mapValue": {
-            "name": "gamma_floob",
-            "schema": "double"
+            "name": "iota_kappa",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "gamma_thnad",
+            "name": "iota_theta",
             "schema": "asynchronous"
           }
         }
@@ -668,18 +668,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_yekk;1",
+        "@id": "dtmi:example:iota_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_flunn;1",
+          "@id": "dtmi:example:iota_nu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "gamma_itch",
-            "schema": "duration"
+            "name": "iota_xi",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "gamma_jogg",
+            "name": "iota_mu",
             "schema": "asynchronous"
           }
         }
@@ -694,17 +694,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_beta;1",
+        "@id": "dtmi:example:iota_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_hi;1",
+          "@id": "dtmi:example:iota_rho;1",
           "@type": "Map",
           "mapValue": {
-            "name": "delta_alpha",
-            "schema": "float"
+            "name": "iota_sigma",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "gamma_vroo",
+            "name": "iota_pi",
             "schema": "dtmi:dtdl:instance:CommandType:asynchronous;2"
           }
         }
@@ -719,18 +719,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_zeta;1",
+        "@id": "dtmi:example:iota_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_delta;1",
+          "@id": "dtmi:example:iota_phi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "delta_epsilon",
-            "schema": "integer"
+            "name": "iota_chi",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "delta_gamma",
+            "name": "iota_upsilon",
             "schema": "dtmi:dtdl:instance:CommandType:asynchronous;2"
           }
         }
@@ -745,17 +745,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_kappa;1",
+        "@id": "dtmi:example:iota_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_theta;1",
+          "@id": "dtmi:example:iota_yuzz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "delta_iota",
-            "schema": "long"
+            "name": "iota_wum",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "delta_eta",
+            "name": "iota_omega",
             "schema": "synchronous"
           }
         }
@@ -770,18 +770,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_xi;1",
+        "@id": "dtmi:example:iota_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_mu;1",
+          "@id": "dtmi:example:iota_fuddle;1",
           "@type": "Map",
           "mapValue": {
-            "name": "delta_nu",
-            "schema": "string"
+            "name": "iota_glikk",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "delta_lambda",
+            "name": "iota_humpf",
             "schema": "synchronous"
           }
         }
@@ -796,17 +796,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_sigma;1",
+        "@id": "dtmi:example:iota_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_pi;1",
+          "@id": "dtmi:example:iota_quan;1",
           "@type": "Map",
           "mapValue": {
-            "name": "delta_rho",
-            "schema": "time"
+            "name": "iota_thnad",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "delta_omicron",
+            "name": "iota_snee",
             "schema": "dtmi:dtdl:instance:CommandType:synchronous;2"
           }
         }
@@ -821,18 +821,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_chi;1",
+        "@id": "dtmi:example:iota_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_upsilon;1",
+          "@id": "dtmi:example:iota_zatz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "delta_phi",
-            "schema": "boolean"
+            "name": "iota_jogg",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "delta_tau",
+            "name": "iota_floob",
             "schema": "dtmi:dtdl:instance:CommandType:synchronous;2"
           }
         }
@@ -847,17 +847,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_wum;1",
+        "@id": "dtmi:example:iota_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_omega;1",
+          "@id": "dtmi:example:iota_yekk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "delta_yuzz",
-            "schema": "date"
+            "name": "iota_vroo",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "delta_psi",
+            "name": "iota_itch",
             "schema": "boolean"
           }
         }
@@ -872,18 +872,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_glikk;1",
+        "@id": "dtmi:example:kappa_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_humpf;1",
+          "@id": "dtmi:example:kappa_beta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "delta_fuddle",
-            "schema": "dateTime"
+            "name": "kappa_gamma",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "delta_um",
+            "name": "kappa_alpha",
             "schema": "boolean"
           }
         }
@@ -898,17 +898,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_thnad;1",
+        "@id": "dtmi:example:kappa_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_snee;1",
+          "@id": "dtmi:example:kappa_zeta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "delta_quan",
-            "schema": "double"
+            "name": "kappa_eta",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "delta_nuh",
+            "name": "kappa_epsilon",
             "schema": "dtmi:dtdl:instance:Schema:boolean;2"
           }
         }
@@ -923,18 +923,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_jogg;1",
+        "@id": "dtmi:example:kappa_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_floob;1",
+          "@id": "dtmi:example:kappa_kappa;1",
           "@type": "Map",
           "mapValue": {
-            "name": "delta_zatz",
-            "schema": "duration"
+            "name": "kappa_lambda",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "delta_spazz",
+            "name": "kappa_iota",
             "schema": "dtmi:dtdl:instance:Schema:boolean;2"
           }
         }
@@ -949,17 +949,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_vroo;1",
+        "@id": "dtmi:example:kappa_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_itch;1",
+          "@id": "dtmi:example:kappa_xi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "delta_yekk",
-            "schema": "float"
+            "name": "kappa_omicron",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "delta_flunn",
+            "name": "kappa_nu",
             "schema": "date"
           }
         }
@@ -974,18 +974,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_gamma;1",
+        "@id": "dtmi:example:kappa_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_alpha;1",
+          "@id": "dtmi:example:kappa_sigma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "epsilon_beta",
-            "schema": "integer"
+            "name": "kappa_tau",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "delta_hi",
+            "name": "kappa_rho",
             "schema": "date"
           }
         }
@@ -1000,17 +1000,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_eta;1",
+        "@id": "dtmi:example:kappa_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_epsilon;1",
+          "@id": "dtmi:example:kappa_chi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "epsilon_zeta",
-            "schema": "long"
+            "name": "kappa_psi",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "epsilon_delta",
+            "name": "kappa_phi",
             "schema": "dtmi:dtdl:instance:Schema:date;2"
           }
         }
@@ -1025,18 +1025,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_lambda;1",
+        "@id": "dtmi:example:kappa_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_iota;1",
+          "@id": "dtmi:example:kappa_wum;1",
           "@type": "Map",
           "mapValue": {
-            "name": "epsilon_kappa",
-            "schema": "string"
+            "name": "kappa_um",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "epsilon_theta",
+            "name": "kappa_yuzz",
             "schema": "dtmi:dtdl:instance:Schema:date;2"
           }
         }
@@ -1051,17 +1051,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_omicron;1",
+        "@id": "dtmi:example:kappa_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_nu;1",
+          "@id": "dtmi:example:kappa_glikk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "epsilon_xi",
-            "schema": "time"
+            "name": "kappa_nuh",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "epsilon_mu",
+            "name": "kappa_fuddle",
             "schema": "dateTime"
           }
         }
@@ -1076,18 +1076,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_tau;1",
+        "@id": "dtmi:example:kappa_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_rho;1",
+          "@id": "dtmi:example:kappa_thnad;1",
           "@type": "Map",
           "mapValue": {
-            "name": "epsilon_sigma",
-            "schema": "boolean"
+            "name": "kappa_spazz",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "epsilon_pi",
+            "name": "kappa_quan",
             "schema": "dateTime"
           }
         }
@@ -1102,17 +1102,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_psi;1",
+        "@id": "dtmi:example:kappa_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_phi;1",
+          "@id": "dtmi:example:kappa_jogg;1",
           "@type": "Map",
           "mapValue": {
-            "name": "epsilon_chi",
-            "schema": "date"
+            "name": "kappa_flunn",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "epsilon_upsilon",
+            "name": "kappa_zatz",
             "schema": "dtmi:dtdl:instance:Schema:dateTime;2"
           }
         }
@@ -1127,18 +1127,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_um;1",
+        "@id": "dtmi:example:lambda_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_yuzz;1",
+          "@id": "dtmi:example:kappa_vroo;1",
           "@type": "Map",
           "mapValue": {
-            "name": "epsilon_wum",
-            "schema": "dateTime"
+            "name": "kappa_hi",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "epsilon_omega",
+            "name": "kappa_yekk",
             "schema": "dtmi:dtdl:instance:Schema:dateTime;2"
           }
         }
@@ -1153,17 +1153,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_nuh;1",
+        "@id": "dtmi:example:lambda_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_fuddle;1",
+          "@id": "dtmi:example:lambda_gamma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "epsilon_glikk",
-            "schema": "double"
+            "name": "lambda_delta",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "epsilon_humpf",
+            "name": "lambda_beta",
             "schema": "double"
           }
         }
@@ -1178,18 +1178,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_spazz;1",
+        "@id": "dtmi:example:lambda_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_quan;1",
+          "@id": "dtmi:example:lambda_eta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "epsilon_thnad",
-            "schema": "duration"
+            "name": "lambda_theta",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "epsilon_snee",
+            "name": "lambda_zeta",
             "schema": "double"
           }
         }
@@ -1204,17 +1204,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_flunn;1",
+        "@id": "dtmi:example:lambda_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_zatz;1",
+          "@id": "dtmi:example:lambda_lambda;1",
           "@type": "Map",
           "mapValue": {
-            "name": "epsilon_jogg",
-            "schema": "float"
+            "name": "lambda_mu",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "epsilon_floob",
+            "name": "lambda_kappa",
             "schema": "dtmi:dtdl:instance:Schema:double;2"
           }
         }
@@ -1229,18 +1229,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_hi;1",
+        "@id": "dtmi:example:lambda_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_yekk;1",
+          "@id": "dtmi:example:lambda_omicron;1",
           "@type": "Map",
           "mapValue": {
-            "name": "epsilon_vroo",
-            "schema": "integer"
+            "name": "lambda_pi",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "epsilon_itch",
+            "name": "lambda_xi",
             "schema": "dtmi:dtdl:instance:Schema:double;2"
           }
         }
@@ -1255,17 +1255,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_delta;1",
+        "@id": "dtmi:example:lambda_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_beta;1",
+          "@id": "dtmi:example:lambda_tau;1",
           "@type": "Map",
           "mapValue": {
-            "name": "zeta_gamma",
-            "schema": "long"
+            "name": "lambda_upsilon",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "zeta_alpha",
+            "name": "lambda_sigma",
             "schema": "duration"
           }
         }
@@ -1280,18 +1280,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_theta;1",
+        "@id": "dtmi:example:lambda_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_zeta;1",
+          "@id": "dtmi:example:lambda_psi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "zeta_eta",
-            "schema": "string"
+            "name": "lambda_omega",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_epsilon",
+            "name": "lambda_chi",
             "schema": "duration"
           }
         }
@@ -1306,17 +1306,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_mu;1",
+        "@id": "dtmi:example:lambda_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_kappa;1",
+          "@id": "dtmi:example:lambda_um;1",
           "@type": "Map",
           "mapValue": {
-            "name": "zeta_lambda",
-            "schema": "time"
+            "name": "lambda_humpf",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "zeta_iota",
+            "name": "lambda_wum",
             "schema": "dtmi:dtdl:instance:Schema:duration;2"
           }
         }
@@ -1331,18 +1331,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_pi;1",
+        "@id": "dtmi:example:lambda_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_xi;1",
+          "@id": "dtmi:example:lambda_nuh;1",
           "@type": "Map",
           "mapValue": {
-            "name": "zeta_omicron",
-            "schema": "boolean"
+            "name": "lambda_snee",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_nu",
+            "name": "lambda_glikk",
             "schema": "dtmi:dtdl:instance:Schema:duration;2"
           }
         }
@@ -1357,17 +1357,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_upsilon;1",
+        "@id": "dtmi:example:lambda_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_sigma;1",
+          "@id": "dtmi:example:lambda_spazz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "zeta_tau",
-            "schema": "date"
+            "name": "lambda_floob",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "zeta_rho",
+            "name": "lambda_thnad",
             "schema": "float"
           }
         }
@@ -1382,18 +1382,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_omega;1",
+        "@id": "dtmi:example:lambda_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_chi;1",
+          "@id": "dtmi:example:lambda_flunn;1",
           "@type": "Map",
           "mapValue": {
-            "name": "zeta_psi",
-            "schema": "dateTime"
+            "name": "lambda_itch",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_phi",
+            "name": "lambda_jogg",
             "schema": "float"
           }
         }
@@ -1408,17 +1408,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_humpf;1",
+        "@id": "dtmi:example:mu_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_wum;1",
+          "@id": "dtmi:example:lambda_hi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "zeta_um",
-            "schema": "double"
+            "name": "mu_alpha",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "zeta_yuzz",
+            "name": "lambda_vroo",
             "schema": "dtmi:dtdl:instance:Schema:float;2"
           }
         }
@@ -1433,18 +1433,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_snee;1",
+        "@id": "dtmi:example:mu_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_glikk;1",
+          "@id": "dtmi:example:mu_delta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "zeta_nuh",
-            "schema": "duration"
+            "name": "mu_epsilon",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_fuddle",
+            "name": "mu_gamma",
             "schema": "dtmi:dtdl:instance:Schema:float;2"
           }
         }
@@ -1459,17 +1459,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_floob;1",
+        "@id": "dtmi:example:mu_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_thnad;1",
+          "@id": "dtmi:example:mu_theta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "zeta_spazz",
-            "schema": "float"
+            "name": "mu_iota",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "zeta_quan",
+            "name": "mu_eta",
             "schema": "integer"
           }
         }
@@ -1484,18 +1484,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_itch;1",
+        "@id": "dtmi:example:mu_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_jogg;1",
+          "@id": "dtmi:example:mu_mu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "zeta_flunn",
-            "schema": "integer"
+            "name": "mu_nu",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_zatz",
+            "name": "mu_lambda",
             "schema": "integer"
           }
         }
@@ -1510,17 +1510,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_alpha;1",
+        "@id": "dtmi:example:mu_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_vroo;1",
+          "@id": "dtmi:example:mu_pi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "zeta_hi",
-            "schema": "long"
+            "name": "mu_rho",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "zeta_yekk",
+            "name": "mu_omicron",
             "schema": "dtmi:dtdl:instance:Schema:integer;2"
           }
         }
@@ -1535,18 +1535,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_epsilon;1",
+        "@id": "dtmi:example:mu_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_gamma;1",
+          "@id": "dtmi:example:mu_upsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "eta_delta",
-            "schema": "string"
+            "name": "mu_phi",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "eta_beta",
+            "name": "mu_tau",
             "schema": "dtmi:dtdl:instance:Schema:integer;2"
           }
         }
@@ -1561,17 +1561,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_iota;1",
+        "@id": "dtmi:example:mu_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_eta;1",
+          "@id": "dtmi:example:mu_omega;1",
           "@type": "Map",
           "mapValue": {
-            "name": "eta_theta",
-            "schema": "time"
+            "name": "mu_yuzz",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "eta_zeta",
+            "name": "mu_psi",
             "schema": "long"
           }
         }
@@ -1586,18 +1586,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_nu;1",
+        "@id": "dtmi:example:mu_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_lambda;1",
+          "@id": "dtmi:example:mu_humpf;1",
           "@type": "Map",
           "mapValue": {
-            "name": "eta_mu",
-            "schema": "boolean"
+            "name": "mu_fuddle",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "eta_kappa",
+            "name": "mu_um",
             "schema": "long"
           }
         }
@@ -1612,17 +1612,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_rho;1",
+        "@id": "dtmi:example:mu_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_omicron;1",
+          "@id": "dtmi:example:mu_snee;1",
           "@type": "Map",
           "mapValue": {
-            "name": "eta_pi",
-            "schema": "date"
+            "name": "mu_quan",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "eta_xi",
+            "name": "mu_nuh",
             "schema": "dtmi:dtdl:instance:Schema:long;2"
           }
         }
@@ -1637,18 +1637,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_phi;1",
+        "@id": "dtmi:example:mu_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_tau;1",
+          "@id": "dtmi:example:mu_floob;1",
           "@type": "Map",
           "mapValue": {
-            "name": "eta_upsilon",
-            "schema": "dateTime"
+            "name": "mu_zatz",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "eta_sigma",
+            "name": "mu_spazz",
             "schema": "dtmi:dtdl:instance:Schema:long;2"
           }
         }
@@ -1663,17 +1663,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_yuzz;1",
+        "@id": "dtmi:example:mu_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_psi;1",
+          "@id": "dtmi:example:mu_itch;1",
           "@type": "Map",
           "mapValue": {
-            "name": "eta_omega",
-            "schema": "double"
+            "name": "mu_yekk",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "eta_chi",
+            "name": "mu_flunn",
             "schema": "time"
           }
         }
@@ -1688,18 +1688,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_fuddle;1",
+        "@id": "dtmi:example:nu_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_um;1",
+          "@id": "dtmi:example:nu_alpha;1",
           "@type": "Map",
           "mapValue": {
-            "name": "eta_humpf",
-            "schema": "duration"
+            "name": "nu_beta",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "eta_wum",
+            "name": "mu_hi",
             "schema": "time"
           }
         }
@@ -1714,17 +1714,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_quan;1",
+        "@id": "dtmi:example:nu_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_nuh;1",
+          "@id": "dtmi:example:nu_epsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "eta_snee",
-            "schema": "float"
+            "name": "nu_zeta",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "eta_glikk",
+            "name": "nu_delta",
             "schema": "dtmi:dtdl:instance:Schema:time;2"
           }
         }
@@ -1739,18 +1739,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_zatz;1",
+        "@id": "dtmi:example:nu_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_spazz;1",
+          "@id": "dtmi:example:nu_iota;1",
           "@type": "Map",
           "mapValue": {
-            "name": "eta_floob",
-            "schema": "integer"
+            "name": "nu_kappa",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "eta_thnad",
+            "name": "nu_theta",
             "schema": "dtmi:dtdl:instance:Schema:time;2"
           }
         }
@@ -1765,17 +1765,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_yekk;1",
+        "@id": "dtmi:example:nu_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_flunn;1",
+          "@id": "dtmi:example:nu_nu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "eta_itch",
-            "schema": "long"
+            "name": "nu_xi",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "eta_jogg",
+            "name": "nu_mu",
             "schema": "geopoint"
           }
         }
@@ -1790,18 +1790,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_beta;1",
+        "@id": "dtmi:example:nu_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_hi;1",
+          "@id": "dtmi:example:nu_rho;1",
           "@type": "Map",
           "mapValue": {
-            "name": "theta_alpha",
-            "schema": "string"
+            "name": "nu_sigma",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "eta_vroo",
+            "name": "nu_pi",
             "schema": "geopoint"
           }
         }
@@ -1816,17 +1816,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_zeta;1",
+        "@id": "dtmi:example:nu_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_delta;1",
+          "@id": "dtmi:example:nu_phi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "theta_epsilon",
-            "schema": "time"
+            "name": "nu_chi",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "theta_gamma",
+            "name": "nu_upsilon",
             "schema": "dtmi:iotcentral:schema:geopoint;2"
           }
         }
@@ -1841,18 +1841,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_kappa;1",
+        "@id": "dtmi:example:nu_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_theta;1",
+          "@id": "dtmi:example:nu_yuzz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "theta_iota",
-            "schema": "boolean"
+            "name": "nu_wum",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "theta_eta",
+            "name": "nu_omega",
             "schema": "dtmi:iotcentral:schema:geopoint;2"
           }
         }
@@ -1867,17 +1867,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_xi;1",
+        "@id": "dtmi:example:nu_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_mu;1",
+          "@id": "dtmi:example:nu_fuddle;1",
           "@type": "Map",
           "mapValue": {
-            "name": "theta_nu",
-            "schema": "date"
+            "name": "nu_glikk",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "theta_lambda",
+            "name": "nu_humpf",
             "schema": "vector"
           }
         }
@@ -1892,18 +1892,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_sigma;1",
+        "@id": "dtmi:example:nu_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_pi;1",
+          "@id": "dtmi:example:nu_quan;1",
           "@type": "Map",
           "mapValue": {
-            "name": "theta_rho",
-            "schema": "dateTime"
+            "name": "nu_thnad",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "theta_omicron",
+            "name": "nu_snee",
             "schema": "vector"
           }
         }
@@ -1918,17 +1918,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_chi;1",
+        "@id": "dtmi:example:nu_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_upsilon;1",
+          "@id": "dtmi:example:nu_zatz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "theta_phi",
-            "schema": "double"
+            "name": "nu_jogg",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "theta_tau",
+            "name": "nu_floob",
             "schema": "dtmi:iotcentral:schema:vector;2"
           }
         }
@@ -1943,18 +1943,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_wum;1",
+        "@id": "dtmi:example:nu_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_omega;1",
+          "@id": "dtmi:example:nu_yekk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "theta_yuzz",
-            "schema": "duration"
+            "name": "nu_vroo",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "theta_psi",
+            "name": "nu_itch",
             "schema": "dtmi:iotcentral:schema:vector;2"
           }
         }
@@ -1969,17 +1969,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_glikk;1",
+        "@id": "dtmi:example:xi_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_humpf;1",
+          "@id": "dtmi:example:xi_beta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "theta_fuddle",
-            "schema": "float"
+            "name": "xi_gamma",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "theta_um",
+            "name": "xi_alpha",
             "schema": "lineString"
           }
         }
@@ -1994,18 +1994,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_thnad;1",
+        "@id": "dtmi:example:xi_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_snee;1",
+          "@id": "dtmi:example:xi_zeta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "theta_quan",
-            "schema": "integer"
+            "name": "xi_eta",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "theta_nuh",
+            "name": "xi_epsilon",
             "schema": "lineString"
           }
         }
@@ -2020,17 +2020,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_jogg;1",
+        "@id": "dtmi:example:xi_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_floob;1",
+          "@id": "dtmi:example:xi_kappa;1",
           "@type": "Map",
           "mapValue": {
-            "name": "theta_zatz",
-            "schema": "long"
+            "name": "xi_lambda",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "theta_spazz",
+            "name": "xi_iota",
             "schema": "dtmi:standard:schema:geospatial:lineString;2"
           }
         }
@@ -2045,18 +2045,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_vroo;1",
+        "@id": "dtmi:example:xi_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_itch;1",
+          "@id": "dtmi:example:xi_xi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "theta_yekk",
-            "schema": "string"
+            "name": "xi_omicron",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "theta_flunn",
+            "name": "xi_nu",
             "schema": "dtmi:standard:schema:geospatial:lineString;2"
           }
         }
@@ -2071,17 +2071,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_gamma;1",
+        "@id": "dtmi:example:xi_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_alpha;1",
+          "@id": "dtmi:example:xi_sigma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_beta",
-            "schema": "time"
+            "name": "xi_tau",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "theta_hi",
+            "name": "xi_rho",
             "schema": "multiLineString"
           }
         }
@@ -2096,18 +2096,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_eta;1",
+        "@id": "dtmi:example:xi_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_epsilon;1",
+          "@id": "dtmi:example:xi_chi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_zeta",
-            "schema": "boolean"
+            "name": "xi_psi",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "iota_delta",
+            "name": "xi_phi",
             "schema": "multiLineString"
           }
         }
@@ -2122,17 +2122,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_lambda;1",
+        "@id": "dtmi:example:xi_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_iota;1",
+          "@id": "dtmi:example:xi_wum;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_kappa",
-            "schema": "date"
+            "name": "xi_um",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "iota_theta",
+            "name": "xi_yuzz",
             "schema": "dtmi:standard:schema:geospatial:multiLineString;2"
           }
         }
@@ -2147,18 +2147,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_omicron;1",
+        "@id": "dtmi:example:xi_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_nu;1",
+          "@id": "dtmi:example:xi_glikk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_xi",
-            "schema": "dateTime"
+            "name": "xi_nuh",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "iota_mu",
+            "name": "xi_fuddle",
             "schema": "dtmi:standard:schema:geospatial:multiLineString;2"
           }
         }
@@ -2173,17 +2173,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_tau;1",
+        "@id": "dtmi:example:xi_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_rho;1",
+          "@id": "dtmi:example:xi_thnad;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_sigma",
-            "schema": "double"
+            "name": "xi_spazz",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "iota_pi",
+            "name": "xi_quan",
             "schema": "multiPoint"
           }
         }
@@ -2198,18 +2198,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_psi;1",
+        "@id": "dtmi:example:xi_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_phi;1",
+          "@id": "dtmi:example:xi_jogg;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_chi",
-            "schema": "duration"
+            "name": "xi_flunn",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "iota_upsilon",
+            "name": "xi_zatz",
             "schema": "multiPoint"
           }
         }
@@ -2224,17 +2224,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_um;1",
+        "@id": "dtmi:example:omicron_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_yuzz;1",
+          "@id": "dtmi:example:xi_vroo;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_wum",
-            "schema": "float"
+            "name": "xi_hi",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "iota_omega",
+            "name": "xi_yekk",
             "schema": "dtmi:standard:schema:geospatial:multiPoint;2"
           }
         }
@@ -2249,18 +2249,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_nuh;1",
+        "@id": "dtmi:example:omicron_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_fuddle;1",
+          "@id": "dtmi:example:omicron_gamma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_glikk",
-            "schema": "integer"
+            "name": "omicron_delta",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "iota_humpf",
+            "name": "omicron_beta",
             "schema": "dtmi:standard:schema:geospatial:multiPoint;2"
           }
         }
@@ -2275,17 +2275,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_spazz;1",
+        "@id": "dtmi:example:omicron_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_quan;1",
+          "@id": "dtmi:example:omicron_eta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_thnad",
-            "schema": "long"
+            "name": "omicron_theta",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "iota_snee",
+            "name": "omicron_zeta",
             "schema": "multiPolygon"
           }
         }
@@ -2300,18 +2300,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_flunn;1",
+        "@id": "dtmi:example:omicron_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_zatz;1",
+          "@id": "dtmi:example:omicron_lambda;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_jogg",
-            "schema": "string"
+            "name": "omicron_mu",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "iota_floob",
+            "name": "omicron_kappa",
             "schema": "multiPolygon"
           }
         }
@@ -2326,17 +2326,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_hi;1",
+        "@id": "dtmi:example:omicron_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_yekk;1",
+          "@id": "dtmi:example:omicron_omicron;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_vroo",
-            "schema": "time"
+            "name": "omicron_pi",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "iota_itch",
+            "name": "omicron_xi",
             "schema": "dtmi:standard:schema:geospatial:multiPolygon;2"
           }
         }
@@ -2351,18 +2351,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_delta;1",
+        "@id": "dtmi:example:omicron_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_beta;1",
+          "@id": "dtmi:example:omicron_tau;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_gamma",
-            "schema": "boolean"
+            "name": "omicron_upsilon",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "kappa_alpha",
+            "name": "omicron_sigma",
             "schema": "dtmi:standard:schema:geospatial:multiPolygon;2"
           }
         }
@@ -2377,17 +2377,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_theta;1",
+        "@id": "dtmi:example:omicron_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_zeta;1",
+          "@id": "dtmi:example:omicron_psi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_eta",
-            "schema": "date"
+            "name": "omicron_omega",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "kappa_epsilon",
+            "name": "omicron_chi",
             "schema": "point"
           }
         }
@@ -2402,18 +2402,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_mu;1",
+        "@id": "dtmi:example:omicron_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_kappa;1",
+          "@id": "dtmi:example:omicron_um;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_lambda",
-            "schema": "dateTime"
+            "name": "omicron_humpf",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "kappa_iota",
+            "name": "omicron_wum",
             "schema": "point"
           }
         }
@@ -2428,17 +2428,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_pi;1",
+        "@id": "dtmi:example:omicron_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_xi;1",
+          "@id": "dtmi:example:omicron_nuh;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_omicron",
-            "schema": "double"
+            "name": "omicron_snee",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "kappa_nu",
+            "name": "omicron_glikk",
             "schema": "dtmi:standard:schema:geospatial:point;2"
           }
         }
@@ -2453,18 +2453,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_upsilon;1",
+        "@id": "dtmi:example:omicron_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_sigma;1",
+          "@id": "dtmi:example:omicron_spazz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_tau",
-            "schema": "duration"
+            "name": "omicron_floob",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "kappa_rho",
+            "name": "omicron_thnad",
             "schema": "dtmi:standard:schema:geospatial:point;2"
           }
         }
@@ -2479,17 +2479,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_omega;1",
+        "@id": "dtmi:example:omicron_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_chi;1",
+          "@id": "dtmi:example:omicron_flunn;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_psi",
-            "schema": "float"
+            "name": "omicron_itch",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "kappa_phi",
+            "name": "omicron_jogg",
             "schema": "polygon"
           }
         }
@@ -2504,18 +2504,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_humpf;1",
+        "@id": "dtmi:example:pi_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_wum;1",
+          "@id": "dtmi:example:omicron_hi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_um",
-            "schema": "integer"
+            "name": "pi_alpha",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "kappa_yuzz",
+            "name": "omicron_vroo",
             "schema": "polygon"
           }
         }
@@ -2530,17 +2530,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_snee;1",
+        "@id": "dtmi:example:pi_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_glikk;1",
+          "@id": "dtmi:example:pi_delta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_nuh",
-            "schema": "long"
+            "name": "pi_epsilon",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "kappa_fuddle",
+            "name": "pi_gamma",
             "schema": "dtmi:standard:schema:geospatial:polygon;2"
           }
         }
@@ -2555,18 +2555,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_floob;1",
+        "@id": "dtmi:example:pi_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_thnad;1",
+          "@id": "dtmi:example:pi_theta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_spazz",
-            "schema": "string"
+            "name": "pi_iota",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "kappa_quan",
+            "name": "pi_eta",
             "schema": "dtmi:standard:schema:geospatial:polygon;2"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyPropertySchemaTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyPropertySchemaTermAndDtmiV2.json
index 92827aa1..4933c050 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyPropertySchemaTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyPropertySchemaTermAndDtmiV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_rho;1",
+        "@id": "dtmi:example:pi_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_omicron;1",
+          "@id": "dtmi:example:pi_snee;1",
           "@type": "Map",
           "mapValue": {
-            "name": "lambda_pi",
-            "schema": "duration"
+            "name": "pi_quan",
+            "schema": "dateTime"
           },
           "mapKey": {
-            "name": "lambda_xi",
+            "name": "pi_nuh",
             "schema": "string",
             "dtmi:dtdl:property:schema;2": "string"
           }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_phi;1",
+        "@id": "dtmi:example:pi_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_tau;1",
+          "@id": "dtmi:example:pi_floob;1",
           "@type": "Map",
           "mapValue": {
-            "name": "lambda_upsilon",
-            "schema": "float"
+            "name": "pi_zatz",
+            "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "lambda_sigma",
+            "name": "pi_spazz",
             "schema": "string",
             "dtmi:dtdl:property:schema;2": "string"
           }
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyRequiredPropertiesV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyRequiredPropertiesV2.json
index b65b60e4..1b1164e5 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyRequiredPropertiesV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyRequiredPropertiesV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_mu;1",
+        "@id": "dtmi:example:beta_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_kappa;1",
+          "@id": "dtmi:example:beta_um;1",
           "@type": "Map",
           "mapValue": {
-            "name": "itch_lambda",
-            "schema": "boolean"
+            "name": "beta_humpf",
+            "schema": "string"
           },
           "mapKey": {
             "schema": "string"
@@ -31,14 +31,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_omicron;1",
+        "@id": "dtmi:example:beta_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_nu;1",
+          "@id": "dtmi:example:beta_glikk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "itch_xi",
-            "schema": "date"
+            "name": "beta_nuh",
+            "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -56,17 +56,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_tau;1",
+        "@id": "dtmi:example:beta_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_rho;1",
+          "@id": "dtmi:example:beta_thnad;1",
           "@type": "Map",
           "mapValue": {
-            "name": "itch_sigma",
-            "schema": "dateTime"
+            "name": "beta_spazz",
+            "schema": "boolean"
           },
           "mapKey": {
-            "name": "itch_pi"
+            "name": "beta_quan"
           }
         }
       }
@@ -80,18 +80,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_psi;1",
+        "@id": "dtmi:example:beta_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_phi;1",
+          "@id": "dtmi:example:beta_jogg;1",
           "@type": "Map",
           "mapValue": {
-            "name": "itch_chi",
-            "schema": "double"
+            "name": "beta_flunn",
+            "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "itch_upsilon"
+            "name": "beta_zatz"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyTypeIncludesInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyTypeIncludesInvalidDtmiV2.json
index bb208fe1..661227ed 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyTypeIncludesInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyTypeIncludesInvalidDtmiV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_chi;1",
+        "@id": "dtmi:example:chi_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_upsilon;1",
+          "@id": "dtmi:example:chi_beta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_phi",
+            "name": "chi_gamma",
             "schema": "time"
           },
           "mapKey": {
@@ -21,7 +21,7 @@
               "MapKey",
               "dtmi:foo//bar"
             ],
-            "name": "pi_tau",
+            "name": "chi_alpha",
             "schema": "string"
           }
         }
@@ -36,13 +36,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_wum;1",
+        "@id": "dtmi:example:chi_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_omega;1",
+          "@id": "dtmi:example:chi_zeta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_yuzz",
+            "name": "chi_eta",
             "schema": "boolean"
           },
           "mapKey": {
@@ -51,7 +51,7 @@
               "MapKey",
               "dtmi:foo//bar"
             ],
-            "name": "pi_psi",
+            "name": "chi_epsilon",
             "schema": "string"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyTypeIncludesMaterialV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyTypeIncludesMaterialV2.json
index 5408f3cb..2bb56b55 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyTypeIncludesMaterialV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyTypeIncludesMaterialV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_itch;1",
+        "@id": "dtmi:example:upsilon_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_jogg;1",
+          "@id": "dtmi:example:upsilon_upsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_flunn",
+            "name": "upsilon_phi",
             "schema": "dateTime"
           },
           "mapKey": {
-            "name": "xi_zatz",
+            "name": "upsilon_tau",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_alpha;1",
+        "@id": "dtmi:example:upsilon_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_vroo;1",
+          "@id": "dtmi:example:upsilon_omega;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_hi",
+            "name": "upsilon_yuzz",
             "schema": "double"
           },
           "mapKey": {
-            "name": "xi_yekk",
+            "name": "upsilon_psi",
             "schema": "string",
             "@type": [
               "MapKey"
@@ -61,17 +61,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_epsilon;1",
+        "@id": "dtmi:example:upsilon_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_gamma;1",
+          "@id": "dtmi:example:upsilon_humpf;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_delta",
+            "name": "upsilon_fuddle",
             "schema": "duration"
           },
           "mapKey": {
-            "name": "omicron_beta",
+            "name": "upsilon_um",
             "schema": "string",
             "@type": "dtmi:dtdl:class:MapKey;2"
           }
@@ -87,17 +87,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_iota;1",
+        "@id": "dtmi:example:upsilon_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_eta;1",
+          "@id": "dtmi:example:upsilon_snee;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_theta",
+            "name": "upsilon_quan",
             "schema": "float"
           },
           "mapKey": {
-            "name": "omicron_zeta",
+            "name": "upsilon_nuh",
             "schema": "string",
             "@type": [
               "dtmi:dtdl:class:MapKey;2"
@@ -115,17 +115,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_nu;1",
+        "@id": "dtmi:example:upsilon_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_lambda;1",
+          "@id": "dtmi:example:upsilon_floob;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_mu",
+            "name": "upsilon_zatz",
             "schema": "integer"
           },
           "mapKey": {
-            "name": "omicron_kappa",
+            "name": "upsilon_spazz",
             "schema": "string",
             "@type": "Something"
           }
@@ -141,18 +141,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_rho;1",
+        "@id": "dtmi:example:upsilon_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_omicron;1",
+          "@id": "dtmi:example:upsilon_itch;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_pi",
+            "name": "upsilon_yekk",
             "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omicron_xi",
+            "name": "upsilon_flunn",
             "schema": "string",
             "@type": "Something"
           }
@@ -168,17 +168,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_phi;1",
+        "@id": "dtmi:example:phi_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_tau;1",
+          "@id": "dtmi:example:phi_alpha;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_upsilon",
+            "name": "phi_beta",
             "schema": "string"
           },
           "mapKey": {
-            "name": "omicron_sigma",
+            "name": "upsilon_hi",
             "schema": "string",
             "@type": [
               "Something"
@@ -196,18 +196,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_yuzz;1",
+        "@id": "dtmi:example:phi_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_psi;1",
+          "@id": "dtmi:example:phi_epsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_omega",
+            "name": "phi_zeta",
             "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omicron_chi",
+            "name": "phi_delta",
             "schema": "string",
             "@type": [
               "Something"
diff --git a/DTDL/v2/spec/Requirement-ClassMapKeyTypeStringOrArrayV2.json b/DTDL/v2/spec/Requirement-ClassMapKeyTypeStringOrArrayV2.json
index 38a65323..167d1a37 100644
--- a/DTDL/v2/spec/Requirement-ClassMapKeyTypeStringOrArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapKeyTypeStringOrArrayV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_tau;1",
+        "@id": "dtmi:example:tau_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_rho;1",
+          "@id": "dtmi:example:sigma_vroo;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nu_sigma",
+            "name": "sigma_hi",
             "schema": "integer"
           },
           "mapKey": {
-            "name": "nu_pi",
+            "name": "sigma_yekk",
             "schema": "string",
             "@type": 626
           }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_psi;1",
+        "@id": "dtmi:example:tau_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_phi;1",
+          "@id": "dtmi:example:tau_gamma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nu_chi",
+            "name": "tau_delta",
             "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nu_upsilon",
+            "name": "tau_beta",
             "schema": "string",
             "@type": 626
           }
@@ -60,17 +60,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_um;1",
+        "@id": "dtmi:example:tau_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_yuzz;1",
+          "@id": "dtmi:example:tau_eta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nu_wum",
+            "name": "tau_theta",
             "schema": "string"
           },
           "mapKey": {
-            "name": "nu_omega",
+            "name": "tau_zeta",
             "schema": "string",
             "@type": null
           }
@@ -86,18 +86,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_nuh;1",
+        "@id": "dtmi:example:tau_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_fuddle;1",
+          "@id": "dtmi:example:tau_lambda;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nu_glikk",
+            "name": "tau_mu",
             "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nu_humpf",
+            "name": "tau_kappa",
             "schema": "string",
             "@type": null
           }
@@ -113,17 +113,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_spazz;1",
+        "@id": "dtmi:example:tau_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_quan;1",
+          "@id": "dtmi:example:tau_omicron;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nu_thnad",
+            "name": "tau_pi",
             "schema": "boolean"
           },
           "mapKey": {
-            "name": "nu_snee",
+            "name": "tau_xi",
             "schema": "string",
             "@type": true
           }
@@ -139,18 +139,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_flunn;1",
+        "@id": "dtmi:example:tau_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_zatz;1",
+          "@id": "dtmi:example:tau_tau;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nu_jogg",
+            "name": "tau_upsilon",
             "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nu_floob",
+            "name": "tau_sigma",
             "schema": "string",
             "@type": true
           }
@@ -166,17 +166,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_hi;1",
+        "@id": "dtmi:example:tau_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_yekk;1",
+          "@id": "dtmi:example:tau_psi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nu_vroo",
+            "name": "tau_omega",
             "schema": "dateTime"
           },
           "mapKey": {
-            "name": "nu_itch",
+            "name": "tau_chi",
             "schema": "string",
             "@type": {}
           }
@@ -192,18 +192,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_delta;1",
+        "@id": "dtmi:example:tau_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_beta;1",
+          "@id": "dtmi:example:tau_um;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_gamma",
+            "name": "tau_humpf",
             "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "xi_alpha",
+            "name": "tau_wum",
             "schema": "string",
             "@type": {}
           }
@@ -219,17 +219,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_theta;1",
+        "@id": "dtmi:example:tau_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_zeta;1",
+          "@id": "dtmi:example:tau_nuh;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_eta",
+            "name": "tau_snee",
             "schema": "duration"
           },
           "mapKey": {
-            "name": "xi_epsilon",
+            "name": "tau_glikk",
             "schema": "string",
             "@type": [
               626
@@ -247,18 +247,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_mu;1",
+        "@id": "dtmi:example:tau_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_kappa;1",
+          "@id": "dtmi:example:tau_spazz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_lambda",
+            "name": "tau_floob",
             "schema": "float"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "xi_iota",
+            "name": "tau_thnad",
             "schema": "string",
             "@type": [
               626
@@ -276,17 +276,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_pi;1",
+        "@id": "dtmi:example:tau_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_xi;1",
+          "@id": "dtmi:example:tau_flunn;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_omicron",
+            "name": "tau_itch",
             "schema": "integer"
           },
           "mapKey": {
-            "name": "xi_nu",
+            "name": "tau_jogg",
             "schema": "string",
             "@type": [
               null
@@ -304,18 +304,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_upsilon;1",
+        "@id": "dtmi:example:upsilon_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_sigma;1",
+          "@id": "dtmi:example:tau_hi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_tau",
+            "name": "upsilon_alpha",
             "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "xi_rho",
+            "name": "tau_vroo",
             "schema": "string",
             "@type": [
               null
@@ -333,17 +333,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_omega;1",
+        "@id": "dtmi:example:upsilon_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_chi;1",
+          "@id": "dtmi:example:upsilon_delta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_psi",
+            "name": "upsilon_epsilon",
             "schema": "string"
           },
           "mapKey": {
-            "name": "xi_phi",
+            "name": "upsilon_gamma",
             "schema": "string",
             "@type": [
               true
@@ -361,18 +361,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_humpf;1",
+        "@id": "dtmi:example:upsilon_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_wum;1",
+          "@id": "dtmi:example:upsilon_theta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_um",
+            "name": "upsilon_iota",
             "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "xi_yuzz",
+            "name": "upsilon_eta",
             "schema": "string",
             "@type": [
               true
@@ -390,17 +390,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_snee;1",
+        "@id": "dtmi:example:upsilon_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_glikk;1",
+          "@id": "dtmi:example:upsilon_mu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_nuh",
+            "name": "upsilon_nu",
             "schema": "boolean"
           },
           "mapKey": {
-            "name": "xi_fuddle",
+            "name": "upsilon_lambda",
             "schema": "string",
             "@type": [
               {}
@@ -418,18 +418,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_floob;1",
+        "@id": "dtmi:example:upsilon_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_thnad;1",
+          "@id": "dtmi:example:upsilon_pi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_spazz",
+            "name": "upsilon_rho",
             "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "xi_quan",
+            "name": "upsilon_omicron",
             "schema": "string",
             "@type": [
               {}
diff --git a/DTDL/v2/spec/Requirement-ClassMapPropertiesElementSchemaSchemaMaxDepthV2.json b/DTDL/v2/spec/Requirement-ClassMapPropertiesElementSchemaSchemaMaxDepthV2.json
index 4ef2afaf..16f269c8 100644
--- a/DTDL/v2/spec/Requirement-ClassMapPropertiesElementSchemaSchemaMaxDepthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapPropertiesElementSchemaSchemaMaxDepthV2.json
@@ -7,51 +7,51 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_epsilon;1",
+        "@id": "dtmi:example:glikk_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_delta",
+          "name": "glikk_yuzz",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "psi_gamma",
+              "name": "glikk_omega",
               "schema": "string"
             },
             "mapValue": {
-              "name": "psi_beta",
+              "name": "glikk_psi",
               "schema": {
                 "@type": "Map",
                 "mapKey": {
-                  "name": "psi_alpha",
+                  "name": "glikk_chi",
                   "schema": "string"
                 },
                 "mapValue": {
-                  "name": "chi_hi",
+                  "name": "glikk_phi",
                   "schema": {
                     "@type": "Map",
                     "mapKey": {
-                      "name": "chi_vroo",
+                      "name": "glikk_upsilon",
                       "schema": "string"
                     },
                     "mapValue": {
-                      "name": "chi_yekk",
+                      "name": "glikk_tau",
                       "schema": {
                         "@type": "Map",
                         "mapKey": {
-                          "name": "chi_itch",
+                          "name": "glikk_sigma",
                           "schema": "string"
                         },
                         "mapValue": {
-                          "name": "chi_flunn",
+                          "name": "glikk_rho",
                           "schema": {
                             "@type": "Map",
                             "mapKey": {
-                              "name": "chi_zatz",
+                              "name": "glikk_omicron",
                               "schema": "string"
                             },
                             "mapValue": {
-                              "name": "chi_jogg",
+                              "name": "glikk_pi",
                               "schema": "double"
                             }
                           }
@@ -75,59 +75,59 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_tau;1",
+        "@id": "dtmi:example:glikk_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_sigma",
+          "name": "glikk_flunn",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "psi_rho",
+              "name": "glikk_jogg",
               "schema": "string"
             },
             "mapValue": {
-              "name": "psi_pi",
+              "name": "glikk_zatz",
               "schema": {
                 "@type": "Map",
                 "mapKey": {
-                  "name": "psi_omicron",
+                  "name": "glikk_floob",
                   "schema": "string"
                 },
                 "mapValue": {
-                  "name": "psi_xi",
+                  "name": "glikk_spazz",
                   "schema": {
                     "@type": "Map",
                     "mapKey": {
-                      "name": "psi_nu",
+                      "name": "glikk_thnad",
                       "schema": "string"
                     },
                     "mapValue": {
-                      "name": "psi_mu",
+                      "name": "glikk_quan",
                       "schema": {
                         "@type": "Map",
                         "mapKey": {
-                          "name": "psi_lambda",
+                          "name": "glikk_snee",
                           "schema": "string"
                         },
                         "mapValue": {
-                          "name": "psi_kappa",
+                          "name": "glikk_nuh",
                           "schema": {
                             "@type": "Map",
                             "mapKey": {
-                              "name": "psi_iota",
+                              "name": "glikk_glikk",
                               "schema": "string"
                             },
                             "mapValue": {
-                              "name": "psi_theta",
+                              "name": "glikk_fuddle",
                               "schema": {
                                 "@type": "Map",
                                 "mapKey": {
-                                  "name": "psi_zeta",
+                                  "name": "glikk_um",
                                   "schema": "string"
                                 },
                                 "mapValue": {
-                                  "name": "psi_eta",
+                                  "name": "glikk_humpf",
                                   "schema": "duration"
                                 }
                               }
@@ -153,60 +153,60 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_quan;1",
+        "@id": "dtmi:example:nuh_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_snee",
+          "name": "nuh_kappa",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Map",
             "mapKey": {
-              "name": "psi_nuh",
+              "name": "nuh_iota",
               "schema": "string"
             },
             "mapValue": {
-              "name": "psi_glikk",
+              "name": "nuh_theta",
               "schema": {
                 "@type": "Map",
                 "mapKey": {
-                  "name": "psi_fuddle",
+                  "name": "nuh_eta",
                   "schema": "string"
                 },
                 "mapValue": {
-                  "name": "psi_humpf",
+                  "name": "nuh_zeta",
                   "schema": {
                     "@type": "Map",
                     "mapKey": {
-                      "name": "psi_um",
+                      "name": "nuh_epsilon",
                       "schema": "string"
                     },
                     "mapValue": {
-                      "name": "psi_wum",
+                      "name": "nuh_delta",
                       "schema": {
                         "@type": "Map",
                         "mapKey": {
-                          "name": "psi_yuzz",
+                          "name": "nuh_gamma",
                           "schema": "string"
                         },
                         "mapValue": {
-                          "name": "psi_omega",
+                          "name": "nuh_beta",
                           "schema": {
                             "@type": "Map",
                             "mapKey": {
-                              "name": "psi_psi",
+                              "name": "nuh_alpha",
                               "schema": "string"
                             },
                             "mapValue": {
-                              "name": "psi_chi",
+                              "name": "glikk_hi",
                               "schema": {
                                 "@type": "Map",
                                 "mapKey": {
-                                  "name": "psi_upsilon",
+                                  "name": "glikk_yekk",
                                   "schema": "string"
                                 },
                                 "mapValue": {
-                                  "name": "psi_phi",
+                                  "name": "glikk_vroo",
                                   "schema": "float"
                                 }
                               }
diff --git a/DTDL/v2/spec/Requirement-ClassMapPropertiesElementSchemaSchemaSelfReferenceV2.json b/DTDL/v2/spec/Requirement-ClassMapPropertiesElementSchemaSchemaSelfReferenceV2.json
new file mode 100644
index 00000000..6685d26b
--- /dev/null
+++ b/DTDL/v2/spec/Requirement-ClassMapPropertiesElementSchemaSchemaSelfReferenceV2.json
@@ -0,0 +1,61 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:nuh_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "nuh_xi",
+          "schema": {
+            "@id": "dtmi:foo:beta_chi;1",
+            "@type": "Map",
+            "mapKey": {
+              "name": "nuh_nu",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "nuh_mu",
+              "schema": "dtmi:foo:beta_chi;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:nuh_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "nuh_sigma",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:beta_chi;1",
+            "@type": "Map",
+            "mapKey": {
+              "name": "nuh_rho",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "nuh_pi",
+              "schema": "dtmi:foo:beta_chi;1"
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v2/spec/Requirement-ClassMapPropertyCommentStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassMapPropertyCommentStringLengthV2.json
index dc98a63a..a1c1a176 100644
--- a/DTDL/v2/spec/Requirement-ClassMapPropertyCommentStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapPropertyCommentStringLengthV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_lambda;1",
+        "@id": "dtmi:example:floob_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_theta;1",
+          "@id": "dtmi:example:floob_yuzz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_iota",
+            "name": "floob_wum",
             "schema": "string"
           },
           "mapValue": {
-            "name": "nuh_kappa",
-            "schema": "string"
+            "name": "floob_um",
+            "schema": "integer"
           },
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_omicron;1",
+        "@id": "dtmi:example:floob_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_mu;1",
+          "@id": "dtmi:example:floob_fuddle;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_nu",
+            "name": "floob_glikk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "nuh_xi",
-            "schema": "time"
+            "name": "floob_nuh",
+            "schema": "long"
           },
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
@@ -59,19 +59,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_tau;1",
+        "@id": "dtmi:example:floob_floob;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_pi;1",
+          "@id": "dtmi:example:floob_quan;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_rho",
+            "name": "floob_thnad",
             "schema": "string"
           },
           "mapValue": {
-            "name": "nuh_sigma",
-            "schema": "boolean"
+            "name": "floob_spazz",
+            "schema": "string"
           },
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapPropertyCommentStringV2.json b/DTDL/v2/spec/Requirement-ClassMapPropertyCommentStringV2.json
index 7ac079e0..629230a5 100644
--- a/DTDL/v2/spec/Requirement-ClassMapPropertyCommentStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapPropertyCommentStringV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_nu;1",
+        "@id": "dtmi:example:thnad_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_kappa;1",
+          "@id": "dtmi:example:thnad_um;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_lambda",
+            "name": "thnad_humpf",
             "schema": "string"
           },
           "mapValue": {
-            "name": "fuddle_mu",
-            "schema": "long"
+            "name": "thnad_fuddle",
+            "schema": "float"
           },
           "comment": "hello"
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_rho;1",
+        "@id": "dtmi:example:thnad_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_xi;1",
+          "@id": "dtmi:example:thnad_nuh;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_omicron",
+            "name": "thnad_snee",
             "schema": "string"
           },
           "mapValue": {
-            "name": "fuddle_pi",
-            "schema": "string"
+            "name": "thnad_quan",
+            "schema": "integer"
           },
           "comment": [
             "hello"
@@ -61,18 +61,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_phi;1",
+        "@id": "dtmi:example:thnad_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_sigma;1",
+          "@id": "dtmi:example:thnad_spazz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_tau",
+            "name": "thnad_floob",
             "schema": "string"
           },
           "mapValue": {
-            "name": "fuddle_upsilon",
-            "schema": "time"
+            "name": "thnad_zatz",
+            "schema": "long"
           },
           "comment": {
             "@value": "hello",
@@ -90,18 +90,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_yuzz;1",
+        "@id": "dtmi:example:thnad_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_chi;1",
+          "@id": "dtmi:example:thnad_flunn;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_psi",
+            "name": "thnad_itch",
             "schema": "string"
           },
           "mapValue": {
-            "name": "fuddle_omega",
-            "schema": "boolean"
+            "name": "thnad_yekk",
+            "schema": "string"
           },
           "comment": [
             {
@@ -121,18 +121,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_fuddle;1",
+        "@id": "dtmi:example:spazz_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_wum;1",
+          "@id": "dtmi:example:thnad_hi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_um",
+            "name": "spazz_alpha",
             "schema": "string"
           },
           "mapValue": {
-            "name": "fuddle_humpf",
-            "schema": "date"
+            "name": "spazz_beta",
+            "schema": "time"
           },
           "comment": []
         }
@@ -147,18 +147,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_quan;1",
+        "@id": "dtmi:example:spazz_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_glikk;1",
+          "@id": "dtmi:example:spazz_delta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_nuh",
+            "name": "spazz_epsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "fuddle_snee",
-            "schema": "dateTime"
+            "name": "spazz_zeta",
+            "schema": "boolean"
           },
           "comment": null
         }
@@ -173,19 +173,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_zatz;1",
+        "@id": "dtmi:example:spazz_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_thnad;1",
+          "@id": "dtmi:example:spazz_theta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_spazz",
+            "name": "spazz_iota",
             "schema": "string"
           },
           "mapValue": {
-            "name": "fuddle_floob",
-            "schema": "double"
+            "name": "spazz_kappa",
+            "schema": "date"
           },
           "comment": null
         }
@@ -200,18 +200,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_yekk;1",
+        "@id": "dtmi:example:spazz_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_jogg;1",
+          "@id": "dtmi:example:spazz_mu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_flunn",
+            "name": "spazz_nu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "fuddle_itch",
-            "schema": "duration"
+            "name": "spazz_xi",
+            "schema": "dateTime"
           },
           "comment": true
         }
@@ -226,19 +226,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_beta;1",
+        "@id": "dtmi:example:spazz_tau;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_vroo;1",
+          "@id": "dtmi:example:spazz_pi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_hi",
+            "name": "spazz_rho",
             "schema": "string"
           },
           "mapValue": {
-            "name": "glikk_alpha",
-            "schema": "float"
+            "name": "spazz_sigma",
+            "schema": "double"
           },
           "comment": true
         }
@@ -253,18 +253,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_zeta;1",
+        "@id": "dtmi:example:spazz_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_gamma;1",
+          "@id": "dtmi:example:spazz_upsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_delta",
+            "name": "spazz_phi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "glikk_epsilon",
-            "schema": "integer"
+            "name": "spazz_chi",
+            "schema": "duration"
           },
           "comment": 626
         }
@@ -279,19 +279,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_kappa;1",
+        "@id": "dtmi:example:spazz_um;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_eta;1",
+          "@id": "dtmi:example:spazz_omega;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_theta",
+            "name": "spazz_yuzz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "glikk_iota",
-            "schema": "long"
+            "name": "spazz_wum",
+            "schema": "float"
           },
           "comment": 626
         }
@@ -306,18 +306,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_xi;1",
+        "@id": "dtmi:example:spazz_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_lambda;1",
+          "@id": "dtmi:example:spazz_humpf;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_mu",
+            "name": "spazz_fuddle",
             "schema": "string"
           },
           "mapValue": {
-            "name": "glikk_nu",
-            "schema": "string"
+            "name": "spazz_glikk",
+            "schema": "integer"
           },
           "comment": [
             null
@@ -334,19 +334,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_sigma;1",
+        "@id": "dtmi:example:spazz_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_omicron;1",
+          "@id": "dtmi:example:spazz_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_pi",
+            "name": "spazz_quan",
             "schema": "string"
           },
           "mapValue": {
-            "name": "glikk_rho",
-            "schema": "time"
+            "name": "spazz_thnad",
+            "schema": "long"
           },
           "comment": [
             null
@@ -363,18 +363,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_chi;1",
+        "@id": "dtmi:example:spazz_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_tau;1",
+          "@id": "dtmi:example:spazz_floob;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_upsilon",
+            "name": "spazz_zatz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "glikk_phi",
-            "schema": "boolean"
+            "name": "spazz_jogg",
+            "schema": "string"
           },
           "comment": [
             true
@@ -391,19 +391,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_wum;1",
+        "@id": "dtmi:example:spazz_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_psi;1",
+          "@id": "dtmi:example:spazz_itch;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_omega",
+            "name": "spazz_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "glikk_yuzz",
-            "schema": "date"
+            "name": "spazz_vroo",
+            "schema": "time"
           },
           "comment": [
             true
@@ -420,18 +420,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_glikk;1",
+        "@id": "dtmi:example:floob_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_um;1",
+          "@id": "dtmi:example:floob_alpha;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_humpf",
+            "name": "floob_beta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "glikk_fuddle",
-            "schema": "dateTime"
+            "name": "floob_gamma",
+            "schema": "boolean"
           },
           "comment": [
             626
@@ -448,19 +448,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_thnad;1",
+        "@id": "dtmi:example:floob_theta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_nuh;1",
+          "@id": "dtmi:example:floob_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_snee",
+            "name": "floob_zeta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "glikk_quan",
-            "schema": "double"
+            "name": "floob_eta",
+            "schema": "date"
           },
           "comment": [
             626
@@ -477,18 +477,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_jogg;1",
+        "@id": "dtmi:example:floob_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_spazz;1",
+          "@id": "dtmi:example:floob_iota;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_floob",
+            "name": "floob_kappa",
             "schema": "string"
           },
           "mapValue": {
-            "name": "glikk_zatz",
-            "schema": "duration"
+            "name": "floob_lambda",
+            "schema": "dateTime"
           },
           "comment": {}
         }
@@ -503,19 +503,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_vroo;1",
+        "@id": "dtmi:example:floob_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_flunn;1",
+          "@id": "dtmi:example:floob_nu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_itch",
+            "name": "floob_xi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "glikk_yekk",
-            "schema": "float"
+            "name": "floob_omicron",
+            "schema": "double"
           },
           "comment": {}
         }
@@ -530,18 +530,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_gamma;1",
+        "@id": "dtmi:example:floob_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_hi;1",
+          "@id": "dtmi:example:floob_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_alpha",
+            "name": "floob_sigma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "nuh_beta",
-            "schema": "integer"
+            "name": "floob_tau",
+            "schema": "duration"
           },
           "comment": [
             {}
@@ -558,19 +558,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_eta;1",
+        "@id": "dtmi:example:floob_omega;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_delta;1",
+          "@id": "dtmi:example:floob_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_epsilon",
+            "name": "floob_chi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "nuh_zeta",
-            "schema": "long"
+            "name": "floob_psi",
+            "schema": "float"
           },
           "comment": [
             {}
diff --git a/DTDL/v2/spec/Requirement-ClassMapPropertyCommentTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassMapPropertyCommentTermAndDtmiV2.json
index ef678213..88910274 100644
--- a/DTDL/v2/spec/Requirement-ClassMapPropertyCommentTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapPropertyCommentTermAndDtmiV2.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_itch;1",
+        "@id": "dtmi:example:zatz_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_spazz;1",
+          "@id": "dtmi:example:zatz_iota;1",
           "@type": "Map",
-          "comment": "nuh_floob",
-          "dtmi:dtdl:property:comment;2": "nuh_zatz",
+          "comment": "zatz_kappa",
+          "dtmi:dtdl:property:comment;2": "zatz_lambda",
           "mapKey": {
-            "name": "nuh_jogg",
+            "name": "zatz_mu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "nuh_flunn",
-            "schema": "duration"
+            "name": "zatz_nu",
+            "schema": "dateTime"
           }
         }
       }
@@ -34,21 +34,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_gamma;1",
+        "@id": "dtmi:example:zatz_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_yekk;1",
+          "@id": "dtmi:example:zatz_omicron;1",
           "@type": "Map",
-          "comment": "nuh_vroo",
-          "dtmi:dtdl:property:comment;2": "nuh_hi",
+          "comment": "zatz_pi",
+          "dtmi:dtdl:property:comment;2": "zatz_rho",
           "mapKey": {
-            "name": "snee_alpha",
+            "name": "zatz_sigma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "snee_beta",
-            "schema": "float"
+            "name": "zatz_tau",
+            "schema": "double"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassMapPropertyDescriptionLangStringV2.json b/DTDL/v2/spec/Requirement-ClassMapPropertyDescriptionLangStringV2.json
index 8bb5e12a..202f5287 100644
--- a/DTDL/v2/spec/Requirement-ClassMapPropertyDescriptionLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapPropertyDescriptionLangStringV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_eta;1",
+        "@id": "dtmi:example:zatz_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_delta;1",
+          "@id": "dtmi:example:zatz_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_epsilon",
+            "name": "zatz_chi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "snee_zeta",
-            "schema": "integer"
+            "name": "zatz_psi",
+            "schema": "duration"
           },
           "description": "hello"
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_lambda;1",
+        "@id": "dtmi:example:zatz_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_theta;1",
+          "@id": "dtmi:example:zatz_yuzz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_iota",
+            "name": "zatz_wum",
             "schema": "string"
           },
           "mapValue": {
-            "name": "snee_kappa",
-            "schema": "long"
+            "name": "zatz_um",
+            "schema": "float"
           },
           "description": [
             "hello"
@@ -61,18 +61,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_omicron;1",
+        "@id": "dtmi:example:zatz_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_mu;1",
+          "@id": "dtmi:example:zatz_fuddle;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_nu",
+            "name": "zatz_glikk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "snee_xi",
-            "schema": "string"
+            "name": "zatz_nuh",
+            "schema": "integer"
           },
           "description": {
             "en": "hello"
@@ -89,18 +89,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_tau;1",
+        "@id": "dtmi:example:zatz_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_pi;1",
+          "@id": "dtmi:example:zatz_quan;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_rho",
+            "name": "zatz_thnad",
             "schema": "string"
           },
           "mapValue": {
-            "name": "snee_sigma",
-            "schema": "time"
+            "name": "zatz_spazz",
+            "schema": "long"
           },
           "description": [
             {
@@ -120,18 +120,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_psi;1",
+        "@id": "dtmi:example:zatz_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_upsilon;1",
+          "@id": "dtmi:example:zatz_zatz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_phi",
+            "name": "zatz_jogg",
             "schema": "string"
           },
           "mapValue": {
-            "name": "snee_chi",
-            "schema": "boolean"
+            "name": "zatz_flunn",
+            "schema": "string"
           },
           "description": {}
         }
@@ -146,18 +146,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_um;1",
+        "@id": "dtmi:example:jogg_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_omega;1",
+          "@id": "dtmi:example:zatz_yekk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_yuzz",
+            "name": "zatz_vroo",
             "schema": "string"
           },
           "mapValue": {
-            "name": "snee_wum",
-            "schema": "date"
+            "name": "zatz_hi",
+            "schema": "time"
           },
           "description": []
         }
@@ -172,18 +172,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_nuh;1",
+        "@id": "dtmi:example:jogg_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_humpf;1",
+          "@id": "dtmi:example:jogg_beta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_fuddle",
+            "name": "jogg_gamma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "snee_glikk",
-            "schema": "dateTime"
+            "name": "jogg_delta",
+            "schema": "boolean"
           },
           "description": null
         }
@@ -198,19 +198,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_spazz;1",
+        "@id": "dtmi:example:jogg_iota;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:snee_snee;1",
+          "@id": "dtmi:example:jogg_zeta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_quan",
+            "name": "jogg_eta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "snee_thnad",
-            "schema": "double"
+            "name": "jogg_theta",
+            "schema": "date"
           },
           "description": null
         }
@@ -225,18 +225,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_flunn;1",
+        "@id": "dtmi:example:jogg_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_floob;1",
+          "@id": "dtmi:example:jogg_kappa;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_zatz",
+            "name": "jogg_lambda",
             "schema": "string"
           },
           "mapValue": {
-            "name": "snee_jogg",
-            "schema": "duration"
+            "name": "jogg_mu",
+            "schema": "dateTime"
           },
           "description": true
         }
@@ -251,19 +251,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_hi;1",
+        "@id": "dtmi:example:jogg_rho;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:snee_itch;1",
+          "@id": "dtmi:example:jogg_xi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_yekk",
+            "name": "jogg_omicron",
             "schema": "string"
           },
           "mapValue": {
-            "name": "snee_vroo",
-            "schema": "float"
+            "name": "jogg_pi",
+            "schema": "double"
           },
           "description": true
         }
@@ -278,18 +278,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_delta;1",
+        "@id": "dtmi:example:jogg_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_alpha;1",
+          "@id": "dtmi:example:jogg_sigma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_beta",
+            "name": "jogg_tau",
             "schema": "string"
           },
           "mapValue": {
-            "name": "quan_gamma",
-            "schema": "integer"
+            "name": "jogg_upsilon",
+            "schema": "duration"
           },
           "description": 626
         }
@@ -304,19 +304,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_theta;1",
+        "@id": "dtmi:example:jogg_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:quan_epsilon;1",
+          "@id": "dtmi:example:jogg_chi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_zeta",
+            "name": "jogg_psi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "quan_eta",
-            "schema": "long"
+            "name": "jogg_omega",
+            "schema": "float"
           },
           "description": 626
         }
@@ -331,18 +331,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_mu;1",
+        "@id": "dtmi:example:jogg_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_iota;1",
+          "@id": "dtmi:example:jogg_wum;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_kappa",
+            "name": "jogg_um",
             "schema": "string"
           },
           "mapValue": {
-            "name": "quan_lambda",
-            "schema": "string"
+            "name": "jogg_humpf",
+            "schema": "integer"
           },
           "description": [
             null
@@ -359,19 +359,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_pi;1",
+        "@id": "dtmi:example:jogg_quan;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:quan_nu;1",
+          "@id": "dtmi:example:jogg_glikk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_xi",
+            "name": "jogg_nuh",
             "schema": "string"
           },
           "mapValue": {
-            "name": "quan_omicron",
-            "schema": "time"
+            "name": "jogg_snee",
+            "schema": "long"
           },
           "description": [
             null
@@ -388,18 +388,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_upsilon;1",
+        "@id": "dtmi:example:jogg_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_rho;1",
+          "@id": "dtmi:example:jogg_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_sigma",
+            "name": "jogg_spazz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "quan_tau",
-            "schema": "boolean"
+            "name": "jogg_floob",
+            "schema": "string"
           },
           "description": [
             true
@@ -416,19 +416,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_omega;1",
+        "@id": "dtmi:example:jogg_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:quan_phi;1",
+          "@id": "dtmi:example:jogg_jogg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_chi",
+            "name": "jogg_flunn",
             "schema": "string"
           },
           "mapValue": {
-            "name": "quan_psi",
-            "schema": "date"
+            "name": "jogg_itch",
+            "schema": "time"
           },
           "description": [
             true
@@ -445,18 +445,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_humpf;1",
+        "@id": "dtmi:example:flunn_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_yuzz;1",
+          "@id": "dtmi:example:jogg_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_wum",
+            "name": "jogg_hi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "quan_um",
-            "schema": "dateTime"
+            "name": "flunn_alpha",
+            "schema": "boolean"
           },
           "description": [
             626
@@ -473,19 +473,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_snee;1",
+        "@id": "dtmi:example:flunn_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:quan_fuddle;1",
+          "@id": "dtmi:example:flunn_gamma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_glikk",
+            "name": "flunn_delta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "quan_nuh",
-            "schema": "double"
+            "name": "flunn_epsilon",
+            "schema": "date"
           },
           "description": [
             626
@@ -502,18 +502,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_floob;1",
+        "@id": "dtmi:example:flunn_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_quan;1",
+          "@id": "dtmi:example:flunn_eta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_thnad",
+            "name": "flunn_theta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "quan_spazz",
-            "schema": "duration"
+            "name": "flunn_iota",
+            "schema": "dateTime"
           },
           "description": [
             {}
@@ -530,19 +530,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_itch;1",
+        "@id": "dtmi:example:flunn_xi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:quan_zatz;1",
+          "@id": "dtmi:example:flunn_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_jogg",
+            "name": "flunn_mu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "quan_flunn",
-            "schema": "float"
+            "name": "flunn_nu",
+            "schema": "double"
           },
           "description": [
             {}
@@ -559,18 +559,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_alpha;1",
+        "@id": "dtmi:example:flunn_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_yekk;1",
+          "@id": "dtmi:example:flunn_omicron;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_vroo",
+            "name": "flunn_pi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "quan_hi",
-            "schema": "integer"
+            "name": "flunn_rho",
+            "schema": "duration"
           },
           "description": {
             "@value": "hello",
@@ -588,19 +588,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_epsilon;1",
+        "@id": "dtmi:example:flunn_chi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:thnad_beta;1",
+          "@id": "dtmi:example:flunn_tau;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_gamma",
+            "name": "flunn_upsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "thnad_delta",
-            "schema": "long"
+            "name": "flunn_phi",
+            "schema": "float"
           },
           "description": {
             "@value": "hello",
@@ -618,18 +618,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_iota;1",
+        "@id": "dtmi:example:flunn_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_zeta;1",
+          "@id": "dtmi:example:flunn_psi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_eta",
+            "name": "flunn_omega",
             "schema": "string"
           },
           "mapValue": {
-            "name": "thnad_theta",
-            "schema": "string"
+            "name": "flunn_yuzz",
+            "schema": "integer"
           },
           "description": [
             {
@@ -648,19 +648,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_nu;1",
+        "@id": "dtmi:example:flunn_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:thnad_kappa;1",
+          "@id": "dtmi:example:flunn_um;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_lambda",
+            "name": "flunn_humpf",
             "schema": "string"
           },
           "mapValue": {
-            "name": "thnad_mu",
-            "schema": "time"
+            "name": "flunn_fuddle",
+            "schema": "long"
           },
           "description": [
             {
diff --git a/DTDL/v2/spec/Requirement-ClassMapPropertyDescriptionStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassMapPropertyDescriptionStringLengthV2.json
index be83f839..fcad8284 100644
--- a/DTDL/v2/spec/Requirement-ClassMapPropertyDescriptionStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapPropertyDescriptionStringLengthV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_rho;1",
+        "@id": "dtmi:example:flunn_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_xi;1",
+          "@id": "dtmi:example:flunn_nuh;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_omicron",
+            "name": "flunn_snee",
             "schema": "string"
           },
           "mapValue": {
-            "name": "thnad_pi",
-            "schema": "boolean"
+            "name": "flunn_quan",
+            "schema": "string"
           },
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_phi;1",
+        "@id": "dtmi:example:flunn_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_sigma;1",
+          "@id": "dtmi:example:flunn_spazz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_tau",
+            "name": "flunn_floob",
             "schema": "string"
           },
           "mapValue": {
-            "name": "thnad_upsilon",
-            "schema": "date"
+            "name": "flunn_zatz",
+            "schema": "time"
           },
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
@@ -59,19 +59,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_yuzz;1",
+        "@id": "dtmi:example:flunn_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:thnad_chi;1",
+          "@id": "dtmi:example:flunn_flunn;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_psi",
+            "name": "flunn_itch",
             "schema": "string"
           },
           "mapValue": {
-            "name": "thnad_omega",
-            "schema": "dateTime"
+            "name": "flunn_yekk",
+            "schema": "boolean"
           },
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapPropertyDescriptionTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassMapPropertyDescriptionTermAndDtmiV2.json
index 5684249c..591d7dd9 100644
--- a/DTDL/v2/spec/Requirement-ClassMapPropertyDescriptionTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapPropertyDescriptionTermAndDtmiV2.json
@@ -7,24 +7,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_gamma;1",
+        "@id": "dtmi:example:itch_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_yekk;1",
+          "@id": "dtmi:example:itch_omicron;1",
           "@type": "Map",
           "description": [
-            "thnad_vroo"
+            "itch_pi"
           ],
           "dtmi:dtdl:property:description;2": [
-            "thnad_hi"
+            "itch_rho"
           ],
           "mapKey": {
-            "name": "spazz_alpha",
+            "name": "itch_sigma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_beta",
-            "schema": "integer"
+            "name": "itch_tau",
+            "schema": "duration"
           }
         }
       }
@@ -38,25 +38,25 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_iota;1",
+        "@id": "dtmi:example:itch_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:spazz_delta;1",
+          "@id": "dtmi:example:itch_phi;1",
           "@type": "Map",
           "description": [
-            "spazz_epsilon"
+            "itch_chi"
           ],
           "dtmi:dtdl:property:description;2": [
-            "spazz_zeta"
+            "itch_psi"
           ],
           "mapKey": {
-            "name": "spazz_eta",
+            "name": "itch_omega",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_theta",
-            "schema": "long"
+            "name": "itch_yuzz",
+            "schema": "float"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassMapPropertyDisplayNameLangStringV2.json b/DTDL/v2/spec/Requirement-ClassMapPropertyDisplayNameLangStringV2.json
index aad58639..bfdb2a10 100644
--- a/DTDL/v2/spec/Requirement-ClassMapPropertyDisplayNameLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapPropertyDisplayNameLangStringV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_nu;1",
+        "@id": "dtmi:example:itch_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_kappa;1",
+          "@id": "dtmi:example:itch_um;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_lambda",
+            "name": "itch_humpf",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_mu",
-            "schema": "string"
+            "name": "itch_fuddle",
+            "schema": "integer"
           },
           "displayName": "hello"
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_rho;1",
+        "@id": "dtmi:example:itch_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_xi;1",
+          "@id": "dtmi:example:itch_nuh;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_omicron",
+            "name": "itch_snee",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_pi",
-            "schema": "time"
+            "name": "itch_quan",
+            "schema": "long"
           },
           "displayName": [
             "hello"
@@ -61,18 +61,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_phi;1",
+        "@id": "dtmi:example:itch_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_sigma;1",
+          "@id": "dtmi:example:itch_spazz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_tau",
+            "name": "itch_floob",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_upsilon",
-            "schema": "boolean"
+            "name": "itch_zatz",
+            "schema": "string"
           },
           "displayName": {
             "en": "hello"
@@ -89,18 +89,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_yuzz;1",
+        "@id": "dtmi:example:itch_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_chi;1",
+          "@id": "dtmi:example:itch_flunn;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_psi",
+            "name": "itch_itch",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_omega",
-            "schema": "date"
+            "name": "itch_yekk",
+            "schema": "time"
           },
           "displayName": [
             {
@@ -120,18 +120,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_fuddle;1",
+        "@id": "dtmi:example:yekk_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_wum;1",
+          "@id": "dtmi:example:itch_hi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_um",
+            "name": "yekk_alpha",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_humpf",
-            "schema": "dateTime"
+            "name": "yekk_beta",
+            "schema": "boolean"
           },
           "displayName": {}
         }
@@ -146,18 +146,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_quan;1",
+        "@id": "dtmi:example:yekk_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_glikk;1",
+          "@id": "dtmi:example:yekk_delta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_nuh",
+            "name": "yekk_epsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_snee",
-            "schema": "double"
+            "name": "yekk_zeta",
+            "schema": "date"
           },
           "displayName": []
         }
@@ -172,18 +172,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_zatz;1",
+        "@id": "dtmi:example:yekk_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_thnad;1",
+          "@id": "dtmi:example:yekk_theta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_spazz",
+            "name": "yekk_iota",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_floob",
-            "schema": "duration"
+            "name": "yekk_kappa",
+            "schema": "dateTime"
           },
           "displayName": null
         }
@@ -198,19 +198,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_yekk;1",
+        "@id": "dtmi:example:yekk_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:spazz_jogg;1",
+          "@id": "dtmi:example:yekk_mu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_flunn",
+            "name": "yekk_nu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_itch",
-            "schema": "float"
+            "name": "yekk_xi",
+            "schema": "double"
           },
           "displayName": null
         }
@@ -225,18 +225,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_beta;1",
+        "@id": "dtmi:example:yekk_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_vroo;1",
+          "@id": "dtmi:example:yekk_pi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_hi",
+            "name": "yekk_rho",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_alpha",
-            "schema": "integer"
+            "name": "yekk_sigma",
+            "schema": "duration"
           },
           "displayName": true
         }
@@ -251,19 +251,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_zeta;1",
+        "@id": "dtmi:example:yekk_psi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:floob_gamma;1",
+          "@id": "dtmi:example:yekk_upsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_delta",
+            "name": "yekk_phi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_epsilon",
-            "schema": "long"
+            "name": "yekk_chi",
+            "schema": "float"
           },
           "displayName": true
         }
@@ -278,18 +278,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_kappa;1",
+        "@id": "dtmi:example:yekk_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_eta;1",
+          "@id": "dtmi:example:yekk_omega;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_theta",
+            "name": "yekk_yuzz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_iota",
-            "schema": "string"
+            "name": "yekk_wum",
+            "schema": "integer"
           },
           "displayName": 626
         }
@@ -304,19 +304,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_xi;1",
+        "@id": "dtmi:example:yekk_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:floob_lambda;1",
+          "@id": "dtmi:example:yekk_humpf;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_mu",
+            "name": "yekk_fuddle",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_nu",
-            "schema": "time"
+            "name": "yekk_glikk",
+            "schema": "long"
           },
           "displayName": 626
         }
@@ -331,18 +331,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_sigma;1",
+        "@id": "dtmi:example:yekk_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_omicron;1",
+          "@id": "dtmi:example:yekk_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_pi",
+            "name": "yekk_quan",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_rho",
-            "schema": "boolean"
+            "name": "yekk_thnad",
+            "schema": "string"
           },
           "displayName": [
             null
@@ -359,19 +359,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_chi;1",
+        "@id": "dtmi:example:yekk_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:floob_tau;1",
+          "@id": "dtmi:example:yekk_floob;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_upsilon",
+            "name": "yekk_zatz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_phi",
-            "schema": "date"
+            "name": "yekk_jogg",
+            "schema": "time"
           },
           "displayName": [
             null
@@ -388,18 +388,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_wum;1",
+        "@id": "dtmi:example:yekk_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_psi;1",
+          "@id": "dtmi:example:yekk_itch;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_omega",
+            "name": "yekk_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_yuzz",
-            "schema": "dateTime"
+            "name": "yekk_vroo",
+            "schema": "boolean"
           },
           "displayName": [
             true
@@ -416,19 +416,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_glikk;1",
+        "@id": "dtmi:example:vroo_delta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:floob_um;1",
+          "@id": "dtmi:example:vroo_alpha;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_humpf",
+            "name": "vroo_beta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_fuddle",
-            "schema": "double"
+            "name": "vroo_gamma",
+            "schema": "date"
           },
           "displayName": [
             true
@@ -445,18 +445,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_thnad;1",
+        "@id": "dtmi:example:vroo_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_nuh;1",
+          "@id": "dtmi:example:vroo_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_snee",
+            "name": "vroo_zeta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_quan",
-            "schema": "duration"
+            "name": "vroo_eta",
+            "schema": "dateTime"
           },
           "displayName": [
             626
@@ -473,19 +473,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_jogg;1",
+        "@id": "dtmi:example:vroo_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:floob_spazz;1",
+          "@id": "dtmi:example:vroo_iota;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_floob",
+            "name": "vroo_kappa",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_zatz",
-            "schema": "float"
+            "name": "vroo_lambda",
+            "schema": "double"
           },
           "displayName": [
             626
@@ -502,18 +502,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_vroo;1",
+        "@id": "dtmi:example:vroo_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_flunn;1",
+          "@id": "dtmi:example:vroo_nu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_itch",
+            "name": "vroo_xi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_yekk",
-            "schema": "integer"
+            "name": "vroo_omicron",
+            "schema": "duration"
           },
           "displayName": [
             {}
@@ -530,19 +530,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_gamma;1",
+        "@id": "dtmi:example:vroo_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:floob_hi;1",
+          "@id": "dtmi:example:vroo_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_alpha",
+            "name": "vroo_sigma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_beta",
-            "schema": "long"
+            "name": "vroo_tau",
+            "schema": "float"
           },
           "displayName": [
             {}
@@ -559,18 +559,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_eta;1",
+        "@id": "dtmi:example:vroo_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_delta;1",
+          "@id": "dtmi:example:vroo_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_epsilon",
+            "name": "vroo_chi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_zeta",
-            "schema": "string"
+            "name": "vroo_psi",
+            "schema": "integer"
           },
           "displayName": {
             "@value": "hello",
@@ -588,19 +588,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_lambda;1",
+        "@id": "dtmi:example:vroo_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zatz_theta;1",
+          "@id": "dtmi:example:vroo_yuzz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_iota",
+            "name": "vroo_wum",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_kappa",
-            "schema": "time"
+            "name": "vroo_um",
+            "schema": "long"
           },
           "displayName": {
             "@value": "hello",
@@ -618,18 +618,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_omicron;1",
+        "@id": "dtmi:example:vroo_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_mu;1",
+          "@id": "dtmi:example:vroo_fuddle;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_nu",
+            "name": "vroo_glikk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_xi",
-            "schema": "boolean"
+            "name": "vroo_nuh",
+            "schema": "string"
           },
           "displayName": [
             {
@@ -648,19 +648,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_tau;1",
+        "@id": "dtmi:example:vroo_floob;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zatz_pi;1",
+          "@id": "dtmi:example:vroo_quan;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_rho",
+            "name": "vroo_thnad",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_sigma",
-            "schema": "date"
+            "name": "vroo_spazz",
+            "schema": "time"
           },
           "displayName": [
             {
diff --git a/DTDL/v2/spec/Requirement-ClassMapPropertyDisplayNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassMapPropertyDisplayNameStringLengthV2.json
index 909a48e8..b4a2a310 100644
--- a/DTDL/v2/spec/Requirement-ClassMapPropertyDisplayNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapPropertyDisplayNameStringLengthV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_psi;1",
+        "@id": "dtmi:example:vroo_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_upsilon;1",
+          "@id": "dtmi:example:vroo_zatz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_phi",
+            "name": "vroo_jogg",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_chi",
-            "schema": "dateTime"
+            "name": "vroo_flunn",
+            "schema": "boolean"
           },
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSometh"
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_um;1",
+        "@id": "dtmi:example:hi_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_omega;1",
+          "@id": "dtmi:example:vroo_yekk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_yuzz",
+            "name": "vroo_vroo",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_wum",
-            "schema": "double"
+            "name": "vroo_hi",
+            "schema": "date"
           },
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
         }
@@ -59,19 +59,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_nuh;1",
+        "@id": "dtmi:example:hi_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zatz_humpf;1",
+          "@id": "dtmi:example:hi_beta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_fuddle",
+            "name": "hi_gamma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_glikk",
-            "schema": "duration"
+            "name": "hi_delta",
+            "schema": "dateTime"
           },
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapPropertyDisplayNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassMapPropertyDisplayNameTermAndDtmiV2.json
index 6debad0a..cb428622 100644
--- a/DTDL/v2/spec/Requirement-ClassMapPropertyDisplayNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapPropertyDisplayNameTermAndDtmiV2.json
@@ -7,24 +7,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_iota;1",
+        "@id": "dtmi:example:hi_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_delta;1",
+          "@id": "dtmi:example:hi_phi;1",
           "@type": "Map",
           "displayName": [
-            "jogg_epsilon"
+            "hi_chi"
           ],
           "dtmi:dtdl:property:displayName;2": [
-            "jogg_zeta"
+            "hi_psi"
           ],
           "mapKey": {
-            "name": "jogg_eta",
+            "name": "hi_omega",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_theta",
-            "schema": "string"
+            "name": "hi_yuzz",
+            "schema": "integer"
           }
         }
       }
@@ -38,25 +38,25 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_omicron;1",
+        "@id": "dtmi:example:hi_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:jogg_kappa;1",
+          "@id": "dtmi:example:hi_um;1",
           "@type": "Map",
           "displayName": [
-            "jogg_lambda"
+            "hi_humpf"
           ],
           "dtmi:dtdl:property:displayName;2": [
-            "jogg_mu"
+            "hi_fuddle"
           ],
           "mapKey": {
-            "name": "jogg_nu",
+            "name": "hi_glikk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_xi",
-            "schema": "time"
+            "name": "hi_nuh",
+            "schema": "long"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassMapPropertyFormallyInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassMapPropertyFormallyInvalidDtmiV2.json
index 20de9aee..c330a23e 100644
--- a/DTDL/v2/spec/Requirement-ClassMapPropertyFormallyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapPropertyFormallyInvalidDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_omega;1",
+        "@id": "dtmi:example:alpha_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_phi;1",
+          "@id": "dtmi:example:alpha_jogg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_chi",
+            "name": "alpha_flunn",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_psi",
-            "schema": "dateTime"
+            "name": "alpha_itch",
+            "schema": "boolean"
           },
           "dtmi:foo//bar": 626
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_humpf;1",
+        "@id": "dtmi:example:beta_beta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_yuzz;1",
+          "@id": "dtmi:example:alpha_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_wum",
+            "name": "alpha_hi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_um",
-            "schema": "double"
+            "name": "beta_alpha",
+            "schema": "date"
           },
           "dtmi:foo//bar": 626
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapPropertyFormallyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Requirement-ClassMapPropertyFormallyIrrelevantDtmiOrTermV2.json
index 562a4e65..36f0e97c 100644
--- a/DTDL/v2/spec/Requirement-ClassMapPropertyFormallyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapPropertyFormallyIrrelevantDtmiOrTermV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_delta;1",
+        "@id": "dtmi:example:alpha_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_alpha;1",
+          "@id": "dtmi:example:alpha_sigma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_beta",
+            "name": "alpha_tau",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_gamma",
-            "schema": "long"
+            "name": "alpha_upsilon",
+            "schema": "float"
           },
           "dtmi:foo:bar;1": 626
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_theta;1",
+        "@id": "dtmi:example:alpha_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_epsilon;1",
+          "@id": "dtmi:example:alpha_chi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_zeta",
+            "name": "alpha_psi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_eta",
-            "schema": "string"
+            "name": "alpha_omega",
+            "schema": "integer"
           },
           "dtmi:foo:bar;1": 626
         }
@@ -60,18 +60,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_mu;1",
+        "@id": "dtmi:example:alpha_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_iota;1",
+          "@id": "dtmi:example:alpha_wum;1",
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_kappa",
+            "name": "alpha_um",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_lambda",
-            "schema": "time"
+            "name": "alpha_humpf",
+            "schema": "long"
           },
           "boolean": null
         }
@@ -86,19 +86,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_pi;1",
+        "@id": "dtmi:example:alpha_quan;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_nu;1",
+          "@id": "dtmi:example:alpha_glikk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_xi",
+            "name": "alpha_nuh",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_omicron",
-            "schema": "boolean"
+            "name": "alpha_snee",
+            "schema": "string"
           },
           "boolean": null
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapPropertyFormallyNotDtmiNorTermV2.json b/DTDL/v2/spec/Requirement-ClassMapPropertyFormallyNotDtmiNorTermV2.json
index 484efb6d..83530351 100644
--- a/DTDL/v2/spec/Requirement-ClassMapPropertyFormallyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapPropertyFormallyNotDtmiNorTermV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_floob;1",
+        "@id": "dtmi:example:beta_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_quan;1",
+          "@id": "dtmi:example:beta_eta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_thnad",
+            "name": "beta_theta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_spazz",
-            "schema": "float"
+            "name": "beta_iota",
+            "schema": "double"
           },
           "http://foo.com/bar": true
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_itch;1",
+        "@id": "dtmi:example:beta_xi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_zatz;1",
+          "@id": "dtmi:example:beta_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_jogg",
+            "name": "beta_mu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_flunn",
-            "schema": "integer"
+            "name": "beta_nu",
+            "schema": "duration"
           },
           "http://foo.com/bar": true
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapPropertyFormallyUndefinedTermV2.json b/DTDL/v2/spec/Requirement-ClassMapPropertyFormallyUndefinedTermV2.json
index 6c7bbce8..b68d1ef6 100644
--- a/DTDL/v2/spec/Requirement-ClassMapPropertyFormallyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapPropertyFormallyUndefinedTermV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_epsilon;1",
+        "@id": "dtmi:example:beta_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_beta;1",
+          "@id": "dtmi:example:beta_tau;1",
           "@type": "Map",
           "mapKey": {
-            "name": "itch_gamma",
+            "name": "beta_upsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "itch_delta",
-            "schema": "string"
+            "name": "beta_phi",
+            "schema": "integer"
           },
           "foobar": {}
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_iota;1",
+        "@id": "dtmi:example:beta_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:itch_zeta;1",
+          "@id": "dtmi:example:beta_psi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "itch_eta",
+            "name": "beta_omega",
             "schema": "string"
           },
           "mapValue": {
-            "name": "itch_theta",
-            "schema": "time"
+            "name": "beta_yuzz",
+            "schema": "long"
           },
           "foobar": {}
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapPropertyMapKeyElementV2.json b/DTDL/v2/spec/Requirement-ClassMapPropertyMapKeyElementV2.json
index 39c22343..3c77ab28 100644
--- a/DTDL/v2/spec/Requirement-ClassMapPropertyMapKeyElementV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapPropertyMapKeyElementV2.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_vroo;1",
+        "@id": "dtmi:example:pi_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "lambda_yekk",
+          "name": "pi_glikk",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "lambda_itch",
-              "schema": "boolean"
+              "name": "pi_fuddle",
+              "schema": "dateTime"
             },
             "mapKey": {
-              "@id": "dtmi:example:lambda_jogg;1",
-              "name": "lambda_flunn",
+              "@id": "dtmi:example:pi_um;1",
+              "name": "pi_humpf",
               "schema": "string"
             }
           }
@@ -36,21 +36,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_delta;1",
+        "@id": "dtmi:example:pi_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_gamma",
+          "name": "pi_spazz",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "mu_beta",
-              "schema": "date"
+              "name": "pi_thnad",
+              "schema": "double"
             },
             "mapKey": [
               {
-                "@id": "dtmi:example:lambda_hi;1",
-                "name": "mu_alpha",
+                "@id": "dtmi:example:pi_snee;1",
+                "name": "pi_quan",
                 "schema": "string"
               }
             ]
@@ -67,29 +67,29 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_theta;1",
+        "@id": "dtmi:example:pi_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_zeta;1",
+          "@id": "dtmi:example:pi_jogg;1",
           "@type": "Map",
           "mapValue": {
-            "name": "mu_eta",
-            "schema": "dateTime"
+            "name": "pi_flunn",
+            "schema": "duration"
           },
           "mapKey": {
             "@id": "dtmi:ex:dependentRef;1",
-            "name": "mu_epsilon",
+            "name": "pi_zatz",
             "schema": "string"
           }
         },
         "contents": {
           "@type": "Property",
-          "name": "mu_kappa",
+          "name": "pi_vroo",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "mu_iota",
-              "schema": "double"
+              "name": "pi_yekk",
+              "schema": "float"
             },
             "mapKey": "dtmi:ex:dependentRef;1"
           }
@@ -105,29 +105,29 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_xi;1",
+        "@id": "dtmi:example:rho_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_mu;1",
+          "@id": "dtmi:example:rho_alpha;1",
           "@type": "Map",
           "mapValue": {
-            "name": "mu_nu",
-            "schema": "duration"
+            "name": "rho_beta",
+            "schema": "integer"
           },
           "mapKey": {
             "@id": "dtmi:ex:dependentRef;1",
-            "name": "mu_lambda",
+            "name": "pi_hi",
             "schema": "string"
           }
         },
         "contents": {
           "@type": "Property",
-          "name": "mu_pi",
+          "name": "rho_epsilon",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "mu_omicron",
-              "schema": "float"
+              "name": "rho_delta",
+              "schema": "long"
             },
             "mapKey": [
               "dtmi:ex:dependentRef;1"
@@ -145,20 +145,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_phi;1",
+        "@id": "dtmi:example:rho_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_upsilon",
+          "name": "rho_iota",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "mu_tau",
-              "schema": "integer"
+              "name": "rho_theta",
+              "schema": "string"
             },
             "mapKey": {
-              "@id": "dtmi:example:mu_rho;1",
-              "name": "mu_sigma",
+              "@id": "dtmi:example:rho_zeta;1",
+              "name": "rho_eta",
               "schema": "string",
               "@context": "dtmi:dtdl:context;3"
             }
@@ -175,21 +175,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_wum;1",
+        "@id": "dtmi:example:rho_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_yuzz",
+          "name": "rho_xi",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Map",
             "mapValue": {
-              "name": "mu_omega",
-              "schema": "long"
+              "name": "rho_nu",
+              "schema": "time"
             },
             "mapKey": {
-              "@id": "dtmi:example:mu_chi;1",
-              "name": "mu_psi",
+              "@id": "dtmi:example:rho_lambda;1",
+              "name": "rho_mu",
               "schema": "string",
               "@context": "dtmi:dtdl:context;3"
             }
@@ -206,16 +206,77 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_fuddle;1",
+        "@id": "dtmi:example:rho_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_humpf",
+          "name": "rho_tau",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "mu_um",
-              "schema": "string"
+              "name": "rho_sigma",
+              "schema": "boolean"
+            },
+            "mapKey": {
+              "@id": "dtmi:example:rho_pi;1",
+              "name": "rho_rho",
+              "schema": "string",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:rho_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "rho_omega",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Map",
+            "mapValue": {
+              "name": "rho_psi",
+              "schema": "date"
+            },
+            "mapKey": {
+              "@id": "dtmi:example:rho_phi;1",
+              "name": "rho_chi",
+              "schema": "string",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:rho_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "rho_um",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "rho_wum",
+              "schema": "dateTime"
             },
             "mapKey": []
           }
@@ -231,17 +292,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_snee;1",
+        "@id": "dtmi:example:rho_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_nuh",
+          "name": "rho_glikk",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Map",
             "mapValue": {
-              "name": "mu_glikk",
-              "schema": "time"
+              "name": "rho_fuddle",
+              "schema": "double"
             },
             "mapKey": []
           }
@@ -257,26 +318,26 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_flunn;1",
+        "@id": "dtmi:example:rho_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_jogg",
+          "name": "rho_zatz",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "mu_zatz",
-              "schema": "boolean"
+              "name": "rho_floob",
+              "schema": "duration"
             },
             "mapKey": [
               {
-                "@id": "dtmi:example:mu_quan;1",
-                "name": "mu_thnad",
+                "@id": "dtmi:example:rho_snee;1",
+                "name": "rho_quan",
                 "schema": "string"
               },
               {
-                "@id": "dtmi:example:mu_spazz;1",
-                "name": "mu_floob",
+                "@id": "dtmi:example:rho_thnad;1",
+                "name": "rho_spazz",
                 "schema": "string"
               }
             ]
@@ -293,27 +354,27 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_gamma;1",
+        "@id": "dtmi:example:sigma_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nu_beta",
+          "name": "sigma_alpha",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Map",
             "mapValue": {
-              "name": "nu_alpha",
-              "schema": "date"
+              "name": "rho_hi",
+              "schema": "float"
             },
             "mapKey": [
               {
-                "@id": "dtmi:example:mu_itch;1",
-                "name": "mu_yekk",
+                "@id": "dtmi:example:rho_flunn;1",
+                "name": "rho_itch",
                 "schema": "string"
               },
               {
-                "@id": "dtmi:example:mu_vroo;1",
-                "name": "mu_hi",
+                "@id": "dtmi:example:rho_yekk;1",
+                "name": "rho_vroo",
                 "schema": "string"
               }
             ]
diff --git a/DTDL/v2/spec/Requirement-ClassMapPropertyMapKeyTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassMapPropertyMapKeyTermAndDtmiV2.json
index 53c18777..286658cb 100644
--- a/DTDL/v2/spec/Requirement-ClassMapPropertyMapKeyTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapPropertyMapKeyTermAndDtmiV2.json
@@ -7,22 +7,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_vroo;1",
+        "@id": "dtmi:example:phi_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_jogg;1",
+          "@id": "dtmi:example:phi_zatz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "pi_flunn",
+            "name": "phi_jogg",
             "schema": "string"
           },
           "dtmi:dtdl:property:mapKey;2": {
-            "name": "pi_itch",
+            "name": "phi_flunn",
             "schema": "string"
           },
           "mapValue": {
-            "name": "pi_yekk",
-            "schema": "dateTime"
+            "name": "phi_itch",
+            "schema": "integer"
           }
         }
       }
@@ -36,23 +36,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_delta;1",
+        "@id": "dtmi:example:chi_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:pi_hi;1",
+          "@id": "dtmi:example:phi_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "rho_alpha",
+            "name": "phi_hi",
             "schema": "string"
           },
           "dtmi:dtdl:property:mapKey;2": {
-            "name": "rho_beta",
+            "name": "chi_alpha",
             "schema": "string"
           },
           "mapValue": {
-            "name": "rho_gamma",
-            "schema": "double"
+            "name": "chi_beta",
+            "schema": "long"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassMapPropertyMapKeyTypeConformanceV2.json b/DTDL/v2/spec/Requirement-ClassMapPropertyMapKeyTypeConformanceV2.json
index 4f11b387..b692de91 100644
--- a/DTDL/v2/spec/Requirement-ClassMapPropertyMapKeyTypeConformanceV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapPropertyMapKeyTypeConformanceV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_nu;1",
+        "@id": "dtmi:example:sigma_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_lambda;1",
+          "@id": "dtmi:example:sigma_kappa;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nu_mu",
-            "schema": "float"
+            "name": "sigma_lambda",
+            "schema": "time"
           },
           "mapKey": {
-            "@id": "dtmi:example:nu_kappa;1",
-            "elementSchema": "duration",
+            "@id": "dtmi:example:sigma_iota;1",
+            "elementSchema": "string",
             "@type": "Array"
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_rho;1",
+        "@id": "dtmi:example:sigma_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nu_omicron;1",
+          "@id": "dtmi:example:sigma_xi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nu_pi",
-            "schema": "long"
+            "name": "sigma_omicron",
+            "schema": "date"
           },
           "mapKey": {
-            "@id": "dtmi:example:nu_xi;1",
-            "elementSchema": "integer",
+            "@id": "dtmi:example:sigma_nu;1",
+            "elementSchema": "boolean",
             "@type": "Array"
           }
         }
@@ -60,18 +60,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_chi;1",
+        "@id": "dtmi:example:sigma_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_upsilon;1",
+          "@id": "dtmi:example:sigma_tau;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nu_phi",
-            "schema": "string"
+            "name": "sigma_upsilon",
+            "schema": "dateTime"
           },
           "mapKey": {
-            "@id": "dtmi:example:nu_sigma;1",
-            "name": "nu_tau",
+            "@id": "dtmi:example:sigma_rho;1",
+            "name": "sigma_sigma",
             "@type": "Command"
           }
         }
@@ -86,19 +86,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_um;1",
+        "@id": "dtmi:example:sigma_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nu_yuzz;1",
+          "@id": "dtmi:example:sigma_omega;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nu_wum",
-            "schema": "time"
+            "name": "sigma_yuzz",
+            "schema": "double"
           },
           "mapKey": {
-            "@id": "dtmi:example:nu_psi;1",
-            "name": "nu_omega",
+            "@id": "dtmi:example:sigma_chi;1",
+            "name": "sigma_psi",
             "@type": "Command"
           }
         }
@@ -113,19 +113,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_snee;1",
+        "@id": "dtmi:example:sigma_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_glikk;1",
+          "@id": "dtmi:example:sigma_fuddle;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nu_nuh",
-            "schema": "date"
+            "name": "sigma_glikk",
+            "schema": "float"
           },
           "mapKey": {
-            "@id": "dtmi:example:nu_humpf;1",
-            "name": "nu_fuddle",
-            "schema": "boolean",
+            "@id": "dtmi:example:sigma_um;1",
+            "name": "sigma_humpf",
+            "schema": "duration",
             "@type": "CommandPayload"
           }
         }
@@ -140,20 +140,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_zatz;1",
+        "@id": "dtmi:example:sigma_floob;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nu_spazz;1",
+          "@id": "dtmi:example:sigma_thnad;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nu_floob",
-            "schema": "double"
+            "name": "sigma_spazz",
+            "schema": "long"
           },
           "mapKey": {
-            "@id": "dtmi:example:nu_quan;1",
-            "name": "nu_thnad",
-            "schema": "dateTime",
+            "@id": "dtmi:example:sigma_snee;1",
+            "name": "sigma_quan",
+            "schema": "integer",
             "@type": "CommandPayload"
           }
         }
@@ -168,20 +168,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_hi;1",
+        "@id": "dtmi:example:sigma_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_yekk;1",
+          "@id": "dtmi:example:sigma_itch;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nu_vroo",
-            "schema": "duration"
+            "name": "sigma_yekk",
+            "schema": "string"
           },
           "mapKey": {
-            "@id": "dtmi:example:nu_jogg;1",
-            "name": "nu_flunn",
+            "@id": "dtmi:example:sigma_zatz;1",
+            "name": "sigma_jogg",
             "schema": {
-              "@id": "dtmi:example:nu_itch;1",
+              "@id": "dtmi:example:sigma_flunn;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -198,21 +198,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_zeta;1",
+        "@id": "dtmi:example:tau_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:xi_delta;1",
+          "@id": "dtmi:example:tau_gamma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_epsilon",
-            "schema": "float"
+            "name": "tau_delta",
+            "schema": "time"
           },
           "mapKey": {
-            "@id": "dtmi:example:xi_alpha;1",
-            "name": "xi_beta",
+            "@id": "dtmi:example:sigma_hi;1",
+            "name": "tau_alpha",
             "schema": {
-              "@id": "dtmi:example:xi_gamma;1",
+              "@id": "dtmi:example:tau_beta;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -229,21 +229,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_lambda;1",
+        "@id": "dtmi:example:tau_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_iota;1",
+          "@id": "dtmi:example:tau_theta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_kappa",
-            "schema": "integer"
+            "name": "tau_iota",
+            "schema": "boolean"
           },
           "mapKey": {
-            "@id": "dtmi:example:xi_eta;1",
+            "@id": "dtmi:example:tau_zeta;1",
             "enumValues": [
               {
-                "enumValue": 1043,
-                "name": "xi_theta"
+                "enumValue": 1056,
+                "name": "tau_eta"
               }
             ],
             "valueSchema": "integer",
@@ -261,22 +261,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_pi;1",
+        "@id": "dtmi:example:tau_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:xi_xi;1",
+          "@id": "dtmi:example:tau_nu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_omicron",
-            "schema": "long"
+            "name": "tau_xi",
+            "schema": "date"
           },
           "mapKey": {
-            "@id": "dtmi:example:xi_mu;1",
+            "@id": "dtmi:example:tau_lambda;1",
             "enumValues": [
               {
-                "enumValue": 1044,
-                "name": "xi_nu"
+                "enumValue": 1057,
+                "name": "tau_mu"
               }
             ],
             "valueSchema": "integer",
@@ -294,19 +294,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_phi;1",
+        "@id": "dtmi:example:tau_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_tau;1",
+          "@id": "dtmi:example:tau_sigma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_upsilon",
-            "schema": "string"
+            "name": "tau_tau",
+            "schema": "dateTime"
           },
           "mapKey": {
-            "@id": "dtmi:example:xi_rho;1",
-            "enumValue": 1045,
-            "name": "xi_sigma",
+            "@id": "dtmi:example:tau_pi;1",
+            "enumValue": 1058,
+            "name": "tau_rho",
             "@type": "EnumValue"
           }
         }
@@ -321,20 +321,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_wum;1",
+        "@id": "dtmi:example:tau_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:xi_omega;1",
+          "@id": "dtmi:example:tau_psi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_yuzz",
-            "schema": "time"
+            "name": "tau_omega",
+            "schema": "double"
           },
           "mapKey": {
-            "@id": "dtmi:example:xi_chi;1",
-            "enumValue": 1046,
-            "name": "xi_psi",
+            "@id": "dtmi:example:tau_phi;1",
+            "enumValue": 1059,
+            "name": "tau_chi",
             "@type": "EnumValue"
           }
         }
@@ -349,19 +349,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_nuh;1",
+        "@id": "dtmi:example:tau_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_fuddle;1",
+          "@id": "dtmi:example:tau_humpf;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_glikk",
-            "schema": "date"
+            "name": "tau_fuddle",
+            "schema": "float"
           },
           "mapKey": {
-            "@id": "dtmi:example:xi_um;1",
-            "name": "xi_humpf",
-            "schema": "boolean",
+            "@id": "dtmi:example:tau_wum;1",
+            "name": "tau_um",
+            "schema": "duration",
             "@type": "Field"
           }
         }
@@ -376,20 +376,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_floob;1",
+        "@id": "dtmi:example:tau_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:xi_thnad;1",
+          "@id": "dtmi:example:tau_quan;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_spazz",
-            "schema": "double"
+            "name": "tau_thnad",
+            "schema": "long"
           },
           "mapKey": {
-            "@id": "dtmi:example:xi_snee;1",
-            "name": "xi_quan",
-            "schema": "dateTime",
+            "@id": "dtmi:example:tau_nuh;1",
+            "name": "tau_snee",
+            "schema": "integer",
             "@type": "Field"
           }
         }
@@ -404,17 +404,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_itch;1",
+        "@id": "dtmi:example:tau_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_jogg;1",
+          "@id": "dtmi:example:tau_zatz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_flunn",
-            "schema": "duration"
+            "name": "tau_jogg",
+            "schema": "string"
           },
           "mapKey": {
-            "@id": "dtmi:example:xi_zatz;1",
+            "@id": "dtmi:example:tau_floob;1",
             "@type": "Interface"
           }
         }
@@ -429,18 +429,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_alpha;1",
+        "@id": "dtmi:example:tau_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:xi_vroo;1",
+          "@id": "dtmi:example:tau_yekk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_hi",
-            "schema": "float"
+            "name": "tau_vroo",
+            "schema": "time"
           },
           "mapKey": {
-            "@id": "dtmi:example:xi_yekk;1",
+            "@id": "dtmi:example:tau_itch;1",
             "@type": "Interface"
           }
         }
@@ -455,24 +455,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_eta;1",
+        "@id": "dtmi:example:upsilon_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_epsilon;1",
+          "@id": "dtmi:example:upsilon_delta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_zeta",
-            "schema": "long"
+            "name": "upsilon_epsilon",
+            "schema": "date"
           },
           "mapKey": {
-            "@id": "dtmi:example:omicron_beta;1",
+            "@id": "dtmi:example:upsilon_alpha;1",
             "mapKey": {
-              "name": "omicron_gamma",
+              "name": "upsilon_beta",
               "schema": "string"
             },
             "mapValue": {
-              "name": "omicron_delta",
-              "schema": "integer"
+              "name": "upsilon_gamma",
+              "schema": "boolean"
             },
             "@type": "Map"
           }
@@ -488,25 +488,25 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_nu;1",
+        "@id": "dtmi:example:upsilon_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omicron_lambda;1",
+          "@id": "dtmi:example:upsilon_kappa;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_mu",
-            "schema": "time"
+            "name": "upsilon_lambda",
+            "schema": "double"
           },
           "mapKey": {
-            "@id": "dtmi:example:omicron_theta;1",
+            "@id": "dtmi:example:upsilon_eta;1",
             "mapKey": {
-              "name": "omicron_iota",
+              "name": "upsilon_theta",
               "schema": "string"
             },
             "mapValue": {
-              "name": "omicron_kappa",
-              "schema": "string"
+              "name": "upsilon_iota",
+              "schema": "dateTime"
             },
             "@type": "Map"
           }
@@ -522,18 +522,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_sigma;1",
+        "@id": "dtmi:example:upsilon_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_pi;1",
+          "@id": "dtmi:example:upsilon_omicron;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_rho",
-            "schema": "boolean"
+            "name": "upsilon_pi",
+            "schema": "duration"
           },
           "mapKey": {
-            "@id": "dtmi:example:omicron_xi;1",
-            "name": "omicron_omicron",
+            "@id": "dtmi:example:upsilon_nu;1",
+            "name": "upsilon_xi",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -549,19 +549,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_psi;1",
+        "@id": "dtmi:example:upsilon_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_phi;1",
+          "@id": "dtmi:example:upsilon_upsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_chi",
-            "schema": "dateTime"
+            "name": "upsilon_phi",
+            "schema": "integer"
           },
           "mapKey": {
-            "@id": "dtmi:example:omicron_tau;1",
-            "name": "omicron_upsilon",
-            "schema": "date",
+            "@id": "dtmi:example:upsilon_sigma;1",
+            "name": "upsilon_tau",
+            "schema": "float",
             "@type": "MapValue"
           }
         }
@@ -576,20 +576,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_humpf;1",
+        "@id": "dtmi:example:upsilon_um;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omicron_wum;1",
+          "@id": "dtmi:example:upsilon_yuzz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_um",
-            "schema": "duration"
+            "name": "upsilon_wum",
+            "schema": "string"
           },
           "mapKey": {
-            "@id": "dtmi:example:omicron_omega;1",
-            "name": "omicron_yuzz",
-            "schema": "double",
+            "@id": "dtmi:example:upsilon_psi;1",
+            "name": "upsilon_omega",
+            "schema": "long",
             "@type": "MapValue"
           }
         }
@@ -604,21 +604,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_quan;1",
+        "@id": "dtmi:example:upsilon_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_nuh;1",
+          "@id": "dtmi:example:upsilon_glikk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_snee",
-            "schema": "integer"
+            "name": "upsilon_nuh",
+            "schema": "boolean"
           },
           "mapKey": {
-            "@id": "dtmi:example:omicron_fuddle;1",
+            "@id": "dtmi:example:upsilon_humpf;1",
             "fields": [
               {
-                "name": "omicron_glikk",
-                "schema": "float"
+                "name": "upsilon_fuddle",
+                "schema": "time"
               }
             ],
             "@type": "Object"
@@ -635,22 +635,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_jogg;1",
+        "@id": "dtmi:example:upsilon_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omicron_floob;1",
+          "@id": "dtmi:example:upsilon_spazz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_zatz",
-            "schema": "string"
+            "name": "upsilon_floob",
+            "schema": "dateTime"
           },
           "mapKey": {
-            "@id": "dtmi:example:omicron_thnad;1",
+            "@id": "dtmi:example:upsilon_quan;1",
             "fields": [
               {
-                "name": "omicron_spazz",
-                "schema": "long"
+                "name": "upsilon_thnad",
+                "schema": "date"
               }
             ],
             "@type": "Object"
@@ -667,19 +667,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_hi;1",
+        "@id": "dtmi:example:upsilon_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_yekk;1",
+          "@id": "dtmi:example:upsilon_itch;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_vroo",
-            "schema": "boolean"
+            "name": "upsilon_yekk",
+            "schema": "duration"
           },
           "mapKey": {
-            "@id": "dtmi:example:omicron_flunn;1",
-            "name": "omicron_itch",
-            "schema": "time",
+            "@id": "dtmi:example:upsilon_jogg;1",
+            "name": "upsilon_flunn",
+            "schema": "double",
             "@type": "Property"
           }
         }
@@ -694,20 +694,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_epsilon;1",
+        "@id": "dtmi:example:phi_delta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:pi_gamma;1",
+          "@id": "dtmi:example:phi_beta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_delta",
-            "schema": "dateTime"
+            "name": "phi_gamma",
+            "schema": "integer"
           },
           "mapKey": {
-            "@id": "dtmi:example:pi_alpha;1",
-            "name": "pi_beta",
-            "schema": "date",
+            "@id": "dtmi:example:upsilon_hi;1",
+            "name": "phi_alpha",
+            "schema": "float",
             "@type": "Property"
           }
         }
@@ -722,18 +722,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_kappa;1",
+        "@id": "dtmi:example:phi_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_theta;1",
+          "@id": "dtmi:example:phi_eta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_iota",
-            "schema": "double"
+            "name": "phi_theta",
+            "schema": "long"
           },
           "mapKey": {
-            "@id": "dtmi:example:pi_zeta;1",
-            "name": "pi_eta",
+            "@id": "dtmi:example:phi_epsilon;1",
+            "name": "phi_zeta",
             "@type": "Relationship"
           }
         }
@@ -748,19 +748,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_omicron;1",
+        "@id": "dtmi:example:phi_xi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:pi_nu;1",
+          "@id": "dtmi:example:phi_mu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_xi",
-            "schema": "duration"
+            "name": "phi_nu",
+            "schema": "string"
           },
           "mapKey": {
-            "@id": "dtmi:example:pi_lambda;1",
-            "name": "pi_mu",
+            "@id": "dtmi:example:phi_kappa;1",
+            "name": "phi_lambda",
             "@type": "Relationship"
           }
         }
@@ -775,19 +775,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_upsilon;1",
+        "@id": "dtmi:example:phi_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_sigma;1",
+          "@id": "dtmi:example:phi_rho;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_tau",
-            "schema": "integer"
+            "name": "phi_sigma",
+            "schema": "boolean"
           },
           "mapKey": {
-            "@id": "dtmi:example:pi_pi;1",
-            "name": "pi_rho",
-            "schema": "float",
+            "@id": "dtmi:example:phi_omicron;1",
+            "name": "phi_pi",
+            "schema": "time",
             "@type": "Telemetry"
           }
         }
@@ -802,20 +802,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_yuzz;1",
+        "@id": "dtmi:example:phi_omega;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:pi_psi;1",
+          "@id": "dtmi:example:phi_chi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_omega",
-            "schema": "string"
+            "name": "phi_psi",
+            "schema": "dateTime"
           },
           "mapKey": {
-            "@id": "dtmi:example:pi_phi;1",
-            "name": "pi_chi",
-            "schema": "long",
+            "@id": "dtmi:example:phi_upsilon;1",
+            "name": "phi_phi",
+            "schema": "date",
             "@type": "Telemetry"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapPropertyMapValueElementV2.json b/DTDL/v2/spec/Requirement-ClassMapPropertyMapValueElementV2.json
index 2a307ecc..28f5cc65 100644
--- a/DTDL/v2/spec/Requirement-ClassMapPropertyMapValueElementV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapPropertyMapValueElementV2.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_iota;1",
+        "@id": "dtmi:example:chi_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "rho_theta",
+          "name": "chi_eta",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "rho_eta",
+              "name": "chi_zeta",
               "schema": "string"
             },
             "mapValue": {
-              "@id": "dtmi:example:rho_epsilon;1",
-              "name": "rho_zeta",
-              "schema": "duration"
+              "@id": "dtmi:example:chi_delta;1",
+              "name": "chi_epsilon",
+              "schema": "string"
             }
           }
         }
@@ -36,22 +36,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_xi;1",
+        "@id": "dtmi:example:chi_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "rho_nu",
+          "name": "chi_mu",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "rho_mu",
+              "name": "chi_lambda",
               "schema": "string"
             },
             "mapValue": [
               {
-                "@id": "dtmi:example:rho_kappa;1",
-                "name": "rho_lambda",
-                "schema": "float"
+                "@id": "dtmi:example:chi_iota;1",
+                "name": "chi_kappa",
+                "schema": "time"
               }
             ]
           }
@@ -67,28 +67,28 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_sigma;1",
+        "@id": "dtmi:example:chi_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_pi;1",
+          "@id": "dtmi:example:chi_omicron;1",
           "@type": "Map",
           "mapKey": {
-            "name": "rho_rho",
+            "name": "chi_pi",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:ex:dependentRef;1",
-            "name": "rho_omicron",
-            "schema": "integer"
+            "name": "chi_xi",
+            "schema": "boolean"
           }
         },
         "contents": {
           "@type": "Property",
-          "name": "rho_upsilon",
+          "name": "chi_tau",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "rho_tau",
+              "name": "chi_sigma",
               "schema": "string"
             },
             "mapValue": "dtmi:ex:dependentRef;1"
@@ -105,28 +105,28 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_omega;1",
+        "@id": "dtmi:example:chi_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_chi;1",
+          "@id": "dtmi:example:chi_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "rho_psi",
+            "name": "chi_chi",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:ex:dependentRef;1",
-            "name": "rho_phi",
-            "schema": "long"
+            "name": "chi_upsilon",
+            "schema": "date"
           }
         },
         "contents": {
           "@type": "Property",
-          "name": "rho_wum",
+          "name": "chi_yuzz",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "rho_yuzz",
+              "name": "chi_omega",
               "schema": "string"
             },
             "mapValue": [
@@ -145,21 +145,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_nuh;1",
+        "@id": "dtmi:example:chi_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "rho_glikk",
+          "name": "chi_fuddle",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "rho_fuddle",
+              "name": "chi_humpf",
               "schema": "string"
             },
             "mapValue": {
-              "@id": "dtmi:example:rho_um;1",
-              "name": "rho_humpf",
-              "schema": "string",
+              "@id": "dtmi:example:chi_wum;1",
+              "name": "chi_um",
+              "schema": "dateTime",
               "@context": "dtmi:dtdl:context;3"
             }
           }
@@ -175,22 +175,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_floob;1",
+        "@id": "dtmi:example:chi_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "rho_spazz",
+          "name": "chi_thnad",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Map",
             "mapKey": {
-              "name": "rho_thnad",
+              "name": "chi_quan",
               "schema": "string"
             },
             "mapValue": {
-              "@id": "dtmi:example:rho_snee;1",
-              "name": "rho_quan",
-              "schema": "time",
+              "@id": "dtmi:example:chi_nuh;1",
+              "name": "chi_snee",
+              "schema": "double",
               "@context": "dtmi:dtdl:context;3"
             }
           }
@@ -206,15 +206,76 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_flunn;1",
+        "@id": "dtmi:example:chi_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "chi_flunn",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "chi_jogg",
+              "schema": "string"
+            },
+            "mapValue": {
+              "@id": "dtmi:example:chi_floob;1",
+              "name": "chi_zatz",
+              "schema": "decimal",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:psi_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "psi_alpha",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Map",
+            "mapKey": {
+              "name": "chi_hi",
+              "schema": "string"
+            },
+            "mapValue": {
+              "@id": "dtmi:example:chi_yekk;1",
+              "name": "chi_vroo",
+              "schema": "double",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:psi_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "rho_jogg",
+          "name": "psi_delta",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "rho_zatz",
+              "name": "psi_gamma",
               "schema": "string"
             },
             "mapValue": []
@@ -231,16 +292,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_vroo;1",
+        "@id": "dtmi:example:psi_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "rho_yekk",
+          "name": "psi_eta",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Map",
             "mapKey": {
-              "name": "rho_itch",
+              "name": "psi_zeta",
               "schema": "string"
             },
             "mapValue": []
@@ -257,27 +318,27 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_zeta;1",
+        "@id": "dtmi:example:psi_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "sigma_epsilon",
+          "name": "psi_xi",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "sigma_delta",
+              "name": "psi_nu",
               "schema": "string"
             },
             "mapValue": [
               {
-                "@id": "dtmi:example:rho_hi;1",
-                "name": "sigma_alpha",
-                "schema": "boolean"
+                "@id": "dtmi:example:psi_iota;1",
+                "name": "psi_kappa",
+                "schema": "integer"
               },
               {
-                "@id": "dtmi:example:sigma_beta;1",
-                "name": "sigma_gamma",
-                "schema": "date"
+                "@id": "dtmi:example:psi_lambda;1",
+                "name": "psi_mu",
+                "schema": "long"
               }
             ]
           }
@@ -293,28 +354,28 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_nu;1",
+        "@id": "dtmi:example:psi_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "sigma_mu",
+          "name": "psi_phi",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Map",
             "mapKey": {
-              "name": "sigma_lambda",
+              "name": "psi_upsilon",
               "schema": "string"
             },
             "mapValue": [
               {
-                "@id": "dtmi:example:sigma_eta;1",
-                "name": "sigma_theta",
-                "schema": "dateTime"
+                "@id": "dtmi:example:psi_pi;1",
+                "name": "psi_rho",
+                "schema": "string"
               },
               {
-                "@id": "dtmi:example:sigma_iota;1",
-                "name": "sigma_kappa",
-                "schema": "double"
+                "@id": "dtmi:example:psi_sigma;1",
+                "name": "psi_tau",
+                "schema": "time"
               }
             ]
           }
diff --git a/DTDL/v2/spec/Requirement-ClassMapPropertyMapValueTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassMapPropertyMapValueTermAndDtmiV2.json
index 8115e80f..ee7af8a2 100644
--- a/DTDL/v2/spec/Requirement-ClassMapPropertyMapValueTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapPropertyMapValueTermAndDtmiV2.json
@@ -7,22 +7,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_iota;1",
+        "@id": "dtmi:example:um_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_epsilon;1",
+          "@id": "dtmi:example:um_xi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_zeta",
+            "name": "um_omicron",
             "schema": "string"
           },
           "mapValue": {
-            "name": "chi_eta",
-            "schema": "dateTime"
+            "name": "um_pi",
+            "schema": "string"
           },
           "dtmi:dtdl:property:mapValue;2": {
-            "name": "chi_theta",
-            "schema": "double"
+            "name": "um_rho",
+            "schema": "time"
           }
         }
       }
@@ -36,23 +36,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_xi;1",
+        "@id": "dtmi:example:um_psi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:chi_kappa;1",
+          "@id": "dtmi:example:um_tau;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_lambda",
+            "name": "um_upsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "chi_mu",
-            "schema": "duration"
+            "name": "um_phi",
+            "schema": "boolean"
           },
           "dtmi:dtdl:property:mapValue;2": {
-            "name": "chi_nu",
-            "schema": "float"
+            "name": "um_chi",
+            "schema": "date"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassMapPropertyMapValueTypeConformanceV2.json b/DTDL/v2/spec/Requirement-ClassMapPropertyMapValueTypeConformanceV2.json
index 25908877..c7f75d17 100644
--- a/DTDL/v2/spec/Requirement-ClassMapPropertyMapValueTypeConformanceV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapPropertyMapValueTypeConformanceV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_psi;1",
+        "@id": "dtmi:example:psi_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_phi;1",
+          "@id": "dtmi:example:psi_glikk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_chi",
+            "name": "psi_nuh",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:sigma_upsilon;1",
-            "elementSchema": "duration",
+            "@id": "dtmi:example:psi_fuddle;1",
+            "elementSchema": "boolean",
             "@type": "Array"
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_um;1",
+        "@id": "dtmi:example:psi_floob;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:sigma_yuzz;1",
+          "@id": "dtmi:example:psi_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_wum",
+            "name": "psi_spazz",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:sigma_omega;1",
-            "elementSchema": "float",
+            "@id": "dtmi:example:psi_quan;1",
+            "elementSchema": "date",
             "@type": "Array"
           }
         }
@@ -60,18 +60,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_snee;1",
+        "@id": "dtmi:example:psi_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_glikk;1",
+          "@id": "dtmi:example:psi_flunn;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_nuh",
+            "name": "psi_itch",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:sigma_humpf;1",
-            "name": "sigma_fuddle",
+            "@id": "dtmi:example:psi_zatz;1",
+            "name": "psi_jogg",
             "@type": "Command"
           }
         }
@@ -86,19 +86,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_zatz;1",
+        "@id": "dtmi:example:omega_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:sigma_spazz;1",
+          "@id": "dtmi:example:omega_alpha;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_floob",
+            "name": "omega_beta",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:sigma_quan;1",
-            "name": "sigma_thnad",
+            "@id": "dtmi:example:psi_vroo;1",
+            "name": "psi_hi",
             "@type": "Command"
           }
         }
@@ -113,19 +113,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_vroo;1",
+        "@id": "dtmi:example:omega_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_itch;1",
+          "@id": "dtmi:example:omega_zeta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_yekk",
+            "name": "omega_eta",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:sigma_jogg;1",
-            "name": "sigma_flunn",
-            "schema": "integer",
+            "@id": "dtmi:example:omega_delta;1",
+            "name": "omega_epsilon",
+            "schema": "dateTime",
             "@type": "CommandPayload"
           }
         }
@@ -140,20 +140,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_delta;1",
+        "@id": "dtmi:example:omega_nu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:tau_beta;1",
+          "@id": "dtmi:example:omega_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_gamma",
+            "name": "omega_mu",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:sigma_hi;1",
-            "name": "tau_alpha",
-            "schema": "long",
+            "@id": "dtmi:example:omega_iota;1",
+            "name": "omega_kappa",
+            "schema": "double",
             "@type": "CommandPayload"
           }
         }
@@ -168,20 +168,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_kappa;1",
+        "@id": "dtmi:example:omega_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_theta;1",
+          "@id": "dtmi:example:omega_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_iota",
+            "name": "omega_sigma",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:tau_epsilon;1",
-            "name": "tau_zeta",
+            "@id": "dtmi:example:omega_xi;1",
+            "name": "omega_omicron",
             "schema": {
-              "@id": "dtmi:example:tau_eta;1",
+              "@id": "dtmi:example:omega_pi;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -198,21 +198,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_pi;1",
+        "@id": "dtmi:example:omega_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:tau_xi;1",
+          "@id": "dtmi:example:omega_psi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_omicron",
+            "name": "omega_omega",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:tau_lambda;1",
-            "name": "tau_mu",
+            "@id": "dtmi:example:omega_upsilon;1",
+            "name": "omega_phi",
             "schema": {
-              "@id": "dtmi:example:tau_nu;1",
+              "@id": "dtmi:example:omega_chi;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -229,21 +229,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_phi;1",
+        "@id": "dtmi:example:omega_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_tau;1",
+          "@id": "dtmi:example:omega_humpf;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_upsilon",
+            "name": "omega_fuddle",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:tau_rho;1",
+            "@id": "dtmi:example:omega_wum;1",
             "enumValues": [
               {
-                "enumValue": 1047,
-                "name": "tau_sigma"
+                "enumValue": 1060,
+                "name": "omega_um"
               }
             ],
             "valueSchema": "integer",
@@ -261,22 +261,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_wum;1",
+        "@id": "dtmi:example:omega_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:tau_omega;1",
+          "@id": "dtmi:example:omega_quan;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_yuzz",
+            "name": "omega_thnad",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:tau_chi;1",
+            "@id": "dtmi:example:omega_nuh;1",
             "enumValues": [
               {
-                "enumValue": 1048,
-                "name": "tau_psi"
+                "enumValue": 1061,
+                "name": "omega_snee"
               }
             ],
             "valueSchema": "integer",
@@ -294,19 +294,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_nuh;1",
+        "@id": "dtmi:example:omega_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_fuddle;1",
+          "@id": "dtmi:example:omega_jogg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_glikk",
+            "name": "omega_flunn",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:tau_um;1",
-            "enumValue": 1049,
-            "name": "tau_humpf",
+            "@id": "dtmi:example:omega_floob;1",
+            "enumValue": 1062,
+            "name": "omega_zatz",
             "@type": "EnumValue"
           }
         }
@@ -321,20 +321,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_floob;1",
+        "@id": "dtmi:example:yuzz_beta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:tau_thnad;1",
+          "@id": "dtmi:example:omega_hi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_spazz",
+            "name": "yuzz_alpha",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:tau_snee;1",
-            "enumValue": 1050,
-            "name": "tau_quan",
+            "@id": "dtmi:example:omega_yekk;1",
+            "enumValue": 1063,
+            "name": "omega_vroo",
             "@type": "EnumValue"
           }
         }
@@ -349,19 +349,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_yekk;1",
+        "@id": "dtmi:example:yuzz_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_flunn;1",
+          "@id": "dtmi:example:yuzz_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_itch",
+            "name": "yuzz_zeta",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:tau_zatz;1",
-            "name": "tau_jogg",
-            "schema": "string",
+            "@id": "dtmi:example:yuzz_gamma;1",
+            "name": "yuzz_delta",
+            "schema": "duration",
             "@type": "Field"
           }
         }
@@ -376,20 +376,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_gamma;1",
+        "@id": "dtmi:example:yuzz_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:upsilon_alpha;1",
+          "@id": "dtmi:example:yuzz_kappa;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_beta",
+            "name": "yuzz_lambda",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:tau_vroo;1",
-            "name": "tau_hi",
-            "schema": "time",
+            "@id": "dtmi:example:yuzz_theta;1",
+            "name": "yuzz_iota",
+            "schema": "float",
             "@type": "Field"
           }
         }
@@ -404,17 +404,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_eta;1",
+        "@id": "dtmi:example:yuzz_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_epsilon;1",
+          "@id": "dtmi:example:yuzz_xi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_zeta",
+            "name": "yuzz_omicron",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:upsilon_delta;1",
+            "@id": "dtmi:example:yuzz_nu;1",
             "@type": "Interface"
           }
         }
@@ -429,18 +429,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_lambda;1",
+        "@id": "dtmi:example:yuzz_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:upsilon_iota;1",
+          "@id": "dtmi:example:yuzz_sigma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_kappa",
+            "name": "yuzz_tau",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:upsilon_theta;1",
+            "@id": "dtmi:example:yuzz_rho;1",
             "@type": "Interface"
           }
         }
@@ -455,24 +455,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_rho;1",
+        "@id": "dtmi:example:yuzz_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_omicron;1",
+          "@id": "dtmi:example:yuzz_omega;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_pi",
+            "name": "yuzz_yuzz",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:upsilon_mu;1",
+            "@id": "dtmi:example:yuzz_phi;1",
             "mapKey": {
-              "name": "upsilon_nu",
+              "name": "yuzz_chi",
               "schema": "string"
             },
             "mapValue": {
-              "name": "upsilon_xi",
-              "schema": "boolean"
+              "name": "yuzz_psi",
+              "schema": "integer"
             },
             "@type": "Map"
           }
@@ -488,25 +488,25 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_psi;1",
+        "@id": "dtmi:example:yuzz_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:upsilon_phi;1",
+          "@id": "dtmi:example:yuzz_glikk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_chi",
+            "name": "yuzz_nuh",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:upsilon_sigma;1",
+            "@id": "dtmi:example:yuzz_um;1",
             "mapKey": {
-              "name": "upsilon_tau",
+              "name": "yuzz_humpf",
               "schema": "string"
             },
             "mapValue": {
-              "name": "upsilon_upsilon",
-              "schema": "date"
+              "name": "yuzz_fuddle",
+              "schema": "long"
             },
             "@type": "Map"
           }
@@ -522,18 +522,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_humpf;1",
+        "@id": "dtmi:example:yuzz_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_wum;1",
+          "@id": "dtmi:example:yuzz_spazz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_um",
+            "name": "yuzz_floob",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:upsilon_omega;1",
-            "name": "upsilon_yuzz",
+            "@id": "dtmi:example:yuzz_quan;1",
+            "name": "yuzz_thnad",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -549,19 +549,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_quan;1",
+        "@id": "dtmi:example:yuzz_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:upsilon_nuh;1",
+          "@id": "dtmi:example:yuzz_itch;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_snee",
+            "name": "yuzz_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:upsilon_fuddle;1",
-            "name": "upsilon_glikk",
+            "@id": "dtmi:example:yuzz_jogg;1",
+            "name": "yuzz_flunn",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -577,19 +577,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_jogg;1",
+        "@id": "dtmi:example:wum_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_floob;1",
+          "@id": "dtmi:example:wum_beta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_zatz",
+            "name": "wum_gamma",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:upsilon_thnad;1",
-            "name": "upsilon_spazz",
-            "schema": "dateTime",
+            "@id": "dtmi:example:yuzz_hi;1",
+            "name": "wum_alpha",
+            "schema": "string",
             "@type": "MapValue"
           }
         }
@@ -604,21 +604,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_hi;1",
+        "@id": "dtmi:example:wum_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_yekk;1",
+          "@id": "dtmi:example:wum_eta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_vroo",
+            "name": "wum_theta",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:upsilon_flunn;1",
+            "@id": "dtmi:example:wum_epsilon;1",
             "fields": [
               {
-                "name": "upsilon_itch",
-                "schema": "double"
+                "name": "wum_zeta",
+                "schema": "time"
               }
             ],
             "@type": "Object"
@@ -635,22 +635,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_epsilon;1",
+        "@id": "dtmi:example:wum_xi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:phi_gamma;1",
+          "@id": "dtmi:example:wum_mu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_delta",
+            "name": "wum_nu",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:phi_alpha;1",
+            "@id": "dtmi:example:wum_kappa;1",
             "fields": [
               {
-                "name": "phi_beta",
-                "schema": "duration"
+                "name": "wum_lambda",
+                "schema": "boolean"
               }
             ],
             "@type": "Object"
@@ -667,19 +667,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_kappa;1",
+        "@id": "dtmi:example:wum_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_theta;1",
+          "@id": "dtmi:example:wum_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_iota",
+            "name": "wum_sigma",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:phi_zeta;1",
-            "name": "phi_eta",
-            "schema": "float",
+            "@id": "dtmi:example:wum_omicron;1",
+            "name": "wum_pi",
+            "schema": "date",
             "@type": "Property"
           }
         }
@@ -694,20 +694,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_omicron;1",
+        "@id": "dtmi:example:wum_omega;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:phi_nu;1",
+          "@id": "dtmi:example:wum_chi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_xi",
+            "name": "wum_psi",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:phi_lambda;1",
-            "name": "phi_mu",
-            "schema": "integer",
+            "@id": "dtmi:example:wum_upsilon;1",
+            "name": "wum_phi",
+            "schema": "dateTime",
             "@type": "Property"
           }
         }
@@ -722,18 +722,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_upsilon;1",
+        "@id": "dtmi:example:wum_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_sigma;1",
+          "@id": "dtmi:example:wum_um;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_tau",
+            "name": "wum_humpf",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:phi_pi;1",
-            "name": "phi_rho",
+            "@id": "dtmi:example:wum_yuzz;1",
+            "name": "wum_wum",
             "@type": "Relationship"
           }
         }
@@ -748,19 +748,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_yuzz;1",
+        "@id": "dtmi:example:wum_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:phi_psi;1",
+          "@id": "dtmi:example:wum_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_omega",
+            "name": "wum_quan",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:phi_phi;1",
-            "name": "phi_chi",
+            "@id": "dtmi:example:wum_glikk;1",
+            "name": "wum_nuh",
             "@type": "Relationship"
           }
         }
@@ -775,19 +775,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_glikk;1",
+        "@id": "dtmi:example:wum_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_humpf;1",
+          "@id": "dtmi:example:wum_zatz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_fuddle",
+            "name": "wum_jogg",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:phi_wum;1",
-            "name": "phi_um",
-            "schema": "long",
+            "@id": "dtmi:example:wum_spazz;1",
+            "name": "wum_floob",
+            "schema": "double",
             "@type": "Telemetry"
           }
         }
@@ -802,20 +802,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_spazz;1",
+        "@id": "dtmi:example:um_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:phi_quan;1",
+          "@id": "dtmi:example:wum_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_thnad",
+            "name": "wum_hi",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:phi_nuh;1",
-            "name": "phi_snee",
-            "schema": "string",
+            "@id": "dtmi:example:wum_itch;1",
+            "name": "wum_yekk",
+            "schema": "duration",
             "@type": "Telemetry"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapRequiredPropertiesV2.json b/DTDL/v2/spec/Requirement-ClassMapRequiredPropertiesV2.json
index 6d171d30..d8450dc1 100644
--- a/DTDL/v2/spec/Requirement-ClassMapRequiredPropertiesV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapRequiredPropertiesV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_beta;1",
+        "@id": "dtmi:example:mu_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_vroo;1",
+          "@id": "dtmi:example:mu_nuh;1",
           "mapKey": {
-            "name": "eta_hi",
+            "name": "mu_snee",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_alpha",
-            "schema": "time"
+            "name": "mu_quan",
+            "schema": "date"
           }
         }
       }
@@ -31,18 +31,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_zeta;1",
+        "@id": "dtmi:example:mu_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:theta_gamma;1",
+          "@id": "dtmi:example:mu_spazz;1",
           "mapKey": {
-            "name": "theta_delta",
+            "name": "mu_floob",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_epsilon",
-            "schema": "boolean"
+            "name": "mu_zatz",
+            "schema": "dateTime"
           }
         }
       }
@@ -56,14 +56,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_iota;1",
+        "@id": "dtmi:example:mu_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_eta;1",
+          "@id": "dtmi:example:mu_flunn;1",
           "@type": "Map",
           "mapValue": {
-            "name": "theta_theta",
-            "schema": "date"
+            "name": "mu_itch",
+            "schema": "double"
           }
         }
       }
@@ -77,15 +77,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_mu;1",
+        "@id": "dtmi:example:nu_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:theta_kappa;1",
+          "@id": "dtmi:example:mu_vroo;1",
           "@type": "Map",
           "mapValue": {
-            "name": "theta_lambda",
-            "schema": "dateTime"
+            "name": "mu_hi",
+            "schema": "duration"
           }
         }
       }
@@ -99,13 +99,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_omicron;1",
+        "@id": "dtmi:example:nu_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_nu;1",
+          "@id": "dtmi:example:nu_beta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_xi",
+            "name": "nu_gamma",
             "schema": "string"
           }
         }
@@ -120,14 +120,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_sigma;1",
+        "@id": "dtmi:example:nu_eta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:theta_pi;1",
+          "@id": "dtmi:example:nu_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_rho",
+            "name": "nu_zeta",
             "schema": "string"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapTypeIncludesInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassMapTypeIncludesInvalidDtmiV2.json
index 8a507357..e29044fc 100644
--- a/DTDL/v2/spec/Requirement-ClassMapTypeIncludesInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapTypeIncludesInvalidDtmiV2.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_yuzz;1",
+        "@id": "dtmi:example:pi_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_chi;1",
+          "@id": "dtmi:example:pi_lambda;1",
           "@type": [
             "Map",
             "dtmi:foo//bar"
           ],
           "mapKey": {
-            "name": "lambda_psi",
+            "name": "pi_mu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "lambda_omega",
-            "schema": "integer"
+            "name": "pi_nu",
+            "schema": "string"
           }
         }
       }
@@ -35,22 +35,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_fuddle;1",
+        "@id": "dtmi:example:pi_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:lambda_wum;1",
+          "@id": "dtmi:example:pi_omicron;1",
           "@type": [
             "Map",
             "dtmi:foo//bar"
           ],
           "mapKey": {
-            "name": "lambda_um",
+            "name": "pi_pi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "lambda_humpf",
-            "schema": "long"
+            "name": "pi_rho",
+            "schema": "time"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassMapTypeIncludesMaterialV2.json b/DTDL/v2/spec/Requirement-ClassMapTypeIncludesMaterialV2.json
index 6a5186a5..5206a632 100644
--- a/DTDL/v2/spec/Requirement-ClassMapTypeIncludesMaterialV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapTypeIncludesMaterialV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_hi;1",
+        "@id": "dtmi:example:xi_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_itch;1",
+          "@id": "dtmi:example:xi_fuddle;1",
           "mapKey": {
-            "name": "iota_yekk",
+            "name": "xi_glikk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "iota_vroo",
-            "schema": "time"
+            "name": "xi_nuh",
+            "schema": "date"
           },
           "@type": "Map"
         }
@@ -32,17 +32,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_delta;1",
+        "@id": "dtmi:example:xi_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_alpha;1",
+          "@id": "dtmi:example:xi_quan;1",
           "mapKey": {
-            "name": "kappa_beta",
+            "name": "xi_thnad",
             "schema": "string"
           },
           "mapValue": {
-            "name": "kappa_gamma",
-            "schema": "boolean"
+            "name": "xi_spazz",
+            "schema": "dateTime"
           },
           "@type": [
             "Map"
@@ -59,17 +59,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_theta;1",
+        "@id": "dtmi:example:xi_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_epsilon;1",
+          "@id": "dtmi:example:xi_zatz;1",
           "mapKey": {
-            "name": "kappa_zeta",
+            "name": "xi_jogg",
             "schema": "string"
           },
           "mapValue": {
-            "name": "kappa_eta",
-            "schema": "date"
+            "name": "xi_flunn",
+            "schema": "double"
           },
           "@type": "dtmi:dtdl:class:Map;2"
         }
@@ -84,17 +84,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_mu;1",
+        "@id": "dtmi:example:omicron_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_iota;1",
+          "@id": "dtmi:example:xi_yekk;1",
           "mapKey": {
-            "name": "kappa_kappa",
+            "name": "xi_vroo",
             "schema": "string"
           },
           "mapValue": {
-            "name": "kappa_lambda",
-            "schema": "dateTime"
+            "name": "xi_hi",
+            "schema": "duration"
           },
           "@type": [
             "dtmi:dtdl:class:Map;2"
@@ -111,17 +111,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_pi;1",
+        "@id": "dtmi:example:omicron_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_nu;1",
+          "@id": "dtmi:example:omicron_beta;1",
           "mapKey": {
-            "name": "kappa_xi",
+            "name": "omicron_gamma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "kappa_omicron",
-            "schema": "double"
+            "name": "omicron_delta",
+            "schema": "float"
           },
           "@type": "Something"
         }
@@ -136,18 +136,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_upsilon;1",
+        "@id": "dtmi:example:omicron_iota;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:kappa_rho;1",
+          "@id": "dtmi:example:omicron_zeta;1",
           "mapKey": {
-            "name": "kappa_sigma",
+            "name": "omicron_eta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "kappa_tau",
-            "schema": "duration"
+            "name": "omicron_theta",
+            "schema": "integer"
           },
           "@type": "Something"
         }
@@ -162,17 +162,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_omega;1",
+        "@id": "dtmi:example:omicron_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_phi;1",
+          "@id": "dtmi:example:omicron_kappa;1",
           "mapKey": {
-            "name": "kappa_chi",
+            "name": "omicron_lambda",
             "schema": "string"
           },
           "mapValue": {
-            "name": "kappa_psi",
-            "schema": "float"
+            "name": "omicron_mu",
+            "schema": "long"
           },
           "@type": [
             "Something"
@@ -189,18 +189,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_humpf;1",
+        "@id": "dtmi:example:omicron_rho;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:kappa_yuzz;1",
+          "@id": "dtmi:example:omicron_xi;1",
           "mapKey": {
-            "name": "kappa_wum",
+            "name": "omicron_omicron",
             "schema": "string"
           },
           "mapValue": {
-            "name": "kappa_um",
-            "schema": "integer"
+            "name": "omicron_pi",
+            "schema": "string"
           },
           "@type": [
             "Something"
diff --git a/DTDL/v2/spec/Requirement-ClassMapTypeStringOrArrayV2.json b/DTDL/v2/spec/Requirement-ClassMapTypeStringOrArrayV2.json
index e966841f..857c0a46 100644
--- a/DTDL/v2/spec/Requirement-ClassMapTypeStringOrArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapTypeStringOrArrayV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_chi;1",
+        "@id": "dtmi:example:nu_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_tau;1",
+          "@id": "dtmi:example:nu_theta;1",
           "mapKey": {
-            "name": "theta_upsilon",
+            "name": "nu_iota",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_phi",
-            "schema": "double"
+            "name": "nu_kappa",
+            "schema": "float"
           },
           "@type": 626
         }
@@ -32,18 +32,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_wum;1",
+        "@id": "dtmi:example:nu_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:theta_psi;1",
+          "@id": "dtmi:example:nu_mu;1",
           "mapKey": {
-            "name": "theta_omega",
+            "name": "nu_nu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_yuzz",
-            "schema": "duration"
+            "name": "nu_xi",
+            "schema": "integer"
           },
           "@type": 626
         }
@@ -58,17 +58,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_glikk;1",
+        "@id": "dtmi:example:nu_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_um;1",
+          "@id": "dtmi:example:nu_pi;1",
           "mapKey": {
-            "name": "theta_humpf",
+            "name": "nu_rho",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_fuddle",
-            "schema": "float"
+            "name": "nu_sigma",
+            "schema": "long"
           },
           "@type": null
         }
@@ -83,18 +83,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_thnad;1",
+        "@id": "dtmi:example:nu_psi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:theta_nuh;1",
+          "@id": "dtmi:example:nu_upsilon;1",
           "mapKey": {
-            "name": "theta_snee",
+            "name": "nu_phi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_quan",
-            "schema": "integer"
+            "name": "nu_chi",
+            "schema": "string"
           },
           "@type": null
         }
@@ -109,17 +109,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_jogg;1",
+        "@id": "dtmi:example:nu_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_spazz;1",
+          "@id": "dtmi:example:nu_omega;1",
           "mapKey": {
-            "name": "theta_floob",
+            "name": "nu_yuzz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_zatz",
-            "schema": "long"
+            "name": "nu_wum",
+            "schema": "time"
           },
           "@type": true
         }
@@ -134,18 +134,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_vroo;1",
+        "@id": "dtmi:example:nu_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:theta_flunn;1",
+          "@id": "dtmi:example:nu_humpf;1",
           "mapKey": {
-            "name": "theta_itch",
+            "name": "nu_fuddle",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_yekk",
-            "schema": "string"
+            "name": "nu_glikk",
+            "schema": "boolean"
           },
           "@type": true
         }
@@ -160,17 +160,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_gamma;1",
+        "@id": "dtmi:example:nu_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_hi;1",
+          "@id": "dtmi:example:nu_snee;1",
           "mapKey": {
-            "name": "iota_alpha",
+            "name": "nu_quan",
             "schema": "string"
           },
           "mapValue": {
-            "name": "iota_beta",
-            "schema": "time"
+            "name": "nu_thnad",
+            "schema": "date"
           },
           "@type": {}
         }
@@ -185,18 +185,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_eta;1",
+        "@id": "dtmi:example:nu_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:iota_delta;1",
+          "@id": "dtmi:example:nu_floob;1",
           "mapKey": {
-            "name": "iota_epsilon",
+            "name": "nu_zatz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "iota_zeta",
-            "schema": "boolean"
+            "name": "nu_jogg",
+            "schema": "dateTime"
           },
           "@type": {}
         }
@@ -211,17 +211,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_lambda;1",
+        "@id": "dtmi:example:nu_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_theta;1",
+          "@id": "dtmi:example:nu_itch;1",
           "mapKey": {
-            "name": "iota_iota",
+            "name": "nu_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "iota_kappa",
-            "schema": "date"
+            "name": "nu_vroo",
+            "schema": "double"
           },
           "@type": [
             626
@@ -238,18 +238,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_omicron;1",
+        "@id": "dtmi:example:xi_delta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:iota_mu;1",
+          "@id": "dtmi:example:xi_alpha;1",
           "mapKey": {
-            "name": "iota_nu",
+            "name": "xi_beta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "iota_xi",
-            "schema": "dateTime"
+            "name": "xi_gamma",
+            "schema": "duration"
           },
           "@type": [
             626
@@ -266,17 +266,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_tau;1",
+        "@id": "dtmi:example:xi_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_pi;1",
+          "@id": "dtmi:example:xi_epsilon;1",
           "mapKey": {
-            "name": "iota_rho",
+            "name": "xi_zeta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "iota_sigma",
-            "schema": "double"
+            "name": "xi_eta",
+            "schema": "float"
           },
           "@type": [
             null
@@ -293,18 +293,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_psi;1",
+        "@id": "dtmi:example:xi_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:iota_upsilon;1",
+          "@id": "dtmi:example:xi_iota;1",
           "mapKey": {
-            "name": "iota_phi",
+            "name": "xi_kappa",
             "schema": "string"
           },
           "mapValue": {
-            "name": "iota_chi",
-            "schema": "duration"
+            "name": "xi_lambda",
+            "schema": "integer"
           },
           "@type": [
             null
@@ -321,17 +321,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_um;1",
+        "@id": "dtmi:example:xi_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_omega;1",
+          "@id": "dtmi:example:xi_nu;1",
           "mapKey": {
-            "name": "iota_yuzz",
+            "name": "xi_xi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "iota_wum",
-            "schema": "float"
+            "name": "xi_omicron",
+            "schema": "long"
           },
           "@type": [
             true
@@ -348,18 +348,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_nuh;1",
+        "@id": "dtmi:example:xi_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:iota_humpf;1",
+          "@id": "dtmi:example:xi_rho;1",
           "mapKey": {
-            "name": "iota_fuddle",
+            "name": "xi_sigma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "iota_glikk",
-            "schema": "integer"
+            "name": "xi_tau",
+            "schema": "string"
           },
           "@type": [
             true
@@ -376,17 +376,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_spazz;1",
+        "@id": "dtmi:example:xi_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_snee;1",
+          "@id": "dtmi:example:xi_phi;1",
           "mapKey": {
-            "name": "iota_quan",
+            "name": "xi_chi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "iota_thnad",
-            "schema": "long"
+            "name": "xi_psi",
+            "schema": "time"
           },
           "@type": [
             {}
@@ -403,18 +403,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_flunn;1",
+        "@id": "dtmi:example:xi_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:iota_floob;1",
+          "@id": "dtmi:example:xi_yuzz;1",
           "mapKey": {
-            "name": "iota_zatz",
+            "name": "xi_wum",
             "schema": "string"
           },
           "mapValue": {
-            "name": "iota_jogg",
-            "schema": "string"
+            "name": "xi_um",
+            "schema": "boolean"
           },
           "@type": [
             {}
diff --git a/DTDL/v2/spec/Requirement-ClassMapValueContextConformsV2.json b/DTDL/v2/spec/Requirement-ClassMapValueContextConformsV2.json
index f7c807ba..01ca3dbe 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValueContextConformsV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValueContextConformsV2.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_xi;1",
+        "@id": "dtmi:example:kappa_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "delta_nu",
+          "name": "kappa_epsilon",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "delta_mu",
+              "name": "kappa_delta",
               "schema": "string"
             },
             "mapValue": {
-              "name": "delta_lambda",
+              "name": "kappa_gamma",
               "schema": "long",
               "@context": "dtmi:iotcentral:context;2"
             }
@@ -36,19 +36,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_sigma;1",
+        "@id": "dtmi:example:kappa_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "delta_rho",
+          "name": "kappa_iota",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "delta_pi",
+              "name": "kappa_theta",
               "schema": "string"
             },
             "mapValue": {
-              "name": "delta_omicron",
+              "name": "kappa_eta",
               "schema": "string",
               "@context": []
             }
@@ -65,19 +65,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_chi;1",
+        "@id": "dtmi:example:kappa_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "delta_phi",
+          "name": "kappa_nu",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "delta_upsilon",
+              "name": "kappa_mu",
               "schema": "string"
             },
             "mapValue": {
-              "name": "delta_tau",
+              "name": "kappa_lambda",
               "schema": "time",
               "@context": [
                 "dtmi:iotcentral:context;2"
@@ -96,19 +96,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_wum;1",
+        "@id": "dtmi:example:kappa_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "delta_yuzz",
+          "name": "kappa_rho",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "delta_omega",
+              "name": "kappa_pi",
               "schema": "string"
             },
             "mapValue": {
-              "name": "delta_psi",
+              "name": "kappa_omicron",
               "schema": "boolean",
               "@context": null
             }
@@ -125,19 +125,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_glikk;1",
+        "@id": "dtmi:example:kappa_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "delta_fuddle",
+          "name": "kappa_phi",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "delta_humpf",
+              "name": "kappa_upsilon",
               "schema": "string"
             },
             "mapValue": {
-              "name": "delta_um",
+              "name": "kappa_tau",
               "schema": "date",
               "@context": 626
             }
@@ -154,19 +154,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_thnad;1",
+        "@id": "dtmi:example:kappa_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "delta_quan",
+          "name": "kappa_yuzz",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "delta_snee",
+              "name": "kappa_omega",
               "schema": "string"
             },
             "mapValue": {
-              "name": "delta_nuh",
+              "name": "kappa_psi",
               "schema": "dateTime",
               "@context": true
             }
@@ -183,19 +183,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_jogg;1",
+        "@id": "dtmi:example:kappa_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "delta_zatz",
+          "name": "kappa_fuddle",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "delta_floob",
+              "name": "kappa_humpf",
               "schema": "string"
             },
             "mapValue": {
-              "name": "delta_spazz",
+              "name": "kappa_um",
               "schema": "double",
               "@context": [
                 null
@@ -214,19 +214,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_vroo;1",
+        "@id": "dtmi:example:kappa_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "delta_yekk",
+          "name": "kappa_quan",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "delta_itch",
+              "name": "kappa_snee",
               "schema": "string"
             },
             "mapValue": {
-              "name": "delta_flunn",
+              "name": "kappa_nuh",
               "schema": "duration",
               "@context": [
                 626
@@ -245,19 +245,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_gamma;1",
+        "@id": "dtmi:example:kappa_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "epsilon_beta",
+          "name": "kappa_zatz",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "epsilon_alpha",
+              "name": "kappa_floob",
               "schema": "string"
             },
             "mapValue": {
-              "name": "delta_hi",
+              "name": "kappa_spazz",
               "schema": "float",
               "@context": [
                 true
@@ -276,21 +276,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_eta;1",
+        "@id": "dtmi:example:kappa_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "epsilon_zeta",
+          "name": "kappa_yekk",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "epsilon_epsilon",
+              "name": "kappa_itch",
               "schema": "string"
             },
             "mapValue": {
-              "name": "epsilon_delta",
+              "name": "kappa_flunn",
               "schema": "integer",
-              "@context": {}
+              "@context": "dtmi:iotcentral:context"
             }
           }
         }
@@ -305,23 +305,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_lambda;1",
+        "@id": "dtmi:example:lambda_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "epsilon_kappa",
+          "name": "lambda_beta",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "epsilon_iota",
+              "name": "lambda_alpha",
               "schema": "string"
             },
             "mapValue": {
-              "name": "epsilon_theta",
+              "name": "kappa_hi",
               "schema": "long",
-              "@context": [
-                {}
-              ]
+              "@context": "http://iotcentral/context/2"
             }
           }
         }
@@ -336,21 +334,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_omicron;1",
+        "@id": "dtmi:example:lambda_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "epsilon_xi",
+          "name": "lambda_zeta",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "epsilon_nu",
+              "name": "lambda_epsilon",
               "schema": "string"
             },
             "mapValue": {
-              "name": "epsilon_mu",
+              "name": "lambda_delta",
               "schema": "string",
-              "@context": "dtmi:iotcentral:context"
+              "@context": "iotcentral;2"
             }
           }
         }
@@ -365,21 +363,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_tau;1",
+        "@id": "dtmi:example:lambda_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "epsilon_sigma",
+          "name": "lambda_kappa",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "epsilon_rho",
+              "name": "lambda_iota",
               "schema": "string"
             },
             "mapValue": {
-              "name": "epsilon_pi",
+              "name": "lambda_theta",
               "schema": "time",
-              "@context": "http://iotcentral/context/2"
+              "@context": {}
             }
           }
         }
@@ -394,21 +392,87 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_psi;1",
+        "@id": "dtmi:example:lambda_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "epsilon_chi",
+          "name": "lambda_xi",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "epsilon_phi",
+              "name": "lambda_nu",
               "schema": "string"
             },
             "mapValue": {
-              "name": "epsilon_upsilon",
+              "name": "lambda_mu",
               "schema": "boolean",
-              "@context": "iotcentral;2"
+              "@context": {
+                "foo": "dtmi:foo:bar;1"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:lambda_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "lambda_sigma",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "lambda_rho",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "lambda_pi",
+              "schema": "date",
+              "@context": [
+                {}
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:lambda_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "lambda_chi",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "lambda_phi",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "lambda_upsilon",
+              "schema": "dateTime",
+              "@context": [
+                {
+                  "foo": "dtmi:foo:bar;1"
+                }
+              ]
             }
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapValueGraphKeywordV2.json b/DTDL/v2/spec/Requirement-ClassMapValueGraphKeywordV2.json
index 55124f5b..7a275aad 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValueGraphKeywordV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValueGraphKeywordV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_psi;1",
+        "@id": "dtmi:example:glikk_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_phi;1",
+          "@id": "dtmi:example:glikk_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_chi",
+            "name": "glikk_chi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omega_upsilon",
-            "schema": "time",
+            "name": "glikk_upsilon",
+            "schema": "date",
             "@graph": {}
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_um;1",
+        "@id": "dtmi:example:glikk_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_yuzz;1",
+          "@id": "dtmi:example:glikk_yuzz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_wum",
+            "name": "glikk_wum",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omega_omega",
-            "schema": "boolean",
+            "name": "glikk_omega",
+            "schema": "dateTime",
             "@graph": {}
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapValueIdDuplicateV2.json b/DTDL/v2/spec/Requirement-ClassMapValueIdDuplicateV2.json
index 6e447c01..35dfbe43 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValueIdDuplicateV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValueIdDuplicateV2.json
@@ -7,23 +7,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_zeta;1",
+        "@id": "dtmi:example:phi_zeta;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:omicron_zeta;1",
+          "@id": "dtmi:example:phi_zeta;1",
           "@type": "Property",
-          "name": "omicron_iota",
+          "name": "phi_iota",
           "schema": {
-            "@id": "dtmi:example:omicron_zeta;1",
+            "@id": "dtmi:example:phi_zeta;1",
             "@type": "Map",
             "mapKey": {
-              "name": "omicron_theta",
+              "name": "phi_theta",
               "schema": "string"
             },
             "mapValue": {
-              "@id": "dtmi:example:omicron_zeta;1",
-              "name": "omicron_eta",
-              "schema": "duration"
+              "@id": "dtmi:example:phi_zeta;1",
+              "name": "phi_eta",
+              "schema": "integer"
             }
           }
         }
@@ -38,24 +38,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_kappa;1",
+        "@id": "dtmi:example:phi_kappa;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:omicron_kappa;1",
+          "@id": "dtmi:example:phi_kappa;1",
           "@type": "Property",
-          "name": "omicron_nu",
+          "name": "phi_nu",
           "schema": {
-            "@id": "dtmi:example:omicron_kappa;1",
+            "@id": "dtmi:example:phi_kappa;1",
             "@type": "Map",
             "mapKey": {
-              "name": "omicron_mu",
+              "name": "phi_mu",
               "schema": "string"
             },
             "mapValue": {
               "@context": "dtmi:undefinedExtension:context;1",
-              "@id": "dtmi:example:omicron_kappa;1",
-              "name": "omicron_lambda",
-              "schema": "float"
+              "@id": "dtmi:example:phi_kappa;1",
+              "name": "phi_lambda",
+              "schema": "long"
             }
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapValueIdIsDtmiV2.json b/DTDL/v2/spec/Requirement-ClassMapValueIdIsDtmiV2.json
index c54fc9cf..9b9032b5 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValueIdIsDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValueIdIsDtmiV2.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_gamma;1",
+        "@id": "dtmi:example:omicron_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_alpha;1",
+          "@id": "dtmi:example:omicron_alpha;1",
           "@type": "Map",
           "mapKey": {
-            "name": "iota_beta",
+            "name": "omicron_beta",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;7",
-            "name": "theta_hi",
-            "schema": "string"
+            "name": "xi_hi",
+            "schema": "boolean"
           }
         }
       }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_eta;1",
+        "@id": "dtmi:example:omicron_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_epsilon;1",
+          "@id": "dtmi:example:omicron_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "iota_zeta",
+            "name": "omicron_zeta",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;108675309",
-            "name": "iota_delta",
-            "schema": "time"
+            "name": "omicron_delta",
+            "schema": "date"
           }
         }
       }
@@ -59,19 +59,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_lambda;1",
+        "@id": "dtmi:example:omicron_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_iota;1",
+          "@id": "dtmi:example:omicron_iota;1",
           "@type": "Map",
           "mapKey": {
-            "name": "iota_kappa",
+            "name": "omicron_kappa",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;999999999",
-            "name": "iota_theta",
-            "schema": "boolean"
+            "name": "omicron_theta",
+            "schema": "dateTime"
           }
         }
       }
@@ -85,19 +85,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_omicron;1",
+        "@id": "dtmi:example:omicron_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_nu;1",
+          "@id": "dtmi:example:omicron_nu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "iota_xi",
+            "name": "omicron_xi",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo;1",
-            "name": "iota_mu",
-            "schema": "date"
+            "name": "omicron_mu",
+            "schema": "double"
           }
         }
       }
@@ -111,19 +111,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_tau;1",
+        "@id": "dtmi:example:omicron_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_rho;1",
+          "@id": "dtmi:example:omicron_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "iota_sigma",
+            "name": "omicron_sigma",
             "schema": "string"
           },
           "mapValue": {
             "@id": null,
-            "name": "iota_pi",
-            "schema": "dateTime"
+            "name": "omicron_pi",
+            "schema": "duration"
           }
         }
       }
@@ -137,20 +137,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_psi;1",
+        "@id": "dtmi:example:omicron_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_phi;1",
+          "@id": "dtmi:example:omicron_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "iota_chi",
+            "name": "omicron_chi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": null,
-            "name": "iota_upsilon",
-            "schema": "double"
+            "name": "omicron_upsilon",
+            "schema": "float"
           }
         }
       }
@@ -164,19 +164,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_um;1",
+        "@id": "dtmi:example:omicron_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_yuzz;1",
+          "@id": "dtmi:example:omicron_yuzz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "iota_wum",
+            "name": "omicron_wum",
             "schema": "string"
           },
           "mapValue": {
             "@id": 626,
-            "name": "iota_omega",
-            "schema": "duration"
+            "name": "omicron_omega",
+            "schema": "integer"
           }
         }
       }
@@ -190,20 +190,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_nuh;1",
+        "@id": "dtmi:example:omicron_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_fuddle;1",
+          "@id": "dtmi:example:omicron_fuddle;1",
           "@type": "Map",
           "mapKey": {
-            "name": "iota_glikk",
+            "name": "omicron_glikk",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": 626,
-            "name": "iota_humpf",
-            "schema": "float"
+            "name": "omicron_humpf",
+            "schema": "long"
           }
         }
       }
@@ -217,19 +217,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_spazz;1",
+        "@id": "dtmi:example:omicron_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_quan;1",
+          "@id": "dtmi:example:omicron_quan;1",
           "@type": "Map",
           "mapKey": {
-            "name": "iota_thnad",
+            "name": "omicron_thnad",
             "schema": "string"
           },
           "mapValue": {
             "@id": true,
-            "name": "iota_snee",
-            "schema": "integer"
+            "name": "omicron_snee",
+            "schema": "string"
           }
         }
       }
@@ -243,20 +243,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_flunn;1",
+        "@id": "dtmi:example:omicron_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_zatz;1",
+          "@id": "dtmi:example:omicron_zatz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "iota_jogg",
+            "name": "omicron_jogg",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": true,
-            "name": "iota_floob",
-            "schema": "long"
+            "name": "omicron_floob",
+            "schema": "time"
           }
         }
       }
@@ -270,21 +270,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_hi;1",
+        "@id": "dtmi:example:omicron_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_yekk;1",
+          "@id": "dtmi:example:omicron_yekk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "iota_vroo",
+            "name": "omicron_vroo",
             "schema": "string"
           },
           "mapValue": {
             "@id": {
               "@value": "dtmi:apparently:valid:identifier;3"
             },
-            "name": "iota_itch",
-            "schema": "string"
+            "name": "omicron_itch",
+            "schema": "boolean"
           }
         }
       }
@@ -298,13 +298,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_delta;1",
+        "@id": "dtmi:example:pi_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_beta;1",
+          "@id": "dtmi:example:pi_beta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "kappa_gamma",
+            "name": "pi_gamma",
             "schema": "string"
           },
           "mapValue": {
@@ -312,8 +312,8 @@
             "@id": {
               "@value": "dtmi:apparently:valid:identifier;3"
             },
-            "name": "kappa_alpha",
-            "schema": "time"
+            "name": "pi_alpha",
+            "schema": "date"
           }
         }
       }
@@ -327,19 +327,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_theta;1",
+        "@id": "dtmi:example:pi_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_zeta;1",
+          "@id": "dtmi:example:pi_zeta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "kappa_eta",
+            "name": "pi_eta",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;0",
-            "name": "kappa_epsilon",
-            "schema": "boolean"
+            "name": "pi_epsilon",
+            "schema": "dateTime"
           }
         }
       }
@@ -353,20 +353,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_mu;1",
+        "@id": "dtmi:example:pi_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_kappa;1",
+          "@id": "dtmi:example:pi_kappa;1",
           "@type": "Map",
           "mapKey": {
-            "name": "kappa_lambda",
+            "name": "pi_lambda",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0",
-            "name": "kappa_iota",
-            "schema": "date"
+            "name": "pi_iota",
+            "schema": "double"
           }
         }
       }
@@ -380,19 +380,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_pi;1",
+        "@id": "dtmi:example:pi_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_xi;1",
+          "@id": "dtmi:example:pi_xi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "kappa_omicron",
+            "name": "pi_omicron",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;0.0",
-            "name": "kappa_nu",
-            "schema": "dateTime"
+            "name": "pi_nu",
+            "schema": "duration"
           }
         }
       }
@@ -406,20 +406,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_upsilon;1",
+        "@id": "dtmi:example:pi_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_sigma;1",
+          "@id": "dtmi:example:pi_sigma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "kappa_tau",
+            "name": "pi_tau",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0.0",
-            "name": "kappa_rho",
-            "schema": "double"
+            "name": "pi_rho",
+            "schema": "float"
           }
         }
       }
@@ -433,19 +433,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_omega;1",
+        "@id": "dtmi:example:pi_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_chi;1",
+          "@id": "dtmi:example:pi_chi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "kappa_psi",
+            "name": "pi_psi",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;1234567890",
-            "name": "kappa_phi",
-            "schema": "duration"
+            "name": "pi_phi",
+            "schema": "integer"
           }
         }
       }
@@ -459,20 +459,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_humpf;1",
+        "@id": "dtmi:example:pi_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_wum;1",
+          "@id": "dtmi:example:pi_wum;1",
           "@type": "Map",
           "mapKey": {
-            "name": "kappa_um",
+            "name": "pi_um",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;1234567890",
-            "name": "kappa_yuzz",
-            "schema": "float"
+            "name": "pi_yuzz",
+            "schema": "long"
           }
         }
       }
@@ -486,19 +486,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_snee;1",
+        "@id": "dtmi:example:pi_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_glikk;1",
+          "@id": "dtmi:example:pi_glikk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "kappa_nuh",
+            "name": "pi_nuh",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;1a",
-            "name": "kappa_fuddle",
-            "schema": "integer"
+            "name": "pi_fuddle",
+            "schema": "string"
           }
         }
       }
@@ -512,20 +512,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_floob;1",
+        "@id": "dtmi:example:pi_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_thnad;1",
+          "@id": "dtmi:example:pi_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "kappa_spazz",
+            "name": "pi_spazz",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;1a",
-            "name": "kappa_quan",
-            "schema": "long"
+            "name": "pi_quan",
+            "schema": "time"
           }
         }
       }
@@ -539,19 +539,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_itch;1",
+        "@id": "dtmi:example:pi_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_jogg;1",
+          "@id": "dtmi:example:pi_jogg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "kappa_flunn",
+            "name": "pi_flunn",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;3.0",
-            "name": "kappa_zatz",
-            "schema": "string"
+            "name": "pi_zatz",
+            "schema": "boolean"
           }
         }
       }
@@ -565,20 +565,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_alpha;1",
+        "@id": "dtmi:example:rho_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_vroo;1",
+          "@id": "dtmi:example:pi_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "kappa_hi",
+            "name": "pi_hi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.0",
-            "name": "kappa_yekk",
-            "schema": "time"
+            "name": "pi_yekk",
+            "schema": "date"
           }
         }
       }
@@ -592,19 +592,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_epsilon;1",
+        "@id": "dtmi:example:rho_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_gamma;1",
+          "@id": "dtmi:example:rho_gamma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "lambda_delta",
+            "name": "rho_delta",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;3.1415926",
-            "name": "lambda_beta",
-            "schema": "boolean"
+            "name": "rho_beta",
+            "schema": "dateTime"
           }
         }
       }
@@ -618,20 +618,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_iota;1",
+        "@id": "dtmi:example:rho_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_eta;1",
+          "@id": "dtmi:example:rho_eta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "lambda_theta",
+            "name": "rho_theta",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.1415926",
-            "name": "lambda_zeta",
-            "schema": "date"
+            "name": "rho_zeta",
+            "schema": "double"
           }
         }
       }
@@ -645,19 +645,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_nu;1",
+        "@id": "dtmi:example:rho_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_lambda;1",
+          "@id": "dtmi:example:rho_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "lambda_mu",
+            "name": "rho_mu",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;6.02",
-            "name": "lambda_kappa",
-            "schema": "dateTime"
+            "name": "rho_kappa",
+            "schema": "duration"
           }
         }
       }
@@ -671,20 +671,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_rho;1",
+        "@id": "dtmi:example:rho_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_omicron;1",
+          "@id": "dtmi:example:rho_omicron;1",
           "@type": "Map",
           "mapKey": {
-            "name": "lambda_pi",
+            "name": "rho_pi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;6.02",
-            "name": "lambda_xi",
-            "schema": "double"
+            "name": "rho_xi",
+            "schema": "float"
           }
         }
       }
@@ -698,19 +698,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_phi;1",
+        "@id": "dtmi:example:rho_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_tau;1",
+          "@id": "dtmi:example:rho_tau;1",
           "@type": "Map",
           "mapKey": {
-            "name": "lambda_upsilon",
+            "name": "rho_upsilon",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;0.1",
-            "name": "lambda_sigma",
-            "schema": "duration"
+            "name": "rho_sigma",
+            "schema": "integer"
           }
         }
       }
@@ -724,20 +724,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_yuzz;1",
+        "@id": "dtmi:example:rho_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_psi;1",
+          "@id": "dtmi:example:rho_psi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "lambda_omega",
+            "name": "rho_omega",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0.1",
-            "name": "lambda_chi",
-            "schema": "float"
+            "name": "rho_chi",
+            "schema": "long"
           }
         }
       }
@@ -751,19 +751,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_fuddle;1",
+        "@id": "dtmi:example:rho_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_um;1",
+          "@id": "dtmi:example:rho_um;1",
           "@type": "Map",
           "mapKey": {
-            "name": "lambda_humpf",
+            "name": "rho_humpf",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;01",
-            "name": "lambda_wum",
-            "schema": "integer"
+            "name": "rho_wum",
+            "schema": "string"
           }
         }
       }
@@ -777,20 +777,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_quan;1",
+        "@id": "dtmi:example:rho_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_nuh;1",
+          "@id": "dtmi:example:rho_nuh;1",
           "@type": "Map",
           "mapKey": {
-            "name": "lambda_snee",
+            "name": "rho_snee",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;01",
-            "name": "lambda_glikk",
-            "schema": "long"
+            "name": "rho_glikk",
+            "schema": "time"
           }
         }
       }
@@ -804,19 +804,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_zatz;1",
+        "@id": "dtmi:example:rho_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_spazz;1",
+          "@id": "dtmi:example:rho_spazz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "lambda_floob",
+            "name": "rho_floob",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;",
-            "name": "lambda_thnad",
-            "schema": "string"
+            "name": "rho_thnad",
+            "schema": "boolean"
           }
         }
       }
@@ -830,20 +830,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_yekk;1",
+        "@id": "dtmi:example:rho_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_flunn;1",
+          "@id": "dtmi:example:rho_flunn;1",
           "@type": "Map",
           "mapKey": {
-            "name": "lambda_itch",
+            "name": "rho_itch",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;",
-            "name": "lambda_jogg",
-            "schema": "time"
+            "name": "rho_jogg",
+            "schema": "date"
           }
         }
       }
@@ -857,19 +857,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_beta;1",
+        "@id": "dtmi:example:sigma_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_hi;1",
+          "@id": "dtmi:example:rho_hi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "mu_alpha",
+            "name": "sigma_alpha",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:test:invalidId_;1",
-            "name": "lambda_vroo",
-            "schema": "boolean"
+            "name": "rho_vroo",
+            "schema": "dateTime"
           }
         }
       }
@@ -883,20 +883,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_zeta;1",
+        "@id": "dtmi:example:sigma_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_delta;1",
+          "@id": "dtmi:example:sigma_delta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "mu_epsilon",
+            "name": "sigma_epsilon",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:invalidId_;1",
-            "name": "mu_gamma",
-            "schema": "date"
+            "name": "sigma_gamma",
+            "schema": "double"
           }
         }
       }
@@ -910,19 +910,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_kappa;1",
+        "@id": "dtmi:example:sigma_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_theta;1",
+          "@id": "dtmi:example:sigma_theta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "mu_iota",
+            "name": "sigma_iota",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:test:_invalidUserId;1",
-            "name": "mu_eta",
-            "schema": "dateTime"
+            "name": "sigma_eta",
+            "schema": "duration"
           }
         }
       }
@@ -936,20 +936,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_xi;1",
+        "@id": "dtmi:example:sigma_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_mu;1",
+          "@id": "dtmi:example:sigma_mu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "mu_nu",
+            "name": "sigma_nu",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:_invalidUserId;1",
-            "name": "mu_lambda",
-            "schema": "double"
+            "name": "sigma_lambda",
+            "schema": "float"
           }
         }
       }
@@ -963,19 +963,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_sigma;1",
+        "@id": "dtmi:example:sigma_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_pi;1",
+          "@id": "dtmi:example:sigma_pi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "mu_rho",
+            "name": "sigma_rho",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:test:1seg;1",
-            "name": "mu_omicron",
-            "schema": "duration"
+            "name": "sigma_omicron",
+            "schema": "integer"
           }
         }
       }
@@ -989,20 +989,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_chi;1",
+        "@id": "dtmi:example:sigma_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_upsilon;1",
+          "@id": "dtmi:example:sigma_upsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "mu_phi",
+            "name": "sigma_phi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:1seg;1",
-            "name": "mu_tau",
-            "schema": "float"
+            "name": "sigma_tau",
+            "schema": "long"
           }
         }
       }
@@ -1016,19 +1016,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_wum;1",
+        "@id": "dtmi:example:sigma_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_omega;1",
+          "@id": "dtmi:example:sigma_omega;1",
           "@type": "Map",
           "mapKey": {
-            "name": "mu_yuzz",
+            "name": "sigma_yuzz",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar.baz;1",
-            "name": "mu_psi",
-            "schema": "integer"
+            "name": "sigma_psi",
+            "schema": "string"
           }
         }
       }
@@ -1042,20 +1042,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_glikk;1",
+        "@id": "dtmi:example:sigma_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_humpf;1",
+          "@id": "dtmi:example:sigma_humpf;1",
           "@type": "Map",
           "mapKey": {
-            "name": "mu_fuddle",
+            "name": "sigma_fuddle",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar.baz;1",
-            "name": "mu_um",
-            "schema": "long"
+            "name": "sigma_um",
+            "schema": "time"
           }
         }
       }
@@ -1069,19 +1069,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_thnad;1",
+        "@id": "dtmi:example:sigma_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_snee;1",
+          "@id": "dtmi:example:sigma_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "mu_quan",
+            "name": "sigma_quan",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo::bar;1",
-            "name": "mu_nuh",
-            "schema": "string"
+            "name": "sigma_nuh",
+            "schema": "boolean"
           }
         }
       }
@@ -1095,20 +1095,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_jogg;1",
+        "@id": "dtmi:example:sigma_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_floob;1",
+          "@id": "dtmi:example:sigma_floob;1",
           "@type": "Map",
           "mapKey": {
-            "name": "mu_zatz",
+            "name": "sigma_zatz",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo::bar;1",
-            "name": "mu_spazz",
-            "schema": "time"
+            "name": "sigma_spazz",
+            "schema": "date"
           }
         }
       }
@@ -1122,19 +1122,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_vroo;1",
+        "@id": "dtmi:example:sigma_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_itch;1",
+          "@id": "dtmi:example:sigma_itch;1",
           "@type": "Map",
           "mapKey": {
-            "name": "mu_yekk",
+            "name": "sigma_yekk",
             "schema": "string"
           },
           "mapValue": {
             "@id": "urn:foo:bar:1",
-            "name": "mu_flunn",
-            "schema": "boolean"
+            "name": "sigma_flunn",
+            "schema": "dateTime"
           }
         }
       }
@@ -1148,20 +1148,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_gamma;1",
+        "@id": "dtmi:example:tau_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_alpha;1",
+          "@id": "dtmi:example:tau_alpha;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nu_beta",
+            "name": "tau_beta",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "urn:foo:bar:1",
-            "name": "mu_hi",
-            "schema": "date"
+            "name": "sigma_hi",
+            "schema": "double"
           }
         }
       }
@@ -1175,19 +1175,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_eta;1",
+        "@id": "dtmi:example:tau_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_epsilon;1",
+          "@id": "dtmi:example:tau_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nu_zeta",
+            "name": "tau_zeta",
             "schema": "string"
           },
           "mapValue": {
             "@id": "http://foo/bar/baz",
-            "name": "nu_delta",
-            "schema": "dateTime"
+            "name": "tau_delta",
+            "schema": "duration"
           }
         }
       }
@@ -1201,20 +1201,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_lambda;1",
+        "@id": "dtmi:example:tau_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_iota;1",
+          "@id": "dtmi:example:tau_iota;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nu_kappa",
+            "name": "tau_kappa",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "http://foo/bar/baz",
-            "name": "nu_theta",
-            "schema": "double"
+            "name": "tau_theta",
+            "schema": "float"
           }
         }
       }
@@ -1228,19 +1228,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_omicron;1",
+        "@id": "dtmi:example:tau_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_nu;1",
+          "@id": "dtmi:example:tau_nu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nu_xi",
+            "name": "tau_xi",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:;1",
-            "name": "nu_mu",
-            "schema": "duration"
+            "name": "tau_mu",
+            "schema": "integer"
           }
         }
       }
@@ -1254,20 +1254,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_tau;1",
+        "@id": "dtmi:example:tau_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_rho;1",
+          "@id": "dtmi:example:tau_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nu_sigma",
+            "name": "tau_sigma",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:;1",
-            "name": "nu_pi",
-            "schema": "float"
+            "name": "tau_pi",
+            "schema": "long"
           }
         }
       }
@@ -1281,19 +1281,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_psi;1",
+        "@id": "dtmi:example:tau_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_phi;1",
+          "@id": "dtmi:example:tau_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nu_chi",
+            "name": "tau_chi",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar",
-            "name": "nu_upsilon",
-            "schema": "integer"
+            "name": "tau_upsilon",
+            "schema": "string"
           }
         }
       }
@@ -1307,20 +1307,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_um;1",
+        "@id": "dtmi:example:tau_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_yuzz;1",
+          "@id": "dtmi:example:tau_yuzz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nu_wum",
+            "name": "tau_wum",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar",
-            "name": "nu_omega",
-            "schema": "long"
+            "name": "tau_omega",
+            "schema": "time"
           }
         }
       }
@@ -1334,19 +1334,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_nuh;1",
+        "@id": "dtmi:example:tau_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_fuddle;1",
+          "@id": "dtmi:example:tau_fuddle;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nu_glikk",
+            "name": "tau_glikk",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;3.14",
-            "name": "nu_humpf",
-            "schema": "string"
+            "name": "tau_humpf",
+            "schema": "boolean"
           }
         }
       }
@@ -1360,20 +1360,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_spazz;1",
+        "@id": "dtmi:example:tau_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_quan;1",
+          "@id": "dtmi:example:tau_quan;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nu_thnad",
+            "name": "tau_thnad",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.14",
-            "name": "nu_snee",
-            "schema": "time"
+            "name": "tau_snee",
+            "schema": "date"
           }
         }
       }
@@ -1387,19 +1387,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_flunn;1",
+        "@id": "dtmi:example:tau_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_zatz;1",
+          "@id": "dtmi:example:tau_zatz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nu_jogg",
+            "name": "tau_jogg",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;3.141592",
-            "name": "nu_floob",
-            "schema": "boolean"
+            "name": "tau_floob",
+            "schema": "dateTime"
           }
         }
       }
@@ -1413,20 +1413,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_hi;1",
+        "@id": "dtmi:example:tau_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_yekk;1",
+          "@id": "dtmi:example:tau_yekk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nu_vroo",
+            "name": "tau_vroo",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.141592",
-            "name": "nu_itch",
-            "schema": "date"
+            "name": "tau_itch",
+            "schema": "double"
           }
         }
       }
@@ -1440,19 +1440,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_delta;1",
+        "@id": "dtmi:example:upsilon_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_beta;1",
+          "@id": "dtmi:example:upsilon_beta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "xi_gamma",
+            "name": "upsilon_gamma",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:dtdl:example;1",
-            "name": "xi_alpha",
-            "schema": "dateTime"
+            "name": "upsilon_alpha",
+            "schema": "duration"
           }
         }
       }
@@ -1466,20 +1466,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_theta;1",
+        "@id": "dtmi:example:upsilon_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_zeta;1",
+          "@id": "dtmi:example:upsilon_zeta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "xi_eta",
+            "name": "upsilon_eta",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:dtdl:example;1",
-            "name": "xi_epsilon",
-            "schema": "double"
+            "name": "upsilon_epsilon",
+            "schema": "float"
           }
         }
       }
@@ -1493,19 +1493,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_mu;1",
+        "@id": "dtmi:example:upsilon_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_kappa;1",
+          "@id": "dtmi:example:upsilon_kappa;1",
           "@type": "Map",
           "mapKey": {
-            "name": "xi_lambda",
+            "name": "upsilon_lambda",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:standard:example;1",
-            "name": "xi_iota",
-            "schema": "duration"
+            "name": "upsilon_iota",
+            "schema": "integer"
           }
         }
       }
@@ -1519,20 +1519,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_pi;1",
+        "@id": "dtmi:example:upsilon_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_xi;1",
+          "@id": "dtmi:example:upsilon_xi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "xi_omicron",
+            "name": "upsilon_omicron",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:standard:example;1",
-            "name": "xi_nu",
-            "schema": "float"
+            "name": "upsilon_nu",
+            "schema": "long"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassMapValueIdNotArrayV2.json b/DTDL/v2/spec/Requirement-ClassMapValueIdNotArrayV2.json
index c16779c7..a53ed671 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValueIdNotArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValueIdNotArrayV2.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_upsilon;1",
+        "@id": "dtmi:example:upsilon_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_sigma;1",
+          "@id": "dtmi:example:upsilon_sigma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "xi_tau",
+            "name": "upsilon_tau",
             "schema": "string"
           },
           "mapValue": {
             "@id": [
               "dtmi:foo:bar;7"
             ],
-            "name": "xi_rho",
-            "schema": "integer"
+            "name": "upsilon_rho",
+            "schema": "string"
           }
         }
       }
@@ -35,13 +35,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_omega;1",
+        "@id": "dtmi:example:upsilon_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_chi;1",
+          "@id": "dtmi:example:upsilon_chi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "xi_psi",
+            "name": "upsilon_psi",
             "schema": "string"
           },
           "mapValue": {
@@ -49,8 +49,8 @@
             "@id": [
               "dtmi:foo:bar;7"
             ],
-            "name": "xi_phi",
-            "schema": "long"
+            "name": "upsilon_phi",
+            "schema": "time"
           }
         }
       }
@@ -64,21 +64,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_humpf;1",
+        "@id": "dtmi:example:upsilon_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_wum;1",
+          "@id": "dtmi:example:upsilon_wum;1",
           "@type": "Map",
           "mapKey": {
-            "name": "xi_um",
+            "name": "upsilon_um",
             "schema": "string"
           },
           "mapValue": {
             "@id": [
               "dtmi:foo:bar;108675309"
             ],
-            "name": "xi_yuzz",
-            "schema": "string"
+            "name": "upsilon_yuzz",
+            "schema": "boolean"
           }
         }
       }
@@ -92,13 +92,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_snee;1",
+        "@id": "dtmi:example:upsilon_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_glikk;1",
+          "@id": "dtmi:example:upsilon_glikk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "xi_nuh",
+            "name": "upsilon_nuh",
             "schema": "string"
           },
           "mapValue": {
@@ -106,8 +106,8 @@
             "@id": [
               "dtmi:foo:bar;108675309"
             ],
-            "name": "xi_fuddle",
-            "schema": "time"
+            "name": "upsilon_fuddle",
+            "schema": "date"
           }
         }
       }
@@ -121,21 +121,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_floob;1",
+        "@id": "dtmi:example:upsilon_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_thnad;1",
+          "@id": "dtmi:example:upsilon_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "xi_spazz",
+            "name": "upsilon_spazz",
             "schema": "string"
           },
           "mapValue": {
             "@id": [
               "dtmi:foo:bar;999999999"
             ],
-            "name": "xi_quan",
-            "schema": "boolean"
+            "name": "upsilon_quan",
+            "schema": "dateTime"
           }
         }
       }
@@ -149,13 +149,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_itch;1",
+        "@id": "dtmi:example:upsilon_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_jogg;1",
+          "@id": "dtmi:example:upsilon_jogg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "xi_flunn",
+            "name": "upsilon_flunn",
             "schema": "string"
           },
           "mapValue": {
@@ -163,8 +163,8 @@
             "@id": [
               "dtmi:foo:bar;999999999"
             ],
-            "name": "xi_zatz",
-            "schema": "date"
+            "name": "upsilon_zatz",
+            "schema": "double"
           }
         }
       }
@@ -178,21 +178,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_alpha;1",
+        "@id": "dtmi:example:phi_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_vroo;1",
+          "@id": "dtmi:example:upsilon_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "xi_hi",
+            "name": "upsilon_hi",
             "schema": "string"
           },
           "mapValue": {
             "@id": [
               "dtmi:foo;1"
             ],
-            "name": "xi_yekk",
-            "schema": "dateTime"
+            "name": "upsilon_yekk",
+            "schema": "duration"
           }
         }
       }
@@ -206,13 +206,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_epsilon;1",
+        "@id": "dtmi:example:phi_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_gamma;1",
+          "@id": "dtmi:example:phi_gamma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omicron_delta",
+            "name": "phi_delta",
             "schema": "string"
           },
           "mapValue": {
@@ -220,8 +220,8 @@
             "@id": [
               "dtmi:foo;1"
             ],
-            "name": "omicron_beta",
-            "schema": "double"
+            "name": "phi_beta",
+            "schema": "float"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassMapValuePropertyCommentStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassMapValuePropertyCommentStringLengthV2.json
index 69fb2f80..6f5f6363 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValuePropertyCommentStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValuePropertyCommentStringLengthV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_omicron;1",
+        "@id": "dtmi:example:psi_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_nu;1",
+          "@id": "dtmi:example:psi_nu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "rho_xi",
+            "name": "psi_xi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "rho_mu",
-            "schema": "long",
+            "name": "psi_mu",
+            "schema": "time",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_tau;1",
+        "@id": "dtmi:example:psi_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_rho;1",
+          "@id": "dtmi:example:psi_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "rho_sigma",
+            "name": "psi_sigma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "rho_pi",
-            "schema": "string",
+            "name": "psi_pi",
+            "schema": "boolean",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
@@ -59,19 +59,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_psi;1",
+        "@id": "dtmi:example:psi_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_phi;1",
+          "@id": "dtmi:example:psi_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "rho_chi",
+            "name": "psi_chi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "rho_upsilon",
-            "schema": "time",
+            "name": "psi_upsilon",
+            "schema": "date",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapValuePropertyCommentStringV2.json b/DTDL/v2/spec/Requirement-ClassMapValuePropertyCommentStringV2.json
index 3e030dac..95912517 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValuePropertyCommentStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValuePropertyCommentStringV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_rho;1",
+        "@id": "dtmi:example:phi_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_omicron;1",
+          "@id": "dtmi:example:phi_omicron;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omicron_pi",
+            "name": "phi_pi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omicron_xi",
-            "schema": "integer",
+            "name": "phi_xi",
+            "schema": "string",
             "comment": "hello"
           }
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_phi;1",
+        "@id": "dtmi:example:phi_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_tau;1",
+          "@id": "dtmi:example:phi_tau;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omicron_upsilon",
+            "name": "phi_upsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omicron_sigma",
-            "schema": "long",
+            "name": "phi_sigma",
+            "schema": "time",
             "comment": [
               "hello"
             ]
@@ -61,18 +61,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_yuzz;1",
+        "@id": "dtmi:example:phi_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_psi;1",
+          "@id": "dtmi:example:phi_psi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omicron_omega",
+            "name": "phi_omega",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omicron_chi",
-            "schema": "string",
+            "name": "phi_chi",
+            "schema": "boolean",
             "comment": {
               "@value": "hello",
               "@type": "xsd:string"
@@ -90,18 +90,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_fuddle;1",
+        "@id": "dtmi:example:phi_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_um;1",
+          "@id": "dtmi:example:phi_um;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omicron_humpf",
+            "name": "phi_humpf",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omicron_wum",
-            "schema": "time",
+            "name": "phi_wum",
+            "schema": "date",
             "comment": [
               {
                 "@value": "hello",
@@ -121,18 +121,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_quan;1",
+        "@id": "dtmi:example:phi_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_nuh;1",
+          "@id": "dtmi:example:phi_nuh;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omicron_snee",
+            "name": "phi_snee",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omicron_glikk",
-            "schema": "boolean",
+            "name": "phi_glikk",
+            "schema": "dateTime",
             "comment": []
           }
         }
@@ -147,18 +147,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_zatz;1",
+        "@id": "dtmi:example:phi_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_spazz;1",
+          "@id": "dtmi:example:phi_spazz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omicron_floob",
+            "name": "phi_floob",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omicron_thnad",
-            "schema": "date",
+            "name": "phi_thnad",
+            "schema": "double",
             "comment": null
           }
         }
@@ -173,19 +173,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_yekk;1",
+        "@id": "dtmi:example:phi_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_flunn;1",
+          "@id": "dtmi:example:phi_flunn;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omicron_itch",
+            "name": "phi_itch",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omicron_jogg",
-            "schema": "dateTime",
+            "name": "phi_jogg",
+            "schema": "duration",
             "comment": null
           }
         }
@@ -200,18 +200,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_beta;1",
+        "@id": "dtmi:example:chi_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_hi;1",
+          "@id": "dtmi:example:phi_hi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "pi_alpha",
+            "name": "chi_alpha",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omicron_vroo",
-            "schema": "double",
+            "name": "phi_vroo",
+            "schema": "float",
             "comment": true
           }
         }
@@ -226,19 +226,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_zeta;1",
+        "@id": "dtmi:example:chi_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_delta;1",
+          "@id": "dtmi:example:chi_delta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "pi_epsilon",
+            "name": "chi_epsilon",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "pi_gamma",
-            "schema": "duration",
+            "name": "chi_gamma",
+            "schema": "integer",
             "comment": true
           }
         }
@@ -253,18 +253,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_kappa;1",
+        "@id": "dtmi:example:chi_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_theta;1",
+          "@id": "dtmi:example:chi_theta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "pi_iota",
+            "name": "chi_iota",
             "schema": "string"
           },
           "mapValue": {
-            "name": "pi_eta",
-            "schema": "float",
+            "name": "chi_eta",
+            "schema": "long",
             "comment": 626
           }
         }
@@ -279,19 +279,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_xi;1",
+        "@id": "dtmi:example:chi_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_mu;1",
+          "@id": "dtmi:example:chi_mu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "pi_nu",
+            "name": "chi_nu",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "pi_lambda",
-            "schema": "integer",
+            "name": "chi_lambda",
+            "schema": "string",
             "comment": 626
           }
         }
@@ -306,18 +306,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_sigma;1",
+        "@id": "dtmi:example:chi_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_pi;1",
+          "@id": "dtmi:example:chi_pi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "pi_rho",
+            "name": "chi_rho",
             "schema": "string"
           },
           "mapValue": {
-            "name": "pi_omicron",
-            "schema": "long",
+            "name": "chi_omicron",
+            "schema": "time",
             "comment": [
               null
             ]
@@ -334,19 +334,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_chi;1",
+        "@id": "dtmi:example:chi_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_upsilon;1",
+          "@id": "dtmi:example:chi_upsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "pi_phi",
+            "name": "chi_phi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "pi_tau",
-            "schema": "string",
+            "name": "chi_tau",
+            "schema": "boolean",
             "comment": [
               null
             ]
@@ -363,18 +363,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_wum;1",
+        "@id": "dtmi:example:chi_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_omega;1",
+          "@id": "dtmi:example:chi_omega;1",
           "@type": "Map",
           "mapKey": {
-            "name": "pi_yuzz",
+            "name": "chi_yuzz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "pi_psi",
-            "schema": "time",
+            "name": "chi_psi",
+            "schema": "date",
             "comment": [
               true
             ]
@@ -391,19 +391,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_glikk;1",
+        "@id": "dtmi:example:chi_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_humpf;1",
+          "@id": "dtmi:example:chi_humpf;1",
           "@type": "Map",
           "mapKey": {
-            "name": "pi_fuddle",
+            "name": "chi_fuddle",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "pi_um",
-            "schema": "boolean",
+            "name": "chi_um",
+            "schema": "dateTime",
             "comment": [
               true
             ]
@@ -420,18 +420,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_thnad;1",
+        "@id": "dtmi:example:chi_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_snee;1",
+          "@id": "dtmi:example:chi_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "pi_quan",
+            "name": "chi_quan",
             "schema": "string"
           },
           "mapValue": {
-            "name": "pi_nuh",
-            "schema": "date",
+            "name": "chi_nuh",
+            "schema": "double",
             "comment": [
               626
             ]
@@ -448,19 +448,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_jogg;1",
+        "@id": "dtmi:example:chi_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_floob;1",
+          "@id": "dtmi:example:chi_floob;1",
           "@type": "Map",
           "mapKey": {
-            "name": "pi_zatz",
+            "name": "chi_zatz",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "pi_spazz",
-            "schema": "dateTime",
+            "name": "chi_spazz",
+            "schema": "duration",
             "comment": [
               626
             ]
@@ -477,18 +477,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_vroo;1",
+        "@id": "dtmi:example:chi_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_itch;1",
+          "@id": "dtmi:example:chi_itch;1",
           "@type": "Map",
           "mapKey": {
-            "name": "pi_yekk",
+            "name": "chi_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "pi_flunn",
-            "schema": "double",
+            "name": "chi_flunn",
+            "schema": "float",
             "comment": {}
           }
         }
@@ -503,19 +503,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_gamma;1",
+        "@id": "dtmi:example:psi_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_alpha;1",
+          "@id": "dtmi:example:psi_alpha;1",
           "@type": "Map",
           "mapKey": {
-            "name": "rho_beta",
+            "name": "psi_beta",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "pi_hi",
-            "schema": "duration",
+            "name": "chi_hi",
+            "schema": "integer",
             "comment": {}
           }
         }
@@ -530,18 +530,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_eta;1",
+        "@id": "dtmi:example:psi_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_epsilon;1",
+          "@id": "dtmi:example:psi_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "rho_zeta",
+            "name": "psi_zeta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "rho_delta",
-            "schema": "float",
+            "name": "psi_delta",
+            "schema": "long",
             "comment": [
               {}
             ]
@@ -558,19 +558,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_lambda;1",
+        "@id": "dtmi:example:psi_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_iota;1",
+          "@id": "dtmi:example:psi_iota;1",
           "@type": "Map",
           "mapKey": {
-            "name": "rho_kappa",
+            "name": "psi_kappa",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "rho_theta",
-            "schema": "integer",
+            "name": "psi_theta",
+            "schema": "string",
             "comment": [
               {}
             ]
diff --git a/DTDL/v2/spec/Requirement-ClassMapValuePropertyCommentTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassMapValuePropertyCommentTermAndDtmiV2.json
index b838cf15..570994be 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValuePropertyCommentTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValuePropertyCommentTermAndDtmiV2.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_alpha;1",
+        "@id": "dtmi:example:omega_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_vroo;1",
+          "@id": "dtmi:example:psi_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "rho_hi",
+            "name": "psi_hi",
             "schema": "string"
           },
           "mapValue": {
-            "comment": "rho_flunn",
-            "dtmi:dtdl:property:comment;2": "rho_itch",
-            "name": "rho_yekk",
-            "schema": "double"
+            "comment": "psi_flunn",
+            "dtmi:dtdl:property:comment;2": "psi_itch",
+            "name": "psi_yekk",
+            "schema": "float"
           }
         }
       }
@@ -34,21 +34,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_eta;1",
+        "@id": "dtmi:example:omega_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_epsilon;1",
+          "@id": "dtmi:example:omega_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_zeta",
+            "name": "omega_zeta",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "comment": "sigma_beta",
-            "dtmi:dtdl:property:comment;2": "sigma_gamma",
-            "name": "sigma_delta",
-            "schema": "duration"
+            "comment": "omega_beta",
+            "dtmi:dtdl:property:comment;2": "omega_gamma",
+            "name": "omega_delta",
+            "schema": "integer"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassMapValuePropertyDescriptionLangStringV2.json b/DTDL/v2/spec/Requirement-ClassMapValuePropertyDescriptionLangStringV2.json
index 24cc7cc5..6d184847 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValuePropertyDescriptionLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValuePropertyDescriptionLangStringV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_lambda;1",
+        "@id": "dtmi:example:omega_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_iota;1",
+          "@id": "dtmi:example:omega_iota;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_kappa",
+            "name": "omega_kappa",
             "schema": "string"
           },
           "mapValue": {
-            "name": "sigma_theta",
-            "schema": "float",
+            "name": "omega_theta",
+            "schema": "long",
             "description": "hello"
           }
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_omicron;1",
+        "@id": "dtmi:example:omega_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_nu;1",
+          "@id": "dtmi:example:omega_nu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_xi",
+            "name": "omega_xi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "sigma_mu",
-            "schema": "integer",
+            "name": "omega_mu",
+            "schema": "string",
             "description": [
               "hello"
             ]
@@ -61,18 +61,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_tau;1",
+        "@id": "dtmi:example:omega_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_rho;1",
+          "@id": "dtmi:example:omega_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_sigma",
+            "name": "omega_sigma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "sigma_pi",
-            "schema": "long",
+            "name": "omega_pi",
+            "schema": "time",
             "description": {
               "en": "hello"
             }
@@ -89,18 +89,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_psi;1",
+        "@id": "dtmi:example:omega_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_phi;1",
+          "@id": "dtmi:example:omega_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_chi",
+            "name": "omega_chi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "sigma_upsilon",
-            "schema": "string",
+            "name": "omega_upsilon",
+            "schema": "boolean",
             "description": [
               {
                 "@value": "hello",
@@ -120,18 +120,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_um;1",
+        "@id": "dtmi:example:omega_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_yuzz;1",
+          "@id": "dtmi:example:omega_yuzz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_wum",
+            "name": "omega_wum",
             "schema": "string"
           },
           "mapValue": {
-            "name": "sigma_omega",
-            "schema": "time",
+            "name": "omega_omega",
+            "schema": "date",
             "description": {}
           }
         }
@@ -146,18 +146,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_nuh;1",
+        "@id": "dtmi:example:omega_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_fuddle;1",
+          "@id": "dtmi:example:omega_fuddle;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_glikk",
+            "name": "omega_glikk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "sigma_humpf",
-            "schema": "boolean",
+            "name": "omega_humpf",
+            "schema": "dateTime",
             "description": []
           }
         }
@@ -172,18 +172,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_spazz;1",
+        "@id": "dtmi:example:omega_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_quan;1",
+          "@id": "dtmi:example:omega_quan;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_thnad",
+            "name": "omega_thnad",
             "schema": "string"
           },
           "mapValue": {
-            "name": "sigma_snee",
-            "schema": "date",
+            "name": "omega_snee",
+            "schema": "double",
             "description": null
           }
         }
@@ -198,19 +198,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_flunn;1",
+        "@id": "dtmi:example:omega_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_zatz;1",
+          "@id": "dtmi:example:omega_zatz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_jogg",
+            "name": "omega_jogg",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "sigma_floob",
-            "schema": "dateTime",
+            "name": "omega_floob",
+            "schema": "duration",
             "description": null
           }
         }
@@ -225,18 +225,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_hi;1",
+        "@id": "dtmi:example:omega_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_yekk;1",
+          "@id": "dtmi:example:omega_yekk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_vroo",
+            "name": "omega_vroo",
             "schema": "string"
           },
           "mapValue": {
-            "name": "sigma_itch",
-            "schema": "double",
+            "name": "omega_itch",
+            "schema": "float",
             "description": true
           }
         }
@@ -251,19 +251,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_delta;1",
+        "@id": "dtmi:example:yuzz_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_beta;1",
+          "@id": "dtmi:example:yuzz_beta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_gamma",
+            "name": "yuzz_gamma",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "tau_alpha",
-            "schema": "duration",
+            "name": "yuzz_alpha",
+            "schema": "integer",
             "description": true
           }
         }
@@ -278,18 +278,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_theta;1",
+        "@id": "dtmi:example:yuzz_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_zeta;1",
+          "@id": "dtmi:example:yuzz_zeta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_eta",
+            "name": "yuzz_eta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "tau_epsilon",
-            "schema": "float",
+            "name": "yuzz_epsilon",
+            "schema": "long",
             "description": 626
           }
         }
@@ -304,19 +304,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_mu;1",
+        "@id": "dtmi:example:yuzz_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_kappa;1",
+          "@id": "dtmi:example:yuzz_kappa;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_lambda",
+            "name": "yuzz_lambda",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "tau_iota",
-            "schema": "integer",
+            "name": "yuzz_iota",
+            "schema": "string",
             "description": 626
           }
         }
@@ -331,18 +331,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_pi;1",
+        "@id": "dtmi:example:yuzz_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_xi;1",
+          "@id": "dtmi:example:yuzz_xi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_omicron",
+            "name": "yuzz_omicron",
             "schema": "string"
           },
           "mapValue": {
-            "name": "tau_nu",
-            "schema": "long",
+            "name": "yuzz_nu",
+            "schema": "time",
             "description": [
               null
             ]
@@ -359,19 +359,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_upsilon;1",
+        "@id": "dtmi:example:yuzz_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_sigma;1",
+          "@id": "dtmi:example:yuzz_sigma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_tau",
+            "name": "yuzz_tau",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "tau_rho",
-            "schema": "string",
+            "name": "yuzz_rho",
+            "schema": "boolean",
             "description": [
               null
             ]
@@ -388,18 +388,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_omega;1",
+        "@id": "dtmi:example:yuzz_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_chi;1",
+          "@id": "dtmi:example:yuzz_chi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_psi",
+            "name": "yuzz_psi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "tau_phi",
-            "schema": "time",
+            "name": "yuzz_phi",
+            "schema": "date",
             "description": [
               true
             ]
@@ -416,19 +416,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_humpf;1",
+        "@id": "dtmi:example:yuzz_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_wum;1",
+          "@id": "dtmi:example:yuzz_wum;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_um",
+            "name": "yuzz_um",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "tau_yuzz",
-            "schema": "boolean",
+            "name": "yuzz_yuzz",
+            "schema": "dateTime",
             "description": [
               true
             ]
@@ -445,18 +445,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_snee;1",
+        "@id": "dtmi:example:yuzz_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_glikk;1",
+          "@id": "dtmi:example:yuzz_glikk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_nuh",
+            "name": "yuzz_nuh",
             "schema": "string"
           },
           "mapValue": {
-            "name": "tau_fuddle",
-            "schema": "date",
+            "name": "yuzz_fuddle",
+            "schema": "double",
             "description": [
               626
             ]
@@ -473,19 +473,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_floob;1",
+        "@id": "dtmi:example:yuzz_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_thnad;1",
+          "@id": "dtmi:example:yuzz_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_spazz",
+            "name": "yuzz_spazz",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "tau_quan",
-            "schema": "dateTime",
+            "name": "yuzz_quan",
+            "schema": "duration",
             "description": [
               626
             ]
@@ -502,18 +502,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_itch;1",
+        "@id": "dtmi:example:yuzz_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_jogg;1",
+          "@id": "dtmi:example:yuzz_jogg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_flunn",
+            "name": "yuzz_flunn",
             "schema": "string"
           },
           "mapValue": {
-            "name": "tau_zatz",
-            "schema": "double",
+            "name": "yuzz_zatz",
+            "schema": "float",
             "description": [
               {}
             ]
@@ -530,19 +530,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_alpha;1",
+        "@id": "dtmi:example:wum_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_vroo;1",
+          "@id": "dtmi:example:yuzz_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_hi",
+            "name": "yuzz_hi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "tau_yekk",
-            "schema": "duration",
+            "name": "yuzz_yekk",
+            "schema": "integer",
             "description": [
               {}
             ]
@@ -559,18 +559,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_epsilon;1",
+        "@id": "dtmi:example:wum_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_gamma;1",
+          "@id": "dtmi:example:wum_gamma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_delta",
+            "name": "wum_delta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "upsilon_beta",
-            "schema": "float",
+            "name": "wum_beta",
+            "schema": "long",
             "description": {
               "@value": "hello",
               "@language": "en"
@@ -588,19 +588,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_iota;1",
+        "@id": "dtmi:example:wum_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_eta;1",
+          "@id": "dtmi:example:wum_eta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_theta",
+            "name": "wum_theta",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "upsilon_zeta",
-            "schema": "integer",
+            "name": "wum_zeta",
+            "schema": "string",
             "description": {
               "@value": "hello",
               "@language": "en"
@@ -618,18 +618,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_nu;1",
+        "@id": "dtmi:example:wum_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_lambda;1",
+          "@id": "dtmi:example:wum_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_mu",
+            "name": "wum_mu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "upsilon_kappa",
-            "schema": "long",
+            "name": "wum_kappa",
+            "schema": "time",
             "description": [
               {
                 "en": "hello"
@@ -648,19 +648,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_rho;1",
+        "@id": "dtmi:example:wum_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_omicron;1",
+          "@id": "dtmi:example:wum_omicron;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_pi",
+            "name": "wum_pi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "upsilon_xi",
-            "schema": "string",
+            "name": "wum_xi",
+            "schema": "boolean",
             "description": [
               {
                 "en": "hello"
diff --git a/DTDL/v2/spec/Requirement-ClassMapValuePropertyDescriptionStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassMapValuePropertyDescriptionStringLengthV2.json
index 567cdf62..1c478858 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValuePropertyDescriptionStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValuePropertyDescriptionStringLengthV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_phi;1",
+        "@id": "dtmi:example:wum_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_tau;1",
+          "@id": "dtmi:example:wum_tau;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_upsilon",
+            "name": "wum_upsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "upsilon_sigma",
-            "schema": "time",
+            "name": "wum_sigma",
+            "schema": "date",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_yuzz;1",
+        "@id": "dtmi:example:wum_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_psi;1",
+          "@id": "dtmi:example:wum_psi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_omega",
+            "name": "wum_omega",
             "schema": "string"
           },
           "mapValue": {
-            "name": "upsilon_chi",
-            "schema": "boolean",
+            "name": "wum_chi",
+            "schema": "dateTime",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
@@ -59,19 +59,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_fuddle;1",
+        "@id": "dtmi:example:wum_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_um;1",
+          "@id": "dtmi:example:wum_um;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_humpf",
+            "name": "wum_humpf",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "upsilon_wum",
-            "schema": "date",
+            "name": "wum_wum",
+            "schema": "double",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapValuePropertyDescriptionTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassMapValuePropertyDescriptionTermAndDtmiV2.json
index c08ee137..8eb8b893 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValuePropertyDescriptionTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValuePropertyDescriptionTermAndDtmiV2.json
@@ -7,24 +7,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_eta;1",
+        "@id": "dtmi:example:um_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_epsilon;1",
+          "@id": "dtmi:example:um_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_zeta",
+            "name": "um_zeta",
             "schema": "string"
           },
           "mapValue": {
             "description": [
-              "phi_beta"
+              "um_beta"
             ],
             "dtmi:dtdl:property:description;2": [
-              "phi_gamma"
+              "um_gamma"
             ],
-            "name": "phi_delta",
-            "schema": "float"
+            "name": "um_delta",
+            "schema": "long"
           }
         }
       }
@@ -38,25 +38,25 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_nu;1",
+        "@id": "dtmi:example:um_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_lambda;1",
+          "@id": "dtmi:example:um_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_mu",
+            "name": "um_mu",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "description": [
-              "phi_theta"
+              "um_theta"
             ],
             "dtmi:dtdl:property:description;2": [
-              "phi_iota"
+              "um_iota"
             ],
-            "name": "phi_kappa",
-            "schema": "integer"
+            "name": "um_kappa",
+            "schema": "string"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassMapValuePropertyDisplayNameLangStringV2.json b/DTDL/v2/spec/Requirement-ClassMapValuePropertyDisplayNameLangStringV2.json
index 4a9edba5..8cf0a1df 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValuePropertyDisplayNameLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValuePropertyDisplayNameLangStringV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_rho;1",
+        "@id": "dtmi:example:um_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_omicron;1",
+          "@id": "dtmi:example:um_omicron;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_pi",
+            "name": "um_pi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "phi_xi",
-            "schema": "long",
+            "name": "um_xi",
+            "schema": "time",
             "displayName": "hello"
           }
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_phi;1",
+        "@id": "dtmi:example:um_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_tau;1",
+          "@id": "dtmi:example:um_tau;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_upsilon",
+            "name": "um_upsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "phi_sigma",
-            "schema": "string",
+            "name": "um_sigma",
+            "schema": "boolean",
             "displayName": [
               "hello"
             ]
@@ -61,18 +61,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_yuzz;1",
+        "@id": "dtmi:example:um_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_psi;1",
+          "@id": "dtmi:example:um_psi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_omega",
+            "name": "um_omega",
             "schema": "string"
           },
           "mapValue": {
-            "name": "phi_chi",
-            "schema": "time",
+            "name": "um_chi",
+            "schema": "date",
             "displayName": {
               "en": "hello"
             }
@@ -89,18 +89,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_fuddle;1",
+        "@id": "dtmi:example:um_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_um;1",
+          "@id": "dtmi:example:um_um;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_humpf",
+            "name": "um_humpf",
             "schema": "string"
           },
           "mapValue": {
-            "name": "phi_wum",
-            "schema": "boolean",
+            "name": "um_wum",
+            "schema": "dateTime",
             "displayName": [
               {
                 "@value": "hello",
@@ -120,18 +120,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_quan;1",
+        "@id": "dtmi:example:um_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_nuh;1",
+          "@id": "dtmi:example:um_nuh;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_snee",
+            "name": "um_snee",
             "schema": "string"
           },
           "mapValue": {
-            "name": "phi_glikk",
-            "schema": "date",
+            "name": "um_glikk",
+            "schema": "double",
             "displayName": {}
           }
         }
@@ -146,18 +146,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_zatz;1",
+        "@id": "dtmi:example:um_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_spazz;1",
+          "@id": "dtmi:example:um_spazz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_floob",
+            "name": "um_floob",
             "schema": "string"
           },
           "mapValue": {
-            "name": "phi_thnad",
-            "schema": "dateTime",
+            "name": "um_thnad",
+            "schema": "duration",
             "displayName": []
           }
         }
@@ -172,18 +172,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_yekk;1",
+        "@id": "dtmi:example:um_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_flunn;1",
+          "@id": "dtmi:example:um_flunn;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_itch",
+            "name": "um_itch",
             "schema": "string"
           },
           "mapValue": {
-            "name": "phi_jogg",
-            "schema": "double",
+            "name": "um_jogg",
+            "schema": "float",
             "displayName": null
           }
         }
@@ -198,19 +198,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_beta;1",
+        "@id": "dtmi:example:humpf_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_hi;1",
+          "@id": "dtmi:example:um_hi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_alpha",
+            "name": "humpf_alpha",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "phi_vroo",
-            "schema": "duration",
+            "name": "um_vroo",
+            "schema": "integer",
             "displayName": null
           }
         }
@@ -225,18 +225,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_zeta;1",
+        "@id": "dtmi:example:humpf_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_delta;1",
+          "@id": "dtmi:example:humpf_delta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_epsilon",
+            "name": "humpf_epsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "chi_gamma",
-            "schema": "float",
+            "name": "humpf_gamma",
+            "schema": "long",
             "displayName": true
           }
         }
@@ -251,19 +251,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_kappa;1",
+        "@id": "dtmi:example:humpf_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_theta;1",
+          "@id": "dtmi:example:humpf_theta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_iota",
+            "name": "humpf_iota",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "chi_eta",
-            "schema": "integer",
+            "name": "humpf_eta",
+            "schema": "string",
             "displayName": true
           }
         }
@@ -278,18 +278,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_xi;1",
+        "@id": "dtmi:example:humpf_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_mu;1",
+          "@id": "dtmi:example:humpf_mu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_nu",
+            "name": "humpf_nu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "chi_lambda",
-            "schema": "long",
+            "name": "humpf_lambda",
+            "schema": "time",
             "displayName": 626
           }
         }
@@ -304,19 +304,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_sigma;1",
+        "@id": "dtmi:example:humpf_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_pi;1",
+          "@id": "dtmi:example:humpf_pi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_rho",
+            "name": "humpf_rho",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "chi_omicron",
-            "schema": "string",
+            "name": "humpf_omicron",
+            "schema": "boolean",
             "displayName": 626
           }
         }
@@ -331,18 +331,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_chi;1",
+        "@id": "dtmi:example:humpf_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_upsilon;1",
+          "@id": "dtmi:example:humpf_upsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_phi",
+            "name": "humpf_phi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "chi_tau",
-            "schema": "time",
+            "name": "humpf_tau",
+            "schema": "date",
             "displayName": [
               null
             ]
@@ -359,19 +359,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_wum;1",
+        "@id": "dtmi:example:humpf_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_omega;1",
+          "@id": "dtmi:example:humpf_omega;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_yuzz",
+            "name": "humpf_yuzz",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "chi_psi",
-            "schema": "boolean",
+            "name": "humpf_psi",
+            "schema": "dateTime",
             "displayName": [
               null
             ]
@@ -388,18 +388,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_glikk;1",
+        "@id": "dtmi:example:humpf_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_humpf;1",
+          "@id": "dtmi:example:humpf_humpf;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_fuddle",
+            "name": "humpf_fuddle",
             "schema": "string"
           },
           "mapValue": {
-            "name": "chi_um",
-            "schema": "date",
+            "name": "humpf_um",
+            "schema": "double",
             "displayName": [
               true
             ]
@@ -416,19 +416,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_thnad;1",
+        "@id": "dtmi:example:humpf_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_snee;1",
+          "@id": "dtmi:example:humpf_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_quan",
+            "name": "humpf_quan",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "chi_nuh",
-            "schema": "dateTime",
+            "name": "humpf_nuh",
+            "schema": "duration",
             "displayName": [
               true
             ]
@@ -445,18 +445,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_jogg;1",
+        "@id": "dtmi:example:humpf_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_floob;1",
+          "@id": "dtmi:example:humpf_floob;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_zatz",
+            "name": "humpf_zatz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "chi_spazz",
-            "schema": "double",
+            "name": "humpf_spazz",
+            "schema": "float",
             "displayName": [
               626
             ]
@@ -473,19 +473,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_vroo;1",
+        "@id": "dtmi:example:humpf_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_itch;1",
+          "@id": "dtmi:example:humpf_itch;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_yekk",
+            "name": "humpf_yekk",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "chi_flunn",
-            "schema": "duration",
+            "name": "humpf_flunn",
+            "schema": "integer",
             "displayName": [
               626
             ]
@@ -502,18 +502,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_gamma;1",
+        "@id": "dtmi:example:fuddle_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_alpha;1",
+          "@id": "dtmi:example:fuddle_alpha;1",
           "@type": "Map",
           "mapKey": {
-            "name": "psi_beta",
+            "name": "fuddle_beta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "chi_hi",
-            "schema": "float",
+            "name": "humpf_hi",
+            "schema": "long",
             "displayName": [
               {}
             ]
@@ -530,19 +530,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_eta;1",
+        "@id": "dtmi:example:fuddle_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_epsilon;1",
+          "@id": "dtmi:example:fuddle_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "psi_zeta",
+            "name": "fuddle_zeta",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "psi_delta",
-            "schema": "integer",
+            "name": "fuddle_delta",
+            "schema": "string",
             "displayName": [
               {}
             ]
@@ -559,18 +559,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_lambda;1",
+        "@id": "dtmi:example:fuddle_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_iota;1",
+          "@id": "dtmi:example:fuddle_iota;1",
           "@type": "Map",
           "mapKey": {
-            "name": "psi_kappa",
+            "name": "fuddle_kappa",
             "schema": "string"
           },
           "mapValue": {
-            "name": "psi_theta",
-            "schema": "long",
+            "name": "fuddle_theta",
+            "schema": "time",
             "displayName": {
               "@value": "hello",
               "@language": "en"
@@ -588,19 +588,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_omicron;1",
+        "@id": "dtmi:example:fuddle_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_nu;1",
+          "@id": "dtmi:example:fuddle_nu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "psi_xi",
+            "name": "fuddle_xi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "psi_mu",
-            "schema": "string",
+            "name": "fuddle_mu",
+            "schema": "boolean",
             "displayName": {
               "@value": "hello",
               "@language": "en"
@@ -618,18 +618,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_tau;1",
+        "@id": "dtmi:example:fuddle_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_rho;1",
+          "@id": "dtmi:example:fuddle_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "psi_sigma",
+            "name": "fuddle_sigma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "psi_pi",
-            "schema": "time",
+            "name": "fuddle_pi",
+            "schema": "date",
             "displayName": [
               {
                 "en": "hello"
@@ -648,19 +648,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_psi;1",
+        "@id": "dtmi:example:fuddle_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_phi;1",
+          "@id": "dtmi:example:fuddle_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "psi_chi",
+            "name": "fuddle_chi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "psi_upsilon",
-            "schema": "boolean",
+            "name": "fuddle_upsilon",
+            "schema": "dateTime",
             "displayName": [
               {
                 "en": "hello"
diff --git a/DTDL/v2/spec/Requirement-ClassMapValuePropertyDisplayNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassMapValuePropertyDisplayNameStringLengthV2.json
index a256adb8..e1e048aa 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValuePropertyDisplayNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValuePropertyDisplayNameStringLengthV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_um;1",
+        "@id": "dtmi:example:fuddle_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_yuzz;1",
+          "@id": "dtmi:example:fuddle_yuzz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "psi_wum",
+            "name": "fuddle_wum",
             "schema": "string"
           },
           "mapValue": {
-            "name": "psi_omega",
-            "schema": "date",
+            "name": "fuddle_omega",
+            "schema": "double",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSometh"
           }
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_nuh;1",
+        "@id": "dtmi:example:fuddle_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_fuddle;1",
+          "@id": "dtmi:example:fuddle_fuddle;1",
           "@type": "Map",
           "mapKey": {
-            "name": "psi_glikk",
+            "name": "fuddle_glikk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "psi_humpf",
-            "schema": "dateTime",
+            "name": "fuddle_humpf",
+            "schema": "duration",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
           }
         }
@@ -59,19 +59,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_spazz;1",
+        "@id": "dtmi:example:fuddle_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_quan;1",
+          "@id": "dtmi:example:fuddle_quan;1",
           "@type": "Map",
           "mapKey": {
-            "name": "psi_thnad",
+            "name": "fuddle_thnad",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "psi_snee",
-            "schema": "double",
+            "name": "fuddle_snee",
+            "schema": "float",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapValuePropertyDisplayNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassMapValuePropertyDisplayNameTermAndDtmiV2.json
index ad43efcd..df882a99 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValuePropertyDisplayNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValuePropertyDisplayNameTermAndDtmiV2.json
@@ -7,24 +7,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_nu;1",
+        "@id": "dtmi:example:glikk_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_lambda;1",
+          "@id": "dtmi:example:glikk_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_mu",
+            "name": "glikk_mu",
             "schema": "string"
           },
           "mapValue": {
             "displayName": [
-              "omega_theta"
+              "glikk_theta"
             ],
             "dtmi:dtdl:property:displayName;2": [
-              "omega_iota"
+              "glikk_iota"
             ],
-            "name": "omega_kappa",
-            "schema": "long"
+            "name": "glikk_kappa",
+            "schema": "time"
           }
         }
       }
@@ -38,25 +38,25 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_tau;1",
+        "@id": "dtmi:example:glikk_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_rho;1",
+          "@id": "dtmi:example:glikk_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_sigma",
+            "name": "glikk_sigma",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "displayName": [
-              "omega_xi"
+              "glikk_xi"
             ],
             "dtmi:dtdl:property:displayName;2": [
-              "omega_omicron"
+              "glikk_omicron"
             ],
-            "name": "omega_pi",
-            "schema": "string"
+            "name": "glikk_pi",
+            "schema": "boolean"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassMapValuePropertyFormallyInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassMapValuePropertyFormallyInvalidDtmiV2.json
index 77dcb223..be93c579 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValuePropertyFormallyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValuePropertyFormallyInvalidDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_humpf;1",
+        "@id": "dtmi:example:nuh_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_wum;1",
+          "@id": "dtmi:example:nuh_wum;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_um",
+            "name": "nuh_um",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yuzz_yuzz",
-            "schema": "date",
+            "name": "nuh_yuzz",
+            "schema": "double",
             "dtmi:foo//bar": 626
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_snee;1",
+        "@id": "dtmi:example:nuh_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_glikk;1",
+          "@id": "dtmi:example:nuh_glikk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_nuh",
+            "name": "nuh_nuh",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yuzz_fuddle",
-            "schema": "dateTime",
+            "name": "nuh_fuddle",
+            "schema": "duration",
             "dtmi:foo//bar": 626
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapValuePropertyFormallyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Requirement-ClassMapValuePropertyFormallyIrrelevantDtmiOrTermV2.json
index e78cdb12..c0f72acd 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValuePropertyFormallyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValuePropertyFormallyIrrelevantDtmiOrTermV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_theta;1",
+        "@id": "dtmi:example:nuh_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_zeta;1",
+          "@id": "dtmi:example:nuh_zeta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_eta",
+            "name": "nuh_eta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yuzz_epsilon",
-            "schema": "integer",
+            "name": "nuh_epsilon",
+            "schema": "string",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_mu;1",
+        "@id": "dtmi:example:nuh_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_kappa;1",
+          "@id": "dtmi:example:nuh_kappa;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_lambda",
+            "name": "nuh_lambda",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yuzz_iota",
-            "schema": "long",
+            "name": "nuh_iota",
+            "schema": "time",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -60,18 +60,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_pi;1",
+        "@id": "dtmi:example:nuh_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_xi;1",
+          "@id": "dtmi:example:nuh_xi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_omicron",
+            "name": "nuh_omicron",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yuzz_nu",
-            "schema": "string",
+            "name": "nuh_nu",
+            "schema": "boolean",
             "boolean": null
           }
         }
@@ -86,19 +86,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_upsilon;1",
+        "@id": "dtmi:example:nuh_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_sigma;1",
+          "@id": "dtmi:example:nuh_sigma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_tau",
+            "name": "nuh_tau",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yuzz_rho",
-            "schema": "time",
+            "name": "nuh_rho",
+            "schema": "date",
             "boolean": null
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapValuePropertyFormallyNotDtmiNorTermV2.json b/DTDL/v2/spec/Requirement-ClassMapValuePropertyFormallyNotDtmiNorTermV2.json
index ef5b00e3..a6807e65 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValuePropertyFormallyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValuePropertyFormallyNotDtmiNorTermV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_itch;1",
+        "@id": "dtmi:example:nuh_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_jogg;1",
+          "@id": "dtmi:example:nuh_jogg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_flunn",
+            "name": "nuh_flunn",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yuzz_zatz",
-            "schema": "duration",
+            "name": "nuh_zatz",
+            "schema": "integer",
             "http://foo.com/bar": true
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_alpha;1",
+        "@id": "dtmi:example:snee_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_vroo;1",
+          "@id": "dtmi:example:nuh_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_hi",
+            "name": "nuh_hi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yuzz_yekk",
-            "schema": "float",
+            "name": "nuh_yekk",
+            "schema": "long",
             "http://foo.com/bar": true
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapValuePropertyFormallyUndefinedTermV2.json b/DTDL/v2/spec/Requirement-ClassMapValuePropertyFormallyUndefinedTermV2.json
index 4d145a12..3f7138f4 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValuePropertyFormallyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValuePropertyFormallyUndefinedTermV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_iota;1",
+        "@id": "dtmi:example:snee_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_eta;1",
+          "@id": "dtmi:example:snee_eta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_theta",
+            "name": "snee_theta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "wum_zeta",
-            "schema": "long",
+            "name": "snee_zeta",
+            "schema": "time",
             "foobar": {}
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_nu;1",
+        "@id": "dtmi:example:snee_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_lambda;1",
+          "@id": "dtmi:example:snee_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_mu",
+            "name": "snee_mu",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "wum_kappa",
-            "schema": "string",
+            "name": "snee_kappa",
+            "schema": "boolean",
             "foobar": {}
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapValuePropertyNamePatternV2.json b/DTDL/v2/spec/Requirement-ClassMapValuePropertyNamePatternV2.json
index 2a9a3bba..a3792be4 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValuePropertyNamePatternV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValuePropertyNamePatternV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_lambda;1",
+        "@id": "dtmi:example:yekk_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_iota;1",
+          "@id": "dtmi:example:yekk_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_kappa",
+            "name": "yekk_spazz",
             "schema": "string"
           },
           "mapValue": {
@@ -32,13 +32,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_xi;1",
+        "@id": "dtmi:example:yekk_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_mu;1",
+          "@id": "dtmi:example:yekk_zatz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_nu",
+            "name": "yekk_jogg",
             "schema": "string"
           },
           "mapValue": {
@@ -57,13 +57,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_rho;1",
+        "@id": "dtmi:example:yekk_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_omicron;1",
+          "@id": "dtmi:example:yekk_itch;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_pi",
+            "name": "yekk_yekk",
             "schema": "string"
           },
           "mapValue": {
@@ -82,13 +82,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_upsilon;1",
+        "@id": "dtmi:example:vroo_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_sigma;1",
+          "@id": "dtmi:example:yekk_hi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_tau",
+            "name": "vroo_alpha",
             "schema": "string"
           },
           "mapValue": {
@@ -107,13 +107,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_psi;1",
+        "@id": "dtmi:example:vroo_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_phi;1",
+          "@id": "dtmi:example:vroo_gamma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_chi",
+            "name": "vroo_delta",
             "schema": "string"
           },
           "mapValue": {
@@ -132,13 +132,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_wum;1",
+        "@id": "dtmi:example:vroo_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_omega;1",
+          "@id": "dtmi:example:vroo_zeta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_yuzz",
+            "name": "vroo_eta",
             "schema": "string"
           },
           "mapValue": {
@@ -157,13 +157,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_fuddle;1",
+        "@id": "dtmi:example:vroo_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_um;1",
+          "@id": "dtmi:example:vroo_iota;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_humpf",
+            "name": "vroo_kappa",
             "schema": "string"
           },
           "mapValue": {
@@ -183,13 +183,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_snee;1",
+        "@id": "dtmi:example:vroo_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_glikk;1",
+          "@id": "dtmi:example:vroo_mu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_nuh",
+            "name": "vroo_nu",
             "schema": "string"
           },
           "mapValue": {
@@ -208,13 +208,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_spazz;1",
+        "@id": "dtmi:example:vroo_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_quan;1",
+          "@id": "dtmi:example:vroo_omicron;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_thnad",
+            "name": "vroo_pi",
             "schema": "string"
           },
           "mapValue": {
@@ -234,13 +234,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_jogg;1",
+        "@id": "dtmi:example:vroo_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_floob;1",
+          "@id": "dtmi:example:vroo_sigma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_zatz",
+            "name": "vroo_tau",
             "schema": "string"
           },
           "mapValue": {
@@ -259,13 +259,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_yekk;1",
+        "@id": "dtmi:example:vroo_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_flunn;1",
+          "@id": "dtmi:example:vroo_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_itch",
+            "name": "vroo_chi",
             "schema": "string"
           },
           "mapValue": {
@@ -285,13 +285,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_alpha;1",
+        "@id": "dtmi:example:vroo_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_vroo;1",
+          "@id": "dtmi:example:vroo_omega;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_hi",
+            "name": "vroo_yuzz",
             "schema": "string"
           },
           "mapValue": {
@@ -310,13 +310,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_delta;1",
+        "@id": "dtmi:example:vroo_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_beta;1",
+          "@id": "dtmi:example:vroo_um;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_gamma",
+            "name": "vroo_humpf",
             "schema": "string"
           },
           "mapValue": {
@@ -336,13 +336,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_eta;1",
+        "@id": "dtmi:example:vroo_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_epsilon;1",
+          "@id": "dtmi:example:vroo_glikk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_zeta",
+            "name": "vroo_nuh",
             "schema": "string"
           },
           "mapValue": {
@@ -361,13 +361,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_kappa;1",
+        "@id": "dtmi:example:vroo_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_theta;1",
+          "@id": "dtmi:example:vroo_quan;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_iota",
+            "name": "vroo_thnad",
             "schema": "string"
           },
           "mapValue": {
@@ -387,13 +387,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_nu;1",
+        "@id": "dtmi:example:vroo_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_lambda;1",
+          "@id": "dtmi:example:vroo_floob;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_mu",
+            "name": "vroo_zatz",
             "schema": "string"
           },
           "mapValue": {
@@ -412,13 +412,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_pi;1",
+        "@id": "dtmi:example:vroo_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_xi;1",
+          "@id": "dtmi:example:vroo_flunn;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_omicron",
+            "name": "vroo_itch",
             "schema": "string"
           },
           "mapValue": {
@@ -438,13 +438,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_tau;1",
+        "@id": "dtmi:example:hi_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_rho;1",
+          "@id": "dtmi:example:vroo_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_sigma",
+            "name": "vroo_hi",
             "schema": "string"
           },
           "mapValue": {
@@ -463,13 +463,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_chi;1",
+        "@id": "dtmi:example:hi_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_upsilon;1",
+          "@id": "dtmi:example:hi_beta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_phi",
+            "name": "hi_gamma",
             "schema": "string"
           },
           "mapValue": {
@@ -489,13 +489,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_yuzz;1",
+        "@id": "dtmi:example:hi_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_psi;1",
+          "@id": "dtmi:example:hi_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_omega",
+            "name": "hi_zeta",
             "schema": "string"
           },
           "mapValue": {
@@ -514,13 +514,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_humpf;1",
+        "@id": "dtmi:example:hi_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_wum;1",
+          "@id": "dtmi:example:hi_theta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_um",
+            "name": "hi_iota",
             "schema": "string"
           },
           "mapValue": {
@@ -540,13 +540,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_nuh;1",
+        "@id": "dtmi:example:hi_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_fuddle;1",
+          "@id": "dtmi:example:hi_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_glikk",
+            "name": "hi_mu",
             "schema": "string"
           },
           "mapValue": {
@@ -565,13 +565,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_thnad;1",
+        "@id": "dtmi:example:hi_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_snee;1",
+          "@id": "dtmi:example:hi_xi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_quan",
+            "name": "hi_omicron",
             "schema": "string"
           },
           "mapValue": {
@@ -591,13 +591,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_zatz;1",
+        "@id": "dtmi:example:hi_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_spazz;1",
+          "@id": "dtmi:example:hi_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_floob",
+            "name": "hi_sigma",
             "schema": "string"
           },
           "mapValue": {
@@ -616,13 +616,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_itch;1",
+        "@id": "dtmi:example:hi_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_jogg;1",
+          "@id": "dtmi:example:hi_upsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_flunn",
+            "name": "hi_phi",
             "schema": "string"
           },
           "mapValue": {
diff --git a/DTDL/v2/spec/Requirement-ClassMapValuePropertyNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassMapValuePropertyNameStringLengthV2.json
index 300897a7..c5330999 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValuePropertyNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValuePropertyNameStringLengthV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_beta;1",
+        "@id": "dtmi:example:yekk_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_hi;1",
+          "@id": "dtmi:example:yekk_yuzz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_alpha",
+            "name": "yekk_wum",
             "schema": "string"
           },
           "mapValue": {
@@ -32,13 +32,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_epsilon;1",
+        "@id": "dtmi:example:yekk_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_gamma;1",
+          "@id": "dtmi:example:yekk_humpf;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_delta",
+            "name": "yekk_fuddle",
             "schema": "string"
           },
           "mapValue": {
@@ -57,13 +57,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_theta;1",
+        "@id": "dtmi:example:yekk_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_zeta;1",
+          "@id": "dtmi:example:yekk_nuh;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_eta",
+            "name": "yekk_snee",
             "schema": "string"
           },
           "mapValue": {
diff --git a/DTDL/v2/spec/Requirement-ClassMapValuePropertyNameStringV2.json b/DTDL/v2/spec/Requirement-ClassMapValuePropertyNameStringV2.json
index 72dd60c1..08886e47 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValuePropertyNameStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValuePropertyNameStringV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_chi;1",
+        "@id": "dtmi:example:itch_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_upsilon;1",
+          "@id": "dtmi:example:itch_beta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_phi",
+            "name": "itch_gamma",
             "schema": "string"
           },
           "mapValue": {
@@ -32,13 +32,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_yuzz;1",
+        "@id": "dtmi:example:itch_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_psi;1",
+          "@id": "dtmi:example:itch_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_omega",
+            "name": "itch_zeta",
             "schema": "string"
           },
           "mapValue": {
@@ -59,13 +59,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_humpf;1",
+        "@id": "dtmi:example:itch_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_wum;1",
+          "@id": "dtmi:example:itch_theta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_um",
+            "name": "itch_iota",
             "schema": "string"
           },
           "mapValue": {
@@ -87,13 +87,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_nuh;1",
+        "@id": "dtmi:example:itch_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_fuddle;1",
+          "@id": "dtmi:example:itch_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_glikk",
+            "name": "itch_mu",
             "schema": "string"
           },
           "mapValue": {
@@ -117,13 +117,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_thnad;1",
+        "@id": "dtmi:example:itch_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_snee;1",
+          "@id": "dtmi:example:itch_xi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_quan",
+            "name": "itch_omicron",
             "schema": "string"
           },
           "mapValue": {
@@ -142,13 +142,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_zatz;1",
+        "@id": "dtmi:example:itch_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_spazz;1",
+          "@id": "dtmi:example:itch_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_floob",
+            "name": "itch_sigma",
             "schema": "string"
           },
           "mapValue": {
@@ -168,13 +168,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_itch;1",
+        "@id": "dtmi:example:itch_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_jogg;1",
+          "@id": "dtmi:example:itch_upsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_flunn",
+            "name": "itch_phi",
             "schema": "string"
           },
           "mapValue": {
@@ -193,13 +193,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_hi;1",
+        "@id": "dtmi:example:itch_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_yekk;1",
+          "@id": "dtmi:example:itch_psi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_vroo",
+            "name": "itch_omega",
             "schema": "string"
           },
           "mapValue": {
@@ -219,13 +219,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_gamma;1",
+        "@id": "dtmi:example:itch_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_alpha;1",
+          "@id": "dtmi:example:itch_wum;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_beta",
+            "name": "itch_um",
             "schema": "string"
           },
           "mapValue": {
@@ -244,13 +244,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_zeta;1",
+        "@id": "dtmi:example:itch_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_delta;1",
+          "@id": "dtmi:example:itch_fuddle;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_epsilon",
+            "name": "itch_glikk",
             "schema": "string"
           },
           "mapValue": {
@@ -270,13 +270,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_iota;1",
+        "@id": "dtmi:example:itch_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_eta;1",
+          "@id": "dtmi:example:itch_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_theta",
+            "name": "itch_quan",
             "schema": "string"
           },
           "mapValue": {
@@ -297,13 +297,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_mu;1",
+        "@id": "dtmi:example:itch_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_kappa;1",
+          "@id": "dtmi:example:itch_spazz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_lambda",
+            "name": "itch_floob",
             "schema": "string"
           },
           "mapValue": {
@@ -325,13 +325,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_omicron;1",
+        "@id": "dtmi:example:itch_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_nu;1",
+          "@id": "dtmi:example:itch_jogg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_xi",
+            "name": "itch_flunn",
             "schema": "string"
           },
           "mapValue": {
@@ -352,13 +352,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_sigma;1",
+        "@id": "dtmi:example:itch_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_pi;1",
+          "@id": "dtmi:example:itch_yekk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_rho",
+            "name": "itch_vroo",
             "schema": "string"
           },
           "mapValue": {
@@ -380,13 +380,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_phi;1",
+        "@id": "dtmi:example:yekk_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_tau;1",
+          "@id": "dtmi:example:yekk_alpha;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_upsilon",
+            "name": "yekk_beta",
             "schema": "string"
           },
           "mapValue": {
@@ -407,13 +407,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_omega;1",
+        "@id": "dtmi:example:yekk_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_chi;1",
+          "@id": "dtmi:example:yekk_delta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_psi",
+            "name": "yekk_epsilon",
             "schema": "string"
           },
           "mapValue": {
@@ -435,13 +435,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_um;1",
+        "@id": "dtmi:example:yekk_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_yuzz;1",
+          "@id": "dtmi:example:yekk_eta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_wum",
+            "name": "yekk_theta",
             "schema": "string"
           },
           "mapValue": {
@@ -460,13 +460,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_glikk;1",
+        "@id": "dtmi:example:yekk_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_humpf;1",
+          "@id": "dtmi:example:yekk_kappa;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_fuddle",
+            "name": "yekk_lambda",
             "schema": "string"
           },
           "mapValue": {
@@ -486,13 +486,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_quan;1",
+        "@id": "dtmi:example:yekk_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_nuh;1",
+          "@id": "dtmi:example:yekk_nu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_snee",
+            "name": "yekk_xi",
             "schema": "string"
           },
           "mapValue": {
@@ -513,13 +513,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_floob;1",
+        "@id": "dtmi:example:yekk_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_thnad;1",
+          "@id": "dtmi:example:yekk_pi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_spazz",
+            "name": "yekk_rho",
             "schema": "string"
           },
           "mapValue": {
@@ -541,13 +541,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_flunn;1",
+        "@id": "dtmi:example:yekk_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_zatz;1",
+          "@id": "dtmi:example:yekk_tau;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_jogg",
+            "name": "yekk_upsilon",
             "schema": "string"
           },
           "mapValue": {
@@ -566,13 +566,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_vroo;1",
+        "@id": "dtmi:example:yekk_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_itch;1",
+          "@id": "dtmi:example:yekk_chi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_yekk",
+            "name": "yekk_psi",
             "schema": "string"
           },
           "mapValue": {
diff --git a/DTDL/v2/spec/Requirement-ClassMapValuePropertyNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassMapValuePropertyNameTermAndDtmiV2.json
index 1882adf0..cd31bdb6 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValuePropertyNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValuePropertyNameTermAndDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_xi;1",
+        "@id": "dtmi:example:hi_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_mu;1",
+          "@id": "dtmi:example:hi_zatz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_nu",
+            "name": "hi_jogg",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_kappa",
-            "dtmi:dtdl:property:name;2": "jogg_lambda",
+            "name": "hi_spazz",
+            "dtmi:dtdl:property:name;2": "hi_floob",
             "schema": "time"
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_tau;1",
+        "@id": "dtmi:example:alpha_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_rho;1",
+          "@id": "dtmi:example:hi_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_sigma",
+            "name": "hi_hi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "jogg_omicron",
-            "dtmi:dtdl:property:name;2": "jogg_pi",
+            "name": "hi_itch",
+            "dtmi:dtdl:property:name;2": "hi_yekk",
             "schema": "boolean"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapValuePropertySchemaElementV2.json b/DTDL/v2/spec/Requirement-ClassMapValuePropertySchemaElementV2.json
index 22556e23..8f98538a 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValuePropertySchemaElementV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValuePropertySchemaElementV2.json
@@ -7,25 +7,25 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_omega;1",
+        "@id": "dtmi:example:alpha_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "jogg_psi",
+          "name": "alpha_epsilon",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "jogg_chi",
+              "name": "alpha_delta",
               "schema": "string"
             },
             "mapValue": {
-              "name": "jogg_phi",
+              "name": "alpha_gamma",
               "schema": {
                 "@type": "Enum",
                 "enumValues": [
                   {
-                    "enumValue": 1051,
-                    "name": "jogg_upsilon"
+                    "enumValue": 1064,
+                    "name": "alpha_beta"
                   }
                 ],
                 "valueSchema": "integer"
@@ -44,26 +44,26 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_fuddle;1",
+        "@id": "dtmi:example:alpha_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "jogg_humpf",
+          "name": "alpha_kappa",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "jogg_um",
+              "name": "alpha_iota",
               "schema": "string"
             },
             "mapValue": {
-              "name": "jogg_wum",
+              "name": "alpha_theta",
               "schema": [
                 {
                   "@type": "Enum",
                   "enumValues": [
                     {
-                      "enumValue": 1052,
-                      "name": "jogg_yuzz"
+                      "enumValue": 1065,
+                      "name": "alpha_eta"
                     }
                   ],
                   "valueSchema": "integer"
@@ -83,30 +83,30 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_nuh;1",
+        "@id": "dtmi:example:alpha_nu;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 1053,
-              "name": "jogg_glikk"
+              "enumValue": 1066,
+              "name": "alpha_mu"
             }
           ],
           "valueSchema": "integer"
         },
         "contents": {
           "@type": "Property",
-          "name": "jogg_thnad",
+          "name": "alpha_pi",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "jogg_quan",
+              "name": "alpha_omicron",
               "schema": "string"
             },
             "mapValue": {
-              "name": "jogg_snee",
+              "name": "alpha_xi",
               "schema": "dtmi:ex:dependentRef;1"
             }
           }
@@ -122,30 +122,30 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_floob;1",
+        "@id": "dtmi:example:alpha_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 1054,
-              "name": "jogg_spazz"
+              "enumValue": 1067,
+              "name": "alpha_rho"
             }
           ],
           "valueSchema": "integer"
         },
         "contents": {
           "@type": "Property",
-          "name": "jogg_flunn",
+          "name": "alpha_phi",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "jogg_jogg",
+              "name": "alpha_upsilon",
               "schema": "string"
             },
             "mapValue": {
-              "name": "jogg_zatz",
+              "name": "alpha_tau",
               "schema": [
                 "dtmi:ex:dependentRef;1"
               ]
@@ -163,21 +163,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_alpha;1",
+        "@id": "dtmi:example:alpha_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "jogg_hi",
+          "name": "alpha_yuzz",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "jogg_vroo",
+              "name": "alpha_omega",
               "schema": "string"
             },
             "mapValue": {
-              "name": "jogg_yekk",
+              "name": "alpha_psi",
               "schema": {
-                "@id": "dtmi:example:jogg_itch;1",
+                "@id": "dtmi:example:alpha_chi;1",
                 "@type": "Enum",
                 "valueSchema": "integer",
                 "@context": "dtmi:dtdl:context;3"
@@ -196,22 +196,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_zeta;1",
+        "@id": "dtmi:example:alpha_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "flunn_epsilon",
+          "name": "alpha_glikk",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "flunn_delta",
+              "name": "alpha_fuddle",
               "schema": "string"
             },
             "mapValue": {
               "@context": "dtmi:undefinedExtension:context;1",
-              "name": "flunn_gamma",
+              "name": "alpha_humpf",
               "schema": {
-                "@id": "dtmi:example:flunn_beta;1",
+                "@id": "dtmi:example:alpha_um;1",
                 "@type": "Enum",
                 "valueSchema": "integer",
                 "@context": "dtmi:dtdl:context;3"
@@ -230,37 +230,104 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_iota;1",
+        "@id": "dtmi:example:alpha_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_spazz",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "alpha_thnad",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "alpha_quan",
+              "schema": {
+                "@id": "dtmi:example:alpha_snee;1",
+                "@type": "Enum",
+                "valueSchema": "integer",
+                "@context": "dtmi:dtdl:context;4"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:alpha_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_itch",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "alpha_flunn",
+              "schema": "string"
+            },
+            "mapValue": {
+              "@context": "dtmi:undefinedExtension:context;1",
+              "name": "alpha_jogg",
+              "schema": {
+                "@id": "dtmi:example:alpha_zatz;1",
+                "@type": "Enum",
+                "valueSchema": "integer",
+                "@context": "dtmi:dtdl:context;4"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:beta_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 1056,
-              "name": "flunn_theta"
+              "enumValue": 1069,
+              "name": "alpha_hi"
             }
           ],
           "valueSchema": "integer"
         },
         "contents": {
           "@type": "Property",
-          "name": "flunn_mu",
+          "name": "beta_delta",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "flunn_lambda",
+              "name": "beta_gamma",
               "schema": "string"
             },
             "mapValue": {
-              "name": "flunn_kappa",
+              "name": "beta_beta",
               "schema": [
                 {
                   "@type": "Enum",
                   "enumValues": [
                     {
-                      "enumValue": 1055,
-                      "name": "flunn_eta"
+                      "enumValue": 1068,
+                      "name": "alpha_vroo"
                     }
                   ],
                   "valueSchema": "integer"
@@ -281,38 +348,38 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_omicron;1",
+        "@id": "dtmi:example:beta_eta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 1058,
-              "name": "flunn_xi"
+              "enumValue": 1071,
+              "name": "beta_zeta"
             }
           ],
           "valueSchema": "integer"
         },
         "contents": {
           "@type": "Property",
-          "name": "flunn_sigma",
+          "name": "beta_kappa",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "flunn_rho",
+              "name": "beta_iota",
               "schema": "string"
             },
             "mapValue": {
               "@context": "dtmi:undefinedExtension:context;1",
-              "name": "flunn_pi",
+              "name": "beta_theta",
               "schema": [
                 {
                   "@type": "Enum",
                   "enumValues": [
                     {
-                      "enumValue": 1057,
-                      "name": "flunn_nu"
+                      "enumValue": 1070,
+                      "name": "beta_epsilon"
                     }
                   ],
                   "valueSchema": "integer"
@@ -333,17 +400,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_chi;1",
+        "@id": "dtmi:example:beta_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_upsilon;1",
+          "@id": "dtmi:example:beta_mu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_phi",
+            "name": "beta_nu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_tau",
+            "name": "beta_lambda",
             "schema": "integer"
           }
         }
@@ -358,17 +425,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_wum;1",
+        "@id": "dtmi:example:beta_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_omega;1",
+          "@id": "dtmi:example:beta_pi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_yuzz",
+            "name": "beta_rho",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_psi",
+            "name": "beta_omicron",
             "schema": [
               "integer"
             ]
@@ -385,17 +452,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_glikk;1",
+        "@id": "dtmi:example:beta_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_humpf;1",
+          "@id": "dtmi:example:beta_upsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_fuddle",
+            "name": "beta_phi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_um",
+            "name": "beta_tau",
             "schema": "dtmi:dtdl:instance:Schema:integer;2"
           }
         }
@@ -410,17 +477,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_thnad;1",
+        "@id": "dtmi:example:beta_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_snee;1",
+          "@id": "dtmi:example:beta_omega;1",
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_quan",
+            "name": "beta_yuzz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_nuh",
+            "name": "beta_psi",
             "schema": [
               "dtmi:dtdl:instance:Schema:integer;2"
             ]
@@ -437,17 +504,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_jogg;1",
+        "@id": "dtmi:example:beta_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_floob;1",
+          "@id": "dtmi:example:beta_humpf;1",
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_zatz",
+            "name": "beta_fuddle",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_spazz",
+            "name": "beta_um",
             "schema": "point"
           }
         }
@@ -462,17 +529,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_vroo;1",
+        "@id": "dtmi:example:beta_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_itch;1",
+          "@id": "dtmi:example:beta_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_yekk",
+            "name": "beta_quan",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_flunn",
+            "name": "beta_nuh",
             "schema": [
               "point"
             ]
@@ -489,17 +556,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_gamma;1",
+        "@id": "dtmi:example:beta_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_alpha;1",
+          "@id": "dtmi:example:beta_floob;1",
           "@type": "Map",
           "mapKey": {
-            "name": "itch_beta",
+            "name": "beta_zatz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_hi",
+            "name": "beta_spazz",
             "schema": "dtmi:standard:schema:geospatial:point;2"
           }
         }
@@ -514,17 +581,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_eta;1",
+        "@id": "dtmi:example:beta_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_epsilon;1",
+          "@id": "dtmi:example:beta_itch;1",
           "@type": "Map",
           "mapKey": {
-            "name": "itch_zeta",
+            "name": "beta_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "itch_delta",
+            "name": "beta_flunn",
             "schema": [
               "dtmi:standard:schema:geospatial:point;2"
             ]
@@ -541,17 +608,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_lambda;1",
+        "@id": "dtmi:example:gamma_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_iota;1",
+          "@id": "dtmi:example:gamma_alpha;1",
           "@type": "Map",
           "mapKey": {
-            "name": "itch_kappa",
+            "name": "gamma_beta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "itch_theta",
+            "name": "beta_hi",
             "schema": "Foobar"
           }
         }
@@ -566,18 +633,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_omicron;1",
+        "@id": "dtmi:example:gamma_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_nu;1",
+          "@id": "dtmi:example:gamma_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "itch_xi",
+            "name": "gamma_zeta",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "itch_mu",
+            "name": "gamma_delta",
             "schema": "Foobar"
           }
         }
@@ -592,17 +659,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_tau;1",
+        "@id": "dtmi:example:gamma_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_rho;1",
+          "@id": "dtmi:example:gamma_iota;1",
           "@type": "Map",
           "mapKey": {
-            "name": "itch_sigma",
+            "name": "gamma_kappa",
             "schema": "string"
           },
           "mapValue": {
-            "name": "itch_pi",
+            "name": "gamma_theta",
             "schema": null
           }
         }
@@ -617,18 +684,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_psi;1",
+        "@id": "dtmi:example:gamma_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_phi;1",
+          "@id": "dtmi:example:gamma_nu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "itch_chi",
+            "name": "gamma_xi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "itch_upsilon",
+            "name": "gamma_mu",
             "schema": null
           }
         }
@@ -643,17 +710,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_um;1",
+        "@id": "dtmi:example:gamma_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_yuzz;1",
+          "@id": "dtmi:example:gamma_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "itch_wum",
+            "name": "gamma_sigma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "itch_omega",
+            "name": "gamma_pi",
             "schema": true
           }
         }
@@ -668,18 +735,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_nuh;1",
+        "@id": "dtmi:example:gamma_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_fuddle;1",
+          "@id": "dtmi:example:gamma_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "itch_glikk",
+            "name": "gamma_chi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "itch_humpf",
+            "name": "gamma_upsilon",
             "schema": true
           }
         }
@@ -694,17 +761,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_spazz;1",
+        "@id": "dtmi:example:gamma_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_quan;1",
+          "@id": "dtmi:example:gamma_yuzz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "itch_thnad",
+            "name": "gamma_wum",
             "schema": "string"
           },
           "mapValue": {
-            "name": "itch_snee",
+            "name": "gamma_omega",
             "schema": 626
           }
         }
@@ -719,18 +786,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_flunn;1",
+        "@id": "dtmi:example:gamma_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_zatz;1",
+          "@id": "dtmi:example:gamma_fuddle;1",
           "@type": "Map",
           "mapKey": {
-            "name": "itch_jogg",
+            "name": "gamma_glikk",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "itch_floob",
+            "name": "gamma_humpf",
             "schema": 626
           }
         }
@@ -745,17 +812,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_hi;1",
+        "@id": "dtmi:example:gamma_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_yekk;1",
+          "@id": "dtmi:example:gamma_quan;1",
           "@type": "Map",
           "mapKey": {
-            "name": "itch_vroo",
+            "name": "gamma_thnad",
             "schema": "string"
           },
           "mapValue": {
-            "name": "itch_itch",
+            "name": "gamma_snee",
             "schema": [
               null
             ]
@@ -772,18 +839,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_delta;1",
+        "@id": "dtmi:example:gamma_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_beta;1",
+          "@id": "dtmi:example:gamma_zatz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yekk_gamma",
+            "name": "gamma_jogg",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yekk_alpha",
+            "name": "gamma_floob",
             "schema": [
               null
             ]
@@ -800,17 +867,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_theta;1",
+        "@id": "dtmi:example:gamma_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_zeta;1",
+          "@id": "dtmi:example:gamma_yekk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yekk_eta",
+            "name": "gamma_vroo",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yekk_epsilon",
+            "name": "gamma_itch",
             "schema": [
               true
             ]
@@ -827,18 +894,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_mu;1",
+        "@id": "dtmi:example:delta_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_kappa;1",
+          "@id": "dtmi:example:delta_beta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yekk_lambda",
+            "name": "delta_gamma",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yekk_iota",
+            "name": "delta_alpha",
             "schema": [
               true
             ]
@@ -855,17 +922,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_pi;1",
+        "@id": "dtmi:example:delta_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_xi;1",
+          "@id": "dtmi:example:delta_zeta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yekk_omicron",
+            "name": "delta_eta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yekk_nu",
+            "name": "delta_epsilon",
             "schema": [
               626
             ]
@@ -882,18 +949,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_upsilon;1",
+        "@id": "dtmi:example:delta_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_sigma;1",
+          "@id": "dtmi:example:delta_kappa;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yekk_tau",
+            "name": "delta_lambda",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yekk_rho",
+            "name": "delta_iota",
             "schema": [
               626
             ]
@@ -910,17 +977,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_omega;1",
+        "@id": "dtmi:example:delta_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_chi;1",
+          "@id": "dtmi:example:delta_xi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yekk_psi",
+            "name": "delta_omicron",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yekk_phi",
+            "name": "delta_nu",
             "schema": {}
           }
         }
@@ -935,18 +1002,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_humpf;1",
+        "@id": "dtmi:example:delta_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_wum;1",
+          "@id": "dtmi:example:delta_sigma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yekk_um",
+            "name": "delta_tau",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yekk_yuzz",
+            "name": "delta_rho",
             "schema": {}
           }
         }
@@ -961,17 +1028,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_snee;1",
+        "@id": "dtmi:example:delta_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_glikk;1",
+          "@id": "dtmi:example:delta_chi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yekk_nuh",
+            "name": "delta_psi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yekk_fuddle",
+            "name": "delta_phi",
             "schema": [
               {}
             ]
@@ -988,18 +1055,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_floob;1",
+        "@id": "dtmi:example:delta_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_thnad;1",
+          "@id": "dtmi:example:delta_wum;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yekk_spazz",
+            "name": "delta_um",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yekk_quan",
+            "name": "delta_yuzz",
             "schema": [
               {}
             ]
@@ -1016,17 +1083,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_itch;1",
+        "@id": "dtmi:example:delta_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_jogg;1",
+          "@id": "dtmi:example:delta_glikk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yekk_flunn",
+            "name": "delta_nuh",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yekk_zatz",
+            "name": "delta_fuddle",
             "schema": []
           }
         }
@@ -1041,18 +1108,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_alpha;1",
+        "@id": "dtmi:example:delta_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_vroo;1",
+          "@id": "dtmi:example:delta_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yekk_hi",
+            "name": "delta_spazz",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yekk_yekk",
+            "name": "delta_quan",
             "schema": []
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassMapValuePropertySchemaTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassMapValuePropertySchemaTermAndDtmiV2.json
index 9c2010df..ccdb512b 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValuePropertySchemaTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValuePropertySchemaTermAndDtmiV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_yuzz;1",
+        "@id": "dtmi:example:iota_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_psi;1",
+          "@id": "dtmi:example:iota_omicron;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_omega",
+            "name": "iota_pi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "gamma_chi",
+            "name": "iota_xi",
             "schema": "long",
             "dtmi:dtdl:property:schema;2": "string"
           }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_fuddle;1",
+        "@id": "dtmi:example:iota_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_um;1",
+          "@id": "dtmi:example:iota_tau;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_humpf",
+            "name": "iota_upsilon",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "gamma_wum",
+            "name": "iota_sigma",
             "schema": "time",
             "dtmi:dtdl:property:schema;2": "boolean"
           }
diff --git a/DTDL/v2/spec/Requirement-ClassMapValuePropertySchemaTypeConformanceV2.json b/DTDL/v2/spec/Requirement-ClassMapValuePropertySchemaTypeConformanceV2.json
index d4996db0..6508765d 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValuePropertySchemaTypeConformanceV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValuePropertySchemaTypeConformanceV2.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_xi;1",
+        "@id": "dtmi:example:epsilon_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_mu;1",
+          "@id": "dtmi:example:epsilon_delta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "vroo_nu",
+            "name": "epsilon_epsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "vroo_lambda",
+            "name": "epsilon_gamma",
             "schema": {
-              "@id": "dtmi:example:vroo_kappa;1",
+              "@id": "dtmi:example:epsilon_beta;1",
               "elementSchema": "date",
               "@type": "Array"
             }
@@ -36,20 +36,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_upsilon;1",
+        "@id": "dtmi:example:epsilon_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_sigma;1",
+          "@id": "dtmi:example:epsilon_kappa;1",
           "@type": "Map",
           "mapKey": {
-            "name": "vroo_tau",
+            "name": "epsilon_lambda",
             "schema": "string"
           },
           "mapValue": {
-            "name": "vroo_rho",
+            "name": "epsilon_iota",
             "schema": {
-              "@id": "dtmi:example:vroo_omicron;1",
-              "name": "vroo_pi",
+              "@id": "dtmi:example:epsilon_eta;1",
+              "name": "epsilon_theta",
               "@type": "Command"
             }
           }
@@ -65,21 +65,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_wum;1",
+        "@id": "dtmi:example:epsilon_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_omega;1",
+          "@id": "dtmi:example:epsilon_pi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "vroo_yuzz",
+            "name": "epsilon_rho",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "vroo_psi",
+            "name": "epsilon_omicron",
             "schema": {
-              "@id": "dtmi:example:vroo_phi;1",
-              "name": "vroo_chi",
+              "@id": "dtmi:example:epsilon_nu;1",
+              "name": "epsilon_xi",
               "@type": "Command"
             }
           }
@@ -95,20 +95,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_snee;1",
+        "@id": "dtmi:example:epsilon_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_glikk;1",
+          "@id": "dtmi:example:epsilon_chi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "vroo_nuh",
+            "name": "epsilon_psi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "vroo_fuddle",
+            "name": "epsilon_phi",
             "schema": {
-              "@id": "dtmi:example:vroo_um;1",
-              "name": "vroo_humpf",
+              "@id": "dtmi:example:epsilon_tau;1",
+              "name": "epsilon_upsilon",
               "schema": "dateTime",
               "@type": "CommandPayload"
             }
@@ -125,21 +125,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_jogg;1",
+        "@id": "dtmi:example:epsilon_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_floob;1",
+          "@id": "dtmi:example:epsilon_humpf;1",
           "@type": "Map",
           "mapKey": {
-            "name": "vroo_zatz",
+            "name": "epsilon_fuddle",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "vroo_spazz",
+            "name": "epsilon_um",
             "schema": {
-              "@id": "dtmi:example:vroo_quan;1",
-              "name": "vroo_thnad",
+              "@id": "dtmi:example:epsilon_yuzz;1",
+              "name": "epsilon_wum",
               "schema": "double",
               "@type": "CommandPayload"
             }
@@ -156,22 +156,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_beta;1",
+        "@id": "dtmi:example:epsilon_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_hi;1",
+          "@id": "dtmi:example:epsilon_spazz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "hi_alpha",
+            "name": "epsilon_floob",
             "schema": "string"
           },
           "mapValue": {
-            "name": "vroo_vroo",
+            "name": "epsilon_thnad",
             "schema": {
-              "@id": "dtmi:example:vroo_flunn;1",
-              "name": "vroo_itch",
+              "@id": "dtmi:example:epsilon_nuh;1",
+              "name": "epsilon_snee",
               "schema": {
-                "@id": "dtmi:example:vroo_yekk;1",
+                "@id": "dtmi:example:epsilon_quan;1",
                 "@type": "Interface"
               },
               "@type": "Component"
@@ -189,23 +189,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_iota;1",
+        "@id": "dtmi:example:zeta_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_eta;1",
+          "@id": "dtmi:example:epsilon_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "hi_theta",
+            "name": "epsilon_hi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "hi_zeta",
+            "name": "epsilon_yekk",
             "schema": {
-              "@id": "dtmi:example:hi_gamma;1",
-              "name": "hi_delta",
+              "@id": "dtmi:example:epsilon_jogg;1",
+              "name": "epsilon_flunn",
               "schema": {
-                "@id": "dtmi:example:hi_epsilon;1",
+                "@id": "dtmi:example:epsilon_itch;1",
                 "@type": "Interface"
               },
               "@type": "Component"
@@ -223,23 +223,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_omicron;1",
+        "@id": "dtmi:example:zeta_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_nu;1",
+          "@id": "dtmi:example:zeta_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "hi_xi",
+            "name": "zeta_zeta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "hi_mu",
+            "name": "zeta_delta",
             "schema": {
-              "@id": "dtmi:example:hi_kappa;1",
+              "@id": "dtmi:example:zeta_beta;1",
               "enumValues": [
                 {
-                  "enumValue": 1059,
-                  "name": "hi_lambda"
+                  "enumValue": 1072,
+                  "name": "zeta_gamma"
                 }
               ],
               "valueSchema": "integer",
@@ -258,21 +258,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_phi;1",
+        "@id": "dtmi:example:zeta_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_tau;1",
+          "@id": "dtmi:example:zeta_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "hi_upsilon",
+            "name": "zeta_mu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "hi_sigma",
+            "name": "zeta_kappa",
             "schema": {
-              "@id": "dtmi:example:hi_pi;1",
-              "enumValue": 1060,
-              "name": "hi_rho",
+              "@id": "dtmi:example:zeta_theta;1",
+              "enumValue": 1073,
+              "name": "zeta_iota",
               "@type": "EnumValue"
             }
           }
@@ -288,22 +288,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_um;1",
+        "@id": "dtmi:example:zeta_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_yuzz;1",
+          "@id": "dtmi:example:zeta_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "hi_wum",
+            "name": "zeta_sigma",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "hi_omega",
+            "name": "zeta_pi",
             "schema": {
-              "@id": "dtmi:example:hi_chi;1",
-              "enumValue": 1061,
-              "name": "hi_psi",
+              "@id": "dtmi:example:zeta_xi;1",
+              "enumValue": 1074,
+              "name": "zeta_omicron",
               "@type": "EnumValue"
             }
           }
@@ -319,20 +319,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_quan;1",
+        "@id": "dtmi:example:zeta_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_nuh;1",
+          "@id": "dtmi:example:zeta_psi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "hi_snee",
+            "name": "zeta_omega",
             "schema": "string"
           },
           "mapValue": {
-            "name": "hi_glikk",
+            "name": "zeta_chi",
             "schema": {
-              "@id": "dtmi:example:hi_humpf;1",
-              "name": "hi_fuddle",
+              "@id": "dtmi:example:zeta_upsilon;1",
+              "name": "zeta_phi",
               "schema": "duration",
               "@type": "Field"
             }
@@ -349,21 +349,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_flunn;1",
+        "@id": "dtmi:example:zeta_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_zatz;1",
+          "@id": "dtmi:example:zeta_fuddle;1",
           "@type": "Map",
           "mapKey": {
-            "name": "hi_jogg",
+            "name": "zeta_glikk",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "hi_floob",
+            "name": "zeta_humpf",
             "schema": {
-              "@id": "dtmi:example:hi_thnad;1",
-              "name": "hi_spazz",
+              "@id": "dtmi:example:zeta_wum;1",
+              "name": "zeta_um",
               "schema": "float",
               "@type": "Field"
             }
@@ -380,19 +380,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_alpha;1",
+        "@id": "dtmi:example:zeta_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_vroo;1",
+          "@id": "dtmi:example:zeta_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "hi_hi",
+            "name": "zeta_spazz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "hi_yekk",
+            "name": "zeta_quan",
             "schema": {
-              "@id": "dtmi:example:hi_itch;1",
+              "@id": "dtmi:example:zeta_snee;1",
               "@type": "Interface"
             }
           }
@@ -408,20 +408,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_zeta;1",
+        "@id": "dtmi:example:zeta_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_delta;1",
+          "@id": "dtmi:example:zeta_flunn;1",
           "@type": "Map",
           "mapKey": {
-            "name": "alpha_epsilon",
+            "name": "zeta_itch",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "alpha_gamma",
+            "name": "zeta_jogg",
             "schema": {
-              "@id": "dtmi:example:alpha_beta;1",
+              "@id": "dtmi:example:zeta_zatz;1",
               "@type": "Interface"
             }
           }
@@ -437,25 +437,25 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_nu;1",
+        "@id": "dtmi:example:eta_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_lambda;1",
+          "@id": "dtmi:example:eta_gamma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "alpha_mu",
+            "name": "eta_delta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "alpha_kappa",
+            "name": "eta_beta",
             "schema": {
-              "@id": "dtmi:example:alpha_eta;1",
+              "@id": "dtmi:example:zeta_vroo;1",
               "mapKey": {
-                "name": "alpha_theta",
+                "name": "zeta_hi",
                 "schema": "string"
               },
               "mapValue": {
-                "name": "alpha_iota",
+                "name": "eta_alpha",
                 "schema": "integer"
               },
               "@type": "Map"
@@ -473,20 +473,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_tau;1",
+        "@id": "dtmi:example:eta_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_rho;1",
+          "@id": "dtmi:example:eta_iota;1",
           "@type": "Map",
           "mapKey": {
-            "name": "alpha_sigma",
+            "name": "eta_kappa",
             "schema": "string"
           },
           "mapValue": {
-            "name": "alpha_pi",
+            "name": "eta_theta",
             "schema": {
-              "@id": "dtmi:example:alpha_xi;1",
-              "name": "alpha_omicron",
+              "@id": "dtmi:example:eta_zeta;1",
+              "name": "eta_eta",
               "schema": "string",
               "@type": "MapKey"
             }
@@ -503,21 +503,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_yuzz;1",
+        "@id": "dtmi:example:eta_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_psi;1",
+          "@id": "dtmi:example:eta_omicron;1",
           "@type": "Map",
           "mapKey": {
-            "name": "alpha_omega",
+            "name": "eta_pi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "alpha_chi",
+            "name": "eta_xi",
             "schema": {
-              "@id": "dtmi:example:alpha_upsilon;1",
-              "name": "alpha_phi",
+              "@id": "dtmi:example:eta_mu;1",
+              "name": "eta_nu",
               "schema": "string",
               "@type": "MapKey"
             }
@@ -534,20 +534,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_nuh;1",
+        "@id": "dtmi:example:eta_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_fuddle;1",
+          "@id": "dtmi:example:eta_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "alpha_glikk",
+            "name": "eta_chi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "alpha_humpf",
+            "name": "eta_upsilon",
             "schema": {
-              "@id": "dtmi:example:alpha_wum;1",
-              "name": "alpha_um",
+              "@id": "dtmi:example:eta_sigma;1",
+              "name": "eta_tau",
               "schema": "long",
               "@type": "MapValue"
             }
@@ -564,21 +564,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_zatz;1",
+        "@id": "dtmi:example:eta_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_spazz;1",
+          "@id": "dtmi:example:eta_um;1",
           "@type": "Map",
           "mapKey": {
-            "name": "alpha_floob",
+            "name": "eta_humpf",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "alpha_thnad",
+            "name": "eta_wum",
             "schema": {
-              "@id": "dtmi:example:alpha_snee;1",
-              "name": "alpha_quan",
+              "@id": "dtmi:example:eta_omega;1",
+              "name": "eta_yuzz",
               "schema": "string",
               "@type": "MapValue"
             }
@@ -595,22 +595,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_hi;1",
+        "@id": "dtmi:example:eta_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_yekk;1",
+          "@id": "dtmi:example:eta_quan;1",
           "@type": "Map",
           "mapKey": {
-            "name": "alpha_vroo",
+            "name": "eta_thnad",
             "schema": "string"
           },
           "mapValue": {
-            "name": "alpha_itch",
+            "name": "eta_snee",
             "schema": {
-              "@id": "dtmi:example:alpha_jogg;1",
+              "@id": "dtmi:example:eta_glikk;1",
               "fields": [
                 {
-                  "name": "alpha_flunn",
+                  "name": "eta_nuh",
                   "schema": "time"
                 }
               ],
@@ -629,20 +629,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_zeta;1",
+        "@id": "dtmi:example:eta_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_delta;1",
+          "@id": "dtmi:example:eta_flunn;1",
           "@type": "Map",
           "mapKey": {
-            "name": "beta_epsilon",
+            "name": "eta_itch",
             "schema": "string"
           },
           "mapValue": {
-            "name": "beta_gamma",
+            "name": "eta_jogg",
             "schema": {
-              "@id": "dtmi:example:beta_alpha;1",
-              "name": "beta_beta",
+              "@id": "dtmi:example:eta_floob;1",
+              "name": "eta_zatz",
               "schema": "boolean",
               "@type": "Property"
             }
@@ -659,21 +659,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_mu;1",
+        "@id": "dtmi:example:theta_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_kappa;1",
+          "@id": "dtmi:example:theta_beta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "beta_lambda",
+            "name": "theta_gamma",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "beta_iota",
+            "name": "theta_alpha",
             "schema": {
-              "@id": "dtmi:example:beta_eta;1",
-              "name": "beta_theta",
+              "@id": "dtmi:example:eta_vroo;1",
+              "name": "eta_hi",
               "schema": "date",
               "@type": "Property"
             }
@@ -690,20 +690,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_sigma;1",
+        "@id": "dtmi:example:theta_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_pi;1",
+          "@id": "dtmi:example:theta_theta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "beta_rho",
+            "name": "theta_iota",
             "schema": "string"
           },
           "mapValue": {
-            "name": "beta_omicron",
+            "name": "theta_eta",
             "schema": {
-              "@id": "dtmi:example:beta_nu;1",
-              "name": "beta_xi",
+              "@id": "dtmi:example:theta_epsilon;1",
+              "name": "theta_zeta",
               "@type": "Relationship"
             }
           }
@@ -719,21 +719,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_omega;1",
+        "@id": "dtmi:example:theta_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_chi;1",
+          "@id": "dtmi:example:theta_xi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "beta_psi",
+            "name": "theta_omicron",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "beta_phi",
+            "name": "theta_nu",
             "schema": {
-              "@id": "dtmi:example:beta_tau;1",
-              "name": "beta_upsilon",
+              "@id": "dtmi:example:theta_lambda;1",
+              "name": "theta_mu",
               "@type": "Relationship"
             }
           }
@@ -749,20 +749,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_glikk;1",
+        "@id": "dtmi:example:theta_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_humpf;1",
+          "@id": "dtmi:example:theta_upsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "beta_fuddle",
+            "name": "theta_phi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "beta_um",
+            "name": "theta_tau",
             "schema": {
-              "@id": "dtmi:example:beta_yuzz;1",
-              "name": "beta_wum",
+              "@id": "dtmi:example:theta_rho;1",
+              "name": "theta_sigma",
               "schema": "dateTime",
               "@type": "Telemetry"
             }
@@ -779,21 +779,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_floob;1",
+        "@id": "dtmi:example:theta_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_thnad;1",
+          "@id": "dtmi:example:theta_wum;1",
           "@type": "Map",
           "mapKey": {
-            "name": "beta_spazz",
+            "name": "theta_um",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "beta_quan",
+            "name": "theta_yuzz",
             "schema": {
-              "@id": "dtmi:example:beta_nuh;1",
-              "name": "beta_snee",
+              "@id": "dtmi:example:theta_psi;1",
+              "name": "theta_omega",
               "schema": "double",
               "@type": "Telemetry"
             }
diff --git a/DTDL/v2/spec/Requirement-ClassMapValueRequiredPropertiesV2.json b/DTDL/v2/spec/Requirement-ClassMapValueRequiredPropertiesV2.json
index 6f2117ad..e0d46c88 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValueRequiredPropertiesV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValueRequiredPropertiesV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_theta;1",
+        "@id": "dtmi:example:flunn_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_zeta;1",
+          "@id": "dtmi:example:flunn_nuh;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_eta",
+            "name": "flunn_snee",
             "schema": "string"
           },
           "mapValue": {
@@ -31,13 +31,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_lambda;1",
+        "@id": "dtmi:example:flunn_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_iota;1",
+          "@id": "dtmi:example:flunn_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_kappa",
+            "name": "flunn_spazz",
             "schema": "string"
           },
           "mapValue": {
@@ -56,17 +56,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_omicron;1",
+        "@id": "dtmi:example:flunn_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_nu;1",
+          "@id": "dtmi:example:flunn_jogg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_xi",
+            "name": "flunn_flunn",
             "schema": "string"
           },
           "mapValue": {
-            "name": "thnad_mu"
+            "name": "flunn_zatz"
           }
         }
       }
@@ -80,18 +80,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_tau;1",
+        "@id": "dtmi:example:itch_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_rho;1",
+          "@id": "dtmi:example:flunn_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_sigma",
+            "name": "flunn_hi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "thnad_pi"
+            "name": "flunn_yekk"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassMapValueTypeIncludesInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassMapValueTypeIncludesInvalidDtmiV2.json
index 411324f4..666c1d3f 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValueTypeIncludesInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValueTypeIncludesInvalidDtmiV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_glikk;1",
+        "@id": "dtmi:example:xi_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_humpf;1",
+          "@id": "dtmi:example:xi_humpf;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_fuddle",
+            "name": "xi_fuddle",
             "schema": "string"
           },
           "mapValue": {
@@ -21,8 +21,8 @@
               "MapValue",
               "dtmi:foo//bar"
             ],
-            "name": "theta_um",
-            "schema": "duration"
+            "name": "xi_um",
+            "schema": "integer"
           }
         }
       }
@@ -36,13 +36,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_thnad;1",
+        "@id": "dtmi:example:xi_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_snee;1",
+          "@id": "dtmi:example:xi_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_quan",
+            "name": "xi_quan",
             "schema": "string"
           },
           "mapValue": {
@@ -51,8 +51,8 @@
               "MapValue",
               "dtmi:foo//bar"
             ],
-            "name": "theta_nuh",
-            "schema": "float"
+            "name": "xi_nuh",
+            "schema": "long"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassMapValueTypeIncludesMaterialV2.json b/DTDL/v2/spec/Requirement-ClassMapValueTypeIncludesMaterialV2.json
index aa29e67b..3c286dc0 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValueTypeIncludesMaterialV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValueTypeIncludesMaterialV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_epsilon;1",
+        "@id": "dtmi:example:nu_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_gamma;1",
+          "@id": "dtmi:example:nu_gamma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "eta_delta",
+            "name": "nu_delta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "eta_beta",
-            "schema": "long",
+            "name": "nu_beta",
+            "schema": "time",
             "@type": "MapValue"
           }
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_iota;1",
+        "@id": "dtmi:example:nu_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_eta;1",
+          "@id": "dtmi:example:nu_eta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "eta_theta",
+            "name": "nu_theta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "eta_zeta",
-            "schema": "string",
+            "name": "nu_zeta",
+            "schema": "boolean",
             "@type": [
               "MapValue"
             ]
@@ -61,18 +61,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_nu;1",
+        "@id": "dtmi:example:nu_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_lambda;1",
+          "@id": "dtmi:example:nu_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "eta_mu",
+            "name": "nu_mu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "eta_kappa",
-            "schema": "time",
+            "name": "nu_kappa",
+            "schema": "date",
             "@type": "dtmi:dtdl:class:MapValue;2"
           }
         }
@@ -87,18 +87,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_rho;1",
+        "@id": "dtmi:example:nu_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_omicron;1",
+          "@id": "dtmi:example:nu_omicron;1",
           "@type": "Map",
           "mapKey": {
-            "name": "eta_pi",
+            "name": "nu_pi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "eta_xi",
-            "schema": "boolean",
+            "name": "nu_xi",
+            "schema": "dateTime",
             "@type": [
               "dtmi:dtdl:class:MapValue;2"
             ]
@@ -115,18 +115,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_phi;1",
+        "@id": "dtmi:example:nu_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_tau;1",
+          "@id": "dtmi:example:nu_tau;1",
           "@type": "Map",
           "mapKey": {
-            "name": "eta_upsilon",
+            "name": "nu_upsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "eta_sigma",
-            "schema": "date",
+            "name": "nu_sigma",
+            "schema": "double",
             "@type": "Something"
           }
         }
@@ -141,19 +141,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_yuzz;1",
+        "@id": "dtmi:example:nu_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_psi;1",
+          "@id": "dtmi:example:nu_psi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "eta_omega",
+            "name": "nu_omega",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "eta_chi",
-            "schema": "dateTime",
+            "name": "nu_chi",
+            "schema": "duration",
             "@type": "Something"
           }
         }
@@ -168,18 +168,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_fuddle;1",
+        "@id": "dtmi:example:nu_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_um;1",
+          "@id": "dtmi:example:nu_um;1",
           "@type": "Map",
           "mapKey": {
-            "name": "eta_humpf",
+            "name": "nu_humpf",
             "schema": "string"
           },
           "mapValue": {
-            "name": "eta_wum",
-            "schema": "double",
+            "name": "nu_wum",
+            "schema": "float",
             "@type": [
               "Something"
             ]
@@ -196,19 +196,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_quan;1",
+        "@id": "dtmi:example:nu_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_nuh;1",
+          "@id": "dtmi:example:nu_nuh;1",
           "@type": "Map",
           "mapKey": {
-            "name": "eta_snee",
+            "name": "nu_snee",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "eta_glikk",
-            "schema": "duration",
+            "name": "nu_glikk",
+            "schema": "integer",
             "@type": [
               "Something"
             ]
diff --git a/DTDL/v2/spec/Requirement-ClassMapValueTypeStringOrArrayV2.json b/DTDL/v2/spec/Requirement-ClassMapValueTypeStringOrArrayV2.json
index 3258b977..360b3b05 100644
--- a/DTDL/v2/spec/Requirement-ClassMapValueTypeStringOrArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassMapValueTypeStringOrArrayV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_um;1",
+        "@id": "dtmi:example:lambda_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_yuzz;1",
+          "@id": "dtmi:example:lambda_yuzz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_wum",
+            "name": "lambda_wum",
             "schema": "string"
           },
           "mapValue": {
-            "name": "epsilon_omega",
-            "schema": "date",
+            "name": "lambda_omega",
+            "schema": "double",
             "@type": 626
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_nuh;1",
+        "@id": "dtmi:example:lambda_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_fuddle;1",
+          "@id": "dtmi:example:lambda_fuddle;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_glikk",
+            "name": "lambda_glikk",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "epsilon_humpf",
-            "schema": "dateTime",
+            "name": "lambda_humpf",
+            "schema": "duration",
             "@type": 626
           }
         }
@@ -60,18 +60,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_spazz;1",
+        "@id": "dtmi:example:lambda_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_quan;1",
+          "@id": "dtmi:example:lambda_quan;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_thnad",
+            "name": "lambda_thnad",
             "schema": "string"
           },
           "mapValue": {
-            "name": "epsilon_snee",
-            "schema": "double",
+            "name": "lambda_snee",
+            "schema": "float",
             "@type": null
           }
         }
@@ -86,19 +86,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_flunn;1",
+        "@id": "dtmi:example:lambda_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_zatz;1",
+          "@id": "dtmi:example:lambda_zatz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_jogg",
+            "name": "lambda_jogg",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "epsilon_floob",
-            "schema": "duration",
+            "name": "lambda_floob",
+            "schema": "integer",
             "@type": null
           }
         }
@@ -113,18 +113,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_hi;1",
+        "@id": "dtmi:example:lambda_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_yekk;1",
+          "@id": "dtmi:example:lambda_yekk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_vroo",
+            "name": "lambda_vroo",
             "schema": "string"
           },
           "mapValue": {
-            "name": "epsilon_itch",
-            "schema": "float",
+            "name": "lambda_itch",
+            "schema": "long",
             "@type": true
           }
         }
@@ -139,19 +139,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_delta;1",
+        "@id": "dtmi:example:mu_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_beta;1",
+          "@id": "dtmi:example:mu_beta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_gamma",
+            "name": "mu_gamma",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_alpha",
-            "schema": "integer",
+            "name": "mu_alpha",
+            "schema": "string",
             "@type": true
           }
         }
@@ -166,18 +166,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_theta;1",
+        "@id": "dtmi:example:mu_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_zeta;1",
+          "@id": "dtmi:example:mu_zeta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_eta",
+            "name": "mu_eta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zeta_epsilon",
-            "schema": "long",
+            "name": "mu_epsilon",
+            "schema": "time",
             "@type": {}
           }
         }
@@ -192,19 +192,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_mu;1",
+        "@id": "dtmi:example:mu_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_kappa;1",
+          "@id": "dtmi:example:mu_kappa;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_lambda",
+            "name": "mu_lambda",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_iota",
-            "schema": "string",
+            "name": "mu_iota",
+            "schema": "boolean",
             "@type": {}
           }
         }
@@ -219,18 +219,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_pi;1",
+        "@id": "dtmi:example:mu_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_xi;1",
+          "@id": "dtmi:example:mu_xi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_omicron",
+            "name": "mu_omicron",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zeta_nu",
-            "schema": "time",
+            "name": "mu_nu",
+            "schema": "date",
             "@type": [
               626
             ]
@@ -247,19 +247,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_upsilon;1",
+        "@id": "dtmi:example:mu_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_sigma;1",
+          "@id": "dtmi:example:mu_sigma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_tau",
+            "name": "mu_tau",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_rho",
-            "schema": "boolean",
+            "name": "mu_rho",
+            "schema": "dateTime",
             "@type": [
               626
             ]
@@ -276,18 +276,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_omega;1",
+        "@id": "dtmi:example:mu_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_chi;1",
+          "@id": "dtmi:example:mu_chi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_psi",
+            "name": "mu_psi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zeta_phi",
-            "schema": "date",
+            "name": "mu_phi",
+            "schema": "double",
             "@type": [
               null
             ]
@@ -304,19 +304,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_humpf;1",
+        "@id": "dtmi:example:mu_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_wum;1",
+          "@id": "dtmi:example:mu_wum;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_um",
+            "name": "mu_um",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_yuzz",
-            "schema": "dateTime",
+            "name": "mu_yuzz",
+            "schema": "duration",
             "@type": [
               null
             ]
@@ -333,18 +333,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_snee;1",
+        "@id": "dtmi:example:mu_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_glikk;1",
+          "@id": "dtmi:example:mu_glikk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_nuh",
+            "name": "mu_nuh",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zeta_fuddle",
-            "schema": "double",
+            "name": "mu_fuddle",
+            "schema": "float",
             "@type": [
               true
             ]
@@ -361,19 +361,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_floob;1",
+        "@id": "dtmi:example:mu_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_thnad;1",
+          "@id": "dtmi:example:mu_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_spazz",
+            "name": "mu_spazz",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_quan",
-            "schema": "duration",
+            "name": "mu_quan",
+            "schema": "integer",
             "@type": [
               true
             ]
@@ -390,18 +390,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_itch;1",
+        "@id": "dtmi:example:mu_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_jogg;1",
+          "@id": "dtmi:example:mu_jogg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_flunn",
+            "name": "mu_flunn",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zeta_zatz",
-            "schema": "float",
+            "name": "mu_zatz",
+            "schema": "long",
             "@type": [
               {}
             ]
@@ -418,19 +418,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_alpha;1",
+        "@id": "dtmi:example:nu_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_vroo;1",
+          "@id": "dtmi:example:mu_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_hi",
+            "name": "mu_hi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_yekk",
-            "schema": "integer",
+            "name": "mu_yekk",
+            "schema": "string",
             "@type": [
               {}
             ]
diff --git a/DTDL/v2/spec/Requirement-ClassObjectContextConformsV2.json b/DTDL/v2/spec/Requirement-ClassObjectContextConformsV2.json
index 162b00bc..0c016262 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectContextConformsV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectContextConformsV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_yekk;1",
+        "@id": "dtmi:example:vroo_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "spazz_itch",
+          "name": "vroo_epsilon",
           "schema": {
             "@type": "Object",
             "fields": [
               {
-                "name": "spazz_flunn",
-                "schema": "integer"
+                "name": "vroo_delta",
+                "schema": "boolean"
               }
             ],
             "@context": "dtmi:iotcentral:context;2"
@@ -34,17 +34,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_alpha;1",
+        "@id": "dtmi:example:vroo_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "spazz_hi",
+          "name": "vroo_theta",
           "schema": {
             "@type": "Object",
             "fields": [
               {
-                "name": "spazz_vroo",
-                "schema": "long"
+                "name": "vroo_eta",
+                "schema": "date"
               }
             ],
             "@context": []
@@ -61,17 +61,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_delta;1",
+        "@id": "dtmi:example:vroo_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "floob_gamma",
+          "name": "vroo_lambda",
           "schema": {
             "@type": "Object",
             "fields": [
               {
-                "name": "floob_beta",
-                "schema": "string"
+                "name": "vroo_kappa",
+                "schema": "dateTime"
               }
             ],
             "@context": [
@@ -90,17 +90,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_eta;1",
+        "@id": "dtmi:example:vroo_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "floob_zeta",
+          "name": "vroo_xi",
           "schema": {
             "@type": "Object",
             "fields": [
               {
-                "name": "floob_epsilon",
-                "schema": "time"
+                "name": "vroo_nu",
+                "schema": "double"
               }
             ],
             "@context": null
@@ -117,17 +117,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_kappa;1",
+        "@id": "dtmi:example:vroo_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "floob_iota",
+          "name": "vroo_rho",
           "schema": {
             "@type": "Object",
             "fields": [
               {
-                "name": "floob_theta",
-                "schema": "boolean"
+                "name": "vroo_pi",
+                "schema": "duration"
               }
             ],
             "@context": 626
@@ -144,17 +144,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_nu;1",
+        "@id": "dtmi:example:vroo_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "floob_mu",
+          "name": "vroo_upsilon",
           "schema": {
             "@type": "Object",
             "fields": [
               {
-                "name": "floob_lambda",
-                "schema": "date"
+                "name": "vroo_tau",
+                "schema": "float"
               }
             ],
             "@context": true
@@ -171,17 +171,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_pi;1",
+        "@id": "dtmi:example:vroo_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "floob_omicron",
+          "name": "vroo_psi",
           "schema": {
             "@type": "Object",
             "fields": [
               {
-                "name": "floob_xi",
-                "schema": "dateTime"
+                "name": "vroo_chi",
+                "schema": "integer"
               }
             ],
             "@context": [
@@ -200,17 +200,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_tau;1",
+        "@id": "dtmi:example:vroo_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "floob_sigma",
+          "name": "vroo_wum",
           "schema": {
             "@type": "Object",
             "fields": [
               {
-                "name": "floob_rho",
-                "schema": "double"
+                "name": "vroo_yuzz",
+                "schema": "long"
               }
             ],
             "@context": [
@@ -229,17 +229,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_chi;1",
+        "@id": "dtmi:example:vroo_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "floob_phi",
+          "name": "vroo_fuddle",
           "schema": {
             "@type": "Object",
             "fields": [
               {
-                "name": "floob_upsilon",
-                "schema": "duration"
+                "name": "vroo_humpf",
+                "schema": "string"
               }
             ],
             "@context": [
@@ -258,20 +258,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_yuzz;1",
+        "@id": "dtmi:example:vroo_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "floob_omega",
+          "name": "vroo_snee",
           "schema": {
             "@type": "Object",
             "fields": [
               {
-                "name": "floob_psi",
-                "schema": "float"
+                "name": "vroo_nuh",
+                "schema": "time"
               }
             ],
-            "@context": {}
+            "@context": "dtmi:iotcentral:context"
           }
         }
       }
@@ -285,22 +285,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_humpf;1",
+        "@id": "dtmi:example:vroo_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "floob_um",
+          "name": "vroo_spazz",
           "schema": {
             "@type": "Object",
             "fields": [
               {
-                "name": "floob_wum",
-                "schema": "integer"
+                "name": "vroo_thnad",
+                "schema": "boolean"
               }
             ],
-            "@context": [
-              {}
-            ]
+            "@context": "http://iotcentral/context/2"
           }
         }
       }
@@ -314,20 +312,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_nuh;1",
+        "@id": "dtmi:example:vroo_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "floob_glikk",
+          "name": "vroo_jogg",
           "schema": {
             "@type": "Object",
             "fields": [
               {
-                "name": "floob_fuddle",
-                "schema": "long"
+                "name": "vroo_zatz",
+                "schema": "date"
               }
             ],
-            "@context": "dtmi:iotcentral:context"
+            "@context": "iotcentral;2"
           }
         }
       }
@@ -341,20 +339,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_thnad;1",
+        "@id": "dtmi:example:vroo_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "floob_quan",
+          "name": "vroo_yekk",
           "schema": {
             "@type": "Object",
             "fields": [
               {
-                "name": "floob_snee",
-                "schema": "string"
+                "name": "vroo_itch",
+                "schema": "dateTime"
               }
             ],
-            "@context": "http://iotcentral/context/2"
+            "@context": {}
           }
         }
       }
@@ -368,20 +366,82 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_zatz;1",
+        "@id": "dtmi:example:hi_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "floob_floob",
+          "name": "hi_alpha",
           "schema": {
             "@type": "Object",
             "fields": [
               {
-                "name": "floob_spazz",
-                "schema": "time"
+                "name": "vroo_hi",
+                "schema": "double"
               }
             ],
-            "@context": "iotcentral;2"
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:hi_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "hi_delta",
+          "schema": {
+            "@type": "Object",
+            "fields": [
+              {
+                "name": "hi_gamma",
+                "schema": "duration"
+              }
+            ],
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:hi_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "hi_eta",
+          "schema": {
+            "@type": "Object",
+            "fields": [
+              {
+                "name": "hi_zeta",
+                "schema": "float"
+              }
+            ],
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassObjectGraphKeywordV2.json b/DTDL/v2/spec/Requirement-ClassObjectGraphKeywordV2.json
index 26373c79..19636f54 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectGraphKeywordV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectGraphKeywordV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_omicron;1",
+        "@id": "dtmi:example:kappa_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_nu;1",
+          "@id": "dtmi:example:kappa_um;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "delta_xi",
-              "schema": "float"
+              "name": "kappa_humpf",
+              "schema": "date"
             }
           ],
           "@graph": {}
@@ -31,16 +31,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_sigma;1",
+        "@id": "dtmi:example:kappa_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_pi;1",
+          "@id": "dtmi:example:kappa_glikk;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "delta_rho",
-              "schema": "integer"
+              "name": "kappa_nuh",
+              "schema": "dateTime"
             }
           ],
           "@graph": {}
diff --git a/DTDL/v2/spec/Requirement-ClassObjectIdDuplicateV2.json b/DTDL/v2/spec/Requirement-ClassObjectIdDuplicateV2.json
index 73b01560..0cd62507 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectIdDuplicateV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectIdDuplicateV2.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_theta;1",
+        "@id": "dtmi:example:gamma_chi;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:itch_theta;1",
+          "@id": "dtmi:example:gamma_chi;1",
           "@type": "Property",
-          "name": "itch_kappa",
+          "name": "gamma_omega",
           "schema": {
-            "@id": "dtmi:example:itch_theta;1",
+            "@id": "dtmi:example:gamma_chi;1",
             "@type": "Object",
             "fields": [
               {
-                "name": "itch_iota",
-                "schema": "boolean"
+                "name": "gamma_psi",
+                "schema": "integer"
               }
             ]
           }
@@ -35,20 +35,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_lambda;1",
+        "@id": "dtmi:example:gamma_yuzz;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:itch_lambda;1",
+          "@id": "dtmi:example:gamma_yuzz;1",
           "@type": "Property",
-          "name": "itch_nu",
+          "name": "gamma_um",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "@id": "dtmi:example:itch_lambda;1",
+            "@id": "dtmi:example:gamma_yuzz;1",
             "@type": "Object",
             "fields": [
               {
-                "name": "itch_mu",
-                "schema": "date"
+                "name": "gamma_wum",
+                "schema": "long"
               }
             ]
           }
diff --git a/DTDL/v2/spec/Requirement-ClassObjectIdIsDtmiV2.json b/DTDL/v2/spec/Requirement-ClassObjectIdIsDtmiV2.json
index a9a22930..c38d7484 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectIdIsDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectIdIsDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_zeta;1",
+        "@id": "dtmi:example:hi_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;7",
           "@type": "Object",
           "fields": [
             {
-              "name": "zatz_epsilon",
-              "schema": "duration"
+              "name": "hi_tau",
+              "schema": "boolean"
             }
           ]
         }
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_theta;1",
+        "@id": "dtmi:example:hi_chi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;108675309",
           "@type": "Object",
           "fields": [
             {
-              "name": "zatz_eta",
-              "schema": "float"
+              "name": "hi_phi",
+              "schema": "date"
             }
           ]
         }
@@ -53,15 +53,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_kappa;1",
+        "@id": "dtmi:example:hi_omega;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;999999999",
           "@type": "Object",
           "fields": [
             {
-              "name": "zatz_iota",
-              "schema": "integer"
+              "name": "hi_psi",
+              "schema": "dateTime"
             }
           ]
         }
@@ -76,15 +76,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_mu;1",
+        "@id": "dtmi:example:hi_wum;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "zatz_lambda",
-              "schema": "long"
+              "name": "hi_yuzz",
+              "schema": "double"
             }
           ]
         }
@@ -99,15 +99,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_xi;1",
+        "@id": "dtmi:example:hi_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@id": null,
           "@type": "Object",
           "fields": [
             {
-              "name": "zatz_nu",
-              "schema": "string"
+              "name": "hi_um",
+              "schema": "duration"
             }
           ]
         }
@@ -122,7 +122,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_pi;1",
+        "@id": "dtmi:example:hi_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -130,8 +130,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "zatz_omicron",
-              "schema": "time"
+              "name": "hi_fuddle",
+              "schema": "float"
             }
           ]
         }
@@ -146,15 +146,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_sigma;1",
+        "@id": "dtmi:example:hi_snee;1",
         "@type": "Interface",
         "schemas": {
           "@id": 626,
           "@type": "Object",
           "fields": [
             {
-              "name": "zatz_rho",
-              "schema": "boolean"
+              "name": "hi_nuh",
+              "schema": "integer"
             }
           ]
         }
@@ -169,7 +169,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_upsilon;1",
+        "@id": "dtmi:example:hi_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -177,8 +177,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "zatz_tau",
-              "schema": "date"
+              "name": "hi_quan",
+              "schema": "long"
             }
           ]
         }
@@ -193,15 +193,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_chi;1",
+        "@id": "dtmi:example:hi_floob;1",
         "@type": "Interface",
         "schemas": {
           "@id": true,
           "@type": "Object",
           "fields": [
             {
-              "name": "zatz_phi",
-              "schema": "dateTime"
+              "name": "hi_spazz",
+              "schema": "string"
             }
           ]
         }
@@ -216,7 +216,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_omega;1",
+        "@id": "dtmi:example:hi_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -224,8 +224,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "zatz_psi",
-              "schema": "double"
+              "name": "hi_zatz",
+              "schema": "time"
             }
           ]
         }
@@ -240,7 +240,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_wum;1",
+        "@id": "dtmi:example:hi_itch;1",
         "@type": "Interface",
         "schemas": {
           "@id": {
@@ -249,8 +249,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "zatz_yuzz",
-              "schema": "duration"
+              "name": "hi_flunn",
+              "schema": "boolean"
             }
           ]
         }
@@ -265,7 +265,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_humpf;1",
+        "@id": "dtmi:example:hi_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -275,8 +275,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "zatz_um",
-              "schema": "float"
+              "name": "hi_yekk",
+              "schema": "date"
             }
           ]
         }
@@ -291,15 +291,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_glikk;1",
+        "@id": "dtmi:example:alpha_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;0",
           "@type": "Object",
           "fields": [
             {
-              "name": "zatz_fuddle",
-              "schema": "integer"
+              "name": "hi_hi",
+              "schema": "dateTime"
             }
           ]
         }
@@ -314,7 +314,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_snee;1",
+        "@id": "dtmi:example:alpha_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -322,8 +322,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "zatz_nuh",
-              "schema": "long"
+              "name": "alpha_beta",
+              "schema": "double"
             }
           ]
         }
@@ -338,15 +338,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_thnad;1",
+        "@id": "dtmi:example:alpha_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Object",
           "fields": [
             {
-              "name": "zatz_quan",
-              "schema": "string"
+              "name": "alpha_delta",
+              "schema": "duration"
             }
           ]
         }
@@ -361,7 +361,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_floob;1",
+        "@id": "dtmi:example:alpha_eta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -369,8 +369,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "zatz_spazz",
-              "schema": "time"
+              "name": "alpha_zeta",
+              "schema": "float"
             }
           ]
         }
@@ -385,15 +385,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_jogg;1",
+        "@id": "dtmi:example:alpha_iota;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Object",
           "fields": [
             {
-              "name": "zatz_zatz",
-              "schema": "boolean"
+              "name": "alpha_theta",
+              "schema": "integer"
             }
           ]
         }
@@ -408,7 +408,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_itch;1",
+        "@id": "dtmi:example:alpha_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -416,8 +416,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "zatz_flunn",
-              "schema": "date"
+              "name": "alpha_kappa",
+              "schema": "long"
             }
           ]
         }
@@ -432,15 +432,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_vroo;1",
+        "@id": "dtmi:example:alpha_nu;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;1a",
           "@type": "Object",
           "fields": [
             {
-              "name": "zatz_yekk",
-              "schema": "dateTime"
+              "name": "alpha_mu",
+              "schema": "string"
             }
           ]
         }
@@ -455,7 +455,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_alpha;1",
+        "@id": "dtmi:example:alpha_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -463,8 +463,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "zatz_hi",
-              "schema": "double"
+              "name": "alpha_xi",
+              "schema": "time"
             }
           ]
         }
@@ -479,15 +479,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_gamma;1",
+        "@id": "dtmi:example:alpha_rho;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Object",
           "fields": [
             {
-              "name": "jogg_beta",
-              "schema": "duration"
+              "name": "alpha_pi",
+              "schema": "boolean"
             }
           ]
         }
@@ -502,7 +502,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_epsilon;1",
+        "@id": "dtmi:example:alpha_tau;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -510,8 +510,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "jogg_delta",
-              "schema": "float"
+              "name": "alpha_sigma",
+              "schema": "date"
             }
           ]
         }
@@ -526,15 +526,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_eta;1",
+        "@id": "dtmi:example:alpha_phi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Object",
           "fields": [
             {
-              "name": "jogg_zeta",
-              "schema": "integer"
+              "name": "alpha_upsilon",
+              "schema": "dateTime"
             }
           ]
         }
@@ -549,7 +549,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_iota;1",
+        "@id": "dtmi:example:alpha_psi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -557,8 +557,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "jogg_theta",
-              "schema": "long"
+              "name": "alpha_chi",
+              "schema": "double"
             }
           ]
         }
@@ -573,15 +573,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_lambda;1",
+        "@id": "dtmi:example:alpha_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Object",
           "fields": [
             {
-              "name": "jogg_kappa",
-              "schema": "string"
+              "name": "alpha_omega",
+              "schema": "duration"
             }
           ]
         }
@@ -596,7 +596,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_nu;1",
+        "@id": "dtmi:example:alpha_um;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -604,8 +604,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "jogg_mu",
-              "schema": "time"
+              "name": "alpha_wum",
+              "schema": "float"
             }
           ]
         }
@@ -620,15 +620,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_omicron;1",
+        "@id": "dtmi:example:alpha_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Object",
           "fields": [
             {
-              "name": "jogg_xi",
-              "schema": "boolean"
+              "name": "alpha_humpf",
+              "schema": "integer"
             }
           ]
         }
@@ -643,7 +643,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_rho;1",
+        "@id": "dtmi:example:alpha_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -651,8 +651,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "jogg_pi",
-              "schema": "date"
+              "name": "alpha_glikk",
+              "schema": "long"
             }
           ]
         }
@@ -667,15 +667,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_tau;1",
+        "@id": "dtmi:example:alpha_quan;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;01",
           "@type": "Object",
           "fields": [
             {
-              "name": "jogg_sigma",
-              "schema": "dateTime"
+              "name": "alpha_snee",
+              "schema": "string"
             }
           ]
         }
@@ -690,7 +690,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_phi;1",
+        "@id": "dtmi:example:alpha_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -698,8 +698,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "jogg_upsilon",
-              "schema": "double"
+              "name": "alpha_thnad",
+              "schema": "time"
             }
           ]
         }
@@ -714,15 +714,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_psi;1",
+        "@id": "dtmi:example:alpha_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;",
           "@type": "Object",
           "fields": [
             {
-              "name": "jogg_chi",
-              "schema": "duration"
+              "name": "alpha_floob",
+              "schema": "boolean"
             }
           ]
         }
@@ -737,7 +737,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_yuzz;1",
+        "@id": "dtmi:example:alpha_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -745,8 +745,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "jogg_omega",
-              "schema": "float"
+              "name": "alpha_jogg",
+              "schema": "date"
             }
           ]
         }
@@ -761,15 +761,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_um;1",
+        "@id": "dtmi:example:alpha_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "jogg_wum",
-              "schema": "integer"
+              "name": "alpha_itch",
+              "schema": "dateTime"
             }
           ]
         }
@@ -784,7 +784,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_fuddle;1",
+        "@id": "dtmi:example:alpha_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -792,8 +792,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "jogg_humpf",
-              "schema": "long"
+              "name": "alpha_vroo",
+              "schema": "double"
             }
           ]
         }
@@ -808,15 +808,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_nuh;1",
+        "@id": "dtmi:example:beta_beta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "jogg_glikk",
-              "schema": "string"
+              "name": "beta_alpha",
+              "schema": "duration"
             }
           ]
         }
@@ -831,7 +831,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_quan;1",
+        "@id": "dtmi:example:beta_delta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -839,8 +839,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "jogg_snee",
-              "schema": "time"
+              "name": "beta_gamma",
+              "schema": "float"
             }
           ]
         }
@@ -855,15 +855,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_spazz;1",
+        "@id": "dtmi:example:beta_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:test:1seg;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "jogg_thnad",
-              "schema": "boolean"
+              "name": "beta_epsilon",
+              "schema": "integer"
             }
           ]
         }
@@ -878,7 +878,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_zatz;1",
+        "@id": "dtmi:example:beta_theta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -886,8 +886,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "jogg_floob",
-              "schema": "date"
+              "name": "beta_eta",
+              "schema": "long"
             }
           ]
         }
@@ -902,15 +902,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_flunn;1",
+        "@id": "dtmi:example:beta_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "jogg_jogg",
-              "schema": "dateTime"
+              "name": "beta_iota",
+              "schema": "string"
             }
           ]
         }
@@ -925,7 +925,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_yekk;1",
+        "@id": "dtmi:example:beta_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -933,8 +933,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "jogg_itch",
-              "schema": "double"
+              "name": "beta_lambda",
+              "schema": "time"
             }
           ]
         }
@@ -949,15 +949,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_hi;1",
+        "@id": "dtmi:example:beta_xi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo::bar;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "jogg_vroo",
-              "schema": "duration"
+              "name": "beta_nu",
+              "schema": "boolean"
             }
           ]
         }
@@ -972,7 +972,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_beta;1",
+        "@id": "dtmi:example:beta_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -980,8 +980,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "flunn_alpha",
-              "schema": "float"
+              "name": "beta_omicron",
+              "schema": "date"
             }
           ]
         }
@@ -996,15 +996,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_delta;1",
+        "@id": "dtmi:example:beta_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@id": "urn:foo:bar:1",
           "@type": "Object",
           "fields": [
             {
-              "name": "flunn_gamma",
-              "schema": "integer"
+              "name": "beta_rho",
+              "schema": "dateTime"
             }
           ]
         }
@@ -1019,7 +1019,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_zeta;1",
+        "@id": "dtmi:example:beta_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1027,8 +1027,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "flunn_epsilon",
-              "schema": "long"
+              "name": "beta_tau",
+              "schema": "double"
             }
           ]
         }
@@ -1043,15 +1043,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_theta;1",
+        "@id": "dtmi:example:beta_chi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "http://foo/bar/baz",
           "@type": "Object",
           "fields": [
             {
-              "name": "flunn_eta",
-              "schema": "string"
+              "name": "beta_phi",
+              "schema": "duration"
             }
           ]
         }
@@ -1066,7 +1066,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_kappa;1",
+        "@id": "dtmi:example:beta_omega;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1074,8 +1074,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "flunn_iota",
-              "schema": "time"
+              "name": "beta_psi",
+              "schema": "float"
             }
           ]
         }
@@ -1090,15 +1090,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_mu;1",
+        "@id": "dtmi:example:beta_wum;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "flunn_lambda",
-              "schema": "boolean"
+              "name": "beta_yuzz",
+              "schema": "integer"
             }
           ]
         }
@@ -1113,7 +1113,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_xi;1",
+        "@id": "dtmi:example:beta_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1121,8 +1121,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "flunn_nu",
-              "schema": "date"
+              "name": "beta_um",
+              "schema": "long"
             }
           ]
         }
@@ -1137,15 +1137,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_pi;1",
+        "@id": "dtmi:example:beta_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar",
           "@type": "Object",
           "fields": [
             {
-              "name": "flunn_omicron",
-              "schema": "dateTime"
+              "name": "beta_fuddle",
+              "schema": "string"
             }
           ]
         }
@@ -1160,7 +1160,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_sigma;1",
+        "@id": "dtmi:example:beta_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1168,8 +1168,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "flunn_rho",
-              "schema": "double"
+              "name": "beta_nuh",
+              "schema": "time"
             }
           ]
         }
@@ -1184,15 +1184,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_upsilon;1",
+        "@id": "dtmi:example:beta_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.14",
           "@type": "Object",
           "fields": [
             {
-              "name": "flunn_tau",
-              "schema": "duration"
+              "name": "beta_quan",
+              "schema": "boolean"
             }
           ]
         }
@@ -1207,7 +1207,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_chi;1",
+        "@id": "dtmi:example:beta_floob;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1215,8 +1215,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "flunn_phi",
-              "schema": "float"
+              "name": "beta_spazz",
+              "schema": "date"
             }
           ]
         }
@@ -1231,15 +1231,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_omega;1",
+        "@id": "dtmi:example:beta_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.141592",
           "@type": "Object",
           "fields": [
             {
-              "name": "flunn_psi",
-              "schema": "integer"
+              "name": "beta_zatz",
+              "schema": "dateTime"
             }
           ]
         }
@@ -1254,7 +1254,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_wum;1",
+        "@id": "dtmi:example:beta_itch;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1262,8 +1262,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "flunn_yuzz",
-              "schema": "long"
+              "name": "beta_flunn",
+              "schema": "double"
             }
           ]
         }
@@ -1278,15 +1278,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_humpf;1",
+        "@id": "dtmi:example:beta_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:dtdl:example;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "flunn_um",
-              "schema": "string"
+              "name": "beta_yekk",
+              "schema": "duration"
             }
           ]
         }
@@ -1301,7 +1301,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_glikk;1",
+        "@id": "dtmi:example:gamma_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1309,8 +1309,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "flunn_fuddle",
-              "schema": "time"
+              "name": "beta_hi",
+              "schema": "float"
             }
           ]
         }
@@ -1325,15 +1325,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_snee;1",
+        "@id": "dtmi:example:gamma_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:standard:example;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "flunn_nuh",
-              "schema": "boolean"
+              "name": "gamma_beta",
+              "schema": "integer"
             }
           ]
         }
@@ -1348,7 +1348,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_thnad;1",
+        "@id": "dtmi:example:gamma_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1356,8 +1356,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "flunn_quan",
-              "schema": "date"
+              "name": "gamma_delta",
+              "schema": "long"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Requirement-ClassObjectIdNotArrayV2.json b/DTDL/v2/spec/Requirement-ClassObjectIdNotArrayV2.json
index 46788402..200442d6 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectIdNotArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectIdNotArrayV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_floob;1",
+        "@id": "dtmi:example:gamma_eta;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -16,8 +16,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "flunn_spazz",
-              "schema": "dateTime"
+              "name": "gamma_zeta",
+              "schema": "string"
             }
           ]
         }
@@ -32,7 +32,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_jogg;1",
+        "@id": "dtmi:example:gamma_iota;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -42,8 +42,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "flunn_zatz",
-              "schema": "double"
+              "name": "gamma_theta",
+              "schema": "time"
             }
           ]
         }
@@ -58,7 +58,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_itch;1",
+        "@id": "dtmi:example:gamma_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -67,8 +67,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "flunn_flunn",
-              "schema": "duration"
+              "name": "gamma_kappa",
+              "schema": "boolean"
             }
           ]
         }
@@ -83,7 +83,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_vroo;1",
+        "@id": "dtmi:example:gamma_nu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -93,8 +93,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "flunn_yekk",
-              "schema": "float"
+              "name": "gamma_mu",
+              "schema": "date"
             }
           ]
         }
@@ -109,7 +109,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_alpha;1",
+        "@id": "dtmi:example:gamma_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -118,8 +118,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "flunn_hi",
-              "schema": "integer"
+              "name": "gamma_xi",
+              "schema": "dateTime"
             }
           ]
         }
@@ -134,7 +134,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_gamma;1",
+        "@id": "dtmi:example:gamma_rho;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -144,8 +144,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "itch_beta",
-              "schema": "long"
+              "name": "gamma_pi",
+              "schema": "double"
             }
           ]
         }
@@ -160,7 +160,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_epsilon;1",
+        "@id": "dtmi:example:gamma_tau;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -169,8 +169,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "itch_delta",
-              "schema": "string"
+              "name": "gamma_sigma",
+              "schema": "duration"
             }
           ]
         }
@@ -185,7 +185,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_eta;1",
+        "@id": "dtmi:example:gamma_phi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -195,8 +195,8 @@
           "@type": "Object",
           "fields": [
             {
-              "name": "itch_zeta",
-              "schema": "time"
+              "name": "gamma_upsilon",
+              "schema": "float"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Requirement-ClassObjectIdRequiredV2.json b/DTDL/v2/spec/Requirement-ClassObjectIdRequiredV2.json
index 83ae34bb..df052f3f 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectIdRequiredV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectIdRequiredV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_itch;1",
+        "@id": "dtmi:example:hi_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "floob_flunn",
+          "name": "hi_kappa",
           "schema": {
             "@type": "Object",
             "fields": [
               {
-                "name": "floob_jogg",
-                "schema": "boolean"
+                "name": "hi_iota",
+                "schema": "integer"
               }
             ]
           }
@@ -33,15 +33,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_hi;1",
+        "@id": "dtmi:example:hi_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_yekk;1",
+          "@id": "dtmi:example:hi_mu;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "floob_vroo",
-              "schema": "date"
+              "name": "hi_nu",
+              "schema": "long"
             }
           ]
         }
@@ -56,14 +56,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_beta;1",
+        "@id": "dtmi:example:hi_pi;1",
         "@type": "Interface",
         "schemas": {
           "@type": "Object",
           "fields": [
             {
-              "name": "zatz_alpha",
-              "schema": "dateTime"
+              "name": "hi_omicron",
+              "schema": "string"
             }
           ]
         }
@@ -78,15 +78,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_delta;1",
+        "@id": "dtmi:example:hi_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "zatz_gamma",
-              "schema": "double"
+              "name": "hi_rho",
+              "schema": "time"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Requirement-ClassObjectPropertiesElementSchemaSchemaMaxDepthV2.json b/DTDL/v2/spec/Requirement-ClassObjectPropertiesElementSchemaSchemaMaxDepthV2.json
index c1f56780..c9ce5daf 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectPropertiesElementSchemaSchemaMaxDepthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectPropertiesElementSchemaSchemaMaxDepthV2.json
@@ -7,32 +7,32 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_itch;1",
+        "@id": "dtmi:example:nuh_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_flunn",
+          "name": "nuh_yuzz",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "psi_jogg",
+              "name": "nuh_omega",
               "schema": {
                 "@type": "Object",
                 "fields": {
-                  "name": "psi_zatz",
+                  "name": "nuh_psi",
                   "schema": {
                     "@type": "Object",
                     "fields": {
-                      "name": "psi_floob",
+                      "name": "nuh_chi",
                       "schema": {
                         "@type": "Object",
                         "fields": {
-                          "name": "psi_spazz",
+                          "name": "nuh_phi",
                           "schema": {
                             "@type": "Object",
                             "fields": [
                               {
-                                "name": "psi_thnad",
+                                "name": "nuh_upsilon",
                                 "schema": "integer"
                               }
                             ]
@@ -57,36 +57,36 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_epsilon;1",
+        "@id": "dtmi:example:nuh_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_delta",
+          "name": "nuh_quan",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "omega_gamma",
+              "name": "nuh_snee",
               "schema": {
                 "@type": "Object",
                 "fields": {
-                  "name": "omega_beta",
+                  "name": "nuh_nuh",
                   "schema": {
                     "@type": "Object",
                     "fields": {
-                      "name": "omega_alpha",
+                      "name": "nuh_glikk",
                       "schema": {
                         "@type": "Object",
                         "fields": {
-                          "name": "psi_hi",
+                          "name": "nuh_fuddle",
                           "schema": {
                             "@type": "Object",
                             "fields": {
-                              "name": "psi_vroo",
+                              "name": "nuh_humpf",
                               "schema": {
                                 "@type": "Object",
                                 "fields": [
                                   {
-                                    "name": "psi_yekk",
+                                    "name": "nuh_um",
                                     "schema": "long"
                                   }
                                 ]
@@ -113,37 +113,37 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_nu;1",
+        "@id": "dtmi:example:nuh_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_mu",
+          "name": "nuh_yekk",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Object",
             "fields": {
-              "name": "omega_lambda",
+              "name": "nuh_itch",
               "schema": {
                 "@type": "Object",
                 "fields": {
-                  "name": "omega_kappa",
+                  "name": "nuh_flunn",
                   "schema": {
                     "@type": "Object",
                     "fields": {
-                      "name": "omega_iota",
+                      "name": "nuh_jogg",
                       "schema": {
                         "@type": "Object",
                         "fields": {
-                          "name": "omega_theta",
+                          "name": "nuh_zatz",
                           "schema": {
                             "@type": "Object",
                             "fields": {
-                              "name": "omega_eta",
+                              "name": "nuh_floob",
                               "schema": {
                                 "@type": "Object",
                                 "fields": [
                                   {
-                                    "name": "omega_zeta",
+                                    "name": "nuh_spazz",
                                     "schema": "string"
                                   }
                                 ]
diff --git a/DTDL/v2/spec/Requirement-ClassObjectPropertiesElementSchemaSchemaSelfReferenceV2.json b/DTDL/v2/spec/Requirement-ClassObjectPropertiesElementSchemaSchemaSelfReferenceV2.json
new file mode 100644
index 00000000..c30a9f3f
--- /dev/null
+++ b/DTDL/v2/spec/Requirement-ClassObjectPropertiesElementSchemaSchemaSelfReferenceV2.json
@@ -0,0 +1,53 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:snee_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "snee_alpha",
+          "schema": {
+            "@id": "dtmi:foo:beta_psi;1",
+            "@type": "Object",
+            "fields": {
+              "name": "nuh_hi",
+              "schema": "dtmi:foo:beta_psi;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:snee_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "snee_delta",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:beta_psi;1",
+            "@type": "Object",
+            "fields": {
+              "name": "snee_gamma",
+              "schema": "dtmi:foo:beta_psi;1"
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v2/spec/Requirement-ClassObjectPropertyCommentStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassObjectPropertyCommentStringLengthV2.json
index c31c02fc..6837b3b6 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectPropertyCommentStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectPropertyCommentStringLengthV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_floob;1",
+        "@id": "dtmi:example:epsilon_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_thnad;1",
+          "@id": "dtmi:example:epsilon_epsilon;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "yekk_spazz",
-              "schema": "double"
+              "name": "epsilon_zeta",
+              "schema": "time"
             }
           ],
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
@@ -31,15 +31,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_flunn;1",
+        "@id": "dtmi:example:epsilon_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_zatz;1",
+          "@id": "dtmi:example:epsilon_theta;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "yekk_jogg",
-              "schema": "duration"
+              "name": "epsilon_iota",
+              "schema": "boolean"
             }
           ],
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
@@ -55,16 +55,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_vroo;1",
+        "@id": "dtmi:example:epsilon_nu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yekk_itch;1",
+          "@id": "dtmi:example:epsilon_lambda;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "yekk_yekk",
-              "schema": "float"
+              "name": "epsilon_mu",
+              "schema": "date"
             }
           ],
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
diff --git a/DTDL/v2/spec/Requirement-ClassObjectPropertyCommentStringV2.json b/DTDL/v2/spec/Requirement-ClassObjectPropertyCommentStringV2.json
index e49ee3ba..9059b7b9 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectPropertyCommentStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectPropertyCommentStringV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_pi;1",
+        "@id": "dtmi:example:gamma_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_xi;1",
+          "@id": "dtmi:example:gamma_humpf;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "itch_omicron",
-              "schema": "dateTime"
+              "name": "gamma_fuddle",
+              "schema": "string"
             }
           ],
           "comment": "hello"
@@ -31,15 +31,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_tau;1",
+        "@id": "dtmi:example:gamma_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_rho;1",
+          "@id": "dtmi:example:gamma_nuh;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "itch_sigma",
-              "schema": "double"
+              "name": "gamma_snee",
+              "schema": "time"
             }
           ],
           "comment": [
@@ -57,15 +57,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_chi;1",
+        "@id": "dtmi:example:gamma_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_upsilon;1",
+          "@id": "dtmi:example:gamma_thnad;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "itch_phi",
-              "schema": "duration"
+              "name": "gamma_spazz",
+              "schema": "boolean"
             }
           ],
           "comment": {
@@ -84,15 +84,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_yuzz;1",
+        "@id": "dtmi:example:gamma_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_psi;1",
+          "@id": "dtmi:example:gamma_zatz;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "itch_omega",
-              "schema": "float"
+              "name": "gamma_jogg",
+              "schema": "date"
             }
           ],
           "comment": [
@@ -113,15 +113,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_humpf;1",
+        "@id": "dtmi:example:gamma_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_wum;1",
+          "@id": "dtmi:example:gamma_itch;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "itch_um",
-              "schema": "integer"
+              "name": "gamma_yekk",
+              "schema": "dateTime"
             }
           ],
           "comment": []
@@ -137,15 +137,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_nuh;1",
+        "@id": "dtmi:example:delta_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_fuddle;1",
+          "@id": "dtmi:example:gamma_hi;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "itch_glikk",
-              "schema": "long"
+              "name": "delta_alpha",
+              "schema": "double"
             }
           ],
           "comment": null
@@ -161,16 +161,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_thnad;1",
+        "@id": "dtmi:example:delta_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:itch_snee;1",
+          "@id": "dtmi:example:delta_gamma;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "itch_quan",
-              "schema": "string"
+              "name": "delta_delta",
+              "schema": "duration"
             }
           ],
           "comment": null
@@ -186,15 +186,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_zatz;1",
+        "@id": "dtmi:example:delta_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_spazz;1",
+          "@id": "dtmi:example:delta_zeta;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "itch_floob",
-              "schema": "time"
+              "name": "delta_eta",
+              "schema": "float"
             }
           ],
           "comment": true
@@ -210,16 +210,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_itch;1",
+        "@id": "dtmi:example:delta_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:itch_jogg;1",
+          "@id": "dtmi:example:delta_iota;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "itch_flunn",
-              "schema": "boolean"
+              "name": "delta_kappa",
+              "schema": "integer"
             }
           ],
           "comment": true
@@ -235,15 +235,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_hi;1",
+        "@id": "dtmi:example:delta_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_yekk;1",
+          "@id": "dtmi:example:delta_mu;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "itch_vroo",
-              "schema": "date"
+              "name": "delta_nu",
+              "schema": "long"
             }
           ],
           "comment": 626
@@ -259,16 +259,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_gamma;1",
+        "@id": "dtmi:example:delta_rho;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yekk_alpha;1",
+          "@id": "dtmi:example:delta_omicron;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "yekk_beta",
-              "schema": "dateTime"
+              "name": "delta_pi",
+              "schema": "string"
             }
           ],
           "comment": 626
@@ -284,15 +284,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_zeta;1",
+        "@id": "dtmi:example:delta_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_delta;1",
+          "@id": "dtmi:example:delta_sigma;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "yekk_epsilon",
-              "schema": "double"
+              "name": "delta_tau",
+              "schema": "time"
             }
           ],
           "comment": [
@@ -310,16 +310,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_iota;1",
+        "@id": "dtmi:example:delta_psi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yekk_eta;1",
+          "@id": "dtmi:example:delta_phi;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "yekk_theta",
-              "schema": "duration"
+              "name": "delta_chi",
+              "schema": "boolean"
             }
           ],
           "comment": [
@@ -337,15 +337,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_mu;1",
+        "@id": "dtmi:example:delta_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_kappa;1",
+          "@id": "dtmi:example:delta_omega;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "yekk_lambda",
-              "schema": "float"
+              "name": "delta_yuzz",
+              "schema": "date"
             }
           ],
           "comment": [
@@ -363,16 +363,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_omicron;1",
+        "@id": "dtmi:example:delta_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yekk_nu;1",
+          "@id": "dtmi:example:delta_um;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "yekk_xi",
-              "schema": "integer"
+              "name": "delta_humpf",
+              "schema": "dateTime"
             }
           ],
           "comment": [
@@ -390,15 +390,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_sigma;1",
+        "@id": "dtmi:example:delta_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_pi;1",
+          "@id": "dtmi:example:delta_glikk;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "yekk_rho",
-              "schema": "long"
+              "name": "delta_nuh",
+              "schema": "double"
             }
           ],
           "comment": [
@@ -416,16 +416,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_phi;1",
+        "@id": "dtmi:example:delta_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yekk_tau;1",
+          "@id": "dtmi:example:delta_quan;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "yekk_upsilon",
-              "schema": "string"
+              "name": "delta_thnad",
+              "schema": "duration"
             }
           ],
           "comment": [
@@ -443,15 +443,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_omega;1",
+        "@id": "dtmi:example:delta_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_chi;1",
+          "@id": "dtmi:example:delta_floob;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "yekk_psi",
-              "schema": "time"
+              "name": "delta_zatz",
+              "schema": "float"
             }
           ],
           "comment": {}
@@ -467,16 +467,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_um;1",
+        "@id": "dtmi:example:delta_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yekk_yuzz;1",
+          "@id": "dtmi:example:delta_flunn;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "yekk_wum",
-              "schema": "boolean"
+              "name": "delta_itch",
+              "schema": "integer"
             }
           ],
           "comment": {}
@@ -492,15 +492,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_glikk;1",
+        "@id": "dtmi:example:epsilon_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_humpf;1",
+          "@id": "dtmi:example:delta_vroo;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "yekk_fuddle",
-              "schema": "date"
+              "name": "delta_hi",
+              "schema": "long"
             }
           ],
           "comment": [
@@ -518,16 +518,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_quan;1",
+        "@id": "dtmi:example:epsilon_delta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yekk_nuh;1",
+          "@id": "dtmi:example:epsilon_beta;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "yekk_snee",
-              "schema": "dateTime"
+              "name": "epsilon_gamma",
+              "schema": "string"
             }
           ],
           "comment": [
diff --git a/DTDL/v2/spec/Requirement-ClassObjectPropertyCommentTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassObjectPropertyCommentTermAndDtmiV2.json
index 085c0d7c..c14d4793 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectPropertyCommentTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectPropertyCommentTermAndDtmiV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_pi;1",
+        "@id": "dtmi:example:epsilon_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_mu;1",
+          "@id": "dtmi:example:epsilon_wum;1",
           "@type": "Object",
-          "comment": "vroo_nu",
-          "dtmi:dtdl:property:comment;2": "vroo_xi",
+          "comment": "epsilon_um",
+          "dtmi:dtdl:property:comment;2": "epsilon_humpf",
           "fields": [
             {
-              "name": "vroo_omicron",
-              "schema": "time"
+              "name": "epsilon_fuddle",
+              "schema": "float"
             }
           ]
         }
@@ -32,18 +32,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_phi;1",
+        "@id": "dtmi:example:epsilon_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:vroo_rho;1",
+          "@id": "dtmi:example:epsilon_nuh;1",
           "@type": "Object",
-          "comment": "vroo_sigma",
-          "dtmi:dtdl:property:comment;2": "vroo_tau",
+          "comment": "epsilon_snee",
+          "dtmi:dtdl:property:comment;2": "epsilon_quan",
           "fields": [
             {
-              "name": "vroo_upsilon",
-              "schema": "boolean"
+              "name": "epsilon_thnad",
+              "schema": "integer"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Requirement-ClassObjectPropertyDescriptionLangStringV2.json b/DTDL/v2/spec/Requirement-ClassObjectPropertyDescriptionLangStringV2.json
index fe633ce3..f833a52f 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectPropertyDescriptionLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectPropertyDescriptionLangStringV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_omega;1",
+        "@id": "dtmi:example:epsilon_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_chi;1",
+          "@id": "dtmi:example:epsilon_floob;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "vroo_psi",
-              "schema": "date"
+              "name": "epsilon_zatz",
+              "schema": "long"
             }
           ],
           "description": "hello"
@@ -31,15 +31,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_um;1",
+        "@id": "dtmi:example:epsilon_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_yuzz;1",
+          "@id": "dtmi:example:epsilon_flunn;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "vroo_wum",
-              "schema": "dateTime"
+              "name": "epsilon_itch",
+              "schema": "string"
             }
           ],
           "description": [
@@ -57,15 +57,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_glikk;1",
+        "@id": "dtmi:example:zeta_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_humpf;1",
+          "@id": "dtmi:example:epsilon_vroo;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "vroo_fuddle",
-              "schema": "double"
+              "name": "epsilon_hi",
+              "schema": "time"
             }
           ],
           "description": {
@@ -83,15 +83,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_quan;1",
+        "@id": "dtmi:example:zeta_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_nuh;1",
+          "@id": "dtmi:example:zeta_beta;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "vroo_snee",
-              "schema": "duration"
+              "name": "zeta_gamma",
+              "schema": "boolean"
             }
           ],
           "description": [
@@ -112,15 +112,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_floob;1",
+        "@id": "dtmi:example:zeta_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_thnad;1",
+          "@id": "dtmi:example:zeta_epsilon;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "vroo_spazz",
-              "schema": "float"
+              "name": "zeta_zeta",
+              "schema": "date"
             }
           ],
           "description": {}
@@ -136,15 +136,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_flunn;1",
+        "@id": "dtmi:example:zeta_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_zatz;1",
+          "@id": "dtmi:example:zeta_theta;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "vroo_jogg",
-              "schema": "integer"
+              "name": "zeta_iota",
+              "schema": "dateTime"
             }
           ],
           "description": []
@@ -160,15 +160,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_vroo;1",
+        "@id": "dtmi:example:zeta_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_itch;1",
+          "@id": "dtmi:example:zeta_lambda;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "vroo_yekk",
-              "schema": "long"
+              "name": "zeta_mu",
+              "schema": "double"
             }
           ],
           "description": null
@@ -184,16 +184,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_beta;1",
+        "@id": "dtmi:example:zeta_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:vroo_hi;1",
+          "@id": "dtmi:example:zeta_xi;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "hi_alpha",
-              "schema": "string"
+              "name": "zeta_omicron",
+              "schema": "duration"
             }
           ],
           "description": null
@@ -209,15 +209,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_epsilon;1",
+        "@id": "dtmi:example:zeta_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_gamma;1",
+          "@id": "dtmi:example:zeta_rho;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "hi_delta",
-              "schema": "time"
+              "name": "zeta_sigma",
+              "schema": "float"
             }
           ],
           "description": true
@@ -233,16 +233,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_theta;1",
+        "@id": "dtmi:example:zeta_chi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:hi_zeta;1",
+          "@id": "dtmi:example:zeta_upsilon;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "hi_eta",
-              "schema": "boolean"
+              "name": "zeta_phi",
+              "schema": "integer"
             }
           ],
           "description": true
@@ -258,15 +258,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_lambda;1",
+        "@id": "dtmi:example:zeta_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_iota;1",
+          "@id": "dtmi:example:zeta_psi;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "hi_kappa",
-              "schema": "date"
+              "name": "zeta_omega",
+              "schema": "long"
             }
           ],
           "description": 626
@@ -282,16 +282,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_xi;1",
+        "@id": "dtmi:example:zeta_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:hi_mu;1",
+          "@id": "dtmi:example:zeta_wum;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "hi_nu",
-              "schema": "dateTime"
+              "name": "zeta_um",
+              "schema": "string"
             }
           ],
           "description": 626
@@ -307,15 +307,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_rho;1",
+        "@id": "dtmi:example:zeta_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_omicron;1",
+          "@id": "dtmi:example:zeta_fuddle;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "hi_pi",
-              "schema": "double"
+              "name": "zeta_glikk",
+              "schema": "time"
             }
           ],
           "description": [
@@ -333,16 +333,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_upsilon;1",
+        "@id": "dtmi:example:zeta_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:hi_sigma;1",
+          "@id": "dtmi:example:zeta_snee;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "hi_tau",
-              "schema": "duration"
+              "name": "zeta_quan",
+              "schema": "boolean"
             }
           ],
           "description": [
@@ -360,15 +360,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_psi;1",
+        "@id": "dtmi:example:zeta_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_phi;1",
+          "@id": "dtmi:example:zeta_spazz;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "hi_chi",
-              "schema": "float"
+              "name": "zeta_floob",
+              "schema": "date"
             }
           ],
           "description": [
@@ -386,16 +386,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_wum;1",
+        "@id": "dtmi:example:zeta_itch;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:hi_omega;1",
+          "@id": "dtmi:example:zeta_jogg;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "hi_yuzz",
-              "schema": "integer"
+              "name": "zeta_flunn",
+              "schema": "dateTime"
             }
           ],
           "description": [
@@ -413,15 +413,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_fuddle;1",
+        "@id": "dtmi:example:zeta_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_um;1",
+          "@id": "dtmi:example:zeta_yekk;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "hi_humpf",
-              "schema": "long"
+              "name": "zeta_vroo",
+              "schema": "double"
             }
           ],
           "description": [
@@ -439,16 +439,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_snee;1",
+        "@id": "dtmi:example:eta_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:hi_glikk;1",
+          "@id": "dtmi:example:eta_alpha;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "hi_nuh",
-              "schema": "string"
+              "name": "eta_beta",
+              "schema": "duration"
             }
           ],
           "description": [
@@ -466,15 +466,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_spazz;1",
+        "@id": "dtmi:example:eta_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_quan;1",
+          "@id": "dtmi:example:eta_delta;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "hi_thnad",
-              "schema": "time"
+              "name": "eta_epsilon",
+              "schema": "float"
             }
           ],
           "description": [
@@ -492,16 +492,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_jogg;1",
+        "@id": "dtmi:example:eta_iota;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:hi_floob;1",
+          "@id": "dtmi:example:eta_eta;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "hi_zatz",
-              "schema": "boolean"
+              "name": "eta_theta",
+              "schema": "integer"
             }
           ],
           "description": [
@@ -519,15 +519,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_yekk;1",
+        "@id": "dtmi:example:eta_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_flunn;1",
+          "@id": "dtmi:example:eta_kappa;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "hi_itch",
-              "schema": "date"
+              "name": "eta_lambda",
+              "schema": "long"
             }
           ],
           "description": {
@@ -546,16 +546,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_alpha;1",
+        "@id": "dtmi:example:eta_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:hi_vroo;1",
+          "@id": "dtmi:example:eta_nu;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "hi_hi",
-              "schema": "dateTime"
+              "name": "eta_xi",
+              "schema": "string"
             }
           ],
           "description": {
@@ -574,15 +574,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_delta;1",
+        "@id": "dtmi:example:eta_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_beta;1",
+          "@id": "dtmi:example:eta_pi;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "alpha_gamma",
-              "schema": "double"
+              "name": "eta_rho",
+              "schema": "time"
             }
           ],
           "description": [
@@ -602,16 +602,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_eta;1",
+        "@id": "dtmi:example:eta_phi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:alpha_epsilon;1",
+          "@id": "dtmi:example:eta_tau;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "alpha_zeta",
-              "schema": "duration"
+              "name": "eta_upsilon",
+              "schema": "boolean"
             }
           ],
           "description": [
diff --git a/DTDL/v2/spec/Requirement-ClassObjectPropertyDescriptionStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassObjectPropertyDescriptionStringLengthV2.json
index 8b93c33d..a3e06221 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectPropertyDescriptionStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectPropertyDescriptionStringLengthV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_kappa;1",
+        "@id": "dtmi:example:eta_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_theta;1",
+          "@id": "dtmi:example:eta_chi;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "alpha_iota",
-              "schema": "float"
+              "name": "eta_psi",
+              "schema": "date"
             }
           ],
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
@@ -31,15 +31,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_nu;1",
+        "@id": "dtmi:example:eta_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_lambda;1",
+          "@id": "dtmi:example:eta_yuzz;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "alpha_mu",
-              "schema": "integer"
+              "name": "eta_wum",
+              "schema": "dateTime"
             }
           ],
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
@@ -55,16 +55,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_pi;1",
+        "@id": "dtmi:example:eta_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:alpha_xi;1",
+          "@id": "dtmi:example:eta_humpf;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "alpha_omicron",
-              "schema": "long"
+              "name": "eta_fuddle",
+              "schema": "double"
             }
           ],
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
diff --git a/DTDL/v2/spec/Requirement-ClassObjectPropertyDescriptionTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassObjectPropertyDescriptionTermAndDtmiV2.json
index ff579c53..d10641c3 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectPropertyDescriptionTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectPropertyDescriptionTermAndDtmiV2.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_quan;1",
+        "@id": "dtmi:example:theta_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_fuddle;1",
+          "@id": "dtmi:example:eta_hi;1",
           "@type": "Object",
           "description": [
-            "alpha_glikk"
+            "theta_alpha"
           ],
           "dtmi:dtdl:property:description;2": [
-            "alpha_nuh"
+            "theta_beta"
           ],
           "fields": [
             {
-              "name": "alpha_snee",
-              "schema": "date"
+              "name": "theta_gamma",
+              "schema": "long"
             }
           ]
         }
@@ -36,22 +36,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_jogg;1",
+        "@id": "dtmi:example:theta_iota;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:alpha_thnad;1",
+          "@id": "dtmi:example:theta_epsilon;1",
           "@type": "Object",
           "description": [
-            "alpha_spazz"
+            "theta_zeta"
           ],
           "dtmi:dtdl:property:description;2": [
-            "alpha_floob"
+            "theta_eta"
           ],
           "fields": [
             {
-              "name": "alpha_zatz",
-              "schema": "dateTime"
+              "name": "theta_theta",
+              "schema": "string"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Requirement-ClassObjectPropertyDisplayNameLangStringV2.json b/DTDL/v2/spec/Requirement-ClassObjectPropertyDisplayNameLangStringV2.json
index e5f69d92..69c2d6af 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectPropertyDisplayNameLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectPropertyDisplayNameLangStringV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_yekk;1",
+        "@id": "dtmi:example:theta_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_flunn;1",
+          "@id": "dtmi:example:theta_kappa;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "alpha_itch",
-              "schema": "double"
+              "name": "theta_lambda",
+              "schema": "time"
             }
           ],
           "displayName": "hello"
@@ -31,15 +31,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_alpha;1",
+        "@id": "dtmi:example:theta_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_vroo;1",
+          "@id": "dtmi:example:theta_nu;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "alpha_hi",
-              "schema": "duration"
+              "name": "theta_xi",
+              "schema": "boolean"
             }
           ],
           "displayName": [
@@ -57,15 +57,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_delta;1",
+        "@id": "dtmi:example:theta_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_beta;1",
+          "@id": "dtmi:example:theta_pi;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "beta_gamma",
-              "schema": "float"
+              "name": "theta_rho",
+              "schema": "date"
             }
           ],
           "displayName": {
@@ -83,15 +83,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_eta;1",
+        "@id": "dtmi:example:theta_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_epsilon;1",
+          "@id": "dtmi:example:theta_tau;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "beta_zeta",
-              "schema": "integer"
+              "name": "theta_upsilon",
+              "schema": "dateTime"
             }
           ],
           "displayName": [
@@ -112,15 +112,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_kappa;1",
+        "@id": "dtmi:example:theta_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_theta;1",
+          "@id": "dtmi:example:theta_chi;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "beta_iota",
-              "schema": "long"
+              "name": "theta_psi",
+              "schema": "double"
             }
           ],
           "displayName": {}
@@ -136,15 +136,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_nu;1",
+        "@id": "dtmi:example:theta_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_lambda;1",
+          "@id": "dtmi:example:theta_yuzz;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "beta_mu",
-              "schema": "string"
+              "name": "theta_wum",
+              "schema": "duration"
             }
           ],
           "displayName": []
@@ -160,15 +160,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_pi;1",
+        "@id": "dtmi:example:theta_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_xi;1",
+          "@id": "dtmi:example:theta_humpf;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "beta_omicron",
-              "schema": "time"
+              "name": "theta_fuddle",
+              "schema": "float"
             }
           ],
           "displayName": null
@@ -184,16 +184,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_tau;1",
+        "@id": "dtmi:example:theta_quan;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:beta_rho;1",
+          "@id": "dtmi:example:theta_nuh;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "beta_sigma",
-              "schema": "boolean"
+              "name": "theta_snee",
+              "schema": "integer"
             }
           ],
           "displayName": null
@@ -209,15 +209,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_chi;1",
+        "@id": "dtmi:example:theta_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_upsilon;1",
+          "@id": "dtmi:example:theta_thnad;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "beta_phi",
-              "schema": "date"
+              "name": "theta_spazz",
+              "schema": "long"
             }
           ],
           "displayName": true
@@ -233,16 +233,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_yuzz;1",
+        "@id": "dtmi:example:theta_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:beta_psi;1",
+          "@id": "dtmi:example:theta_zatz;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "beta_omega",
-              "schema": "dateTime"
+              "name": "theta_jogg",
+              "schema": "string"
             }
           ],
           "displayName": true
@@ -258,15 +258,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_humpf;1",
+        "@id": "dtmi:example:theta_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_wum;1",
+          "@id": "dtmi:example:theta_itch;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "beta_um",
-              "schema": "double"
+              "name": "theta_yekk",
+              "schema": "time"
             }
           ],
           "displayName": 626
@@ -282,16 +282,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_nuh;1",
+        "@id": "dtmi:example:iota_beta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:beta_fuddle;1",
+          "@id": "dtmi:example:theta_hi;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "beta_glikk",
-              "schema": "duration"
+              "name": "iota_alpha",
+              "schema": "boolean"
             }
           ],
           "displayName": 626
@@ -307,15 +307,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_thnad;1",
+        "@id": "dtmi:example:iota_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_snee;1",
+          "@id": "dtmi:example:iota_gamma;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "beta_quan",
-              "schema": "float"
+              "name": "iota_delta",
+              "schema": "date"
             }
           ],
           "displayName": [
@@ -333,16 +333,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_zatz;1",
+        "@id": "dtmi:example:iota_theta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:beta_spazz;1",
+          "@id": "dtmi:example:iota_zeta;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "beta_floob",
-              "schema": "integer"
+              "name": "iota_eta",
+              "schema": "dateTime"
             }
           ],
           "displayName": [
@@ -360,15 +360,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_itch;1",
+        "@id": "dtmi:example:iota_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_jogg;1",
+          "@id": "dtmi:example:iota_iota;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "beta_flunn",
-              "schema": "long"
+              "name": "iota_kappa",
+              "schema": "double"
             }
           ],
           "displayName": [
@@ -386,16 +386,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_hi;1",
+        "@id": "dtmi:example:iota_xi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:beta_yekk;1",
+          "@id": "dtmi:example:iota_mu;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "beta_vroo",
-              "schema": "string"
+              "name": "iota_nu",
+              "schema": "duration"
             }
           ],
           "displayName": [
@@ -413,15 +413,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_gamma;1",
+        "@id": "dtmi:example:iota_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_alpha;1",
+          "@id": "dtmi:example:iota_omicron;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "gamma_beta",
-              "schema": "time"
+              "name": "iota_pi",
+              "schema": "float"
             }
           ],
           "displayName": [
@@ -439,16 +439,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_zeta;1",
+        "@id": "dtmi:example:iota_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:gamma_delta;1",
+          "@id": "dtmi:example:iota_sigma;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "gamma_epsilon",
-              "schema": "boolean"
+              "name": "iota_tau",
+              "schema": "integer"
             }
           ],
           "displayName": [
@@ -466,15 +466,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_iota;1",
+        "@id": "dtmi:example:iota_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_eta;1",
+          "@id": "dtmi:example:iota_phi;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "gamma_theta",
-              "schema": "date"
+              "name": "iota_chi",
+              "schema": "long"
             }
           ],
           "displayName": [
@@ -492,16 +492,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_mu;1",
+        "@id": "dtmi:example:iota_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:gamma_kappa;1",
+          "@id": "dtmi:example:iota_omega;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "gamma_lambda",
-              "schema": "dateTime"
+              "name": "iota_yuzz",
+              "schema": "string"
             }
           ],
           "displayName": [
@@ -519,15 +519,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_omicron;1",
+        "@id": "dtmi:example:iota_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_nu;1",
+          "@id": "dtmi:example:iota_um;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "gamma_xi",
-              "schema": "double"
+              "name": "iota_humpf",
+              "schema": "time"
             }
           ],
           "displayName": {
@@ -546,16 +546,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_sigma;1",
+        "@id": "dtmi:example:iota_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:gamma_pi;1",
+          "@id": "dtmi:example:iota_glikk;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "gamma_rho",
-              "schema": "duration"
+              "name": "iota_nuh",
+              "schema": "boolean"
             }
           ],
           "displayName": {
@@ -574,15 +574,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_phi;1",
+        "@id": "dtmi:example:iota_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_tau;1",
+          "@id": "dtmi:example:iota_quan;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "gamma_upsilon",
-              "schema": "float"
+              "name": "iota_thnad",
+              "schema": "date"
             }
           ],
           "displayName": [
@@ -602,16 +602,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_omega;1",
+        "@id": "dtmi:example:iota_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:gamma_chi;1",
+          "@id": "dtmi:example:iota_floob;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "gamma_psi",
-              "schema": "integer"
+              "name": "iota_zatz",
+              "schema": "dateTime"
             }
           ],
           "displayName": [
diff --git a/DTDL/v2/spec/Requirement-ClassObjectPropertyDisplayNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassObjectPropertyDisplayNameStringLengthV2.json
index 0aba21cc..3220ed14 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectPropertyDisplayNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectPropertyDisplayNameStringLengthV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_um;1",
+        "@id": "dtmi:example:iota_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_yuzz;1",
+          "@id": "dtmi:example:iota_flunn;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "gamma_wum",
-              "schema": "long"
+              "name": "iota_itch",
+              "schema": "double"
             }
           ],
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSometh"
@@ -31,15 +31,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_glikk;1",
+        "@id": "dtmi:example:kappa_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_humpf;1",
+          "@id": "dtmi:example:iota_vroo;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "gamma_fuddle",
-              "schema": "string"
+              "name": "iota_hi",
+              "schema": "duration"
             }
           ],
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
@@ -55,16 +55,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_quan;1",
+        "@id": "dtmi:example:kappa_delta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:gamma_nuh;1",
+          "@id": "dtmi:example:kappa_beta;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "gamma_snee",
-              "schema": "time"
+              "name": "kappa_gamma",
+              "schema": "float"
             }
           ],
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
diff --git a/DTDL/v2/spec/Requirement-ClassObjectPropertyDisplayNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassObjectPropertyDisplayNameTermAndDtmiV2.json
index caf5c91d..82d93050 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectPropertyDisplayNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectPropertyDisplayNameTermAndDtmiV2.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_eta;1",
+        "@id": "dtmi:example:kappa_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_gamma;1",
+          "@id": "dtmi:example:kappa_rho;1",
           "@type": "Object",
           "displayName": [
-            "delta_delta"
+            "kappa_sigma"
           ],
           "dtmi:dtdl:property:displayName;2": [
-            "delta_epsilon"
+            "kappa_tau"
           ],
           "fields": [
             {
-              "name": "delta_zeta",
-              "schema": "double"
+              "name": "kappa_upsilon",
+              "schema": "time"
             }
           ]
         }
@@ -36,22 +36,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_mu;1",
+        "@id": "dtmi:example:kappa_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_theta;1",
+          "@id": "dtmi:example:kappa_chi;1",
           "@type": "Object",
           "displayName": [
-            "delta_iota"
+            "kappa_psi"
           ],
           "dtmi:dtdl:property:displayName;2": [
-            "delta_kappa"
+            "kappa_omega"
           ],
           "fields": [
             {
-              "name": "delta_lambda",
-              "schema": "duration"
+              "name": "kappa_yuzz",
+              "schema": "boolean"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Requirement-ClassObjectPropertyFieldsElementV2.json b/DTDL/v2/spec/Requirement-ClassObjectPropertyFieldsElementV2.json
index f99b7368..5e12a810 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectPropertyFieldsElementV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectPropertyFieldsElementV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_iota;1",
+        "@id": "dtmi:example:spazz_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_theta",
+          "name": "spazz_theta",
           "schema": {
             "@type": "Object",
             "fields": {
-              "@id": "dtmi:example:fuddle_zeta;1",
-              "name": "fuddle_eta",
-              "schema": "string"
+              "@id": "dtmi:example:spazz_zeta;1",
+              "name": "spazz_eta",
+              "schema": "boolean"
             }
           }
         }
@@ -32,18 +32,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_nu;1",
+        "@id": "dtmi:example:spazz_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_mu",
+          "name": "spazz_mu",
           "schema": {
             "@type": "Object",
             "fields": [
               {
-                "@id": "dtmi:example:fuddle_kappa;1",
-                "name": "fuddle_lambda",
-                "schema": "time"
+                "@id": "dtmi:example:spazz_kappa;1",
+                "name": "spazz_lambda",
+                "schema": "date"
               }
             ]
           }
@@ -59,20 +59,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_pi;1",
+        "@id": "dtmi:example:spazz_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_omicron;1",
+          "@id": "dtmi:example:spazz_omicron;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:ex:dependentRef;1",
-            "name": "fuddle_xi",
-            "schema": "boolean"
+            "name": "spazz_xi",
+            "schema": "dateTime"
           }
         },
         "contents": {
           "@type": "Property",
-          "name": "fuddle_rho",
+          "name": "spazz_rho",
           "schema": {
             "@type": "Object",
             "fields": "dtmi:ex:dependentRef;1"
@@ -89,20 +89,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_upsilon;1",
+        "@id": "dtmi:example:spazz_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_tau;1",
+          "@id": "dtmi:example:spazz_tau;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:ex:dependentRef;1",
-            "name": "fuddle_sigma",
-            "schema": "date"
+            "name": "spazz_sigma",
+            "schema": "double"
           }
         },
         "contents": {
           "@type": "Property",
-          "name": "fuddle_phi",
+          "name": "spazz_phi",
           "schema": {
             "@type": "Object",
             "fields": [
@@ -121,17 +121,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_yuzz;1",
+        "@id": "dtmi:example:spazz_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_omega",
+          "name": "spazz_omega",
           "schema": {
             "@type": "Object",
             "fields": {
-              "@id": "dtmi:example:fuddle_chi;1",
-              "name": "fuddle_psi",
-              "schema": "dateTime",
+              "@id": "dtmi:example:spazz_chi;1",
+              "name": "spazz_psi",
+              "schema": "duration",
               "@context": "dtmi:dtdl:context;3"
             }
           }
@@ -147,18 +147,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_fuddle;1",
+        "@id": "dtmi:example:spazz_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_humpf",
+          "name": "spazz_humpf",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Object",
             "fields": {
-              "@id": "dtmi:example:fuddle_wum;1",
-              "name": "fuddle_um",
-              "schema": "double",
+              "@id": "dtmi:example:spazz_wum;1",
+              "name": "spazz_um",
+              "schema": "float",
               "@context": "dtmi:dtdl:context;3"
             }
           }
@@ -174,11 +174,64 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_nuh;1",
+        "@id": "dtmi:example:spazz_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "spazz_snee",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "@id": "dtmi:example:spazz_glikk;1",
+              "name": "spazz_nuh",
+              "schema": "boolean",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:spazz_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_glikk",
+          "name": "spazz_floob",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Object",
+            "fields": {
+              "@id": "dtmi:example:spazz_thnad;1",
+              "name": "spazz_spazz",
+              "schema": "byte",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:spazz_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "spazz_jogg",
           "schema": {
             "@type": "Object",
             "fields": []
@@ -195,11 +248,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_quan;1",
+        "@id": "dtmi:example:spazz_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_snee",
+          "name": "spazz_itch",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Object",
@@ -217,23 +270,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_flunn;1",
+        "@id": "dtmi:example:floob_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_jogg",
+          "name": "floob_gamma",
           "schema": {
             "@type": "Object",
             "fields": [
               {
-                "@id": "dtmi:example:fuddle_thnad;1",
-                "name": "fuddle_spazz",
-                "schema": "duration"
+                "@id": "dtmi:example:spazz_vroo;1",
+                "name": "spazz_hi",
+                "schema": "string"
               },
               {
-                "@id": "dtmi:example:fuddle_floob;1",
-                "name": "fuddle_zatz",
-                "schema": "float"
+                "@id": "dtmi:example:floob_alpha;1",
+                "name": "floob_beta",
+                "schema": "time"
               }
             ]
           }
diff --git a/DTDL/v2/spec/Requirement-ClassObjectPropertyFieldsMaxCountV2.json b/DTDL/v2/spec/Requirement-ClassObjectPropertyFieldsMaxCountV2.json
index 2c224544..13cdab82 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectPropertyFieldsMaxCountV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectPropertyFieldsMaxCountV2.json
@@ -7,131 +7,131 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_wum;1",
+        "@id": "dtmi:example:flunn_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_yuzz;1",
+          "@id": "dtmi:example:flunn_quan;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "snee_jogg",
-              "schema": "dateTime"
-            },
-            {
-              "name": "snee_flunn",
-              "schema": "double"
-            },
-            {
-              "name": "snee_itch",
-              "schema": "duration"
-            },
-            {
-              "name": "snee_yekk",
-              "schema": "float"
-            },
-            {
-              "name": "snee_vroo",
+              "name": "flunn_gamma",
               "schema": "integer"
             },
             {
-              "name": "snee_hi",
+              "name": "flunn_delta",
               "schema": "long"
             },
             {
-              "name": "quan_alpha",
+              "name": "flunn_epsilon",
               "schema": "string"
             },
             {
-              "name": "quan_beta",
+              "name": "flunn_zeta",
               "schema": "time"
             },
             {
-              "name": "quan_gamma",
+              "name": "flunn_eta",
               "schema": "boolean"
             },
             {
-              "name": "quan_delta",
+              "name": "flunn_theta",
               "schema": "date"
             },
             {
-              "name": "quan_epsilon",
+              "name": "flunn_iota",
               "schema": "dateTime"
             },
             {
-              "name": "quan_zeta",
+              "name": "flunn_kappa",
               "schema": "double"
             },
             {
-              "name": "quan_eta",
+              "name": "flunn_lambda",
               "schema": "duration"
             },
             {
-              "name": "quan_theta",
+              "name": "flunn_mu",
               "schema": "float"
             },
             {
-              "name": "quan_iota",
+              "name": "flunn_nu",
               "schema": "integer"
             },
             {
-              "name": "quan_kappa",
+              "name": "flunn_xi",
               "schema": "long"
             },
             {
-              "name": "quan_lambda",
+              "name": "flunn_omicron",
               "schema": "string"
             },
             {
-              "name": "quan_mu",
+              "name": "flunn_pi",
               "schema": "time"
             },
             {
-              "name": "quan_nu",
+              "name": "flunn_rho",
               "schema": "boolean"
             },
             {
-              "name": "quan_xi",
+              "name": "flunn_sigma",
               "schema": "date"
             },
             {
-              "name": "quan_omicron",
+              "name": "flunn_tau",
               "schema": "dateTime"
             },
             {
-              "name": "quan_pi",
+              "name": "flunn_upsilon",
               "schema": "double"
             },
             {
-              "name": "quan_rho",
+              "name": "flunn_phi",
               "schema": "duration"
             },
             {
-              "name": "quan_sigma",
+              "name": "flunn_chi",
               "schema": "float"
             },
             {
-              "name": "quan_tau",
+              "name": "flunn_psi",
               "schema": "integer"
             },
             {
-              "name": "quan_upsilon",
+              "name": "flunn_omega",
               "schema": "long"
             },
             {
-              "name": "quan_phi",
+              "name": "flunn_yuzz",
               "schema": "string"
             },
             {
-              "name": "quan_chi",
+              "name": "flunn_wum",
               "schema": "time"
             },
             {
-              "name": "quan_psi",
+              "name": "flunn_um",
               "schema": "boolean"
             },
             {
-              "name": "quan_omega",
+              "name": "flunn_humpf",
               "schema": "date"
+            },
+            {
+              "name": "flunn_fuddle",
+              "schema": "dateTime"
+            },
+            {
+              "name": "flunn_glikk",
+              "schema": "double"
+            },
+            {
+              "name": "flunn_nuh",
+              "schema": "duration"
+            },
+            {
+              "name": "flunn_snee",
+              "schema": "float"
             }
           ]
         }
@@ -146,135 +146,135 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_pi;1",
+        "@id": "dtmi:example:itch_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_omicron;1",
+          "@id": "dtmi:example:itch_psi;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "quan_um",
-              "schema": "dateTime"
-            },
-            {
-              "name": "quan_humpf",
-              "schema": "double"
-            },
-            {
-              "name": "quan_fuddle",
-              "schema": "duration"
-            },
-            {
-              "name": "quan_glikk",
-              "schema": "float"
-            },
-            {
-              "name": "quan_nuh",
+              "name": "flunn_spazz",
               "schema": "integer"
             },
             {
-              "name": "quan_snee",
+              "name": "flunn_floob",
               "schema": "long"
             },
             {
-              "name": "quan_quan",
+              "name": "flunn_zatz",
               "schema": "string"
             },
             {
-              "name": "quan_thnad",
+              "name": "flunn_jogg",
               "schema": "time"
             },
             {
-              "name": "quan_spazz",
+              "name": "flunn_flunn",
               "schema": "boolean"
             },
             {
-              "name": "quan_floob",
+              "name": "flunn_itch",
               "schema": "date"
             },
             {
-              "name": "quan_zatz",
+              "name": "flunn_yekk",
               "schema": "dateTime"
             },
             {
-              "name": "quan_jogg",
+              "name": "flunn_vroo",
               "schema": "double"
             },
             {
-              "name": "quan_flunn",
+              "name": "flunn_hi",
               "schema": "duration"
             },
             {
-              "name": "quan_itch",
+              "name": "itch_alpha",
               "schema": "float"
             },
             {
-              "name": "quan_yekk",
+              "name": "itch_beta",
               "schema": "integer"
             },
             {
-              "name": "quan_vroo",
+              "name": "itch_gamma",
               "schema": "long"
             },
             {
-              "name": "quan_hi",
+              "name": "itch_delta",
               "schema": "string"
             },
             {
-              "name": "thnad_alpha",
+              "name": "itch_epsilon",
               "schema": "time"
             },
             {
-              "name": "thnad_beta",
+              "name": "itch_zeta",
               "schema": "boolean"
             },
             {
-              "name": "thnad_gamma",
+              "name": "itch_eta",
               "schema": "date"
             },
             {
-              "name": "thnad_delta",
+              "name": "itch_theta",
               "schema": "dateTime"
             },
             {
-              "name": "thnad_epsilon",
+              "name": "itch_iota",
               "schema": "double"
             },
             {
-              "name": "thnad_zeta",
+              "name": "itch_kappa",
               "schema": "duration"
             },
             {
-              "name": "thnad_eta",
+              "name": "itch_lambda",
               "schema": "float"
             },
             {
-              "name": "thnad_theta",
+              "name": "itch_mu",
               "schema": "integer"
             },
             {
-              "name": "thnad_iota",
+              "name": "itch_nu",
               "schema": "long"
             },
             {
-              "name": "thnad_kappa",
+              "name": "itch_xi",
               "schema": "string"
             },
             {
-              "name": "thnad_lambda",
+              "name": "itch_omicron",
               "schema": "time"
             },
             {
-              "name": "thnad_mu",
+              "name": "itch_pi",
               "schema": "boolean"
             },
             {
-              "name": "thnad_nu",
+              "name": "itch_rho",
               "schema": "date"
             },
             {
-              "name": "thnad_xi",
+              "name": "itch_sigma",
               "schema": "dateTime"
+            },
+            {
+              "name": "itch_tau",
+              "schema": "double"
+            },
+            {
+              "name": "itch_upsilon",
+              "schema": "duration"
+            },
+            {
+              "name": "itch_phi",
+              "schema": "float"
+            },
+            {
+              "name": "itch_chi",
+              "schema": "integer"
             }
           ]
         }
@@ -289,136 +289,136 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_zeta;1",
+        "@id": "dtmi:example:yekk_xi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:spazz_epsilon;1",
+          "@id": "dtmi:example:yekk_nu;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "thnad_rho",
-              "schema": "double"
-            },
-            {
-              "name": "thnad_sigma",
-              "schema": "duration"
-            },
-            {
-              "name": "thnad_tau",
-              "schema": "float"
-            },
-            {
-              "name": "thnad_upsilon",
-              "schema": "integer"
-            },
-            {
-              "name": "thnad_phi",
+              "name": "itch_yuzz",
               "schema": "long"
             },
             {
-              "name": "thnad_chi",
+              "name": "itch_wum",
               "schema": "string"
             },
             {
-              "name": "thnad_psi",
+              "name": "itch_um",
               "schema": "time"
             },
             {
-              "name": "thnad_omega",
+              "name": "itch_humpf",
               "schema": "boolean"
             },
             {
-              "name": "thnad_yuzz",
+              "name": "itch_fuddle",
               "schema": "date"
             },
             {
-              "name": "thnad_wum",
+              "name": "itch_glikk",
               "schema": "dateTime"
             },
             {
-              "name": "thnad_um",
+              "name": "itch_nuh",
               "schema": "double"
             },
             {
-              "name": "thnad_humpf",
+              "name": "itch_snee",
               "schema": "duration"
             },
             {
-              "name": "thnad_fuddle",
+              "name": "itch_quan",
               "schema": "float"
             },
             {
-              "name": "thnad_glikk",
+              "name": "itch_thnad",
               "schema": "integer"
             },
             {
-              "name": "thnad_nuh",
+              "name": "itch_spazz",
               "schema": "long"
             },
             {
-              "name": "thnad_snee",
+              "name": "itch_floob",
               "schema": "string"
             },
             {
-              "name": "thnad_quan",
+              "name": "itch_zatz",
               "schema": "time"
             },
             {
-              "name": "thnad_thnad",
+              "name": "itch_jogg",
               "schema": "boolean"
             },
             {
-              "name": "thnad_spazz",
+              "name": "itch_flunn",
               "schema": "date"
             },
             {
-              "name": "thnad_floob",
+              "name": "itch_itch",
               "schema": "dateTime"
             },
             {
-              "name": "thnad_zatz",
+              "name": "itch_yekk",
               "schema": "double"
             },
             {
-              "name": "thnad_jogg",
+              "name": "itch_vroo",
               "schema": "duration"
             },
             {
-              "name": "thnad_flunn",
+              "name": "itch_hi",
               "schema": "float"
             },
             {
-              "name": "thnad_itch",
+              "name": "yekk_alpha",
               "schema": "integer"
             },
             {
-              "name": "thnad_yekk",
+              "name": "yekk_beta",
               "schema": "long"
             },
             {
-              "name": "thnad_vroo",
+              "name": "yekk_gamma",
               "schema": "string"
             },
             {
-              "name": "thnad_hi",
+              "name": "yekk_delta",
               "schema": "time"
             },
             {
-              "name": "spazz_alpha",
+              "name": "yekk_epsilon",
               "schema": "boolean"
             },
             {
-              "name": "spazz_beta",
+              "name": "yekk_zeta",
               "schema": "date"
             },
             {
-              "name": "spazz_gamma",
+              "name": "yekk_eta",
               "schema": "dateTime"
             },
             {
-              "name": "spazz_delta",
+              "name": "yekk_theta",
               "schema": "double"
+            },
+            {
+              "name": "yekk_iota",
+              "schema": "duration"
+            },
+            {
+              "name": "yekk_kappa",
+              "schema": "float"
+            },
+            {
+              "name": "yekk_lambda",
+              "schema": "integer"
+            },
+            {
+              "name": "yekk_mu",
+              "schema": "long"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Requirement-ClassObjectPropertyFieldsMinCountV2.json b/DTDL/v2/spec/Requirement-ClassObjectPropertyFieldsMinCountV2.json
index fa79f52e..7c46a5ad 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectPropertyFieldsMinCountV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectPropertyFieldsMinCountV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_snee;1",
+        "@id": "dtmi:example:jogg_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_nuh;1",
+          "@id": "dtmi:example:jogg_flunn;1",
           "@type": "Object",
           "fields": []
         }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_thnad;1",
+        "@id": "dtmi:example:jogg_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:snee_quan;1",
+          "@id": "dtmi:example:jogg_yekk;1",
           "@type": "Object",
           "fields": []
         }
@@ -44,15 +44,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_zatz;1",
+        "@id": "dtmi:example:flunn_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_floob;1",
+          "@id": "dtmi:example:flunn_alpha;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "snee_spazz",
-              "schema": "date"
+              "name": "jogg_hi",
+              "schema": "float"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Requirement-ClassObjectPropertyFieldsTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassObjectPropertyFieldsTermAndDtmiV2.json
index dce32c93..1ab298bf 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectPropertyFieldsTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectPropertyFieldsTermAndDtmiV2.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_tau;1",
+        "@id": "dtmi:example:yekk_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_pi;1",
+          "@id": "dtmi:example:yekk_omega;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "spazz_rho",
-              "schema": "long"
+              "name": "yekk_yuzz",
+              "schema": "date"
             }
           ],
           "dtmi:dtdl:property:fields;2": [
             {
-              "name": "spazz_sigma",
-              "schema": "string"
+              "name": "yekk_wum",
+              "schema": "dateTime"
             }
           ]
         }
@@ -36,22 +36,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_psi;1",
+        "@id": "dtmi:example:yekk_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:spazz_upsilon;1",
+          "@id": "dtmi:example:yekk_humpf;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "spazz_phi",
-              "schema": "time"
+              "name": "yekk_fuddle",
+              "schema": "double"
             }
           ],
           "dtmi:dtdl:property:fields;2": [
             {
-              "name": "spazz_chi",
-              "schema": "boolean"
+              "name": "yekk_glikk",
+              "schema": "duration"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Requirement-ClassObjectPropertyFieldsTypeConformanceV2.json b/DTDL/v2/spec/Requirement-ClassObjectPropertyFieldsTypeConformanceV2.json
index 14634918..c0537059 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectPropertyFieldsTypeConformanceV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectPropertyFieldsTypeConformanceV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_gamma;1",
+        "@id": "dtmi:example:floob_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_beta;1",
+          "@id": "dtmi:example:floob_kappa;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:glikk_alpha;1",
-            "elementSchema": "integer",
+            "@id": "dtmi:example:floob_iota;1",
+            "elementSchema": "boolean",
             "@type": "Array"
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_zeta;1",
+        "@id": "dtmi:example:floob_xi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_epsilon;1",
+          "@id": "dtmi:example:floob_nu;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:glikk_delta;1",
-            "elementSchema": "long",
+            "@id": "dtmi:example:floob_mu;1",
+            "elementSchema": "date",
             "@type": "Array"
           }
         }
@@ -52,14 +52,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_kappa;1",
+        "@id": "dtmi:example:floob_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_iota;1",
+          "@id": "dtmi:example:floob_rho;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:glikk_eta;1",
-            "name": "glikk_theta",
+            "@id": "dtmi:example:floob_omicron;1",
+            "name": "floob_pi",
             "@type": "Command"
           }
         }
@@ -74,15 +74,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_xi;1",
+        "@id": "dtmi:example:floob_chi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_nu;1",
+          "@id": "dtmi:example:floob_phi;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:glikk_lambda;1",
-            "name": "glikk_mu",
+            "@id": "dtmi:example:floob_tau;1",
+            "name": "floob_upsilon",
             "@type": "Command"
           }
         }
@@ -97,15 +97,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_sigma;1",
+        "@id": "dtmi:example:floob_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_rho;1",
+          "@id": "dtmi:example:floob_yuzz;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:glikk_omicron;1",
-            "name": "glikk_pi",
-            "schema": "string",
+            "@id": "dtmi:example:floob_psi;1",
+            "name": "floob_omega",
+            "schema": "dateTime",
             "@type": "CommandPayload"
           }
         }
@@ -120,16 +120,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_chi;1",
+        "@id": "dtmi:example:floob_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_phi;1",
+          "@id": "dtmi:example:floob_fuddle;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:glikk_tau;1",
-            "name": "glikk_upsilon",
-            "schema": "time",
+            "@id": "dtmi:example:floob_um;1",
+            "name": "floob_humpf",
+            "schema": "double",
             "@type": "CommandPayload"
           }
         }
@@ -144,16 +144,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_um;1",
+        "@id": "dtmi:example:floob_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_wum;1",
+          "@id": "dtmi:example:floob_thnad;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:glikk_psi;1",
-            "name": "glikk_omega",
+            "@id": "dtmi:example:floob_nuh;1",
+            "name": "floob_snee",
             "schema": {
-              "@id": "dtmi:example:glikk_yuzz;1",
+              "@id": "dtmi:example:floob_quan;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -170,17 +170,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_snee;1",
+        "@id": "dtmi:example:floob_itch;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_nuh;1",
+          "@id": "dtmi:example:floob_flunn;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:glikk_humpf;1",
-            "name": "glikk_fuddle",
+            "@id": "dtmi:example:floob_floob;1",
+            "name": "floob_zatz",
             "schema": {
-              "@id": "dtmi:example:glikk_glikk;1",
+              "@id": "dtmi:example:floob_jogg;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -197,17 +197,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_floob;1",
+        "@id": "dtmi:example:zatz_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_spazz;1",
+          "@id": "dtmi:example:floob_hi;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:glikk_quan;1",
+            "@id": "dtmi:example:floob_yekk;1",
             "enumValues": [
               {
-                "enumValue": 1062,
-                "name": "glikk_thnad"
+                "enumValue": 1075,
+                "name": "floob_vroo"
               }
             ],
             "valueSchema": "integer",
@@ -225,18 +225,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_itch;1",
+        "@id": "dtmi:example:zatz_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_flunn;1",
+          "@id": "dtmi:example:zatz_delta;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:glikk_zatz;1",
+            "@id": "dtmi:example:zatz_beta;1",
             "enumValues": [
               {
-                "enumValue": 1063,
-                "name": "glikk_jogg"
+                "enumValue": 1076,
+                "name": "zatz_gamma"
               }
             ],
             "valueSchema": "integer",
@@ -254,15 +254,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_alpha;1",
+        "@id": "dtmi:example:zatz_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_hi;1",
+          "@id": "dtmi:example:zatz_theta;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:glikk_yekk;1",
-            "enumValue": 1064,
-            "name": "glikk_vroo",
+            "@id": "dtmi:example:zatz_zeta;1",
+            "enumValue": 1077,
+            "name": "zatz_eta",
             "@type": "EnumValue"
           }
         }
@@ -277,16 +277,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_epsilon;1",
+        "@id": "dtmi:example:zatz_nu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_delta;1",
+          "@id": "dtmi:example:zatz_mu;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:nuh_beta;1",
-            "enumValue": 1065,
-            "name": "nuh_gamma",
+            "@id": "dtmi:example:zatz_kappa;1",
+            "enumValue": 1078,
+            "name": "zatz_lambda",
             "@type": "EnumValue"
           }
         }
@@ -301,15 +301,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_iota;1",
+        "@id": "dtmi:example:zatz_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_theta;1",
+          "@id": "dtmi:example:zatz_pi;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:nuh_zeta;1",
-            "name": "nuh_eta",
-            "schema": "boolean",
+            "@id": "dtmi:example:zatz_xi;1",
+            "name": "zatz_omicron",
+            "schema": "duration",
             "@type": "Field"
           }
         }
@@ -324,13 +324,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_mu;1",
+        "@id": "dtmi:example:zatz_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_lambda;1",
+          "@id": "dtmi:example:zatz_tau;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:nuh_kappa;1",
+            "@id": "dtmi:example:zatz_sigma;1",
             "@type": "Interface"
           }
         }
@@ -345,14 +345,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_omicron;1",
+        "@id": "dtmi:example:zatz_psi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_xi;1",
+          "@id": "dtmi:example:zatz_chi;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:nuh_nu;1",
+            "@id": "dtmi:example:zatz_phi;1",
             "@type": "Interface"
           }
         }
@@ -367,20 +367,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_upsilon;1",
+        "@id": "dtmi:example:zatz_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_tau;1",
+          "@id": "dtmi:example:zatz_um;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:nuh_pi;1",
+            "@id": "dtmi:example:zatz_omega;1",
             "mapKey": {
-              "name": "nuh_rho",
+              "name": "zatz_yuzz",
               "schema": "string"
             },
             "mapValue": {
-              "name": "nuh_sigma",
-              "schema": "date"
+              "name": "zatz_wum",
+              "schema": "float"
             },
             "@type": "Map"
           }
@@ -396,21 +396,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_yuzz;1",
+        "@id": "dtmi:example:zatz_quan;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_omega;1",
+          "@id": "dtmi:example:zatz_snee;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:nuh_phi;1",
+            "@id": "dtmi:example:zatz_fuddle;1",
             "mapKey": {
-              "name": "nuh_chi",
+              "name": "zatz_glikk",
               "schema": "string"
             },
             "mapValue": {
-              "name": "nuh_psi",
-              "schema": "dateTime"
+              "name": "zatz_nuh",
+              "schema": "integer"
             },
             "@type": "Map"
           }
@@ -426,14 +426,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_fuddle;1",
+        "@id": "dtmi:example:zatz_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_humpf;1",
+          "@id": "dtmi:example:zatz_floob;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:nuh_wum;1",
-            "name": "nuh_um",
+            "@id": "dtmi:example:zatz_thnad;1",
+            "name": "zatz_spazz",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -449,15 +449,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_quan;1",
+        "@id": "dtmi:example:zatz_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_snee;1",
+          "@id": "dtmi:example:zatz_itch;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:nuh_glikk;1",
-            "name": "nuh_nuh",
+            "@id": "dtmi:example:zatz_jogg;1",
+            "name": "zatz_flunn",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -473,15 +473,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_zatz;1",
+        "@id": "dtmi:example:jogg_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_floob;1",
+          "@id": "dtmi:example:jogg_alpha;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:nuh_thnad;1",
-            "name": "nuh_spazz",
-            "schema": "double",
+            "@id": "dtmi:example:zatz_vroo;1",
+            "name": "zatz_hi",
+            "schema": "long",
             "@type": "MapValue"
           }
         }
@@ -496,16 +496,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_yekk;1",
+        "@id": "dtmi:example:jogg_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_itch;1",
+          "@id": "dtmi:example:jogg_epsilon;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:nuh_jogg;1",
-            "name": "nuh_flunn",
-            "schema": "duration",
+            "@id": "dtmi:example:jogg_gamma;1",
+            "name": "jogg_delta",
+            "schema": "string",
             "@type": "MapValue"
           }
         }
@@ -520,17 +520,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_beta;1",
+        "@id": "dtmi:example:jogg_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_alpha;1",
+          "@id": "dtmi:example:jogg_iota;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:nuh_vroo;1",
+            "@id": "dtmi:example:jogg_eta;1",
             "fields": [
               {
-                "name": "nuh_hi",
-                "schema": "float"
+                "name": "jogg_theta",
+                "schema": "time"
               }
             ],
             "@type": "Object"
@@ -547,18 +547,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_zeta;1",
+        "@id": "dtmi:example:jogg_xi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:snee_epsilon;1",
+          "@id": "dtmi:example:jogg_nu;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:snee_gamma;1",
+            "@id": "dtmi:example:jogg_lambda;1",
             "fields": [
               {
-                "name": "snee_delta",
-                "schema": "integer"
+                "name": "jogg_mu",
+                "schema": "boolean"
               }
             ],
             "@type": "Object"
@@ -575,15 +575,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_kappa;1",
+        "@id": "dtmi:example:jogg_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_iota;1",
+          "@id": "dtmi:example:jogg_rho;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:snee_eta;1",
-            "name": "snee_theta",
-            "schema": "long",
+            "@id": "dtmi:example:jogg_omicron;1",
+            "name": "jogg_pi",
+            "schema": "date",
             "@type": "Property"
           }
         }
@@ -598,16 +598,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_xi;1",
+        "@id": "dtmi:example:jogg_chi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:snee_nu;1",
+          "@id": "dtmi:example:jogg_phi;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:snee_lambda;1",
-            "name": "snee_mu",
-            "schema": "string",
+            "@id": "dtmi:example:jogg_tau;1",
+            "name": "jogg_upsilon",
+            "schema": "dateTime",
             "@type": "Property"
           }
         }
@@ -622,14 +622,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_sigma;1",
+        "@id": "dtmi:example:jogg_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_rho;1",
+          "@id": "dtmi:example:jogg_yuzz;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:snee_omicron;1",
-            "name": "snee_pi",
+            "@id": "dtmi:example:jogg_psi;1",
+            "name": "jogg_omega",
             "@type": "Relationship"
           }
         }
@@ -644,15 +644,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_chi;1",
+        "@id": "dtmi:example:jogg_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:snee_phi;1",
+          "@id": "dtmi:example:jogg_fuddle;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:snee_tau;1",
-            "name": "snee_upsilon",
+            "@id": "dtmi:example:jogg_um;1",
+            "name": "jogg_humpf",
             "@type": "Relationship"
           }
         }
@@ -667,15 +667,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_wum;1",
+        "@id": "dtmi:example:jogg_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_yuzz;1",
+          "@id": "dtmi:example:jogg_quan;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:snee_psi;1",
-            "name": "snee_omega",
-            "schema": "time",
+            "@id": "dtmi:example:jogg_nuh;1",
+            "name": "jogg_snee",
+            "schema": "double",
             "@type": "Telemetry"
           }
         }
@@ -690,16 +690,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_glikk;1",
+        "@id": "dtmi:example:jogg_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:snee_fuddle;1",
+          "@id": "dtmi:example:jogg_zatz;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:snee_um;1",
-            "name": "snee_humpf",
-            "schema": "boolean",
+            "@id": "dtmi:example:jogg_spazz;1",
+            "name": "jogg_floob",
+            "schema": "duration",
             "@type": "Telemetry"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassObjectPropertyFormallyInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassObjectPropertyFormallyInvalidDtmiV2.json
index 14f868f0..c9446a7f 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectPropertyFormallyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectPropertyFormallyInvalidDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_theta;1",
+        "@id": "dtmi:example:lambda_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_zeta;1",
+          "@id": "dtmi:example:lambda_upsilon;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "epsilon_eta",
-              "schema": "long"
+              "name": "lambda_phi",
+              "schema": "double"
             }
           ],
           "dtmi:foo//bar": 626
@@ -31,16 +31,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_lambda;1",
+        "@id": "dtmi:example:lambda_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:epsilon_iota;1",
+          "@id": "dtmi:example:lambda_psi;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "epsilon_kappa",
-              "schema": "string"
+              "name": "lambda_omega",
+              "schema": "duration"
             }
           ],
           "dtmi:foo//bar": 626
diff --git a/DTDL/v2/spec/Requirement-ClassObjectPropertyFormallyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Requirement-ClassObjectPropertyFormallyIrrelevantDtmiOrTermV2.json
index e8801c2c..e0d99056 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectPropertyFormallyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectPropertyFormallyIrrelevantDtmiOrTermV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_floob;1",
+        "@id": "dtmi:example:lambda_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_thnad;1",
+          "@id": "dtmi:example:lambda_epsilon;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "delta_spazz",
-              "schema": "dateTime"
+              "name": "lambda_zeta",
+              "schema": "string"
             }
           ],
           "dtmi:foo:bar;1": 626
@@ -31,16 +31,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_flunn;1",
+        "@id": "dtmi:example:lambda_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_zatz;1",
+          "@id": "dtmi:example:lambda_theta;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "delta_jogg",
-              "schema": "double"
+              "name": "lambda_iota",
+              "schema": "time"
             }
           ],
           "dtmi:foo:bar;1": 626
@@ -56,15 +56,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_vroo;1",
+        "@id": "dtmi:example:lambda_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_itch;1",
+          "@id": "dtmi:example:lambda_lambda;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "delta_yekk",
-              "schema": "duration"
+              "name": "lambda_mu",
+              "schema": "boolean"
             }
           ],
           "boolean": null
@@ -80,16 +80,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_beta;1",
+        "@id": "dtmi:example:lambda_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_hi;1",
+          "@id": "dtmi:example:lambda_xi;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "epsilon_alpha",
-              "schema": "float"
+              "name": "lambda_omicron",
+              "schema": "date"
             }
           ],
           "boolean": null
diff --git a/DTDL/v2/spec/Requirement-ClassObjectPropertyFormallyNotDtmiNorTermV2.json b/DTDL/v2/spec/Requirement-ClassObjectPropertyFormallyNotDtmiNorTermV2.json
index 06e549da..19cb07e2 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectPropertyFormallyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectPropertyFormallyNotDtmiNorTermV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_rho;1",
+        "@id": "dtmi:example:lambda_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_omicron;1",
+          "@id": "dtmi:example:lambda_fuddle;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "epsilon_pi",
-              "schema": "boolean"
+              "name": "lambda_glikk",
+              "schema": "integer"
             }
           ],
           "http://foo.com/bar": true
@@ -31,16 +31,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_upsilon;1",
+        "@id": "dtmi:example:lambda_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:epsilon_sigma;1",
+          "@id": "dtmi:example:lambda_snee;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "epsilon_tau",
-              "schema": "date"
+              "name": "lambda_quan",
+              "schema": "long"
             }
           ],
           "http://foo.com/bar": true
diff --git a/DTDL/v2/spec/Requirement-ClassObjectPropertyFormallyUndefinedTermV2.json b/DTDL/v2/spec/Requirement-ClassObjectPropertyFormallyUndefinedTermV2.json
index 1c09a8d7..078c0d01 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectPropertyFormallyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectPropertyFormallyUndefinedTermV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_wum;1",
+        "@id": "dtmi:example:lambda_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_omega;1",
+          "@id": "dtmi:example:lambda_jogg;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "epsilon_yuzz",
-              "schema": "double"
+              "name": "lambda_flunn",
+              "schema": "time"
             }
           ],
           "foobar": {}
@@ -31,16 +31,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_fuddle;1",
+        "@id": "dtmi:example:lambda_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:epsilon_um;1",
+          "@id": "dtmi:example:lambda_yekk;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "epsilon_humpf",
-              "schema": "duration"
+              "name": "lambda_vroo",
+              "schema": "boolean"
             }
           ],
           "foobar": {}
diff --git a/DTDL/v2/spec/Requirement-ClassObjectRequiredPropertiesV2.json b/DTDL/v2/spec/Requirement-ClassObjectRequiredPropertiesV2.json
index d5a41700..0271e24c 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectRequiredPropertiesV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectRequiredPropertiesV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_pi;1",
+        "@id": "dtmi:example:snee_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_xi;1",
+          "@id": "dtmi:example:snee_xi;1",
           "fields": [
             {
-              "name": "wum_omicron",
-              "schema": "time"
+              "name": "snee_omicron",
+              "schema": "date"
             }
           ]
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_tau;1",
+        "@id": "dtmi:example:snee_tau;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:wum_rho;1",
+          "@id": "dtmi:example:snee_rho;1",
           "fields": [
             {
-              "name": "wum_sigma",
-              "schema": "boolean"
+              "name": "snee_sigma",
+              "schema": "dateTime"
             }
           ]
         }
@@ -52,10 +52,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_phi;1",
+        "@id": "dtmi:example:snee_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_upsilon;1",
+          "@id": "dtmi:example:snee_upsilon;1",
           "@type": "Object"
         }
       }
@@ -69,11 +69,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_psi;1",
+        "@id": "dtmi:example:snee_psi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:wum_chi;1",
+          "@id": "dtmi:example:snee_chi;1",
           "@type": "Object"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassObjectTypeIncludesInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassObjectTypeIncludesInvalidDtmiV2.json
index 5e351af4..05499b6b 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectTypeIncludesInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectTypeIncludesInvalidDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_flunn;1",
+        "@id": "dtmi:example:thnad_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_zatz;1",
+          "@id": "dtmi:example:thnad_zatz;1",
           "@type": [
             "Object",
             "dtmi:foo//bar"
           ],
           "fields": [
             {
-              "name": "humpf_jogg",
-              "schema": "duration"
+              "name": "thnad_jogg",
+              "schema": "integer"
             }
           ]
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_vroo;1",
+        "@id": "dtmi:example:thnad_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:humpf_itch;1",
+          "@id": "dtmi:example:thnad_itch;1",
           "@type": [
             "Object",
             "dtmi:foo//bar"
           ],
           "fields": [
             {
-              "name": "humpf_yekk",
-              "schema": "float"
+              "name": "thnad_yekk",
+              "schema": "long"
             }
           ]
         }
diff --git a/DTDL/v2/spec/Requirement-ClassObjectTypeIncludesMaterialV2.json b/DTDL/v2/spec/Requirement-ClassObjectTypeIncludesMaterialV2.json
index f6e83dca..f1019053 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectTypeIncludesMaterialV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectTypeIncludesMaterialV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_nuh;1",
+        "@id": "dtmi:example:quan_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_fuddle;1",
+          "@id": "dtmi:example:quan_fuddle;1",
           "fields": [
             {
-              "name": "um_glikk",
-              "schema": "long"
+              "name": "quan_glikk",
+              "schema": "time"
             }
           ],
           "@type": "Object"
@@ -30,14 +30,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_thnad;1",
+        "@id": "dtmi:example:quan_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_snee;1",
+          "@id": "dtmi:example:quan_snee;1",
           "fields": [
             {
-              "name": "um_quan",
-              "schema": "string"
+              "name": "quan_quan",
+              "schema": "boolean"
             }
           ],
           "@type": [
@@ -55,14 +55,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_zatz;1",
+        "@id": "dtmi:example:quan_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_spazz;1",
+          "@id": "dtmi:example:quan_spazz;1",
           "fields": [
             {
-              "name": "um_floob",
-              "schema": "time"
+              "name": "quan_floob",
+              "schema": "date"
             }
           ],
           "@type": "dtmi:dtdl:class:Object;2"
@@ -78,14 +78,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_itch;1",
+        "@id": "dtmi:example:quan_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_jogg;1",
+          "@id": "dtmi:example:quan_jogg;1",
           "fields": [
             {
-              "name": "um_flunn",
-              "schema": "boolean"
+              "name": "quan_flunn",
+              "schema": "dateTime"
             }
           ],
           "@type": [
@@ -103,14 +103,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_hi;1",
+        "@id": "dtmi:example:quan_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_yekk;1",
+          "@id": "dtmi:example:quan_yekk;1",
           "fields": [
             {
-              "name": "um_vroo",
-              "schema": "date"
+              "name": "quan_vroo",
+              "schema": "double"
             }
           ],
           "@type": "Something"
@@ -126,15 +126,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_gamma;1",
+        "@id": "dtmi:example:thnad_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:humpf_alpha;1",
+          "@id": "dtmi:example:thnad_alpha;1",
           "fields": [
             {
-              "name": "humpf_beta",
-              "schema": "dateTime"
+              "name": "thnad_beta",
+              "schema": "duration"
             }
           ],
           "@type": "Something"
@@ -150,14 +150,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_zeta;1",
+        "@id": "dtmi:example:thnad_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_delta;1",
+          "@id": "dtmi:example:thnad_delta;1",
           "fields": [
             {
-              "name": "humpf_epsilon",
-              "schema": "double"
+              "name": "thnad_epsilon",
+              "schema": "float"
             }
           ],
           "@type": [
@@ -175,15 +175,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_iota;1",
+        "@id": "dtmi:example:thnad_iota;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:humpf_eta;1",
+          "@id": "dtmi:example:thnad_eta;1",
           "fields": [
             {
-              "name": "humpf_theta",
-              "schema": "duration"
+              "name": "thnad_theta",
+              "schema": "integer"
             }
           ],
           "@type": [
diff --git a/DTDL/v2/spec/Requirement-ClassObjectTypeStringOrArrayV2.json b/DTDL/v2/spec/Requirement-ClassObjectTypeStringOrArrayV2.json
index a3540b8e..4369aab9 100644
--- a/DTDL/v2/spec/Requirement-ClassObjectTypeStringOrArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassObjectTypeStringOrArrayV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_wum;1",
+        "@id": "dtmi:example:snee_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_omega;1",
+          "@id": "dtmi:example:snee_omega;1",
           "fields": [
             {
-              "name": "wum_yuzz",
-              "schema": "date"
+              "name": "snee_yuzz",
+              "schema": "double"
             }
           ],
           "@type": 626
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_fuddle;1",
+        "@id": "dtmi:example:snee_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:wum_um;1",
+          "@id": "dtmi:example:snee_um;1",
           "fields": [
             {
-              "name": "wum_humpf",
-              "schema": "dateTime"
+              "name": "snee_humpf",
+              "schema": "duration"
             }
           ],
           "@type": 626
@@ -54,14 +54,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_snee;1",
+        "@id": "dtmi:example:snee_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_glikk;1",
+          "@id": "dtmi:example:snee_glikk;1",
           "fields": [
             {
-              "name": "wum_nuh",
-              "schema": "double"
+              "name": "snee_nuh",
+              "schema": "float"
             }
           ],
           "@type": null
@@ -77,15 +77,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_spazz;1",
+        "@id": "dtmi:example:snee_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:wum_quan;1",
+          "@id": "dtmi:example:snee_quan;1",
           "fields": [
             {
-              "name": "wum_thnad",
-              "schema": "duration"
+              "name": "snee_thnad",
+              "schema": "integer"
             }
           ],
           "@type": null
@@ -101,14 +101,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_jogg;1",
+        "@id": "dtmi:example:snee_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_floob;1",
+          "@id": "dtmi:example:snee_floob;1",
           "fields": [
             {
-              "name": "wum_zatz",
-              "schema": "float"
+              "name": "snee_zatz",
+              "schema": "long"
             }
           ],
           "@type": true
@@ -124,15 +124,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_yekk;1",
+        "@id": "dtmi:example:snee_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:wum_flunn;1",
+          "@id": "dtmi:example:snee_flunn;1",
           "fields": [
             {
-              "name": "wum_itch",
-              "schema": "integer"
+              "name": "snee_itch",
+              "schema": "string"
             }
           ],
           "@type": true
@@ -148,14 +148,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_alpha;1",
+        "@id": "dtmi:example:quan_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_vroo;1",
+          "@id": "dtmi:example:snee_vroo;1",
           "fields": [
             {
-              "name": "wum_hi",
-              "schema": "long"
+              "name": "snee_hi",
+              "schema": "time"
             }
           ],
           "@type": {}
@@ -171,15 +171,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_delta;1",
+        "@id": "dtmi:example:quan_delta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:um_beta;1",
+          "@id": "dtmi:example:quan_beta;1",
           "fields": [
             {
-              "name": "um_gamma",
-              "schema": "string"
+              "name": "quan_gamma",
+              "schema": "boolean"
             }
           ],
           "@type": {}
@@ -195,14 +195,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_eta;1",
+        "@id": "dtmi:example:quan_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_epsilon;1",
+          "@id": "dtmi:example:quan_epsilon;1",
           "fields": [
             {
-              "name": "um_zeta",
-              "schema": "time"
+              "name": "quan_zeta",
+              "schema": "date"
             }
           ],
           "@type": [
@@ -220,15 +220,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_kappa;1",
+        "@id": "dtmi:example:quan_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:um_theta;1",
+          "@id": "dtmi:example:quan_theta;1",
           "fields": [
             {
-              "name": "um_iota",
-              "schema": "boolean"
+              "name": "quan_iota",
+              "schema": "dateTime"
             }
           ],
           "@type": [
@@ -246,14 +246,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_nu;1",
+        "@id": "dtmi:example:quan_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_lambda;1",
+          "@id": "dtmi:example:quan_lambda;1",
           "fields": [
             {
-              "name": "um_mu",
-              "schema": "date"
+              "name": "quan_mu",
+              "schema": "double"
             }
           ],
           "@type": [
@@ -271,15 +271,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_pi;1",
+        "@id": "dtmi:example:quan_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:um_xi;1",
+          "@id": "dtmi:example:quan_xi;1",
           "fields": [
             {
-              "name": "um_omicron",
-              "schema": "dateTime"
+              "name": "quan_omicron",
+              "schema": "duration"
             }
           ],
           "@type": [
@@ -297,14 +297,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_tau;1",
+        "@id": "dtmi:example:quan_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_rho;1",
+          "@id": "dtmi:example:quan_rho;1",
           "fields": [
             {
-              "name": "um_sigma",
-              "schema": "double"
+              "name": "quan_sigma",
+              "schema": "float"
             }
           ],
           "@type": [
@@ -322,15 +322,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_chi;1",
+        "@id": "dtmi:example:quan_chi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:um_upsilon;1",
+          "@id": "dtmi:example:quan_upsilon;1",
           "fields": [
             {
-              "name": "um_phi",
-              "schema": "duration"
+              "name": "quan_phi",
+              "schema": "integer"
             }
           ],
           "@type": [
@@ -348,14 +348,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_yuzz;1",
+        "@id": "dtmi:example:quan_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_psi;1",
+          "@id": "dtmi:example:quan_psi;1",
           "fields": [
             {
-              "name": "um_omega",
-              "schema": "float"
+              "name": "quan_omega",
+              "schema": "long"
             }
           ],
           "@type": [
@@ -373,15 +373,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_humpf;1",
+        "@id": "dtmi:example:quan_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:um_wum;1",
+          "@id": "dtmi:example:quan_wum;1",
           "fields": [
             {
-              "name": "um_um",
-              "schema": "integer"
+              "name": "quan_um",
+              "schema": "string"
             }
           ],
           "@type": [
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyContextConformsV2.json b/DTDL/v2/spec/Requirement-ClassPropertyContextConformsV2.json
index 597d5358..9a776bf8 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyContextConformsV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyContextConformsV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_yuzz;1",
+        "@id": "dtmi:example:yuzz_delta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:sigma_omega;1",
+          "@id": "dtmi:example:yuzz_gamma;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "sigma_psi",
-            "schema": "double",
+            "name": "yuzz_beta",
+            "schema": "time",
             "@context": "dtmi:iotcentral:context;2"
           }
         }
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_humpf;1",
+        "@id": "dtmi:example:yuzz_eta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:sigma_um;1",
+          "@id": "dtmi:example:yuzz_zeta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "sigma_wum",
-            "schema": "duration",
+            "name": "yuzz_epsilon",
+            "schema": "boolean",
             "@context": []
           }
         }
@@ -53,15 +53,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_nuh;1",
+        "@id": "dtmi:example:yuzz_kappa;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:sigma_glikk;1",
+          "@id": "dtmi:example:yuzz_iota;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "sigma_fuddle",
-            "schema": "float",
+            "name": "yuzz_theta",
+            "schema": "date",
             "@context": [
               "dtmi:iotcentral:context;2"
             ]
@@ -78,15 +78,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_thnad;1",
+        "@id": "dtmi:example:yuzz_nu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:sigma_quan;1",
+          "@id": "dtmi:example:yuzz_mu;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "sigma_snee",
-            "schema": "integer",
+            "name": "yuzz_lambda",
+            "schema": "dateTime",
             "@context": null
           }
         }
@@ -101,15 +101,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_zatz;1",
+        "@id": "dtmi:example:yuzz_pi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:sigma_floob;1",
+          "@id": "dtmi:example:yuzz_omicron;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "sigma_spazz",
-            "schema": "long",
+            "name": "yuzz_xi",
+            "schema": "double",
             "@context": 626
           }
         }
@@ -124,15 +124,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_itch;1",
+        "@id": "dtmi:example:yuzz_tau;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:sigma_flunn;1",
+          "@id": "dtmi:example:yuzz_sigma;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "sigma_jogg",
-            "schema": "string",
+            "name": "yuzz_rho",
+            "schema": "duration",
             "@context": true
           }
         }
@@ -147,15 +147,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_hi;1",
+        "@id": "dtmi:example:yuzz_chi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:sigma_vroo;1",
+          "@id": "dtmi:example:yuzz_phi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "sigma_yekk",
-            "schema": "time",
+            "name": "yuzz_upsilon",
+            "schema": "float",
             "@context": [
               null
             ]
@@ -172,15 +172,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_gamma;1",
+        "@id": "dtmi:example:yuzz_yuzz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_beta;1",
+          "@id": "dtmi:example:yuzz_omega;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "tau_alpha",
-            "schema": "boolean",
+            "name": "yuzz_psi",
+            "schema": "integer",
             "@context": [
               626
             ]
@@ -197,15 +197,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_zeta;1",
+        "@id": "dtmi:example:yuzz_humpf;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_epsilon;1",
+          "@id": "dtmi:example:yuzz_um;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "tau_delta",
-            "schema": "date",
+            "name": "yuzz_wum",
+            "schema": "long",
             "@context": [
               true
             ]
@@ -222,16 +222,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_iota;1",
+        "@id": "dtmi:example:yuzz_nuh;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_theta;1",
+          "@id": "dtmi:example:yuzz_glikk;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "tau_eta",
-            "schema": "dateTime",
-            "@context": {}
+            "name": "yuzz_fuddle",
+            "schema": "string",
+            "@context": "dtmi:iotcentral:context"
           }
         }
       }
@@ -245,18 +245,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_mu;1",
+        "@id": "dtmi:example:yuzz_thnad;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_lambda;1",
+          "@id": "dtmi:example:yuzz_quan;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "tau_kappa",
-            "schema": "double",
-            "@context": [
-              {}
-            ]
+            "name": "yuzz_snee",
+            "schema": "time",
+            "@context": "http://iotcentral/context/2"
           }
         }
       }
@@ -270,16 +268,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_omicron;1",
+        "@id": "dtmi:example:yuzz_zatz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_xi;1",
+          "@id": "dtmi:example:yuzz_floob;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "tau_nu",
-            "schema": "duration",
-            "@context": "dtmi:iotcentral:context"
+            "name": "yuzz_spazz",
+            "schema": "boolean",
+            "@context": "iotcentral;2"
           }
         }
       }
@@ -293,16 +291,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_sigma;1",
+        "@id": "dtmi:example:yuzz_itch;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_rho;1",
+          "@id": "dtmi:example:yuzz_flunn;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "tau_pi",
-            "schema": "float",
-            "@context": "http://iotcentral/context/2"
+            "name": "yuzz_jogg",
+            "schema": "date",
+            "@context": {}
           }
         }
       }
@@ -316,16 +314,70 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_phi;1",
+        "@id": "dtmi:example:yuzz_hi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_upsilon;1",
+          "@id": "dtmi:example:yuzz_vroo;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "tau_tau",
-            "schema": "integer",
-            "@context": "iotcentral;2"
+            "name": "yuzz_yekk",
+            "schema": "dateTime",
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:wum_gamma;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:wum_beta;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "wum_alpha",
+            "schema": "double",
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:wum_zeta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:wum_epsilon;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "wum_delta",
+            "schema": "duration",
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyCotypePropertyPresentV2.json b/DTDL/v2/spec/Requirement-ClassPropertyCotypePropertyPresentV2.json
index f6ab2bfa..5a954cc3 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyCotypePropertyPresentV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyCotypePropertyPresentV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_zeta;1",
+        "@id": "dtmi:example:spazz_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "fuddle_epsilon",
+          "name": "spazz_quan",
           "schema": "long"
         }
       }
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_theta;1",
+        "@id": "dtmi:example:spazz_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,7 +36,7 @@
             "Property",
             "Luminosity"
           ],
-          "name": "fuddle_eta",
+          "name": "spazz_spazz",
           "schema": "double"
         }
       }
@@ -50,14 +50,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_kappa;1",
+        "@id": "dtmi:example:spazz_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "fuddle_iota",
+          "name": "spazz_zatz",
           "schema": "float"
         }
       }
@@ -71,7 +71,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_mu;1",
+        "@id": "dtmi:example:spazz_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -79,7 +79,7 @@
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "fuddle_lambda",
+          "name": "spazz_flunn",
           "schema": "integer"
         }
       }
@@ -93,14 +93,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_xi;1",
+        "@id": "dtmi:example:spazz_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "fuddle_nu",
+          "name": "spazz_yekk",
           "schema": "long",
           "unit": null
         }
@@ -115,7 +115,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_pi;1",
+        "@id": "dtmi:example:floob_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -123,7 +123,7 @@
             "Property",
             "Luminosity"
           ],
-          "name": "fuddle_omicron",
+          "name": "spazz_hi",
           "schema": "double",
           "unit": null
         }
@@ -138,14 +138,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_sigma;1",
+        "@id": "dtmi:example:floob_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "fuddle_rho",
+          "name": "floob_beta",
           "schema": "float",
           "unit": null
         }
@@ -160,7 +160,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_upsilon;1",
+        "@id": "dtmi:example:floob_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -168,7 +168,7 @@
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "fuddle_tau",
+          "name": "floob_delta",
           "schema": "integer",
           "unit": null
         }
@@ -183,14 +183,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_chi;1",
+        "@id": "dtmi:example:floob_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "fuddle_phi",
+          "name": "floob_zeta",
           "schema": "long",
           "unit": true
         }
@@ -205,7 +205,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_omega;1",
+        "@id": "dtmi:example:floob_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -213,7 +213,7 @@
             "Property",
             "Luminosity"
           ],
-          "name": "fuddle_psi",
+          "name": "floob_theta",
           "schema": "double",
           "unit": true
         }
@@ -228,14 +228,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_wum;1",
+        "@id": "dtmi:example:floob_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "fuddle_yuzz",
+          "name": "floob_kappa",
           "schema": "float",
           "unit": true
         }
@@ -250,7 +250,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_humpf;1",
+        "@id": "dtmi:example:floob_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -258,7 +258,7 @@
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "fuddle_um",
+          "name": "floob_mu",
           "schema": "integer",
           "unit": true
         }
@@ -273,14 +273,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_glikk;1",
+        "@id": "dtmi:example:floob_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "fuddle_fuddle",
+          "name": "floob_xi",
           "schema": "long",
           "unit": 626
         }
@@ -295,7 +295,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_snee;1",
+        "@id": "dtmi:example:floob_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -303,7 +303,7 @@
             "Property",
             "Luminosity"
           ],
-          "name": "fuddle_nuh",
+          "name": "floob_pi",
           "schema": "double",
           "unit": 626
         }
@@ -318,14 +318,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_thnad;1",
+        "@id": "dtmi:example:floob_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "fuddle_quan",
+          "name": "floob_sigma",
           "schema": "float",
           "unit": 626
         }
@@ -340,7 +340,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_floob;1",
+        "@id": "dtmi:example:floob_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -348,7 +348,7 @@
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "fuddle_spazz",
+          "name": "floob_upsilon",
           "schema": "integer",
           "unit": 626
         }
@@ -363,14 +363,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_jogg;1",
+        "@id": "dtmi:example:floob_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "fuddle_zatz",
+          "name": "floob_chi",
           "schema": "long",
           "unit": [
             null
@@ -387,7 +387,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_itch;1",
+        "@id": "dtmi:example:floob_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -395,7 +395,7 @@
             "Property",
             "Luminosity"
           ],
-          "name": "fuddle_flunn",
+          "name": "floob_omega",
           "schema": "double",
           "unit": [
             null
@@ -412,14 +412,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:fuddle_vroo;1",
+        "@id": "dtmi:example:floob_um;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "fuddle_yekk",
+          "name": "floob_wum",
           "schema": "float",
           "unit": [
             null
@@ -436,7 +436,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_alpha;1",
+        "@id": "dtmi:example:floob_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -444,7 +444,7 @@
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "fuddle_hi",
+          "name": "floob_humpf",
           "schema": "integer",
           "unit": [
             null
@@ -461,14 +461,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_gamma;1",
+        "@id": "dtmi:example:floob_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "glikk_beta",
+          "name": "floob_glikk",
           "schema": "long",
           "unit": [
             true
@@ -485,7 +485,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_epsilon;1",
+        "@id": "dtmi:example:floob_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -493,7 +493,7 @@
             "Property",
             "Luminosity"
           ],
-          "name": "glikk_delta",
+          "name": "floob_snee",
           "schema": "double",
           "unit": [
             true
@@ -510,14 +510,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_eta;1",
+        "@id": "dtmi:example:floob_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "glikk_zeta",
+          "name": "floob_thnad",
           "schema": "float",
           "unit": [
             true
@@ -534,7 +534,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_iota;1",
+        "@id": "dtmi:example:floob_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -542,7 +542,7 @@
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "glikk_theta",
+          "name": "floob_floob",
           "schema": "integer",
           "unit": [
             true
@@ -559,14 +559,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_lambda;1",
+        "@id": "dtmi:example:floob_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "glikk_kappa",
+          "name": "floob_jogg",
           "schema": "long",
           "unit": [
             626
@@ -583,7 +583,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_nu;1",
+        "@id": "dtmi:example:floob_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -591,7 +591,7 @@
             "Property",
             "Luminosity"
           ],
-          "name": "glikk_mu",
+          "name": "floob_itch",
           "schema": "double",
           "unit": [
             626
@@ -608,14 +608,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_omicron;1",
+        "@id": "dtmi:example:floob_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "glikk_xi",
+          "name": "floob_vroo",
           "schema": "float",
           "unit": [
             626
@@ -632,7 +632,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_rho;1",
+        "@id": "dtmi:example:zatz_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -640,7 +640,7 @@
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "glikk_pi",
+          "name": "zatz_alpha",
           "schema": "integer",
           "unit": [
             626
@@ -657,14 +657,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_tau;1",
+        "@id": "dtmi:example:zatz_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "glikk_sigma",
+          "name": "zatz_gamma",
           "schema": "long",
           "unit": {}
         }
@@ -679,7 +679,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_phi;1",
+        "@id": "dtmi:example:zatz_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -687,7 +687,7 @@
             "Property",
             "Luminosity"
           ],
-          "name": "glikk_upsilon",
+          "name": "zatz_epsilon",
           "schema": "double",
           "unit": {}
         }
@@ -702,14 +702,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_psi;1",
+        "@id": "dtmi:example:zatz_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "glikk_chi",
+          "name": "zatz_eta",
           "schema": "float",
           "unit": {}
         }
@@ -724,7 +724,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_yuzz;1",
+        "@id": "dtmi:example:zatz_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -732,7 +732,7 @@
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "glikk_omega",
+          "name": "zatz_iota",
           "schema": "integer",
           "unit": {}
         }
@@ -747,14 +747,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_um;1",
+        "@id": "dtmi:example:zatz_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "glikk_wum",
+          "name": "zatz_lambda",
           "schema": "long",
           "unit": [
             {}
@@ -771,7 +771,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_fuddle;1",
+        "@id": "dtmi:example:zatz_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -779,7 +779,7 @@
             "Property",
             "Luminosity"
           ],
-          "name": "glikk_humpf",
+          "name": "zatz_nu",
           "schema": "double",
           "unit": [
             {}
@@ -796,14 +796,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_nuh;1",
+        "@id": "dtmi:example:zatz_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "glikk_glikk",
+          "name": "zatz_omicron",
           "schema": "float",
           "unit": [
             {}
@@ -820,7 +820,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_quan;1",
+        "@id": "dtmi:example:zatz_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -828,7 +828,7 @@
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "glikk_snee",
+          "name": "zatz_rho",
           "schema": "integer",
           "unit": [
             {}
@@ -845,14 +845,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_spazz;1",
+        "@id": "dtmi:example:zatz_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "glikk_thnad",
+          "name": "zatz_tau",
           "schema": "long",
           "unit": []
         }
@@ -867,7 +867,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_zatz;1",
+        "@id": "dtmi:example:zatz_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -875,7 +875,7 @@
             "Property",
             "Luminosity"
           ],
-          "name": "glikk_floob",
+          "name": "zatz_phi",
           "schema": "double",
           "unit": []
         }
@@ -890,14 +890,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_flunn;1",
+        "@id": "dtmi:example:zatz_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "glikk_jogg",
+          "name": "zatz_psi",
           "schema": "float",
           "unit": []
         }
@@ -912,7 +912,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_yekk;1",
+        "@id": "dtmi:example:zatz_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -920,7 +920,7 @@
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "glikk_itch",
+          "name": "zatz_yuzz",
           "schema": "integer",
           "unit": []
         }
@@ -935,14 +935,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:glikk_hi;1",
+        "@id": "dtmi:example:zatz_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "glikk_vroo",
+          "name": "zatz_um",
           "schema": "long",
           "unit": "gigawatt"
         }
@@ -957,14 +957,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_beta;1",
+        "@id": "dtmi:example:zatz_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "nuh_alpha",
+          "name": "zatz_fuddle",
           "schema": "double",
           "unit": "gigawatt"
         }
@@ -979,14 +979,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_delta;1",
+        "@id": "dtmi:example:zatz_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "nuh_gamma",
+          "name": "zatz_nuh",
           "schema": "float",
           "unit": [
             "gigawatt"
@@ -1003,14 +1003,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_zeta;1",
+        "@id": "dtmi:example:zatz_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "nuh_epsilon",
+          "name": "zatz_quan",
           "schema": "integer",
           "unit": [
             "gigawatt"
@@ -1027,14 +1027,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_theta;1",
+        "@id": "dtmi:example:zatz_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "nuh_eta",
+          "name": "zatz_spazz",
           "schema": "long",
           "unit": [
             "gigawatt",
@@ -1052,7 +1052,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_kappa;1",
+        "@id": "dtmi:example:zatz_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1060,7 +1060,7 @@
             "Property",
             "Luminosity"
           ],
-          "name": "nuh_iota",
+          "name": "zatz_zatz",
           "schema": "double",
           "unit": [
             "gigawatt",
@@ -1078,14 +1078,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_mu;1",
+        "@id": "dtmi:example:zatz_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "nuh_lambda",
+          "name": "zatz_flunn",
           "schema": "float",
           "unit": [
             "gigawatt",
@@ -1103,7 +1103,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_xi;1",
+        "@id": "dtmi:example:zatz_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1111,7 +1111,7 @@
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "nuh_nu",
+          "name": "zatz_yekk",
           "schema": "integer",
           "unit": [
             "gigawatt",
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyCotypePropertyTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassPropertyCotypePropertyTermAndDtmiV2.json
index 7b42ed0e..b6274435 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyCotypePropertyTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyCotypePropertyTermAndDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_sigma;1",
+        "@id": "dtmi:example:itch_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "quan_rho",
+          "name": "itch_beta",
           "schema": "long",
           "unit": "gigawatt",
           "dtmi:dtdl:property:unit;2": "gigawatt"
@@ -30,7 +30,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_upsilon;1",
+        "@id": "dtmi:example:itch_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -38,7 +38,7 @@
             "Property",
             "Luminosity"
           ],
-          "name": "quan_tau",
+          "name": "itch_delta",
           "schema": "double",
           "unit": "gigawatt",
           "dtmi:dtdl:property:unit;2": "gigawatt"
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyCotypePropertyValueFromTableV2.json b/DTDL/v2/spec/Requirement-ClassPropertyCotypePropertyValueFromTableV2.json
index e32ce457..2fb4139d 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyCotypePropertyValueFromTableV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyCotypePropertyValueFromTableV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_pi;1",
+        "@id": "dtmi:example:jogg_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "nuh_omicron",
+          "name": "zatz_hi",
           "schema": "long",
           "unit": "dtmi:foo//bar"
         }
@@ -29,7 +29,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_sigma;1",
+        "@id": "dtmi:example:jogg_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -37,7 +37,7 @@
             "Property",
             "Luminosity"
           ],
-          "name": "nuh_rho",
+          "name": "jogg_beta",
           "schema": "double",
           "unit": "dtmi:foo//bar"
         }
@@ -52,14 +52,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_upsilon;1",
+        "@id": "dtmi:example:jogg_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "nuh_tau",
+          "name": "jogg_delta",
           "schema": "float",
           "unit": "dtmi:foo//bar"
         }
@@ -74,7 +74,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_chi;1",
+        "@id": "dtmi:example:jogg_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -82,7 +82,7 @@
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "nuh_phi",
+          "name": "jogg_zeta",
           "schema": "integer",
           "unit": "dtmi:foo//bar"
         }
@@ -97,14 +97,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_omega;1",
+        "@id": "dtmi:example:jogg_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "nuh_psi",
+          "name": "jogg_theta",
           "schema": "long",
           "unit": "http://foo.com/bar"
         }
@@ -119,7 +119,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_wum;1",
+        "@id": "dtmi:example:jogg_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -127,7 +127,7 @@
             "Property",
             "Luminosity"
           ],
-          "name": "nuh_yuzz",
+          "name": "jogg_kappa",
           "schema": "double",
           "unit": "http://foo.com/bar"
         }
@@ -142,14 +142,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_humpf;1",
+        "@id": "dtmi:example:jogg_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "nuh_um",
+          "name": "jogg_mu",
           "schema": "float",
           "unit": "http://foo.com/bar"
         }
@@ -164,7 +164,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_glikk;1",
+        "@id": "dtmi:example:jogg_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -172,7 +172,7 @@
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "nuh_fuddle",
+          "name": "jogg_xi",
           "schema": "integer",
           "unit": "http://foo.com/bar"
         }
@@ -187,14 +187,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_snee;1",
+        "@id": "dtmi:example:jogg_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "nuh_nuh",
+          "name": "jogg_pi",
           "schema": "long",
           "unit": "Foobar"
         }
@@ -209,7 +209,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_thnad;1",
+        "@id": "dtmi:example:jogg_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -217,7 +217,7 @@
             "Property",
             "Luminosity"
           ],
-          "name": "nuh_quan",
+          "name": "jogg_sigma",
           "schema": "double",
           "unit": "Foobar"
         }
@@ -232,14 +232,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_floob;1",
+        "@id": "dtmi:example:jogg_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "nuh_spazz",
+          "name": "jogg_upsilon",
           "schema": "float",
           "unit": "Foobar"
         }
@@ -254,7 +254,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_jogg;1",
+        "@id": "dtmi:example:jogg_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -262,7 +262,7 @@
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "nuh_zatz",
+          "name": "jogg_chi",
           "schema": "integer",
           "unit": "Foobar"
         }
@@ -277,14 +277,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_itch;1",
+        "@id": "dtmi:example:jogg_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "nuh_flunn",
+          "name": "jogg_omega",
           "schema": "long",
           "unit": "dtmi:foo:bar;1"
         }
@@ -299,7 +299,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_vroo;1",
+        "@id": "dtmi:example:jogg_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -307,7 +307,7 @@
             "Property",
             "Luminosity"
           ],
-          "name": "nuh_yekk",
+          "name": "jogg_wum",
           "schema": "double",
           "unit": "dtmi:foo:bar;1"
         }
@@ -322,14 +322,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_alpha;1",
+        "@id": "dtmi:example:jogg_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "nuh_hi",
+          "name": "jogg_humpf",
           "schema": "float",
           "unit": "dtmi:foo:bar;1"
         }
@@ -344,7 +344,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_gamma;1",
+        "@id": "dtmi:example:jogg_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -352,7 +352,7 @@
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "snee_beta",
+          "name": "jogg_glikk",
           "schema": "integer",
           "unit": "dtmi:foo:bar;1"
         }
@@ -367,14 +367,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_epsilon;1",
+        "@id": "dtmi:example:jogg_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "snee_delta",
+          "name": "jogg_snee",
           "schema": "long",
           "unit": "boolean"
         }
@@ -389,7 +389,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_eta;1",
+        "@id": "dtmi:example:jogg_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -397,7 +397,7 @@
             "Property",
             "Luminosity"
           ],
-          "name": "snee_zeta",
+          "name": "jogg_thnad",
           "schema": "double",
           "unit": "boolean"
         }
@@ -412,14 +412,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_iota;1",
+        "@id": "dtmi:example:jogg_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "snee_theta",
+          "name": "jogg_floob",
           "schema": "float",
           "unit": "boolean"
         }
@@ -434,7 +434,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_lambda;1",
+        "@id": "dtmi:example:jogg_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -442,7 +442,7 @@
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "snee_kappa",
+          "name": "jogg_jogg",
           "schema": "integer",
           "unit": "boolean"
         }
@@ -457,14 +457,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_nu;1",
+        "@id": "dtmi:example:jogg_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "snee_mu",
+          "name": "jogg_itch",
           "schema": "long",
           "unit": "gigawatt"
         }
@@ -479,14 +479,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_omicron;1",
+        "@id": "dtmi:example:jogg_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "snee_xi",
+          "name": "jogg_vroo",
           "schema": "double",
           "unit": "gigawatt"
         }
@@ -501,14 +501,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_rho;1",
+        "@id": "dtmi:example:flunn_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "snee_pi",
+          "name": "flunn_alpha",
           "schema": "float",
           "unit": "dtmi:standard:unit:gigawatt;2"
         }
@@ -523,14 +523,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_tau;1",
+        "@id": "dtmi:example:flunn_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "snee_sigma",
+          "name": "flunn_gamma",
           "schema": "integer",
           "unit": "dtmi:standard:unit:gigawatt;2"
         }
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyCotypePropertyValueMatchesCotypeV2.json b/DTDL/v2/spec/Requirement-ClassPropertyCotypePropertyValueMatchesCotypeV2.json
index 5b94ede3..2ed350a9 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyCotypePropertyValueMatchesCotypeV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyCotypePropertyValueMatchesCotypeV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_fuddle;1",
+        "@id": "dtmi:example:flunn_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "snee_humpf",
+          "name": "flunn_nu",
           "schema": "long",
           "unit": "gigawatt"
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_nuh;1",
+        "@id": "dtmi:example:flunn_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "snee_glikk",
+          "name": "flunn_omicron",
           "schema": "double",
           "unit": "gigawatt"
         }
@@ -51,14 +51,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_quan;1",
+        "@id": "dtmi:example:flunn_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "snee_snee",
+          "name": "flunn_rho",
           "schema": "float",
           "unit": "dtmi:standard:unit:gigawatt;2"
         }
@@ -73,14 +73,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_spazz;1",
+        "@id": "dtmi:example:flunn_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "snee_thnad",
+          "name": "flunn_tau",
           "schema": "integer",
           "unit": "dtmi:standard:unit:gigawatt;2"
         }
@@ -95,14 +95,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_zatz;1",
+        "@id": "dtmi:example:flunn_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "snee_floob",
+          "name": "flunn_phi",
           "schema": "long",
           "unit": "lumen"
         }
@@ -117,7 +117,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_flunn;1",
+        "@id": "dtmi:example:flunn_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -125,7 +125,7 @@
             "Property",
             "Luminosity"
           ],
-          "name": "snee_jogg",
+          "name": "flunn_psi",
           "schema": "double",
           "unit": "lumen"
         }
@@ -140,14 +140,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_yekk;1",
+        "@id": "dtmi:example:flunn_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "snee_itch",
+          "name": "flunn_yuzz",
           "schema": "float",
           "unit": "lumen"
         }
@@ -162,7 +162,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_hi;1",
+        "@id": "dtmi:example:flunn_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -170,7 +170,7 @@
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "snee_vroo",
+          "name": "flunn_um",
           "schema": "integer",
           "unit": "lumen"
         }
@@ -185,14 +185,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_beta;1",
+        "@id": "dtmi:example:flunn_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminosity"
           ],
-          "name": "quan_alpha",
+          "name": "flunn_fuddle",
           "schema": "long",
           "unit": "dtmi:standard:unit:lumen;2"
         }
@@ -207,7 +207,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_delta;1",
+        "@id": "dtmi:example:flunn_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -215,7 +215,7 @@
             "Property",
             "Luminosity"
           ],
-          "name": "quan_gamma",
+          "name": "flunn_nuh",
           "schema": "double",
           "unit": "dtmi:standard:unit:lumen;2"
         }
@@ -230,14 +230,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_zeta;1",
+        "@id": "dtmi:example:flunn_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "quan_epsilon",
+          "name": "flunn_quan",
           "schema": "float",
           "unit": "dtmi:standard:unit:lumen;2"
         }
@@ -252,7 +252,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_theta;1",
+        "@id": "dtmi:example:flunn_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -260,7 +260,7 @@
             "Property",
             "dtmi:standard:class:Luminosity;2"
           ],
-          "name": "quan_eta",
+          "name": "flunn_spazz",
           "schema": "integer",
           "unit": "dtmi:standard:unit:lumen;2"
         }
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyCotypeRequiresPropertySchemaValueV2.json b/DTDL/v2/spec/Requirement-ClassPropertyCotypeRequiresPropertySchemaValueV2.json
index 144e3226..056ad995 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyCotypeRequiresPropertySchemaValueV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyCotypeRequiresPropertySchemaValueV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_humpf;1",
+        "@id": "dtmi:example:phi_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "AngularAcceleration"
           ],
-          "name": "xi_um",
+          "name": "phi_zeta",
           "schema": "asynchronous",
           "unit": "radianPerSecondSquared"
         }
@@ -29,7 +29,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_glikk;1",
+        "@id": "dtmi:example:phi_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -37,7 +37,7 @@
             "Property",
             "AngularAcceleration"
           ],
-          "name": "xi_fuddle",
+          "name": "phi_theta",
           "schema": "asynchronous",
           "unit": "radianPerSecondSquared"
         }
@@ -52,14 +52,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_snee;1",
+        "@id": "dtmi:example:phi_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "AngularAcceleration"
           ],
-          "name": "xi_nuh",
+          "name": "phi_kappa",
           "schema": "dtmi:dtdl:instance:CommandType:asynchronous;2",
           "unit": "radianPerSecondSquared"
         }
@@ -74,7 +74,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_thnad;1",
+        "@id": "dtmi:example:phi_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -82,7 +82,7 @@
             "Property",
             "AngularAcceleration"
           ],
-          "name": "xi_quan",
+          "name": "phi_mu",
           "schema": "dtmi:dtdl:instance:CommandType:asynchronous;2",
           "unit": "radianPerSecondSquared"
         }
@@ -97,14 +97,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_floob;1",
+        "@id": "dtmi:example:phi_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "AngularVelocity"
           ],
-          "name": "xi_spazz",
+          "name": "phi_xi",
           "schema": "synchronous",
           "unit": "degreePerSecond"
         }
@@ -119,7 +119,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_jogg;1",
+        "@id": "dtmi:example:phi_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -127,7 +127,7 @@
             "Property",
             "AngularVelocity"
           ],
-          "name": "xi_zatz",
+          "name": "phi_pi",
           "schema": "synchronous",
           "unit": "degreePerSecond"
         }
@@ -142,14 +142,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_itch;1",
+        "@id": "dtmi:example:phi_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "AngularVelocity"
           ],
-          "name": "xi_flunn",
+          "name": "phi_sigma",
           "schema": "dtmi:dtdl:instance:CommandType:synchronous;2",
           "unit": "degreePerSecond"
         }
@@ -164,7 +164,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_vroo;1",
+        "@id": "dtmi:example:phi_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -172,7 +172,7 @@
             "Property",
             "AngularVelocity"
           ],
-          "name": "xi_yekk",
+          "name": "phi_upsilon",
           "schema": "dtmi:dtdl:instance:CommandType:synchronous;2",
           "unit": "degreePerSecond"
         }
@@ -187,14 +187,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_alpha;1",
+        "@id": "dtmi:example:phi_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Area"
           ],
-          "name": "xi_hi",
+          "name": "phi_chi",
           "schema": "boolean",
           "unit": "acre"
         }
@@ -209,7 +209,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_gamma;1",
+        "@id": "dtmi:example:phi_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -217,7 +217,7 @@
             "Property",
             "Area"
           ],
-          "name": "omicron_beta",
+          "name": "phi_omega",
           "schema": "boolean",
           "unit": "acre"
         }
@@ -232,14 +232,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_epsilon;1",
+        "@id": "dtmi:example:phi_um;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Area"
           ],
-          "name": "omicron_delta",
+          "name": "phi_wum",
           "schema": "dtmi:dtdl:instance:Schema:boolean;2",
           "unit": "acre"
         }
@@ -254,7 +254,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_eta;1",
+        "@id": "dtmi:example:phi_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -262,7 +262,7 @@
             "Property",
             "Area"
           ],
-          "name": "omicron_zeta",
+          "name": "phi_humpf",
           "schema": "dtmi:dtdl:instance:Schema:boolean;2",
           "unit": "acre"
         }
@@ -277,14 +277,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_iota;1",
+        "@id": "dtmi:example:phi_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Capacitance"
           ],
-          "name": "omicron_theta",
+          "name": "phi_glikk",
           "schema": "date",
           "unit": "farad"
         }
@@ -299,7 +299,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_lambda;1",
+        "@id": "dtmi:example:phi_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -307,7 +307,7 @@
             "Property",
             "Capacitance"
           ],
-          "name": "omicron_kappa",
+          "name": "phi_snee",
           "schema": "date",
           "unit": "farad"
         }
@@ -322,14 +322,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_nu;1",
+        "@id": "dtmi:example:phi_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Capacitance"
           ],
-          "name": "omicron_mu",
+          "name": "phi_thnad",
           "schema": "dtmi:dtdl:instance:Schema:date;2",
           "unit": "farad"
         }
@@ -344,7 +344,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_omicron;1",
+        "@id": "dtmi:example:phi_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -352,7 +352,7 @@
             "Property",
             "Capacitance"
           ],
-          "name": "omicron_xi",
+          "name": "phi_floob",
           "schema": "dtmi:dtdl:instance:Schema:date;2",
           "unit": "farad"
         }
@@ -367,14 +367,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_rho;1",
+        "@id": "dtmi:example:phi_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Current"
           ],
-          "name": "omicron_pi",
+          "name": "phi_jogg",
           "schema": "dateTime",
           "unit": "ampere"
         }
@@ -389,7 +389,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_tau;1",
+        "@id": "dtmi:example:phi_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -397,7 +397,7 @@
             "Property",
             "Current"
           ],
-          "name": "omicron_sigma",
+          "name": "phi_itch",
           "schema": "dateTime",
           "unit": "ampere"
         }
@@ -412,14 +412,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_phi;1",
+        "@id": "dtmi:example:phi_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Current"
           ],
-          "name": "omicron_upsilon",
+          "name": "phi_vroo",
           "schema": "dtmi:dtdl:instance:Schema:dateTime;2",
           "unit": "ampere"
         }
@@ -434,7 +434,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_psi;1",
+        "@id": "dtmi:example:chi_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -442,7 +442,7 @@
             "Property",
             "Current"
           ],
-          "name": "omicron_chi",
+          "name": "chi_alpha",
           "schema": "dtmi:dtdl:instance:Schema:dateTime;2",
           "unit": "ampere"
         }
@@ -457,14 +457,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_yuzz;1",
+        "@id": "dtmi:example:chi_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "DataRate"
           ],
-          "name": "omicron_omega",
+          "name": "chi_gamma",
           "schema": "double",
           "unit": "bitPerSecond"
         }
@@ -479,14 +479,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_um;1",
+        "@id": "dtmi:example:chi_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "DataRate"
           ],
-          "name": "omicron_wum",
+          "name": "chi_epsilon",
           "schema": "dtmi:dtdl:instance:Schema:double;2",
           "unit": "bitPerSecond"
         }
@@ -501,14 +501,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_fuddle;1",
+        "@id": "dtmi:example:chi_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "DataSize"
           ],
-          "name": "omicron_humpf",
+          "name": "chi_eta",
           "schema": "duration",
           "unit": "bit"
         }
@@ -523,7 +523,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_nuh;1",
+        "@id": "dtmi:example:chi_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -531,7 +531,7 @@
             "Property",
             "DataSize"
           ],
-          "name": "omicron_glikk",
+          "name": "chi_iota",
           "schema": "duration",
           "unit": "bit"
         }
@@ -546,14 +546,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_quan;1",
+        "@id": "dtmi:example:chi_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "DataSize"
           ],
-          "name": "omicron_snee",
+          "name": "chi_lambda",
           "schema": "dtmi:dtdl:instance:Schema:duration;2",
           "unit": "bit"
         }
@@ -568,7 +568,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_spazz;1",
+        "@id": "dtmi:example:chi_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -576,7 +576,7 @@
             "Property",
             "DataSize"
           ],
-          "name": "omicron_thnad",
+          "name": "chi_nu",
           "schema": "dtmi:dtdl:instance:Schema:duration;2",
           "unit": "bit"
         }
@@ -591,14 +591,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_zatz;1",
+        "@id": "dtmi:example:chi_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Density"
           ],
-          "name": "omicron_floob",
+          "name": "chi_omicron",
           "schema": "float",
           "unit": "gramPerCubicMetre"
         }
@@ -613,14 +613,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_flunn;1",
+        "@id": "dtmi:example:chi_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Density"
           ],
-          "name": "omicron_jogg",
+          "name": "chi_rho",
           "schema": "dtmi:dtdl:instance:Schema:float;2",
           "unit": "gramPerCubicMetre"
         }
@@ -635,14 +635,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_yekk;1",
+        "@id": "dtmi:example:chi_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Distance"
           ],
-          "name": "omicron_itch",
+          "name": "chi_tau",
           "schema": "integer",
           "unit": "astronomicalUnit"
         }
@@ -657,14 +657,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_hi;1",
+        "@id": "dtmi:example:chi_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Distance"
           ],
-          "name": "omicron_vroo",
+          "name": "chi_phi",
           "schema": "dtmi:dtdl:instance:Schema:integer;2",
           "unit": "astronomicalUnit"
         }
@@ -679,14 +679,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_beta;1",
+        "@id": "dtmi:example:chi_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "ElectricCharge"
           ],
-          "name": "pi_alpha",
+          "name": "chi_psi",
           "schema": "long",
           "unit": "coulomb"
         }
@@ -701,14 +701,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_delta;1",
+        "@id": "dtmi:example:chi_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "ElectricCharge"
           ],
-          "name": "pi_gamma",
+          "name": "chi_yuzz",
           "schema": "dtmi:dtdl:instance:Schema:long;2",
           "unit": "coulomb"
         }
@@ -723,14 +723,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_zeta;1",
+        "@id": "dtmi:example:chi_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Energy"
           ],
-          "name": "pi_epsilon",
+          "name": "chi_um",
           "schema": "string",
           "unit": "electronvolt"
         }
@@ -745,7 +745,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_theta;1",
+        "@id": "dtmi:example:chi_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -753,7 +753,7 @@
             "Property",
             "Energy"
           ],
-          "name": "pi_eta",
+          "name": "chi_fuddle",
           "schema": "string",
           "unit": "electronvolt"
         }
@@ -768,14 +768,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_kappa;1",
+        "@id": "dtmi:example:chi_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Energy"
           ],
-          "name": "pi_iota",
+          "name": "chi_nuh",
           "schema": "dtmi:dtdl:instance:Schema:string;2",
           "unit": "electronvolt"
         }
@@ -790,7 +790,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_mu;1",
+        "@id": "dtmi:example:chi_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -798,7 +798,7 @@
             "Property",
             "Energy"
           ],
-          "name": "pi_lambda",
+          "name": "chi_quan",
           "schema": "dtmi:dtdl:instance:Schema:string;2",
           "unit": "electronvolt"
         }
@@ -813,14 +813,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_xi;1",
+        "@id": "dtmi:example:chi_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Force"
           ],
-          "name": "pi_nu",
+          "name": "chi_spazz",
           "schema": "time",
           "unit": "newton"
         }
@@ -835,7 +835,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_pi;1",
+        "@id": "dtmi:example:chi_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -843,7 +843,7 @@
             "Property",
             "Force"
           ],
-          "name": "pi_omicron",
+          "name": "chi_zatz",
           "schema": "time",
           "unit": "newton"
         }
@@ -858,14 +858,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_sigma;1",
+        "@id": "dtmi:example:chi_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Force"
           ],
-          "name": "pi_rho",
+          "name": "chi_flunn",
           "schema": "dtmi:dtdl:instance:Schema:time;2",
           "unit": "newton"
         }
@@ -880,7 +880,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_upsilon;1",
+        "@id": "dtmi:example:chi_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -888,7 +888,7 @@
             "Property",
             "Force"
           ],
-          "name": "pi_tau",
+          "name": "chi_yekk",
           "schema": "dtmi:dtdl:instance:Schema:time;2",
           "unit": "newton"
         }
@@ -903,14 +903,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_chi;1",
+        "@id": "dtmi:example:psi_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Frequency"
           ],
-          "name": "pi_phi",
+          "name": "chi_hi",
           "schema": "geopoint",
           "unit": "gigahertz"
         }
@@ -925,7 +925,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_omega;1",
+        "@id": "dtmi:example:psi_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -933,7 +933,7 @@
             "Property",
             "Frequency"
           ],
-          "name": "pi_psi",
+          "name": "psi_beta",
           "schema": "geopoint",
           "unit": "gigahertz"
         }
@@ -948,14 +948,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_wum;1",
+        "@id": "dtmi:example:psi_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Frequency"
           ],
-          "name": "pi_yuzz",
+          "name": "psi_delta",
           "schema": "dtmi:iotcentral:schema:geopoint;2",
           "unit": "gigahertz"
         }
@@ -970,7 +970,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_humpf;1",
+        "@id": "dtmi:example:psi_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -978,7 +978,7 @@
             "Property",
             "Frequency"
           ],
-          "name": "pi_um",
+          "name": "psi_zeta",
           "schema": "dtmi:iotcentral:schema:geopoint;2",
           "unit": "gigahertz"
         }
@@ -993,14 +993,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_glikk;1",
+        "@id": "dtmi:example:psi_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Humidity"
           ],
-          "name": "pi_fuddle",
+          "name": "psi_theta",
           "schema": "vector",
           "unit": "gramPerCubicMetre"
         }
@@ -1015,7 +1015,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_snee;1",
+        "@id": "dtmi:example:psi_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1023,7 +1023,7 @@
             "Property",
             "Humidity"
           ],
-          "name": "pi_nuh",
+          "name": "psi_kappa",
           "schema": "vector",
           "unit": "gramPerCubicMetre"
         }
@@ -1038,14 +1038,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_thnad;1",
+        "@id": "dtmi:example:psi_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Humidity"
           ],
-          "name": "pi_quan",
+          "name": "psi_mu",
           "schema": "dtmi:iotcentral:schema:vector;2",
           "unit": "gramPerCubicMetre"
         }
@@ -1060,7 +1060,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_floob;1",
+        "@id": "dtmi:example:psi_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1068,7 +1068,7 @@
             "Property",
             "Humidity"
           ],
-          "name": "pi_spazz",
+          "name": "psi_xi",
           "schema": "dtmi:iotcentral:schema:vector;2",
           "unit": "gramPerCubicMetre"
         }
@@ -1083,14 +1083,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_jogg;1",
+        "@id": "dtmi:example:psi_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Illuminance"
           ],
-          "name": "pi_zatz",
+          "name": "psi_pi",
           "schema": "lineString",
           "unit": "footcandle"
         }
@@ -1105,7 +1105,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_itch;1",
+        "@id": "dtmi:example:psi_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1113,7 +1113,7 @@
             "Property",
             "Illuminance"
           ],
-          "name": "pi_flunn",
+          "name": "psi_sigma",
           "schema": "lineString",
           "unit": "footcandle"
         }
@@ -1128,14 +1128,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_vroo;1",
+        "@id": "dtmi:example:psi_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Illuminance"
           ],
-          "name": "pi_yekk",
+          "name": "psi_upsilon",
           "schema": "dtmi:standard:schema:geospatial:lineString;2",
           "unit": "footcandle"
         }
@@ -1150,7 +1150,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_alpha;1",
+        "@id": "dtmi:example:psi_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1158,7 +1158,7 @@
             "Property",
             "Illuminance"
           ],
-          "name": "pi_hi",
+          "name": "psi_chi",
           "schema": "dtmi:standard:schema:geospatial:lineString;2",
           "unit": "footcandle"
         }
@@ -1173,14 +1173,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_gamma;1",
+        "@id": "dtmi:example:psi_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Inductance"
           ],
-          "name": "rho_beta",
+          "name": "psi_omega",
           "schema": "multiLineString",
           "unit": "henry"
         }
@@ -1195,7 +1195,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_epsilon;1",
+        "@id": "dtmi:example:psi_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1203,7 +1203,7 @@
             "Property",
             "Inductance"
           ],
-          "name": "rho_delta",
+          "name": "psi_wum",
           "schema": "multiLineString",
           "unit": "henry"
         }
@@ -1218,14 +1218,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_eta;1",
+        "@id": "dtmi:example:psi_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Inductance"
           ],
-          "name": "rho_zeta",
+          "name": "psi_humpf",
           "schema": "dtmi:standard:schema:geospatial:multiLineString;2",
           "unit": "henry"
         }
@@ -1240,7 +1240,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_iota;1",
+        "@id": "dtmi:example:psi_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1248,7 +1248,7 @@
             "Property",
             "Inductance"
           ],
-          "name": "rho_theta",
+          "name": "psi_glikk",
           "schema": "dtmi:standard:schema:geospatial:multiLineString;2",
           "unit": "henry"
         }
@@ -1263,14 +1263,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_lambda;1",
+        "@id": "dtmi:example:psi_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Latitude"
           ],
-          "name": "rho_kappa",
+          "name": "psi_snee",
           "schema": "multiPoint",
           "unit": "degreeOfArc"
         }
@@ -1285,7 +1285,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_nu;1",
+        "@id": "dtmi:example:psi_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1293,7 +1293,7 @@
             "Property",
             "Latitude"
           ],
-          "name": "rho_mu",
+          "name": "psi_thnad",
           "schema": "multiPoint",
           "unit": "degreeOfArc"
         }
@@ -1308,14 +1308,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_omicron;1",
+        "@id": "dtmi:example:psi_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Latitude"
           ],
-          "name": "rho_xi",
+          "name": "psi_floob",
           "schema": "dtmi:standard:schema:geospatial:multiPoint;2",
           "unit": "degreeOfArc"
         }
@@ -1330,7 +1330,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_rho;1",
+        "@id": "dtmi:example:psi_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1338,7 +1338,7 @@
             "Property",
             "Latitude"
           ],
-          "name": "rho_pi",
+          "name": "psi_jogg",
           "schema": "dtmi:standard:schema:geospatial:multiPoint;2",
           "unit": "degreeOfArc"
         }
@@ -1353,14 +1353,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_tau;1",
+        "@id": "dtmi:example:psi_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Length"
           ],
-          "name": "rho_sigma",
+          "name": "psi_itch",
           "schema": "multiPolygon",
           "unit": "astronomicalUnit"
         }
@@ -1375,7 +1375,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_phi;1",
+        "@id": "dtmi:example:psi_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1383,7 +1383,7 @@
             "Property",
             "Length"
           ],
-          "name": "rho_upsilon",
+          "name": "psi_vroo",
           "schema": "multiPolygon",
           "unit": "astronomicalUnit"
         }
@@ -1398,14 +1398,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_psi;1",
+        "@id": "dtmi:example:omega_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Length"
           ],
-          "name": "rho_chi",
+          "name": "omega_alpha",
           "schema": "dtmi:standard:schema:geospatial:multiPolygon;2",
           "unit": "astronomicalUnit"
         }
@@ -1420,7 +1420,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_yuzz;1",
+        "@id": "dtmi:example:omega_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1428,7 +1428,7 @@
             "Property",
             "Length"
           ],
-          "name": "rho_omega",
+          "name": "omega_gamma",
           "schema": "dtmi:standard:schema:geospatial:multiPolygon;2",
           "unit": "astronomicalUnit"
         }
@@ -1443,14 +1443,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_um;1",
+        "@id": "dtmi:example:omega_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Longitude"
           ],
-          "name": "rho_wum",
+          "name": "omega_epsilon",
           "schema": "point",
           "unit": "degreeOfArc"
         }
@@ -1465,7 +1465,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_fuddle;1",
+        "@id": "dtmi:example:omega_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1473,7 +1473,7 @@
             "Property",
             "Longitude"
           ],
-          "name": "rho_humpf",
+          "name": "omega_eta",
           "schema": "point",
           "unit": "degreeOfArc"
         }
@@ -1488,14 +1488,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_nuh;1",
+        "@id": "dtmi:example:omega_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Longitude"
           ],
-          "name": "rho_glikk",
+          "name": "omega_iota",
           "schema": "dtmi:standard:schema:geospatial:point;2",
           "unit": "degreeOfArc"
         }
@@ -1510,7 +1510,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_quan;1",
+        "@id": "dtmi:example:omega_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1518,7 +1518,7 @@
             "Property",
             "Longitude"
           ],
-          "name": "rho_snee",
+          "name": "omega_lambda",
           "schema": "dtmi:standard:schema:geospatial:point;2",
           "unit": "degreeOfArc"
         }
@@ -1533,14 +1533,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_spazz;1",
+        "@id": "dtmi:example:omega_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminance"
           ],
-          "name": "rho_thnad",
+          "name": "omega_nu",
           "schema": "polygon",
           "unit": "candelaPerSquareMetre"
         }
@@ -1555,7 +1555,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_zatz;1",
+        "@id": "dtmi:example:omega_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1563,7 +1563,7 @@
             "Property",
             "Luminance"
           ],
-          "name": "rho_floob",
+          "name": "omega_omicron",
           "schema": "polygon",
           "unit": "candelaPerSquareMetre"
         }
@@ -1578,14 +1578,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_flunn;1",
+        "@id": "dtmi:example:omega_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Luminance"
           ],
-          "name": "rho_jogg",
+          "name": "omega_rho",
           "schema": "dtmi:standard:schema:geospatial:polygon;2",
           "unit": "candelaPerSquareMetre"
         }
@@ -1600,7 +1600,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_yekk;1",
+        "@id": "dtmi:example:omega_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1608,7 +1608,7 @@
             "Property",
             "Luminance"
           ],
-          "name": "rho_itch",
+          "name": "omega_tau",
           "schema": "dtmi:standard:schema:geospatial:polygon;2",
           "unit": "candelaPerSquareMetre"
         }
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyGraphKeywordV2.json b/DTDL/v2/spec/Requirement-ClassPropertyGraphKeywordV2.json
index 1bcb8fd6..e2c23b77 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyGraphKeywordV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyGraphKeywordV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_flunn;1",
+        "@id": "dtmi:example:spazz_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_jogg",
-          "schema": "string",
+          "name": "spazz_psi",
+          "schema": "integer",
           "@graph": {}
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_yekk;1",
+        "@id": "dtmi:example:spazz_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "humpf_itch",
-          "schema": "time",
+          "name": "spazz_yuzz",
+          "schema": "long",
           "@graph": {}
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyIdDuplicateV2.json b/DTDL/v2/spec/Requirement-ClassPropertyIdDuplicateV2.json
index cabec692..59c0448d 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyIdDuplicateV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyIdDuplicateV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_yuzz;1",
+        "@id": "dtmi:example:fuddle_kappa;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:chi_yuzz;1",
+          "@id": "dtmi:example:fuddle_kappa;1",
           "@type": "Interface",
           "contents": {
-            "@id": "dtmi:example:chi_yuzz;1",
+            "@id": "dtmi:example:fuddle_kappa;1",
             "@type": "Property",
-            "name": "chi_wum",
-            "schema": "double"
+            "name": "fuddle_lambda",
+            "schema": "date"
           }
         }
       }
@@ -30,17 +30,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_um;1",
+        "@id": "dtmi:example:fuddle_mu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:chi_um;1",
+          "@id": "dtmi:example:fuddle_mu;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "@id": "dtmi:example:chi_um;1",
+            "@id": "dtmi:example:fuddle_mu;1",
             "@type": "Property",
-            "name": "chi_humpf",
-            "schema": "duration"
+            "name": "fuddle_nu",
+            "schema": "dateTime"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyIdIsDtmiV2.json b/DTDL/v2/spec/Requirement-ClassPropertyIdIsDtmiV2.json
index 143485bd..84089424 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyIdIsDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyIdIsDtmiV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_psi;1",
+        "@id": "dtmi:example:wum_theta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;7",
           "@type": "Property",
-          "name": "tau_chi",
-          "schema": "long"
+          "name": "wum_eta",
+          "schema": "float"
         }
       }
     ]
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_yuzz;1",
+        "@id": "dtmi:example:wum_kappa;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;108675309",
           "@type": "Property",
-          "name": "tau_omega",
-          "schema": "string"
+          "name": "wum_iota",
+          "schema": "integer"
         }
       }
     ]
@@ -45,13 +45,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_um;1",
+        "@id": "dtmi:example:wum_mu;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;999999999",
           "@type": "Property",
-          "name": "tau_wum",
-          "schema": "time"
+          "name": "wum_lambda",
+          "schema": "long"
         }
       }
     ]
@@ -64,13 +64,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_fuddle;1",
+        "@id": "dtmi:example:wum_xi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo;1",
           "@type": "Property",
-          "name": "tau_humpf",
-          "schema": "boolean"
+          "name": "wum_nu",
+          "schema": "string"
         }
       }
     ]
@@ -83,13 +83,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_nuh;1",
+        "@id": "dtmi:example:wum_pi;1",
         "@type": "Interface",
         "contents": {
           "@id": null,
           "@type": "Property",
-          "name": "tau_glikk",
-          "schema": "date"
+          "name": "wum_omicron",
+          "schema": "time"
         }
       }
     ]
@@ -102,14 +102,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_quan;1",
+        "@id": "dtmi:example:wum_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": null,
           "@type": "Property",
-          "name": "tau_snee",
-          "schema": "dateTime"
+          "name": "wum_rho",
+          "schema": "boolean"
         }
       }
     ]
@@ -122,13 +122,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_spazz;1",
+        "@id": "dtmi:example:wum_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@id": 626,
           "@type": "Property",
-          "name": "tau_thnad",
-          "schema": "double"
+          "name": "wum_tau",
+          "schema": "date"
         }
       }
     ]
@@ -141,14 +141,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_zatz;1",
+        "@id": "dtmi:example:wum_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": 626,
           "@type": "Property",
-          "name": "tau_floob",
-          "schema": "duration"
+          "name": "wum_phi",
+          "schema": "dateTime"
         }
       }
     ]
@@ -161,13 +161,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_flunn;1",
+        "@id": "dtmi:example:wum_omega;1",
         "@type": "Interface",
         "contents": {
           "@id": true,
           "@type": "Property",
-          "name": "tau_jogg",
-          "schema": "float"
+          "name": "wum_psi",
+          "schema": "double"
         }
       }
     ]
@@ -180,14 +180,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_yekk;1",
+        "@id": "dtmi:example:wum_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": true,
           "@type": "Property",
-          "name": "tau_itch",
-          "schema": "integer"
+          "name": "wum_yuzz",
+          "schema": "duration"
         }
       }
     ]
@@ -200,15 +200,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_hi;1",
+        "@id": "dtmi:example:wum_humpf;1",
         "@type": "Interface",
         "contents": {
           "@id": {
             "@value": "dtmi:apparently:valid:identifier;3"
           },
           "@type": "Property",
-          "name": "tau_vroo",
-          "schema": "long"
+          "name": "wum_um",
+          "schema": "float"
         }
       }
     ]
@@ -221,7 +221,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_beta;1",
+        "@id": "dtmi:example:wum_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -229,8 +229,8 @@
             "@value": "dtmi:apparently:valid:identifier;3"
           },
           "@type": "Property",
-          "name": "upsilon_alpha",
-          "schema": "string"
+          "name": "wum_fuddle",
+          "schema": "integer"
         }
       }
     ]
@@ -243,13 +243,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_delta;1",
+        "@id": "dtmi:example:wum_snee;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0",
           "@type": "Property",
-          "name": "upsilon_gamma",
-          "schema": "time"
+          "name": "wum_nuh",
+          "schema": "long"
         }
       }
     ]
@@ -262,14 +262,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_zeta;1",
+        "@id": "dtmi:example:wum_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0",
           "@type": "Property",
-          "name": "upsilon_epsilon",
-          "schema": "boolean"
+          "name": "wum_quan",
+          "schema": "string"
         }
       }
     ]
@@ -282,13 +282,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_theta;1",
+        "@id": "dtmi:example:wum_floob;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Property",
-          "name": "upsilon_eta",
-          "schema": "date"
+          "name": "wum_spazz",
+          "schema": "time"
         }
       }
     ]
@@ -301,14 +301,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_kappa;1",
+        "@id": "dtmi:example:wum_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Property",
-          "name": "upsilon_iota",
-          "schema": "dateTime"
+          "name": "wum_zatz",
+          "schema": "boolean"
         }
       }
     ]
@@ -321,13 +321,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_mu;1",
+        "@id": "dtmi:example:wum_itch;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Property",
-          "name": "upsilon_lambda",
-          "schema": "double"
+          "name": "wum_flunn",
+          "schema": "date"
         }
       }
     ]
@@ -340,14 +340,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_xi;1",
+        "@id": "dtmi:example:wum_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Property",
-          "name": "upsilon_nu",
-          "schema": "duration"
+          "name": "wum_yekk",
+          "schema": "dateTime"
         }
       }
     ]
@@ -360,13 +360,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_pi;1",
+        "@id": "dtmi:example:um_alpha;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;1a",
           "@type": "Property",
-          "name": "upsilon_omicron",
-          "schema": "float"
+          "name": "wum_hi",
+          "schema": "double"
         }
       }
     ]
@@ -379,14 +379,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_sigma;1",
+        "@id": "dtmi:example:um_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1a",
           "@type": "Property",
-          "name": "upsilon_rho",
-          "schema": "integer"
+          "name": "um_beta",
+          "schema": "duration"
         }
       }
     ]
@@ -399,13 +399,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_upsilon;1",
+        "@id": "dtmi:example:um_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Property",
-          "name": "upsilon_tau",
-          "schema": "long"
+          "name": "um_delta",
+          "schema": "float"
         }
       }
     ]
@@ -418,14 +418,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_chi;1",
+        "@id": "dtmi:example:um_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Property",
-          "name": "upsilon_phi",
-          "schema": "string"
+          "name": "um_zeta",
+          "schema": "integer"
         }
       }
     ]
@@ -438,13 +438,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_omega;1",
+        "@id": "dtmi:example:um_iota;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Property",
-          "name": "upsilon_psi",
-          "schema": "time"
+          "name": "um_theta",
+          "schema": "long"
         }
       }
     ]
@@ -457,14 +457,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_wum;1",
+        "@id": "dtmi:example:um_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Property",
-          "name": "upsilon_yuzz",
-          "schema": "boolean"
+          "name": "um_kappa",
+          "schema": "string"
         }
       }
     ]
@@ -477,13 +477,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_humpf;1",
+        "@id": "dtmi:example:um_nu;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Property",
-          "name": "upsilon_um",
-          "schema": "date"
+          "name": "um_mu",
+          "schema": "time"
         }
       }
     ]
@@ -496,14 +496,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_glikk;1",
+        "@id": "dtmi:example:um_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Property",
-          "name": "upsilon_fuddle",
-          "schema": "dateTime"
+          "name": "um_xi",
+          "schema": "boolean"
         }
       }
     ]
@@ -516,13 +516,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_snee;1",
+        "@id": "dtmi:example:um_rho;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Property",
-          "name": "upsilon_nuh",
-          "schema": "double"
+          "name": "um_pi",
+          "schema": "date"
         }
       }
     ]
@@ -535,14 +535,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_thnad;1",
+        "@id": "dtmi:example:um_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Property",
-          "name": "upsilon_quan",
-          "schema": "duration"
+          "name": "um_sigma",
+          "schema": "dateTime"
         }
       }
     ]
@@ -555,13 +555,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_floob;1",
+        "@id": "dtmi:example:um_phi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;01",
           "@type": "Property",
-          "name": "upsilon_spazz",
-          "schema": "float"
+          "name": "um_upsilon",
+          "schema": "double"
         }
       }
     ]
@@ -574,14 +574,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_jogg;1",
+        "@id": "dtmi:example:um_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;01",
           "@type": "Property",
-          "name": "upsilon_zatz",
-          "schema": "integer"
+          "name": "um_chi",
+          "schema": "duration"
         }
       }
     ]
@@ -594,13 +594,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_itch;1",
+        "@id": "dtmi:example:um_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;",
           "@type": "Property",
-          "name": "upsilon_flunn",
-          "schema": "long"
+          "name": "um_omega",
+          "schema": "float"
         }
       }
     ]
@@ -613,14 +613,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_vroo;1",
+        "@id": "dtmi:example:um_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;",
           "@type": "Property",
-          "name": "upsilon_yekk",
-          "schema": "string"
+          "name": "um_wum",
+          "schema": "integer"
         }
       }
     ]
@@ -633,13 +633,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_alpha;1",
+        "@id": "dtmi:example:um_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Property",
-          "name": "upsilon_hi",
-          "schema": "time"
+          "name": "um_humpf",
+          "schema": "long"
         }
       }
     ]
@@ -652,14 +652,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_gamma;1",
+        "@id": "dtmi:example:um_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Property",
-          "name": "phi_beta",
-          "schema": "boolean"
+          "name": "um_glikk",
+          "schema": "string"
         }
       }
     ]
@@ -672,13 +672,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_epsilon;1",
+        "@id": "dtmi:example:um_quan;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Property",
-          "name": "phi_delta",
-          "schema": "date"
+          "name": "um_snee",
+          "schema": "time"
         }
       }
     ]
@@ -691,14 +691,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_eta;1",
+        "@id": "dtmi:example:um_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Property",
-          "name": "phi_zeta",
-          "schema": "dateTime"
+          "name": "um_thnad",
+          "schema": "boolean"
         }
       }
     ]
@@ -711,13 +711,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_iota;1",
+        "@id": "dtmi:example:um_zatz;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:1seg;1",
           "@type": "Property",
-          "name": "phi_theta",
-          "schema": "double"
+          "name": "um_floob",
+          "schema": "date"
         }
       }
     ]
@@ -730,14 +730,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_lambda;1",
+        "@id": "dtmi:example:um_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:1seg;1",
           "@type": "Property",
-          "name": "phi_kappa",
-          "schema": "duration"
+          "name": "um_jogg",
+          "schema": "dateTime"
         }
       }
     ]
@@ -750,13 +750,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_nu;1",
+        "@id": "dtmi:example:um_yekk;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Property",
-          "name": "phi_mu",
-          "schema": "float"
+          "name": "um_itch",
+          "schema": "double"
         }
       }
     ]
@@ -769,14 +769,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_omicron;1",
+        "@id": "dtmi:example:um_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Property",
-          "name": "phi_xi",
-          "schema": "integer"
+          "name": "um_vroo",
+          "schema": "duration"
         }
       }
     ]
@@ -789,13 +789,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_rho;1",
+        "@id": "dtmi:example:humpf_beta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo::bar;1",
           "@type": "Property",
-          "name": "phi_pi",
-          "schema": "long"
+          "name": "humpf_alpha",
+          "schema": "float"
         }
       }
     ]
@@ -808,14 +808,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_tau;1",
+        "@id": "dtmi:example:humpf_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo::bar;1",
           "@type": "Property",
-          "name": "phi_sigma",
-          "schema": "string"
+          "name": "humpf_gamma",
+          "schema": "integer"
         }
       }
     ]
@@ -828,13 +828,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_phi;1",
+        "@id": "dtmi:example:humpf_zeta;1",
         "@type": "Interface",
         "contents": {
           "@id": "urn:foo:bar:1",
           "@type": "Property",
-          "name": "phi_upsilon",
-          "schema": "time"
+          "name": "humpf_epsilon",
+          "schema": "long"
         }
       }
     ]
@@ -847,14 +847,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_psi;1",
+        "@id": "dtmi:example:humpf_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "urn:foo:bar:1",
           "@type": "Property",
-          "name": "phi_chi",
-          "schema": "boolean"
+          "name": "humpf_eta",
+          "schema": "string"
         }
       }
     ]
@@ -867,13 +867,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_yuzz;1",
+        "@id": "dtmi:example:humpf_kappa;1",
         "@type": "Interface",
         "contents": {
           "@id": "http://foo/bar/baz",
           "@type": "Property",
-          "name": "phi_omega",
-          "schema": "date"
+          "name": "humpf_iota",
+          "schema": "time"
         }
       }
     ]
@@ -886,14 +886,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_um;1",
+        "@id": "dtmi:example:humpf_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "http://foo/bar/baz",
           "@type": "Property",
-          "name": "phi_wum",
-          "schema": "dateTime"
+          "name": "humpf_lambda",
+          "schema": "boolean"
         }
       }
     ]
@@ -906,13 +906,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_fuddle;1",
+        "@id": "dtmi:example:humpf_xi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:;1",
           "@type": "Property",
-          "name": "phi_humpf",
-          "schema": "double"
+          "name": "humpf_nu",
+          "schema": "date"
         }
       }
     ]
@@ -925,14 +925,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_nuh;1",
+        "@id": "dtmi:example:humpf_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:;1",
           "@type": "Property",
-          "name": "phi_glikk",
-          "schema": "duration"
+          "name": "humpf_omicron",
+          "schema": "dateTime"
         }
       }
     ]
@@ -945,13 +945,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_quan;1",
+        "@id": "dtmi:example:humpf_sigma;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar",
           "@type": "Property",
-          "name": "phi_snee",
-          "schema": "float"
+          "name": "humpf_rho",
+          "schema": "double"
         }
       }
     ]
@@ -964,14 +964,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_spazz;1",
+        "@id": "dtmi:example:humpf_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar",
           "@type": "Property",
-          "name": "phi_thnad",
-          "schema": "integer"
+          "name": "humpf_tau",
+          "schema": "duration"
         }
       }
     ]
@@ -984,13 +984,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_zatz;1",
+        "@id": "dtmi:example:humpf_chi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.14",
           "@type": "Property",
-          "name": "phi_floob",
-          "schema": "long"
+          "name": "humpf_phi",
+          "schema": "float"
         }
       }
     ]
@@ -1003,14 +1003,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_flunn;1",
+        "@id": "dtmi:example:humpf_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.14",
           "@type": "Property",
-          "name": "phi_jogg",
-          "schema": "string"
+          "name": "humpf_psi",
+          "schema": "integer"
         }
       }
     ]
@@ -1023,13 +1023,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_yekk;1",
+        "@id": "dtmi:example:humpf_wum;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.141592",
           "@type": "Property",
-          "name": "phi_itch",
-          "schema": "time"
+          "name": "humpf_yuzz",
+          "schema": "long"
         }
       }
     ]
@@ -1042,14 +1042,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_hi;1",
+        "@id": "dtmi:example:humpf_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.141592",
           "@type": "Property",
-          "name": "phi_vroo",
-          "schema": "boolean"
+          "name": "humpf_um",
+          "schema": "string"
         }
       }
     ]
@@ -1062,13 +1062,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_beta;1",
+        "@id": "dtmi:example:humpf_glikk;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:dtdl:example;1",
           "@type": "Property",
-          "name": "chi_alpha",
-          "schema": "date"
+          "name": "humpf_fuddle",
+          "schema": "time"
         }
       }
     ]
@@ -1081,14 +1081,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_delta;1",
+        "@id": "dtmi:example:humpf_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:dtdl:example;1",
           "@type": "Property",
-          "name": "chi_gamma",
-          "schema": "dateTime"
+          "name": "humpf_nuh",
+          "schema": "boolean"
         }
       }
     ]
@@ -1101,13 +1101,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_zeta;1",
+        "@id": "dtmi:example:humpf_thnad;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:standard:example;1",
           "@type": "Property",
-          "name": "chi_epsilon",
-          "schema": "double"
+          "name": "humpf_quan",
+          "schema": "date"
         }
       }
     ]
@@ -1120,14 +1120,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_theta;1",
+        "@id": "dtmi:example:humpf_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:standard:example;1",
           "@type": "Property",
-          "name": "chi_eta",
-          "schema": "duration"
+          "name": "humpf_spazz",
+          "schema": "dateTime"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyIdNotArrayV2.json b/DTDL/v2/spec/Requirement-ClassPropertyIdNotArrayV2.json
index 5aaed47b..e5524151 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyIdNotArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyIdNotArrayV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_kappa;1",
+        "@id": "dtmi:example:humpf_jogg;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;7"
           ],
           "@type": "Property",
-          "name": "chi_iota",
-          "schema": "float"
+          "name": "humpf_zatz",
+          "schema": "double"
         }
       }
     ]
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_mu;1",
+        "@id": "dtmi:example:humpf_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,8 +36,8 @@
             "dtmi:foo:bar;7"
           ],
           "@type": "Property",
-          "name": "chi_lambda",
-          "schema": "integer"
+          "name": "humpf_flunn",
+          "schema": "duration"
         }
       }
     ]
@@ -50,15 +50,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_xi;1",
+        "@id": "dtmi:example:humpf_vroo;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;108675309"
           ],
           "@type": "Property",
-          "name": "chi_nu",
-          "schema": "long"
+          "name": "humpf_yekk",
+          "schema": "float"
         }
       }
     ]
@@ -71,7 +71,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_pi;1",
+        "@id": "dtmi:example:fuddle_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -79,8 +79,8 @@
             "dtmi:foo:bar;108675309"
           ],
           "@type": "Property",
-          "name": "chi_omicron",
-          "schema": "string"
+          "name": "humpf_hi",
+          "schema": "integer"
         }
       }
     ]
@@ -93,15 +93,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_sigma;1",
+        "@id": "dtmi:example:fuddle_gamma;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;999999999"
           ],
           "@type": "Property",
-          "name": "chi_rho",
-          "schema": "time"
+          "name": "fuddle_beta",
+          "schema": "long"
         }
       }
     ]
@@ -114,7 +114,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_upsilon;1",
+        "@id": "dtmi:example:fuddle_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -122,8 +122,8 @@
             "dtmi:foo:bar;999999999"
           ],
           "@type": "Property",
-          "name": "chi_tau",
-          "schema": "boolean"
+          "name": "fuddle_delta",
+          "schema": "string"
         }
       }
     ]
@@ -136,15 +136,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_chi;1",
+        "@id": "dtmi:example:fuddle_eta;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo;1"
           ],
           "@type": "Property",
-          "name": "chi_phi",
-          "schema": "date"
+          "name": "fuddle_zeta",
+          "schema": "time"
         }
       }
     ]
@@ -157,7 +157,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_omega;1",
+        "@id": "dtmi:example:fuddle_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -165,8 +165,8 @@
             "dtmi:foo;1"
           ],
           "@type": "Property",
-          "name": "chi_psi",
-          "schema": "dateTime"
+          "name": "fuddle_theta",
+          "schema": "boolean"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyMultipleSemanticTypesV2.json b/DTDL/v2/spec/Requirement-ClassPropertyMultipleSemanticTypesV2.json
index e6b5c1cb..05f557f7 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyMultipleSemanticTypesV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyMultipleSemanticTypesV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_rho;1",
+        "@id": "dtmi:example:nu_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": [
@@ -15,8 +15,8 @@
             "Acceleration",
             "Angle"
           ],
-          "name": "eta_pi",
-          "schema": "double"
+          "name": "nu_glikk",
+          "schema": "integer"
         }
       }
     ]
@@ -29,7 +29,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_tau;1",
+        "@id": "dtmi:example:nu_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -38,8 +38,8 @@
             "Acceleration",
             "Angle"
           ],
-          "name": "eta_sigma",
-          "schema": "float"
+          "name": "nu_snee",
+          "schema": "long"
         }
       }
     ]
@@ -52,7 +52,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_phi;1",
+        "@id": "dtmi:example:nu_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": [
@@ -60,8 +60,8 @@
             "Acceleration",
             "dtmi:standard:class:Angle;2"
           ],
-          "name": "eta_upsilon",
-          "schema": "integer",
+          "name": "nu_thnad",
+          "schema": "double",
           "unit": "centimetrePerSecondSquared"
         }
       }
@@ -75,7 +75,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_psi;1",
+        "@id": "dtmi:example:nu_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -84,8 +84,8 @@
             "Acceleration",
             "dtmi:standard:class:Angle;2"
           ],
-          "name": "eta_chi",
-          "schema": "long",
+          "name": "nu_floob",
+          "schema": "float",
           "unit": "centimetrePerSecondSquared"
         }
       }
@@ -99,7 +99,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_yuzz;1",
+        "@id": "dtmi:example:nu_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": [
@@ -107,8 +107,8 @@
             "dtmi:standard:class:Acceleration;2",
             "dtmi:standard:class:Angle;2"
           ],
-          "name": "eta_omega",
-          "schema": "double",
+          "name": "nu_jogg",
+          "schema": "integer",
           "unit": "centimetrePerSecondSquared"
         }
       }
@@ -122,7 +122,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_um;1",
+        "@id": "dtmi:example:nu_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -131,8 +131,8 @@
             "dtmi:standard:class:Acceleration;2",
             "dtmi:standard:class:Angle;2"
           ],
-          "name": "eta_wum",
-          "schema": "float",
+          "name": "nu_itch",
+          "schema": "long",
           "unit": "centimetrePerSecondSquared"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertiesSchemaExcludeArrayImplicantV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertiesSchemaExcludeArrayImplicantV2.json
index 7692c86f..28a5ddfb 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertiesSchemaExcludeArrayImplicantV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertiesSchemaExcludeArrayImplicantV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_chi;1",
+        "@id": "dtmi:example:snee_xi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omega_phi;1",
+          "@id": "dtmi:example:snee_nu;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "omega_upsilon",
+            "name": "snee_mu",
             "schema": "point"
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_yuzz;1",
+        "@id": "dtmi:example:snee_rho;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omega_omega;1",
+          "@id": "dtmi:example:snee_pi;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Property",
-            "name": "omega_psi",
+            "name": "snee_omicron",
             "schema": "point"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertiesSchemaExcludeArrayV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertiesSchemaExcludeArrayV2.json
index cffdeb80..ad81f442 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertiesSchemaExcludeArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertiesSchemaExcludeArrayV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_pi;1",
+        "@id": "dtmi:example:snee_theta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omega_omicron;1",
+          "@id": "dtmi:example:snee_eta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "omega_xi",
+            "name": "snee_zeta",
             "schema": {
               "@type": "Array",
               "elementSchema": "time"
@@ -32,15 +32,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_tau;1",
+        "@id": "dtmi:example:snee_lambda;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omega_sigma;1",
+          "@id": "dtmi:example:snee_kappa;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Property",
-            "name": "omega_rho",
+            "name": "snee_iota",
             "schema": {
               "@type": "Array",
               "elementSchema": "boolean"
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertyCommentStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertyCommentStringLengthV2.json
index 17c2e922..5ab15771 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertyCommentStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertyCommentStringLengthV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_fuddle;1",
+        "@id": "dtmi:example:glikk_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_humpf",
-          "schema": "integer",
+          "name": "glikk_nu",
+          "schema": "duration",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_nuh;1",
+        "@id": "dtmi:example:glikk_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_glikk",
-          "schema": "long",
+          "name": "glikk_omicron",
+          "schema": "float",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -45,13 +45,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_quan;1",
+        "@id": "dtmi:example:glikk_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "psi_snee",
-          "schema": "string",
+          "name": "glikk_rho",
+          "schema": "integer",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertyCommentStringV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertyCommentStringV2.json
index 72cff9f5..48846c28 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertyCommentStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertyCommentStringV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_glikk;1",
+        "@id": "dtmi:example:fuddle_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "chi_fuddle",
-          "schema": "float",
+          "name": "fuddle_xi",
+          "schema": "double",
           "comment": "hello"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_snee;1",
+        "@id": "dtmi:example:fuddle_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "chi_nuh",
-          "schema": "integer",
+          "name": "fuddle_pi",
+          "schema": "duration",
           "comment": [
             "hello"
           ]
@@ -47,12 +47,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_thnad;1",
+        "@id": "dtmi:example:fuddle_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "chi_quan",
-          "schema": "long",
+          "name": "fuddle_sigma",
+          "schema": "float",
           "comment": {
             "@value": "hello",
             "@type": "xsd:string"
@@ -69,12 +69,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_floob;1",
+        "@id": "dtmi:example:fuddle_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "chi_spazz",
-          "schema": "string",
+          "name": "fuddle_upsilon",
+          "schema": "integer",
           "comment": [
             {
               "@value": "hello",
@@ -93,12 +93,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_jogg;1",
+        "@id": "dtmi:example:fuddle_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "chi_zatz",
-          "schema": "time",
+          "name": "fuddle_chi",
+          "schema": "long",
           "comment": []
         }
       }
@@ -112,12 +112,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_itch;1",
+        "@id": "dtmi:example:fuddle_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "chi_flunn",
-          "schema": "boolean",
+          "name": "fuddle_omega",
+          "schema": "string",
           "comment": null
         }
       }
@@ -131,13 +131,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:chi_vroo;1",
+        "@id": "dtmi:example:fuddle_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "chi_yekk",
-          "schema": "date",
+          "name": "fuddle_wum",
+          "schema": "time",
           "comment": null
         }
       }
@@ -151,12 +151,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_alpha;1",
+        "@id": "dtmi:example:fuddle_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "chi_hi",
-          "schema": "dateTime",
+          "name": "fuddle_humpf",
+          "schema": "boolean",
           "comment": true
         }
       }
@@ -170,13 +170,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_gamma;1",
+        "@id": "dtmi:example:fuddle_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "psi_beta",
-          "schema": "double",
+          "name": "fuddle_glikk",
+          "schema": "date",
           "comment": true
         }
       }
@@ -190,12 +190,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_epsilon;1",
+        "@id": "dtmi:example:fuddle_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_delta",
-          "schema": "duration",
+          "name": "fuddle_snee",
+          "schema": "dateTime",
           "comment": 626
         }
       }
@@ -209,13 +209,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_eta;1",
+        "@id": "dtmi:example:fuddle_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "psi_zeta",
-          "schema": "float",
+          "name": "fuddle_thnad",
+          "schema": "double",
           "comment": 626
         }
       }
@@ -229,12 +229,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_iota;1",
+        "@id": "dtmi:example:fuddle_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_theta",
-          "schema": "integer",
+          "name": "fuddle_floob",
+          "schema": "duration",
           "comment": [
             null
           ]
@@ -250,13 +250,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_lambda;1",
+        "@id": "dtmi:example:fuddle_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "psi_kappa",
-          "schema": "long",
+          "name": "fuddle_jogg",
+          "schema": "float",
           "comment": [
             null
           ]
@@ -272,12 +272,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_nu;1",
+        "@id": "dtmi:example:fuddle_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_mu",
-          "schema": "string",
+          "name": "fuddle_itch",
+          "schema": "integer",
           "comment": [
             true
           ]
@@ -293,13 +293,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_omicron;1",
+        "@id": "dtmi:example:fuddle_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "psi_xi",
-          "schema": "time",
+          "name": "fuddle_vroo",
+          "schema": "long",
           "comment": [
             true
           ]
@@ -315,12 +315,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_rho;1",
+        "@id": "dtmi:example:glikk_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_pi",
-          "schema": "boolean",
+          "name": "glikk_alpha",
+          "schema": "string",
           "comment": [
             626
           ]
@@ -336,13 +336,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_tau;1",
+        "@id": "dtmi:example:glikk_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "psi_sigma",
-          "schema": "date",
+          "name": "glikk_gamma",
+          "schema": "time",
           "comment": [
             626
           ]
@@ -358,12 +358,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_phi;1",
+        "@id": "dtmi:example:glikk_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_upsilon",
-          "schema": "dateTime",
+          "name": "glikk_epsilon",
+          "schema": "boolean",
           "comment": {}
         }
       }
@@ -377,13 +377,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_psi;1",
+        "@id": "dtmi:example:glikk_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "psi_chi",
-          "schema": "double",
+          "name": "glikk_eta",
+          "schema": "date",
           "comment": {}
         }
       }
@@ -397,12 +397,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_yuzz;1",
+        "@id": "dtmi:example:glikk_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_omega",
-          "schema": "duration",
+          "name": "glikk_iota",
+          "schema": "dateTime",
           "comment": [
             {}
           ]
@@ -418,13 +418,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:psi_um;1",
+        "@id": "dtmi:example:glikk_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "psi_wum",
-          "schema": "float",
+          "name": "glikk_lambda",
+          "schema": "double",
           "comment": [
             {}
           ]
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertyCommentTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertyCommentTermAndDtmiV2.json
index 890831a2..704ccccc 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertyCommentTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertyCommentTermAndDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_gamma;1",
+        "@id": "dtmi:example:glikk_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "comment": "psi_hi",
-          "dtmi:dtdl:property:comment;2": "omega_alpha",
-          "name": "omega_beta",
-          "schema": "dateTime"
+          "comment": "glikk_humpf",
+          "dtmi:dtdl:property:comment;2": "glikk_fuddle",
+          "name": "glikk_glikk",
+          "schema": "boolean"
         }
       }
     ]
@@ -27,15 +27,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_eta;1",
+        "@id": "dtmi:example:glikk_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "comment": "omega_delta",
-          "dtmi:dtdl:property:comment;2": "omega_epsilon",
-          "name": "omega_zeta",
-          "schema": "double"
+          "comment": "glikk_snee",
+          "dtmi:dtdl:property:comment;2": "glikk_quan",
+          "name": "glikk_thnad",
+          "schema": "date"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertyDescriptionLangStringV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertyDescriptionLangStringV2.json
index 06dfef2a..7f8f4895 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertyDescriptionLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertyDescriptionLangStringV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_iota;1",
+        "@id": "dtmi:example:glikk_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_theta",
-          "schema": "duration",
+          "name": "glikk_floob",
+          "schema": "dateTime",
           "description": "hello"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_lambda;1",
+        "@id": "dtmi:example:glikk_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_kappa",
-          "schema": "float",
+          "name": "glikk_jogg",
+          "schema": "double",
           "description": [
             "hello"
           ]
@@ -47,12 +47,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_nu;1",
+        "@id": "dtmi:example:glikk_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_mu",
-          "schema": "integer",
+          "name": "glikk_itch",
+          "schema": "duration",
           "description": {
             "en": "hello"
           }
@@ -68,12 +68,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_omicron;1",
+        "@id": "dtmi:example:glikk_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_xi",
-          "schema": "long",
+          "name": "glikk_vroo",
+          "schema": "float",
           "description": [
             {
               "@value": "hello",
@@ -92,12 +92,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_rho;1",
+        "@id": "dtmi:example:nuh_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_pi",
-          "schema": "string",
+          "name": "nuh_alpha",
+          "schema": "integer",
           "description": {}
         }
       }
@@ -111,12 +111,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_tau;1",
+        "@id": "dtmi:example:nuh_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_sigma",
-          "schema": "time",
+          "name": "nuh_gamma",
+          "schema": "long",
           "description": []
         }
       }
@@ -130,12 +130,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_phi;1",
+        "@id": "dtmi:example:nuh_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_upsilon",
-          "schema": "boolean",
+          "name": "nuh_epsilon",
+          "schema": "string",
           "description": null
         }
       }
@@ -149,13 +149,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_psi;1",
+        "@id": "dtmi:example:nuh_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "omega_chi",
-          "schema": "date",
+          "name": "nuh_eta",
+          "schema": "time",
           "description": null
         }
       }
@@ -169,12 +169,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_yuzz;1",
+        "@id": "dtmi:example:nuh_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_omega",
-          "schema": "dateTime",
+          "name": "nuh_iota",
+          "schema": "boolean",
           "description": true
         }
       }
@@ -188,13 +188,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_um;1",
+        "@id": "dtmi:example:nuh_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "omega_wum",
-          "schema": "double",
+          "name": "nuh_lambda",
+          "schema": "date",
           "description": true
         }
       }
@@ -208,12 +208,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_fuddle;1",
+        "@id": "dtmi:example:nuh_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_humpf",
-          "schema": "duration",
+          "name": "nuh_nu",
+          "schema": "dateTime",
           "description": 626
         }
       }
@@ -227,13 +227,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_nuh;1",
+        "@id": "dtmi:example:nuh_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "omega_glikk",
-          "schema": "float",
+          "name": "nuh_omicron",
+          "schema": "double",
           "description": 626
         }
       }
@@ -247,12 +247,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_quan;1",
+        "@id": "dtmi:example:nuh_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_snee",
-          "schema": "integer",
+          "name": "nuh_rho",
+          "schema": "duration",
           "description": [
             null
           ]
@@ -268,13 +268,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_spazz;1",
+        "@id": "dtmi:example:nuh_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "omega_thnad",
-          "schema": "long",
+          "name": "nuh_tau",
+          "schema": "float",
           "description": [
             null
           ]
@@ -290,12 +290,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_zatz;1",
+        "@id": "dtmi:example:nuh_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_floob",
-          "schema": "string",
+          "name": "nuh_phi",
+          "schema": "integer",
           "description": [
             true
           ]
@@ -311,13 +311,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_flunn;1",
+        "@id": "dtmi:example:nuh_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "omega_jogg",
-          "schema": "time",
+          "name": "nuh_psi",
+          "schema": "long",
           "description": [
             true
           ]
@@ -333,12 +333,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_yekk;1",
+        "@id": "dtmi:example:nuh_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_itch",
-          "schema": "boolean",
+          "name": "nuh_yuzz",
+          "schema": "string",
           "description": [
             626
           ]
@@ -354,13 +354,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_hi;1",
+        "@id": "dtmi:example:nuh_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "omega_vroo",
-          "schema": "date",
+          "name": "nuh_um",
+          "schema": "time",
           "description": [
             626
           ]
@@ -376,12 +376,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_beta;1",
+        "@id": "dtmi:example:nuh_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yuzz_alpha",
-          "schema": "dateTime",
+          "name": "nuh_fuddle",
+          "schema": "boolean",
           "description": [
             {}
           ]
@@ -397,13 +397,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_delta;1",
+        "@id": "dtmi:example:nuh_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "yuzz_gamma",
-          "schema": "double",
+          "name": "nuh_nuh",
+          "schema": "date",
           "description": [
             {}
           ]
@@ -419,12 +419,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_zeta;1",
+        "@id": "dtmi:example:nuh_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yuzz_epsilon",
-          "schema": "duration",
+          "name": "nuh_quan",
+          "schema": "dateTime",
           "description": {
             "@value": "hello",
             "@language": "en"
@@ -441,13 +441,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_theta;1",
+        "@id": "dtmi:example:nuh_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "yuzz_eta",
-          "schema": "float",
+          "name": "nuh_spazz",
+          "schema": "double",
           "description": {
             "@value": "hello",
             "@language": "en"
@@ -464,12 +464,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_kappa;1",
+        "@id": "dtmi:example:nuh_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yuzz_iota",
-          "schema": "integer",
+          "name": "nuh_zatz",
+          "schema": "duration",
           "description": [
             {
               "en": "hello"
@@ -487,13 +487,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_mu;1",
+        "@id": "dtmi:example:nuh_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "yuzz_lambda",
-          "schema": "long",
+          "name": "nuh_flunn",
+          "schema": "float",
           "description": [
             {
               "en": "hello"
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertyDescriptionStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertyDescriptionStringLengthV2.json
index 7494f534..1519e6a7 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertyDescriptionStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertyDescriptionStringLengthV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_xi;1",
+        "@id": "dtmi:example:nuh_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yuzz_nu",
-          "schema": "string",
+          "name": "nuh_yekk",
+          "schema": "integer",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_pi;1",
+        "@id": "dtmi:example:snee_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yuzz_omicron",
-          "schema": "time",
+          "name": "nuh_hi",
+          "schema": "long",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -45,13 +45,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_sigma;1",
+        "@id": "dtmi:example:snee_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "yuzz_rho",
-          "schema": "boolean",
+          "name": "snee_beta",
+          "schema": "string",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertyDescriptionTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertyDescriptionTermAndDtmiV2.json
index 52867ddd..c50f7d34 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertyDescriptionTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertyDescriptionTermAndDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_nuh;1",
+        "@id": "dtmi:example:snee_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
           "description": [
-            "yuzz_humpf"
+            "snee_nu"
           ],
           "dtmi:dtdl:property:description;2": [
-            "yuzz_fuddle"
+            "snee_xi"
           ],
-          "name": "yuzz_glikk",
-          "schema": "duration"
+          "name": "snee_omicron",
+          "schema": "dateTime"
         }
       }
     ]
@@ -31,19 +31,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_spazz;1",
+        "@id": "dtmi:example:snee_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
           "description": [
-            "yuzz_snee"
+            "snee_rho"
           ],
           "dtmi:dtdl:property:description;2": [
-            "yuzz_quan"
+            "snee_sigma"
           ],
-          "name": "yuzz_thnad",
-          "schema": "float"
+          "name": "snee_tau",
+          "schema": "double"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertyDisplayNameLangStringV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertyDisplayNameLangStringV2.json
index f8dc733e..2d33e4f6 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertyDisplayNameLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertyDisplayNameLangStringV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_zatz;1",
+        "@id": "dtmi:example:snee_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yuzz_floob",
-          "schema": "integer",
+          "name": "snee_phi",
+          "schema": "duration",
           "displayName": "hello"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_flunn;1",
+        "@id": "dtmi:example:snee_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yuzz_jogg",
-          "schema": "long",
+          "name": "snee_psi",
+          "schema": "float",
           "displayName": [
             "hello"
           ]
@@ -47,12 +47,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_yekk;1",
+        "@id": "dtmi:example:snee_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yuzz_itch",
-          "schema": "string",
+          "name": "snee_yuzz",
+          "schema": "integer",
           "displayName": {
             "en": "hello"
           }
@@ -68,12 +68,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yuzz_hi;1",
+        "@id": "dtmi:example:snee_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yuzz_vroo",
-          "schema": "time",
+          "name": "snee_um",
+          "schema": "long",
           "displayName": [
             {
               "@value": "hello",
@@ -92,12 +92,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_beta;1",
+        "@id": "dtmi:example:snee_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_alpha",
-          "schema": "boolean",
+          "name": "snee_fuddle",
+          "schema": "string",
           "displayName": {}
         }
       }
@@ -111,12 +111,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_delta;1",
+        "@id": "dtmi:example:snee_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_gamma",
-          "schema": "date",
+          "name": "snee_nuh",
+          "schema": "time",
           "displayName": []
         }
       }
@@ -130,12 +130,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_zeta;1",
+        "@id": "dtmi:example:snee_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_epsilon",
-          "schema": "dateTime",
+          "name": "snee_quan",
+          "schema": "boolean",
           "displayName": null
         }
       }
@@ -149,13 +149,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_theta;1",
+        "@id": "dtmi:example:snee_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "wum_eta",
-          "schema": "double",
+          "name": "snee_spazz",
+          "schema": "date",
           "displayName": null
         }
       }
@@ -169,12 +169,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_kappa;1",
+        "@id": "dtmi:example:snee_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_iota",
-          "schema": "duration",
+          "name": "snee_zatz",
+          "schema": "dateTime",
           "displayName": true
         }
       }
@@ -188,13 +188,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_mu;1",
+        "@id": "dtmi:example:snee_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "wum_lambda",
-          "schema": "float",
+          "name": "snee_flunn",
+          "schema": "double",
           "displayName": true
         }
       }
@@ -208,12 +208,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_xi;1",
+        "@id": "dtmi:example:snee_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_nu",
-          "schema": "integer",
+          "name": "snee_yekk",
+          "schema": "duration",
           "displayName": 626
         }
       }
@@ -227,13 +227,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_pi;1",
+        "@id": "dtmi:example:quan_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "wum_omicron",
-          "schema": "long",
+          "name": "snee_hi",
+          "schema": "float",
           "displayName": 626
         }
       }
@@ -247,12 +247,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_sigma;1",
+        "@id": "dtmi:example:quan_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_rho",
-          "schema": "string",
+          "name": "quan_beta",
+          "schema": "integer",
           "displayName": [
             null
           ]
@@ -268,13 +268,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_upsilon;1",
+        "@id": "dtmi:example:quan_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "wum_tau",
-          "schema": "time",
+          "name": "quan_delta",
+          "schema": "long",
           "displayName": [
             null
           ]
@@ -290,12 +290,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_chi;1",
+        "@id": "dtmi:example:quan_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_phi",
-          "schema": "boolean",
+          "name": "quan_zeta",
+          "schema": "string",
           "displayName": [
             true
           ]
@@ -311,13 +311,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_omega;1",
+        "@id": "dtmi:example:quan_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "wum_psi",
-          "schema": "date",
+          "name": "quan_theta",
+          "schema": "time",
           "displayName": [
             true
           ]
@@ -333,12 +333,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_wum;1",
+        "@id": "dtmi:example:quan_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_yuzz",
-          "schema": "dateTime",
+          "name": "quan_kappa",
+          "schema": "boolean",
           "displayName": [
             626
           ]
@@ -354,13 +354,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_humpf;1",
+        "@id": "dtmi:example:quan_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "wum_um",
-          "schema": "double",
+          "name": "quan_mu",
+          "schema": "date",
           "displayName": [
             626
           ]
@@ -376,12 +376,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_glikk;1",
+        "@id": "dtmi:example:quan_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_fuddle",
-          "schema": "duration",
+          "name": "quan_xi",
+          "schema": "dateTime",
           "displayName": [
             {}
           ]
@@ -397,13 +397,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_snee;1",
+        "@id": "dtmi:example:quan_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "wum_nuh",
-          "schema": "float",
+          "name": "quan_pi",
+          "schema": "double",
           "displayName": [
             {}
           ]
@@ -419,12 +419,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_thnad;1",
+        "@id": "dtmi:example:quan_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_quan",
-          "schema": "integer",
+          "name": "quan_sigma",
+          "schema": "duration",
           "displayName": {
             "@value": "hello",
             "@language": "en"
@@ -441,13 +441,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_floob;1",
+        "@id": "dtmi:example:quan_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "wum_spazz",
-          "schema": "long",
+          "name": "quan_upsilon",
+          "schema": "float",
           "displayName": {
             "@value": "hello",
             "@language": "en"
@@ -464,12 +464,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_jogg;1",
+        "@id": "dtmi:example:quan_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_zatz",
-          "schema": "string",
+          "name": "quan_chi",
+          "schema": "integer",
           "displayName": [
             {
               "en": "hello"
@@ -487,13 +487,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_itch;1",
+        "@id": "dtmi:example:quan_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "wum_flunn",
-          "schema": "time",
+          "name": "quan_omega",
+          "schema": "long",
           "displayName": [
             {
               "en": "hello"
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertyDisplayNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertyDisplayNameStringLengthV2.json
index 35d79731..0bd686b8 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertyDisplayNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertyDisplayNameStringLengthV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:wum_vroo;1",
+        "@id": "dtmi:example:quan_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_yekk",
-          "schema": "boolean",
+          "name": "quan_wum",
+          "schema": "string",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSometh"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_alpha;1",
+        "@id": "dtmi:example:quan_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_hi",
-          "schema": "date",
+          "name": "quan_humpf",
+          "schema": "time",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
         }
       }
@@ -45,13 +45,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_gamma;1",
+        "@id": "dtmi:example:quan_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "um_beta",
-          "schema": "dateTime",
+          "name": "quan_glikk",
+          "schema": "boolean",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertyDisplayNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertyDisplayNameTermAndDtmiV2.json
index fd0beede..9df575ec 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertyDisplayNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertyDisplayNameTermAndDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_pi;1",
+        "@id": "dtmi:example:thnad_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
           "displayName": [
-            "um_nu"
+            "quan_yekk"
           ],
           "dtmi:dtdl:property:displayName;2": [
-            "um_xi"
+            "quan_vroo"
           ],
-          "name": "um_omicron",
-          "schema": "integer"
+          "name": "quan_hi",
+          "schema": "duration"
         }
       }
     ]
@@ -31,19 +31,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_upsilon;1",
+        "@id": "dtmi:example:thnad_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
           "displayName": [
-            "um_rho"
+            "thnad_beta"
           ],
           "dtmi:dtdl:property:displayName;2": [
-            "um_sigma"
+            "thnad_gamma"
           ],
-          "name": "um_tau",
-          "schema": "long"
+          "name": "thnad_delta",
+          "schema": "float"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertyFormallyInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertyFormallyInvalidDtmiV2.json
index 188d6bbe..3836ffef 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertyFormallyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertyFormallyInvalidDtmiV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_floob;1",
+        "@id": "dtmi:example:itch_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "quan_spazz",
-          "schema": "duration",
+          "name": "itch_upsilon",
+          "schema": "dateTime",
           "dtmi:foo//bar": 626
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_jogg;1",
+        "@id": "dtmi:example:itch_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "quan_zatz",
-          "schema": "float",
+          "name": "itch_chi",
+          "schema": "double",
           "dtmi:foo//bar": 626
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertyFormallyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertyFormallyIrrelevantDtmiOrTermV2.json
index 41be3fa0..b85711e3 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertyFormallyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertyFormallyIrrelevantDtmiOrTermV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_wum;1",
+        "@id": "dtmi:example:itch_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "quan_yuzz",
-          "schema": "time",
+          "name": "itch_kappa",
+          "schema": "long",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_humpf;1",
+        "@id": "dtmi:example:itch_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "quan_um",
-          "schema": "boolean",
+          "name": "itch_mu",
+          "schema": "string",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -46,12 +46,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_glikk;1",
+        "@id": "dtmi:example:itch_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "quan_fuddle",
-          "schema": "date",
+          "name": "itch_xi",
+          "schema": "time",
           "boolean": null
         }
       }
@@ -65,13 +65,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_snee;1",
+        "@id": "dtmi:example:itch_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "quan_nuh",
-          "schema": "dateTime",
+          "name": "itch_pi",
+          "schema": "boolean",
           "boolean": null
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertyFormallyNotDtmiNorTermV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertyFormallyNotDtmiNorTermV2.json
index 308de119..0d3607ab 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertyFormallyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertyFormallyNotDtmiNorTermV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_vroo;1",
+        "@id": "dtmi:example:itch_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "quan_yekk",
-          "schema": "long",
+          "name": "itch_wum",
+          "schema": "float",
           "http://foo.com/bar": true
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_alpha;1",
+        "@id": "dtmi:example:itch_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "quan_hi",
-          "schema": "string",
+          "name": "itch_humpf",
+          "schema": "integer",
           "http://foo.com/bar": true
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertyFormallyUndefinedTermV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertyFormallyUndefinedTermV2.json
index 2bc3b2f5..20bb21d9 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertyFormallyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertyFormallyUndefinedTermV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_epsilon;1",
+        "@id": "dtmi:example:itch_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_delta",
-          "schema": "boolean",
+          "name": "itch_snee",
+          "schema": "string",
           "foobar": {}
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_eta;1",
+        "@id": "dtmi:example:itch_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "thnad_zeta",
-          "schema": "date",
+          "name": "itch_thnad",
+          "schema": "time",
           "foobar": {}
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertyNamePatternV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertyNamePatternV2.json
index 92294937..4c598eea 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertyNamePatternV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertyNamePatternV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_floob;1",
+        "@id": "dtmi:example:omicron_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "duration",
+          "schema": "boolean",
           "name": "EARTH"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_zatz;1",
+        "@id": "dtmi:example:omicron_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "float",
+          "schema": "date",
           "name": "Air"
         }
       }
@@ -43,11 +43,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_jogg;1",
+        "@id": "dtmi:example:omicron_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "integer",
+          "schema": "dateTime",
           "name": "fire"
         }
       }
@@ -61,11 +61,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_flunn;1",
+        "@id": "dtmi:example:omicron_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "long",
+          "schema": "double",
           "name": "hello_world"
         }
       }
@@ -79,11 +79,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_itch;1",
+        "@id": "dtmi:example:omicron_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "string",
+          "schema": "duration",
           "name": "Anarchy99"
         }
       }
@@ -97,11 +97,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_yekk;1",
+        "@id": "dtmi:example:omicron_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "time",
+          "schema": "float",
           "name": "23skidoo"
         }
       }
@@ -115,12 +115,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_vroo;1",
+        "@id": "dtmi:example:omicron_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "boolean",
+          "schema": "integer",
           "name": "23skidoo"
         }
       }
@@ -134,11 +134,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_hi;1",
+        "@id": "dtmi:example:omicron_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "date",
+          "schema": "long",
           "name": "626"
         }
       }
@@ -152,12 +152,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_alpha;1",
+        "@id": "dtmi:example:omicron_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "dateTime",
+          "schema": "string",
           "name": "626"
         }
       }
@@ -171,11 +171,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_beta;1",
+        "@id": "dtmi:example:omicron_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "double",
+          "schema": "time",
           "name": "goodbye-world"
         }
       }
@@ -189,12 +189,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_gamma;1",
+        "@id": "dtmi:example:omicron_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "duration",
+          "schema": "boolean",
           "name": "goodbye-world"
         }
       }
@@ -208,11 +208,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_delta;1",
+        "@id": "dtmi:example:omicron_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "float",
+          "schema": "date",
           "name": "_haha"
         }
       }
@@ -226,12 +226,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_epsilon;1",
+        "@id": "dtmi:example:omicron_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "integer",
+          "schema": "dateTime",
           "name": "_haha"
         }
       }
@@ -245,11 +245,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_zeta;1",
+        "@id": "dtmi:example:omicron_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "long",
+          "schema": "double",
           "name": "toodaloo_"
         }
       }
@@ -263,12 +263,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_eta;1",
+        "@id": "dtmi:example:omicron_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "string",
+          "schema": "duration",
           "name": "toodaloo_"
         }
       }
@@ -282,11 +282,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_theta;1",
+        "@id": "dtmi:example:omicron_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "time",
+          "schema": "float",
           "name": "pro:con"
         }
       }
@@ -300,12 +300,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_iota;1",
+        "@id": "dtmi:example:omicron_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "boolean",
+          "schema": "integer",
           "name": "pro:con"
         }
       }
@@ -319,11 +319,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_kappa;1",
+        "@id": "dtmi:example:omicron_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "date",
+          "schema": "long",
           "name": "mish/mash"
         }
       }
@@ -337,12 +337,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_lambda;1",
+        "@id": "dtmi:example:omicron_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "dateTime",
+          "schema": "string",
           "name": "mish/mash"
         }
       }
@@ -356,11 +356,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_mu;1",
+        "@id": "dtmi:example:omicron_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "double",
+          "schema": "time",
           "name": "#tag"
         }
       }
@@ -374,12 +374,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_nu;1",
+        "@id": "dtmi:example:omicron_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "duration",
+          "schema": "boolean",
           "name": "#tag"
         }
       }
@@ -393,11 +393,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_xi;1",
+        "@id": "dtmi:example:omicron_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "float",
+          "schema": "date",
           "name": "@tweet"
         }
       }
@@ -411,12 +411,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_omicron;1",
+        "@id": "dtmi:example:omicron_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "integer",
+          "schema": "dateTime",
           "name": "@tweet"
         }
       }
@@ -430,11 +430,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_pi;1",
+        "@id": "dtmi:example:omicron_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "long",
+          "schema": "double",
           "name": "$money"
         }
       }
@@ -448,12 +448,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_rho;1",
+        "@id": "dtmi:example:omicron_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "string",
+          "schema": "duration",
           "name": "$money"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertyNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertyNameStringLengthV2.json
index 9e6b46cc..b7a14ff1 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertyNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertyNameStringLengthV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_quan;1",
+        "@id": "dtmi:example:omicron_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "date",
+          "schema": "long",
           "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSometh"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_thnad;1",
+        "@id": "dtmi:example:omicron_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "dateTime",
+          "schema": "string",
           "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
         }
       }
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_spazz;1",
+        "@id": "dtmi:example:omicron_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "double",
+          "schema": "time",
           "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertyNameStringV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertyNameStringV2.json
index 288ee81c..57a96138 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertyNameStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertyNameStringV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_lambda;1",
+        "@id": "dtmi:example:xi_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "time",
+          "schema": "float",
           "name": "hello"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_mu;1",
+        "@id": "dtmi:example:xi_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "boolean",
+          "schema": "integer",
           "name": [
             "hello"
           ]
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_nu;1",
+        "@id": "dtmi:example:xi_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "date",
+          "schema": "long",
           "name": {
             "@value": "hello",
             "@type": "xsd:string"
@@ -66,11 +66,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_xi;1",
+        "@id": "dtmi:example:xi_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "dateTime",
+          "schema": "string",
           "name": [
             {
               "@value": "hello",
@@ -89,11 +89,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_omicron;1",
+        "@id": "dtmi:example:xi_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "double",
+          "schema": "time",
           "name": null
         }
       }
@@ -107,12 +107,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_pi;1",
+        "@id": "dtmi:example:xi_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "duration",
+          "schema": "boolean",
           "name": null
         }
       }
@@ -126,11 +126,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_rho;1",
+        "@id": "dtmi:example:xi_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "float",
+          "schema": "date",
           "name": true
         }
       }
@@ -144,12 +144,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_sigma;1",
+        "@id": "dtmi:example:xi_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "integer",
+          "schema": "dateTime",
           "name": true
         }
       }
@@ -163,11 +163,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_tau;1",
+        "@id": "dtmi:example:xi_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "long",
+          "schema": "double",
           "name": 626
         }
       }
@@ -181,12 +181,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_upsilon;1",
+        "@id": "dtmi:example:xi_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "string",
+          "schema": "duration",
           "name": 626
         }
       }
@@ -200,11 +200,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_phi;1",
+        "@id": "dtmi:example:xi_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "time",
+          "schema": "float",
           "name": [
             null
           ]
@@ -220,12 +220,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_chi;1",
+        "@id": "dtmi:example:xi_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "boolean",
+          "schema": "integer",
           "name": [
             null
           ]
@@ -241,11 +241,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_psi;1",
+        "@id": "dtmi:example:xi_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "date",
+          "schema": "long",
           "name": [
             true
           ]
@@ -261,12 +261,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_omega;1",
+        "@id": "dtmi:example:xi_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "dateTime",
+          "schema": "string",
           "name": [
             true
           ]
@@ -282,11 +282,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_yuzz;1",
+        "@id": "dtmi:example:xi_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "double",
+          "schema": "time",
           "name": [
             626
           ]
@@ -302,12 +302,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_wum;1",
+        "@id": "dtmi:example:xi_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "duration",
+          "schema": "boolean",
           "name": [
             626
           ]
@@ -323,11 +323,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_um;1",
+        "@id": "dtmi:example:xi_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "float",
+          "schema": "date",
           "name": {}
         }
       }
@@ -341,12 +341,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_humpf;1",
+        "@id": "dtmi:example:xi_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "integer",
+          "schema": "dateTime",
           "name": {}
         }
       }
@@ -360,11 +360,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_fuddle;1",
+        "@id": "dtmi:example:xi_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "long",
+          "schema": "double",
           "name": [
             {}
           ]
@@ -380,12 +380,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_glikk;1",
+        "@id": "dtmi:example:omicron_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "string",
+          "schema": "duration",
           "name": [
             {}
           ]
@@ -401,11 +401,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_nuh;1",
+        "@id": "dtmi:example:omicron_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "time",
+          "schema": "float",
           "name": []
         }
       }
@@ -419,12 +419,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_snee;1",
+        "@id": "dtmi:example:omicron_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "boolean",
+          "schema": "integer",
           "name": []
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertyNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertyNameTermAndDtmiV2.json
index 964d9b6e..02070192 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertyNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertyNameTermAndDtmiV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_spazz;1",
+        "@id": "dtmi:example:pi_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "iota_quan",
-          "dtmi:dtdl:property:name;2": "iota_thnad",
-          "schema": "duration"
+          "name": "pi_delta",
+          "dtmi:dtdl:property:name;2": "pi_epsilon",
+          "schema": "boolean"
         }
       }
     ]
@@ -26,14 +26,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_jogg;1",
+        "@id": "dtmi:example:pi_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "iota_floob",
-          "dtmi:dtdl:property:name;2": "iota_zatz",
-          "schema": "float"
+          "name": "pi_eta",
+          "dtmi:dtdl:property:name;2": "pi_theta",
+          "schema": "date"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertyNameUniqueAmongInterfaceContentsV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertyNameUniqueAmongInterfaceContentsV2.json
index bbcf6b0f..d6720557 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertyNameUniqueAmongInterfaceContentsV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertyNameUniqueAmongInterfaceContentsV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_sigma;1",
+        "@id": "dtmi:example:omicron_snee;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Property",
-            "schema": "time",
+            "schema": "float",
             "name": "beta_eta"
           },
           {
             "@type": "Property",
-            "schema": "boolean",
+            "schema": "integer",
             "name": "beta_theta"
           }
         ]
@@ -32,17 +32,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_tau;1",
+        "@id": "dtmi:example:omicron_quan;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Property",
-            "schema": "date",
+            "schema": "long",
             "name": "beta_eta"
           },
           {
             "@type": "Property",
-            "schema": "dateTime",
+            "schema": "string",
             "name": "beta_eta"
           }
         ]
@@ -60,17 +60,17 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:iota_upsilon;1",
+        "@id": "dtmi:example:omicron_thnad;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Property",
-            "schema": "double",
+            "schema": "time",
             "name": "beta_eta"
           },
           {
             "@type": "Property",
-            "schema": "duration",
+            "schema": "boolean",
             "name": "beta_eta"
           }
         ]
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertyNameUniqueAmongRelationshipPropertiesV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertyNameUniqueAmongRelationshipPropertiesV2.json
index e989e8d3..9668e35d 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertyNameUniqueAmongRelationshipPropertiesV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertyNameUniqueAmongRelationshipPropertiesV2.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_chi;1",
+        "@id": "dtmi:example:omicron_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "iota_phi",
+          "name": "omicron_spazz",
           "properties": [
             {
               "@type": "Property",
-              "schema": "float",
+              "schema": "date",
               "name": "beta_iota"
             },
             {
               "@type": "Property",
-              "schema": "integer",
+              "schema": "dateTime",
               "name": "beta_kappa"
             }
           ]
@@ -36,20 +36,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_omega;1",
+        "@id": "dtmi:example:omicron_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "iota_psi",
+          "name": "omicron_zatz",
           "properties": [
             {
               "@type": "Property",
-              "schema": "long",
+              "schema": "double",
               "name": "beta_iota"
             },
             {
               "@type": "Property",
-              "schema": "string",
+              "schema": "duration",
               "name": "beta_iota"
             }
           ]
@@ -65,21 +65,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_wum;1",
+        "@id": "dtmi:example:omicron_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "iota_yuzz",
+          "name": "omicron_flunn",
           "properties": [
             {
               "@type": "Property",
-              "schema": "time",
+              "schema": "float",
               "name": "beta_iota"
             },
             {
               "@type": "Property",
-              "schema": "boolean",
+              "schema": "integer",
               "name": "beta_iota"
             }
           ]
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertySchemaElementV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertySchemaElementV2.json
index 94149131..a2b730b4 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertySchemaElementV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertySchemaElementV2.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_vroo;1",
+        "@id": "dtmi:example:pi_nu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:iota_yekk;1",
+          "@id": "dtmi:example:pi_mu;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "iota_itch",
+            "name": "pi_lambda",
             "schema": {
               "@type": "Enum",
               "enumValues": [
                 {
-                  "enumValue": 1066,
-                  "name": "iota_flunn"
+                  "enumValue": 1079,
+                  "name": "pi_kappa"
                 }
               ],
               "valueSchema": "integer"
@@ -38,21 +38,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_gamma;1",
+        "@id": "dtmi:example:pi_rho;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:kappa_beta;1",
+          "@id": "dtmi:example:pi_pi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "kappa_alpha",
+            "name": "pi_omicron",
             "schema": [
               {
                 "@type": "Enum",
                 "enumValues": [
                   {
-                    "enumValue": 1067,
-                    "name": "iota_hi"
+                    "enumValue": 1080,
+                    "name": "pi_xi"
                   }
                 ],
                 "valueSchema": "integer"
@@ -71,22 +71,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_epsilon;1",
+        "@id": "dtmi:example:pi_tau;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 1068,
-              "name": "kappa_delta"
+              "enumValue": 1081,
+              "name": "pi_sigma"
             }
           ],
           "valueSchema": "integer"
         },
         "contents": {
           "@type": "Property",
-          "name": "kappa_zeta",
+          "name": "pi_upsilon",
           "schema": "dtmi:ex:dependentRef;1"
         }
       }
@@ -100,22 +100,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_theta;1",
+        "@id": "dtmi:example:pi_chi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 1069,
-              "name": "kappa_eta"
+              "enumValue": 1082,
+              "name": "pi_phi"
             }
           ],
           "valueSchema": "integer"
         },
         "contents": {
           "@type": "Property",
-          "name": "kappa_iota",
+          "name": "pi_psi",
           "schema": [
             "dtmi:ex:dependentRef;1"
           ]
@@ -131,16 +131,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_nu;1",
+        "@id": "dtmi:example:pi_um;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:kappa_mu;1",
+          "@id": "dtmi:example:pi_wum;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "kappa_lambda",
+            "name": "pi_yuzz",
             "schema": {
-              "@id": "dtmi:example:kappa_kappa;1",
+              "@id": "dtmi:example:pi_omega;1",
               "@type": "Enum",
               "valueSchema": "integer",
               "@context": "dtmi:dtdl:context;3"
@@ -158,17 +158,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_rho;1",
+        "@id": "dtmi:example:pi_nuh;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:kappa_pi;1",
+          "@id": "dtmi:example:pi_glikk;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Property",
-            "name": "kappa_omicron",
+            "name": "pi_fuddle",
             "schema": {
-              "@id": "dtmi:example:kappa_xi;1",
+              "@id": "dtmi:example:pi_humpf;1",
               "@type": "Enum",
               "valueSchema": "integer",
               "@context": "dtmi:dtdl:context;3"
@@ -186,29 +186,84 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_upsilon;1",
+        "@id": "dtmi:example:pi_spazz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:pi_thnad;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "pi_quan",
+            "schema": {
+              "@id": "dtmi:example:pi_snee;1",
+              "@type": "Enum",
+              "valueSchema": "integer",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:pi_flunn;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:pi_jogg;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Property",
+            "name": "pi_zatz",
+            "schema": {
+              "@id": "dtmi:example:pi_floob;1",
+              "@type": "Enum",
+              "valueSchema": "integer",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:pi_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 1071,
-              "name": "kappa_tau"
+              "enumValue": 1084,
+              "name": "pi_yekk"
             }
           ],
           "valueSchema": "integer"
         },
         "contents": {
           "@type": "Property",
-          "name": "kappa_phi",
+          "name": "pi_hi",
           "schema": [
             {
               "@type": "Enum",
               "enumValues": [
                 {
-                  "enumValue": 1070,
-                  "name": "kappa_sigma"
+                  "enumValue": 1083,
+                  "name": "pi_itch"
                 }
               ],
               "valueSchema": "integer"
@@ -227,15 +282,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_omega;1",
+        "@id": "dtmi:example:rho_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 1073,
-              "name": "kappa_psi"
+              "enumValue": 1086,
+              "name": "rho_beta"
             }
           ],
           "valueSchema": "integer"
@@ -243,14 +298,14 @@
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "kappa_yuzz",
+          "name": "rho_delta",
           "schema": [
             {
               "@type": "Enum",
               "enumValues": [
                 {
-                  "enumValue": 1072,
-                  "name": "kappa_chi"
+                  "enumValue": 1085,
+                  "name": "rho_alpha"
                 }
               ],
               "valueSchema": "integer"
@@ -269,11 +324,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_um;1",
+        "@id": "dtmi:example:rho_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "kappa_wum",
+          "name": "rho_epsilon",
           "schema": "string"
         }
       }
@@ -287,11 +342,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_fuddle;1",
+        "@id": "dtmi:example:rho_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "kappa_humpf",
+          "name": "rho_eta",
           "schema": [
             "string"
           ]
@@ -307,11 +362,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_nuh;1",
+        "@id": "dtmi:example:rho_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "kappa_glikk",
+          "name": "rho_iota",
           "schema": "dtmi:dtdl:instance:Schema:string;2"
         }
       }
@@ -325,11 +380,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_quan;1",
+        "@id": "dtmi:example:rho_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "kappa_snee",
+          "name": "rho_lambda",
           "schema": [
             "dtmi:dtdl:instance:Schema:string;2"
           ]
@@ -345,11 +400,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_spazz;1",
+        "@id": "dtmi:example:rho_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "kappa_thnad",
+          "name": "rho_nu",
           "schema": "Foobar"
         }
       }
@@ -363,12 +418,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_zatz;1",
+        "@id": "dtmi:example:rho_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "kappa_floob",
+          "name": "rho_omicron",
           "schema": "Foobar"
         }
       }
@@ -382,11 +437,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_flunn;1",
+        "@id": "dtmi:example:rho_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "kappa_jogg",
+          "name": "rho_rho",
           "schema": null
         }
       }
@@ -400,12 +455,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_yekk;1",
+        "@id": "dtmi:example:rho_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "kappa_itch",
+          "name": "rho_tau",
           "schema": null
         }
       }
@@ -419,11 +474,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_hi;1",
+        "@id": "dtmi:example:rho_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "kappa_vroo",
+          "name": "rho_phi",
           "schema": true
         }
       }
@@ -437,12 +492,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_beta;1",
+        "@id": "dtmi:example:rho_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "lambda_alpha",
+          "name": "rho_psi",
           "schema": true
         }
       }
@@ -456,11 +511,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_delta;1",
+        "@id": "dtmi:example:rho_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "lambda_gamma",
+          "name": "rho_yuzz",
           "schema": 626
         }
       }
@@ -474,12 +529,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_zeta;1",
+        "@id": "dtmi:example:rho_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "lambda_epsilon",
+          "name": "rho_um",
           "schema": 626
         }
       }
@@ -493,11 +548,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_theta;1",
+        "@id": "dtmi:example:rho_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "lambda_eta",
+          "name": "rho_fuddle",
           "schema": [
             null
           ]
@@ -513,12 +568,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_kappa;1",
+        "@id": "dtmi:example:rho_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "lambda_iota",
+          "name": "rho_nuh",
           "schema": [
             null
           ]
@@ -534,11 +589,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_mu;1",
+        "@id": "dtmi:example:rho_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "lambda_lambda",
+          "name": "rho_quan",
           "schema": [
             true
           ]
@@ -554,12 +609,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_xi;1",
+        "@id": "dtmi:example:rho_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "lambda_nu",
+          "name": "rho_spazz",
           "schema": [
             true
           ]
@@ -575,11 +630,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_pi;1",
+        "@id": "dtmi:example:rho_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "lambda_omicron",
+          "name": "rho_zatz",
           "schema": [
             626
           ]
@@ -595,12 +650,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_sigma;1",
+        "@id": "dtmi:example:rho_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "lambda_rho",
+          "name": "rho_flunn",
           "schema": [
             626
           ]
@@ -616,11 +671,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_upsilon;1",
+        "@id": "dtmi:example:rho_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "lambda_tau",
+          "name": "rho_yekk",
           "schema": {}
         }
       }
@@ -634,12 +689,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_chi;1",
+        "@id": "dtmi:example:sigma_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "lambda_phi",
+          "name": "rho_hi",
           "schema": {}
         }
       }
@@ -653,11 +708,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_omega;1",
+        "@id": "dtmi:example:sigma_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "lambda_psi",
+          "name": "sigma_beta",
           "schema": [
             {}
           ]
@@ -673,12 +728,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_wum;1",
+        "@id": "dtmi:example:sigma_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "lambda_yuzz",
+          "name": "sigma_delta",
           "schema": [
             {}
           ]
@@ -694,11 +749,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_humpf;1",
+        "@id": "dtmi:example:sigma_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "lambda_um",
+          "name": "sigma_zeta",
           "schema": []
         }
       }
@@ -712,12 +767,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_glikk;1",
+        "@id": "dtmi:example:sigma_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "lambda_fuddle",
+          "name": "sigma_theta",
           "schema": []
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertySchemaImpliedExclusionV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertySchemaImpliedExclusionV2.json
index 0088471f..1fd7b22c 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertySchemaImpliedExclusionV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertySchemaImpliedExclusionV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_upsilon;1",
+        "@id": "dtmi:example:upsilon_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "xi_tau",
+          "name": "upsilon_yekk",
           "schema": "point"
         }
       }
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_chi;1",
+        "@id": "dtmi:example:phi_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "xi_phi",
+          "name": "upsilon_hi",
           "schema": "point"
         }
       }
@@ -44,11 +44,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_omega;1",
+        "@id": "dtmi:example:phi_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "xi_psi",
+          "name": "phi_beta",
           "schema": "dtmi:standard:schema:geospatial:point;2"
         }
       }
@@ -62,12 +62,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_wum;1",
+        "@id": "dtmi:example:phi_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "xi_yuzz",
+          "name": "phi_delta",
           "schema": "dtmi:standard:schema:geospatial:point;2"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertySchemaTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertySchemaTermAndDtmiV2.json
index 84bfaa45..11785bf1 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertySchemaTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertySchemaTermAndDtmiV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_zeta;1",
+        "@id": "dtmi:example:omega_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "sigma_epsilon",
-          "schema": "double",
-          "dtmi:dtdl:property:schema;2": "duration"
+          "name": "omega_um",
+          "schema": "time",
+          "dtmi:dtdl:property:schema;2": "boolean"
         }
       }
     ]
@@ -26,14 +26,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_theta;1",
+        "@id": "dtmi:example:omega_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "sigma_eta",
-          "schema": "float",
-          "dtmi:dtdl:property:schema;2": "integer"
+          "name": "omega_fuddle",
+          "schema": "date",
+          "dtmi:dtdl:property:schema;2": "dateTime"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertySchemaTypeConformanceV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertySchemaTypeConformanceV2.json
index f5465141..72bf1ba8 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertySchemaTypeConformanceV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertySchemaTypeConformanceV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_flunn;1",
+        "@id": "dtmi:example:sigma_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "lambda_jogg",
+          "name": "sigma_rho",
           "schema": {
-            "@id": "dtmi:example:lambda_zatz;1",
-            "elementSchema": "integer",
+            "@id": "dtmi:example:sigma_pi;1",
+            "elementSchema": "dateTime",
             "@type": "Array"
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_vroo;1",
+        "@id": "dtmi:example:sigma_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "lambda_yekk",
+          "name": "sigma_upsilon",
           "schema": {
-            "@id": "dtmi:example:lambda_itch;1",
-            "elementSchema": "long",
+            "@id": "dtmi:example:sigma_tau;1",
+            "elementSchema": "double",
             "@type": "Array"
           }
         }
@@ -52,14 +52,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_gamma;1",
+        "@id": "dtmi:example:sigma_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_beta",
+          "name": "sigma_omega",
           "schema": {
-            "@id": "dtmi:example:lambda_hi;1",
-            "name": "mu_alpha",
+            "@id": "dtmi:example:sigma_chi;1",
+            "name": "sigma_psi",
             "@type": "Command"
           }
         }
@@ -74,15 +74,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_eta;1",
+        "@id": "dtmi:example:sigma_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "mu_zeta",
+          "name": "sigma_humpf",
           "schema": {
-            "@id": "dtmi:example:mu_delta;1",
-            "name": "mu_epsilon",
+            "@id": "dtmi:example:sigma_wum;1",
+            "name": "sigma_um",
             "@type": "Command"
           }
         }
@@ -97,15 +97,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_lambda;1",
+        "@id": "dtmi:example:sigma_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_kappa",
+          "name": "sigma_snee",
           "schema": {
-            "@id": "dtmi:example:mu_theta;1",
-            "name": "mu_iota",
-            "schema": "string",
+            "@id": "dtmi:example:sigma_glikk;1",
+            "name": "sigma_nuh",
+            "schema": "duration",
             "@type": "CommandPayload"
           }
         }
@@ -120,16 +120,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_omicron;1",
+        "@id": "dtmi:example:sigma_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "mu_xi",
+          "name": "sigma_floob",
           "schema": {
-            "@id": "dtmi:example:mu_mu;1",
-            "name": "mu_nu",
-            "schema": "time",
+            "@id": "dtmi:example:sigma_thnad;1",
+            "name": "sigma_spazz",
+            "schema": "float",
             "@type": "CommandPayload"
           }
         }
@@ -144,16 +144,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_upsilon;1",
+        "@id": "dtmi:example:sigma_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_tau",
+          "name": "sigma_yekk",
           "schema": {
-            "@id": "dtmi:example:mu_pi;1",
-            "name": "mu_rho",
+            "@id": "dtmi:example:sigma_jogg;1",
+            "name": "sigma_flunn",
             "schema": {
-              "@id": "dtmi:example:mu_sigma;1",
+              "@id": "dtmi:example:sigma_itch;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -170,17 +170,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_yuzz;1",
+        "@id": "dtmi:example:tau_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "mu_omega",
+          "name": "tau_gamma",
           "schema": {
-            "@id": "dtmi:example:mu_phi;1",
-            "name": "mu_chi",
+            "@id": "dtmi:example:sigma_hi;1",
+            "name": "tau_alpha",
             "schema": {
-              "@id": "dtmi:example:mu_psi;1",
+              "@id": "dtmi:example:tau_beta;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -197,17 +197,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_fuddle;1",
+        "@id": "dtmi:example:tau_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_humpf",
+          "name": "tau_eta",
           "schema": {
-            "@id": "dtmi:example:mu_wum;1",
+            "@id": "dtmi:example:tau_epsilon;1",
             "enumValues": [
               {
-                "enumValue": 1074,
-                "name": "mu_um"
+                "enumValue": 1087,
+                "name": "tau_zeta"
               }
             ],
             "valueSchema": "integer",
@@ -225,15 +225,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_quan;1",
+        "@id": "dtmi:example:tau_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_snee",
+          "name": "tau_lambda",
           "schema": {
-            "@id": "dtmi:example:mu_glikk;1",
-            "enumValue": 1075,
-            "name": "mu_nuh",
+            "@id": "dtmi:example:tau_iota;1",
+            "enumValue": 1088,
+            "name": "tau_kappa",
             "@type": "EnumValue"
           }
         }
@@ -248,16 +248,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_zatz;1",
+        "@id": "dtmi:example:tau_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "mu_floob",
+          "name": "tau_omicron",
           "schema": {
-            "@id": "dtmi:example:mu_thnad;1",
-            "enumValue": 1076,
-            "name": "mu_spazz",
+            "@id": "dtmi:example:tau_nu;1",
+            "enumValue": 1089,
+            "name": "tau_xi",
             "@type": "EnumValue"
           }
         }
@@ -272,15 +272,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_yekk;1",
+        "@id": "dtmi:example:tau_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "mu_itch",
+          "name": "tau_tau",
           "schema": {
-            "@id": "dtmi:example:mu_jogg;1",
-            "name": "mu_flunn",
-            "schema": "boolean",
+            "@id": "dtmi:example:tau_rho;1",
+            "name": "tau_sigma",
+            "schema": "integer",
             "@type": "Field"
           }
         }
@@ -295,16 +295,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_beta;1",
+        "@id": "dtmi:example:tau_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "nu_alpha",
+          "name": "tau_psi",
           "schema": {
-            "@id": "dtmi:example:mu_vroo;1",
-            "name": "mu_hi",
-            "schema": "date",
+            "@id": "dtmi:example:tau_phi;1",
+            "name": "tau_chi",
+            "schema": "long",
             "@type": "Field"
           }
         }
@@ -319,13 +319,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_epsilon;1",
+        "@id": "dtmi:example:tau_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nu_delta",
+          "name": "tau_wum",
           "schema": {
-            "@id": "dtmi:example:nu_gamma;1",
+            "@id": "dtmi:example:tau_yuzz;1",
             "@type": "Interface"
           }
         }
@@ -340,14 +340,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_theta;1",
+        "@id": "dtmi:example:tau_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "nu_eta",
+          "name": "tau_fuddle",
           "schema": {
-            "@id": "dtmi:example:nu_zeta;1",
+            "@id": "dtmi:example:tau_humpf;1",
             "@type": "Interface"
           }
         }
@@ -362,20 +362,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_nu;1",
+        "@id": "dtmi:example:tau_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nu_mu",
+          "name": "tau_thnad",
           "schema": {
-            "@id": "dtmi:example:nu_iota;1",
+            "@id": "dtmi:example:tau_nuh;1",
             "mapKey": {
-              "name": "nu_kappa",
+              "name": "tau_snee",
               "schema": "string"
             },
             "mapValue": {
-              "name": "nu_lambda",
-              "schema": "dateTime"
+              "name": "tau_quan",
+              "schema": "string"
             },
             "@type": "Map"
           }
@@ -391,14 +391,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_rho;1",
+        "@id": "dtmi:example:tau_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nu_pi",
+          "name": "tau_jogg",
           "schema": {
-            "@id": "dtmi:example:nu_xi;1",
-            "name": "nu_omicron",
+            "@id": "dtmi:example:tau_floob;1",
+            "name": "tau_zatz",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -414,15 +414,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_phi;1",
+        "@id": "dtmi:example:tau_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "nu_upsilon",
+          "name": "tau_vroo",
           "schema": {
-            "@id": "dtmi:example:nu_sigma;1",
-            "name": "nu_tau",
+            "@id": "dtmi:example:tau_itch;1",
+            "name": "tau_yekk",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -438,15 +438,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_yuzz;1",
+        "@id": "dtmi:example:upsilon_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nu_omega",
+          "name": "upsilon_gamma",
           "schema": {
-            "@id": "dtmi:example:nu_chi;1",
-            "name": "nu_psi",
-            "schema": "double",
+            "@id": "dtmi:example:upsilon_alpha;1",
+            "name": "upsilon_beta",
+            "schema": "time",
             "@type": "MapValue"
           }
         }
@@ -461,16 +461,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_fuddle;1",
+        "@id": "dtmi:example:upsilon_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "nu_humpf",
+          "name": "upsilon_eta",
           "schema": {
-            "@id": "dtmi:example:nu_wum;1",
-            "name": "nu_um",
-            "schema": "duration",
+            "@id": "dtmi:example:upsilon_epsilon;1",
+            "name": "upsilon_zeta",
+            "schema": "boolean",
             "@type": "MapValue"
           }
         }
@@ -485,17 +485,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_quan;1",
+        "@id": "dtmi:example:upsilon_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nu_snee",
+          "name": "upsilon_lambda",
           "schema": {
-            "@id": "dtmi:example:nu_glikk;1",
+            "@id": "dtmi:example:upsilon_iota;1",
             "fields": [
               {
-                "name": "nu_nuh",
-                "schema": "float"
+                "name": "upsilon_kappa",
+                "schema": "date"
               }
             ],
             "@type": "Object"
@@ -512,15 +512,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_zatz;1",
+        "@id": "dtmi:example:upsilon_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nu_floob",
+          "name": "upsilon_omicron",
           "schema": {
-            "@id": "dtmi:example:nu_thnad;1",
-            "name": "nu_spazz",
-            "schema": "integer",
+            "@id": "dtmi:example:upsilon_nu;1",
+            "name": "upsilon_xi",
+            "schema": "dateTime",
             "@type": "Property"
           }
         }
@@ -535,16 +535,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_yekk;1",
+        "@id": "dtmi:example:upsilon_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "nu_itch",
+          "name": "upsilon_tau",
           "schema": {
-            "@id": "dtmi:example:nu_jogg;1",
-            "name": "nu_flunn",
-            "schema": "long",
+            "@id": "dtmi:example:upsilon_rho;1",
+            "name": "upsilon_sigma",
+            "schema": "double",
             "@type": "Property"
           }
         }
@@ -559,14 +559,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_beta;1",
+        "@id": "dtmi:example:upsilon_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "xi_alpha",
+          "name": "upsilon_psi",
           "schema": {
-            "@id": "dtmi:example:nu_vroo;1",
-            "name": "nu_hi",
+            "@id": "dtmi:example:upsilon_phi;1",
+            "name": "upsilon_chi",
             "@type": "Relationship"
           }
         }
@@ -581,15 +581,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_zeta;1",
+        "@id": "dtmi:example:upsilon_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "xi_epsilon",
+          "name": "upsilon_um",
           "schema": {
-            "@id": "dtmi:example:xi_gamma;1",
-            "name": "xi_delta",
+            "@id": "dtmi:example:upsilon_yuzz;1",
+            "name": "upsilon_wum",
             "@type": "Relationship"
           }
         }
@@ -604,15 +604,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_kappa;1",
+        "@id": "dtmi:example:upsilon_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "xi_iota",
+          "name": "upsilon_nuh",
           "schema": {
-            "@id": "dtmi:example:xi_eta;1",
-            "name": "xi_theta",
-            "schema": "string",
+            "@id": "dtmi:example:upsilon_fuddle;1",
+            "name": "upsilon_glikk",
+            "schema": "duration",
             "@type": "Telemetry"
           }
         }
@@ -627,16 +627,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_xi;1",
+        "@id": "dtmi:example:upsilon_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "xi_nu",
+          "name": "upsilon_spazz",
           "schema": {
-            "@id": "dtmi:example:xi_lambda;1",
-            "name": "xi_mu",
-            "schema": "time",
+            "@id": "dtmi:example:upsilon_quan;1",
+            "name": "upsilon_thnad",
+            "schema": "float",
             "@type": "Telemetry"
           }
         }
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertyWritableBooleanV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertyWritableBooleanV2.json
index fec74048..93738610 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertyWritableBooleanV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertyWritableBooleanV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_chi;1",
+        "@id": "dtmi:example:thnad_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "um_phi",
-          "schema": "string",
+          "name": "thnad_zeta",
+          "schema": "integer",
           "writable": true
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_omega;1",
+        "@id": "dtmi:example:thnad_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "um_psi",
-          "schema": "time",
+          "name": "thnad_theta",
+          "schema": "long",
           "writable": false
         }
       }
@@ -45,12 +45,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_wum;1",
+        "@id": "dtmi:example:thnad_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "um_yuzz",
-          "schema": "boolean",
+          "name": "thnad_kappa",
+          "schema": "string",
           "writable": [
             true
           ]
@@ -66,12 +66,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_humpf;1",
+        "@id": "dtmi:example:thnad_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "um_um",
-          "schema": "date",
+          "name": "thnad_mu",
+          "schema": "time",
           "writable": [
             false
           ]
@@ -87,12 +87,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_glikk;1",
+        "@id": "dtmi:example:thnad_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "um_fuddle",
-          "schema": "dateTime",
+          "name": "thnad_xi",
+          "schema": "boolean",
           "writable": {
             "@value": true,
             "@type": "xsd:boolean"
@@ -109,12 +109,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_snee;1",
+        "@id": "dtmi:example:thnad_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "um_nuh",
-          "schema": "double",
+          "name": "thnad_pi",
+          "schema": "date",
           "writable": {
             "@value": false,
             "@type": "xsd:boolean"
@@ -131,12 +131,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_thnad;1",
+        "@id": "dtmi:example:thnad_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "um_quan",
-          "schema": "duration",
+          "name": "thnad_sigma",
+          "schema": "dateTime",
           "writable": [
             {
               "@value": true,
@@ -155,12 +155,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_floob;1",
+        "@id": "dtmi:example:thnad_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "um_spazz",
-          "schema": "float",
+          "name": "thnad_upsilon",
+          "schema": "double",
           "writable": [
             {
               "@value": false,
@@ -179,12 +179,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_jogg;1",
+        "@id": "dtmi:example:thnad_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "um_zatz",
-          "schema": "integer",
+          "name": "thnad_chi",
+          "schema": "duration",
           "writable": []
         }
       }
@@ -198,12 +198,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_itch;1",
+        "@id": "dtmi:example:thnad_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "um_flunn",
-          "schema": "long",
+          "name": "thnad_omega",
+          "schema": "float",
           "writable": null
         }
       }
@@ -217,13 +217,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:um_vroo;1",
+        "@id": "dtmi:example:thnad_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "um_yekk",
-          "schema": "string",
+          "name": "thnad_wum",
+          "schema": "integer",
           "writable": null
         }
       }
@@ -237,12 +237,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_alpha;1",
+        "@id": "dtmi:example:thnad_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "um_hi",
-          "schema": "time",
+          "name": "thnad_humpf",
+          "schema": "long",
           "writable": 626
         }
       }
@@ -256,13 +256,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_gamma;1",
+        "@id": "dtmi:example:thnad_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "humpf_beta",
-          "schema": "boolean",
+          "name": "thnad_glikk",
+          "schema": "string",
           "writable": 626
         }
       }
@@ -276,12 +276,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_epsilon;1",
+        "@id": "dtmi:example:thnad_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_delta",
-          "schema": "date",
+          "name": "thnad_snee",
+          "schema": "time",
           "writable": "hello"
         }
       }
@@ -295,13 +295,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_eta;1",
+        "@id": "dtmi:example:thnad_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "humpf_zeta",
-          "schema": "dateTime",
+          "name": "thnad_thnad",
+          "schema": "boolean",
           "writable": "hello"
         }
       }
@@ -315,12 +315,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_iota;1",
+        "@id": "dtmi:example:thnad_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_theta",
-          "schema": "double",
+          "name": "thnad_floob",
+          "schema": "date",
           "writable": [
             null
           ]
@@ -336,13 +336,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_lambda;1",
+        "@id": "dtmi:example:thnad_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "humpf_kappa",
-          "schema": "duration",
+          "name": "thnad_jogg",
+          "schema": "dateTime",
           "writable": [
             null
           ]
@@ -358,12 +358,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_nu;1",
+        "@id": "dtmi:example:thnad_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_mu",
-          "schema": "float",
+          "name": "thnad_itch",
+          "schema": "double",
           "writable": [
             626
           ]
@@ -379,13 +379,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_omicron;1",
+        "@id": "dtmi:example:thnad_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "humpf_xi",
-          "schema": "integer",
+          "name": "thnad_vroo",
+          "schema": "duration",
           "writable": [
             626
           ]
@@ -401,12 +401,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_rho;1",
+        "@id": "dtmi:example:spazz_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_pi",
-          "schema": "long",
+          "name": "spazz_alpha",
+          "schema": "float",
           "writable": [
             "hello"
           ]
@@ -422,13 +422,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_tau;1",
+        "@id": "dtmi:example:spazz_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "humpf_sigma",
-          "schema": "string",
+          "name": "spazz_gamma",
+          "schema": "integer",
           "writable": [
             "hello"
           ]
@@ -444,12 +444,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_phi;1",
+        "@id": "dtmi:example:spazz_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_upsilon",
-          "schema": "time",
+          "name": "spazz_epsilon",
+          "schema": "long",
           "writable": {}
         }
       }
@@ -463,13 +463,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_psi;1",
+        "@id": "dtmi:example:spazz_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "humpf_chi",
-          "schema": "boolean",
+          "name": "spazz_eta",
+          "schema": "string",
           "writable": {}
         }
       }
@@ -483,12 +483,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_yuzz;1",
+        "@id": "dtmi:example:spazz_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_omega",
-          "schema": "date",
+          "name": "spazz_iota",
+          "schema": "time",
           "writable": [
             {}
           ]
@@ -504,13 +504,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_um;1",
+        "@id": "dtmi:example:spazz_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "humpf_wum",
-          "schema": "dateTime",
+          "name": "spazz_lambda",
+          "schema": "boolean",
           "writable": [
             {}
           ]
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyPropertyWritableTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassPropertyPropertyWritableTermAndDtmiV2.json
index c5f9832b..b4090aee 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyPropertyWritableTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyPropertyWritableTermAndDtmiV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_spazz;1",
+        "@id": "dtmi:example:spazz_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_thnad",
-          "schema": "integer",
+          "name": "spazz_tau",
+          "schema": "duration",
           "writable": true,
           "dtmi:dtdl:property:writable;2": false
         }
@@ -27,13 +27,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:humpf_zatz;1",
+        "@id": "dtmi:example:spazz_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "humpf_floob",
-          "schema": "long",
+          "name": "spazz_phi",
+          "schema": "float",
           "writable": true,
           "dtmi:dtdl:property:writable;2": false
         }
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyRequiredPropertiesV2.json b/DTDL/v2/spec/Requirement-ClassPropertyRequiredPropertiesV2.json
index 912b6049..1af19a84 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyRequiredPropertiesV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyRequiredPropertiesV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_nuh;1",
+        "@id": "dtmi:example:mu_beta;1",
         "@type": "Interface",
         "contents": {
-          "name": "epsilon_glikk",
-          "schema": "float"
+          "name": "mu_alpha",
+          "schema": "date"
         }
       }
     ]
@@ -24,12 +24,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_quan;1",
+        "@id": "dtmi:example:mu_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "epsilon_snee",
-          "schema": "integer"
+          "name": "mu_gamma",
+          "schema": "dateTime"
         }
       }
     ]
@@ -42,11 +42,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_thnad;1",
+        "@id": "dtmi:example:mu_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "long"
+          "schema": "double"
         }
       }
     ]
@@ -59,12 +59,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_spazz;1",
+        "@id": "dtmi:example:mu_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "string"
+          "schema": "duration"
         }
       }
     ]
@@ -77,11 +77,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_zatz;1",
+        "@id": "dtmi:example:mu_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "epsilon_floob"
+          "name": "mu_eta"
         }
       }
     ]
@@ -94,12 +94,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_flunn;1",
+        "@id": "dtmi:example:mu_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "epsilon_jogg"
+          "name": "mu_iota"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyTypeIncludesInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassPropertyTypeIncludesInvalidDtmiV2.json
index da0509fb..155c82ed 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyTypeIncludesInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyTypeIncludesInvalidDtmiV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_delta;1",
+        "@id": "dtmi:example:xi_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:foo//bar"
           ],
-          "name": "theta_gamma",
-          "schema": "float"
+          "name": "xi_rho",
+          "schema": "date"
         }
       }
     ]
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_zeta;1",
+        "@id": "dtmi:example:xi_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,8 +36,8 @@
             "Property",
             "dtmi:foo//bar"
           ],
-          "name": "theta_epsilon",
-          "schema": "integer"
+          "name": "xi_tau",
+          "schema": "dateTime"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyTypeIncludesMaterialV2.json b/DTDL/v2/spec/Requirement-ClassPropertyTypeIncludesMaterialV2.json
index 81c2cf66..a0a8d17a 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyTypeIncludesMaterialV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyTypeIncludesMaterialV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_glikk;1",
+        "@id": "dtmi:example:nu_alpha;1",
         "@type": "Interface",
         "contents": {
-          "name": "zeta_fuddle",
-          "schema": "float",
+          "name": "mu_hi",
+          "schema": "date",
           "@type": "Property"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_snee;1",
+        "@id": "dtmi:example:nu_gamma;1",
         "@type": "Interface",
         "contents": {
-          "name": "zeta_nuh",
-          "schema": "integer",
+          "name": "nu_beta",
+          "schema": "dateTime",
           "@type": [
             "Property"
           ]
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_thnad;1",
+        "@id": "dtmi:example:nu_epsilon;1",
         "@type": "Interface",
         "contents": {
-          "name": "zeta_quan",
-          "schema": "long",
+          "name": "nu_delta",
+          "schema": "double",
           "@type": "dtmi:dtdl:class:Property;2"
         }
       }
@@ -63,11 +63,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_floob;1",
+        "@id": "dtmi:example:nu_eta;1",
         "@type": "Interface",
         "contents": {
-          "name": "zeta_spazz",
-          "schema": "string",
+          "name": "nu_zeta",
+          "schema": "duration",
           "@type": [
             "dtmi:dtdl:class:Property;2"
           ]
@@ -83,11 +83,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_jogg;1",
+        "@id": "dtmi:example:nu_iota;1",
         "@type": "Interface",
         "contents": {
-          "name": "zeta_zatz",
-          "schema": "time",
+          "name": "nu_theta",
+          "schema": "float",
           "@type": "Something"
         }
       }
@@ -101,12 +101,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_itch;1",
+        "@id": "dtmi:example:nu_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "zeta_flunn",
-          "schema": "boolean",
+          "name": "nu_kappa",
+          "schema": "integer",
           "@type": "Something"
         }
       }
@@ -120,11 +120,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_vroo;1",
+        "@id": "dtmi:example:nu_nu;1",
         "@type": "Interface",
         "contents": {
-          "name": "zeta_yekk",
-          "schema": "date",
+          "name": "nu_mu",
+          "schema": "long",
           "@type": [
             "Something"
           ]
@@ -140,12 +140,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_alpha;1",
+        "@id": "dtmi:example:nu_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "zeta_hi",
-          "schema": "dateTime",
+          "name": "nu_xi",
+          "schema": "string",
           "@type": [
             "Something"
           ]
diff --git a/DTDL/v2/spec/Requirement-ClassPropertyTypeStringOrArrayV2.json b/DTDL/v2/spec/Requirement-ClassPropertyTypeStringOrArrayV2.json
index fc4566f5..50ea93b4 100644
--- a/DTDL/v2/spec/Requirement-ClassPropertyTypeStringOrArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassPropertyTypeStringOrArrayV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_yekk;1",
+        "@id": "dtmi:example:mu_mu;1",
         "@type": "Interface",
         "contents": {
-          "name": "epsilon_itch",
-          "schema": "time",
+          "name": "mu_lambda",
+          "schema": "float",
           "@type": 626
         }
       }
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_hi;1",
+        "@id": "dtmi:example:mu_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "epsilon_vroo",
-          "schema": "boolean",
+          "name": "mu_nu",
+          "schema": "integer",
           "@type": 626
         }
       }
@@ -44,11 +44,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_beta;1",
+        "@id": "dtmi:example:mu_pi;1",
         "@type": "Interface",
         "contents": {
-          "name": "zeta_alpha",
-          "schema": "date",
+          "name": "mu_omicron",
+          "schema": "long",
           "@type": null
         }
       }
@@ -62,12 +62,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_delta;1",
+        "@id": "dtmi:example:mu_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "zeta_gamma",
-          "schema": "dateTime",
+          "name": "mu_rho",
+          "schema": "string",
           "@type": null
         }
       }
@@ -81,11 +81,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_zeta;1",
+        "@id": "dtmi:example:mu_upsilon;1",
         "@type": "Interface",
         "contents": {
-          "name": "zeta_epsilon",
-          "schema": "double",
+          "name": "mu_tau",
+          "schema": "time",
           "@type": true
         }
       }
@@ -99,12 +99,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_theta;1",
+        "@id": "dtmi:example:mu_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "zeta_eta",
-          "schema": "duration",
+          "name": "mu_phi",
+          "schema": "boolean",
           "@type": true
         }
       }
@@ -118,11 +118,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_kappa;1",
+        "@id": "dtmi:example:mu_omega;1",
         "@type": "Interface",
         "contents": {
-          "name": "zeta_iota",
-          "schema": "float",
+          "name": "mu_psi",
+          "schema": "date",
           "@type": {}
         }
       }
@@ -136,12 +136,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_mu;1",
+        "@id": "dtmi:example:mu_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "zeta_lambda",
-          "schema": "integer",
+          "name": "mu_yuzz",
+          "schema": "dateTime",
           "@type": {}
         }
       }
@@ -155,11 +155,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_xi;1",
+        "@id": "dtmi:example:mu_humpf;1",
         "@type": "Interface",
         "contents": {
-          "name": "zeta_nu",
-          "schema": "long",
+          "name": "mu_um",
+          "schema": "double",
           "@type": [
             626
           ]
@@ -175,12 +175,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_pi;1",
+        "@id": "dtmi:example:mu_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "zeta_omicron",
-          "schema": "string",
+          "name": "mu_fuddle",
+          "schema": "duration",
           "@type": [
             626
           ]
@@ -196,11 +196,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_sigma;1",
+        "@id": "dtmi:example:mu_snee;1",
         "@type": "Interface",
         "contents": {
-          "name": "zeta_rho",
-          "schema": "time",
+          "name": "mu_nuh",
+          "schema": "float",
           "@type": [
             null
           ]
@@ -216,12 +216,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_upsilon;1",
+        "@id": "dtmi:example:mu_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "zeta_tau",
-          "schema": "boolean",
+          "name": "mu_quan",
+          "schema": "integer",
           "@type": [
             null
           ]
@@ -237,11 +237,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_chi;1",
+        "@id": "dtmi:example:mu_floob;1",
         "@type": "Interface",
         "contents": {
-          "name": "zeta_phi",
-          "schema": "date",
+          "name": "mu_spazz",
+          "schema": "long",
           "@type": [
             true
           ]
@@ -257,12 +257,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_omega;1",
+        "@id": "dtmi:example:mu_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "zeta_psi",
-          "schema": "dateTime",
+          "name": "mu_zatz",
+          "schema": "string",
           "@type": [
             true
           ]
@@ -278,11 +278,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_wum;1",
+        "@id": "dtmi:example:mu_itch;1",
         "@type": "Interface",
         "contents": {
-          "name": "zeta_yuzz",
-          "schema": "double",
+          "name": "mu_flunn",
+          "schema": "time",
           "@type": [
             {}
           ]
@@ -298,12 +298,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_humpf;1",
+        "@id": "dtmi:example:mu_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "zeta_um",
-          "schema": "duration",
+          "name": "mu_yekk",
+          "schema": "boolean",
           "@type": [
             {}
           ]
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipContextConformsV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipContextConformsV2.json
index 0955e6df..963187b8 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipContextConformsV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipContextConformsV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_epsilon;1",
+        "@id": "dtmi:example:alpha_quan;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:jogg_delta;1",
+          "@id": "dtmi:example:alpha_snee;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "jogg_gamma",
+            "name": "alpha_nuh",
             "@context": "dtmi:iotcentral:context;2"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_theta;1",
+        "@id": "dtmi:example:alpha_floob;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:jogg_eta;1",
+          "@id": "dtmi:example:alpha_spazz;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "jogg_zeta",
+            "name": "alpha_thnad",
             "@context": []
           }
         }
@@ -51,14 +51,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_lambda;1",
+        "@id": "dtmi:example:alpha_flunn;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:jogg_kappa;1",
+          "@id": "dtmi:example:alpha_jogg;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "jogg_iota",
+            "name": "alpha_zatz",
             "@context": [
               "dtmi:iotcentral:context;2"
             ]
@@ -75,14 +75,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_xi;1",
+        "@id": "dtmi:example:alpha_vroo;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:jogg_nu;1",
+          "@id": "dtmi:example:alpha_yekk;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "jogg_mu",
+            "name": "alpha_itch",
             "@context": null
           }
         }
@@ -97,14 +97,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_rho;1",
+        "@id": "dtmi:example:beta_beta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:jogg_pi;1",
+          "@id": "dtmi:example:beta_alpha;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "jogg_omicron",
+            "name": "alpha_hi",
             "@context": 626
           }
         }
@@ -119,14 +119,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_upsilon;1",
+        "@id": "dtmi:example:beta_epsilon;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:jogg_tau;1",
+          "@id": "dtmi:example:beta_delta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "jogg_sigma",
+            "name": "beta_gamma",
             "@context": true
           }
         }
@@ -141,14 +141,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_psi;1",
+        "@id": "dtmi:example:beta_theta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:jogg_chi;1",
+          "@id": "dtmi:example:beta_eta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "jogg_phi",
+            "name": "beta_zeta",
             "@context": [
               null
             ]
@@ -165,14 +165,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_wum;1",
+        "@id": "dtmi:example:beta_lambda;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:jogg_yuzz;1",
+          "@id": "dtmi:example:beta_kappa;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "jogg_omega",
+            "name": "beta_iota",
             "@context": [
               626
             ]
@@ -189,14 +189,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_fuddle;1",
+        "@id": "dtmi:example:beta_xi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:jogg_humpf;1",
+          "@id": "dtmi:example:beta_nu;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "jogg_um",
+            "name": "beta_mu",
             "@context": [
               true
             ]
@@ -213,15 +213,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_snee;1",
+        "@id": "dtmi:example:beta_rho;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:jogg_nuh;1",
+          "@id": "dtmi:example:beta_pi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "jogg_glikk",
-            "@context": {}
+            "name": "beta_omicron",
+            "@context": "dtmi:iotcentral:context"
           }
         }
       }
@@ -235,17 +235,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_spazz;1",
+        "@id": "dtmi:example:beta_upsilon;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:jogg_thnad;1",
+          "@id": "dtmi:example:beta_tau;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "jogg_quan",
-            "@context": [
-              {}
-            ]
+            "name": "beta_sigma",
+            "@context": "http://iotcentral/context/2"
           }
         }
       }
@@ -259,15 +257,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_jogg;1",
+        "@id": "dtmi:example:beta_psi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:jogg_zatz;1",
+          "@id": "dtmi:example:beta_chi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "jogg_floob",
-            "@context": "dtmi:iotcentral:context"
+            "name": "beta_phi",
+            "@context": "iotcentral;2"
           }
         }
       }
@@ -281,15 +279,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_yekk;1",
+        "@id": "dtmi:example:beta_wum;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:jogg_itch;1",
+          "@id": "dtmi:example:beta_yuzz;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "jogg_flunn",
-            "@context": "http://iotcentral/context/2"
+            "name": "beta_omega",
+            "@context": {}
           }
         }
       }
@@ -303,15 +301,67 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_alpha;1",
+        "@id": "dtmi:example:beta_fuddle;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:jogg_hi;1",
+          "@id": "dtmi:example:beta_humpf;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "jogg_vroo",
-            "@context": "iotcentral;2"
+            "name": "beta_um",
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:beta_snee;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:beta_nuh;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "beta_glikk",
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:beta_spazz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:beta_thnad;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "beta_quan",
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipGraphKeywordV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipGraphKeywordV2.json
index 4e24a3f0..8e143b0d 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipGraphKeywordV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipGraphKeywordV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_thnad;1",
+        "@id": "dtmi:example:hi_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "floob_quan",
+          "name": "hi_thnad",
           "@graph": {}
         }
       }
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_floob;1",
+        "@id": "dtmi:example:hi_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "floob_spazz",
+          "name": "hi_floob",
           "@graph": {}
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipIdDuplicateV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipIdDuplicateV2.json
index 9bf5bb3c..67703441 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipIdDuplicateV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipIdDuplicateV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_epsilon;1",
+        "@id": "dtmi:example:epsilon_flunn;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:vroo_epsilon;1",
+          "@id": "dtmi:example:epsilon_flunn;1",
           "@type": "Interface",
           "contents": {
-            "@id": "dtmi:example:vroo_epsilon;1",
+            "@id": "dtmi:example:epsilon_flunn;1",
             "@type": "Relationship",
-            "name": "vroo_zeta"
+            "name": "epsilon_itch"
           }
         }
       }
@@ -29,16 +29,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_eta;1",
+        "@id": "dtmi:example:epsilon_yekk;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:vroo_eta;1",
+          "@id": "dtmi:example:epsilon_yekk;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "@id": "dtmi:example:vroo_eta;1",
+            "@id": "dtmi:example:epsilon_yekk;1",
             "@type": "Relationship",
-            "name": "vroo_theta"
+            "name": "epsilon_vroo"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipIdIsDtmiV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipIdIsDtmiV2.json
index bd048259..a25a8c42 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipIdIsDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipIdIsDtmiV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_gamma;1",
+        "@id": "dtmi:example:beta_zatz;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;7",
           "@type": "Relationship",
-          "name": "flunn_beta"
+          "name": "beta_floob"
         }
       }
     ]
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_epsilon;1",
+        "@id": "dtmi:example:beta_flunn;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;108675309",
           "@type": "Relationship",
-          "name": "flunn_delta"
+          "name": "beta_jogg"
         }
       }
     ]
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_eta;1",
+        "@id": "dtmi:example:beta_yekk;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;999999999",
           "@type": "Relationship",
-          "name": "flunn_zeta"
+          "name": "beta_itch"
         }
       }
     ]
@@ -61,12 +61,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_iota;1",
+        "@id": "dtmi:example:beta_hi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo;1",
           "@type": "Relationship",
-          "name": "flunn_theta"
+          "name": "beta_vroo"
         }
       }
     ]
@@ -79,12 +79,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_lambda;1",
+        "@id": "dtmi:example:gamma_beta;1",
         "@type": "Interface",
         "contents": {
           "@id": null,
           "@type": "Relationship",
-          "name": "flunn_kappa"
+          "name": "gamma_alpha"
         }
       }
     ]
@@ -97,13 +97,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_nu;1",
+        "@id": "dtmi:example:gamma_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": null,
           "@type": "Relationship",
-          "name": "flunn_mu"
+          "name": "gamma_gamma"
         }
       }
     ]
@@ -116,12 +116,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_omicron;1",
+        "@id": "dtmi:example:gamma_zeta;1",
         "@type": "Interface",
         "contents": {
           "@id": 626,
           "@type": "Relationship",
-          "name": "flunn_xi"
+          "name": "gamma_epsilon"
         }
       }
     ]
@@ -134,13 +134,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_rho;1",
+        "@id": "dtmi:example:gamma_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": 626,
           "@type": "Relationship",
-          "name": "flunn_pi"
+          "name": "gamma_eta"
         }
       }
     ]
@@ -153,12 +153,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_tau;1",
+        "@id": "dtmi:example:gamma_kappa;1",
         "@type": "Interface",
         "contents": {
           "@id": true,
           "@type": "Relationship",
-          "name": "flunn_sigma"
+          "name": "gamma_iota"
         }
       }
     ]
@@ -171,13 +171,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_phi;1",
+        "@id": "dtmi:example:gamma_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": true,
           "@type": "Relationship",
-          "name": "flunn_upsilon"
+          "name": "gamma_lambda"
         }
       }
     ]
@@ -190,14 +190,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_psi;1",
+        "@id": "dtmi:example:gamma_xi;1",
         "@type": "Interface",
         "contents": {
           "@id": {
             "@value": "dtmi:apparently:valid:identifier;3"
           },
           "@type": "Relationship",
-          "name": "flunn_chi"
+          "name": "gamma_nu"
         }
       }
     ]
@@ -210,7 +210,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_yuzz;1",
+        "@id": "dtmi:example:gamma_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -218,7 +218,7 @@
             "@value": "dtmi:apparently:valid:identifier;3"
           },
           "@type": "Relationship",
-          "name": "flunn_omega"
+          "name": "gamma_omicron"
         }
       }
     ]
@@ -231,12 +231,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_um;1",
+        "@id": "dtmi:example:gamma_sigma;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0",
           "@type": "Relationship",
-          "name": "flunn_wum"
+          "name": "gamma_rho"
         }
       }
     ]
@@ -249,13 +249,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_fuddle;1",
+        "@id": "dtmi:example:gamma_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0",
           "@type": "Relationship",
-          "name": "flunn_humpf"
+          "name": "gamma_tau"
         }
       }
     ]
@@ -268,12 +268,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_nuh;1",
+        "@id": "dtmi:example:gamma_chi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Relationship",
-          "name": "flunn_glikk"
+          "name": "gamma_phi"
         }
       }
     ]
@@ -286,13 +286,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_quan;1",
+        "@id": "dtmi:example:gamma_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Relationship",
-          "name": "flunn_snee"
+          "name": "gamma_psi"
         }
       }
     ]
@@ -305,12 +305,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_spazz;1",
+        "@id": "dtmi:example:gamma_wum;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Relationship",
-          "name": "flunn_thnad"
+          "name": "gamma_yuzz"
         }
       }
     ]
@@ -323,13 +323,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_zatz;1",
+        "@id": "dtmi:example:gamma_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Relationship",
-          "name": "flunn_floob"
+          "name": "gamma_um"
         }
       }
     ]
@@ -342,12 +342,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_flunn;1",
+        "@id": "dtmi:example:gamma_glikk;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;1a",
           "@type": "Relationship",
-          "name": "flunn_jogg"
+          "name": "gamma_fuddle"
         }
       }
     ]
@@ -360,13 +360,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_yekk;1",
+        "@id": "dtmi:example:gamma_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1a",
           "@type": "Relationship",
-          "name": "flunn_itch"
+          "name": "gamma_nuh"
         }
       }
     ]
@@ -379,12 +379,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_hi;1",
+        "@id": "dtmi:example:gamma_thnad;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Relationship",
-          "name": "flunn_vroo"
+          "name": "gamma_quan"
         }
       }
     ]
@@ -397,13 +397,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_beta;1",
+        "@id": "dtmi:example:gamma_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Relationship",
-          "name": "itch_alpha"
+          "name": "gamma_spazz"
         }
       }
     ]
@@ -416,12 +416,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_delta;1",
+        "@id": "dtmi:example:gamma_jogg;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Relationship",
-          "name": "itch_gamma"
+          "name": "gamma_zatz"
         }
       }
     ]
@@ -434,13 +434,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_zeta;1",
+        "@id": "dtmi:example:gamma_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Relationship",
-          "name": "itch_epsilon"
+          "name": "gamma_flunn"
         }
       }
     ]
@@ -453,12 +453,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_theta;1",
+        "@id": "dtmi:example:gamma_vroo;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Relationship",
-          "name": "itch_eta"
+          "name": "gamma_yekk"
         }
       }
     ]
@@ -471,13 +471,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_kappa;1",
+        "@id": "dtmi:example:delta_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Relationship",
-          "name": "itch_iota"
+          "name": "gamma_hi"
         }
       }
     ]
@@ -490,12 +490,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_mu;1",
+        "@id": "dtmi:example:delta_gamma;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Relationship",
-          "name": "itch_lambda"
+          "name": "delta_beta"
         }
       }
     ]
@@ -508,13 +508,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_xi;1",
+        "@id": "dtmi:example:delta_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Relationship",
-          "name": "itch_nu"
+          "name": "delta_delta"
         }
       }
     ]
@@ -527,12 +527,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_pi;1",
+        "@id": "dtmi:example:delta_eta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;01",
           "@type": "Relationship",
-          "name": "itch_omicron"
+          "name": "delta_zeta"
         }
       }
     ]
@@ -545,13 +545,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_sigma;1",
+        "@id": "dtmi:example:delta_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;01",
           "@type": "Relationship",
-          "name": "itch_rho"
+          "name": "delta_theta"
         }
       }
     ]
@@ -564,12 +564,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_upsilon;1",
+        "@id": "dtmi:example:delta_lambda;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;",
           "@type": "Relationship",
-          "name": "itch_tau"
+          "name": "delta_kappa"
         }
       }
     ]
@@ -582,13 +582,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_chi;1",
+        "@id": "dtmi:example:delta_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;",
           "@type": "Relationship",
-          "name": "itch_phi"
+          "name": "delta_mu"
         }
       }
     ]
@@ -601,12 +601,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_omega;1",
+        "@id": "dtmi:example:delta_omicron;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Relationship",
-          "name": "itch_psi"
+          "name": "delta_xi"
         }
       }
     ]
@@ -619,13 +619,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_wum;1",
+        "@id": "dtmi:example:delta_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Relationship",
-          "name": "itch_yuzz"
+          "name": "delta_pi"
         }
       }
     ]
@@ -638,12 +638,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_humpf;1",
+        "@id": "dtmi:example:delta_tau;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Relationship",
-          "name": "itch_um"
+          "name": "delta_sigma"
         }
       }
     ]
@@ -656,13 +656,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_glikk;1",
+        "@id": "dtmi:example:delta_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Relationship",
-          "name": "itch_fuddle"
+          "name": "delta_upsilon"
         }
       }
     ]
@@ -675,12 +675,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_snee;1",
+        "@id": "dtmi:example:delta_psi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:1seg;1",
           "@type": "Relationship",
-          "name": "itch_nuh"
+          "name": "delta_chi"
         }
       }
     ]
@@ -693,13 +693,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_thnad;1",
+        "@id": "dtmi:example:delta_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:1seg;1",
           "@type": "Relationship",
-          "name": "itch_quan"
+          "name": "delta_omega"
         }
       }
     ]
@@ -712,12 +712,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_floob;1",
+        "@id": "dtmi:example:delta_um;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Relationship",
-          "name": "itch_spazz"
+          "name": "delta_wum"
         }
       }
     ]
@@ -730,13 +730,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_jogg;1",
+        "@id": "dtmi:example:delta_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Relationship",
-          "name": "itch_zatz"
+          "name": "delta_humpf"
         }
       }
     ]
@@ -749,12 +749,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_itch;1",
+        "@id": "dtmi:example:delta_nuh;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo::bar;1",
           "@type": "Relationship",
-          "name": "itch_flunn"
+          "name": "delta_glikk"
         }
       }
     ]
@@ -767,13 +767,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_vroo;1",
+        "@id": "dtmi:example:delta_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo::bar;1",
           "@type": "Relationship",
-          "name": "itch_yekk"
+          "name": "delta_snee"
         }
       }
     ]
@@ -786,12 +786,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_alpha;1",
+        "@id": "dtmi:example:delta_spazz;1",
         "@type": "Interface",
         "contents": {
           "@id": "urn:foo:bar:1",
           "@type": "Relationship",
-          "name": "itch_hi"
+          "name": "delta_thnad"
         }
       }
     ]
@@ -804,13 +804,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_gamma;1",
+        "@id": "dtmi:example:delta_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "urn:foo:bar:1",
           "@type": "Relationship",
-          "name": "yekk_beta"
+          "name": "delta_floob"
         }
       }
     ]
@@ -823,12 +823,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_epsilon;1",
+        "@id": "dtmi:example:delta_flunn;1",
         "@type": "Interface",
         "contents": {
           "@id": "http://foo/bar/baz",
           "@type": "Relationship",
-          "name": "yekk_delta"
+          "name": "delta_jogg"
         }
       }
     ]
@@ -841,13 +841,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_eta;1",
+        "@id": "dtmi:example:delta_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "http://foo/bar/baz",
           "@type": "Relationship",
-          "name": "yekk_zeta"
+          "name": "delta_itch"
         }
       }
     ]
@@ -860,12 +860,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_iota;1",
+        "@id": "dtmi:example:delta_hi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:;1",
           "@type": "Relationship",
-          "name": "yekk_theta"
+          "name": "delta_vroo"
         }
       }
     ]
@@ -878,13 +878,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_lambda;1",
+        "@id": "dtmi:example:epsilon_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:;1",
           "@type": "Relationship",
-          "name": "yekk_kappa"
+          "name": "epsilon_alpha"
         }
       }
     ]
@@ -897,12 +897,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_nu;1",
+        "@id": "dtmi:example:epsilon_delta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar",
           "@type": "Relationship",
-          "name": "yekk_mu"
+          "name": "epsilon_gamma"
         }
       }
     ]
@@ -915,13 +915,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_omicron;1",
+        "@id": "dtmi:example:epsilon_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar",
           "@type": "Relationship",
-          "name": "yekk_xi"
+          "name": "epsilon_epsilon"
         }
       }
     ]
@@ -934,12 +934,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_rho;1",
+        "@id": "dtmi:example:epsilon_theta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.14",
           "@type": "Relationship",
-          "name": "yekk_pi"
+          "name": "epsilon_eta"
         }
       }
     ]
@@ -952,13 +952,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_tau;1",
+        "@id": "dtmi:example:epsilon_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.14",
           "@type": "Relationship",
-          "name": "yekk_sigma"
+          "name": "epsilon_iota"
         }
       }
     ]
@@ -971,12 +971,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_phi;1",
+        "@id": "dtmi:example:epsilon_mu;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.141592",
           "@type": "Relationship",
-          "name": "yekk_upsilon"
+          "name": "epsilon_lambda"
         }
       }
     ]
@@ -989,13 +989,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_psi;1",
+        "@id": "dtmi:example:epsilon_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.141592",
           "@type": "Relationship",
-          "name": "yekk_chi"
+          "name": "epsilon_nu"
         }
       }
     ]
@@ -1008,12 +1008,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_yuzz;1",
+        "@id": "dtmi:example:epsilon_pi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:dtdl:example;1",
           "@type": "Relationship",
-          "name": "yekk_omega"
+          "name": "epsilon_omicron"
         }
       }
     ]
@@ -1026,13 +1026,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_um;1",
+        "@id": "dtmi:example:epsilon_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:dtdl:example;1",
           "@type": "Relationship",
-          "name": "yekk_wum"
+          "name": "epsilon_rho"
         }
       }
     ]
@@ -1045,12 +1045,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_fuddle;1",
+        "@id": "dtmi:example:epsilon_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:standard:example;1",
           "@type": "Relationship",
-          "name": "yekk_humpf"
+          "name": "epsilon_tau"
         }
       }
     ]
@@ -1063,13 +1063,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_nuh;1",
+        "@id": "dtmi:example:epsilon_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:standard:example;1",
           "@type": "Relationship",
-          "name": "yekk_glikk"
+          "name": "epsilon_phi"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipIdNotArrayV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipIdNotArrayV2.json
index b9561c7a..50683cc9 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipIdNotArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipIdNotArrayV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_quan;1",
+        "@id": "dtmi:example:epsilon_omega;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;7"
           ],
           "@type": "Relationship",
-          "name": "yekk_snee"
+          "name": "epsilon_psi"
         }
       }
     ]
@@ -27,7 +27,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_spazz;1",
+        "@id": "dtmi:example:epsilon_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -35,7 +35,7 @@
             "dtmi:foo:bar;7"
           ],
           "@type": "Relationship",
-          "name": "yekk_thnad"
+          "name": "epsilon_yuzz"
         }
       }
     ]
@@ -48,14 +48,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_zatz;1",
+        "@id": "dtmi:example:epsilon_humpf;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;108675309"
           ],
           "@type": "Relationship",
-          "name": "yekk_floob"
+          "name": "epsilon_um"
         }
       }
     ]
@@ -68,7 +68,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_flunn;1",
+        "@id": "dtmi:example:epsilon_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -76,7 +76,7 @@
             "dtmi:foo:bar;108675309"
           ],
           "@type": "Relationship",
-          "name": "yekk_jogg"
+          "name": "epsilon_fuddle"
         }
       }
     ]
@@ -89,14 +89,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_yekk;1",
+        "@id": "dtmi:example:epsilon_snee;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;999999999"
           ],
           "@type": "Relationship",
-          "name": "yekk_itch"
+          "name": "epsilon_nuh"
         }
       }
     ]
@@ -109,7 +109,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_hi;1",
+        "@id": "dtmi:example:epsilon_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -117,7 +117,7 @@
             "dtmi:foo:bar;999999999"
           ],
           "@type": "Relationship",
-          "name": "yekk_vroo"
+          "name": "epsilon_quan"
         }
       }
     ]
@@ -130,14 +130,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_beta;1",
+        "@id": "dtmi:example:epsilon_floob;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo;1"
           ],
           "@type": "Relationship",
-          "name": "vroo_alpha"
+          "name": "epsilon_spazz"
         }
       }
     ]
@@ -150,7 +150,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_delta;1",
+        "@id": "dtmi:example:epsilon_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -158,7 +158,7 @@
             "dtmi:foo;1"
           ],
           "@type": "Relationship",
-          "name": "vroo_gamma"
+          "name": "epsilon_zatz"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyCommentStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyCommentStringLengthV2.json
index b50f41bd..6cb3d95e 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyCommentStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyCommentStringLengthV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_iota;1",
+        "@id": "dtmi:example:zeta_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "hi_theta",
+          "name": "zeta_vroo",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_lambda;1",
+        "@id": "dtmi:example:eta_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "hi_kappa",
+          "name": "eta_alpha",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_nu;1",
+        "@id": "dtmi:example:eta_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "hi_mu",
+          "name": "eta_gamma",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyCommentStringV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyCommentStringV2.json
index d52ff6fa..7935a56c 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyCommentStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyCommentStringV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_kappa;1",
+        "@id": "dtmi:example:zeta_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "vroo_iota",
+          "name": "epsilon_hi",
           "comment": "hello"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_mu;1",
+        "@id": "dtmi:example:zeta_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "vroo_lambda",
+          "name": "zeta_beta",
           "comment": [
             "hello"
           ]
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_xi;1",
+        "@id": "dtmi:example:zeta_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "vroo_nu",
+          "name": "zeta_delta",
           "comment": {
             "@value": "hello",
             "@type": "xsd:string"
@@ -66,11 +66,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_pi;1",
+        "@id": "dtmi:example:zeta_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "vroo_omicron",
+          "name": "zeta_zeta",
           "comment": [
             {
               "@value": "hello",
@@ -89,11 +89,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_sigma;1",
+        "@id": "dtmi:example:zeta_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "vroo_rho",
+          "name": "zeta_theta",
           "comment": []
         }
       }
@@ -107,11 +107,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_upsilon;1",
+        "@id": "dtmi:example:zeta_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "vroo_tau",
+          "name": "zeta_kappa",
           "comment": null
         }
       }
@@ -125,12 +125,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_chi;1",
+        "@id": "dtmi:example:zeta_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "vroo_phi",
+          "name": "zeta_mu",
           "comment": null
         }
       }
@@ -144,11 +144,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_omega;1",
+        "@id": "dtmi:example:zeta_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "vroo_psi",
+          "name": "zeta_xi",
           "comment": true
         }
       }
@@ -162,12 +162,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_wum;1",
+        "@id": "dtmi:example:zeta_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "vroo_yuzz",
+          "name": "zeta_pi",
           "comment": true
         }
       }
@@ -181,11 +181,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_humpf;1",
+        "@id": "dtmi:example:zeta_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "vroo_um",
+          "name": "zeta_sigma",
           "comment": 626
         }
       }
@@ -199,12 +199,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_glikk;1",
+        "@id": "dtmi:example:zeta_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "vroo_fuddle",
+          "name": "zeta_upsilon",
           "comment": 626
         }
       }
@@ -218,11 +218,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_snee;1",
+        "@id": "dtmi:example:zeta_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "vroo_nuh",
+          "name": "zeta_chi",
           "comment": [
             null
           ]
@@ -238,12 +238,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_thnad;1",
+        "@id": "dtmi:example:zeta_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "vroo_quan",
+          "name": "zeta_omega",
           "comment": [
             null
           ]
@@ -259,11 +259,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_floob;1",
+        "@id": "dtmi:example:zeta_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "vroo_spazz",
+          "name": "zeta_wum",
           "comment": [
             true
           ]
@@ -279,12 +279,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_jogg;1",
+        "@id": "dtmi:example:zeta_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "vroo_zatz",
+          "name": "zeta_humpf",
           "comment": [
             true
           ]
@@ -300,11 +300,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_itch;1",
+        "@id": "dtmi:example:zeta_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "vroo_flunn",
+          "name": "zeta_glikk",
           "comment": [
             626
           ]
@@ -320,12 +320,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_vroo;1",
+        "@id": "dtmi:example:zeta_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "vroo_yekk",
+          "name": "zeta_snee",
           "comment": [
             626
           ]
@@ -341,11 +341,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_alpha;1",
+        "@id": "dtmi:example:zeta_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "vroo_hi",
+          "name": "zeta_thnad",
           "comment": {}
         }
       }
@@ -359,12 +359,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_gamma;1",
+        "@id": "dtmi:example:zeta_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "hi_beta",
+          "name": "zeta_floob",
           "comment": {}
         }
       }
@@ -378,11 +378,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_epsilon;1",
+        "@id": "dtmi:example:zeta_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "hi_delta",
+          "name": "zeta_jogg",
           "comment": [
             {}
           ]
@@ -398,12 +398,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_eta;1",
+        "@id": "dtmi:example:zeta_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "hi_zeta",
+          "name": "zeta_itch",
           "comment": [
             {}
           ]
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyCommentTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyCommentTermAndDtmiV2.json
index ae702db2..9979ff9e 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyCommentTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyCommentTermAndDtmiV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_wum;1",
+        "@id": "dtmi:example:eta_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "comment": "hi_psi",
-          "dtmi:dtdl:property:comment;2": "hi_omega",
-          "name": "hi_yuzz"
+          "comment": "eta_xi",
+          "dtmi:dtdl:property:comment;2": "eta_omicron",
+          "name": "eta_pi"
         }
       }
     ]
@@ -26,14 +26,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_glikk;1",
+        "@id": "dtmi:example:eta_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "comment": "hi_um",
-          "dtmi:dtdl:property:comment;2": "hi_humpf",
-          "name": "hi_fuddle"
+          "comment": "eta_sigma",
+          "dtmi:dtdl:property:comment;2": "eta_tau",
+          "name": "eta_upsilon"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyDescriptionLangStringV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyDescriptionLangStringV2.json
index 036456ff..99f21ef0 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyDescriptionLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyDescriptionLangStringV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_snee;1",
+        "@id": "dtmi:example:eta_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "hi_nuh",
+          "name": "eta_chi",
           "description": "hello"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_thnad;1",
+        "@id": "dtmi:example:eta_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "hi_quan",
+          "name": "eta_omega",
           "description": [
             "hello"
           ]
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_floob;1",
+        "@id": "dtmi:example:eta_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "hi_spazz",
+          "name": "eta_wum",
           "description": {
             "en": "hello"
           }
@@ -65,11 +65,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_jogg;1",
+        "@id": "dtmi:example:eta_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "hi_zatz",
+          "name": "eta_humpf",
           "description": [
             {
               "@value": "hello",
@@ -88,11 +88,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_itch;1",
+        "@id": "dtmi:example:eta_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "hi_flunn",
+          "name": "eta_glikk",
           "description": {}
         }
       }
@@ -106,11 +106,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_vroo;1",
+        "@id": "dtmi:example:eta_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "hi_yekk",
+          "name": "eta_snee",
           "description": []
         }
       }
@@ -124,11 +124,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_alpha;1",
+        "@id": "dtmi:example:eta_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "hi_hi",
+          "name": "eta_thnad",
           "description": null
         }
       }
@@ -142,12 +142,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_gamma;1",
+        "@id": "dtmi:example:eta_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "alpha_beta",
+          "name": "eta_floob",
           "description": null
         }
       }
@@ -161,11 +161,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_epsilon;1",
+        "@id": "dtmi:example:eta_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "alpha_delta",
+          "name": "eta_jogg",
           "description": true
         }
       }
@@ -179,12 +179,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_eta;1",
+        "@id": "dtmi:example:eta_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "alpha_zeta",
+          "name": "eta_itch",
           "description": true
         }
       }
@@ -198,11 +198,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_iota;1",
+        "@id": "dtmi:example:eta_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "alpha_theta",
+          "name": "eta_vroo",
           "description": 626
         }
       }
@@ -216,12 +216,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_lambda;1",
+        "@id": "dtmi:example:theta_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "alpha_kappa",
+          "name": "theta_alpha",
           "description": 626
         }
       }
@@ -235,11 +235,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_nu;1",
+        "@id": "dtmi:example:theta_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "alpha_mu",
+          "name": "theta_gamma",
           "description": [
             null
           ]
@@ -255,12 +255,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_omicron;1",
+        "@id": "dtmi:example:theta_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "alpha_xi",
+          "name": "theta_epsilon",
           "description": [
             null
           ]
@@ -276,11 +276,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_rho;1",
+        "@id": "dtmi:example:theta_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "alpha_pi",
+          "name": "theta_eta",
           "description": [
             true
           ]
@@ -296,12 +296,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_tau;1",
+        "@id": "dtmi:example:theta_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "alpha_sigma",
+          "name": "theta_iota",
           "description": [
             true
           ]
@@ -317,11 +317,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_phi;1",
+        "@id": "dtmi:example:theta_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "alpha_upsilon",
+          "name": "theta_lambda",
           "description": [
             626
           ]
@@ -337,12 +337,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_psi;1",
+        "@id": "dtmi:example:theta_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "alpha_chi",
+          "name": "theta_nu",
           "description": [
             626
           ]
@@ -358,11 +358,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_yuzz;1",
+        "@id": "dtmi:example:theta_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "alpha_omega",
+          "name": "theta_omicron",
           "description": [
             {}
           ]
@@ -378,12 +378,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_um;1",
+        "@id": "dtmi:example:theta_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "alpha_wum",
+          "name": "theta_rho",
           "description": [
             {}
           ]
@@ -399,11 +399,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_fuddle;1",
+        "@id": "dtmi:example:theta_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "alpha_humpf",
+          "name": "theta_tau",
           "description": {
             "@value": "hello",
             "@language": "en"
@@ -420,12 +420,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_nuh;1",
+        "@id": "dtmi:example:theta_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "alpha_glikk",
+          "name": "theta_phi",
           "description": {
             "@value": "hello",
             "@language": "en"
@@ -442,11 +442,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_quan;1",
+        "@id": "dtmi:example:theta_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "alpha_snee",
+          "name": "theta_psi",
           "description": [
             {
               "en": "hello"
@@ -464,12 +464,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_spazz;1",
+        "@id": "dtmi:example:theta_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "alpha_thnad",
+          "name": "theta_yuzz",
           "description": [
             {
               "en": "hello"
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyDescriptionStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyDescriptionStringLengthV2.json
index 6ece204e..daad856f 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyDescriptionStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyDescriptionStringLengthV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_zatz;1",
+        "@id": "dtmi:example:theta_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "alpha_floob",
+          "name": "theta_um",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_flunn;1",
+        "@id": "dtmi:example:theta_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "alpha_jogg",
+          "name": "theta_fuddle",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_yekk;1",
+        "@id": "dtmi:example:theta_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "alpha_itch",
+          "name": "theta_nuh",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyDescriptionTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyDescriptionTermAndDtmiV2.json
index 0e287fc8..441de8ce 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyDescriptionTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyDescriptionTermAndDtmiV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_lambda;1",
+        "@id": "dtmi:example:iota_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "description": [
-            "beta_theta"
+            "theta_vroo"
           ],
           "dtmi:dtdl:property:description;2": [
-            "beta_iota"
+            "theta_hi"
           ],
-          "name": "beta_kappa"
+          "name": "iota_alpha"
         }
       }
     ]
@@ -30,18 +30,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_omicron;1",
+        "@id": "dtmi:example:iota_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
           "description": [
-            "beta_mu"
+            "iota_gamma"
           ],
           "dtmi:dtdl:property:description;2": [
-            "beta_nu"
+            "iota_delta"
           ],
-          "name": "beta_xi"
+          "name": "iota_epsilon"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyDisplayNameLangStringV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyDisplayNameLangStringV2.json
index 370dc4b7..e825a55f 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyDisplayNameLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyDisplayNameLangStringV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_rho;1",
+        "@id": "dtmi:example:iota_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "beta_pi",
+          "name": "iota_eta",
           "displayName": "hello"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_tau;1",
+        "@id": "dtmi:example:iota_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "beta_sigma",
+          "name": "iota_iota",
           "displayName": [
             "hello"
           ]
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_phi;1",
+        "@id": "dtmi:example:iota_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "beta_upsilon",
+          "name": "iota_lambda",
           "displayName": {
             "en": "hello"
           }
@@ -65,11 +65,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_psi;1",
+        "@id": "dtmi:example:iota_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "beta_chi",
+          "name": "iota_nu",
           "displayName": [
             {
               "@value": "hello",
@@ -88,11 +88,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_yuzz;1",
+        "@id": "dtmi:example:iota_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "beta_omega",
+          "name": "iota_omicron",
           "displayName": {}
         }
       }
@@ -106,11 +106,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_um;1",
+        "@id": "dtmi:example:iota_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "beta_wum",
+          "name": "iota_rho",
           "displayName": []
         }
       }
@@ -124,11 +124,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_fuddle;1",
+        "@id": "dtmi:example:iota_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "beta_humpf",
+          "name": "iota_tau",
           "displayName": null
         }
       }
@@ -142,12 +142,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_nuh;1",
+        "@id": "dtmi:example:iota_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "beta_glikk",
+          "name": "iota_phi",
           "displayName": null
         }
       }
@@ -161,11 +161,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_quan;1",
+        "@id": "dtmi:example:iota_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "beta_snee",
+          "name": "iota_psi",
           "displayName": true
         }
       }
@@ -179,12 +179,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_spazz;1",
+        "@id": "dtmi:example:iota_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "beta_thnad",
+          "name": "iota_yuzz",
           "displayName": true
         }
       }
@@ -198,11 +198,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_zatz;1",
+        "@id": "dtmi:example:iota_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "beta_floob",
+          "name": "iota_um",
           "displayName": 626
         }
       }
@@ -216,12 +216,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_flunn;1",
+        "@id": "dtmi:example:iota_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "beta_jogg",
+          "name": "iota_fuddle",
           "displayName": 626
         }
       }
@@ -235,11 +235,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_yekk;1",
+        "@id": "dtmi:example:iota_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "beta_itch",
+          "name": "iota_nuh",
           "displayName": [
             null
           ]
@@ -255,12 +255,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_hi;1",
+        "@id": "dtmi:example:iota_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "beta_vroo",
+          "name": "iota_quan",
           "displayName": [
             null
           ]
@@ -276,11 +276,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_beta;1",
+        "@id": "dtmi:example:iota_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "gamma_alpha",
+          "name": "iota_spazz",
           "displayName": [
             true
           ]
@@ -296,12 +296,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_delta;1",
+        "@id": "dtmi:example:iota_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "gamma_gamma",
+          "name": "iota_zatz",
           "displayName": [
             true
           ]
@@ -317,11 +317,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_zeta;1",
+        "@id": "dtmi:example:iota_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "gamma_epsilon",
+          "name": "iota_flunn",
           "displayName": [
             626
           ]
@@ -337,12 +337,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_theta;1",
+        "@id": "dtmi:example:iota_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "gamma_eta",
+          "name": "iota_yekk",
           "displayName": [
             626
           ]
@@ -358,11 +358,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_kappa;1",
+        "@id": "dtmi:example:kappa_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "gamma_iota",
+          "name": "iota_hi",
           "displayName": [
             {}
           ]
@@ -378,12 +378,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_mu;1",
+        "@id": "dtmi:example:kappa_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "gamma_lambda",
+          "name": "kappa_beta",
           "displayName": [
             {}
           ]
@@ -399,11 +399,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_xi;1",
+        "@id": "dtmi:example:kappa_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "gamma_nu",
+          "name": "kappa_delta",
           "displayName": {
             "@value": "hello",
             "@language": "en"
@@ -420,12 +420,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_pi;1",
+        "@id": "dtmi:example:kappa_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "gamma_omicron",
+          "name": "kappa_zeta",
           "displayName": {
             "@value": "hello",
             "@language": "en"
@@ -442,11 +442,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_sigma;1",
+        "@id": "dtmi:example:kappa_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "gamma_rho",
+          "name": "kappa_theta",
           "displayName": [
             {
               "en": "hello"
@@ -464,12 +464,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_upsilon;1",
+        "@id": "dtmi:example:kappa_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "gamma_tau",
+          "name": "kappa_kappa",
           "displayName": [
             {
               "en": "hello"
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyDisplayNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyDisplayNameStringLengthV2.json
index 95623fcf..094c0043 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyDisplayNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyDisplayNameStringLengthV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_chi;1",
+        "@id": "dtmi:example:kappa_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "gamma_phi",
+          "name": "kappa_mu",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSometh"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_omega;1",
+        "@id": "dtmi:example:kappa_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "gamma_psi",
+          "name": "kappa_xi",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
         }
       }
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_wum;1",
+        "@id": "dtmi:example:kappa_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "gamma_yuzz",
+          "name": "kappa_pi",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyDisplayNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyDisplayNameTermAndDtmiV2.json
index 851c8890..527cd560 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyDisplayNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyDisplayNameTermAndDtmiV2.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_flunn;1",
+        "@id": "dtmi:example:kappa_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "displayName": [
-            "gamma_floob"
+            "kappa_um"
           ],
           "dtmi:dtdl:property:displayName;2": [
-            "gamma_zatz"
+            "kappa_humpf"
           ],
-          "name": "gamma_jogg"
+          "name": "kappa_fuddle"
         }
       }
     ]
@@ -30,18 +30,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_hi;1",
+        "@id": "dtmi:example:kappa_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
           "displayName": [
-            "gamma_itch"
+            "kappa_nuh"
           ],
           "dtmi:dtdl:property:displayName;2": [
-            "gamma_yekk"
+            "kappa_snee"
           ],
-          "name": "gamma_vroo"
+          "name": "kappa_quan"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyFormallyInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyFormallyInvalidDtmiV2.json
index 11f91444..10431e54 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyFormallyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyFormallyInvalidDtmiV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_omicron;1",
+        "@id": "dtmi:example:alpha_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zatz_xi",
+          "name": "alpha_omicron",
           "dtmi:foo//bar": 626
         }
       }
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_rho;1",
+        "@id": "dtmi:example:alpha_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "zatz_pi",
+          "name": "alpha_rho",
           "dtmi:foo//bar": 626
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyFormallyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyFormallyIrrelevantDtmiOrTermV2.json
index 1d2f93c8..bdb637e4 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyFormallyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyFormallyIrrelevantDtmiOrTermV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_epsilon;1",
+        "@id": "dtmi:example:alpha_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zatz_delta",
+          "name": "alpha_epsilon",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_eta;1",
+        "@id": "dtmi:example:alpha_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "zatz_zeta",
+          "name": "alpha_eta",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -44,11 +44,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_iota;1",
+        "@id": "dtmi:example:alpha_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zatz_theta",
+          "name": "alpha_iota",
           "boolean": null
         }
       }
@@ -62,12 +62,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_lambda;1",
+        "@id": "dtmi:example:alpha_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "zatz_kappa",
+          "name": "alpha_lambda",
           "boolean": null
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyFormallyNotDtmiNorTermV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyFormallyNotDtmiNorTermV2.json
index f4643857..c5cfe658 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyFormallyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyFormallyNotDtmiNorTermV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_phi;1",
+        "@id": "dtmi:example:alpha_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zatz_upsilon",
+          "name": "alpha_phi",
           "http://foo.com/bar": true
         }
       }
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_psi;1",
+        "@id": "dtmi:example:alpha_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "zatz_chi",
+          "name": "alpha_psi",
           "http://foo.com/bar": true
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyFormallyUndefinedTermV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyFormallyUndefinedTermV2.json
index 7d4065d2..ce598e2d 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyFormallyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyFormallyUndefinedTermV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_um;1",
+        "@id": "dtmi:example:alpha_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zatz_wum",
+          "name": "alpha_um",
           "foobar": {}
         }
       }
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_fuddle;1",
+        "@id": "dtmi:example:alpha_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "zatz_humpf",
+          "name": "alpha_fuddle",
           "foobar": {}
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityIntegerV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityIntegerV2.json
index a06f537c..831cece4 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityIntegerV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityIntegerV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_beta;1",
+        "@id": "dtmi:example:kappa_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "delta_alpha",
+          "name": "kappa_spazz",
           "maxMultiplicity": 8
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_delta;1",
+        "@id": "dtmi:example:kappa_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "delta_gamma",
+          "name": "kappa_zatz",
           "maxMultiplicity": [
             8
           ]
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_zeta;1",
+        "@id": "dtmi:example:kappa_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "delta_epsilon",
+          "name": "kappa_flunn",
           "maxMultiplicity": {
             "@value": 8,
             "@type": "xsd:integer"
@@ -66,11 +66,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_theta;1",
+        "@id": "dtmi:example:kappa_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "delta_eta",
+          "name": "kappa_yekk",
           "maxMultiplicity": [
             {
               "@value": 8,
@@ -89,11 +89,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_kappa;1",
+        "@id": "dtmi:example:lambda_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "delta_iota",
+          "name": "kappa_hi",
           "maxMultiplicity": []
         }
       }
@@ -107,11 +107,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_mu;1",
+        "@id": "dtmi:example:lambda_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "delta_lambda",
+          "name": "lambda_beta",
           "maxMultiplicity": null
         }
       }
@@ -125,12 +125,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_xi;1",
+        "@id": "dtmi:example:lambda_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "delta_nu",
+          "name": "lambda_delta",
           "maxMultiplicity": null
         }
       }
@@ -144,11 +144,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_pi;1",
+        "@id": "dtmi:example:lambda_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "delta_omicron",
+          "name": "lambda_zeta",
           "maxMultiplicity": true
         }
       }
@@ -162,12 +162,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_sigma;1",
+        "@id": "dtmi:example:lambda_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "delta_rho",
+          "name": "lambda_theta",
           "maxMultiplicity": true
         }
       }
@@ -181,11 +181,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_upsilon;1",
+        "@id": "dtmi:example:lambda_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "delta_tau",
+          "name": "lambda_kappa",
           "maxMultiplicity": "hello"
         }
       }
@@ -199,12 +199,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_chi;1",
+        "@id": "dtmi:example:lambda_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "delta_phi",
+          "name": "lambda_mu",
           "maxMultiplicity": "hello"
         }
       }
@@ -218,11 +218,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_omega;1",
+        "@id": "dtmi:example:lambda_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "delta_psi",
+          "name": "lambda_xi",
           "maxMultiplicity": [
             null
           ]
@@ -238,12 +238,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_wum;1",
+        "@id": "dtmi:example:lambda_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "delta_yuzz",
+          "name": "lambda_pi",
           "maxMultiplicity": [
             null
           ]
@@ -259,11 +259,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_humpf;1",
+        "@id": "dtmi:example:lambda_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "delta_um",
+          "name": "lambda_sigma",
           "maxMultiplicity": [
             true
           ]
@@ -279,12 +279,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_glikk;1",
+        "@id": "dtmi:example:lambda_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "delta_fuddle",
+          "name": "lambda_upsilon",
           "maxMultiplicity": [
             true
           ]
@@ -300,11 +300,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_snee;1",
+        "@id": "dtmi:example:lambda_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "delta_nuh",
+          "name": "lambda_chi",
           "maxMultiplicity": [
             "hello"
           ]
@@ -320,12 +320,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_thnad;1",
+        "@id": "dtmi:example:lambda_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "delta_quan",
+          "name": "lambda_omega",
           "maxMultiplicity": [
             "hello"
           ]
@@ -341,11 +341,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_floob;1",
+        "@id": "dtmi:example:lambda_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "delta_spazz",
+          "name": "lambda_wum",
           "maxMultiplicity": {}
         }
       }
@@ -359,12 +359,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_jogg;1",
+        "@id": "dtmi:example:lambda_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "delta_zatz",
+          "name": "lambda_humpf",
           "maxMultiplicity": {}
         }
       }
@@ -378,11 +378,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_itch;1",
+        "@id": "dtmi:example:lambda_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "delta_flunn",
+          "name": "lambda_glikk",
           "maxMultiplicity": [
             {}
           ]
@@ -398,12 +398,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_vroo;1",
+        "@id": "dtmi:example:lambda_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "delta_yekk",
+          "name": "lambda_snee",
           "maxMultiplicity": [
             {}
           ]
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityMaxValueV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityMaxValueV2.json
index fcc401b2..f78e96b6 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityMaxValueV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityMaxValueV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_eta;1",
+        "@id": "dtmi:example:lambda_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "epsilon_zeta",
+          "name": "lambda_itch",
           "maxMultiplicity": 500
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_iota;1",
+        "@id": "dtmi:example:lambda_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "epsilon_theta",
+          "name": "lambda_vroo",
           "maxMultiplicity": 501
         }
       }
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_lambda;1",
+        "@id": "dtmi:example:mu_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "epsilon_kappa",
+          "name": "mu_alpha",
           "maxMultiplicity": 501
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityMinValueV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityMinValueV2.json
index 3080ffd1..404364c2 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityMinValueV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityMinValueV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_alpha;1",
+        "@id": "dtmi:example:lambda_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "delta_hi",
+          "name": "lambda_thnad",
           "maxMultiplicity": 1
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_gamma;1",
+        "@id": "dtmi:example:lambda_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "epsilon_beta",
+          "name": "lambda_floob",
           "maxMultiplicity": 0
         }
       }
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_epsilon;1",
+        "@id": "dtmi:example:lambda_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "epsilon_delta",
+          "name": "lambda_jogg",
           "maxMultiplicity": 0
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityTermAndDtmiV2.json
index a4d462c9..09973b46 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityTermAndDtmiV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_tau;1",
+        "@id": "dtmi:example:mu_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "maxMultiplicity": 500,
           "dtmi:dtdl:property:maxMultiplicity;2": 500,
-          "name": "epsilon_sigma"
+          "name": "mu_iota"
         }
       }
     ]
@@ -26,14 +26,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_phi;1",
+        "@id": "dtmi:example:mu_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
           "maxMultiplicity": 500,
           "dtmi:dtdl:property:maxMultiplicity;2": 500,
-          "name": "epsilon_upsilon"
+          "name": "mu_lambda"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMinMultiplicityExactValueV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMinMultiplicityExactValueV2.json
index c1460395..fca0e5b5 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMinMultiplicityExactValueV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMinMultiplicityExactValueV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_chi;1",
+        "@id": "dtmi:example:nu_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zeta_phi",
+          "name": "nu_mu",
           "minMultiplicity": 0
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_omega;1",
+        "@id": "dtmi:example:nu_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zeta_psi",
+          "name": "nu_xi",
           "minMultiplicity": -1
         }
       }
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_wum;1",
+        "@id": "dtmi:example:nu_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "zeta_yuzz",
+          "name": "nu_pi",
           "minMultiplicity": -1
         }
       }
@@ -62,11 +62,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_humpf;1",
+        "@id": "dtmi:example:nu_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zeta_um",
+          "name": "nu_sigma",
           "minMultiplicity": 1
         }
       }
@@ -80,12 +80,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_glikk;1",
+        "@id": "dtmi:example:nu_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "zeta_fuddle",
+          "name": "nu_upsilon",
           "minMultiplicity": 1
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMinMultiplicityIntegerV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMinMultiplicityIntegerV2.json
index b1f9ac3b..490cbcb8 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMinMultiplicityIntegerV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMinMultiplicityIntegerV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_psi;1",
+        "@id": "dtmi:example:mu_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "epsilon_chi",
+          "name": "mu_nu",
           "minMultiplicity": 0
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_yuzz;1",
+        "@id": "dtmi:example:mu_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "epsilon_omega",
+          "name": "mu_omicron",
           "minMultiplicity": [
             0
           ]
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_um;1",
+        "@id": "dtmi:example:mu_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "epsilon_wum",
+          "name": "mu_rho",
           "minMultiplicity": {
             "@value": 0,
             "@type": "xsd:integer"
@@ -66,11 +66,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_fuddle;1",
+        "@id": "dtmi:example:mu_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "epsilon_humpf",
+          "name": "mu_tau",
           "minMultiplicity": [
             {
               "@value": 0,
@@ -89,11 +89,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_nuh;1",
+        "@id": "dtmi:example:mu_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "epsilon_glikk",
+          "name": "mu_phi",
           "minMultiplicity": []
         }
       }
@@ -107,11 +107,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_quan;1",
+        "@id": "dtmi:example:mu_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "epsilon_snee",
+          "name": "mu_psi",
           "minMultiplicity": null
         }
       }
@@ -125,12 +125,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_spazz;1",
+        "@id": "dtmi:example:mu_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "epsilon_thnad",
+          "name": "mu_yuzz",
           "minMultiplicity": null
         }
       }
@@ -144,11 +144,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_zatz;1",
+        "@id": "dtmi:example:mu_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "epsilon_floob",
+          "name": "mu_um",
           "minMultiplicity": true
         }
       }
@@ -162,12 +162,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_flunn;1",
+        "@id": "dtmi:example:mu_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "epsilon_jogg",
+          "name": "mu_fuddle",
           "minMultiplicity": true
         }
       }
@@ -181,11 +181,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_yekk;1",
+        "@id": "dtmi:example:mu_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "epsilon_itch",
+          "name": "mu_nuh",
           "minMultiplicity": "hello"
         }
       }
@@ -199,12 +199,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_hi;1",
+        "@id": "dtmi:example:mu_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "epsilon_vroo",
+          "name": "mu_quan",
           "minMultiplicity": "hello"
         }
       }
@@ -218,11 +218,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_beta;1",
+        "@id": "dtmi:example:mu_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zeta_alpha",
+          "name": "mu_spazz",
           "minMultiplicity": [
             null
           ]
@@ -238,12 +238,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_delta;1",
+        "@id": "dtmi:example:mu_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "zeta_gamma",
+          "name": "mu_zatz",
           "minMultiplicity": [
             null
           ]
@@ -259,11 +259,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_zeta;1",
+        "@id": "dtmi:example:mu_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zeta_epsilon",
+          "name": "mu_flunn",
           "minMultiplicity": [
             true
           ]
@@ -279,12 +279,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_theta;1",
+        "@id": "dtmi:example:mu_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "zeta_eta",
+          "name": "mu_yekk",
           "minMultiplicity": [
             true
           ]
@@ -300,11 +300,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_kappa;1",
+        "@id": "dtmi:example:nu_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zeta_iota",
+          "name": "mu_hi",
           "minMultiplicity": [
             "hello"
           ]
@@ -320,12 +320,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_mu;1",
+        "@id": "dtmi:example:nu_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "zeta_lambda",
+          "name": "nu_beta",
           "minMultiplicity": [
             "hello"
           ]
@@ -341,11 +341,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_xi;1",
+        "@id": "dtmi:example:nu_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zeta_nu",
+          "name": "nu_delta",
           "minMultiplicity": {}
         }
       }
@@ -359,12 +359,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_pi;1",
+        "@id": "dtmi:example:nu_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "zeta_omicron",
+          "name": "nu_zeta",
           "minMultiplicity": {}
         }
       }
@@ -378,11 +378,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_sigma;1",
+        "@id": "dtmi:example:nu_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zeta_rho",
+          "name": "nu_theta",
           "minMultiplicity": [
             {}
           ]
@@ -398,12 +398,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_upsilon;1",
+        "@id": "dtmi:example:nu_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "zeta_tau",
+          "name": "nu_kappa",
           "minMultiplicity": [
             {}
           ]
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMinMultiplicityTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMinMultiplicityTermAndDtmiV2.json
index 5b7b49ac..d6145cfb 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMinMultiplicityTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyMinMultiplicityTermAndDtmiV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_jogg;1",
+        "@id": "dtmi:example:nu_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "minMultiplicity": 0,
           "dtmi:dtdl:property:minMultiplicity;2": 0,
-          "name": "zeta_zatz"
+          "name": "nu_humpf"
         }
       }
     ]
@@ -26,14 +26,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_itch;1",
+        "@id": "dtmi:example:nu_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
           "minMultiplicity": 0,
           "dtmi:dtdl:property:minMultiplicity;2": 0,
-          "name": "zeta_flunn"
+          "name": "nu_glikk"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyNamePatternV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyNamePatternV2.json
index c9c726c4..0fc26cba 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyNamePatternV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyNamePatternV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_um;1",
+        "@id": "dtmi:example:hi_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -24,7 +24,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_humpf;1",
+        "@id": "dtmi:example:hi_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -41,7 +41,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_fuddle;1",
+        "@id": "dtmi:example:hi_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -58,7 +58,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_glikk;1",
+        "@id": "dtmi:example:hi_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -75,7 +75,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_nuh;1",
+        "@id": "dtmi:example:hi_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -92,7 +92,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_snee;1",
+        "@id": "dtmi:example:hi_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -109,7 +109,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_quan;1",
+        "@id": "dtmi:example:hi_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -127,7 +127,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_thnad;1",
+        "@id": "dtmi:example:hi_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -144,7 +144,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_spazz;1",
+        "@id": "dtmi:example:hi_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -162,7 +162,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_floob;1",
+        "@id": "dtmi:example:hi_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -179,7 +179,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_zatz;1",
+        "@id": "dtmi:example:hi_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -197,7 +197,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_jogg;1",
+        "@id": "dtmi:example:hi_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -214,7 +214,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_flunn;1",
+        "@id": "dtmi:example:hi_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -232,7 +232,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_itch;1",
+        "@id": "dtmi:example:hi_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -249,7 +249,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_yekk;1",
+        "@id": "dtmi:example:hi_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -267,7 +267,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_vroo;1",
+        "@id": "dtmi:example:hi_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -284,7 +284,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_hi;1",
+        "@id": "dtmi:example:hi_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -302,7 +302,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_alpha;1",
+        "@id": "dtmi:example:hi_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -319,7 +319,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_beta;1",
+        "@id": "dtmi:example:hi_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -337,7 +337,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_gamma;1",
+        "@id": "dtmi:example:hi_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -354,7 +354,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_delta;1",
+        "@id": "dtmi:example:hi_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -372,7 +372,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_epsilon;1",
+        "@id": "dtmi:example:hi_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -389,7 +389,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_zeta;1",
+        "@id": "dtmi:example:hi_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -407,7 +407,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_eta;1",
+        "@id": "dtmi:example:hi_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -424,7 +424,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_theta;1",
+        "@id": "dtmi:example:hi_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyNameStringLengthV2.json
index 44f03476..599813bd 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyNameStringLengthV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_omega;1",
+        "@id": "dtmi:example:hi_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -24,7 +24,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_yuzz;1",
+        "@id": "dtmi:example:hi_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -41,7 +41,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_wum;1",
+        "@id": "dtmi:example:hi_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyNameStringV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyNameStringV2.json
index 4186d70b..b9c79ecb 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyNameStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyNameStringV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_beta;1",
+        "@id": "dtmi:example:vroo_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -24,7 +24,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_gamma;1",
+        "@id": "dtmi:example:vroo_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -43,7 +43,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_delta;1",
+        "@id": "dtmi:example:vroo_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -63,7 +63,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_epsilon;1",
+        "@id": "dtmi:example:vroo_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -85,7 +85,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_zeta;1",
+        "@id": "dtmi:example:vroo_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -102,7 +102,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_eta;1",
+        "@id": "dtmi:example:vroo_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -120,7 +120,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_theta;1",
+        "@id": "dtmi:example:vroo_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -137,7 +137,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_iota;1",
+        "@id": "dtmi:example:vroo_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -155,7 +155,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_kappa;1",
+        "@id": "dtmi:example:vroo_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -172,7 +172,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_lambda;1",
+        "@id": "dtmi:example:vroo_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -190,7 +190,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_mu;1",
+        "@id": "dtmi:example:vroo_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -209,7 +209,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_nu;1",
+        "@id": "dtmi:example:vroo_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -229,7 +229,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_xi;1",
+        "@id": "dtmi:example:vroo_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -248,7 +248,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_omicron;1",
+        "@id": "dtmi:example:vroo_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -268,7 +268,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_pi;1",
+        "@id": "dtmi:example:hi_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -287,7 +287,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_rho;1",
+        "@id": "dtmi:example:hi_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -307,7 +307,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_sigma;1",
+        "@id": "dtmi:example:hi_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -324,7 +324,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_tau;1",
+        "@id": "dtmi:example:hi_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -342,7 +342,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_upsilon;1",
+        "@id": "dtmi:example:hi_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -361,7 +361,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_phi;1",
+        "@id": "dtmi:example:hi_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -381,7 +381,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_chi;1",
+        "@id": "dtmi:example:hi_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -398,7 +398,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_psi;1",
+        "@id": "dtmi:example:hi_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyNameTermAndDtmiV2.json
index cce1edd6..5989c4fd 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyNameTermAndDtmiV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_upsilon;1",
+        "@id": "dtmi:example:alpha_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zatz_sigma",
-          "dtmi:dtdl:property:name;2": "zatz_tau"
+          "name": "alpha_gamma",
+          "dtmi:dtdl:property:name;2": "alpha_delta"
         }
       }
     ]
@@ -25,13 +25,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_psi;1",
+        "@id": "dtmi:example:alpha_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "zatz_phi",
-          "dtmi:dtdl:property:name;2": "zatz_chi"
+          "name": "alpha_zeta",
+          "dtmi:dtdl:property:name;2": "alpha_eta"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyNameUniqueAmongInterfaceContentsV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyNameUniqueAmongInterfaceContentsV2.json
index 94461437..50a21ee7 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyNameUniqueAmongInterfaceContentsV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyNameUniqueAmongInterfaceContentsV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_iota;1",
+        "@id": "dtmi:example:hi_zatz;1",
         "@type": "Interface",
         "contents": [
           {
@@ -30,7 +30,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_kappa;1",
+        "@id": "dtmi:example:hi_jogg;1",
         "@type": "Interface",
         "contents": [
           {
@@ -56,7 +56,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:zatz_lambda;1",
+        "@id": "dtmi:example:hi_flunn;1",
         "@type": "Interface",
         "contents": [
           {
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyPropertiesElementV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyPropertiesElementV2.json
index 2e9b7a7d..d4740789 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyPropertiesElementV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyPropertiesElementV2.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_beta;1",
+        "@id": "dtmi:example:nu_floob;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:eta_alpha;1",
+          "@id": "dtmi:example:nu_spazz;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "zeta_hi",
+            "name": "nu_thnad",
             "properties": {
-              "@id": "dtmi:example:zeta_yekk;1",
+              "@id": "dtmi:example:nu_snee;1",
               "@type": "Property",
-              "name": "zeta_vroo",
-              "schema": "dateTime"
+              "name": "nu_quan",
+              "schema": "boolean"
             }
           }
         }
@@ -34,20 +34,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_eta;1",
+        "@id": "dtmi:example:nu_yekk;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:eta_zeta;1",
+          "@id": "dtmi:example:nu_itch;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "eta_epsilon",
+            "name": "nu_flunn",
             "properties": [
               {
-                "@id": "dtmi:example:eta_gamma;1",
+                "@id": "dtmi:example:nu_zatz;1",
                 "@type": "Property",
-                "name": "eta_delta",
-                "schema": "double"
+                "name": "nu_jogg",
+                "schema": "date"
               }
             ]
           }
@@ -63,18 +63,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_iota;1",
+        "@id": "dtmi:example:nu_hi;1",
         "@type": "Interface",
         "contents": [
           {
             "@id": "dtmi:ex:dependentRef;1",
             "@type": "Property",
-            "name": "eta_theta",
-            "schema": "duration"
+            "name": "nu_vroo",
+            "schema": "dateTime"
           },
           {
             "@type": "Relationship",
-            "name": "eta_kappa",
+            "name": "xi_alpha",
             "properties": "dtmi:ex:dependentRef;1"
           }
         ]
@@ -89,18 +89,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_mu;1",
+        "@id": "dtmi:example:xi_gamma;1",
         "@type": "Interface",
         "contents": [
           {
             "@id": "dtmi:ex:dependentRef;1",
             "@type": "Property",
-            "name": "eta_lambda",
-            "schema": "float"
+            "name": "xi_beta",
+            "schema": "double"
           },
           {
             "@type": "Relationship",
-            "name": "eta_nu",
+            "name": "xi_delta",
             "properties": [
               "dtmi:ex:dependentRef;1"
             ]
@@ -117,19 +117,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_sigma;1",
+        "@id": "dtmi:example:xi_iota;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:eta_rho;1",
+          "@id": "dtmi:example:xi_theta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "eta_pi",
+            "name": "xi_eta",
             "properties": {
-              "@id": "dtmi:example:eta_xi;1",
+              "@id": "dtmi:example:xi_epsilon;1",
               "@type": "Property",
-              "name": "eta_omicron",
-              "schema": "integer",
+              "name": "xi_zeta",
+              "schema": "duration",
               "@context": "dtmi:dtdl:context;3"
             }
           }
@@ -145,20 +145,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_psi;1",
+        "@id": "dtmi:example:xi_xi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:eta_chi;1",
+          "@id": "dtmi:example:xi_nu;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Relationship",
-            "name": "eta_phi",
+            "name": "xi_mu",
             "properties": {
-              "@id": "dtmi:example:eta_tau;1",
+              "@id": "dtmi:example:xi_kappa;1",
               "@type": "Property",
-              "name": "eta_upsilon",
-              "schema": "long",
+              "name": "xi_lambda",
+              "schema": "float",
               "@context": "dtmi:dtdl:context;3"
             }
           }
@@ -166,6 +166,63 @@
       }
     ]
   },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:xi_tau;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:xi_sigma;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "xi_rho",
+            "properties": {
+              "@id": "dtmi:example:xi_omicron;1",
+              "@type": "Property",
+              "name": "xi_pi",
+              "schema": "bytes",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:xi_omega;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:xi_psi;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Relationship",
+            "name": "xi_chi",
+            "properties": {
+              "@id": "dtmi:example:xi_upsilon;1",
+              "@type": "Property",
+              "name": "xi_phi",
+              "schema": "date",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
   {
     "valid": true,
     "options": [
@@ -174,14 +231,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_wum;1",
+        "@id": "dtmi:example:xi_um;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:eta_yuzz;1",
+          "@id": "dtmi:example:xi_wum;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "eta_omega",
+            "name": "xi_yuzz",
             "properties": []
           }
         }
@@ -196,25 +253,25 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_quan;1",
+        "@id": "dtmi:example:xi_thnad;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:eta_snee;1",
+          "@id": "dtmi:example:xi_quan;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "eta_nuh",
+            "name": "xi_snee",
             "properties": [
               {
-                "@id": "dtmi:example:eta_um;1",
+                "@id": "dtmi:example:xi_humpf;1",
                 "@type": "Property",
-                "name": "eta_humpf",
+                "name": "xi_fuddle",
                 "schema": "string"
               },
               {
-                "@id": "dtmi:example:eta_fuddle;1",
+                "@id": "dtmi:example:xi_glikk;1",
                 "@type": "Property",
-                "name": "eta_glikk",
+                "name": "xi_nuh",
                 "schema": "time"
               }
             ]
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyPropertiesMaxCountV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyPropertiesMaxCountV2.json
index 295bb33b..5e0185f5 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyPropertiesMaxCountV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyPropertiesMaxCountV2.json
@@ -7,1510 +7,1510 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_um;1",
+        "@id": "dtmi:example:omega_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "rho_wum",
+          "name": "omega_um",
           "properties": [
             {
               "@type": "Property",
-              "name": "kappa_um",
+              "name": "rho_humpf",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "kappa_humpf",
+              "name": "rho_fuddle",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "kappa_fuddle",
+              "name": "rho_glikk",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "kappa_glikk",
+              "name": "rho_nuh",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "kappa_nuh",
+              "name": "rho_snee",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "kappa_snee",
+              "name": "rho_quan",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "kappa_quan",
+              "name": "rho_thnad",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "kappa_thnad",
+              "name": "rho_spazz",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "kappa_spazz",
+              "name": "rho_floob",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "kappa_floob",
+              "name": "rho_zatz",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "kappa_zatz",
+              "name": "rho_jogg",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "kappa_jogg",
+              "name": "rho_flunn",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "kappa_flunn",
+              "name": "rho_itch",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "kappa_itch",
+              "name": "rho_yekk",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "kappa_yekk",
+              "name": "rho_vroo",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "kappa_vroo",
+              "name": "rho_hi",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "kappa_hi",
+              "name": "sigma_alpha",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "lambda_alpha",
+              "name": "sigma_beta",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "lambda_beta",
+              "name": "sigma_gamma",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "lambda_gamma",
+              "name": "sigma_delta",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "lambda_delta",
+              "name": "sigma_epsilon",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "lambda_epsilon",
+              "name": "sigma_zeta",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "lambda_zeta",
+              "name": "sigma_eta",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "lambda_eta",
+              "name": "sigma_theta",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "lambda_theta",
+              "name": "sigma_iota",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "lambda_iota",
+              "name": "sigma_kappa",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "lambda_kappa",
+              "name": "sigma_lambda",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "lambda_lambda",
+              "name": "sigma_mu",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "lambda_mu",
+              "name": "sigma_nu",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "lambda_nu",
+              "name": "sigma_xi",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "lambda_xi",
+              "name": "sigma_omicron",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "lambda_omicron",
+              "name": "sigma_pi",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "lambda_pi",
+              "name": "sigma_rho",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "lambda_rho",
+              "name": "sigma_sigma",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "lambda_sigma",
+              "name": "sigma_tau",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "lambda_tau",
+              "name": "sigma_upsilon",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "lambda_upsilon",
+              "name": "sigma_phi",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "lambda_phi",
+              "name": "sigma_chi",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "lambda_chi",
+              "name": "sigma_psi",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "lambda_psi",
+              "name": "sigma_omega",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "lambda_omega",
+              "name": "sigma_yuzz",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "lambda_yuzz",
+              "name": "sigma_wum",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "lambda_wum",
+              "name": "sigma_um",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "lambda_um",
+              "name": "sigma_humpf",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "lambda_humpf",
+              "name": "sigma_fuddle",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "lambda_fuddle",
+              "name": "sigma_glikk",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "lambda_glikk",
+              "name": "sigma_nuh",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "lambda_nuh",
+              "name": "sigma_snee",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "lambda_snee",
+              "name": "sigma_quan",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "lambda_quan",
+              "name": "sigma_thnad",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "lambda_thnad",
+              "name": "sigma_spazz",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "lambda_spazz",
+              "name": "sigma_floob",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "lambda_floob",
+              "name": "sigma_zatz",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "lambda_zatz",
+              "name": "sigma_jogg",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "lambda_jogg",
+              "name": "sigma_flunn",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "lambda_flunn",
+              "name": "sigma_itch",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "lambda_itch",
+              "name": "sigma_yekk",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "lambda_yekk",
+              "name": "sigma_vroo",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "lambda_vroo",
+              "name": "sigma_hi",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "lambda_hi",
+              "name": "tau_alpha",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "mu_alpha",
+              "name": "tau_beta",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "mu_beta",
+              "name": "tau_gamma",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "mu_gamma",
+              "name": "tau_delta",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "mu_delta",
+              "name": "tau_epsilon",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "mu_epsilon",
+              "name": "tau_zeta",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "mu_zeta",
+              "name": "tau_eta",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "mu_eta",
+              "name": "tau_theta",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "mu_theta",
+              "name": "tau_iota",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "mu_iota",
+              "name": "tau_kappa",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "mu_kappa",
+              "name": "tau_lambda",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "mu_lambda",
+              "name": "tau_mu",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "mu_mu",
+              "name": "tau_nu",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "mu_nu",
+              "name": "tau_xi",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "mu_xi",
+              "name": "tau_omicron",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "mu_omicron",
+              "name": "tau_pi",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "mu_pi",
+              "name": "tau_rho",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "mu_rho",
+              "name": "tau_sigma",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "mu_sigma",
+              "name": "tau_tau",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "mu_tau",
+              "name": "tau_upsilon",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "mu_upsilon",
+              "name": "tau_phi",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "mu_phi",
+              "name": "tau_chi",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "mu_chi",
+              "name": "tau_psi",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "mu_psi",
+              "name": "tau_omega",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "mu_omega",
+              "name": "tau_yuzz",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "mu_yuzz",
+              "name": "tau_wum",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "mu_wum",
+              "name": "tau_um",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "mu_um",
+              "name": "tau_humpf",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "mu_humpf",
+              "name": "tau_fuddle",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "mu_fuddle",
+              "name": "tau_glikk",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "mu_glikk",
+              "name": "tau_nuh",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "mu_nuh",
+              "name": "tau_snee",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "mu_snee",
+              "name": "tau_quan",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "mu_quan",
+              "name": "tau_thnad",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "mu_thnad",
+              "name": "tau_spazz",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "mu_spazz",
+              "name": "tau_floob",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "mu_floob",
+              "name": "tau_zatz",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "mu_zatz",
+              "name": "tau_jogg",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "mu_jogg",
+              "name": "tau_flunn",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "mu_flunn",
+              "name": "tau_itch",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "mu_itch",
+              "name": "tau_yekk",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "mu_yekk",
+              "name": "tau_vroo",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "mu_vroo",
+              "name": "tau_hi",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "mu_hi",
+              "name": "upsilon_alpha",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "nu_alpha",
+              "name": "upsilon_beta",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "nu_beta",
+              "name": "upsilon_gamma",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "nu_gamma",
+              "name": "upsilon_delta",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "nu_delta",
+              "name": "upsilon_epsilon",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "nu_epsilon",
+              "name": "upsilon_zeta",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "nu_zeta",
+              "name": "upsilon_eta",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "nu_eta",
+              "name": "upsilon_theta",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "nu_theta",
+              "name": "upsilon_iota",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "nu_iota",
+              "name": "upsilon_kappa",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "nu_kappa",
+              "name": "upsilon_lambda",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "nu_lambda",
+              "name": "upsilon_mu",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "nu_mu",
+              "name": "upsilon_nu",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "nu_nu",
+              "name": "upsilon_xi",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "nu_xi",
+              "name": "upsilon_omicron",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "nu_omicron",
+              "name": "upsilon_pi",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "nu_pi",
+              "name": "upsilon_rho",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "nu_rho",
+              "name": "upsilon_sigma",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "nu_sigma",
+              "name": "upsilon_tau",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "nu_tau",
+              "name": "upsilon_upsilon",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "nu_upsilon",
+              "name": "upsilon_phi",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "nu_phi",
+              "name": "upsilon_chi",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "nu_chi",
+              "name": "upsilon_psi",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "nu_psi",
+              "name": "upsilon_omega",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "nu_omega",
+              "name": "upsilon_yuzz",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "nu_yuzz",
+              "name": "upsilon_wum",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "nu_wum",
+              "name": "upsilon_um",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "nu_um",
+              "name": "upsilon_humpf",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "nu_humpf",
+              "name": "upsilon_fuddle",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "nu_fuddle",
+              "name": "upsilon_glikk",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "nu_glikk",
+              "name": "upsilon_nuh",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "nu_nuh",
+              "name": "upsilon_snee",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "nu_snee",
+              "name": "upsilon_quan",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "nu_quan",
+              "name": "upsilon_thnad",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "nu_thnad",
+              "name": "upsilon_spazz",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "nu_spazz",
+              "name": "upsilon_floob",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "nu_floob",
+              "name": "upsilon_zatz",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "nu_zatz",
+              "name": "upsilon_jogg",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "nu_jogg",
+              "name": "upsilon_flunn",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "nu_flunn",
+              "name": "upsilon_itch",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "nu_itch",
+              "name": "upsilon_yekk",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "nu_yekk",
+              "name": "upsilon_vroo",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "nu_vroo",
+              "name": "upsilon_hi",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "nu_hi",
+              "name": "phi_alpha",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "xi_alpha",
+              "name": "phi_beta",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "xi_beta",
+              "name": "phi_gamma",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "xi_gamma",
+              "name": "phi_delta",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "xi_delta",
+              "name": "phi_epsilon",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "xi_epsilon",
+              "name": "phi_zeta",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "xi_zeta",
+              "name": "phi_eta",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "xi_eta",
+              "name": "phi_theta",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "xi_theta",
+              "name": "phi_iota",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "xi_iota",
+              "name": "phi_kappa",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "xi_kappa",
+              "name": "phi_lambda",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "xi_lambda",
+              "name": "phi_mu",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "xi_mu",
+              "name": "phi_nu",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "xi_nu",
+              "name": "phi_xi",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "xi_xi",
+              "name": "phi_omicron",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "xi_omicron",
+              "name": "phi_pi",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "xi_pi",
+              "name": "phi_rho",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "xi_rho",
+              "name": "phi_sigma",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "xi_sigma",
+              "name": "phi_tau",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "xi_tau",
+              "name": "phi_upsilon",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "xi_upsilon",
+              "name": "phi_phi",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "xi_phi",
+              "name": "phi_chi",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "xi_chi",
+              "name": "phi_psi",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "xi_psi",
+              "name": "phi_omega",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "xi_omega",
+              "name": "phi_yuzz",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "xi_yuzz",
+              "name": "phi_wum",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "xi_wum",
+              "name": "phi_um",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "xi_um",
+              "name": "phi_humpf",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "xi_humpf",
+              "name": "phi_fuddle",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "xi_fuddle",
+              "name": "phi_glikk",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "xi_glikk",
+              "name": "phi_nuh",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "xi_nuh",
+              "name": "phi_snee",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "xi_snee",
+              "name": "phi_quan",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "xi_quan",
+              "name": "phi_thnad",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "xi_thnad",
+              "name": "phi_spazz",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "xi_spazz",
+              "name": "phi_floob",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "xi_floob",
+              "name": "phi_zatz",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "xi_zatz",
+              "name": "phi_jogg",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "xi_jogg",
+              "name": "phi_flunn",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "xi_flunn",
+              "name": "phi_itch",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "xi_itch",
+              "name": "phi_yekk",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "xi_yekk",
+              "name": "phi_vroo",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "xi_vroo",
+              "name": "phi_hi",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "xi_hi",
+              "name": "chi_alpha",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "omicron_alpha",
+              "name": "chi_beta",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "omicron_beta",
+              "name": "chi_gamma",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "omicron_gamma",
+              "name": "chi_delta",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "omicron_delta",
+              "name": "chi_epsilon",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "omicron_epsilon",
+              "name": "chi_zeta",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "omicron_zeta",
+              "name": "chi_eta",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "omicron_eta",
+              "name": "chi_theta",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "omicron_theta",
+              "name": "chi_iota",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "omicron_iota",
+              "name": "chi_kappa",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "omicron_kappa",
+              "name": "chi_lambda",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "omicron_lambda",
+              "name": "chi_mu",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "omicron_mu",
+              "name": "chi_nu",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "omicron_nu",
+              "name": "chi_xi",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "omicron_xi",
+              "name": "chi_omicron",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "omicron_omicron",
+              "name": "chi_pi",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "omicron_pi",
+              "name": "chi_rho",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "omicron_rho",
+              "name": "chi_sigma",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "omicron_sigma",
+              "name": "chi_tau",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "omicron_tau",
+              "name": "chi_upsilon",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "omicron_upsilon",
+              "name": "chi_phi",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "omicron_phi",
+              "name": "chi_chi",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "omicron_chi",
+              "name": "chi_psi",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "omicron_psi",
+              "name": "chi_omega",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "omicron_omega",
+              "name": "chi_yuzz",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "omicron_yuzz",
+              "name": "chi_wum",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "omicron_wum",
+              "name": "chi_um",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "omicron_um",
+              "name": "chi_humpf",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "omicron_humpf",
+              "name": "chi_fuddle",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "omicron_fuddle",
+              "name": "chi_glikk",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "omicron_glikk",
+              "name": "chi_nuh",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "omicron_nuh",
+              "name": "chi_snee",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "omicron_snee",
+              "name": "chi_quan",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "omicron_quan",
+              "name": "chi_thnad",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "omicron_thnad",
+              "name": "chi_spazz",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "omicron_spazz",
+              "name": "chi_floob",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "omicron_floob",
+              "name": "chi_zatz",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "omicron_zatz",
+              "name": "chi_jogg",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "omicron_jogg",
+              "name": "chi_flunn",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "omicron_flunn",
+              "name": "chi_itch",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "omicron_itch",
+              "name": "chi_yekk",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "omicron_yekk",
+              "name": "chi_vroo",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "omicron_vroo",
+              "name": "chi_hi",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "omicron_hi",
+              "name": "psi_alpha",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "pi_alpha",
+              "name": "psi_beta",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "pi_beta",
+              "name": "psi_gamma",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "pi_gamma",
+              "name": "psi_delta",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "pi_delta",
+              "name": "psi_epsilon",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "pi_epsilon",
+              "name": "psi_zeta",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "pi_zeta",
+              "name": "psi_eta",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "pi_eta",
+              "name": "psi_theta",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "pi_theta",
+              "name": "psi_iota",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "pi_iota",
+              "name": "psi_kappa",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "pi_kappa",
+              "name": "psi_lambda",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "pi_lambda",
+              "name": "psi_mu",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "pi_mu",
+              "name": "psi_nu",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "pi_nu",
+              "name": "psi_xi",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "pi_xi",
+              "name": "psi_omicron",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "pi_omicron",
+              "name": "psi_pi",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "pi_pi",
+              "name": "psi_rho",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "pi_rho",
+              "name": "psi_sigma",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "pi_sigma",
+              "name": "psi_tau",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "pi_tau",
+              "name": "psi_upsilon",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "pi_upsilon",
+              "name": "psi_phi",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "pi_phi",
+              "name": "psi_chi",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "pi_chi",
+              "name": "psi_psi",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "pi_psi",
+              "name": "psi_omega",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "pi_omega",
+              "name": "psi_yuzz",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "pi_yuzz",
+              "name": "psi_wum",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "pi_wum",
+              "name": "psi_um",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "pi_um",
+              "name": "psi_humpf",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "pi_humpf",
+              "name": "psi_fuddle",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "pi_fuddle",
+              "name": "psi_glikk",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "pi_glikk",
+              "name": "psi_nuh",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "pi_nuh",
+              "name": "psi_snee",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "pi_snee",
+              "name": "psi_quan",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "pi_quan",
+              "name": "psi_thnad",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "pi_thnad",
+              "name": "psi_spazz",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "pi_spazz",
+              "name": "psi_floob",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "pi_floob",
+              "name": "psi_zatz",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "pi_zatz",
+              "name": "psi_jogg",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "pi_jogg",
+              "name": "psi_flunn",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "pi_flunn",
+              "name": "psi_itch",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "pi_itch",
+              "name": "psi_yekk",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "pi_yekk",
+              "name": "psi_vroo",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "pi_vroo",
+              "name": "psi_hi",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "pi_hi",
+              "name": "omega_alpha",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "rho_alpha",
+              "name": "omega_beta",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "rho_beta",
+              "name": "omega_gamma",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "rho_gamma",
+              "name": "omega_delta",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "rho_delta",
+              "name": "omega_epsilon",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "rho_epsilon",
+              "name": "omega_zeta",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "rho_zeta",
+              "name": "omega_eta",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "rho_eta",
+              "name": "omega_theta",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "rho_theta",
+              "name": "omega_iota",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "rho_iota",
+              "name": "omega_kappa",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "rho_kappa",
+              "name": "omega_lambda",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "rho_lambda",
+              "name": "omega_mu",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "rho_mu",
+              "name": "omega_nu",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "rho_nu",
+              "name": "omega_xi",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "rho_xi",
+              "name": "omega_omicron",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "rho_omicron",
+              "name": "omega_pi",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "rho_pi",
+              "name": "omega_rho",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "rho_rho",
+              "name": "omega_sigma",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "rho_sigma",
+              "name": "omega_tau",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "rho_tau",
+              "name": "omega_upsilon",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "rho_upsilon",
+              "name": "omega_phi",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "rho_phi",
+              "name": "omega_chi",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "rho_chi",
+              "name": "omega_psi",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "rho_psi",
+              "name": "omega_omega",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "rho_omega",
+              "name": "omega_yuzz",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "rho_yuzz",
+              "name": "omega_wum",
               "schema": "duration"
             }
           ]
@@ -1526,1515 +1526,1515 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omega_fuddle;1",
+        "@id": "dtmi:example:nuh_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "omega_humpf",
+          "name": "nuh_fuddle",
           "properties": [
             {
               "@type": "Property",
-              "name": "rho_humpf",
+              "name": "omega_fuddle",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "rho_fuddle",
+              "name": "omega_glikk",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "rho_glikk",
+              "name": "omega_nuh",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "rho_nuh",
+              "name": "omega_snee",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "rho_snee",
+              "name": "omega_quan",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "rho_quan",
+              "name": "omega_thnad",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "rho_thnad",
+              "name": "omega_spazz",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "rho_spazz",
+              "name": "omega_floob",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "rho_floob",
+              "name": "omega_zatz",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "rho_zatz",
+              "name": "omega_jogg",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "rho_jogg",
+              "name": "omega_flunn",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "rho_flunn",
+              "name": "omega_itch",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "rho_itch",
+              "name": "omega_yekk",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "rho_yekk",
+              "name": "omega_vroo",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "rho_vroo",
+              "name": "omega_hi",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "rho_hi",
+              "name": "yuzz_alpha",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "sigma_alpha",
+              "name": "yuzz_beta",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "sigma_beta",
+              "name": "yuzz_gamma",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "sigma_gamma",
+              "name": "yuzz_delta",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "sigma_delta",
+              "name": "yuzz_epsilon",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "sigma_epsilon",
+              "name": "yuzz_zeta",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "sigma_zeta",
+              "name": "yuzz_eta",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "sigma_eta",
+              "name": "yuzz_theta",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "sigma_theta",
+              "name": "yuzz_iota",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "sigma_iota",
+              "name": "yuzz_kappa",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "sigma_kappa",
+              "name": "yuzz_lambda",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "sigma_lambda",
+              "name": "yuzz_mu",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "sigma_mu",
+              "name": "yuzz_nu",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "sigma_nu",
+              "name": "yuzz_xi",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "sigma_xi",
+              "name": "yuzz_omicron",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "sigma_omicron",
+              "name": "yuzz_pi",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "sigma_pi",
+              "name": "yuzz_rho",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "sigma_rho",
+              "name": "yuzz_sigma",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "sigma_sigma",
+              "name": "yuzz_tau",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "sigma_tau",
+              "name": "yuzz_upsilon",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "sigma_upsilon",
+              "name": "yuzz_phi",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "sigma_phi",
+              "name": "yuzz_chi",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "sigma_chi",
+              "name": "yuzz_psi",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "sigma_psi",
+              "name": "yuzz_omega",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "sigma_omega",
+              "name": "yuzz_yuzz",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "sigma_yuzz",
+              "name": "yuzz_wum",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "sigma_wum",
+              "name": "yuzz_um",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "sigma_um",
+              "name": "yuzz_humpf",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "sigma_humpf",
+              "name": "yuzz_fuddle",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "sigma_fuddle",
+              "name": "yuzz_glikk",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "sigma_glikk",
+              "name": "yuzz_nuh",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "sigma_nuh",
+              "name": "yuzz_snee",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "sigma_snee",
+              "name": "yuzz_quan",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "sigma_quan",
+              "name": "yuzz_thnad",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "sigma_thnad",
+              "name": "yuzz_spazz",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "sigma_spazz",
+              "name": "yuzz_floob",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "sigma_floob",
+              "name": "yuzz_zatz",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "sigma_zatz",
+              "name": "yuzz_jogg",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "sigma_jogg",
+              "name": "yuzz_flunn",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "sigma_flunn",
+              "name": "yuzz_itch",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "sigma_itch",
+              "name": "yuzz_yekk",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "sigma_yekk",
+              "name": "yuzz_vroo",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "sigma_vroo",
+              "name": "yuzz_hi",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "sigma_hi",
+              "name": "wum_alpha",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "tau_alpha",
+              "name": "wum_beta",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "tau_beta",
+              "name": "wum_gamma",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "tau_gamma",
+              "name": "wum_delta",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "tau_delta",
+              "name": "wum_epsilon",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "tau_epsilon",
+              "name": "wum_zeta",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "tau_zeta",
+              "name": "wum_eta",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "tau_eta",
+              "name": "wum_theta",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "tau_theta",
+              "name": "wum_iota",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "tau_iota",
+              "name": "wum_kappa",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "tau_kappa",
+              "name": "wum_lambda",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "tau_lambda",
+              "name": "wum_mu",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "tau_mu",
+              "name": "wum_nu",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "tau_nu",
+              "name": "wum_xi",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "tau_xi",
+              "name": "wum_omicron",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "tau_omicron",
+              "name": "wum_pi",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "tau_pi",
+              "name": "wum_rho",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "tau_rho",
+              "name": "wum_sigma",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "tau_sigma",
+              "name": "wum_tau",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "tau_tau",
+              "name": "wum_upsilon",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "tau_upsilon",
+              "name": "wum_phi",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "tau_phi",
+              "name": "wum_chi",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "tau_chi",
+              "name": "wum_psi",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "tau_psi",
+              "name": "wum_omega",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "tau_omega",
+              "name": "wum_yuzz",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "tau_yuzz",
+              "name": "wum_wum",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "tau_wum",
+              "name": "wum_um",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "tau_um",
+              "name": "wum_humpf",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "tau_humpf",
+              "name": "wum_fuddle",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "tau_fuddle",
+              "name": "wum_glikk",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "tau_glikk",
+              "name": "wum_nuh",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "tau_nuh",
+              "name": "wum_snee",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "tau_snee",
+              "name": "wum_quan",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "tau_quan",
+              "name": "wum_thnad",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "tau_thnad",
+              "name": "wum_spazz",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "tau_spazz",
+              "name": "wum_floob",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "tau_floob",
+              "name": "wum_zatz",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "tau_zatz",
+              "name": "wum_jogg",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "tau_jogg",
+              "name": "wum_flunn",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "tau_flunn",
+              "name": "wum_itch",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "tau_itch",
+              "name": "wum_yekk",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "tau_yekk",
+              "name": "wum_vroo",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "tau_vroo",
+              "name": "wum_hi",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "tau_hi",
+              "name": "um_alpha",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "upsilon_alpha",
+              "name": "um_beta",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "upsilon_beta",
+              "name": "um_gamma",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "upsilon_gamma",
+              "name": "um_delta",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "upsilon_delta",
+              "name": "um_epsilon",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "upsilon_epsilon",
+              "name": "um_zeta",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "upsilon_zeta",
+              "name": "um_eta",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "upsilon_eta",
+              "name": "um_theta",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "upsilon_theta",
+              "name": "um_iota",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "upsilon_iota",
+              "name": "um_kappa",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "upsilon_kappa",
+              "name": "um_lambda",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "upsilon_lambda",
+              "name": "um_mu",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "upsilon_mu",
+              "name": "um_nu",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "upsilon_nu",
+              "name": "um_xi",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "upsilon_xi",
+              "name": "um_omicron",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "upsilon_omicron",
+              "name": "um_pi",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "upsilon_pi",
+              "name": "um_rho",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "upsilon_rho",
+              "name": "um_sigma",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "upsilon_sigma",
+              "name": "um_tau",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "upsilon_tau",
+              "name": "um_upsilon",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "upsilon_upsilon",
+              "name": "um_phi",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "upsilon_phi",
+              "name": "um_chi",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "upsilon_chi",
+              "name": "um_psi",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "upsilon_psi",
+              "name": "um_omega",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "upsilon_omega",
+              "name": "um_yuzz",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "upsilon_yuzz",
+              "name": "um_wum",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "upsilon_wum",
+              "name": "um_um",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "upsilon_um",
+              "name": "um_humpf",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "upsilon_humpf",
+              "name": "um_fuddle",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "upsilon_fuddle",
+              "name": "um_glikk",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "upsilon_glikk",
+              "name": "um_nuh",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "upsilon_nuh",
+              "name": "um_snee",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "upsilon_snee",
+              "name": "um_quan",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "upsilon_quan",
+              "name": "um_thnad",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "upsilon_thnad",
+              "name": "um_spazz",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "upsilon_spazz",
+              "name": "um_floob",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "upsilon_floob",
+              "name": "um_zatz",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "upsilon_zatz",
+              "name": "um_jogg",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "upsilon_jogg",
+              "name": "um_flunn",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "upsilon_flunn",
+              "name": "um_itch",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "upsilon_itch",
+              "name": "um_yekk",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "upsilon_yekk",
+              "name": "um_vroo",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "upsilon_vroo",
+              "name": "um_hi",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "upsilon_hi",
+              "name": "humpf_alpha",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "phi_alpha",
+              "name": "humpf_beta",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "phi_beta",
+              "name": "humpf_gamma",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "phi_gamma",
+              "name": "humpf_delta",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "phi_delta",
+              "name": "humpf_epsilon",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "phi_epsilon",
+              "name": "humpf_zeta",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "phi_zeta",
+              "name": "humpf_eta",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "phi_eta",
+              "name": "humpf_theta",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "phi_theta",
+              "name": "humpf_iota",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "phi_iota",
+              "name": "humpf_kappa",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "phi_kappa",
+              "name": "humpf_lambda",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "phi_lambda",
+              "name": "humpf_mu",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "phi_mu",
+              "name": "humpf_nu",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "phi_nu",
+              "name": "humpf_xi",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "phi_xi",
+              "name": "humpf_omicron",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "phi_omicron",
+              "name": "humpf_pi",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "phi_pi",
+              "name": "humpf_rho",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "phi_rho",
+              "name": "humpf_sigma",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "phi_sigma",
+              "name": "humpf_tau",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "phi_tau",
+              "name": "humpf_upsilon",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "phi_upsilon",
+              "name": "humpf_phi",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "phi_phi",
+              "name": "humpf_chi",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "phi_chi",
+              "name": "humpf_psi",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "phi_psi",
+              "name": "humpf_omega",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "phi_omega",
+              "name": "humpf_yuzz",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "phi_yuzz",
+              "name": "humpf_wum",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "phi_wum",
+              "name": "humpf_um",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "phi_um",
+              "name": "humpf_humpf",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "phi_humpf",
+              "name": "humpf_fuddle",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "phi_fuddle",
+              "name": "humpf_glikk",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "phi_glikk",
+              "name": "humpf_nuh",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "phi_nuh",
+              "name": "humpf_snee",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "phi_snee",
+              "name": "humpf_quan",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "phi_quan",
+              "name": "humpf_thnad",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "phi_thnad",
+              "name": "humpf_spazz",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "phi_spazz",
+              "name": "humpf_floob",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "phi_floob",
+              "name": "humpf_zatz",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "phi_zatz",
+              "name": "humpf_jogg",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "phi_jogg",
+              "name": "humpf_flunn",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "phi_flunn",
+              "name": "humpf_itch",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "phi_itch",
+              "name": "humpf_yekk",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "phi_yekk",
+              "name": "humpf_vroo",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "phi_vroo",
+              "name": "humpf_hi",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "phi_hi",
+              "name": "fuddle_alpha",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "chi_alpha",
+              "name": "fuddle_beta",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "chi_beta",
+              "name": "fuddle_gamma",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "chi_gamma",
+              "name": "fuddle_delta",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "chi_delta",
+              "name": "fuddle_epsilon",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "chi_epsilon",
+              "name": "fuddle_zeta",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "chi_zeta",
+              "name": "fuddle_eta",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "chi_eta",
+              "name": "fuddle_theta",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "chi_theta",
+              "name": "fuddle_iota",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "chi_iota",
+              "name": "fuddle_kappa",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "chi_kappa",
+              "name": "fuddle_lambda",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "chi_lambda",
+              "name": "fuddle_mu",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "chi_mu",
+              "name": "fuddle_nu",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "chi_nu",
+              "name": "fuddle_xi",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "chi_xi",
+              "name": "fuddle_omicron",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "chi_omicron",
+              "name": "fuddle_pi",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "chi_pi",
+              "name": "fuddle_rho",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "chi_rho",
+              "name": "fuddle_sigma",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "chi_sigma",
+              "name": "fuddle_tau",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "chi_tau",
+              "name": "fuddle_upsilon",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "chi_upsilon",
+              "name": "fuddle_phi",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "chi_phi",
+              "name": "fuddle_chi",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "chi_chi",
+              "name": "fuddle_psi",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "chi_psi",
+              "name": "fuddle_omega",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "chi_omega",
+              "name": "fuddle_yuzz",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "chi_yuzz",
+              "name": "fuddle_wum",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "chi_wum",
+              "name": "fuddle_um",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "chi_um",
+              "name": "fuddle_humpf",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "chi_humpf",
+              "name": "fuddle_fuddle",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "chi_fuddle",
+              "name": "fuddle_glikk",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "chi_glikk",
+              "name": "fuddle_nuh",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "chi_nuh",
+              "name": "fuddle_snee",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "chi_snee",
+              "name": "fuddle_quan",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "chi_quan",
+              "name": "fuddle_thnad",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "chi_thnad",
+              "name": "fuddle_spazz",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "chi_spazz",
+              "name": "fuddle_floob",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "chi_floob",
+              "name": "fuddle_zatz",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "chi_zatz",
+              "name": "fuddle_jogg",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "chi_jogg",
+              "name": "fuddle_flunn",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "chi_flunn",
+              "name": "fuddle_itch",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "chi_itch",
+              "name": "fuddle_yekk",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "chi_yekk",
+              "name": "fuddle_vroo",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "chi_vroo",
+              "name": "fuddle_hi",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "chi_hi",
+              "name": "glikk_alpha",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "psi_alpha",
+              "name": "glikk_beta",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "psi_beta",
+              "name": "glikk_gamma",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "psi_gamma",
+              "name": "glikk_delta",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "psi_delta",
+              "name": "glikk_epsilon",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "psi_epsilon",
+              "name": "glikk_zeta",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "psi_zeta",
+              "name": "glikk_eta",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "psi_eta",
+              "name": "glikk_theta",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "psi_theta",
+              "name": "glikk_iota",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "psi_iota",
+              "name": "glikk_kappa",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "psi_kappa",
+              "name": "glikk_lambda",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "psi_lambda",
+              "name": "glikk_mu",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "psi_mu",
+              "name": "glikk_nu",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "psi_nu",
+              "name": "glikk_xi",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "psi_xi",
+              "name": "glikk_omicron",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "psi_omicron",
+              "name": "glikk_pi",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "psi_pi",
+              "name": "glikk_rho",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "psi_rho",
+              "name": "glikk_sigma",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "psi_sigma",
+              "name": "glikk_tau",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "psi_tau",
+              "name": "glikk_upsilon",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "psi_upsilon",
+              "name": "glikk_phi",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "psi_phi",
+              "name": "glikk_chi",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "psi_chi",
+              "name": "glikk_psi",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "psi_psi",
+              "name": "glikk_omega",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "psi_omega",
+              "name": "glikk_yuzz",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "psi_yuzz",
+              "name": "glikk_wum",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "psi_wum",
+              "name": "glikk_um",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "psi_um",
+              "name": "glikk_humpf",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "psi_humpf",
+              "name": "glikk_fuddle",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "psi_fuddle",
+              "name": "glikk_glikk",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "psi_glikk",
+              "name": "glikk_nuh",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "psi_nuh",
+              "name": "glikk_snee",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "psi_snee",
+              "name": "glikk_quan",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "psi_quan",
+              "name": "glikk_thnad",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "psi_thnad",
+              "name": "glikk_spazz",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "psi_spazz",
+              "name": "glikk_floob",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "psi_floob",
+              "name": "glikk_zatz",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "psi_zatz",
+              "name": "glikk_jogg",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "psi_jogg",
+              "name": "glikk_flunn",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "psi_flunn",
+              "name": "glikk_itch",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "psi_itch",
+              "name": "glikk_yekk",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "psi_yekk",
+              "name": "glikk_vroo",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "psi_vroo",
+              "name": "glikk_hi",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "psi_hi",
+              "name": "nuh_alpha",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "omega_alpha",
+              "name": "nuh_beta",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "omega_beta",
+              "name": "nuh_gamma",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "omega_gamma",
+              "name": "nuh_delta",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "omega_delta",
+              "name": "nuh_epsilon",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "omega_epsilon",
+              "name": "nuh_zeta",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "omega_zeta",
+              "name": "nuh_eta",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "omega_eta",
+              "name": "nuh_theta",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "omega_theta",
+              "name": "nuh_iota",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "omega_iota",
+              "name": "nuh_kappa",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "omega_kappa",
+              "name": "nuh_lambda",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "omega_lambda",
+              "name": "nuh_mu",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "omega_mu",
+              "name": "nuh_nu",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "omega_nu",
+              "name": "nuh_xi",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "omega_xi",
+              "name": "nuh_omicron",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "omega_omicron",
+              "name": "nuh_pi",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "omega_pi",
+              "name": "nuh_rho",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "omega_rho",
+              "name": "nuh_sigma",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "omega_sigma",
+              "name": "nuh_tau",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "omega_tau",
+              "name": "nuh_upsilon",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "omega_upsilon",
+              "name": "nuh_phi",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "omega_phi",
+              "name": "nuh_chi",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "omega_chi",
+              "name": "nuh_psi",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "omega_psi",
+              "name": "nuh_omega",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "omega_omega",
+              "name": "nuh_yuzz",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "omega_yuzz",
+              "name": "nuh_wum",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "omega_wum",
+              "name": "nuh_um",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "omega_um",
+              "name": "nuh_humpf",
               "schema": "float"
             }
           ]
@@ -3050,1516 +3050,1516 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nuh_nuh;1",
+        "@id": "dtmi:example:jogg_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "nuh_glikk",
+          "name": "jogg_nuh",
           "properties": [
             {
               "@type": "Property",
-              "name": "omega_glikk",
+              "name": "nuh_nuh",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "omega_nuh",
+              "name": "nuh_snee",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "omega_snee",
+              "name": "nuh_quan",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "omega_quan",
+              "name": "nuh_thnad",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "omega_thnad",
+              "name": "nuh_spazz",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "omega_spazz",
+              "name": "nuh_floob",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "omega_floob",
+              "name": "nuh_zatz",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "omega_zatz",
+              "name": "nuh_jogg",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "omega_jogg",
+              "name": "nuh_flunn",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "omega_flunn",
+              "name": "nuh_itch",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "omega_itch",
+              "name": "nuh_yekk",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "omega_yekk",
+              "name": "nuh_vroo",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "omega_vroo",
+              "name": "nuh_hi",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "omega_hi",
+              "name": "snee_alpha",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "yuzz_alpha",
+              "name": "snee_beta",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "yuzz_beta",
+              "name": "snee_gamma",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "yuzz_gamma",
+              "name": "snee_delta",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "yuzz_delta",
+              "name": "snee_epsilon",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "yuzz_epsilon",
+              "name": "snee_zeta",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "yuzz_zeta",
+              "name": "snee_eta",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "yuzz_eta",
+              "name": "snee_theta",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "yuzz_theta",
+              "name": "snee_iota",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "yuzz_iota",
+              "name": "snee_kappa",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "yuzz_kappa",
+              "name": "snee_lambda",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "yuzz_lambda",
+              "name": "snee_mu",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "yuzz_mu",
+              "name": "snee_nu",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "yuzz_nu",
+              "name": "snee_xi",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "yuzz_xi",
+              "name": "snee_omicron",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "yuzz_omicron",
+              "name": "snee_pi",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "yuzz_pi",
+              "name": "snee_rho",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "yuzz_rho",
+              "name": "snee_sigma",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "yuzz_sigma",
+              "name": "snee_tau",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "yuzz_tau",
+              "name": "snee_upsilon",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "yuzz_upsilon",
+              "name": "snee_phi",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "yuzz_phi",
+              "name": "snee_chi",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "yuzz_chi",
+              "name": "snee_psi",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "yuzz_psi",
+              "name": "snee_omega",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "yuzz_omega",
+              "name": "snee_yuzz",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "yuzz_yuzz",
+              "name": "snee_wum",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "yuzz_wum",
+              "name": "snee_um",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "yuzz_um",
+              "name": "snee_humpf",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "yuzz_humpf",
+              "name": "snee_fuddle",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "yuzz_fuddle",
+              "name": "snee_glikk",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "yuzz_glikk",
+              "name": "snee_nuh",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "yuzz_nuh",
+              "name": "snee_snee",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "yuzz_snee",
+              "name": "snee_quan",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "yuzz_quan",
+              "name": "snee_thnad",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "yuzz_thnad",
+              "name": "snee_spazz",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "yuzz_spazz",
+              "name": "snee_floob",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "yuzz_floob",
+              "name": "snee_zatz",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "yuzz_zatz",
+              "name": "snee_jogg",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "yuzz_jogg",
+              "name": "snee_flunn",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "yuzz_flunn",
+              "name": "snee_itch",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "yuzz_itch",
+              "name": "snee_yekk",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "yuzz_yekk",
+              "name": "snee_vroo",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "yuzz_vroo",
+              "name": "snee_hi",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "yuzz_hi",
+              "name": "quan_alpha",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "wum_alpha",
+              "name": "quan_beta",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "wum_beta",
+              "name": "quan_gamma",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "wum_gamma",
+              "name": "quan_delta",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "wum_delta",
+              "name": "quan_epsilon",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "wum_epsilon",
+              "name": "quan_zeta",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "wum_zeta",
+              "name": "quan_eta",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "wum_eta",
+              "name": "quan_theta",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "wum_theta",
+              "name": "quan_iota",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "wum_iota",
+              "name": "quan_kappa",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "wum_kappa",
+              "name": "quan_lambda",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "wum_lambda",
+              "name": "quan_mu",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "wum_mu",
+              "name": "quan_nu",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "wum_nu",
+              "name": "quan_xi",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "wum_xi",
+              "name": "quan_omicron",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "wum_omicron",
+              "name": "quan_pi",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "wum_pi",
+              "name": "quan_rho",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "wum_rho",
+              "name": "quan_sigma",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "wum_sigma",
+              "name": "quan_tau",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "wum_tau",
+              "name": "quan_upsilon",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "wum_upsilon",
+              "name": "quan_phi",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "wum_phi",
+              "name": "quan_chi",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "wum_chi",
+              "name": "quan_psi",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "wum_psi",
+              "name": "quan_omega",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "wum_omega",
+              "name": "quan_yuzz",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "wum_yuzz",
+              "name": "quan_wum",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "wum_wum",
+              "name": "quan_um",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "wum_um",
+              "name": "quan_humpf",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "wum_humpf",
+              "name": "quan_fuddle",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "wum_fuddle",
+              "name": "quan_glikk",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "wum_glikk",
+              "name": "quan_nuh",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "wum_nuh",
+              "name": "quan_snee",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "wum_snee",
+              "name": "quan_quan",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "wum_quan",
+              "name": "quan_thnad",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "wum_thnad",
+              "name": "quan_spazz",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "wum_spazz",
+              "name": "quan_floob",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "wum_floob",
+              "name": "quan_zatz",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "wum_zatz",
+              "name": "quan_jogg",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "wum_jogg",
+              "name": "quan_flunn",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "wum_flunn",
+              "name": "quan_itch",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "wum_itch",
+              "name": "quan_yekk",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "wum_yekk",
+              "name": "quan_vroo",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "wum_vroo",
+              "name": "quan_hi",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "wum_hi",
+              "name": "thnad_alpha",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "um_alpha",
+              "name": "thnad_beta",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "um_beta",
+              "name": "thnad_gamma",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "um_gamma",
+              "name": "thnad_delta",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "um_delta",
+              "name": "thnad_epsilon",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "um_epsilon",
+              "name": "thnad_zeta",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "um_zeta",
+              "name": "thnad_eta",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "um_eta",
+              "name": "thnad_theta",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "um_theta",
+              "name": "thnad_iota",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "um_iota",
+              "name": "thnad_kappa",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "um_kappa",
+              "name": "thnad_lambda",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "um_lambda",
+              "name": "thnad_mu",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "um_mu",
+              "name": "thnad_nu",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "um_nu",
+              "name": "thnad_xi",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "um_xi",
+              "name": "thnad_omicron",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "um_omicron",
+              "name": "thnad_pi",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "um_pi",
+              "name": "thnad_rho",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "um_rho",
+              "name": "thnad_sigma",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "um_sigma",
+              "name": "thnad_tau",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "um_tau",
+              "name": "thnad_upsilon",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "um_upsilon",
+              "name": "thnad_phi",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "um_phi",
+              "name": "thnad_chi",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "um_chi",
+              "name": "thnad_psi",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "um_psi",
+              "name": "thnad_omega",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "um_omega",
+              "name": "thnad_yuzz",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "um_yuzz",
+              "name": "thnad_wum",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "um_wum",
+              "name": "thnad_um",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "um_um",
+              "name": "thnad_humpf",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "um_humpf",
+              "name": "thnad_fuddle",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "um_fuddle",
+              "name": "thnad_glikk",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "um_glikk",
+              "name": "thnad_nuh",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "um_nuh",
+              "name": "thnad_snee",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "um_snee",
+              "name": "thnad_quan",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "um_quan",
+              "name": "thnad_thnad",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "um_thnad",
+              "name": "thnad_spazz",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "um_spazz",
+              "name": "thnad_floob",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "um_floob",
+              "name": "thnad_zatz",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "um_zatz",
+              "name": "thnad_jogg",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "um_jogg",
+              "name": "thnad_flunn",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "um_flunn",
+              "name": "thnad_itch",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "um_itch",
+              "name": "thnad_yekk",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "um_yekk",
+              "name": "thnad_vroo",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "um_vroo",
+              "name": "thnad_hi",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "um_hi",
+              "name": "spazz_alpha",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "humpf_alpha",
+              "name": "spazz_beta",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "humpf_beta",
+              "name": "spazz_gamma",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "humpf_gamma",
+              "name": "spazz_delta",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "humpf_delta",
+              "name": "spazz_epsilon",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "humpf_epsilon",
+              "name": "spazz_zeta",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "humpf_zeta",
+              "name": "spazz_eta",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "humpf_eta",
+              "name": "spazz_theta",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "humpf_theta",
+              "name": "spazz_iota",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "humpf_iota",
+              "name": "spazz_kappa",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "humpf_kappa",
+              "name": "spazz_lambda",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "humpf_lambda",
+              "name": "spazz_mu",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "humpf_mu",
+              "name": "spazz_nu",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "humpf_nu",
+              "name": "spazz_xi",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "humpf_xi",
+              "name": "spazz_omicron",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "humpf_omicron",
+              "name": "spazz_pi",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "humpf_pi",
+              "name": "spazz_rho",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "humpf_rho",
+              "name": "spazz_sigma",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "humpf_sigma",
+              "name": "spazz_tau",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "humpf_tau",
+              "name": "spazz_upsilon",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "humpf_upsilon",
+              "name": "spazz_phi",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "humpf_phi",
+              "name": "spazz_chi",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "humpf_chi",
+              "name": "spazz_psi",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "humpf_psi",
+              "name": "spazz_omega",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "humpf_omega",
+              "name": "spazz_yuzz",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "humpf_yuzz",
+              "name": "spazz_wum",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "humpf_wum",
+              "name": "spazz_um",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "humpf_um",
+              "name": "spazz_humpf",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "humpf_humpf",
+              "name": "spazz_fuddle",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "humpf_fuddle",
+              "name": "spazz_glikk",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "humpf_glikk",
+              "name": "spazz_nuh",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "humpf_nuh",
+              "name": "spazz_snee",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "humpf_snee",
+              "name": "spazz_quan",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "humpf_quan",
+              "name": "spazz_thnad",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "humpf_thnad",
+              "name": "spazz_spazz",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "humpf_spazz",
+              "name": "spazz_floob",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "humpf_floob",
+              "name": "spazz_zatz",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "humpf_zatz",
+              "name": "spazz_jogg",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "humpf_jogg",
+              "name": "spazz_flunn",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "humpf_flunn",
+              "name": "spazz_itch",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "humpf_itch",
+              "name": "spazz_yekk",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "humpf_yekk",
+              "name": "spazz_vroo",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "humpf_vroo",
+              "name": "spazz_hi",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "humpf_hi",
+              "name": "floob_alpha",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "fuddle_alpha",
+              "name": "floob_beta",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "fuddle_beta",
+              "name": "floob_gamma",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "fuddle_gamma",
+              "name": "floob_delta",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "fuddle_delta",
+              "name": "floob_epsilon",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "fuddle_epsilon",
+              "name": "floob_zeta",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "fuddle_zeta",
+              "name": "floob_eta",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "fuddle_eta",
+              "name": "floob_theta",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "fuddle_theta",
+              "name": "floob_iota",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "fuddle_iota",
+              "name": "floob_kappa",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "fuddle_kappa",
+              "name": "floob_lambda",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "fuddle_lambda",
+              "name": "floob_mu",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "fuddle_mu",
+              "name": "floob_nu",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "fuddle_nu",
+              "name": "floob_xi",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "fuddle_xi",
+              "name": "floob_omicron",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "fuddle_omicron",
+              "name": "floob_pi",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "fuddle_pi",
+              "name": "floob_rho",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "fuddle_rho",
+              "name": "floob_sigma",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "fuddle_sigma",
+              "name": "floob_tau",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "fuddle_tau",
+              "name": "floob_upsilon",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "fuddle_upsilon",
+              "name": "floob_phi",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "fuddle_phi",
+              "name": "floob_chi",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "fuddle_chi",
+              "name": "floob_psi",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "fuddle_psi",
+              "name": "floob_omega",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "fuddle_omega",
+              "name": "floob_yuzz",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "fuddle_yuzz",
+              "name": "floob_wum",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "fuddle_wum",
+              "name": "floob_um",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "fuddle_um",
+              "name": "floob_humpf",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "fuddle_humpf",
+              "name": "floob_fuddle",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "fuddle_fuddle",
+              "name": "floob_glikk",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "fuddle_glikk",
+              "name": "floob_nuh",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "fuddle_nuh",
+              "name": "floob_snee",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "fuddle_snee",
+              "name": "floob_quan",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "fuddle_quan",
+              "name": "floob_thnad",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "fuddle_thnad",
+              "name": "floob_spazz",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "fuddle_spazz",
+              "name": "floob_floob",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "fuddle_floob",
+              "name": "floob_zatz",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "fuddle_zatz",
+              "name": "floob_jogg",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "fuddle_jogg",
+              "name": "floob_flunn",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "fuddle_flunn",
+              "name": "floob_itch",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "fuddle_itch",
+              "name": "floob_yekk",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "fuddle_yekk",
+              "name": "floob_vroo",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "fuddle_vroo",
+              "name": "floob_hi",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "fuddle_hi",
+              "name": "zatz_alpha",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "glikk_alpha",
+              "name": "zatz_beta",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "glikk_beta",
+              "name": "zatz_gamma",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "glikk_gamma",
+              "name": "zatz_delta",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "glikk_delta",
+              "name": "zatz_epsilon",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "glikk_epsilon",
+              "name": "zatz_zeta",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "glikk_zeta",
+              "name": "zatz_eta",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "glikk_eta",
+              "name": "zatz_theta",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "glikk_theta",
+              "name": "zatz_iota",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "glikk_iota",
+              "name": "zatz_kappa",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "glikk_kappa",
+              "name": "zatz_lambda",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "glikk_lambda",
+              "name": "zatz_mu",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "glikk_mu",
+              "name": "zatz_nu",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "glikk_nu",
+              "name": "zatz_xi",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "glikk_xi",
+              "name": "zatz_omicron",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "glikk_omicron",
+              "name": "zatz_pi",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "glikk_pi",
+              "name": "zatz_rho",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "glikk_rho",
+              "name": "zatz_sigma",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "glikk_sigma",
+              "name": "zatz_tau",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "glikk_tau",
+              "name": "zatz_upsilon",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "glikk_upsilon",
+              "name": "zatz_phi",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "glikk_phi",
+              "name": "zatz_chi",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "glikk_chi",
+              "name": "zatz_psi",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "glikk_psi",
+              "name": "zatz_omega",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "glikk_omega",
+              "name": "zatz_yuzz",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "glikk_yuzz",
+              "name": "zatz_wum",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "glikk_wum",
+              "name": "zatz_um",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "glikk_um",
+              "name": "zatz_humpf",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "glikk_humpf",
+              "name": "zatz_fuddle",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "glikk_fuddle",
+              "name": "zatz_glikk",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "glikk_glikk",
+              "name": "zatz_nuh",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "glikk_nuh",
+              "name": "zatz_snee",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "glikk_snee",
+              "name": "zatz_quan",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "glikk_quan",
+              "name": "zatz_thnad",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "glikk_thnad",
+              "name": "zatz_spazz",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "glikk_spazz",
+              "name": "zatz_floob",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "glikk_floob",
+              "name": "zatz_zatz",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "glikk_zatz",
+              "name": "zatz_jogg",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "glikk_jogg",
+              "name": "zatz_flunn",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "glikk_flunn",
+              "name": "zatz_itch",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "glikk_itch",
+              "name": "zatz_yekk",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "glikk_yekk",
+              "name": "zatz_vroo",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "glikk_vroo",
+              "name": "zatz_hi",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "glikk_hi",
+              "name": "jogg_alpha",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "nuh_alpha",
+              "name": "jogg_beta",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "nuh_beta",
+              "name": "jogg_gamma",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "nuh_gamma",
+              "name": "jogg_delta",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "nuh_delta",
+              "name": "jogg_epsilon",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "nuh_epsilon",
+              "name": "jogg_zeta",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "nuh_zeta",
+              "name": "jogg_eta",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "nuh_eta",
+              "name": "jogg_theta",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "nuh_theta",
+              "name": "jogg_iota",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "nuh_iota",
+              "name": "jogg_kappa",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "nuh_kappa",
+              "name": "jogg_lambda",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "nuh_lambda",
+              "name": "jogg_mu",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "nuh_mu",
+              "name": "jogg_nu",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "nuh_nu",
+              "name": "jogg_xi",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "nuh_xi",
+              "name": "jogg_omicron",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "nuh_omicron",
+              "name": "jogg_pi",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "nuh_pi",
+              "name": "jogg_rho",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "nuh_rho",
+              "name": "jogg_sigma",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "nuh_sigma",
+              "name": "jogg_tau",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "nuh_tau",
+              "name": "jogg_upsilon",
               "schema": "integer"
             },
             {
               "@type": "Property",
-              "name": "nuh_upsilon",
+              "name": "jogg_phi",
               "schema": "long"
             },
             {
               "@type": "Property",
-              "name": "nuh_phi",
+              "name": "jogg_chi",
               "schema": "string"
             },
             {
               "@type": "Property",
-              "name": "nuh_chi",
+              "name": "jogg_psi",
               "schema": "time"
             },
             {
               "@type": "Property",
-              "name": "nuh_psi",
+              "name": "jogg_omega",
               "schema": "boolean"
             },
             {
               "@type": "Property",
-              "name": "nuh_omega",
+              "name": "jogg_yuzz",
               "schema": "date"
             },
             {
               "@type": "Property",
-              "name": "nuh_yuzz",
+              "name": "jogg_wum",
               "schema": "dateTime"
             },
             {
               "@type": "Property",
-              "name": "nuh_wum",
+              "name": "jogg_um",
               "schema": "double"
             },
             {
               "@type": "Property",
-              "name": "nuh_um",
+              "name": "jogg_humpf",
               "schema": "duration"
             },
             {
               "@type": "Property",
-              "name": "nuh_humpf",
+              "name": "jogg_fuddle",
               "schema": "float"
             },
             {
               "@type": "Property",
-              "name": "nuh_fuddle",
+              "name": "jogg_glikk",
               "schema": "integer"
             }
           ]
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyPropertiesTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyPropertiesTermAndDtmiV2.json
index d9d9d58e..88c9b8fd 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyPropertiesTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyPropertiesTermAndDtmiV2.json
@@ -7,22 +7,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_alpha;1",
+        "@id": "dtmi:example:flunn_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "nuh_yekk",
+          "name": "jogg_vroo",
           "properties": [
             {
               "@type": "Property",
-              "name": "nuh_vroo",
+              "name": "jogg_hi",
               "schema": "boolean"
             }
           ],
           "dtmi:dtdl:property:properties;2": [
             {
               "@type": "Property",
-              "name": "nuh_hi",
+              "name": "flunn_alpha",
               "schema": "date"
             }
           ]
@@ -38,23 +38,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_epsilon;1",
+        "@id": "dtmi:example:flunn_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "snee_beta",
+          "name": "flunn_gamma",
           "properties": [
             {
               "@type": "Property",
-              "name": "snee_gamma",
+              "name": "flunn_delta",
               "schema": "dateTime"
             }
           ],
           "dtmi:dtdl:property:properties;2": [
             {
               "@type": "Property",
-              "name": "snee_delta",
+              "name": "flunn_epsilon",
               "schema": "double"
             }
           ]
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyPropertiesTypeConformanceV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyPropertiesTypeConformanceV2.json
index e033fb71..c98c4efd 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyPropertiesTypeConformanceV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyPropertiesTypeConformanceV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_vroo;1",
+        "@id": "dtmi:example:xi_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "eta_yekk",
+          "name": "xi_vroo",
           "properties": {
-            "@id": "dtmi:example:eta_itch;1",
+            "@id": "dtmi:example:xi_yekk;1",
             "elementSchema": "boolean",
             "@type": "Array"
           }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_beta;1",
+        "@id": "dtmi:example:omicron_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "theta_alpha",
+          "name": "omicron_beta",
           "properties": {
-            "@id": "dtmi:example:eta_hi;1",
+            "@id": "dtmi:example:omicron_alpha;1",
             "elementSchema": "date",
             "@type": "Array"
           }
@@ -52,14 +52,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_zeta;1",
+        "@id": "dtmi:example:omicron_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "theta_epsilon",
+          "name": "omicron_zeta",
           "properties": {
-            "@id": "dtmi:example:theta_gamma;1",
-            "name": "theta_delta",
+            "@id": "dtmi:example:omicron_delta;1",
+            "name": "omicron_epsilon",
             "@type": "Command"
           }
         }
@@ -74,15 +74,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_kappa;1",
+        "@id": "dtmi:example:omicron_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "theta_iota",
+          "name": "omicron_kappa",
           "properties": {
-            "@id": "dtmi:example:theta_eta;1",
-            "name": "theta_theta",
+            "@id": "dtmi:example:omicron_theta;1",
+            "name": "omicron_iota",
             "@type": "Command"
           }
         }
@@ -97,14 +97,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_xi;1",
+        "@id": "dtmi:example:omicron_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "theta_nu",
+          "name": "omicron_xi",
           "properties": {
-            "@id": "dtmi:example:theta_lambda;1",
-            "name": "theta_mu",
+            "@id": "dtmi:example:omicron_mu;1",
+            "name": "omicron_nu",
             "schema": "dateTime",
             "@type": "CommandPayload"
           }
@@ -120,15 +120,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_sigma;1",
+        "@id": "dtmi:example:omicron_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "theta_rho",
+          "name": "omicron_sigma",
           "properties": {
-            "@id": "dtmi:example:theta_omicron;1",
-            "name": "theta_pi",
+            "@id": "dtmi:example:omicron_pi;1",
+            "name": "omicron_rho",
             "schema": "double",
             "@type": "CommandPayload"
           }
@@ -144,16 +144,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_psi;1",
+        "@id": "dtmi:example:omicron_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "theta_chi",
+          "name": "omicron_psi",
           "properties": {
-            "@id": "dtmi:example:theta_tau;1",
-            "name": "theta_upsilon",
+            "@id": "dtmi:example:omicron_upsilon;1",
+            "name": "omicron_phi",
             "schema": {
-              "@id": "dtmi:example:theta_phi;1",
+              "@id": "dtmi:example:omicron_chi;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -170,17 +170,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_humpf;1",
+        "@id": "dtmi:example:omicron_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "theta_um",
+          "name": "omicron_humpf",
           "properties": {
-            "@id": "dtmi:example:theta_omega;1",
-            "name": "theta_yuzz",
+            "@id": "dtmi:example:omicron_yuzz;1",
+            "name": "omicron_wum",
             "schema": {
-              "@id": "dtmi:example:theta_wum;1",
+              "@id": "dtmi:example:omicron_um;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -197,17 +197,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_snee;1",
+        "@id": "dtmi:example:omicron_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "theta_nuh",
+          "name": "omicron_snee",
           "properties": {
-            "@id": "dtmi:example:theta_fuddle;1",
+            "@id": "dtmi:example:omicron_glikk;1",
             "enumValues": [
               {
-                "enumValue": 1091,
-                "name": "theta_glikk"
+                "enumValue": 1104,
+                "name": "omicron_nuh"
               }
             ],
             "valueSchema": "integer",
@@ -225,18 +225,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_floob;1",
+        "@id": "dtmi:example:omicron_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "theta_spazz",
+          "name": "omicron_floob",
           "properties": {
-            "@id": "dtmi:example:theta_quan;1",
+            "@id": "dtmi:example:omicron_thnad;1",
             "enumValues": [
               {
-                "enumValue": 1092,
-                "name": "theta_thnad"
+                "enumValue": 1105,
+                "name": "omicron_spazz"
               }
             ],
             "valueSchema": "integer",
@@ -254,15 +254,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_itch;1",
+        "@id": "dtmi:example:omicron_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "theta_flunn",
+          "name": "omicron_itch",
           "properties": {
-            "@id": "dtmi:example:theta_zatz;1",
-            "enumValue": 1093,
-            "name": "theta_jogg",
+            "@id": "dtmi:example:omicron_jogg;1",
+            "enumValue": 1106,
+            "name": "omicron_flunn",
             "@type": "EnumValue"
           }
         }
@@ -277,16 +277,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_alpha;1",
+        "@id": "dtmi:example:pi_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "theta_hi",
+          "name": "pi_alpha",
           "properties": {
-            "@id": "dtmi:example:theta_yekk;1",
-            "enumValue": 1094,
-            "name": "theta_vroo",
+            "@id": "dtmi:example:omicron_vroo;1",
+            "enumValue": 1107,
+            "name": "omicron_hi",
             "@type": "EnumValue"
           }
         }
@@ -301,14 +301,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_epsilon;1",
+        "@id": "dtmi:example:pi_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "iota_delta",
+          "name": "pi_epsilon",
           "properties": {
-            "@id": "dtmi:example:iota_beta;1",
-            "name": "iota_gamma",
+            "@id": "dtmi:example:pi_gamma;1",
+            "name": "pi_delta",
             "schema": "duration",
             "@type": "Field"
           }
@@ -324,15 +324,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_iota;1",
+        "@id": "dtmi:example:pi_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "iota_theta",
+          "name": "pi_iota",
           "properties": {
-            "@id": "dtmi:example:iota_zeta;1",
-            "name": "iota_eta",
+            "@id": "dtmi:example:pi_eta;1",
+            "name": "pi_theta",
             "schema": "float",
             "@type": "Field"
           }
@@ -348,13 +348,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_mu;1",
+        "@id": "dtmi:example:pi_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "iota_lambda",
+          "name": "pi_mu",
           "properties": {
-            "@id": "dtmi:example:iota_kappa;1",
+            "@id": "dtmi:example:pi_lambda;1",
             "@type": "Interface"
           }
         }
@@ -369,14 +369,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_omicron;1",
+        "@id": "dtmi:example:pi_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "iota_xi",
+          "name": "pi_omicron",
           "properties": {
-            "@id": "dtmi:example:iota_nu;1",
+            "@id": "dtmi:example:pi_xi;1",
             "@type": "Interface"
           }
         }
@@ -391,19 +391,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_upsilon;1",
+        "@id": "dtmi:example:pi_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "iota_tau",
+          "name": "pi_upsilon",
           "properties": {
-            "@id": "dtmi:example:iota_pi;1",
+            "@id": "dtmi:example:pi_rho;1",
             "mapKey": {
-              "name": "iota_rho",
+              "name": "pi_sigma",
               "schema": "string"
             },
             "mapValue": {
-              "name": "iota_sigma",
+              "name": "pi_tau",
               "schema": "integer"
             },
             "@type": "Map"
@@ -420,20 +420,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_yuzz;1",
+        "@id": "dtmi:example:pi_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "iota_omega",
+          "name": "pi_yuzz",
           "properties": {
-            "@id": "dtmi:example:iota_phi;1",
+            "@id": "dtmi:example:pi_chi;1",
             "mapKey": {
-              "name": "iota_chi",
+              "name": "pi_psi",
               "schema": "string"
             },
             "mapValue": {
-              "name": "iota_psi",
+              "name": "pi_omega",
               "schema": "long"
             },
             "@type": "Map"
@@ -450,14 +450,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_fuddle;1",
+        "@id": "dtmi:example:pi_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "iota_humpf",
+          "name": "pi_fuddle",
           "properties": {
-            "@id": "dtmi:example:iota_wum;1",
-            "name": "iota_um",
+            "@id": "dtmi:example:pi_um;1",
+            "name": "pi_humpf",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -473,15 +473,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_quan;1",
+        "@id": "dtmi:example:pi_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "iota_snee",
+          "name": "pi_quan",
           "properties": {
-            "@id": "dtmi:example:iota_glikk;1",
-            "name": "iota_nuh",
+            "@id": "dtmi:example:pi_nuh;1",
+            "name": "pi_snee",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -497,14 +497,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_zatz;1",
+        "@id": "dtmi:example:pi_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "iota_floob",
+          "name": "pi_zatz",
           "properties": {
-            "@id": "dtmi:example:iota_thnad;1",
-            "name": "iota_spazz",
+            "@id": "dtmi:example:pi_spazz;1",
+            "name": "pi_floob",
             "schema": "string",
             "@type": "MapValue"
           }
@@ -520,15 +520,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_yekk;1",
+        "@id": "dtmi:example:pi_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "iota_itch",
+          "name": "pi_yekk",
           "properties": {
-            "@id": "dtmi:example:iota_jogg;1",
-            "name": "iota_flunn",
+            "@id": "dtmi:example:pi_flunn;1",
+            "name": "pi_itch",
             "schema": "time",
             "@type": "MapValue"
           }
@@ -544,16 +544,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_beta;1",
+        "@id": "dtmi:example:rho_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "kappa_alpha",
+          "name": "rho_beta",
           "properties": {
-            "@id": "dtmi:example:iota_vroo;1",
+            "@id": "dtmi:example:pi_hi;1",
             "fields": [
               {
-                "name": "iota_hi",
+                "name": "rho_alpha",
                 "schema": "boolean"
               }
             ],
@@ -571,17 +571,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_zeta;1",
+        "@id": "dtmi:example:rho_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "kappa_epsilon",
+          "name": "rho_zeta",
           "properties": {
-            "@id": "dtmi:example:kappa_gamma;1",
+            "@id": "dtmi:example:rho_delta;1",
             "fields": [
               {
-                "name": "kappa_delta",
+                "name": "rho_epsilon",
                 "schema": "date"
               }
             ],
@@ -599,14 +599,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_kappa;1",
+        "@id": "dtmi:example:rho_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "kappa_iota",
+          "name": "rho_kappa",
           "properties": {
-            "@id": "dtmi:example:kappa_eta;1",
-            "name": "kappa_theta",
+            "@id": "dtmi:example:rho_theta;1",
+            "name": "rho_iota",
             "schema": "dateTime",
             "@type": "Property"
           }
@@ -622,14 +622,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_xi;1",
+        "@id": "dtmi:example:rho_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "kappa_nu",
+          "name": "rho_xi",
           "properties": {
-            "@id": "dtmi:example:kappa_lambda;1",
-            "name": "kappa_mu",
+            "@id": "dtmi:example:rho_mu;1",
+            "name": "rho_nu",
             "@type": "Relationship"
           }
         }
@@ -644,15 +644,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_sigma;1",
+        "@id": "dtmi:example:rho_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "kappa_rho",
+          "name": "rho_sigma",
           "properties": {
-            "@id": "dtmi:example:kappa_omicron;1",
-            "name": "kappa_pi",
+            "@id": "dtmi:example:rho_pi;1",
+            "name": "rho_rho",
             "@type": "Relationship"
           }
         }
@@ -667,14 +667,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_chi;1",
+        "@id": "dtmi:example:rho_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "kappa_phi",
+          "name": "rho_chi",
           "properties": {
-            "@id": "dtmi:example:kappa_tau;1",
-            "name": "kappa_upsilon",
+            "@id": "dtmi:example:rho_upsilon;1",
+            "name": "rho_phi",
             "schema": "double",
             "@type": "Telemetry"
           }
@@ -690,15 +690,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_wum;1",
+        "@id": "dtmi:example:rho_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "kappa_yuzz",
+          "name": "rho_wum",
           "properties": {
-            "@id": "dtmi:example:kappa_psi;1",
-            "name": "kappa_omega",
+            "@id": "dtmi:example:rho_omega;1",
+            "name": "rho_yuzz",
             "schema": "duration",
             "@type": "Telemetry"
           }
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyTargetIsDtmiV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyTargetIsDtmiV2.json
index d60ef57c..74dc9c9a 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyTargetIsDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyTargetIsDtmiV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_eta;1",
+        "@id": "dtmi:example:flunn_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "snee_zeta",
+          "name": "flunn_eta",
           "target": "dtmi:foo:bar;7"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_iota;1",
+        "@id": "dtmi:example:flunn_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "snee_theta",
+          "name": "flunn_iota",
           "target": [
             "dtmi:foo:bar;7"
           ]
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_lambda;1",
+        "@id": "dtmi:example:flunn_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "snee_kappa",
+          "name": "flunn_lambda",
           "target": "dtmi:foo:bar;108675309"
         }
       }
@@ -63,11 +63,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_nu;1",
+        "@id": "dtmi:example:flunn_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "snee_mu",
+          "name": "flunn_nu",
           "target": [
             "dtmi:foo:bar;108675309"
           ]
@@ -83,11 +83,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_omicron;1",
+        "@id": "dtmi:example:flunn_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "snee_xi",
+          "name": "flunn_omicron",
           "target": "dtmi:foo:bar;999999999"
         }
       }
@@ -101,11 +101,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_rho;1",
+        "@id": "dtmi:example:flunn_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "snee_pi",
+          "name": "flunn_rho",
           "target": [
             "dtmi:foo:bar;999999999"
           ]
@@ -121,11 +121,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_tau;1",
+        "@id": "dtmi:example:flunn_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "snee_sigma",
+          "name": "flunn_tau",
           "target": "dtmi:foo;1"
         }
       }
@@ -139,11 +139,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_phi;1",
+        "@id": "dtmi:example:flunn_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "snee_upsilon",
+          "name": "flunn_phi",
           "target": [
             "dtmi:foo;1"
           ]
@@ -159,11 +159,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_psi;1",
+        "@id": "dtmi:example:flunn_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "snee_chi",
+          "name": "flunn_psi",
           "target": null
         }
       }
@@ -177,12 +177,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_yuzz;1",
+        "@id": "dtmi:example:flunn_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "snee_omega",
+          "name": "flunn_yuzz",
           "target": null
         }
       }
@@ -196,11 +196,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_um;1",
+        "@id": "dtmi:example:flunn_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "snee_wum",
+          "name": "flunn_um",
           "target": 626
         }
       }
@@ -214,12 +214,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_fuddle;1",
+        "@id": "dtmi:example:flunn_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "snee_humpf",
+          "name": "flunn_fuddle",
           "target": 626
         }
       }
@@ -233,11 +233,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_nuh;1",
+        "@id": "dtmi:example:flunn_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "snee_glikk",
+          "name": "flunn_nuh",
           "target": true
         }
       }
@@ -251,12 +251,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_quan;1",
+        "@id": "dtmi:example:flunn_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "snee_snee",
+          "name": "flunn_quan",
           "target": true
         }
       }
@@ -270,11 +270,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_spazz;1",
+        "@id": "dtmi:example:flunn_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "snee_thnad",
+          "name": "flunn_spazz",
           "target": {
             "@value": "dtmi:apparently:valid:identifier;3"
           }
@@ -290,12 +290,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_zatz;1",
+        "@id": "dtmi:example:flunn_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "snee_floob",
+          "name": "flunn_zatz",
           "target": {
             "@value": "dtmi:apparently:valid:identifier;3"
           }
@@ -311,11 +311,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_flunn;1",
+        "@id": "dtmi:example:flunn_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "snee_jogg",
+          "name": "flunn_flunn",
           "target": "dtmi:foo:bar;0"
         }
       }
@@ -329,12 +329,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_yekk;1",
+        "@id": "dtmi:example:flunn_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "snee_itch",
+          "name": "flunn_yekk",
           "target": "dtmi:foo:bar;0"
         }
       }
@@ -348,11 +348,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:snee_hi;1",
+        "@id": "dtmi:example:itch_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "snee_vroo",
+          "name": "flunn_hi",
           "target": "dtmi:foo:bar;0.0"
         }
       }
@@ -366,12 +366,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_beta;1",
+        "@id": "dtmi:example:itch_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "quan_alpha",
+          "name": "itch_beta",
           "target": "dtmi:foo:bar;0.0"
         }
       }
@@ -385,11 +385,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_delta;1",
+        "@id": "dtmi:example:itch_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "quan_gamma",
+          "name": "itch_delta",
           "target": "dtmi:foo:bar;1234567890"
         }
       }
@@ -403,12 +403,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_zeta;1",
+        "@id": "dtmi:example:itch_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "quan_epsilon",
+          "name": "itch_zeta",
           "target": "dtmi:foo:bar;1234567890"
         }
       }
@@ -422,11 +422,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_theta;1",
+        "@id": "dtmi:example:itch_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "quan_eta",
+          "name": "itch_theta",
           "target": "dtmi:foo:bar;1a"
         }
       }
@@ -440,12 +440,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_kappa;1",
+        "@id": "dtmi:example:itch_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "quan_iota",
+          "name": "itch_kappa",
           "target": "dtmi:foo:bar;1a"
         }
       }
@@ -459,11 +459,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_mu;1",
+        "@id": "dtmi:example:itch_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "quan_lambda",
+          "name": "itch_mu",
           "target": "dtmi:foo:bar;3.0"
         }
       }
@@ -477,12 +477,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_xi;1",
+        "@id": "dtmi:example:itch_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "quan_nu",
+          "name": "itch_xi",
           "target": "dtmi:foo:bar;3.0"
         }
       }
@@ -496,11 +496,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_pi;1",
+        "@id": "dtmi:example:itch_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "quan_omicron",
+          "name": "itch_pi",
           "target": "dtmi:foo:bar;3.1415926"
         }
       }
@@ -514,12 +514,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_sigma;1",
+        "@id": "dtmi:example:itch_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "quan_rho",
+          "name": "itch_sigma",
           "target": "dtmi:foo:bar;3.1415926"
         }
       }
@@ -533,11 +533,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_upsilon;1",
+        "@id": "dtmi:example:itch_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "quan_tau",
+          "name": "itch_upsilon",
           "target": "dtmi:foo:bar;6.02"
         }
       }
@@ -551,12 +551,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_chi;1",
+        "@id": "dtmi:example:itch_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "quan_phi",
+          "name": "itch_chi",
           "target": "dtmi:foo:bar;6.02"
         }
       }
@@ -570,11 +570,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_omega;1",
+        "@id": "dtmi:example:itch_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "quan_psi",
+          "name": "itch_omega",
           "target": "dtmi:foo:bar;0.1"
         }
       }
@@ -588,12 +588,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_wum;1",
+        "@id": "dtmi:example:itch_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "quan_yuzz",
+          "name": "itch_wum",
           "target": "dtmi:foo:bar;0.1"
         }
       }
@@ -607,11 +607,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_humpf;1",
+        "@id": "dtmi:example:itch_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "quan_um",
+          "name": "itch_humpf",
           "target": "dtmi:foo:bar;01"
         }
       }
@@ -625,12 +625,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_glikk;1",
+        "@id": "dtmi:example:itch_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "quan_fuddle",
+          "name": "itch_glikk",
           "target": "dtmi:foo:bar;01"
         }
       }
@@ -644,11 +644,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_snee;1",
+        "@id": "dtmi:example:itch_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "quan_nuh",
+          "name": "itch_snee",
           "target": "dtmi:foo:bar;"
         }
       }
@@ -662,12 +662,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_thnad;1",
+        "@id": "dtmi:example:itch_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "quan_quan",
+          "name": "itch_thnad",
           "target": "dtmi:foo:bar;"
         }
       }
@@ -681,11 +681,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_floob;1",
+        "@id": "dtmi:example:itch_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "quan_spazz",
+          "name": "itch_floob",
           "target": "dtmi:test:invalidId_;1"
         }
       }
@@ -699,12 +699,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_jogg;1",
+        "@id": "dtmi:example:itch_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "quan_zatz",
+          "name": "itch_jogg",
           "target": "dtmi:test:invalidId_;1"
         }
       }
@@ -718,11 +718,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_itch;1",
+        "@id": "dtmi:example:itch_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "quan_flunn",
+          "name": "itch_itch",
           "target": "dtmi:test:_invalidUserId;1"
         }
       }
@@ -736,12 +736,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:quan_vroo;1",
+        "@id": "dtmi:example:itch_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "quan_yekk",
+          "name": "itch_vroo",
           "target": "dtmi:test:_invalidUserId;1"
         }
       }
@@ -755,11 +755,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_alpha;1",
+        "@id": "dtmi:example:yekk_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "quan_hi",
+          "name": "yekk_alpha",
           "target": "dtmi:test:1seg;1"
         }
       }
@@ -773,12 +773,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_gamma;1",
+        "@id": "dtmi:example:yekk_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "thnad_beta",
+          "name": "yekk_gamma",
           "target": "dtmi:test:1seg;1"
         }
       }
@@ -792,11 +792,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_epsilon;1",
+        "@id": "dtmi:example:yekk_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "thnad_delta",
+          "name": "yekk_epsilon",
           "target": "dtmi:foo:bar.baz;1"
         }
       }
@@ -810,12 +810,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_eta;1",
+        "@id": "dtmi:example:yekk_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "thnad_zeta",
+          "name": "yekk_eta",
           "target": "dtmi:foo:bar.baz;1"
         }
       }
@@ -829,11 +829,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_iota;1",
+        "@id": "dtmi:example:yekk_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "thnad_theta",
+          "name": "yekk_iota",
           "target": "dtmi:foo::bar;1"
         }
       }
@@ -847,12 +847,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_lambda;1",
+        "@id": "dtmi:example:yekk_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "thnad_kappa",
+          "name": "yekk_lambda",
           "target": "dtmi:foo::bar;1"
         }
       }
@@ -866,11 +866,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_nu;1",
+        "@id": "dtmi:example:yekk_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "thnad_mu",
+          "name": "yekk_nu",
           "target": "urn:foo:bar:1"
         }
       }
@@ -884,12 +884,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_omicron;1",
+        "@id": "dtmi:example:yekk_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "thnad_xi",
+          "name": "yekk_omicron",
           "target": "urn:foo:bar:1"
         }
       }
@@ -903,11 +903,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_rho;1",
+        "@id": "dtmi:example:yekk_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "thnad_pi",
+          "name": "yekk_rho",
           "target": "http://foo/bar/baz"
         }
       }
@@ -921,12 +921,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_tau;1",
+        "@id": "dtmi:example:yekk_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "thnad_sigma",
+          "name": "yekk_tau",
           "target": "http://foo/bar/baz"
         }
       }
@@ -940,11 +940,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_phi;1",
+        "@id": "dtmi:example:yekk_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "thnad_upsilon",
+          "name": "yekk_phi",
           "target": "dtmi:;1"
         }
       }
@@ -958,12 +958,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_psi;1",
+        "@id": "dtmi:example:yekk_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "thnad_chi",
+          "name": "yekk_psi",
           "target": "dtmi:;1"
         }
       }
@@ -977,11 +977,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_yuzz;1",
+        "@id": "dtmi:example:yekk_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "thnad_omega",
+          "name": "yekk_yuzz",
           "target": "dtmi:foo:bar"
         }
       }
@@ -995,12 +995,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_um;1",
+        "@id": "dtmi:example:yekk_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "thnad_wum",
+          "name": "yekk_um",
           "target": "dtmi:foo:bar"
         }
       }
@@ -1014,11 +1014,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_fuddle;1",
+        "@id": "dtmi:example:yekk_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "thnad_humpf",
+          "name": "yekk_fuddle",
           "target": "dtmi:foo:bar;3.14"
         }
       }
@@ -1032,12 +1032,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_nuh;1",
+        "@id": "dtmi:example:yekk_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "thnad_glikk",
+          "name": "yekk_nuh",
           "target": "dtmi:foo:bar;3.14"
         }
       }
@@ -1051,11 +1051,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_quan;1",
+        "@id": "dtmi:example:yekk_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "thnad_snee",
+          "name": "yekk_quan",
           "target": "dtmi:foo:bar;3.141592"
         }
       }
@@ -1069,12 +1069,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_spazz;1",
+        "@id": "dtmi:example:yekk_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "thnad_thnad",
+          "name": "yekk_spazz",
           "target": "dtmi:foo:bar;3.141592"
         }
       }
@@ -1088,11 +1088,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_zatz;1",
+        "@id": "dtmi:example:yekk_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "thnad_floob",
+          "name": "yekk_zatz",
           "target": []
         }
       }
@@ -1106,11 +1106,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_flunn;1",
+        "@id": "dtmi:example:yekk_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "thnad_jogg",
+          "name": "yekk_flunn",
           "target": [
             "dtmi:foo:bar;7",
             "dtmi:foo:bar;108675309"
@@ -1127,12 +1127,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_yekk;1",
+        "@id": "dtmi:example:yekk_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "thnad_itch",
+          "name": "yekk_yekk",
           "target": [
             "dtmi:foo:bar;7",
             "dtmi:foo:bar;108675309"
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyTargetTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyTargetTermAndDtmiV2.json
index e32399fe..0fb067e2 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyTargetTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyTargetTermAndDtmiV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_lambda;1",
+        "@id": "dtmi:example:vroo_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "spazz_theta",
-          "target": "dtmi:example:spazz_iota;1",
-          "dtmi:dtdl:property:target;2": "dtmi:example:spazz_kappa;1"
+          "name": "vroo_iota",
+          "target": "dtmi:example:vroo_kappa;1",
+          "dtmi:dtdl:property:target;2": "dtmi:example:vroo_lambda;1"
         }
       }
     ]
@@ -26,14 +26,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_omicron;1",
+        "@id": "dtmi:example:vroo_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "spazz_mu",
-          "target": "dtmi:example:spazz_nu;1",
-          "dtmi:dtdl:property:target;2": "dtmi:example:spazz_xi;1"
+          "name": "vroo_nu",
+          "target": "dtmi:example:vroo_xi;1",
+          "dtmi:dtdl:property:target;2": "dtmi:example:vroo_omicron;1"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyWritableBooleanV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyWritableBooleanV2.json
index f0366d35..892190ee 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyWritableBooleanV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyWritableBooleanV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_rho;1",
+        "@id": "dtmi:example:vroo_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "spazz_pi",
+          "name": "vroo_rho",
           "writable": true
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_tau;1",
+        "@id": "dtmi:example:vroo_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "spazz_sigma",
+          "name": "vroo_tau",
           "writable": false
         }
       }
@@ -43,11 +43,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_phi;1",
+        "@id": "dtmi:example:vroo_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "spazz_upsilon",
+          "name": "vroo_phi",
           "writable": [
             true
           ]
@@ -63,11 +63,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_psi;1",
+        "@id": "dtmi:example:vroo_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "spazz_chi",
+          "name": "vroo_psi",
           "writable": [
             false
           ]
@@ -83,11 +83,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_yuzz;1",
+        "@id": "dtmi:example:vroo_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "spazz_omega",
+          "name": "vroo_yuzz",
           "writable": {
             "@value": true,
             "@type": "xsd:boolean"
@@ -104,11 +104,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_um;1",
+        "@id": "dtmi:example:vroo_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "spazz_wum",
+          "name": "vroo_um",
           "writable": {
             "@value": false,
             "@type": "xsd:boolean"
@@ -125,11 +125,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_fuddle;1",
+        "@id": "dtmi:example:vroo_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "spazz_humpf",
+          "name": "vroo_fuddle",
           "writable": [
             {
               "@value": true,
@@ -148,11 +148,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_nuh;1",
+        "@id": "dtmi:example:vroo_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "spazz_glikk",
+          "name": "vroo_nuh",
           "writable": [
             {
               "@value": false,
@@ -171,11 +171,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_quan;1",
+        "@id": "dtmi:example:vroo_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "spazz_snee",
+          "name": "vroo_quan",
           "writable": []
         }
       }
@@ -189,11 +189,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_spazz;1",
+        "@id": "dtmi:example:vroo_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "spazz_thnad",
+          "name": "vroo_spazz",
           "writable": null
         }
       }
@@ -207,12 +207,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_zatz;1",
+        "@id": "dtmi:example:vroo_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "spazz_floob",
+          "name": "vroo_zatz",
           "writable": null
         }
       }
@@ -226,11 +226,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_flunn;1",
+        "@id": "dtmi:example:vroo_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "spazz_jogg",
+          "name": "vroo_flunn",
           "writable": 626
         }
       }
@@ -244,12 +244,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_yekk;1",
+        "@id": "dtmi:example:vroo_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "spazz_itch",
+          "name": "vroo_yekk",
           "writable": 626
         }
       }
@@ -263,11 +263,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_hi;1",
+        "@id": "dtmi:example:hi_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "spazz_vroo",
+          "name": "vroo_hi",
           "writable": "hello"
         }
       }
@@ -281,12 +281,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_beta;1",
+        "@id": "dtmi:example:hi_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "floob_alpha",
+          "name": "hi_beta",
           "writable": "hello"
         }
       }
@@ -300,11 +300,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_delta;1",
+        "@id": "dtmi:example:hi_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "floob_gamma",
+          "name": "hi_delta",
           "writable": [
             null
           ]
@@ -320,12 +320,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_zeta;1",
+        "@id": "dtmi:example:hi_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "floob_epsilon",
+          "name": "hi_zeta",
           "writable": [
             null
           ]
@@ -341,11 +341,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_theta;1",
+        "@id": "dtmi:example:hi_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "floob_eta",
+          "name": "hi_theta",
           "writable": [
             626
           ]
@@ -361,12 +361,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_kappa;1",
+        "@id": "dtmi:example:hi_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "floob_iota",
+          "name": "hi_kappa",
           "writable": [
             626
           ]
@@ -382,11 +382,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_mu;1",
+        "@id": "dtmi:example:hi_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "floob_lambda",
+          "name": "hi_mu",
           "writable": [
             "hello"
           ]
@@ -402,12 +402,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_xi;1",
+        "@id": "dtmi:example:hi_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "floob_nu",
+          "name": "hi_xi",
           "writable": [
             "hello"
           ]
@@ -423,11 +423,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_pi;1",
+        "@id": "dtmi:example:hi_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "floob_omicron",
+          "name": "hi_pi",
           "writable": {}
         }
       }
@@ -441,12 +441,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_sigma;1",
+        "@id": "dtmi:example:hi_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "floob_rho",
+          "name": "hi_sigma",
           "writable": {}
         }
       }
@@ -460,11 +460,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_upsilon;1",
+        "@id": "dtmi:example:hi_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "floob_tau",
+          "name": "hi_upsilon",
           "writable": [
             {}
           ]
@@ -480,12 +480,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_chi;1",
+        "@id": "dtmi:example:hi_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "floob_phi",
+          "name": "hi_chi",
           "writable": [
             {}
           ]
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyWritableTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyWritableTermAndDtmiV2.json
index 11cec31a..4c761984 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipPropertyWritableTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipPropertyWritableTermAndDtmiV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_glikk;1",
+        "@id": "dtmi:example:hi_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "floob_fuddle",
+          "name": "hi_glikk",
           "writable": false,
           "dtmi:dtdl:property:writable;2": true
         }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:floob_snee;1",
+        "@id": "dtmi:example:hi_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "floob_nuh",
+          "name": "hi_snee",
           "writable": false,
           "dtmi:dtdl:property:writable;2": true
         }
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipRequiredPropertiesV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipRequiredPropertiesV2.json
index c470bb32..1537b14b 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipRequiredPropertiesV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipRequiredPropertiesV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_iota;1",
+        "@id": "dtmi:example:itch_zatz;1",
         "@type": "Interface",
         "contents": {
-          "name": "thnad_theta"
+          "name": "itch_floob"
         }
       }
     ]
@@ -23,11 +23,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_lambda;1",
+        "@id": "dtmi:example:itch_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "thnad_kappa"
+          "name": "itch_jogg"
         }
       }
     ]
@@ -40,7 +40,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_mu;1",
+        "@id": "dtmi:example:itch_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship"
@@ -56,7 +56,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_nu;1",
+        "@id": "dtmi:example:itch_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipTypeIncludesInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipTypeIncludesInvalidDtmiV2.json
index d72d7909..3a62b0da 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipTypeIncludesInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipTypeIncludesInvalidDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_jogg;1",
+        "@id": "dtmi:example:vroo_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Relationship",
             "dtmi:foo//bar"
           ],
-          "name": "spazz_zatz"
+          "name": "vroo_chi"
         }
       }
     ]
@@ -27,7 +27,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_itch;1",
+        "@id": "dtmi:example:vroo_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -35,7 +35,7 @@
             "Relationship",
             "dtmi:foo//bar"
           ],
-          "name": "spazz_flunn"
+          "name": "vroo_omega"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipTypeIncludesMaterialV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipTypeIncludesMaterialV2.json
index 81d06a81..233d02d2 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipTypeIncludesMaterialV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipTypeIncludesMaterialV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_delta;1",
+        "@id": "dtmi:example:yekk_snee;1",
         "@type": "Interface",
         "contents": {
-          "name": "spazz_gamma",
+          "name": "yekk_nuh",
           "@type": "Relationship"
         }
       }
@@ -24,10 +24,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_zeta;1",
+        "@id": "dtmi:example:yekk_thnad;1",
         "@type": "Interface",
         "contents": {
-          "name": "spazz_epsilon",
+          "name": "yekk_quan",
           "@type": [
             "Relationship"
           ]
@@ -43,10 +43,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_theta;1",
+        "@id": "dtmi:example:yekk_floob;1",
         "@type": "Interface",
         "contents": {
-          "name": "spazz_eta",
+          "name": "yekk_spazz",
           "@type": "dtmi:dtdl:class:Relationship;2"
         }
       }
@@ -60,10 +60,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_kappa;1",
+        "@id": "dtmi:example:yekk_jogg;1",
         "@type": "Interface",
         "contents": {
-          "name": "spazz_iota",
+          "name": "yekk_zatz",
           "@type": [
             "dtmi:dtdl:class:Relationship;2"
           ]
@@ -79,10 +79,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_mu;1",
+        "@id": "dtmi:example:yekk_itch;1",
         "@type": "Interface",
         "contents": {
-          "name": "spazz_lambda",
+          "name": "yekk_flunn",
           "@type": "Something"
         }
       }
@@ -96,11 +96,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_xi;1",
+        "@id": "dtmi:example:yekk_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "spazz_nu",
+          "name": "yekk_yekk",
           "@type": "Something"
         }
       }
@@ -114,10 +114,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_pi;1",
+        "@id": "dtmi:example:vroo_alpha;1",
         "@type": "Interface",
         "contents": {
-          "name": "spazz_omicron",
+          "name": "yekk_hi",
           "@type": [
             "Something"
           ]
@@ -133,11 +133,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_sigma;1",
+        "@id": "dtmi:example:vroo_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "spazz_rho",
+          "name": "vroo_beta",
           "@type": [
             "Something"
           ]
diff --git a/DTDL/v2/spec/Requirement-ClassRelationshipTypeStringOrArrayV2.json b/DTDL/v2/spec/Requirement-ClassRelationshipTypeStringOrArrayV2.json
index 8cffae7a..c01764a4 100644
--- a/DTDL/v2/spec/Requirement-ClassRelationshipTypeStringOrArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassRelationshipTypeStringOrArrayV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_omicron;1",
+        "@id": "dtmi:example:itch_hi;1",
         "@type": "Interface",
         "contents": {
-          "name": "thnad_xi",
+          "name": "itch_vroo",
           "@type": 626
         }
       }
@@ -24,11 +24,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_rho;1",
+        "@id": "dtmi:example:yekk_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "thnad_pi",
+          "name": "yekk_alpha",
           "@type": 626
         }
       }
@@ -42,10 +42,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_tau;1",
+        "@id": "dtmi:example:yekk_delta;1",
         "@type": "Interface",
         "contents": {
-          "name": "thnad_sigma",
+          "name": "yekk_gamma",
           "@type": null
         }
       }
@@ -59,11 +59,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_phi;1",
+        "@id": "dtmi:example:yekk_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "thnad_upsilon",
+          "name": "yekk_epsilon",
           "@type": null
         }
       }
@@ -77,10 +77,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_psi;1",
+        "@id": "dtmi:example:yekk_theta;1",
         "@type": "Interface",
         "contents": {
-          "name": "thnad_chi",
+          "name": "yekk_eta",
           "@type": true
         }
       }
@@ -94,11 +94,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_yuzz;1",
+        "@id": "dtmi:example:yekk_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "thnad_omega",
+          "name": "yekk_iota",
           "@type": true
         }
       }
@@ -112,10 +112,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_um;1",
+        "@id": "dtmi:example:yekk_mu;1",
         "@type": "Interface",
         "contents": {
-          "name": "thnad_wum",
+          "name": "yekk_lambda",
           "@type": {}
         }
       }
@@ -129,11 +129,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_fuddle;1",
+        "@id": "dtmi:example:yekk_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "thnad_humpf",
+          "name": "yekk_nu",
           "@type": {}
         }
       }
@@ -147,10 +147,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_nuh;1",
+        "@id": "dtmi:example:yekk_pi;1",
         "@type": "Interface",
         "contents": {
-          "name": "thnad_glikk",
+          "name": "yekk_omicron",
           "@type": [
             626
           ]
@@ -166,11 +166,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_quan;1",
+        "@id": "dtmi:example:yekk_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "thnad_snee",
+          "name": "yekk_rho",
           "@type": [
             626
           ]
@@ -186,10 +186,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_spazz;1",
+        "@id": "dtmi:example:yekk_upsilon;1",
         "@type": "Interface",
         "contents": {
-          "name": "thnad_thnad",
+          "name": "yekk_tau",
           "@type": [
             null
           ]
@@ -205,11 +205,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_zatz;1",
+        "@id": "dtmi:example:yekk_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "thnad_floob",
+          "name": "yekk_phi",
           "@type": [
             null
           ]
@@ -225,10 +225,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_flunn;1",
+        "@id": "dtmi:example:yekk_omega;1",
         "@type": "Interface",
         "contents": {
-          "name": "thnad_jogg",
+          "name": "yekk_psi",
           "@type": [
             true
           ]
@@ -244,11 +244,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_yekk;1",
+        "@id": "dtmi:example:yekk_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "thnad_itch",
+          "name": "yekk_yuzz",
           "@type": [
             true
           ]
@@ -264,10 +264,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:thnad_hi;1",
+        "@id": "dtmi:example:yekk_humpf;1",
         "@type": "Interface",
         "contents": {
-          "name": "thnad_vroo",
+          "name": "yekk_um",
           "@type": [
             {}
           ]
@@ -283,11 +283,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:spazz_beta;1",
+        "@id": "dtmi:example:yekk_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "spazz_alpha",
+          "name": "yekk_fuddle",
           "@type": [
             {}
           ]
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryContextConformsV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryContextConformsV2.json
index 7ed3d733..ebb0df87 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryContextConformsV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryContextConformsV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_sigma;1",
+        "@id": "dtmi:example:xi_um;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:eta_rho;1",
+          "@id": "dtmi:example:xi_wum;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "eta_pi",
+            "name": "xi_yuzz",
             "schema": "duration",
             "@context": "dtmi:iotcentral:context;2"
           }
@@ -30,14 +30,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_phi;1",
+        "@id": "dtmi:example:xi_glikk;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:eta_upsilon;1",
+          "@id": "dtmi:example:xi_fuddle;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "eta_tau",
+            "name": "xi_humpf",
             "schema": "float",
             "@context": []
           }
@@ -53,14 +53,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_omega;1",
+        "@id": "dtmi:example:xi_quan;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:eta_psi;1",
+          "@id": "dtmi:example:xi_snee;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "eta_chi",
+            "name": "xi_nuh",
             "schema": "integer",
             "@context": [
               "dtmi:iotcentral:context;2"
@@ -78,14 +78,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_um;1",
+        "@id": "dtmi:example:xi_floob;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:eta_wum;1",
+          "@id": "dtmi:example:xi_spazz;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "eta_yuzz",
+            "name": "xi_thnad",
             "schema": "long",
             "@context": null
           }
@@ -101,14 +101,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_glikk;1",
+        "@id": "dtmi:example:xi_flunn;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:eta_fuddle;1",
+          "@id": "dtmi:example:xi_jogg;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "eta_humpf",
+            "name": "xi_zatz",
             "schema": "string",
             "@context": 626
           }
@@ -124,14 +124,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_quan;1",
+        "@id": "dtmi:example:xi_vroo;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:eta_snee;1",
+          "@id": "dtmi:example:xi_yekk;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "eta_nuh",
+            "name": "xi_itch",
             "schema": "time",
             "@context": true
           }
@@ -147,14 +147,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_floob;1",
+        "@id": "dtmi:example:omicron_beta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:eta_spazz;1",
+          "@id": "dtmi:example:omicron_alpha;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "eta_thnad",
+            "name": "xi_hi",
             "schema": "boolean",
             "@context": [
               null
@@ -172,14 +172,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_flunn;1",
+        "@id": "dtmi:example:omicron_epsilon;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:eta_jogg;1",
+          "@id": "dtmi:example:omicron_delta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "eta_zatz",
+            "name": "omicron_gamma",
             "schema": "date",
             "@context": [
               626
@@ -197,14 +197,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_vroo;1",
+        "@id": "dtmi:example:omicron_theta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:eta_yekk;1",
+          "@id": "dtmi:example:omicron_eta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "eta_itch",
+            "name": "omicron_zeta",
             "schema": "dateTime",
             "@context": [
               true
@@ -222,16 +222,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_beta;1",
+        "@id": "dtmi:example:omicron_lambda;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:theta_alpha;1",
+          "@id": "dtmi:example:omicron_kappa;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "eta_hi",
+            "name": "omicron_iota",
             "schema": "double",
-            "@context": {}
+            "@context": "dtmi:iotcentral:context"
           }
         }
       }
@@ -245,18 +245,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_epsilon;1",
+        "@id": "dtmi:example:omicron_xi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:theta_delta;1",
+          "@id": "dtmi:example:omicron_nu;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "theta_gamma",
+            "name": "omicron_mu",
             "schema": "duration",
-            "@context": [
-              {}
-            ]
+            "@context": "http://iotcentral/context/2"
           }
         }
       }
@@ -270,16 +268,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_theta;1",
+        "@id": "dtmi:example:omicron_rho;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:theta_eta;1",
+          "@id": "dtmi:example:omicron_pi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "theta_zeta",
+            "name": "omicron_omicron",
             "schema": "float",
-            "@context": "dtmi:iotcentral:context"
+            "@context": "iotcentral;2"
           }
         }
       }
@@ -293,16 +291,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_lambda;1",
+        "@id": "dtmi:example:omicron_upsilon;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:theta_kappa;1",
+          "@id": "dtmi:example:omicron_tau;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "theta_iota",
+            "name": "omicron_sigma",
             "schema": "integer",
-            "@context": "http://iotcentral/context/2"
+            "@context": {}
           }
         }
       }
@@ -316,16 +314,70 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_xi;1",
+        "@id": "dtmi:example:omicron_psi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:theta_nu;1",
+          "@id": "dtmi:example:omicron_chi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "theta_mu",
+            "name": "omicron_phi",
             "schema": "long",
-            "@context": "iotcentral;2"
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:omicron_wum;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:omicron_yuzz;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "omicron_omega",
+            "schema": "string",
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:omicron_fuddle;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:omicron_humpf;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "omicron_um",
+            "schema": "time",
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryCotypePropertyPresentV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryCotypePropertyPresentV2.json
index d975bad2..e9a2fcd9 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryCotypePropertyPresentV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryCotypePropertyPresentV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_yuzz;1",
+        "@id": "dtmi:example:psi_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "pi_omega",
+          "name": "psi_flunn",
           "schema": "double"
         }
       }
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_um;1",
+        "@id": "dtmi:example:psi_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,7 +36,7 @@
             "Telemetry",
             "Area"
           ],
-          "name": "pi_wum",
+          "name": "psi_yekk",
           "schema": "float"
         }
       }
@@ -50,14 +50,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_fuddle;1",
+        "@id": "dtmi:example:omega_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "pi_humpf",
+          "name": "psi_hi",
           "schema": "integer"
         }
       }
@@ -71,7 +71,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_nuh;1",
+        "@id": "dtmi:example:omega_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -79,7 +79,7 @@
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "pi_glikk",
+          "name": "omega_beta",
           "schema": "long"
         }
       }
@@ -93,14 +93,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_quan;1",
+        "@id": "dtmi:example:omega_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "pi_snee",
+          "name": "omega_delta",
           "schema": "double",
           "unit": null
         }
@@ -115,7 +115,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_spazz;1",
+        "@id": "dtmi:example:omega_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -123,7 +123,7 @@
             "Telemetry",
             "Area"
           ],
-          "name": "pi_thnad",
+          "name": "omega_zeta",
           "schema": "float",
           "unit": null
         }
@@ -138,14 +138,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_zatz;1",
+        "@id": "dtmi:example:omega_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "pi_floob",
+          "name": "omega_theta",
           "schema": "integer",
           "unit": null
         }
@@ -160,7 +160,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_flunn;1",
+        "@id": "dtmi:example:omega_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -168,7 +168,7 @@
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "pi_jogg",
+          "name": "omega_kappa",
           "schema": "long",
           "unit": null
         }
@@ -183,14 +183,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_yekk;1",
+        "@id": "dtmi:example:omega_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "pi_itch",
+          "name": "omega_mu",
           "schema": "double",
           "unit": true
         }
@@ -205,7 +205,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_hi;1",
+        "@id": "dtmi:example:omega_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -213,7 +213,7 @@
             "Telemetry",
             "Area"
           ],
-          "name": "pi_vroo",
+          "name": "omega_xi",
           "schema": "float",
           "unit": true
         }
@@ -228,14 +228,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_beta;1",
+        "@id": "dtmi:example:omega_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "rho_alpha",
+          "name": "omega_pi",
           "schema": "integer",
           "unit": true
         }
@@ -250,7 +250,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_delta;1",
+        "@id": "dtmi:example:omega_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -258,7 +258,7 @@
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "rho_gamma",
+          "name": "omega_sigma",
           "schema": "long",
           "unit": true
         }
@@ -273,14 +273,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_zeta;1",
+        "@id": "dtmi:example:omega_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "rho_epsilon",
+          "name": "omega_upsilon",
           "schema": "double",
           "unit": 626
         }
@@ -295,7 +295,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_theta;1",
+        "@id": "dtmi:example:omega_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -303,7 +303,7 @@
             "Telemetry",
             "Area"
           ],
-          "name": "rho_eta",
+          "name": "omega_chi",
           "schema": "float",
           "unit": 626
         }
@@ -318,14 +318,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_kappa;1",
+        "@id": "dtmi:example:omega_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "rho_iota",
+          "name": "omega_omega",
           "schema": "integer",
           "unit": 626
         }
@@ -340,7 +340,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_mu;1",
+        "@id": "dtmi:example:omega_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -348,7 +348,7 @@
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "rho_lambda",
+          "name": "omega_wum",
           "schema": "long",
           "unit": 626
         }
@@ -363,14 +363,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_xi;1",
+        "@id": "dtmi:example:omega_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "rho_nu",
+          "name": "omega_humpf",
           "schema": "double",
           "unit": [
             null
@@ -387,7 +387,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_pi;1",
+        "@id": "dtmi:example:omega_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -395,7 +395,7 @@
             "Telemetry",
             "Area"
           ],
-          "name": "rho_omicron",
+          "name": "omega_glikk",
           "schema": "float",
           "unit": [
             null
@@ -412,14 +412,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_sigma;1",
+        "@id": "dtmi:example:omega_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "rho_rho",
+          "name": "omega_snee",
           "schema": "integer",
           "unit": [
             null
@@ -436,7 +436,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_upsilon;1",
+        "@id": "dtmi:example:omega_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -444,7 +444,7 @@
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "rho_tau",
+          "name": "omega_thnad",
           "schema": "long",
           "unit": [
             null
@@ -461,14 +461,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_chi;1",
+        "@id": "dtmi:example:omega_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "rho_phi",
+          "name": "omega_floob",
           "schema": "double",
           "unit": [
             true
@@ -485,7 +485,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_omega;1",
+        "@id": "dtmi:example:omega_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -493,7 +493,7 @@
             "Telemetry",
             "Area"
           ],
-          "name": "rho_psi",
+          "name": "omega_jogg",
           "schema": "float",
           "unit": [
             true
@@ -510,14 +510,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_wum;1",
+        "@id": "dtmi:example:omega_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "rho_yuzz",
+          "name": "omega_itch",
           "schema": "integer",
           "unit": [
             true
@@ -534,7 +534,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_humpf;1",
+        "@id": "dtmi:example:omega_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -542,7 +542,7 @@
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "rho_um",
+          "name": "omega_vroo",
           "schema": "long",
           "unit": [
             true
@@ -559,14 +559,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_glikk;1",
+        "@id": "dtmi:example:yuzz_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "rho_fuddle",
+          "name": "yuzz_alpha",
           "schema": "double",
           "unit": [
             626
@@ -583,7 +583,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_snee;1",
+        "@id": "dtmi:example:yuzz_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -591,7 +591,7 @@
             "Telemetry",
             "Area"
           ],
-          "name": "rho_nuh",
+          "name": "yuzz_gamma",
           "schema": "float",
           "unit": [
             626
@@ -608,14 +608,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_thnad;1",
+        "@id": "dtmi:example:yuzz_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "rho_quan",
+          "name": "yuzz_epsilon",
           "schema": "integer",
           "unit": [
             626
@@ -632,7 +632,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_floob;1",
+        "@id": "dtmi:example:yuzz_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -640,7 +640,7 @@
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "rho_spazz",
+          "name": "yuzz_eta",
           "schema": "long",
           "unit": [
             626
@@ -657,14 +657,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_jogg;1",
+        "@id": "dtmi:example:yuzz_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "rho_zatz",
+          "name": "yuzz_iota",
           "schema": "double",
           "unit": {}
         }
@@ -679,7 +679,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_itch;1",
+        "@id": "dtmi:example:yuzz_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -687,7 +687,7 @@
             "Telemetry",
             "Area"
           ],
-          "name": "rho_flunn",
+          "name": "yuzz_lambda",
           "schema": "float",
           "unit": {}
         }
@@ -702,14 +702,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:rho_vroo;1",
+        "@id": "dtmi:example:yuzz_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "rho_yekk",
+          "name": "yuzz_nu",
           "schema": "integer",
           "unit": {}
         }
@@ -724,7 +724,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_alpha;1",
+        "@id": "dtmi:example:yuzz_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -732,7 +732,7 @@
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "rho_hi",
+          "name": "yuzz_omicron",
           "schema": "long",
           "unit": {}
         }
@@ -747,14 +747,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_gamma;1",
+        "@id": "dtmi:example:yuzz_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "sigma_beta",
+          "name": "yuzz_rho",
           "schema": "double",
           "unit": [
             {}
@@ -771,7 +771,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_epsilon;1",
+        "@id": "dtmi:example:yuzz_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -779,7 +779,7 @@
             "Telemetry",
             "Area"
           ],
-          "name": "sigma_delta",
+          "name": "yuzz_tau",
           "schema": "float",
           "unit": [
             {}
@@ -796,14 +796,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_eta;1",
+        "@id": "dtmi:example:yuzz_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "sigma_zeta",
+          "name": "yuzz_phi",
           "schema": "integer",
           "unit": [
             {}
@@ -820,7 +820,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_iota;1",
+        "@id": "dtmi:example:yuzz_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -828,7 +828,7 @@
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "sigma_theta",
+          "name": "yuzz_psi",
           "schema": "long",
           "unit": [
             {}
@@ -845,14 +845,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_lambda;1",
+        "@id": "dtmi:example:yuzz_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "sigma_kappa",
+          "name": "yuzz_yuzz",
           "schema": "double",
           "unit": []
         }
@@ -867,7 +867,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_nu;1",
+        "@id": "dtmi:example:yuzz_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -875,7 +875,7 @@
             "Telemetry",
             "Area"
           ],
-          "name": "sigma_mu",
+          "name": "yuzz_um",
           "schema": "float",
           "unit": []
         }
@@ -890,14 +890,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_omicron;1",
+        "@id": "dtmi:example:yuzz_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "sigma_xi",
+          "name": "yuzz_fuddle",
           "schema": "integer",
           "unit": []
         }
@@ -912,7 +912,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_rho;1",
+        "@id": "dtmi:example:yuzz_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -920,7 +920,7 @@
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "sigma_pi",
+          "name": "yuzz_nuh",
           "schema": "long",
           "unit": []
         }
@@ -935,14 +935,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_tau;1",
+        "@id": "dtmi:example:yuzz_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "sigma_sigma",
+          "name": "yuzz_quan",
           "schema": "double",
           "unit": "acre"
         }
@@ -957,14 +957,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_phi;1",
+        "@id": "dtmi:example:yuzz_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "sigma_upsilon",
+          "name": "yuzz_spazz",
           "schema": "float",
           "unit": "acre"
         }
@@ -979,14 +979,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_psi;1",
+        "@id": "dtmi:example:yuzz_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "sigma_chi",
+          "name": "yuzz_zatz",
           "schema": "integer",
           "unit": [
             "acre"
@@ -1003,14 +1003,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_yuzz;1",
+        "@id": "dtmi:example:yuzz_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "sigma_omega",
+          "name": "yuzz_flunn",
           "schema": "long",
           "unit": [
             "acre"
@@ -1027,14 +1027,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_um;1",
+        "@id": "dtmi:example:yuzz_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "sigma_wum",
+          "name": "yuzz_yekk",
           "schema": "double",
           "unit": [
             "acre",
@@ -1052,7 +1052,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_fuddle;1",
+        "@id": "dtmi:example:wum_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1060,7 +1060,7 @@
             "Telemetry",
             "Area"
           ],
-          "name": "sigma_humpf",
+          "name": "yuzz_hi",
           "schema": "float",
           "unit": [
             "acre",
@@ -1078,14 +1078,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_nuh;1",
+        "@id": "dtmi:example:wum_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "sigma_glikk",
+          "name": "wum_beta",
           "schema": "integer",
           "unit": [
             "acre",
@@ -1103,7 +1103,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_quan;1",
+        "@id": "dtmi:example:wum_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1111,7 +1111,7 @@
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "sigma_snee",
+          "name": "wum_delta",
           "schema": "long",
           "unit": [
             "acre",
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryCotypePropertyTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryCotypePropertyTermAndDtmiV2.json
index 764a50ed..b33eb812 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryCotypePropertyTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryCotypePropertyTermAndDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_zatz;1",
+        "@id": "dtmi:example:humpf_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "upsilon_floob",
+          "name": "humpf_theta",
           "schema": "double",
           "unit": "acre",
           "dtmi:dtdl:property:unit;2": "acre"
@@ -30,7 +30,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_flunn;1",
+        "@id": "dtmi:example:humpf_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -38,7 +38,7 @@
             "Telemetry",
             "Area"
           ],
-          "name": "upsilon_jogg",
+          "name": "humpf_kappa",
           "schema": "float",
           "unit": "acre",
           "dtmi:dtdl:property:unit;2": "acre"
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryCotypePropertyValueFromTableV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryCotypePropertyValueFromTableV2.json
index 6d9449bc..92a0bb5a 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryCotypePropertyValueFromTableV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryCotypePropertyValueFromTableV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_spazz;1",
+        "@id": "dtmi:example:wum_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "sigma_thnad",
+          "name": "wum_zeta",
           "schema": "double",
           "unit": "dtmi:foo//bar"
         }
@@ -29,7 +29,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_zatz;1",
+        "@id": "dtmi:example:wum_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -37,7 +37,7 @@
             "Telemetry",
             "Area"
           ],
-          "name": "sigma_floob",
+          "name": "wum_theta",
           "schema": "float",
           "unit": "dtmi:foo//bar"
         }
@@ -52,14 +52,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_flunn;1",
+        "@id": "dtmi:example:wum_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "sigma_jogg",
+          "name": "wum_kappa",
           "schema": "integer",
           "unit": "dtmi:foo//bar"
         }
@@ -74,7 +74,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_yekk;1",
+        "@id": "dtmi:example:wum_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -82,7 +82,7 @@
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "sigma_itch",
+          "name": "wum_mu",
           "schema": "long",
           "unit": "dtmi:foo//bar"
         }
@@ -97,14 +97,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:sigma_hi;1",
+        "@id": "dtmi:example:wum_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "sigma_vroo",
+          "name": "wum_xi",
           "schema": "double",
           "unit": "http://foo.com/bar"
         }
@@ -119,7 +119,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_beta;1",
+        "@id": "dtmi:example:wum_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -127,7 +127,7 @@
             "Telemetry",
             "Area"
           ],
-          "name": "tau_alpha",
+          "name": "wum_pi",
           "schema": "float",
           "unit": "http://foo.com/bar"
         }
@@ -142,14 +142,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_delta;1",
+        "@id": "dtmi:example:wum_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "tau_gamma",
+          "name": "wum_sigma",
           "schema": "integer",
           "unit": "http://foo.com/bar"
         }
@@ -164,7 +164,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_zeta;1",
+        "@id": "dtmi:example:wum_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -172,7 +172,7 @@
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "tau_epsilon",
+          "name": "wum_upsilon",
           "schema": "long",
           "unit": "http://foo.com/bar"
         }
@@ -187,14 +187,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_theta;1",
+        "@id": "dtmi:example:wum_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "tau_eta",
+          "name": "wum_chi",
           "schema": "double",
           "unit": "Foobar"
         }
@@ -209,7 +209,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_kappa;1",
+        "@id": "dtmi:example:wum_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -217,7 +217,7 @@
             "Telemetry",
             "Area"
           ],
-          "name": "tau_iota",
+          "name": "wum_omega",
           "schema": "float",
           "unit": "Foobar"
         }
@@ -232,14 +232,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_mu;1",
+        "@id": "dtmi:example:wum_um;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "tau_lambda",
+          "name": "wum_wum",
           "schema": "integer",
           "unit": "Foobar"
         }
@@ -254,7 +254,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_xi;1",
+        "@id": "dtmi:example:wum_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -262,7 +262,7 @@
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "tau_nu",
+          "name": "wum_humpf",
           "schema": "long",
           "unit": "Foobar"
         }
@@ -277,14 +277,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_pi;1",
+        "@id": "dtmi:example:wum_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "tau_omicron",
+          "name": "wum_glikk",
           "schema": "double",
           "unit": "dtmi:foo:bar;1"
         }
@@ -299,7 +299,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_sigma;1",
+        "@id": "dtmi:example:wum_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -307,7 +307,7 @@
             "Telemetry",
             "Area"
           ],
-          "name": "tau_rho",
+          "name": "wum_snee",
           "schema": "float",
           "unit": "dtmi:foo:bar;1"
         }
@@ -322,14 +322,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_upsilon;1",
+        "@id": "dtmi:example:wum_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "tau_tau",
+          "name": "wum_thnad",
           "schema": "integer",
           "unit": "dtmi:foo:bar;1"
         }
@@ -344,7 +344,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_chi;1",
+        "@id": "dtmi:example:wum_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -352,7 +352,7 @@
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "tau_phi",
+          "name": "wum_floob",
           "schema": "long",
           "unit": "dtmi:foo:bar;1"
         }
@@ -367,14 +367,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_omega;1",
+        "@id": "dtmi:example:wum_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "tau_psi",
+          "name": "wum_jogg",
           "schema": "double",
           "unit": "boolean"
         }
@@ -389,7 +389,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_wum;1",
+        "@id": "dtmi:example:wum_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -397,7 +397,7 @@
             "Telemetry",
             "Area"
           ],
-          "name": "tau_yuzz",
+          "name": "wum_itch",
           "schema": "float",
           "unit": "boolean"
         }
@@ -412,14 +412,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_humpf;1",
+        "@id": "dtmi:example:wum_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "tau_um",
+          "name": "wum_vroo",
           "schema": "integer",
           "unit": "boolean"
         }
@@ -434,7 +434,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_glikk;1",
+        "@id": "dtmi:example:um_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -442,7 +442,7 @@
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "tau_fuddle",
+          "name": "um_alpha",
           "schema": "long",
           "unit": "boolean"
         }
@@ -457,14 +457,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_snee;1",
+        "@id": "dtmi:example:um_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "tau_nuh",
+          "name": "um_gamma",
           "schema": "double",
           "unit": "acre"
         }
@@ -479,14 +479,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_thnad;1",
+        "@id": "dtmi:example:um_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "tau_quan",
+          "name": "um_epsilon",
           "schema": "float",
           "unit": "acre"
         }
@@ -501,14 +501,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_floob;1",
+        "@id": "dtmi:example:um_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "tau_spazz",
+          "name": "um_eta",
           "schema": "integer",
           "unit": "dtmi:standard:unit:acre;2"
         }
@@ -523,14 +523,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:tau_jogg;1",
+        "@id": "dtmi:example:um_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "tau_zatz",
+          "name": "um_iota",
           "schema": "long",
           "unit": "dtmi:standard:unit:acre;2"
         }
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryCotypePropertyValueMatchesCotypeV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryCotypePropertyValueMatchesCotypeV2.json
index 117b4d01..ab31f7a6 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryCotypePropertyValueMatchesCotypeV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryCotypePropertyValueMatchesCotypeV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_epsilon;1",
+        "@id": "dtmi:example:um_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "upsilon_delta",
+          "name": "um_tau",
           "schema": "double",
           "unit": "acre"
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_eta;1",
+        "@id": "dtmi:example:um_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "upsilon_zeta",
+          "name": "um_phi",
           "schema": "float",
           "unit": "acre"
         }
@@ -51,14 +51,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_iota;1",
+        "@id": "dtmi:example:um_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "upsilon_theta",
+          "name": "um_psi",
           "schema": "integer",
           "unit": "dtmi:standard:unit:acre;2"
         }
@@ -73,14 +73,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_lambda;1",
+        "@id": "dtmi:example:um_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "upsilon_kappa",
+          "name": "um_yuzz",
           "schema": "long",
           "unit": "dtmi:standard:unit:acre;2"
         }
@@ -95,14 +95,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_nu;1",
+        "@id": "dtmi:example:um_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "upsilon_mu",
+          "name": "um_um",
           "schema": "double",
           "unit": "farad"
         }
@@ -117,7 +117,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_omicron;1",
+        "@id": "dtmi:example:um_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -125,7 +125,7 @@
             "Telemetry",
             "Area"
           ],
-          "name": "upsilon_xi",
+          "name": "um_fuddle",
           "schema": "float",
           "unit": "farad"
         }
@@ -140,14 +140,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_rho;1",
+        "@id": "dtmi:example:um_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "upsilon_pi",
+          "name": "um_nuh",
           "schema": "integer",
           "unit": "farad"
         }
@@ -162,7 +162,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_tau;1",
+        "@id": "dtmi:example:um_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -170,7 +170,7 @@
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "upsilon_sigma",
+          "name": "um_quan",
           "schema": "long",
           "unit": "farad"
         }
@@ -185,14 +185,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_phi;1",
+        "@id": "dtmi:example:um_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Area"
           ],
-          "name": "upsilon_upsilon",
+          "name": "um_spazz",
           "schema": "double",
           "unit": "dtmi:standard:unit:farad;2"
         }
@@ -207,7 +207,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_psi;1",
+        "@id": "dtmi:example:um_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -215,7 +215,7 @@
             "Telemetry",
             "Area"
           ],
-          "name": "upsilon_chi",
+          "name": "um_zatz",
           "schema": "float",
           "unit": "dtmi:standard:unit:farad;2"
         }
@@ -230,14 +230,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_yuzz;1",
+        "@id": "dtmi:example:um_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "upsilon_omega",
+          "name": "um_flunn",
           "schema": "integer",
           "unit": "dtmi:standard:unit:farad;2"
         }
@@ -252,7 +252,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:upsilon_um;1",
+        "@id": "dtmi:example:um_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -260,7 +260,7 @@
             "Telemetry",
             "dtmi:standard:class:Area;2"
           ],
-          "name": "upsilon_wum",
+          "name": "um_yekk",
           "schema": "long",
           "unit": "dtmi:standard:unit:farad;2"
         }
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryCotypeRequiresPropertySchemaValueV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryCotypeRequiresPropertySchemaValueV2.json
index 4db52bfb..38108281 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryCotypeRequiresPropertySchemaValueV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryCotypeRequiresPropertySchemaValueV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_psi;1",
+        "@id": "dtmi:example:kappa_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "MagneticInduction"
           ],
-          "name": "gamma_chi",
+          "name": "kappa_nuh",
           "schema": "asynchronous",
           "unit": "tesla"
         }
@@ -29,7 +29,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_yuzz;1",
+        "@id": "dtmi:example:kappa_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -37,7 +37,7 @@
             "Telemetry",
             "MagneticInduction"
           ],
-          "name": "gamma_omega",
+          "name": "kappa_quan",
           "schema": "asynchronous",
           "unit": "tesla"
         }
@@ -52,14 +52,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_um;1",
+        "@id": "dtmi:example:kappa_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "MagneticInduction"
           ],
-          "name": "gamma_wum",
+          "name": "kappa_spazz",
           "schema": "dtmi:dtdl:instance:CommandType:asynchronous;2",
           "unit": "tesla"
         }
@@ -74,7 +74,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_fuddle;1",
+        "@id": "dtmi:example:kappa_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -82,7 +82,7 @@
             "Telemetry",
             "MagneticInduction"
           ],
-          "name": "gamma_humpf",
+          "name": "kappa_zatz",
           "schema": "dtmi:dtdl:instance:CommandType:asynchronous;2",
           "unit": "tesla"
         }
@@ -97,14 +97,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_nuh;1",
+        "@id": "dtmi:example:kappa_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Mass"
           ],
-          "name": "gamma_glikk",
+          "name": "kappa_flunn",
           "schema": "synchronous",
           "unit": "gram"
         }
@@ -119,7 +119,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_quan;1",
+        "@id": "dtmi:example:kappa_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -127,7 +127,7 @@
             "Telemetry",
             "Mass"
           ],
-          "name": "gamma_snee",
+          "name": "kappa_yekk",
           "schema": "synchronous",
           "unit": "gram"
         }
@@ -142,14 +142,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_spazz;1",
+        "@id": "dtmi:example:lambda_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Mass"
           ],
-          "name": "gamma_thnad",
+          "name": "kappa_hi",
           "schema": "dtmi:dtdl:instance:CommandType:synchronous;2",
           "unit": "gram"
         }
@@ -164,7 +164,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_zatz;1",
+        "@id": "dtmi:example:lambda_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -172,7 +172,7 @@
             "Telemetry",
             "Mass"
           ],
-          "name": "gamma_floob",
+          "name": "lambda_beta",
           "schema": "dtmi:dtdl:instance:CommandType:synchronous;2",
           "unit": "gram"
         }
@@ -187,14 +187,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_flunn;1",
+        "@id": "dtmi:example:lambda_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "MassFlowRate"
           ],
-          "name": "gamma_jogg",
+          "name": "lambda_delta",
           "schema": "boolean",
           "unit": "gramPerHour"
         }
@@ -209,7 +209,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_yekk;1",
+        "@id": "dtmi:example:lambda_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -217,7 +217,7 @@
             "Telemetry",
             "MassFlowRate"
           ],
-          "name": "gamma_itch",
+          "name": "lambda_zeta",
           "schema": "boolean",
           "unit": "gramPerHour"
         }
@@ -232,14 +232,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_hi;1",
+        "@id": "dtmi:example:lambda_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "MassFlowRate"
           ],
-          "name": "gamma_vroo",
+          "name": "lambda_theta",
           "schema": "dtmi:dtdl:instance:Schema:boolean;2",
           "unit": "gramPerHour"
         }
@@ -254,7 +254,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_beta;1",
+        "@id": "dtmi:example:lambda_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -262,7 +262,7 @@
             "Telemetry",
             "MassFlowRate"
           ],
-          "name": "delta_alpha",
+          "name": "lambda_kappa",
           "schema": "dtmi:dtdl:instance:Schema:boolean;2",
           "unit": "gramPerHour"
         }
@@ -277,14 +277,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_delta;1",
+        "@id": "dtmi:example:lambda_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Power"
           ],
-          "name": "delta_gamma",
+          "name": "lambda_mu",
           "schema": "date",
           "unit": "gigawatt"
         }
@@ -299,7 +299,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_zeta;1",
+        "@id": "dtmi:example:lambda_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -307,7 +307,7 @@
             "Telemetry",
             "Power"
           ],
-          "name": "delta_epsilon",
+          "name": "lambda_xi",
           "schema": "date",
           "unit": "gigawatt"
         }
@@ -322,14 +322,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_theta;1",
+        "@id": "dtmi:example:lambda_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Power"
           ],
-          "name": "delta_eta",
+          "name": "lambda_pi",
           "schema": "dtmi:dtdl:instance:Schema:date;2",
           "unit": "gigawatt"
         }
@@ -344,7 +344,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_kappa;1",
+        "@id": "dtmi:example:lambda_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -352,7 +352,7 @@
             "Telemetry",
             "Power"
           ],
-          "name": "delta_iota",
+          "name": "lambda_sigma",
           "schema": "dtmi:dtdl:instance:Schema:date;2",
           "unit": "gigawatt"
         }
@@ -367,14 +367,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_mu;1",
+        "@id": "dtmi:example:lambda_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Pressure"
           ],
-          "name": "delta_lambda",
+          "name": "lambda_upsilon",
           "schema": "dateTime",
           "unit": "bar"
         }
@@ -389,7 +389,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_xi;1",
+        "@id": "dtmi:example:lambda_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -397,7 +397,7 @@
             "Telemetry",
             "Pressure"
           ],
-          "name": "delta_nu",
+          "name": "lambda_chi",
           "schema": "dateTime",
           "unit": "bar"
         }
@@ -412,14 +412,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_pi;1",
+        "@id": "dtmi:example:lambda_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Pressure"
           ],
-          "name": "delta_omicron",
+          "name": "lambda_omega",
           "schema": "dtmi:dtdl:instance:Schema:dateTime;2",
           "unit": "bar"
         }
@@ -434,7 +434,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_sigma;1",
+        "@id": "dtmi:example:lambda_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -442,7 +442,7 @@
             "Telemetry",
             "Pressure"
           ],
-          "name": "delta_rho",
+          "name": "lambda_wum",
           "schema": "dtmi:dtdl:instance:Schema:dateTime;2",
           "unit": "bar"
         }
@@ -457,14 +457,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_upsilon;1",
+        "@id": "dtmi:example:lambda_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "RelativeHumidity"
           ],
-          "name": "delta_tau",
+          "name": "lambda_humpf",
           "schema": "double",
           "unit": "percent"
         }
@@ -479,14 +479,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_chi;1",
+        "@id": "dtmi:example:lambda_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "RelativeHumidity"
           ],
-          "name": "delta_phi",
+          "name": "lambda_glikk",
           "schema": "dtmi:dtdl:instance:Schema:double;2",
           "unit": "percent"
         }
@@ -501,14 +501,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_omega;1",
+        "@id": "dtmi:example:lambda_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Resistance"
           ],
-          "name": "delta_psi",
+          "name": "lambda_snee",
           "schema": "duration",
           "unit": "kiloohm"
         }
@@ -523,7 +523,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_wum;1",
+        "@id": "dtmi:example:lambda_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -531,7 +531,7 @@
             "Telemetry",
             "Resistance"
           ],
-          "name": "delta_yuzz",
+          "name": "lambda_thnad",
           "schema": "duration",
           "unit": "kiloohm"
         }
@@ -546,14 +546,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_humpf;1",
+        "@id": "dtmi:example:lambda_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Resistance"
           ],
-          "name": "delta_um",
+          "name": "lambda_floob",
           "schema": "dtmi:dtdl:instance:Schema:duration;2",
           "unit": "kiloohm"
         }
@@ -568,7 +568,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_glikk;1",
+        "@id": "dtmi:example:lambda_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -576,7 +576,7 @@
             "Telemetry",
             "Resistance"
           ],
-          "name": "delta_fuddle",
+          "name": "lambda_jogg",
           "schema": "dtmi:dtdl:instance:Schema:duration;2",
           "unit": "kiloohm"
         }
@@ -591,14 +591,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_snee;1",
+        "@id": "dtmi:example:lambda_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "SoundPressure"
           ],
-          "name": "delta_nuh",
+          "name": "lambda_itch",
           "schema": "float",
           "unit": "bel"
         }
@@ -613,14 +613,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_thnad;1",
+        "@id": "dtmi:example:lambda_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "SoundPressure"
           ],
-          "name": "delta_quan",
+          "name": "lambda_vroo",
           "schema": "dtmi:dtdl:instance:Schema:float;2",
           "unit": "bel"
         }
@@ -635,14 +635,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_floob;1",
+        "@id": "dtmi:example:mu_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Temperature"
           ],
-          "name": "delta_spazz",
+          "name": "mu_alpha",
           "schema": "integer",
           "unit": "degreeCelsius"
         }
@@ -657,14 +657,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_jogg;1",
+        "@id": "dtmi:example:mu_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Temperature"
           ],
-          "name": "delta_zatz",
+          "name": "mu_gamma",
           "schema": "dtmi:dtdl:instance:Schema:integer;2",
           "unit": "degreeCelsius"
         }
@@ -679,14 +679,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_itch;1",
+        "@id": "dtmi:example:mu_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Thrust"
           ],
-          "name": "delta_flunn",
+          "name": "mu_epsilon",
           "schema": "long",
           "unit": "newton"
         }
@@ -701,14 +701,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:delta_vroo;1",
+        "@id": "dtmi:example:mu_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Thrust"
           ],
-          "name": "delta_yekk",
+          "name": "mu_eta",
           "schema": "dtmi:dtdl:instance:Schema:long;2",
           "unit": "newton"
         }
@@ -723,14 +723,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_alpha;1",
+        "@id": "dtmi:example:mu_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "TimeSpan"
           ],
-          "name": "delta_hi",
+          "name": "mu_iota",
           "schema": "string",
           "unit": "day"
         }
@@ -745,7 +745,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_gamma;1",
+        "@id": "dtmi:example:mu_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -753,7 +753,7 @@
             "Telemetry",
             "TimeSpan"
           ],
-          "name": "epsilon_beta",
+          "name": "mu_lambda",
           "schema": "string",
           "unit": "day"
         }
@@ -768,14 +768,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_epsilon;1",
+        "@id": "dtmi:example:mu_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "TimeSpan"
           ],
-          "name": "epsilon_delta",
+          "name": "mu_nu",
           "schema": "dtmi:dtdl:instance:Schema:string;2",
           "unit": "day"
         }
@@ -790,7 +790,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_eta;1",
+        "@id": "dtmi:example:mu_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -798,7 +798,7 @@
             "Telemetry",
             "TimeSpan"
           ],
-          "name": "epsilon_zeta",
+          "name": "mu_omicron",
           "schema": "dtmi:dtdl:instance:Schema:string;2",
           "unit": "day"
         }
@@ -813,14 +813,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_iota;1",
+        "@id": "dtmi:example:mu_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Torque"
           ],
-          "name": "epsilon_theta",
+          "name": "mu_rho",
           "schema": "time",
           "unit": "newtonMetre"
         }
@@ -835,7 +835,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_lambda;1",
+        "@id": "dtmi:example:mu_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -843,7 +843,7 @@
             "Telemetry",
             "Torque"
           ],
-          "name": "epsilon_kappa",
+          "name": "mu_tau",
           "schema": "time",
           "unit": "newtonMetre"
         }
@@ -858,14 +858,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_nu;1",
+        "@id": "dtmi:example:mu_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Torque"
           ],
-          "name": "epsilon_mu",
+          "name": "mu_phi",
           "schema": "dtmi:dtdl:instance:Schema:time;2",
           "unit": "newtonMetre"
         }
@@ -880,7 +880,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_omicron;1",
+        "@id": "dtmi:example:mu_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -888,7 +888,7 @@
             "Telemetry",
             "Torque"
           ],
-          "name": "epsilon_xi",
+          "name": "mu_psi",
           "schema": "dtmi:dtdl:instance:Schema:time;2",
           "unit": "newtonMetre"
         }
@@ -903,14 +903,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_rho;1",
+        "@id": "dtmi:example:mu_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Velocity"
           ],
-          "name": "epsilon_pi",
+          "name": "mu_yuzz",
           "schema": "geopoint",
           "unit": "centimetrePerSecond"
         }
@@ -925,7 +925,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_tau;1",
+        "@id": "dtmi:example:mu_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -933,7 +933,7 @@
             "Telemetry",
             "Velocity"
           ],
-          "name": "epsilon_sigma",
+          "name": "mu_um",
           "schema": "geopoint",
           "unit": "centimetrePerSecond"
         }
@@ -948,14 +948,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_phi;1",
+        "@id": "dtmi:example:mu_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Velocity"
           ],
-          "name": "epsilon_upsilon",
+          "name": "mu_fuddle",
           "schema": "dtmi:iotcentral:schema:geopoint;2",
           "unit": "centimetrePerSecond"
         }
@@ -970,7 +970,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_psi;1",
+        "@id": "dtmi:example:mu_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -978,7 +978,7 @@
             "Telemetry",
             "Velocity"
           ],
-          "name": "epsilon_chi",
+          "name": "mu_nuh",
           "schema": "dtmi:iotcentral:schema:geopoint;2",
           "unit": "centimetrePerSecond"
         }
@@ -993,14 +993,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_yuzz;1",
+        "@id": "dtmi:example:mu_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Voltage"
           ],
-          "name": "epsilon_omega",
+          "name": "mu_quan",
           "schema": "vector",
           "unit": "kilovolt"
         }
@@ -1015,7 +1015,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_um;1",
+        "@id": "dtmi:example:mu_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1023,7 +1023,7 @@
             "Telemetry",
             "Voltage"
           ],
-          "name": "epsilon_wum",
+          "name": "mu_spazz",
           "schema": "vector",
           "unit": "kilovolt"
         }
@@ -1038,14 +1038,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_fuddle;1",
+        "@id": "dtmi:example:mu_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Voltage"
           ],
-          "name": "epsilon_humpf",
+          "name": "mu_zatz",
           "schema": "dtmi:iotcentral:schema:vector;2",
           "unit": "kilovolt"
         }
@@ -1060,7 +1060,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_nuh;1",
+        "@id": "dtmi:example:mu_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1068,7 +1068,7 @@
             "Telemetry",
             "Voltage"
           ],
-          "name": "epsilon_glikk",
+          "name": "mu_flunn",
           "schema": "dtmi:iotcentral:schema:vector;2",
           "unit": "kilovolt"
         }
@@ -1083,14 +1083,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_quan;1",
+        "@id": "dtmi:example:mu_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Volume"
           ],
-          "name": "epsilon_snee",
+          "name": "mu_yekk",
           "schema": "lineString",
           "unit": "cubicCentimetre"
         }
@@ -1105,7 +1105,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_spazz;1",
+        "@id": "dtmi:example:nu_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1113,7 +1113,7 @@
             "Telemetry",
             "Volume"
           ],
-          "name": "epsilon_thnad",
+          "name": "mu_hi",
           "schema": "lineString",
           "unit": "cubicCentimetre"
         }
@@ -1128,14 +1128,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_zatz;1",
+        "@id": "dtmi:example:nu_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Volume"
           ],
-          "name": "epsilon_floob",
+          "name": "nu_beta",
           "schema": "dtmi:standard:schema:geospatial:lineString;2",
           "unit": "cubicCentimetre"
         }
@@ -1150,7 +1150,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_flunn;1",
+        "@id": "dtmi:example:nu_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1158,7 +1158,7 @@
             "Telemetry",
             "Volume"
           ],
-          "name": "epsilon_jogg",
+          "name": "nu_delta",
           "schema": "dtmi:standard:schema:geospatial:lineString;2",
           "unit": "cubicCentimetre"
         }
@@ -1173,14 +1173,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_yekk;1",
+        "@id": "dtmi:example:nu_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "VolumeFlowRate"
           ],
-          "name": "epsilon_itch",
+          "name": "nu_zeta",
           "schema": "multiLineString",
           "unit": "litrePerHour"
         }
@@ -1195,7 +1195,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:epsilon_hi;1",
+        "@id": "dtmi:example:nu_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1203,7 +1203,7 @@
             "Telemetry",
             "VolumeFlowRate"
           ],
-          "name": "epsilon_vroo",
+          "name": "nu_theta",
           "schema": "multiLineString",
           "unit": "litrePerHour"
         }
@@ -1218,14 +1218,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_beta;1",
+        "@id": "dtmi:example:nu_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "VolumeFlowRate"
           ],
-          "name": "zeta_alpha",
+          "name": "nu_kappa",
           "schema": "dtmi:standard:schema:geospatial:multiLineString;2",
           "unit": "litrePerHour"
         }
@@ -1240,7 +1240,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_delta;1",
+        "@id": "dtmi:example:nu_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1248,7 +1248,7 @@
             "Telemetry",
             "VolumeFlowRate"
           ],
-          "name": "zeta_gamma",
+          "name": "nu_mu",
           "schema": "dtmi:standard:schema:geospatial:multiLineString;2",
           "unit": "litrePerHour"
         }
@@ -1263,14 +1263,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_zeta;1",
+        "@id": "dtmi:example:nu_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Acceleration"
           ],
-          "name": "zeta_epsilon",
+          "name": "nu_xi",
           "schema": "multiPoint",
           "unit": "centimetrePerSecondSquared"
         }
@@ -1285,7 +1285,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_theta;1",
+        "@id": "dtmi:example:nu_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1293,7 +1293,7 @@
             "Telemetry",
             "Acceleration"
           ],
-          "name": "zeta_eta",
+          "name": "nu_pi",
           "schema": "multiPoint",
           "unit": "centimetrePerSecondSquared"
         }
@@ -1308,14 +1308,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_kappa;1",
+        "@id": "dtmi:example:nu_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Acceleration"
           ],
-          "name": "zeta_iota",
+          "name": "nu_sigma",
           "schema": "dtmi:standard:schema:geospatial:multiPoint;2",
           "unit": "centimetrePerSecondSquared"
         }
@@ -1330,7 +1330,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_mu;1",
+        "@id": "dtmi:example:nu_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1338,7 +1338,7 @@
             "Telemetry",
             "Acceleration"
           ],
-          "name": "zeta_lambda",
+          "name": "nu_upsilon",
           "schema": "dtmi:standard:schema:geospatial:multiPoint;2",
           "unit": "centimetrePerSecondSquared"
         }
@@ -1353,14 +1353,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_xi;1",
+        "@id": "dtmi:example:nu_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Angle"
           ],
-          "name": "zeta_nu",
+          "name": "nu_chi",
           "schema": "multiPolygon",
           "unit": "degreeOfArc"
         }
@@ -1375,7 +1375,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_pi;1",
+        "@id": "dtmi:example:nu_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1383,7 +1383,7 @@
             "Telemetry",
             "Angle"
           ],
-          "name": "zeta_omicron",
+          "name": "nu_omega",
           "schema": "multiPolygon",
           "unit": "degreeOfArc"
         }
@@ -1398,14 +1398,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_sigma;1",
+        "@id": "dtmi:example:nu_um;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Angle"
           ],
-          "name": "zeta_rho",
+          "name": "nu_wum",
           "schema": "dtmi:standard:schema:geospatial:multiPolygon;2",
           "unit": "degreeOfArc"
         }
@@ -1420,7 +1420,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_upsilon;1",
+        "@id": "dtmi:example:nu_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1428,7 +1428,7 @@
             "Telemetry",
             "Angle"
           ],
-          "name": "zeta_tau",
+          "name": "nu_humpf",
           "schema": "dtmi:standard:schema:geospatial:multiPolygon;2",
           "unit": "degreeOfArc"
         }
@@ -1443,14 +1443,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_chi;1",
+        "@id": "dtmi:example:nu_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "AngularAcceleration"
           ],
-          "name": "zeta_phi",
+          "name": "nu_glikk",
           "schema": "point",
           "unit": "radianPerSecondSquared"
         }
@@ -1465,7 +1465,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_omega;1",
+        "@id": "dtmi:example:nu_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1473,7 +1473,7 @@
             "Telemetry",
             "AngularAcceleration"
           ],
-          "name": "zeta_psi",
+          "name": "nu_snee",
           "schema": "point",
           "unit": "radianPerSecondSquared"
         }
@@ -1488,14 +1488,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_wum;1",
+        "@id": "dtmi:example:nu_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "AngularAcceleration"
           ],
-          "name": "zeta_yuzz",
+          "name": "nu_thnad",
           "schema": "dtmi:standard:schema:geospatial:point;2",
           "unit": "radianPerSecondSquared"
         }
@@ -1510,7 +1510,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_humpf;1",
+        "@id": "dtmi:example:nu_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1518,7 +1518,7 @@
             "Telemetry",
             "AngularAcceleration"
           ],
-          "name": "zeta_um",
+          "name": "nu_floob",
           "schema": "dtmi:standard:schema:geospatial:point;2",
           "unit": "radianPerSecondSquared"
         }
@@ -1533,14 +1533,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_glikk;1",
+        "@id": "dtmi:example:nu_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "AngularVelocity"
           ],
-          "name": "zeta_fuddle",
+          "name": "nu_jogg",
           "schema": "polygon",
           "unit": "degreePerSecond"
         }
@@ -1555,7 +1555,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_snee;1",
+        "@id": "dtmi:example:nu_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1563,7 +1563,7 @@
             "Telemetry",
             "AngularVelocity"
           ],
-          "name": "zeta_nuh",
+          "name": "nu_itch",
           "schema": "polygon",
           "unit": "degreePerSecond"
         }
@@ -1578,14 +1578,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_thnad;1",
+        "@id": "dtmi:example:nu_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "AngularVelocity"
           ],
-          "name": "zeta_quan",
+          "name": "nu_vroo",
           "schema": "dtmi:standard:schema:geospatial:polygon;2",
           "unit": "degreePerSecond"
         }
@@ -1600,7 +1600,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zeta_floob;1",
+        "@id": "dtmi:example:xi_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -1608,7 +1608,7 @@
             "Telemetry",
             "AngularVelocity"
           ],
-          "name": "zeta_spazz",
+          "name": "xi_alpha",
           "schema": "dtmi:standard:schema:geospatial:polygon;2",
           "unit": "degreePerSecond"
         }
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryGraphKeywordV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryGraphKeywordV2.json
index 26f852f9..0e0cf9f3 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryGraphKeywordV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryGraphKeywordV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_omicron;1",
+        "@id": "dtmi:example:psi_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "pi_xi",
-          "schema": "time",
+          "name": "psi_fuddle",
+          "schema": "date",
           "@graph": {}
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_rho;1",
+        "@id": "dtmi:example:psi_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "pi_pi",
-          "schema": "boolean",
+          "name": "psi_nuh",
+          "schema": "dateTime",
           "@graph": {}
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryIdDuplicateV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryIdDuplicateV2.json
index 4a43db8b..19f4f254 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryIdDuplicateV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryIdDuplicateV2.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_sigma;1",
+        "@id": "dtmi:example:sigma_quan;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:lambda_sigma;1",
+          "@id": "dtmi:example:sigma_quan;1",
           "@type": "Interface",
           "contents": {
-            "@id": "dtmi:example:lambda_sigma;1",
+            "@id": "dtmi:example:sigma_quan;1",
             "@type": "Telemetry",
-            "name": "lambda_tau",
-            "schema": "duration"
+            "name": "sigma_thnad",
+            "schema": "integer"
           }
         }
       }
@@ -30,17 +30,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_upsilon;1",
+        "@id": "dtmi:example:sigma_spazz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:lambda_upsilon;1",
+          "@id": "dtmi:example:sigma_spazz;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "@id": "dtmi:example:lambda_upsilon;1",
+            "@id": "dtmi:example:sigma_spazz;1",
             "@type": "Telemetry",
-            "name": "lambda_phi",
-            "schema": "float"
+            "name": "sigma_floob",
+            "schema": "long"
           }
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryIdIsDtmiV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryIdIsDtmiV2.json
index 3719c2bf..84e697c8 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryIdIsDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryIdIsDtmiV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_pi;1",
+        "@id": "dtmi:example:omicron_nuh;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;7",
           "@type": "Telemetry",
-          "name": "theta_omicron",
-          "schema": "string"
+          "name": "omicron_glikk",
+          "schema": "boolean"
         }
       }
     ]
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_sigma;1",
+        "@id": "dtmi:example:omicron_quan;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;108675309",
           "@type": "Telemetry",
-          "name": "theta_rho",
-          "schema": "time"
+          "name": "omicron_snee",
+          "schema": "date"
         }
       }
     ]
@@ -45,13 +45,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_upsilon;1",
+        "@id": "dtmi:example:omicron_spazz;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;999999999",
           "@type": "Telemetry",
-          "name": "theta_tau",
-          "schema": "boolean"
+          "name": "omicron_thnad",
+          "schema": "dateTime"
         }
       }
     ]
@@ -64,13 +64,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_chi;1",
+        "@id": "dtmi:example:omicron_zatz;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo;1",
           "@type": "Telemetry",
-          "name": "theta_phi",
-          "schema": "date"
+          "name": "omicron_floob",
+          "schema": "double"
         }
       }
     ]
@@ -83,13 +83,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_omega;1",
+        "@id": "dtmi:example:omicron_flunn;1",
         "@type": "Interface",
         "contents": {
           "@id": null,
           "@type": "Telemetry",
-          "name": "theta_psi",
-          "schema": "dateTime"
+          "name": "omicron_jogg",
+          "schema": "duration"
         }
       }
     ]
@@ -102,14 +102,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_wum;1",
+        "@id": "dtmi:example:omicron_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": null,
           "@type": "Telemetry",
-          "name": "theta_yuzz",
-          "schema": "double"
+          "name": "omicron_itch",
+          "schema": "float"
         }
       }
     ]
@@ -122,13 +122,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_humpf;1",
+        "@id": "dtmi:example:omicron_hi;1",
         "@type": "Interface",
         "contents": {
           "@id": 626,
           "@type": "Telemetry",
-          "name": "theta_um",
-          "schema": "duration"
+          "name": "omicron_vroo",
+          "schema": "integer"
         }
       }
     ]
@@ -141,14 +141,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_glikk;1",
+        "@id": "dtmi:example:pi_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": 626,
           "@type": "Telemetry",
-          "name": "theta_fuddle",
-          "schema": "float"
+          "name": "pi_alpha",
+          "schema": "long"
         }
       }
     ]
@@ -161,13 +161,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_snee;1",
+        "@id": "dtmi:example:pi_delta;1",
         "@type": "Interface",
         "contents": {
           "@id": true,
           "@type": "Telemetry",
-          "name": "theta_nuh",
-          "schema": "integer"
+          "name": "pi_gamma",
+          "schema": "string"
         }
       }
     ]
@@ -180,14 +180,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_thnad;1",
+        "@id": "dtmi:example:pi_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": true,
           "@type": "Telemetry",
-          "name": "theta_quan",
-          "schema": "long"
+          "name": "pi_epsilon",
+          "schema": "time"
         }
       }
     ]
@@ -200,15 +200,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_floob;1",
+        "@id": "dtmi:example:pi_theta;1",
         "@type": "Interface",
         "contents": {
           "@id": {
             "@value": "dtmi:apparently:valid:identifier;3"
           },
           "@type": "Telemetry",
-          "name": "theta_spazz",
-          "schema": "string"
+          "name": "pi_eta",
+          "schema": "boolean"
         }
       }
     ]
@@ -221,7 +221,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_jogg;1",
+        "@id": "dtmi:example:pi_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -229,8 +229,8 @@
             "@value": "dtmi:apparently:valid:identifier;3"
           },
           "@type": "Telemetry",
-          "name": "theta_zatz",
-          "schema": "time"
+          "name": "pi_iota",
+          "schema": "date"
         }
       }
     ]
@@ -243,13 +243,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_itch;1",
+        "@id": "dtmi:example:pi_mu;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0",
           "@type": "Telemetry",
-          "name": "theta_flunn",
-          "schema": "boolean"
+          "name": "pi_lambda",
+          "schema": "dateTime"
         }
       }
     ]
@@ -262,14 +262,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:theta_vroo;1",
+        "@id": "dtmi:example:pi_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0",
           "@type": "Telemetry",
-          "name": "theta_yekk",
-          "schema": "date"
+          "name": "pi_nu",
+          "schema": "double"
         }
       }
     ]
@@ -282,13 +282,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_alpha;1",
+        "@id": "dtmi:example:pi_pi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Telemetry",
-          "name": "theta_hi",
-          "schema": "dateTime"
+          "name": "pi_omicron",
+          "schema": "duration"
         }
       }
     ]
@@ -301,14 +301,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_gamma;1",
+        "@id": "dtmi:example:pi_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Telemetry",
-          "name": "iota_beta",
-          "schema": "double"
+          "name": "pi_rho",
+          "schema": "float"
         }
       }
     ]
@@ -321,13 +321,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_epsilon;1",
+        "@id": "dtmi:example:pi_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Telemetry",
-          "name": "iota_delta",
-          "schema": "duration"
+          "name": "pi_tau",
+          "schema": "integer"
         }
       }
     ]
@@ -340,14 +340,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_eta;1",
+        "@id": "dtmi:example:pi_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Telemetry",
-          "name": "iota_zeta",
-          "schema": "float"
+          "name": "pi_phi",
+          "schema": "long"
         }
       }
     ]
@@ -360,13 +360,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_iota;1",
+        "@id": "dtmi:example:pi_omega;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;1a",
           "@type": "Telemetry",
-          "name": "iota_theta",
-          "schema": "integer"
+          "name": "pi_psi",
+          "schema": "string"
         }
       }
     ]
@@ -379,14 +379,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_lambda;1",
+        "@id": "dtmi:example:pi_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1a",
           "@type": "Telemetry",
-          "name": "iota_kappa",
-          "schema": "long"
+          "name": "pi_yuzz",
+          "schema": "time"
         }
       }
     ]
@@ -399,13 +399,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_nu;1",
+        "@id": "dtmi:example:pi_humpf;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Telemetry",
-          "name": "iota_mu",
-          "schema": "string"
+          "name": "pi_um",
+          "schema": "boolean"
         }
       }
     ]
@@ -418,14 +418,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_omicron;1",
+        "@id": "dtmi:example:pi_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Telemetry",
-          "name": "iota_xi",
-          "schema": "time"
+          "name": "pi_fuddle",
+          "schema": "date"
         }
       }
     ]
@@ -438,13 +438,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_rho;1",
+        "@id": "dtmi:example:pi_snee;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Telemetry",
-          "name": "iota_pi",
-          "schema": "boolean"
+          "name": "pi_nuh",
+          "schema": "dateTime"
         }
       }
     ]
@@ -457,14 +457,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_tau;1",
+        "@id": "dtmi:example:pi_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Telemetry",
-          "name": "iota_sigma",
-          "schema": "date"
+          "name": "pi_quan",
+          "schema": "double"
         }
       }
     ]
@@ -477,13 +477,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_phi;1",
+        "@id": "dtmi:example:pi_floob;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Telemetry",
-          "name": "iota_upsilon",
-          "schema": "dateTime"
+          "name": "pi_spazz",
+          "schema": "duration"
         }
       }
     ]
@@ -496,14 +496,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_psi;1",
+        "@id": "dtmi:example:pi_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Telemetry",
-          "name": "iota_chi",
-          "schema": "double"
+          "name": "pi_zatz",
+          "schema": "float"
         }
       }
     ]
@@ -516,13 +516,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_yuzz;1",
+        "@id": "dtmi:example:pi_itch;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Telemetry",
-          "name": "iota_omega",
-          "schema": "duration"
+          "name": "pi_flunn",
+          "schema": "integer"
         }
       }
     ]
@@ -535,14 +535,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_um;1",
+        "@id": "dtmi:example:pi_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Telemetry",
-          "name": "iota_wum",
-          "schema": "float"
+          "name": "pi_yekk",
+          "schema": "long"
         }
       }
     ]
@@ -555,13 +555,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_fuddle;1",
+        "@id": "dtmi:example:rho_alpha;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;01",
           "@type": "Telemetry",
-          "name": "iota_humpf",
-          "schema": "integer"
+          "name": "pi_hi",
+          "schema": "string"
         }
       }
     ]
@@ -574,14 +574,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_nuh;1",
+        "@id": "dtmi:example:rho_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;01",
           "@type": "Telemetry",
-          "name": "iota_glikk",
-          "schema": "long"
+          "name": "rho_beta",
+          "schema": "time"
         }
       }
     ]
@@ -594,13 +594,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_quan;1",
+        "@id": "dtmi:example:rho_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;",
           "@type": "Telemetry",
-          "name": "iota_snee",
-          "schema": "string"
+          "name": "rho_delta",
+          "schema": "boolean"
         }
       }
     ]
@@ -613,14 +613,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_spazz;1",
+        "@id": "dtmi:example:rho_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;",
           "@type": "Telemetry",
-          "name": "iota_thnad",
-          "schema": "time"
+          "name": "rho_zeta",
+          "schema": "date"
         }
       }
     ]
@@ -633,13 +633,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_zatz;1",
+        "@id": "dtmi:example:rho_iota;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Telemetry",
-          "name": "iota_floob",
-          "schema": "boolean"
+          "name": "rho_theta",
+          "schema": "dateTime"
         }
       }
     ]
@@ -652,14 +652,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_flunn;1",
+        "@id": "dtmi:example:rho_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Telemetry",
-          "name": "iota_jogg",
-          "schema": "date"
+          "name": "rho_kappa",
+          "schema": "double"
         }
       }
     ]
@@ -672,13 +672,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_yekk;1",
+        "@id": "dtmi:example:rho_nu;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Telemetry",
-          "name": "iota_itch",
-          "schema": "dateTime"
+          "name": "rho_mu",
+          "schema": "duration"
         }
       }
     ]
@@ -691,14 +691,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:iota_hi;1",
+        "@id": "dtmi:example:rho_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Telemetry",
-          "name": "iota_vroo",
-          "schema": "double"
+          "name": "rho_xi",
+          "schema": "float"
         }
       }
     ]
@@ -711,13 +711,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_beta;1",
+        "@id": "dtmi:example:rho_rho;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:1seg;1",
           "@type": "Telemetry",
-          "name": "kappa_alpha",
-          "schema": "duration"
+          "name": "rho_pi",
+          "schema": "integer"
         }
       }
     ]
@@ -730,14 +730,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_delta;1",
+        "@id": "dtmi:example:rho_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:1seg;1",
           "@type": "Telemetry",
-          "name": "kappa_gamma",
-          "schema": "float"
+          "name": "rho_sigma",
+          "schema": "long"
         }
       }
     ]
@@ -750,13 +750,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_zeta;1",
+        "@id": "dtmi:example:rho_phi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Telemetry",
-          "name": "kappa_epsilon",
-          "schema": "integer"
+          "name": "rho_upsilon",
+          "schema": "string"
         }
       }
     ]
@@ -769,14 +769,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_theta;1",
+        "@id": "dtmi:example:rho_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Telemetry",
-          "name": "kappa_eta",
-          "schema": "long"
+          "name": "rho_chi",
+          "schema": "time"
         }
       }
     ]
@@ -789,13 +789,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_kappa;1",
+        "@id": "dtmi:example:rho_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo::bar;1",
           "@type": "Telemetry",
-          "name": "kappa_iota",
-          "schema": "string"
+          "name": "rho_omega",
+          "schema": "boolean"
         }
       }
     ]
@@ -808,14 +808,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_mu;1",
+        "@id": "dtmi:example:rho_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo::bar;1",
           "@type": "Telemetry",
-          "name": "kappa_lambda",
-          "schema": "time"
+          "name": "rho_wum",
+          "schema": "date"
         }
       }
     ]
@@ -828,13 +828,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_xi;1",
+        "@id": "dtmi:example:rho_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@id": "urn:foo:bar:1",
           "@type": "Telemetry",
-          "name": "kappa_nu",
-          "schema": "boolean"
+          "name": "rho_humpf",
+          "schema": "dateTime"
         }
       }
     ]
@@ -847,14 +847,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_pi;1",
+        "@id": "dtmi:example:rho_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "urn:foo:bar:1",
           "@type": "Telemetry",
-          "name": "kappa_omicron",
-          "schema": "date"
+          "name": "rho_glikk",
+          "schema": "double"
         }
       }
     ]
@@ -867,13 +867,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_sigma;1",
+        "@id": "dtmi:example:rho_quan;1",
         "@type": "Interface",
         "contents": {
           "@id": "http://foo/bar/baz",
           "@type": "Telemetry",
-          "name": "kappa_rho",
-          "schema": "dateTime"
+          "name": "rho_snee",
+          "schema": "duration"
         }
       }
     ]
@@ -886,14 +886,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_upsilon;1",
+        "@id": "dtmi:example:rho_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "http://foo/bar/baz",
           "@type": "Telemetry",
-          "name": "kappa_tau",
-          "schema": "double"
+          "name": "rho_thnad",
+          "schema": "float"
         }
       }
     ]
@@ -906,13 +906,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_chi;1",
+        "@id": "dtmi:example:rho_zatz;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:;1",
           "@type": "Telemetry",
-          "name": "kappa_phi",
-          "schema": "duration"
+          "name": "rho_floob",
+          "schema": "integer"
         }
       }
     ]
@@ -925,14 +925,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_omega;1",
+        "@id": "dtmi:example:rho_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:;1",
           "@type": "Telemetry",
-          "name": "kappa_psi",
-          "schema": "float"
+          "name": "rho_jogg",
+          "schema": "long"
         }
       }
     ]
@@ -945,13 +945,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_wum;1",
+        "@id": "dtmi:example:rho_yekk;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar",
           "@type": "Telemetry",
-          "name": "kappa_yuzz",
-          "schema": "integer"
+          "name": "rho_itch",
+          "schema": "string"
         }
       }
     ]
@@ -964,14 +964,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_humpf;1",
+        "@id": "dtmi:example:rho_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar",
           "@type": "Telemetry",
-          "name": "kappa_um",
-          "schema": "long"
+          "name": "rho_vroo",
+          "schema": "time"
         }
       }
     ]
@@ -984,13 +984,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_glikk;1",
+        "@id": "dtmi:example:sigma_beta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.14",
           "@type": "Telemetry",
-          "name": "kappa_fuddle",
-          "schema": "string"
+          "name": "sigma_alpha",
+          "schema": "boolean"
         }
       }
     ]
@@ -1003,14 +1003,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_snee;1",
+        "@id": "dtmi:example:sigma_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.14",
           "@type": "Telemetry",
-          "name": "kappa_nuh",
-          "schema": "time"
+          "name": "sigma_gamma",
+          "schema": "date"
         }
       }
     ]
@@ -1023,13 +1023,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_thnad;1",
+        "@id": "dtmi:example:sigma_zeta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.141592",
           "@type": "Telemetry",
-          "name": "kappa_quan",
-          "schema": "boolean"
+          "name": "sigma_epsilon",
+          "schema": "dateTime"
         }
       }
     ]
@@ -1042,14 +1042,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_floob;1",
+        "@id": "dtmi:example:sigma_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.141592",
           "@type": "Telemetry",
-          "name": "kappa_spazz",
-          "schema": "date"
+          "name": "sigma_eta",
+          "schema": "double"
         }
       }
     ]
@@ -1062,13 +1062,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_jogg;1",
+        "@id": "dtmi:example:sigma_kappa;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:dtdl:example;1",
           "@type": "Telemetry",
-          "name": "kappa_zatz",
-          "schema": "dateTime"
+          "name": "sigma_iota",
+          "schema": "duration"
         }
       }
     ]
@@ -1081,14 +1081,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_itch;1",
+        "@id": "dtmi:example:sigma_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:dtdl:example;1",
           "@type": "Telemetry",
-          "name": "kappa_flunn",
-          "schema": "double"
+          "name": "sigma_lambda",
+          "schema": "float"
         }
       }
     ]
@@ -1101,13 +1101,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:kappa_vroo;1",
+        "@id": "dtmi:example:sigma_xi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:standard:example;1",
           "@type": "Telemetry",
-          "name": "kappa_yekk",
-          "schema": "duration"
+          "name": "sigma_nu",
+          "schema": "integer"
         }
       }
     ]
@@ -1120,14 +1120,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_alpha;1",
+        "@id": "dtmi:example:sigma_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:standard:example;1",
           "@type": "Telemetry",
-          "name": "kappa_hi",
-          "schema": "float"
+          "name": "sigma_omicron",
+          "schema": "long"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryIdNotArrayV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryIdNotArrayV2.json
index badd2708..68928324 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryIdNotArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryIdNotArrayV2.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_gamma;1",
+        "@id": "dtmi:example:sigma_sigma;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;7"
           ],
           "@type": "Telemetry",
-          "name": "lambda_beta",
-          "schema": "integer"
+          "name": "sigma_rho",
+          "schema": "string"
         }
       }
     ]
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_epsilon;1",
+        "@id": "dtmi:example:sigma_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,8 +36,8 @@
             "dtmi:foo:bar;7"
           ],
           "@type": "Telemetry",
-          "name": "lambda_delta",
-          "schema": "long"
+          "name": "sigma_tau",
+          "schema": "time"
         }
       }
     ]
@@ -50,15 +50,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_eta;1",
+        "@id": "dtmi:example:sigma_chi;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;108675309"
           ],
           "@type": "Telemetry",
-          "name": "lambda_zeta",
-          "schema": "string"
+          "name": "sigma_phi",
+          "schema": "boolean"
         }
       }
     ]
@@ -71,7 +71,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_iota;1",
+        "@id": "dtmi:example:sigma_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -79,8 +79,8 @@
             "dtmi:foo:bar;108675309"
           ],
           "@type": "Telemetry",
-          "name": "lambda_theta",
-          "schema": "time"
+          "name": "sigma_psi",
+          "schema": "date"
         }
       }
     ]
@@ -93,15 +93,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_lambda;1",
+        "@id": "dtmi:example:sigma_wum;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;999999999"
           ],
           "@type": "Telemetry",
-          "name": "lambda_kappa",
-          "schema": "boolean"
+          "name": "sigma_yuzz",
+          "schema": "dateTime"
         }
       }
     ]
@@ -114,7 +114,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_nu;1",
+        "@id": "dtmi:example:sigma_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -122,8 +122,8 @@
             "dtmi:foo:bar;999999999"
           ],
           "@type": "Telemetry",
-          "name": "lambda_mu",
-          "schema": "date"
+          "name": "sigma_um",
+          "schema": "double"
         }
       }
     ]
@@ -136,15 +136,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_omicron;1",
+        "@id": "dtmi:example:sigma_glikk;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo;1"
           ],
           "@type": "Telemetry",
-          "name": "lambda_xi",
-          "schema": "dateTime"
+          "name": "sigma_fuddle",
+          "schema": "duration"
         }
       }
     ]
@@ -157,7 +157,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_rho;1",
+        "@id": "dtmi:example:sigma_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -165,8 +165,8 @@
             "dtmi:foo;1"
           ],
           "@type": "Telemetry",
-          "name": "lambda_pi",
-          "schema": "double"
+          "name": "sigma_nuh",
+          "schema": "float"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryMultipleSemanticTypesV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryMultipleSemanticTypesV2.json
index 69083c17..35c1a693 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryMultipleSemanticTypesV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryMultipleSemanticTypesV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_rho;1",
+        "@id": "dtmi:example:gamma_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": [
@@ -15,8 +15,8 @@
             "LuminousIntensity",
             "MagneticFlux"
           ],
-          "name": "flunn_pi",
-          "schema": "long"
+          "name": "gamma_rho",
+          "schema": "float"
         }
       }
     ]
@@ -29,7 +29,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_tau;1",
+        "@id": "dtmi:example:gamma_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -38,8 +38,8 @@
             "LuminousIntensity",
             "MagneticFlux"
           ],
-          "name": "flunn_sigma",
-          "schema": "double"
+          "name": "gamma_tau",
+          "schema": "integer"
         }
       }
     ]
@@ -52,7 +52,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_phi;1",
+        "@id": "dtmi:example:gamma_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
@@ -60,8 +60,8 @@
             "LuminousIntensity",
             "dtmi:standard:class:MagneticFlux;2"
           ],
-          "name": "flunn_upsilon",
-          "schema": "float",
+          "name": "gamma_phi",
+          "schema": "long",
           "unit": "candela"
         }
       }
@@ -75,7 +75,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_psi;1",
+        "@id": "dtmi:example:gamma_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -84,8 +84,8 @@
             "LuminousIntensity",
             "dtmi:standard:class:MagneticFlux;2"
           ],
-          "name": "flunn_chi",
-          "schema": "integer",
+          "name": "gamma_psi",
+          "schema": "double",
           "unit": "candela"
         }
       }
@@ -99,7 +99,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_yuzz;1",
+        "@id": "dtmi:example:gamma_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": [
@@ -107,8 +107,8 @@
             "dtmi:standard:class:LuminousIntensity;2",
             "dtmi:standard:class:MagneticFlux;2"
           ],
-          "name": "flunn_omega",
-          "schema": "long",
+          "name": "gamma_yuzz",
+          "schema": "float",
           "unit": "candela"
         }
       }
@@ -122,7 +122,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_um;1",
+        "@id": "dtmi:example:gamma_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -131,8 +131,8 @@
             "dtmi:standard:class:LuminousIntensity;2",
             "dtmi:standard:class:MagneticFlux;2"
           ],
-          "name": "flunn_wum",
-          "schema": "double",
+          "name": "gamma_um",
+          "schema": "integer",
           "unit": "candela"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyCommentStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyCommentStringLengthV2.json
index 363f22d8..54dae3a2 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyCommentStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyCommentStringLengthV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_chi;1",
+        "@id": "dtmi:example:tau_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "mu_phi",
-          "schema": "long",
+          "name": "tau_floob",
+          "schema": "time",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_omega;1",
+        "@id": "dtmi:example:tau_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "mu_psi",
-          "schema": "string",
+          "name": "tau_jogg",
+          "schema": "boolean",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -45,13 +45,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_wum;1",
+        "@id": "dtmi:example:tau_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "mu_yuzz",
-          "schema": "time",
+          "name": "tau_itch",
+          "schema": "date",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyCommentStringV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyCommentStringV2.json
index 30d4e284..9dc4924f 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyCommentStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyCommentStringV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_psi;1",
+        "@id": "dtmi:example:sigma_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "lambda_chi",
-          "schema": "integer",
+          "name": "sigma_zatz",
+          "schema": "string",
           "comment": "hello"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_yuzz;1",
+        "@id": "dtmi:example:sigma_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "lambda_omega",
-          "schema": "long",
+          "name": "sigma_flunn",
+          "schema": "time",
           "comment": [
             "hello"
           ]
@@ -47,12 +47,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_um;1",
+        "@id": "dtmi:example:sigma_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "lambda_wum",
-          "schema": "string",
+          "name": "sigma_yekk",
+          "schema": "boolean",
           "comment": {
             "@value": "hello",
             "@type": "xsd:string"
@@ -69,12 +69,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_fuddle;1",
+        "@id": "dtmi:example:tau_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "lambda_humpf",
-          "schema": "time",
+          "name": "sigma_hi",
+          "schema": "date",
           "comment": [
             {
               "@value": "hello",
@@ -93,12 +93,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_nuh;1",
+        "@id": "dtmi:example:tau_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "lambda_glikk",
-          "schema": "boolean",
+          "name": "tau_beta",
+          "schema": "dateTime",
           "comment": []
         }
       }
@@ -112,12 +112,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_quan;1",
+        "@id": "dtmi:example:tau_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "lambda_snee",
-          "schema": "date",
+          "name": "tau_delta",
+          "schema": "double",
           "comment": null
         }
       }
@@ -131,13 +131,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_spazz;1",
+        "@id": "dtmi:example:tau_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "lambda_thnad",
-          "schema": "dateTime",
+          "name": "tau_zeta",
+          "schema": "duration",
           "comment": null
         }
       }
@@ -151,12 +151,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_zatz;1",
+        "@id": "dtmi:example:tau_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "lambda_floob",
-          "schema": "double",
+          "name": "tau_theta",
+          "schema": "float",
           "comment": true
         }
       }
@@ -170,13 +170,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_flunn;1",
+        "@id": "dtmi:example:tau_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "lambda_jogg",
-          "schema": "duration",
+          "name": "tau_kappa",
+          "schema": "integer",
           "comment": true
         }
       }
@@ -190,12 +190,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_yekk;1",
+        "@id": "dtmi:example:tau_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "lambda_itch",
-          "schema": "float",
+          "name": "tau_mu",
+          "schema": "long",
           "comment": 626
         }
       }
@@ -209,13 +209,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:lambda_hi;1",
+        "@id": "dtmi:example:tau_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "lambda_vroo",
-          "schema": "integer",
+          "name": "tau_xi",
+          "schema": "string",
           "comment": 626
         }
       }
@@ -229,12 +229,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_beta;1",
+        "@id": "dtmi:example:tau_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "mu_alpha",
-          "schema": "long",
+          "name": "tau_pi",
+          "schema": "time",
           "comment": [
             null
           ]
@@ -250,13 +250,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_delta;1",
+        "@id": "dtmi:example:tau_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "mu_gamma",
-          "schema": "string",
+          "name": "tau_sigma",
+          "schema": "boolean",
           "comment": [
             null
           ]
@@ -272,12 +272,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_zeta;1",
+        "@id": "dtmi:example:tau_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "mu_epsilon",
-          "schema": "time",
+          "name": "tau_upsilon",
+          "schema": "date",
           "comment": [
             true
           ]
@@ -293,13 +293,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_theta;1",
+        "@id": "dtmi:example:tau_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "mu_eta",
-          "schema": "boolean",
+          "name": "tau_chi",
+          "schema": "dateTime",
           "comment": [
             true
           ]
@@ -315,12 +315,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_kappa;1",
+        "@id": "dtmi:example:tau_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "mu_iota",
-          "schema": "date",
+          "name": "tau_omega",
+          "schema": "double",
           "comment": [
             626
           ]
@@ -336,13 +336,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_mu;1",
+        "@id": "dtmi:example:tau_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "mu_lambda",
-          "schema": "dateTime",
+          "name": "tau_wum",
+          "schema": "duration",
           "comment": [
             626
           ]
@@ -358,12 +358,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_xi;1",
+        "@id": "dtmi:example:tau_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "mu_nu",
-          "schema": "double",
+          "name": "tau_humpf",
+          "schema": "float",
           "comment": {}
         }
       }
@@ -377,13 +377,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_pi;1",
+        "@id": "dtmi:example:tau_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "mu_omicron",
-          "schema": "duration",
+          "name": "tau_glikk",
+          "schema": "integer",
           "comment": {}
         }
       }
@@ -397,12 +397,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_sigma;1",
+        "@id": "dtmi:example:tau_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "mu_rho",
-          "schema": "float",
+          "name": "tau_snee",
+          "schema": "long",
           "comment": [
             {}
           ]
@@ -418,13 +418,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_upsilon;1",
+        "@id": "dtmi:example:tau_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "mu_tau",
-          "schema": "integer",
+          "name": "tau_thnad",
+          "schema": "string",
           "comment": [
             {}
           ]
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyCommentTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyCommentTermAndDtmiV2.json
index 01fe1214..8540d6dc 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyCommentTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyCommentTermAndDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_flunn;1",
+        "@id": "dtmi:example:upsilon_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "comment": "mu_floob",
-          "dtmi:dtdl:property:comment;2": "mu_zatz",
-          "name": "mu_jogg",
-          "schema": "double"
+          "comment": "upsilon_theta",
+          "dtmi:dtdl:property:comment;2": "upsilon_iota",
+          "name": "upsilon_kappa",
+          "schema": "float"
         }
       }
     ]
@@ -27,15 +27,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:mu_hi;1",
+        "@id": "dtmi:example:upsilon_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "comment": "mu_itch",
-          "dtmi:dtdl:property:comment;2": "mu_yekk",
-          "name": "mu_vroo",
-          "schema": "duration"
+          "comment": "upsilon_mu",
+          "dtmi:dtdl:property:comment;2": "upsilon_nu",
+          "name": "upsilon_xi",
+          "schema": "integer"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyDescriptionLangStringV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyDescriptionLangStringV2.json
index 4fcda12b..41735a55 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyDescriptionLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyDescriptionLangStringV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_beta;1",
+        "@id": "dtmi:example:upsilon_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "nu_alpha",
-          "schema": "float",
+          "name": "upsilon_pi",
+          "schema": "long",
           "description": "hello"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_delta;1",
+        "@id": "dtmi:example:upsilon_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "nu_gamma",
-          "schema": "integer",
+          "name": "upsilon_sigma",
+          "schema": "string",
           "description": [
             "hello"
           ]
@@ -47,12 +47,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_zeta;1",
+        "@id": "dtmi:example:upsilon_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "nu_epsilon",
-          "schema": "long",
+          "name": "upsilon_upsilon",
+          "schema": "time",
           "description": {
             "en": "hello"
           }
@@ -68,12 +68,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_theta;1",
+        "@id": "dtmi:example:upsilon_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "nu_eta",
-          "schema": "string",
+          "name": "upsilon_chi",
+          "schema": "boolean",
           "description": [
             {
               "@value": "hello",
@@ -92,12 +92,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_kappa;1",
+        "@id": "dtmi:example:upsilon_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "nu_iota",
-          "schema": "time",
+          "name": "upsilon_omega",
+          "schema": "date",
           "description": {}
         }
       }
@@ -111,12 +111,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_mu;1",
+        "@id": "dtmi:example:upsilon_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "nu_lambda",
-          "schema": "boolean",
+          "name": "upsilon_wum",
+          "schema": "dateTime",
           "description": []
         }
       }
@@ -130,12 +130,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_xi;1",
+        "@id": "dtmi:example:upsilon_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "nu_nu",
-          "schema": "date",
+          "name": "upsilon_humpf",
+          "schema": "double",
           "description": null
         }
       }
@@ -149,13 +149,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_pi;1",
+        "@id": "dtmi:example:upsilon_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "nu_omicron",
-          "schema": "dateTime",
+          "name": "upsilon_glikk",
+          "schema": "duration",
           "description": null
         }
       }
@@ -169,12 +169,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_sigma;1",
+        "@id": "dtmi:example:upsilon_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "nu_rho",
-          "schema": "double",
+          "name": "upsilon_snee",
+          "schema": "float",
           "description": true
         }
       }
@@ -188,13 +188,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_upsilon;1",
+        "@id": "dtmi:example:upsilon_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "nu_tau",
-          "schema": "duration",
+          "name": "upsilon_thnad",
+          "schema": "integer",
           "description": true
         }
       }
@@ -208,12 +208,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_chi;1",
+        "@id": "dtmi:example:upsilon_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "nu_phi",
-          "schema": "float",
+          "name": "upsilon_floob",
+          "schema": "long",
           "description": 626
         }
       }
@@ -227,13 +227,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_omega;1",
+        "@id": "dtmi:example:upsilon_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "nu_psi",
-          "schema": "integer",
+          "name": "upsilon_jogg",
+          "schema": "string",
           "description": 626
         }
       }
@@ -247,12 +247,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_wum;1",
+        "@id": "dtmi:example:upsilon_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "nu_yuzz",
-          "schema": "long",
+          "name": "upsilon_itch",
+          "schema": "time",
           "description": [
             null
           ]
@@ -268,13 +268,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_humpf;1",
+        "@id": "dtmi:example:upsilon_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "nu_um",
-          "schema": "string",
+          "name": "upsilon_vroo",
+          "schema": "boolean",
           "description": [
             null
           ]
@@ -290,12 +290,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_glikk;1",
+        "@id": "dtmi:example:phi_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "nu_fuddle",
-          "schema": "time",
+          "name": "phi_alpha",
+          "schema": "date",
           "description": [
             true
           ]
@@ -311,13 +311,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_snee;1",
+        "@id": "dtmi:example:phi_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "nu_nuh",
-          "schema": "boolean",
+          "name": "phi_gamma",
+          "schema": "dateTime",
           "description": [
             true
           ]
@@ -333,12 +333,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_thnad;1",
+        "@id": "dtmi:example:phi_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "nu_quan",
-          "schema": "date",
+          "name": "phi_epsilon",
+          "schema": "double",
           "description": [
             626
           ]
@@ -354,13 +354,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_floob;1",
+        "@id": "dtmi:example:phi_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "nu_spazz",
-          "schema": "dateTime",
+          "name": "phi_eta",
+          "schema": "duration",
           "description": [
             626
           ]
@@ -376,12 +376,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_jogg;1",
+        "@id": "dtmi:example:phi_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "nu_zatz",
-          "schema": "double",
+          "name": "phi_iota",
+          "schema": "float",
           "description": [
             {}
           ]
@@ -397,13 +397,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_itch;1",
+        "@id": "dtmi:example:phi_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "nu_flunn",
-          "schema": "duration",
+          "name": "phi_lambda",
+          "schema": "integer",
           "description": [
             {}
           ]
@@ -419,12 +419,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:nu_vroo;1",
+        "@id": "dtmi:example:phi_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "nu_yekk",
-          "schema": "float",
+          "name": "phi_nu",
+          "schema": "long",
           "description": {
             "@value": "hello",
             "@language": "en"
@@ -441,13 +441,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_alpha;1",
+        "@id": "dtmi:example:phi_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "nu_hi",
-          "schema": "integer",
+          "name": "phi_omicron",
+          "schema": "string",
           "description": {
             "@value": "hello",
             "@language": "en"
@@ -464,12 +464,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_gamma;1",
+        "@id": "dtmi:example:phi_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "xi_beta",
-          "schema": "long",
+          "name": "phi_rho",
+          "schema": "time",
           "description": [
             {
               "en": "hello"
@@ -487,13 +487,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_epsilon;1",
+        "@id": "dtmi:example:phi_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "xi_delta",
-          "schema": "string",
+          "name": "phi_tau",
+          "schema": "boolean",
           "description": [
             {
               "en": "hello"
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyDescriptionStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyDescriptionStringLengthV2.json
index b784b679..578b6a9e 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyDescriptionStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyDescriptionStringLengthV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_eta;1",
+        "@id": "dtmi:example:phi_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "xi_zeta",
-          "schema": "time",
+          "name": "phi_phi",
+          "schema": "date",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_iota;1",
+        "@id": "dtmi:example:phi_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "xi_theta",
-          "schema": "boolean",
+          "name": "phi_psi",
+          "schema": "dateTime",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -45,13 +45,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_lambda;1",
+        "@id": "dtmi:example:phi_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "xi_kappa",
-          "schema": "date",
+          "name": "phi_yuzz",
+          "schema": "double",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyDescriptionTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyDescriptionTermAndDtmiV2.json
index 86581d5a..8eb6ed41 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyDescriptionTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyDescriptionTermAndDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_omega;1",
+        "@id": "dtmi:example:phi_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
           "description": [
-            "xi_phi"
+            "phi_floob"
           ],
           "dtmi:dtdl:property:description;2": [
-            "xi_chi"
+            "phi_zatz"
           ],
-          "name": "xi_psi",
-          "schema": "float"
+          "name": "phi_jogg",
+          "schema": "long"
         }
       }
     ]
@@ -31,19 +31,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_humpf;1",
+        "@id": "dtmi:example:phi_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
           "description": [
-            "xi_yuzz"
+            "phi_itch"
           ],
           "dtmi:dtdl:property:description;2": [
-            "xi_wum"
+            "phi_yekk"
           ],
-          "name": "xi_um",
-          "schema": "integer"
+          "name": "phi_vroo",
+          "schema": "string"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyDisplayNameLangStringV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyDisplayNameLangStringV2.json
index 3c67b654..bc1c0f6a 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyDisplayNameLangStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyDisplayNameLangStringV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_glikk;1",
+        "@id": "dtmi:example:chi_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "xi_fuddle",
-          "schema": "long",
+          "name": "chi_alpha",
+          "schema": "time",
           "displayName": "hello"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_snee;1",
+        "@id": "dtmi:example:chi_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "xi_nuh",
-          "schema": "string",
+          "name": "chi_gamma",
+          "schema": "boolean",
           "displayName": [
             "hello"
           ]
@@ -47,12 +47,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_thnad;1",
+        "@id": "dtmi:example:chi_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "xi_quan",
-          "schema": "time",
+          "name": "chi_epsilon",
+          "schema": "date",
           "displayName": {
             "en": "hello"
           }
@@ -68,12 +68,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_floob;1",
+        "@id": "dtmi:example:chi_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "xi_spazz",
-          "schema": "boolean",
+          "name": "chi_eta",
+          "schema": "dateTime",
           "displayName": [
             {
               "@value": "hello",
@@ -92,12 +92,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_jogg;1",
+        "@id": "dtmi:example:chi_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "xi_zatz",
-          "schema": "date",
+          "name": "chi_iota",
+          "schema": "double",
           "displayName": {}
         }
       }
@@ -111,12 +111,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_itch;1",
+        "@id": "dtmi:example:chi_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "xi_flunn",
-          "schema": "dateTime",
+          "name": "chi_lambda",
+          "schema": "duration",
           "displayName": []
         }
       }
@@ -130,12 +130,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:xi_vroo;1",
+        "@id": "dtmi:example:chi_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "xi_yekk",
-          "schema": "double",
+          "name": "chi_nu",
+          "schema": "float",
           "displayName": null
         }
       }
@@ -149,13 +149,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_alpha;1",
+        "@id": "dtmi:example:chi_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "xi_hi",
-          "schema": "duration",
+          "name": "chi_omicron",
+          "schema": "integer",
           "displayName": null
         }
       }
@@ -169,12 +169,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_gamma;1",
+        "@id": "dtmi:example:chi_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "omicron_beta",
-          "schema": "float",
+          "name": "chi_rho",
+          "schema": "long",
           "displayName": true
         }
       }
@@ -188,13 +188,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_epsilon;1",
+        "@id": "dtmi:example:chi_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "omicron_delta",
-          "schema": "integer",
+          "name": "chi_tau",
+          "schema": "string",
           "displayName": true
         }
       }
@@ -208,12 +208,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_eta;1",
+        "@id": "dtmi:example:chi_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "omicron_zeta",
-          "schema": "long",
+          "name": "chi_phi",
+          "schema": "time",
           "displayName": 626
         }
       }
@@ -227,13 +227,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_iota;1",
+        "@id": "dtmi:example:chi_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "omicron_theta",
-          "schema": "string",
+          "name": "chi_psi",
+          "schema": "boolean",
           "displayName": 626
         }
       }
@@ -247,12 +247,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_lambda;1",
+        "@id": "dtmi:example:chi_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "omicron_kappa",
-          "schema": "time",
+          "name": "chi_yuzz",
+          "schema": "date",
           "displayName": [
             null
           ]
@@ -268,13 +268,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_nu;1",
+        "@id": "dtmi:example:chi_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "omicron_mu",
-          "schema": "boolean",
+          "name": "chi_um",
+          "schema": "dateTime",
           "displayName": [
             null
           ]
@@ -290,12 +290,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_omicron;1",
+        "@id": "dtmi:example:chi_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "omicron_xi",
-          "schema": "date",
+          "name": "chi_fuddle",
+          "schema": "double",
           "displayName": [
             true
           ]
@@ -311,13 +311,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_rho;1",
+        "@id": "dtmi:example:chi_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "omicron_pi",
-          "schema": "dateTime",
+          "name": "chi_nuh",
+          "schema": "duration",
           "displayName": [
             true
           ]
@@ -333,12 +333,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_tau;1",
+        "@id": "dtmi:example:chi_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "omicron_sigma",
-          "schema": "double",
+          "name": "chi_quan",
+          "schema": "float",
           "displayName": [
             626
           ]
@@ -354,13 +354,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_phi;1",
+        "@id": "dtmi:example:chi_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "omicron_upsilon",
-          "schema": "duration",
+          "name": "chi_spazz",
+          "schema": "integer",
           "displayName": [
             626
           ]
@@ -376,12 +376,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_psi;1",
+        "@id": "dtmi:example:chi_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "omicron_chi",
-          "schema": "float",
+          "name": "chi_zatz",
+          "schema": "long",
           "displayName": [
             {}
           ]
@@ -397,13 +397,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_yuzz;1",
+        "@id": "dtmi:example:chi_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "omicron_omega",
-          "schema": "integer",
+          "name": "chi_flunn",
+          "schema": "string",
           "displayName": [
             {}
           ]
@@ -419,12 +419,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_um;1",
+        "@id": "dtmi:example:chi_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "omicron_wum",
-          "schema": "long",
+          "name": "chi_yekk",
+          "schema": "time",
           "displayName": {
             "@value": "hello",
             "@language": "en"
@@ -441,13 +441,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_fuddle;1",
+        "@id": "dtmi:example:psi_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "omicron_humpf",
-          "schema": "string",
+          "name": "chi_hi",
+          "schema": "boolean",
           "displayName": {
             "@value": "hello",
             "@language": "en"
@@ -464,12 +464,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_nuh;1",
+        "@id": "dtmi:example:psi_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "omicron_glikk",
-          "schema": "time",
+          "name": "psi_beta",
+          "schema": "date",
           "displayName": [
             {
               "en": "hello"
@@ -487,13 +487,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_quan;1",
+        "@id": "dtmi:example:psi_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "omicron_snee",
-          "schema": "boolean",
+          "name": "psi_delta",
+          "schema": "dateTime",
           "displayName": [
             {
               "en": "hello"
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyDisplayNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyDisplayNameStringLengthV2.json
index ae9217bb..aaf72a0a 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyDisplayNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyDisplayNameStringLengthV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_spazz;1",
+        "@id": "dtmi:example:psi_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "omicron_thnad",
-          "schema": "date",
+          "name": "psi_zeta",
+          "schema": "double",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSometh"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_zatz;1",
+        "@id": "dtmi:example:psi_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "omicron_floob",
-          "schema": "dateTime",
+          "name": "psi_theta",
+          "schema": "duration",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
         }
       }
@@ -45,13 +45,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:omicron_flunn;1",
+        "@id": "dtmi:example:psi_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "omicron_jogg",
-          "schema": "double",
+          "name": "psi_kappa",
+          "schema": "float",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethi"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyDisplayNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyDisplayNameTermAndDtmiV2.json
index 2f250e9c..8ba72dd2 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyDisplayNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyDisplayNameTermAndDtmiV2.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_iota;1",
+        "@id": "dtmi:example:psi_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
           "displayName": [
-            "pi_zeta"
+            "psi_phi"
           ],
           "dtmi:dtdl:property:displayName;2": [
-            "pi_eta"
+            "psi_chi"
           ],
-          "name": "pi_theta",
-          "schema": "long"
+          "name": "psi_psi",
+          "schema": "time"
         }
       }
     ]
@@ -31,19 +31,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:pi_nu;1",
+        "@id": "dtmi:example:psi_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
           "displayName": [
-            "pi_kappa"
+            "psi_yuzz"
           ],
           "dtmi:dtdl:property:displayName;2": [
-            "pi_lambda"
+            "psi_wum"
           ],
-          "name": "pi_mu",
-          "schema": "string"
+          "name": "psi_um",
+          "schema": "boolean"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyFormallyInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyFormallyInvalidDtmiV2.json
index 44a610b4..9b195c15 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyFormallyInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyFormallyInvalidDtmiV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_mu;1",
+        "@id": "dtmi:example:humpf_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "phi_lambda",
-          "schema": "float",
+          "name": "humpf_wum",
+          "schema": "long",
           "dtmi:foo//bar": 626
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_xi;1",
+        "@id": "dtmi:example:humpf_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "phi_nu",
-          "schema": "integer",
+          "name": "humpf_humpf",
+          "schema": "string",
           "dtmi:foo//bar": 626
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyFormallyIrrelevantDtmiOrTermV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyFormallyIrrelevantDtmiOrTermV2.json
index 33bb386b..35bafa76 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyFormallyIrrelevantDtmiOrTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyFormallyIrrelevantDtmiOrTermV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_beta;1",
+        "@id": "dtmi:example:humpf_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "phi_alpha",
-          "schema": "boolean",
+          "name": "humpf_pi",
+          "schema": "dateTime",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_delta;1",
+        "@id": "dtmi:example:humpf_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "phi_gamma",
-          "schema": "date",
+          "name": "humpf_sigma",
+          "schema": "double",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -46,12 +46,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_zeta;1",
+        "@id": "dtmi:example:humpf_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "phi_epsilon",
-          "schema": "dateTime",
+          "name": "humpf_upsilon",
+          "schema": "duration",
           "boolean": null
         }
       }
@@ -65,13 +65,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_theta;1",
+        "@id": "dtmi:example:humpf_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "phi_eta",
-          "schema": "double",
+          "name": "humpf_chi",
+          "schema": "float",
           "boolean": null
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyFormallyNotDtmiNorTermV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyFormallyNotDtmiNorTermV2.json
index 2863516e..d475fe56 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyFormallyNotDtmiNorTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyFormallyNotDtmiNorTermV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_sigma;1",
+        "@id": "dtmi:example:humpf_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "phi_rho",
-          "schema": "string",
+          "name": "humpf_snee",
+          "schema": "boolean",
           "http://foo.com/bar": true
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_upsilon;1",
+        "@id": "dtmi:example:humpf_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "phi_tau",
-          "schema": "time",
+          "name": "humpf_thnad",
+          "schema": "date",
           "http://foo.com/bar": true
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyFormallyUndefinedTermV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyFormallyUndefinedTermV2.json
index 989b85c3..1d8c41b6 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyFormallyUndefinedTermV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyFormallyUndefinedTermV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_omega;1",
+        "@id": "dtmi:example:humpf_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "phi_psi",
-          "schema": "date",
+          "name": "humpf_jogg",
+          "schema": "double",
           "foobar": {}
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:phi_wum;1",
+        "@id": "dtmi:example:humpf_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "phi_yuzz",
-          "schema": "dateTime",
+          "name": "humpf_itch",
+          "schema": "duration",
           "foobar": {}
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyNamePatternV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyNamePatternV2.json
index 9a6a9776..106832f3 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyNamePatternV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyNamePatternV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_floob;1",
+        "@id": "dtmi:example:delta_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -25,7 +25,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_zatz;1",
+        "@id": "dtmi:example:delta_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -43,7 +43,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_jogg;1",
+        "@id": "dtmi:example:delta_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -61,7 +61,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_flunn;1",
+        "@id": "dtmi:example:delta_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -79,7 +79,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_itch;1",
+        "@id": "dtmi:example:delta_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -97,7 +97,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_yekk;1",
+        "@id": "dtmi:example:delta_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -115,7 +115,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_vroo;1",
+        "@id": "dtmi:example:delta_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -134,7 +134,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_hi;1",
+        "@id": "dtmi:example:epsilon_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -152,7 +152,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_alpha;1",
+        "@id": "dtmi:example:epsilon_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -171,7 +171,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_beta;1",
+        "@id": "dtmi:example:epsilon_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -189,7 +189,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_gamma;1",
+        "@id": "dtmi:example:epsilon_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -208,7 +208,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_delta;1",
+        "@id": "dtmi:example:epsilon_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -226,7 +226,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_epsilon;1",
+        "@id": "dtmi:example:epsilon_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -245,7 +245,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_zeta;1",
+        "@id": "dtmi:example:epsilon_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -263,7 +263,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_eta;1",
+        "@id": "dtmi:example:epsilon_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -282,7 +282,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_theta;1",
+        "@id": "dtmi:example:epsilon_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -300,7 +300,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_iota;1",
+        "@id": "dtmi:example:epsilon_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -319,7 +319,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_kappa;1",
+        "@id": "dtmi:example:epsilon_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -337,7 +337,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_lambda;1",
+        "@id": "dtmi:example:epsilon_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -356,7 +356,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_mu;1",
+        "@id": "dtmi:example:epsilon_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -374,7 +374,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_nu;1",
+        "@id": "dtmi:example:epsilon_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -393,7 +393,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_xi;1",
+        "@id": "dtmi:example:epsilon_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -411,7 +411,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_omicron;1",
+        "@id": "dtmi:example:epsilon_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -430,7 +430,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_pi;1",
+        "@id": "dtmi:example:epsilon_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -448,7 +448,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_rho;1",
+        "@id": "dtmi:example:epsilon_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyNameStringLengthV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyNameStringLengthV2.json
index 53a7637a..1b9ab9a7 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyNameStringLengthV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyNameStringLengthV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_quan;1",
+        "@id": "dtmi:example:delta_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -25,7 +25,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_thnad;1",
+        "@id": "dtmi:example:delta_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -43,7 +43,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_spazz;1",
+        "@id": "dtmi:example:delta_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyNameStringV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyNameStringV2.json
index eed6cf56..f78ec3ad 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyNameStringV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyNameStringV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_lambda;1",
+        "@id": "dtmi:example:delta_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -25,7 +25,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_mu;1",
+        "@id": "dtmi:example:delta_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -45,7 +45,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_nu;1",
+        "@id": "dtmi:example:delta_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -66,7 +66,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_xi;1",
+        "@id": "dtmi:example:delta_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -89,7 +89,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_omicron;1",
+        "@id": "dtmi:example:delta_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -107,7 +107,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_pi;1",
+        "@id": "dtmi:example:delta_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -126,7 +126,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_rho;1",
+        "@id": "dtmi:example:delta_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -144,7 +144,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_sigma;1",
+        "@id": "dtmi:example:delta_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -163,7 +163,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_tau;1",
+        "@id": "dtmi:example:delta_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -181,7 +181,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_upsilon;1",
+        "@id": "dtmi:example:delta_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -200,7 +200,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_phi;1",
+        "@id": "dtmi:example:delta_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -220,7 +220,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_chi;1",
+        "@id": "dtmi:example:delta_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -241,7 +241,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_psi;1",
+        "@id": "dtmi:example:delta_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -261,7 +261,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_omega;1",
+        "@id": "dtmi:example:delta_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -282,7 +282,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_yuzz;1",
+        "@id": "dtmi:example:delta_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -302,7 +302,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_wum;1",
+        "@id": "dtmi:example:delta_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -323,7 +323,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_um;1",
+        "@id": "dtmi:example:delta_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -341,7 +341,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_humpf;1",
+        "@id": "dtmi:example:delta_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -360,7 +360,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_fuddle;1",
+        "@id": "dtmi:example:delta_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -380,7 +380,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_glikk;1",
+        "@id": "dtmi:example:delta_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -401,7 +401,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_nuh;1",
+        "@id": "dtmi:example:delta_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -419,7 +419,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_snee;1",
+        "@id": "dtmi:example:delta_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyNameTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyNameTermAndDtmiV2.json
index 8a0c831d..83da246c 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyNameTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyNameTermAndDtmiV2.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_fuddle;1",
+        "@id": "dtmi:example:epsilon_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "yekk_um",
-          "dtmi:dtdl:property:name;2": "yekk_humpf",
+          "name": "epsilon_humpf",
+          "dtmi:dtdl:property:name;2": "epsilon_fuddle",
           "schema": "long"
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_snee;1",
+        "@id": "dtmi:example:epsilon_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "yekk_glikk",
-          "dtmi:dtdl:property:name;2": "yekk_nuh",
+          "name": "epsilon_nuh",
+          "dtmi:dtdl:property:name;2": "epsilon_snee",
           "schema": "string"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyNameUniqueAmongInterfaceContentsV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyNameUniqueAmongInterfaceContentsV2.json
index fad6c7e1..6654cc7d 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryPropertyNameUniqueAmongInterfaceContentsV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryPropertyNameUniqueAmongInterfaceContentsV2.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_sigma;1",
+        "@id": "dtmi:example:epsilon_tau;1",
         "@type": "Interface",
         "contents": [
           {
@@ -32,7 +32,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_tau;1",
+        "@id": "dtmi:example:epsilon_upsilon;1",
         "@type": "Interface",
         "contents": [
           {
@@ -60,7 +60,7 @@
           "dtmi:dtdl:context;2",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:yekk_upsilon;1",
+        "@id": "dtmi:example:epsilon_phi;1",
         "@type": "Interface",
         "contents": [
           {
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryPropertySchemaElementV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryPropertySchemaElementV2.json
index a6077c17..a128f0e0 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryPropertySchemaElementV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryPropertySchemaElementV2.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_floob;1",
+        "@id": "dtmi:example:epsilon_zatz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:yekk_spazz;1",
+          "@id": "dtmi:example:epsilon_floob;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "yekk_thnad",
+            "name": "epsilon_spazz",
             "schema": {
               "@type": "Enum",
               "enumValues": [
                 {
-                  "enumValue": 1095,
-                  "name": "yekk_quan"
+                  "enumValue": 1108,
+                  "name": "epsilon_thnad"
                 }
               ],
               "valueSchema": "integer"
@@ -38,21 +38,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_itch;1",
+        "@id": "dtmi:example:epsilon_yekk;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:yekk_flunn;1",
+          "@id": "dtmi:example:epsilon_itch;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "yekk_jogg",
+            "name": "epsilon_flunn",
             "schema": [
               {
                 "@type": "Enum",
                 "enumValues": [
                   {
-                    "enumValue": 1096,
-                    "name": "yekk_zatz"
+                    "enumValue": 1109,
+                    "name": "epsilon_jogg"
                   }
                 ],
                 "valueSchema": "integer"
@@ -71,22 +71,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:yekk_vroo;1",
+        "@id": "dtmi:example:epsilon_hi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 1097,
-              "name": "yekk_yekk"
+              "enumValue": 1110,
+              "name": "epsilon_vroo"
             }
           ],
           "valueSchema": "integer"
         },
         "contents": {
           "@type": "Telemetry",
-          "name": "yekk_hi",
+          "name": "zeta_alpha",
           "schema": "dtmi:ex:dependentRef;1"
         }
       }
@@ -100,22 +100,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_beta;1",
+        "@id": "dtmi:example:zeta_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 1098,
-              "name": "vroo_alpha"
+              "enumValue": 1111,
+              "name": "zeta_beta"
             }
           ],
           "valueSchema": "integer"
         },
         "contents": {
           "@type": "Telemetry",
-          "name": "vroo_gamma",
+          "name": "zeta_delta",
           "schema": [
             "dtmi:ex:dependentRef;1"
           ]
@@ -131,16 +131,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_eta;1",
+        "@id": "dtmi:example:zeta_theta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:vroo_zeta;1",
+          "@id": "dtmi:example:zeta_eta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "vroo_epsilon",
+            "name": "zeta_zeta",
             "schema": {
-              "@id": "dtmi:example:vroo_delta;1",
+              "@id": "dtmi:example:zeta_epsilon;1",
               "@type": "Enum",
               "valueSchema": "integer",
               "@context": "dtmi:dtdl:context;3"
@@ -158,17 +158,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_lambda;1",
+        "@id": "dtmi:example:zeta_mu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:vroo_kappa;1",
+          "@id": "dtmi:example:zeta_lambda;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Telemetry",
-            "name": "vroo_iota",
+            "name": "zeta_kappa",
             "schema": {
-              "@id": "dtmi:example:vroo_theta;1",
+              "@id": "dtmi:example:zeta_iota;1",
               "@type": "Enum",
               "valueSchema": "integer",
               "@context": "dtmi:dtdl:context;3"
@@ -186,29 +186,84 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_xi;1",
+        "@id": "dtmi:example:zeta_pi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:zeta_omicron;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "zeta_xi",
+            "schema": {
+              "@id": "dtmi:example:zeta_nu;1",
+              "@type": "Enum",
+              "valueSchema": "integer",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:zeta_upsilon;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:zeta_tau;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Telemetry",
+            "name": "zeta_sigma",
+            "schema": {
+              "@id": "dtmi:example:zeta_rho;1",
+              "@type": "Enum",
+              "valueSchema": "integer",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:zeta_psi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 1100,
-              "name": "vroo_nu"
+              "enumValue": 1113,
+              "name": "zeta_chi"
             }
           ],
           "valueSchema": "integer"
         },
         "contents": {
           "@type": "Telemetry",
-          "name": "vroo_omicron",
+          "name": "zeta_omega",
           "schema": [
             {
               "@type": "Enum",
               "enumValues": [
                 {
-                  "enumValue": 1099,
-                  "name": "vroo_mu"
+                  "enumValue": 1112,
+                  "name": "zeta_phi"
                 }
               ],
               "valueSchema": "integer"
@@ -227,15 +282,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_sigma;1",
+        "@id": "dtmi:example:zeta_um;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 1102,
-              "name": "vroo_rho"
+              "enumValue": 1115,
+              "name": "zeta_wum"
             }
           ],
           "valueSchema": "integer"
@@ -243,14 +298,14 @@
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "vroo_tau",
+          "name": "zeta_humpf",
           "schema": [
             {
               "@type": "Enum",
               "enumValues": [
                 {
-                  "enumValue": 1101,
-                  "name": "vroo_pi"
+                  "enumValue": 1114,
+                  "name": "zeta_yuzz"
                 }
               ],
               "valueSchema": "integer"
@@ -269,11 +324,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_phi;1",
+        "@id": "dtmi:example:zeta_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "vroo_upsilon",
+          "name": "zeta_fuddle",
           "schema": "date"
         }
       }
@@ -287,11 +342,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_psi;1",
+        "@id": "dtmi:example:zeta_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "vroo_chi",
+          "name": "zeta_nuh",
           "schema": [
             "date"
           ]
@@ -307,11 +362,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_yuzz;1",
+        "@id": "dtmi:example:zeta_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "vroo_omega",
+          "name": "zeta_quan",
           "schema": "dtmi:dtdl:instance:Schema:date;2"
         }
       }
@@ -325,11 +380,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_um;1",
+        "@id": "dtmi:example:zeta_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "vroo_wum",
+          "name": "zeta_spazz",
           "schema": [
             "dtmi:dtdl:instance:Schema:date;2"
           ]
@@ -345,11 +400,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_fuddle;1",
+        "@id": "dtmi:example:zeta_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "vroo_humpf",
+          "name": "zeta_zatz",
           "schema": "point"
         }
       }
@@ -363,11 +418,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_nuh;1",
+        "@id": "dtmi:example:zeta_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "vroo_glikk",
+          "name": "zeta_flunn",
           "schema": [
             "point"
           ]
@@ -383,11 +438,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_quan;1",
+        "@id": "dtmi:example:zeta_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "vroo_snee",
+          "name": "zeta_yekk",
           "schema": "dtmi:standard:schema:geospatial:point;2"
         }
       }
@@ -401,11 +456,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_spazz;1",
+        "@id": "dtmi:example:eta_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "vroo_thnad",
+          "name": "zeta_hi",
           "schema": [
             "dtmi:standard:schema:geospatial:point;2"
           ]
@@ -421,11 +476,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_zatz;1",
+        "@id": "dtmi:example:eta_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "vroo_floob",
+          "name": "eta_beta",
           "schema": "Foobar"
         }
       }
@@ -439,12 +494,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_flunn;1",
+        "@id": "dtmi:example:eta_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "vroo_jogg",
+          "name": "eta_delta",
           "schema": "Foobar"
         }
       }
@@ -458,11 +513,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_yekk;1",
+        "@id": "dtmi:example:eta_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "vroo_itch",
+          "name": "eta_zeta",
           "schema": null
         }
       }
@@ -476,12 +531,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:vroo_hi;1",
+        "@id": "dtmi:example:eta_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "vroo_vroo",
+          "name": "eta_theta",
           "schema": null
         }
       }
@@ -495,11 +550,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_beta;1",
+        "@id": "dtmi:example:eta_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "hi_alpha",
+          "name": "eta_kappa",
           "schema": true
         }
       }
@@ -513,12 +568,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_delta;1",
+        "@id": "dtmi:example:eta_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "hi_gamma",
+          "name": "eta_mu",
           "schema": true
         }
       }
@@ -532,11 +587,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_zeta;1",
+        "@id": "dtmi:example:eta_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "hi_epsilon",
+          "name": "eta_xi",
           "schema": 626
         }
       }
@@ -550,12 +605,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_theta;1",
+        "@id": "dtmi:example:eta_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "hi_eta",
+          "name": "eta_pi",
           "schema": 626
         }
       }
@@ -569,11 +624,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_kappa;1",
+        "@id": "dtmi:example:eta_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "hi_iota",
+          "name": "eta_sigma",
           "schema": [
             null
           ]
@@ -589,12 +644,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_mu;1",
+        "@id": "dtmi:example:eta_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "hi_lambda",
+          "name": "eta_upsilon",
           "schema": [
             null
           ]
@@ -610,11 +665,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_xi;1",
+        "@id": "dtmi:example:eta_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "hi_nu",
+          "name": "eta_chi",
           "schema": [
             true
           ]
@@ -630,12 +685,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_pi;1",
+        "@id": "dtmi:example:eta_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "hi_omicron",
+          "name": "eta_omega",
           "schema": [
             true
           ]
@@ -651,11 +706,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_sigma;1",
+        "@id": "dtmi:example:eta_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "hi_rho",
+          "name": "eta_wum",
           "schema": [
             626
           ]
@@ -671,12 +726,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_upsilon;1",
+        "@id": "dtmi:example:eta_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "hi_tau",
+          "name": "eta_humpf",
           "schema": [
             626
           ]
@@ -692,11 +747,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_chi;1",
+        "@id": "dtmi:example:eta_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "hi_phi",
+          "name": "eta_glikk",
           "schema": {}
         }
       }
@@ -710,12 +765,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_omega;1",
+        "@id": "dtmi:example:eta_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "hi_psi",
+          "name": "eta_snee",
           "schema": {}
         }
       }
@@ -729,11 +784,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_wum;1",
+        "@id": "dtmi:example:eta_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "hi_yuzz",
+          "name": "eta_thnad",
           "schema": [
             {}
           ]
@@ -749,12 +804,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_humpf;1",
+        "@id": "dtmi:example:eta_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "hi_um",
+          "name": "eta_floob",
           "schema": [
             {}
           ]
@@ -770,11 +825,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_glikk;1",
+        "@id": "dtmi:example:eta_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "hi_fuddle",
+          "name": "eta_jogg",
           "schema": []
         }
       }
@@ -788,12 +843,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_snee;1",
+        "@id": "dtmi:example:eta_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "hi_nuh",
+          "name": "eta_itch",
           "schema": []
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryPropertySchemaTermAndDtmiV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryPropertySchemaTermAndDtmiV2.json
index f121178b..18fc9aa7 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryPropertySchemaTermAndDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryPropertySchemaTermAndDtmiV2.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_alpha;1",
+        "@id": "dtmi:example:xi_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "zeta_hi",
+          "name": "xi_iota",
           "schema": "float",
           "dtmi:dtdl:property:schema;2": "integer"
         }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:eta_gamma;1",
+        "@id": "dtmi:example:xi_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "eta_beta",
+          "name": "xi_lambda",
           "schema": "long",
           "dtmi:dtdl:property:schema;2": "string"
         }
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryPropertySchemaTypeConformanceV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryPropertySchemaTypeConformanceV2.json
index 7eb71975..68390a7d 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryPropertySchemaTypeConformanceV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryPropertySchemaTypeConformanceV2.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:hi_yekk;1",
+        "@id": "dtmi:example:theta_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "hi_itch",
+          "name": "theta_zeta",
           "schema": {
-            "@id": "dtmi:example:hi_flunn;1",
+            "@id": "dtmi:example:theta_epsilon;1",
             "elementSchema": "time",
             "@type": "Array"
           }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_beta;1",
+        "@id": "dtmi:example:theta_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "alpha_alpha",
+          "name": "theta_kappa",
           "schema": {
-            "@id": "dtmi:example:hi_vroo;1",
-            "name": "hi_hi",
+            "@id": "dtmi:example:theta_theta;1",
+            "name": "theta_iota",
             "@type": "Command"
           }
         }
@@ -51,15 +51,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_zeta;1",
+        "@id": "dtmi:example:theta_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "alpha_epsilon",
+          "name": "theta_xi",
           "schema": {
-            "@id": "dtmi:example:alpha_gamma;1",
-            "name": "alpha_delta",
+            "@id": "dtmi:example:theta_mu;1",
+            "name": "theta_nu",
             "@type": "Command"
           }
         }
@@ -74,14 +74,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_kappa;1",
+        "@id": "dtmi:example:theta_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "alpha_iota",
+          "name": "theta_sigma",
           "schema": {
-            "@id": "dtmi:example:alpha_eta;1",
-            "name": "alpha_theta",
+            "@id": "dtmi:example:theta_pi;1",
+            "name": "theta_rho",
             "schema": "boolean",
             "@type": "CommandPayload"
           }
@@ -97,15 +97,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_xi;1",
+        "@id": "dtmi:example:theta_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "alpha_nu",
+          "name": "theta_chi",
           "schema": {
-            "@id": "dtmi:example:alpha_lambda;1",
-            "name": "alpha_mu",
+            "@id": "dtmi:example:theta_upsilon;1",
+            "name": "theta_phi",
             "schema": "date",
             "@type": "CommandPayload"
           }
@@ -121,16 +121,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_tau;1",
+        "@id": "dtmi:example:theta_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "alpha_sigma",
+          "name": "theta_um",
           "schema": {
-            "@id": "dtmi:example:alpha_omicron;1",
-            "name": "alpha_pi",
+            "@id": "dtmi:example:theta_omega;1",
+            "name": "theta_yuzz",
             "schema": {
-              "@id": "dtmi:example:alpha_rho;1",
+              "@id": "dtmi:example:theta_wum;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -147,17 +147,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_omega;1",
+        "@id": "dtmi:example:theta_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "alpha_psi",
+          "name": "theta_snee",
           "schema": {
-            "@id": "dtmi:example:alpha_upsilon;1",
-            "name": "alpha_phi",
+            "@id": "dtmi:example:theta_fuddle;1",
+            "name": "theta_glikk",
             "schema": {
-              "@id": "dtmi:example:alpha_chi;1",
+              "@id": "dtmi:example:theta_nuh;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -174,17 +174,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_humpf;1",
+        "@id": "dtmi:example:theta_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "alpha_um",
+          "name": "theta_floob",
           "schema": {
-            "@id": "dtmi:example:alpha_yuzz;1",
+            "@id": "dtmi:example:theta_thnad;1",
             "enumValues": [
               {
-                "enumValue": 1103,
-                "name": "alpha_wum"
+                "enumValue": 1116,
+                "name": "theta_spazz"
               }
             ],
             "valueSchema": "integer",
@@ -202,15 +202,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_snee;1",
+        "@id": "dtmi:example:theta_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "alpha_nuh",
+          "name": "theta_itch",
           "schema": {
-            "@id": "dtmi:example:alpha_fuddle;1",
-            "enumValue": 1104,
-            "name": "alpha_glikk",
+            "@id": "dtmi:example:theta_jogg;1",
+            "enumValue": 1117,
+            "name": "theta_flunn",
             "@type": "EnumValue"
           }
         }
@@ -225,16 +225,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_floob;1",
+        "@id": "dtmi:example:iota_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "alpha_spazz",
+          "name": "iota_alpha",
           "schema": {
-            "@id": "dtmi:example:alpha_quan;1",
-            "enumValue": 1105,
-            "name": "alpha_thnad",
+            "@id": "dtmi:example:theta_vroo;1",
+            "enumValue": 1118,
+            "name": "theta_hi",
             "@type": "EnumValue"
           }
         }
@@ -249,14 +249,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:alpha_itch;1",
+        "@id": "dtmi:example:iota_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "alpha_flunn",
+          "name": "iota_epsilon",
           "schema": {
-            "@id": "dtmi:example:alpha_zatz;1",
-            "name": "alpha_jogg",
+            "@id": "dtmi:example:iota_gamma;1",
+            "name": "iota_delta",
             "schema": "dateTime",
             "@type": "Field"
           }
@@ -272,15 +272,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_alpha;1",
+        "@id": "dtmi:example:iota_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "alpha_hi",
+          "name": "iota_iota",
           "schema": {
-            "@id": "dtmi:example:alpha_yekk;1",
-            "name": "alpha_vroo",
+            "@id": "dtmi:example:iota_eta;1",
+            "name": "iota_theta",
             "schema": "double",
             "@type": "Field"
           }
@@ -296,13 +296,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_delta;1",
+        "@id": "dtmi:example:iota_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "beta_gamma",
+          "name": "iota_mu",
           "schema": {
-            "@id": "dtmi:example:beta_beta;1",
+            "@id": "dtmi:example:iota_lambda;1",
             "@type": "Interface"
           }
         }
@@ -317,14 +317,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_eta;1",
+        "@id": "dtmi:example:iota_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "beta_zeta",
+          "name": "iota_omicron",
           "schema": {
-            "@id": "dtmi:example:beta_epsilon;1",
+            "@id": "dtmi:example:iota_xi;1",
             "@type": "Interface"
           }
         }
@@ -339,19 +339,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_mu;1",
+        "@id": "dtmi:example:iota_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "beta_lambda",
+          "name": "iota_upsilon",
           "schema": {
-            "@id": "dtmi:example:beta_theta;1",
+            "@id": "dtmi:example:iota_rho;1",
             "mapKey": {
-              "name": "beta_iota",
+              "name": "iota_sigma",
               "schema": "string"
             },
             "mapValue": {
-              "name": "beta_kappa",
+              "name": "iota_tau",
               "schema": "duration"
             },
             "@type": "Map"
@@ -368,14 +368,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_pi;1",
+        "@id": "dtmi:example:iota_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "beta_omicron",
+          "name": "iota_omega",
           "schema": {
-            "@id": "dtmi:example:beta_nu;1",
-            "name": "beta_xi",
+            "@id": "dtmi:example:iota_chi;1",
+            "name": "iota_psi",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -391,15 +391,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_upsilon;1",
+        "@id": "dtmi:example:iota_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "beta_tau",
+          "name": "iota_humpf",
           "schema": {
-            "@id": "dtmi:example:beta_rho;1",
-            "name": "beta_sigma",
+            "@id": "dtmi:example:iota_wum;1",
+            "name": "iota_um",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -415,14 +415,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_omega;1",
+        "@id": "dtmi:example:iota_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "beta_psi",
+          "name": "iota_snee",
           "schema": {
-            "@id": "dtmi:example:beta_phi;1",
-            "name": "beta_chi",
+            "@id": "dtmi:example:iota_glikk;1",
+            "name": "iota_nuh",
             "schema": "float",
             "@type": "MapValue"
           }
@@ -438,15 +438,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_humpf;1",
+        "@id": "dtmi:example:iota_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "beta_um",
+          "name": "iota_floob",
           "schema": {
-            "@id": "dtmi:example:beta_yuzz;1",
-            "name": "beta_wum",
+            "@id": "dtmi:example:iota_thnad;1",
+            "name": "iota_spazz",
             "schema": "integer",
             "@type": "MapValue"
           }
@@ -462,16 +462,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_snee;1",
+        "@id": "dtmi:example:iota_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "beta_nuh",
+          "name": "iota_itch",
           "schema": {
-            "@id": "dtmi:example:beta_fuddle;1",
+            "@id": "dtmi:example:iota_jogg;1",
             "fields": [
               {
-                "name": "beta_glikk",
+                "name": "iota_flunn",
                 "schema": "long"
               }
             ],
@@ -489,14 +489,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_floob;1",
+        "@id": "dtmi:example:kappa_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "beta_spazz",
+          "name": "kappa_alpha",
           "schema": {
-            "@id": "dtmi:example:beta_quan;1",
-            "name": "beta_thnad",
+            "@id": "dtmi:example:iota_vroo;1",
+            "name": "iota_hi",
             "schema": "string",
             "@type": "Property"
           }
@@ -512,15 +512,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:beta_itch;1",
+        "@id": "dtmi:example:kappa_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "beta_flunn",
+          "name": "kappa_epsilon",
           "schema": {
-            "@id": "dtmi:example:beta_zatz;1",
-            "name": "beta_jogg",
+            "@id": "dtmi:example:kappa_gamma;1",
+            "name": "kappa_delta",
             "schema": "time",
             "@type": "Property"
           }
@@ -536,14 +536,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_alpha;1",
+        "@id": "dtmi:example:kappa_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "beta_hi",
+          "name": "kappa_iota",
           "schema": {
-            "@id": "dtmi:example:beta_yekk;1",
-            "name": "beta_vroo",
+            "@id": "dtmi:example:kappa_eta;1",
+            "name": "kappa_theta",
             "@type": "Relationship"
           }
         }
@@ -558,15 +558,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_epsilon;1",
+        "@id": "dtmi:example:kappa_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "gamma_delta",
+          "name": "kappa_nu",
           "schema": {
-            "@id": "dtmi:example:gamma_beta;1",
-            "name": "gamma_gamma",
+            "@id": "dtmi:example:kappa_lambda;1",
+            "name": "kappa_mu",
             "@type": "Relationship"
           }
         }
@@ -581,14 +581,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_iota;1",
+        "@id": "dtmi:example:kappa_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "gamma_theta",
+          "name": "kappa_rho",
           "schema": {
-            "@id": "dtmi:example:gamma_zeta;1",
-            "name": "gamma_eta",
+            "@id": "dtmi:example:kappa_omicron;1",
+            "name": "kappa_pi",
             "schema": "boolean",
             "@type": "Telemetry"
           }
@@ -604,15 +604,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:gamma_nu;1",
+        "@id": "dtmi:example:kappa_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "gamma_mu",
+          "name": "kappa_phi",
           "schema": {
-            "@id": "dtmi:example:gamma_kappa;1",
-            "name": "gamma_lambda",
+            "@id": "dtmi:example:kappa_tau;1",
+            "name": "kappa_upsilon",
             "schema": "date",
             "@type": "Telemetry"
           }
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryRequiredPropertiesV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryRequiredPropertiesV2.json
index 1962d89a..d383085f 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryRequiredPropertiesV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryRequiredPropertiesV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_nuh;1",
+        "@id": "dtmi:example:alpha_snee;1",
         "@type": "Interface",
         "contents": {
-          "name": "zatz_glikk",
+          "name": "alpha_nuh",
           "schema": "duration"
         }
       }
@@ -24,11 +24,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_quan;1",
+        "@id": "dtmi:example:alpha_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "zatz_snee",
+          "name": "alpha_quan",
           "schema": "float"
         }
       }
@@ -42,7 +42,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_thnad;1",
+        "@id": "dtmi:example:alpha_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -59,7 +59,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_spazz;1",
+        "@id": "dtmi:example:alpha_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -77,11 +77,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_zatz;1",
+        "@id": "dtmi:example:alpha_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "zatz_floob"
+          "name": "alpha_zatz"
         }
       }
     ]
@@ -94,12 +94,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_flunn;1",
+        "@id": "dtmi:example:alpha_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "zatz_jogg"
+          "name": "alpha_flunn"
         }
       }
     ]
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryTypeIncludesInvalidDtmiV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryTypeIncludesInvalidDtmiV2.json
index bacc5c0d..61cb9413 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryTypeIncludesInvalidDtmiV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryTypeIncludesInvalidDtmiV2.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_delta;1",
+        "@id": "dtmi:example:delta_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:foo//bar"
           ],
-          "name": "itch_gamma",
+          "name": "delta_delta",
           "schema": "duration"
         }
       }
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:itch_zeta;1",
+        "@id": "dtmi:example:delta_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,7 +36,7 @@
             "Telemetry",
             "dtmi:foo//bar"
           ],
-          "name": "itch_epsilon",
+          "name": "delta_zeta",
           "schema": "float"
         }
       }
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryTypeIncludesMaterialV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryTypeIncludesMaterialV2.json
index 728cb0fa..33ce56ad 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryTypeIncludesMaterialV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryTypeIncludesMaterialV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_glikk;1",
+        "@id": "dtmi:example:beta_nuh;1",
         "@type": "Interface",
         "contents": {
-          "name": "jogg_fuddle",
+          "name": "beta_glikk",
           "schema": "duration",
           "@type": "Telemetry"
         }
@@ -25,10 +25,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_snee;1",
+        "@id": "dtmi:example:beta_quan;1",
         "@type": "Interface",
         "contents": {
-          "name": "jogg_nuh",
+          "name": "beta_snee",
           "schema": "float",
           "@type": [
             "Telemetry"
@@ -45,10 +45,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_thnad;1",
+        "@id": "dtmi:example:beta_spazz;1",
         "@type": "Interface",
         "contents": {
-          "name": "jogg_quan",
+          "name": "beta_thnad",
           "schema": "integer",
           "@type": "dtmi:dtdl:class:Telemetry;2"
         }
@@ -63,10 +63,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_floob;1",
+        "@id": "dtmi:example:beta_zatz;1",
         "@type": "Interface",
         "contents": {
-          "name": "jogg_spazz",
+          "name": "beta_floob",
           "schema": "long",
           "@type": [
             "dtmi:dtdl:class:Telemetry;2"
@@ -83,10 +83,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_jogg;1",
+        "@id": "dtmi:example:beta_flunn;1",
         "@type": "Interface",
         "contents": {
-          "name": "jogg_zatz",
+          "name": "beta_jogg",
           "schema": "string",
           "@type": "Something"
         }
@@ -101,11 +101,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_itch;1",
+        "@id": "dtmi:example:beta_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "jogg_flunn",
+          "name": "beta_itch",
           "schema": "time",
           "@type": "Something"
         }
@@ -120,10 +120,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_vroo;1",
+        "@id": "dtmi:example:beta_hi;1",
         "@type": "Interface",
         "contents": {
-          "name": "jogg_yekk",
+          "name": "beta_vroo",
           "schema": "boolean",
           "@type": [
             "Something"
@@ -140,11 +140,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:flunn_alpha;1",
+        "@id": "dtmi:example:gamma_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "jogg_hi",
+          "name": "gamma_alpha",
           "schema": "date",
           "@type": [
             "Something"
diff --git a/DTDL/v2/spec/Requirement-ClassTelemetryTypeStringOrArrayV2.json b/DTDL/v2/spec/Requirement-ClassTelemetryTypeStringOrArrayV2.json
index a78bdfc5..9713d41b 100644
--- a/DTDL/v2/spec/Requirement-ClassTelemetryTypeStringOrArrayV2.json
+++ b/DTDL/v2/spec/Requirement-ClassTelemetryTypeStringOrArrayV2.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_yekk;1",
+        "@id": "dtmi:example:alpha_vroo;1",
         "@type": "Interface",
         "contents": {
-          "name": "zatz_itch",
+          "name": "alpha_yekk",
           "schema": "string",
           "@type": 626
         }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:zatz_hi;1",
+        "@id": "dtmi:example:beta_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "zatz_vroo",
+          "name": "alpha_hi",
           "schema": "time",
           "@type": 626
         }
@@ -44,10 +44,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_beta;1",
+        "@id": "dtmi:example:beta_gamma;1",
         "@type": "Interface",
         "contents": {
-          "name": "jogg_alpha",
+          "name": "beta_beta",
           "schema": "boolean",
           "@type": null
         }
@@ -62,11 +62,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_delta;1",
+        "@id": "dtmi:example:beta_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "jogg_gamma",
+          "name": "beta_delta",
           "schema": "date",
           "@type": null
         }
@@ -81,10 +81,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_zeta;1",
+        "@id": "dtmi:example:beta_eta;1",
         "@type": "Interface",
         "contents": {
-          "name": "jogg_epsilon",
+          "name": "beta_zeta",
           "schema": "dateTime",
           "@type": true
         }
@@ -99,11 +99,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_theta;1",
+        "@id": "dtmi:example:beta_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "jogg_eta",
+          "name": "beta_theta",
           "schema": "double",
           "@type": true
         }
@@ -118,10 +118,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_kappa;1",
+        "@id": "dtmi:example:beta_lambda;1",
         "@type": "Interface",
         "contents": {
-          "name": "jogg_iota",
+          "name": "beta_kappa",
           "schema": "duration",
           "@type": {}
         }
@@ -136,11 +136,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_mu;1",
+        "@id": "dtmi:example:beta_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "jogg_lambda",
+          "name": "beta_mu",
           "schema": "float",
           "@type": {}
         }
@@ -155,10 +155,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_xi;1",
+        "@id": "dtmi:example:beta_omicron;1",
         "@type": "Interface",
         "contents": {
-          "name": "jogg_nu",
+          "name": "beta_xi",
           "schema": "integer",
           "@type": [
             626
@@ -175,11 +175,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_pi;1",
+        "@id": "dtmi:example:beta_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "jogg_omicron",
+          "name": "beta_pi",
           "schema": "long",
           "@type": [
             626
@@ -196,10 +196,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_sigma;1",
+        "@id": "dtmi:example:beta_tau;1",
         "@type": "Interface",
         "contents": {
-          "name": "jogg_rho",
+          "name": "beta_sigma",
           "schema": "string",
           "@type": [
             null
@@ -216,11 +216,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_upsilon;1",
+        "@id": "dtmi:example:beta_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "jogg_tau",
+          "name": "beta_upsilon",
           "schema": "time",
           "@type": [
             null
@@ -237,10 +237,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_chi;1",
+        "@id": "dtmi:example:beta_psi;1",
         "@type": "Interface",
         "contents": {
-          "name": "jogg_phi",
+          "name": "beta_chi",
           "schema": "boolean",
           "@type": [
             true
@@ -257,11 +257,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_omega;1",
+        "@id": "dtmi:example:beta_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "jogg_psi",
+          "name": "beta_omega",
           "schema": "date",
           "@type": [
             true
@@ -278,10 +278,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_wum;1",
+        "@id": "dtmi:example:beta_um;1",
         "@type": "Interface",
         "contents": {
-          "name": "jogg_yuzz",
+          "name": "beta_wum",
           "schema": "dateTime",
           "@type": [
             {}
@@ -298,11 +298,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;2",
-        "@id": "dtmi:example:jogg_humpf;1",
+        "@id": "dtmi:example:beta_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "jogg_um",
+          "name": "beta_humpf",
           "schema": "double",
           "@type": [
             {}
diff --git a/DTDL/v2/spec/Requirement-TopLevelDtdlContextV2.json b/DTDL/v2/spec/Requirement-TopLevelDtdlContextV2.json
index ce2d7b3d..1a3c3677 100644
--- a/DTDL/v2/spec/Requirement-TopLevelDtdlContextV2.json
+++ b/DTDL/v2/spec/Requirement-TopLevelDtdlContextV2.json
@@ -99,5 +99,38 @@
         "@type": "Interface"
       }
     ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;2#limitless",
+          "dtmi:dtdl:context;2#limits"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;2#limitless",
+          "dtmi:dtdl:context;2#limits",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
   }
 ]
diff --git a/DTDL/v3/DTDL.Extensions.md b/DTDL/v3/DTDL.Extensions.md
index 2cd224e6..3828be07 100644
--- a/DTDL/v3/DTDL.Extensions.md
+++ b/DTDL/v3/DTDL.Extensions.md
@@ -1,109 +1 @@
-# DTDL language extensions
-
-The Digital Twins Definition Language (DTDL) is made up of a set of metamodel classes.
-In addition to its native classes &mdash; Interface, Command, Component, Property, Relationship, and Telemetry &mdash; DTDL supports *language extensions* that define additional metamodel classes.
-There are two categories of language extensions:
-*Partner extensions* add types, properties, and elements that are relevant to a specific cloud service.
-*Feature extensions* add non-core features to the DTDL language in a selectable manner.
-
-Each extension commonly includes one or more *adjunct types*, which are types that can be added to the `@type` property of a DTDL element.
-For example, a Property can be co-typed with the adjunct type Historized defined in the [Historization](./DTDL.historization.v1.md) feature extension:
-
-```json
-{
-  "@context": [
-      "dtmi:dtdl:context;3",
-      "dtmi:dtdl:extension:historization;1"
-  ],
-  "@id": "dtmi:com:example:Thermometer;1",
-  "@type": "Interface",
-  "contents": [
-    {
-      "@type": [ "Property", "Historized" ],
-      "name": "currentTemp",
-      "schema": "double"
-    }
-  ]
-}
-```
-
-Each language extension is identifed by a JSON-LD context specifier, which is a [DTMI](../../DTMI/README.md).
-To use a language extension, a model's `@context` property includes the extension's context specifier in addition to the DTDL context specifier, as illustrated in the example above.
-The order of context specifiers is important; different versions of DTDL may have different sets of extensions available, so it is necessary to first declare the DTDL version with a DTDL context specifier before declaring any language extensions via extension context specifiers.
-
-Of particular note is the [QuantitativeTypes](./DTDL.quantitativeTypes.v1.md) extension.
-DTDL v2 provides native support for semantic types and units, so the following example is valid.
-The Telemetry named "currentTemp" is co-typed Temperature, and it has a `unit` property with value *degreeFahrenheit*.
-Note that the only context specifier is the core DTDL v2 context, "dtmi:dtdl:context;2".
-
-```json
-{
-  "@context": "dtmi:dtdl:context;2",
-  "@id": "dtmi:com:example:Sensor;1",
-  "@type": "Interface",
-  "contents": [
-    {
-      "@type": [ "Telemetry", "Temperature" ],
-      "name": "currentTemp",
-      "schema": "double",
-      "unit": "degreeFahrenheit"
-    }
-  ]
-}
-```
-
-Begining with DTDL v3, semantic types and units are no longer included in the core DTDL language.
-Instead, they are included in the [QuantitativeTypes](./DTDL.quantitativeTypes.v1.md) feature extension, enabling them to evolve more rapidly that the core language is expected to evolve.
-The following example is the same as the above except the DTDL context has been upgraded from 2 to 3.
-Conseqently, an additional context for the QuantitativeTypes extension is also specified.
-
-```json
-{
-  "@context": [
-      "dtmi:dtdl:context;3",
-      "dtmi:dtdl:extension:quantitativeTypes;1"
-  ],
-  "@id": "dtmi:com:example:Sensor;1",
-  "@type": "Interface",
-  "contents": [
-    {
-      "@type": [ "Telemetry", "Temperature" ],
-      "name": "currentTemp",
-      "schema": "double",
-      "unit": "degreeFahrenheit"
-    }
-  ]
-}
-```
-
-## Available partner extensions
-
-The chart below lists the partner extensions that are currently available.
-
-| Extension | Description | DTDL versions |
-| --- | --- | --- |
-| [Iotcentral v2](../v2/DTDL.iotcentral.v2.md) | A set of semantic types and schema types used by IoT Central. | [2](../v2/DTDL.v2.md) |
-
-## Available feature extensions
-
-The chart below lists the feature extensions that are currently available.
-
-| Extension | Description | DTDL versions |
-| --- | --- | --- |
-| [QuantitativeTypes v1](./DTDL.quantitativeTypes.v1.md) | A set of standard semantic types, unit types, and units. | [3](./DTDL.v3.md) |
-| [Historization v1](./DTDL.historization.v1.md) | Record the historical sequence of values of a Property or Telemetry and the times at which values change. | [3](./DTDL.v3.md) |
-| [Annotation v1](./DTDL.annotation.v1.md) | Add custom metadata to a Property or a Telemetry. | [3](./DTDL.v3.md) |
-| [Overriding v1](./DTDL.overriding.v1.md) | Override a model property with an instance value. | [3](./DTDL.v3.md) |
-| [MQTT v1](./DTDL.mqtt.v1.md) | Specify Interface properties to facilitate communication via the MQTT pub/sub protocol. | [3](./DTDL.v3.md) |
-
-## Service and tool support of language extensions
-
-A service or tool is permitted to claim full support of DTDL as long as it understands the core language.
-No service or tool is required to support any given language extension, and lack of extension support does not impinge on the claim of DTDL compatibility.
-If a service or tool does not recognize an extension context specifier, it ignores the context definitions and any adjunct types and properties it does not recognize.
-If a model employs a language extension that is understood by a service or tool, the model can be used in a different service or tool that does not understand the extension.
-However, aspects of the model defined by the language extension will not be understood by the latter service or tool.
-
-> Note: A service that does not understand an extension will not be able to determine whether the extension is used in a model correctly.
-When using a language extension, always validate your model against a tool or service that recognizes the extension context; otherwise, errors in your model may go undetected.
-
+The latest version of this document can be found [here](../v4/DTDL.Extensions.md).
diff --git a/DTDL/v3/DTDL.Specification.v3.md b/DTDL/v3/DTDL.Specification.v3.md
index 3b86915f..2653b6d3 100644
--- a/DTDL/v3/DTDL.Specification.v3.md
+++ b/DTDL/v3/DTDL.Specification.v3.md
@@ -30,7 +30,7 @@ It is based on [JSON-LD](https://json-ld.org/spec/FCGS/json-ld/20180607/), which
 DTDL can be understood and validated without knowing RDF or JSON-LD, and the present document specifies DTDL without reference to either of these other standards.
 DTDL cannot be readily understood without a basic knowledge of JSON; however, JSON syntax is fortunately straightforward, in marked contrast to the size, complexity, and subtlety of JSON-LD.
 
-Within this document, the key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED",  "MAY", and "OPTIONAL" are to be interpreted as described in IETF [RFC 2119](https://tools.ietf.org/search/rfc2119) as updated by [RFC 8174](https://tools.ietf.org/search/rfc8174), per [BCP 14](https://tools.ietf.org/search/bcp14).
+Within this document, the key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED",  "MAY", and "OPTIONAL" are to be interpreted as described in IETF [RFC 2119](https://www.rfc-editor.org/rfc/rfc2119) as updated by [RFC 8174](https://www.rfc-editor.org/rfc/rfc8174), per [BCP 14](https://www.rfc-editor.org/info/bcp14).
 Although these IETF documents make no distinction between the meaning of "MUST" and "SHALL", in the present document a violation of a "MUST" requirement indicates an **invalid** model, whereas a violation of a "SHALL" requirement indicates an **incomplete** model.
 See [Model completeness](#model-completeness) for a description of this distinction.
 
@@ -50,7 +50,7 @@ Following is a complete set of JSON terms with concise definitions:
 * value &mdash; an object OR array OR string OR number OR boolean OR null
 
 For brevity and simplicity, the definitions above &mdash; particularly for number and string &mdash; are succinct to the point of imprecision.
-See IETF [RFC 8259](https://tools.ietf.org/search/rfc8259) for more details on JSON syntax.
+See IETF [RFC 8259](https://www.rfc-editor.org/rfc/rfc8259) for more details on JSON syntax.
 Note that the term "boolean" is never used in the JSON spec; the paired terms "true" and "false" are always used instead.
 Another term not used in the JSON spec is "integer", which herein will mean an integral number expressible in 4 bytes.
 
@@ -168,8 +168,8 @@ If the definition of this extension is not known, the model is contextually inco
 ```json
 {
   "@context": [
-      "dtmi:dtdl:context;3",
-      "dtmi:example:someExtensionContext;1"
+    "dtmi:dtdl:context;3",
+    "dtmi:example:someExtensionContext;1"
   ],
   "@id": "dtmi:example:someInterface;1",
   "@type": "Interface",
@@ -328,10 +328,10 @@ Example:
 ```json
 {
   "@context": "dtmi:dtdl:context;3",
-  "@id": "dtmi:example:beta_upsilon;1",
+  "@id": "dtmi:example:beta_yuzz;1",
   "@type": "Interface",
   "schemas": {
-    "@id": "dtmi:example:beta_tau;1",
+    "@id": "dtmi:example:beta_omega;1",
     "@type": "Array",
     "elementSchema": "boolean"
   }
@@ -400,11 +400,11 @@ Example:
 ```json
 {
   "@context": "dtmi:dtdl:context;3",
-  "@id": "dtmi:example:beta_chi;1",
+  "@id": "dtmi:example:beta_um;1",
   "@type": "Interface",
   "contents": {
     "@type": "Command",
-    "name": "beta_phi"
+    "name": "beta_wum"
   }
 }
 ```
@@ -486,13 +486,13 @@ Example:
 ```json
 {
   "@context": "dtmi:dtdl:context;3",
-  "@id": "dtmi:example:beta_um;1",
+  "@id": "dtmi:example:beta_snee;1",
   "@type": "Interface",
   "contents": {
     "@type": "Command",
-    "name": "beta_wum",
+    "name": "beta_nuh",
     "request": {
-      "name": "beta_yuzz",
+      "name": "beta_glikk",
       "schema": "date"
     }
   }
@@ -565,13 +565,13 @@ Example:
 ```json
 {
   "@context": "dtmi:dtdl:context;3",
-  "@id": "dtmi:example:beta_glikk;1",
+  "@id": "dtmi:example:beta_spazz;1",
   "@type": "Interface",
   "contents": {
     "@type": "Command",
-    "name": "beta_fuddle",
+    "name": "beta_thnad",
     "response": {
-      "name": "beta_humpf",
+      "name": "beta_quan",
       "schema": "dateTime"
     }
   }
@@ -644,13 +644,13 @@ Example:
 ```json
 {
   "@context": "dtmi:dtdl:context;3",
-  "@id": "dtmi:example:beta_quan;1",
+  "@id": "dtmi:example:beta_jogg;1",
   "@type": "Interface",
   "contents": {
     "@type": "Component",
-    "name": "beta_nuh",
+    "name": "beta_floob",
     "schema": {
-      "@id": "dtmi:example:beta_snee;1",
+      "@id": "dtmi:example:beta_zatz;1",
       "@type": "Interface"
     }
   }
@@ -724,10 +724,10 @@ Example:
 ```json
 {
   "@context": "dtmi:dtdl:context;3",
-  "@id": "dtmi:example:beta_zatz;1",
+  "@id": "dtmi:example:beta_vroo;1",
   "@type": "Interface",
   "schemas": {
-    "@id": "dtmi:example:beta_floob;1",
+    "@id": "dtmi:example:beta_yekk;1",
     "@type": "Enum",
     "valueSchema": "integer"
   }
@@ -800,15 +800,15 @@ Example:
 ```json
 {
   "@context": "dtmi:dtdl:context;3",
-  "@id": "dtmi:example:beta_yekk;1",
+  "@id": "dtmi:example:gamma_gamma;1",
   "@type": "Interface",
   "schemas": {
-    "@id": "dtmi:example:beta_itch;1",
+    "@id": "dtmi:example:gamma_beta;1",
     "@type": "Enum",
     "valueSchema": "integer",
     "enumValues": {
       "enumValue": 11,
-      "name": "beta_flunn"
+      "name": "gamma_alpha"
     }
   }
 }
@@ -880,13 +880,13 @@ Example:
 ```json
 {
   "@context": "dtmi:dtdl:context;3",
-  "@id": "dtmi:example:gamma_epsilon;1",
+  "@id": "dtmi:example:gamma_kappa;1",
   "@type": "Interface",
   "schemas": {
-    "@id": "dtmi:example:gamma_delta;1",
+    "@id": "dtmi:example:gamma_iota;1",
     "@type": "Object",
     "fields": {
-      "name": "gamma_gamma",
+      "name": "gamma_theta",
       "schema": "double"
     }
   }
@@ -961,7 +961,7 @@ Example:
 ```json
 {
   "@context": "dtmi:dtdl:context;3",
-  "@id": "dtmi:example:gamma_theta;1",
+  "@id": "dtmi:example:gamma_nu;1",
   "@type": "Interface"
 }
 ```
@@ -1042,17 +1042,17 @@ Example:
 ```json
 {
   "@context": "dtmi:dtdl:context;3",
-  "@id": "dtmi:example:gamma_mu;1",
+  "@id": "dtmi:example:gamma_rho;1",
   "@type": "Interface",
   "schemas": {
-    "@id": "dtmi:example:gamma_iota;1",
+    "@id": "dtmi:example:gamma_xi;1",
     "@type": "Map",
     "mapKey": {
-      "name": "gamma_kappa",
+      "name": "gamma_omicron",
       "schema": "string"
     },
     "mapValue": {
-      "name": "gamma_lambda",
+      "name": "gamma_pi",
       "schema": "duration"
     }
   }
@@ -1125,17 +1125,17 @@ Example:
 ```json
 {
   "@context": "dtmi:dtdl:context;3",
-  "@id": "dtmi:example:gamma_pi;1",
+  "@id": "dtmi:example:gamma_phi;1",
   "@type": "Interface",
   "schemas": {
-    "@id": "dtmi:example:gamma_xi;1",
+    "@id": "dtmi:example:gamma_tau;1",
     "@type": "Map",
     "mapValue": {
-      "name": "gamma_omicron",
+      "name": "gamma_upsilon",
       "schema": "float"
     },
     "mapKey": {
-      "name": "gamma_nu",
+      "name": "gamma_sigma",
       "schema": "string"
     }
   }
@@ -1207,17 +1207,17 @@ Example:
 ```json
 {
   "@context": "dtmi:dtdl:context;3",
-  "@id": "dtmi:example:gamma_upsilon;1",
+  "@id": "dtmi:example:gamma_yuzz;1",
   "@type": "Interface",
   "schemas": {
-    "@id": "dtmi:example:gamma_sigma;1",
+    "@id": "dtmi:example:gamma_psi;1",
     "@type": "Map",
     "mapKey": {
-      "name": "gamma_tau",
+      "name": "gamma_omega",
       "schema": "string"
     },
     "mapValue": {
-      "name": "gamma_rho",
+      "name": "gamma_chi",
       "schema": "integer"
     }
   }
@@ -1291,10 +1291,10 @@ Example:
 ```json
 {
   "@context": "dtmi:dtdl:context;3",
-  "@id": "dtmi:example:gamma_chi;1",
+  "@id": "dtmi:example:gamma_um;1",
   "@type": "Interface",
   "schemas": {
-    "@id": "dtmi:example:gamma_phi;1",
+    "@id": "dtmi:example:gamma_wum;1",
     "@type": "Object"
   }
 }
@@ -1360,11 +1360,11 @@ Example:
 ```json
 {
   "@context": "dtmi:dtdl:context;3",
-  "@id": "dtmi:example:gamma_omega;1",
+  "@id": "dtmi:example:gamma_fuddle;1",
   "@type": "Interface",
   "contents": {
     "@type": "Property",
-    "name": "gamma_psi",
+    "name": "gamma_humpf",
     "schema": "long"
   }
 }
@@ -1442,11 +1442,11 @@ Example:
 ```json
 {
   "@context": "dtmi:dtdl:context;3",
-  "@id": "dtmi:example:gamma_glikk;1",
+  "@id": "dtmi:example:gamma_spazz;1",
   "@type": "Interface",
   "contents": {
     "@type": "Relationship",
-    "name": "gamma_fuddle"
+    "name": "gamma_thnad"
   }
 }
 ```
@@ -1536,11 +1536,11 @@ Example:
 ```json
 {
   "@context": "dtmi:dtdl:context;3",
-  "@id": "dtmi:example:gamma_thnad;1",
+  "@id": "dtmi:example:gamma_flunn;1",
   "@type": "Interface",
   "contents": {
     "@type": "Telemetry",
-    "name": "gamma_quan",
+    "name": "gamma_jogg",
     "schema": "string"
   }
 }
@@ -1612,12 +1612,16 @@ In addition to the direct requirements on members of various [DTDL elements](#dt
 Specifically:
 
 * There [MUST NOT](spec/Requirement-ClassArrayPropertiesElementSchemaSchemaMaxDepthV3.json) be more than 5 "elementSchema" or "schema" members in any path from a DTDL [Array](#array) element to another DTDL element.
+* There [MUST NOT](spec/Requirement-ClassArrayPropertiesElementSchemaSchemaSelfReferenceV3.json) be a path from a DTDL [Array](#array) element wherein some "elementSchema" or "schema" member referentially includes the DTDL Array element where the path begins.
 * There [MUST NOT](spec/Requirement-ClassComponentPropertiesSchemaContentsExcludeComponentV3.json) be a path of "schema" or "contents" members from any DTDL [Component](#component) element to any DTDL [Component](#component) element.
 * In the union of all paths of "extends" members rooted at a given DTDL [Interface](#interface) element, the total count of all values among all such members [MUST NOT](spec/Requirement-ClassInterfacePropertiesExtendsMaxCountV3.json) exceed 1024 values.
 * There [MUST NOT](spec/Requirement-ClassInterfacePropertiesExtendsMaxDepthV3.json) be more than 10 members in any path of "extends" members from a DTDL [Interface](#interface) element to another DTDL element.
+* There [MUST NOT](spec/Requirement-ClassInterfacePropertiesExtendsSelfReferenceV3.json) be a path of "extends" members from a DTDL [Interface](#interface) element to the DTDL Interface element where the path begins.
 * In the union of all paths of "contents" or "fields" or "enumValues" or "request" or "response" or "properties" or "schema" or "elementSchema" or "mapValue" members rooted at a given DTDL [Interface](#interface) element, including those imported via "extends", the total count of all values among all such members MUST NOT exceed 100000 values.
 * There [MUST NOT](spec/Requirement-ClassMapPropertiesElementSchemaSchemaMaxDepthV3.json) be more than 5 "elementSchema" or "schema" members in any path from a DTDL [Map](#map) element to another DTDL element.
+* There [MUST NOT](spec/Requirement-ClassMapPropertiesElementSchemaSchemaSelfReferenceV3.json) be a path from a DTDL [Map](#map) element wherein some "elementSchema" or "schema" member referentially includes the DTDL Map element where the path begins.
 * There [MUST NOT](spec/Requirement-ClassObjectPropertiesElementSchemaSchemaMaxDepthV3.json) be more than 5 "elementSchema" or "schema" members in any path from a DTDL [Object](#object) element to another DTDL element.
+* There [MUST NOT](spec/Requirement-ClassObjectPropertiesElementSchemaSchemaSelfReferenceV3.json) be a path from a DTDL [Object](#object) element wherein some "elementSchema" or "schema" member referentially includes the DTDL Object element where the path begins.
 
 The JSON text of each Interface definition is limited to 1 MiByte.
 This is the total number of bytes inclusive of the opening and closing curly braces for each Interface definition.
@@ -1958,7 +1962,8 @@ The particular circumstances that disallow these strings are explicitly designat
 Every [DTDL element](#dtdl-element) may have &mdash; and every top-level element **must** have &mdash; a "@context" member.
 The following constraints and conditions apply to every DTDL v3 "@context" member:
 
-* Member value [MUST](spec/Requirement-ContextStringOrArrayQuantV3.json) be a string or an array of strings.
+* Member value [MUST](spec/Requirement-ContextStringOrArrayQuantV3.json) be a string or an array.
+* If member value is an array, all elements [MUST](spec/Requirement-ContextArrayAllStringsV3.json) be strings.
 * Each included string value [MUST](spec/Requirement-ContextDtmiWithVersionQuantV3.json) conform to the [Digital Twin Model Identifier](#digital-twin-model-identifier) syntax, and it [MUST](spec/Requirement-ContextDtmiWithVersionQuantV3.json) contain a version number.
 * Each included string value that does not begin with "dtmi:dtdl:context;" [SHALL](spec/Completion-ContextDefinedLanguageExtensionQuantV3.json) refer to a defined DTDL language extension.
 * Member [MUST](spec/Requirement-TopLevelDtdlContextV3.json) include string value "dtmi:dtdl:context;3" if member is in a top-level element.
@@ -2054,8 +2059,8 @@ The active context of the DTDL Relationship element is the set { "dtmi:dtdl:cont
 ```json
 {
   "@context": [
-      "dtmi:dtdl:context;3",
-      "dtmi:ex:foo;2"
+    "dtmi:dtdl:context;3",
+    "dtmi:ex:foo;2"
   ],
   "@id": "dtmi:ex:anInterface;1",
   "@type": "Interface",
diff --git a/DTDL/v3/DTDL.annotation.v1.md b/DTDL/v3/DTDL.annotation.v1.md
index 5e740bda..7cd716d1 100644
--- a/DTDL/v3/DTDL.annotation.v1.md
+++ b/DTDL/v3/DTDL.annotation.v1.md
@@ -41,9 +41,9 @@ So, for the present example, "currentTemp" Telemetry values reported on the date
 ```json
 {
   "@context": [
-      "dtmi:dtdl:context;3",
-      "dtmi:dtdl:extension:quantitativeTypes;1",
-      "dtmi:dtdl:extension:annotation;1"
+    "dtmi:dtdl:context;3",
+    "dtmi:dtdl:extension:quantitativeTypes;1",
+    "dtmi:dtdl:extension:annotation;1"
   ],
   "@id": "dtmi:com:example:Sensor;1",
   "@type": "Interface",
@@ -115,9 +115,9 @@ When an Interface `extends` another Interface, the former can annotate a `conten
   },
   {
     "@context": [
-        "dtmi:dtdl:context;3",
-        "dtmi:dtdl:extension:quantitativeTypes;1",
-        "dtmi:dtdl:extension:annotation;1"
+      "dtmi:dtdl:context;3",
+      "dtmi:dtdl:extension:quantitativeTypes;1",
+      "dtmi:dtdl:extension:annotation;1"
     ],
     "@id": "dtmi:com:example:Sensor;1",
     "@type": "Interface",
@@ -148,4 +148,5 @@ The chart below lists the versions of the Annotation extension that are currentl
 | Extension | Context | DTDL versions |
 | --- | --- | --- |
 | [Annotation v1](./DTDL.annotation.v1.md) | dtmi:dtdl:extension:annotation;1 | [3](./DTDL.v3.md) |
+| [Annotation v2](../v4/DTDL.annotation.v2.md) | dtmi:dtdl:extension:annotation;2 | [3](./DTDL.v3.md), [4](../v4/DTDL.v4.md) |
 
diff --git a/DTDL/v3/DTDL.historization.v1.md b/DTDL/v3/DTDL.historization.v1.md
index 43e5f394..7bd9360b 100644
--- a/DTDL/v3/DTDL.historization.v1.md
+++ b/DTDL/v3/DTDL.historization.v1.md
@@ -27,8 +27,8 @@ The following example shows an Interface with a single `contents` element named
 ```json
 {
   "@context": [
-      "dtmi:dtdl:context;3",
-      "dtmi:dtdl:extension:historization;1"
+    "dtmi:dtdl:context;3",
+    "dtmi:dtdl:extension:historization;1"
   ],
   "@id": "dtmi:com:example:Thermostat;1",
   "@type": "Interface",
@@ -48,9 +48,9 @@ Applying the Historized adjunct type does not preclude the application of other
 ```json
 {
   "@context": [
-      "dtmi:dtdl:context;3",
-      "dtmi:dtdl:extension:quantitativeTypes;1",
-      "dtmi:dtdl:extension:historization;1"
+    "dtmi:dtdl:context;3",
+    "dtmi:dtdl:extension:quantitativeTypes;1",
+    "dtmi:dtdl:extension:historization;1"
   ],
   "@id": "dtmi:com:example:Thermostat;1",
   "@type": "Interface",
@@ -73,4 +73,5 @@ The chart below lists the versions of the Historization extension that are curre
 | Extension | Context | DTDL versions |
 | --- | --- | --- |
 | [Historization v1](./DTDL.historization.v1.md) | dtmi:dtdl:extension:historization;1 | [3](./DTDL.v3.md) |
+| [Historization v2](../v4/DTDL.historization.v2.md) | dtmi:dtdl:extension:historization;2 | [3](./DTDL.v3.md), [4](../v4/DTDL.v4.md) |
 
diff --git a/DTDL/v3/DTDL.mqtt.v1.md b/DTDL/v3/DTDL.mqtt.v1.md
index f99c288d..86bf065e 100644
--- a/DTDL/v3/DTDL.mqtt.v1.md
+++ b/DTDL/v3/DTDL.mqtt.v1.md
@@ -84,8 +84,8 @@ The "getSpeed" Command is also co-typed Cacheable and has a "ttl" property with
 ```json
 {
   "@context": [
-      "dtmi:dtdl:context;3",
-      "dtmi:dtdl:extension:mqtt;1"
+    "dtmi:dtdl:context;3",
+    "dtmi:dtdl:extension:mqtt;1"
   ],
   "@id": "dtmi:example:TestVehicle;1",
   "@type": [ "Interface", "Mqtt" ],
@@ -140,8 +140,8 @@ These indices can be generated automatically, but the example illustrates how th
 ```json
 {
   "@context": [
-      "dtmi:dtdl:context;3",
-      "dtmi:dtdl:extension:mqtt;1"
+    "dtmi:dtdl:context;3",
+    "dtmi:dtdl:extension:mqtt;1"
   ],
   "@id": "dtmi:example:TestVehicle;1",
   "@type": [ "Interface", "Mqtt" ],
@@ -190,9 +190,10 @@ These indices can be generated automatically, but the example illustrates how th
 
 ## Feature versions
 
-The chart below lists the versions of the Annotation extension that are currently available.
+The chart below lists the versions of the Mqtt extension that are currently available.
 
 | Extension | Context | DTDL versions |
 | --- | --- | --- |
 | [MQTT v1](./DTDL.mqtt.v1.md) | dtmi:dtdl:extension:mqtt;1 | [3](./DTDL.v3.md) |
+| [MQTT v2](../v4/DTDL.mqtt.v2.md) | dtmi:dtdl:extension:mqtt;2 | [3](./DTDL.v3.md), [4](../v4/DTDL.v4.md) |
 
diff --git a/DTDL/v3/DTDL.overriding.v1.md b/DTDL/v3/DTDL.overriding.v1.md
index d19294cc..78200946 100644
--- a/DTDL/v3/DTDL.overriding.v1.md
+++ b/DTDL/v3/DTDL.overriding.v1.md
@@ -25,6 +25,12 @@ The chart below lists the additional properties that may be part of an element t
 When a Property in a model is co-typed ValueAnnotation and Override, the value of the `annotates` property specifies the `name` of another Property or Telemetry within the `contents` of the same Interface, and the value of the `overrides` property specifies an extension property on this other Property or Telemetry.
 This indicates that the ValueAnnotation/Override should be regarded as metadata for the element referenced by `annotates`, and further that this metadata overrides the value of the extension property indicated by `overrides`.
 
+## Extension version constraint
+
+The Overriding extension places a constraint on the version of the extension that defines property values that are overridden.
+Specifically, the property-defining extension must be defined using the same version of DTDL that is used for definining the model that uses Overriding.
+Ordinarily, it is acceptable to use a later version of an extension in a model defined in an earlier version of DTDL; however, this freedom is lost when using Overriding.
+
 ## Override examples
 
 The following example shows an Interface with two `contents` elements.
@@ -47,10 +53,10 @@ The `schema` of the overriding Property must match the schema type of the overri
 ```json
 {
   "@context": [
-      "dtmi:dtdl:context;3",
-      "dtmi:dtdl:extension:quantitativeTypes;1",
-      "dtmi:dtdl:extension:annotation;1",
-      "dtmi:dtdl:extension:overriding;1"
+    "dtmi:dtdl:context;3",
+    "dtmi:dtdl:extension:quantitativeTypes;1",
+    "dtmi:dtdl:extension:annotation;1",
+    "dtmi:dtdl:extension:overriding;1"
   ],
   "@id": "dtmi:com:example:Sensor;1",
   "@type": "Interface",
@@ -95,7 +101,8 @@ When an Interface `extends` another Interface, the former can override a propert
   {
     "@context": [
       "dtmi:dtdl:context;3",
-      "dtmi:dtdl:extension:quantitativeTypes;1"
+      "dtmi:dtdl:extension:quantitativeTypes;1",
+      "dtmi:dtdl:extension:overriding;1"
     ],
     "@id": "dtmi:com:example:BaseSensor;1",
     "@type": "Interface",
@@ -110,10 +117,10 @@ When an Interface `extends` another Interface, the former can override a propert
   },
   {
     "@context": [
-        "dtmi:dtdl:context;3",
-        "dtmi:dtdl:extension:quantitativeTypes;1",
-        "dtmi:dtdl:extension:annotation;1",
-        "dtmi:dtdl:extension:overriding;1"
+      "dtmi:dtdl:context;3",
+      "dtmi:dtdl:extension:quantitativeTypes;1",
+      "dtmi:dtdl:extension:annotation;1",
+      "dtmi:dtdl:extension:overriding;1"
     ],
     "@id": "dtmi:com:example:Sensor;1",
     "@type": "Interface",
@@ -139,4 +146,5 @@ The chart below lists the versions of the Overriding extension that are currentl
 | Extension | Context | DTDL versions |
 | --- | --- | --- |
 | [Overriding v1](./DTDL.overriding.v1.md) | dtmi:dtdl:extension:overriding;1 | [3](./DTDL.v3.md) |
+| [Overriding v2](../v4/DTDL.overriding.v2.md) | dtmi:dtdl:extension:overriding;2 | [3](./DTDL.v3.md), [4](../v4/DTDL.v4.md) |
 
diff --git a/DTDL/v3/DTDL.quantitativeTypes.v1.md b/DTDL/v3/DTDL.quantitativeTypes.v1.md
index 4930c46c..63aa9e35 100644
--- a/DTDL/v3/DTDL.quantitativeTypes.v1.md
+++ b/DTDL/v3/DTDL.quantitativeTypes.v1.md
@@ -95,8 +95,8 @@ One Telemetry has a `schema` value of *integer*, and the other three have `schem
 ```json
 {
   "@context": [
-      "dtmi:dtdl:context;3",
-      "dtmi:dtdl:extension:quantitativeTypes;1"
+    "dtmi:dtdl:context;3",
+    "dtmi:dtdl:extension:quantitativeTypes;1"
   ],
   "@id": "dtmi:com:example:Sensor;1",
   "@type": "Interface",
@@ -135,8 +135,8 @@ Each field has a name, co-type, and unit that matches one of the separate Teleme
 ```json
 {
   "@context": [
-      "dtmi:dtdl:context;3",
-      "dtmi:dtdl:extension:quantitativeTypes;1"
+    "dtmi:dtdl:context;3",
+    "dtmi:dtdl:extension:quantitativeTypes;1"
   ],
   "@id": "dtmi:com:example:Sensor;1",
   "@type": "Interface",
@@ -185,4 +185,5 @@ The chart below lists the versions of the QuantitativeTypes extension that are c
 | Extension | Context | DTDL versions |
 | --- | --- | --- |
 | [QuantitativeTypes v1](./DTDL.quantitativeTypes.v1.md) | dtmi:dtdl:extension:quantitativeTypes;1 | [3](./DTDL.v3.md) |
+| [QuantitativeTypes v2](../v4/DTDL.quantitativeTypes.v2.md) | dtmi:dtdl:extension:quantitativeTypes;2 | [4](../v4/DTDL.v4.md) |
 
diff --git a/DTDL/v3/DTDL.v3.md b/DTDL/v3/DTDL.v3.md
index 9496dcf2..7f51bbaa 100644
--- a/DTDL/v3/DTDL.v3.md
+++ b/DTDL/v3/DTDL.v3.md
@@ -48,6 +48,7 @@ When a digital twin is modeled using the DTDL, its behaviors are defined using t
 When writing a digital twin definition, it's necessary to specify the version of DTDL being used.
 Because DTDL is based on JSON-LD, we use the JSON-LD context (the `@context` statement) to specify the version of DTDL being used.
 For DTDL version 3, the appropriate context specifier is "dtmi:dtdl:context;3".
+See the [Context](#context) section for more details.
 
 ## Interface
 
@@ -450,9 +451,9 @@ A full set of primitive data types are provided and can be specified directly as
 | `boolean` | a boolean value |
 | `date` | a date in ISO 8601 format, per [RFC 3339](https://tools.ietf.org/html/rfc3339) |
 | `dateTime` | a date and time in ISO 8601 format, per [RFC 3339](https://tools.ietf.org/html/rfc3339) |
-| `double` | a finite numeric value that is expressible in IEEE 754 double-precision floating point format, conformant with xsd:double |
+| `double` | a finite numeric value that is expressible in IEEE 754 double-precision floating point format, conformant with the numeric range of xsd:double |
 | `duration` | a duration in ISO 8601 format |
-| `float` | a finite numeric value that is expressible in IEEE 754 single-precision floating point format, conformant with xsd:float |
+| `float` | a finite numeric value that is expressible in IEEE 754 single-precision floating point format, conformant with the numeric range of xsd:float |
 | `integer` | a signed integral numeric value that is expressible in 4 bytes |
 | `long` | a signed integral numeric value that is expressible in 8 bytes |
 | `string` | a UTF8 string |
@@ -464,8 +465,9 @@ Complex schemas are designed for supporting complex data types made up of primit
 In DTDL v3, the complex schemas are [Array](#array), [Enum](#enum), [Map](#map), and [Object](#object).
 A complex schema can be specified directly as the value of a schema property or described in the Interface schemas set and referenced in a schema property.
 
-Complex schema definitions are recursive.
+Complex schema definitions are recursive but not self-referential.
 An Array's elementSchema may be Array, Enum, Map, Object, or any of the [primitive schema](#primitive-schema) types.
+However, the elementSchema must not refer to the Array itself or to another complex schema that refers to the Array.
 The same is true for a Map's mapValue's schema and an Object's field's schema.
 For DTDL v3, the maximum depth of nested complex schemas is 5 levels.
 
@@ -632,7 +634,7 @@ The chart below lists the properties that a MapKey may have.
 | `description` | optional | localizable *string* | max 512 characters | A localizable description for display. |
 | `displayName` | optional | localizable *string* | max 512 characters | A localizable name for display. |
 | `name` | required | *string* | max 512 characters; contains only alphanumerics and underscore, starting with a letter, ending with alphanumeric | The programming name of the element. |
-| `schema` | required | [String](#string) | must be *string* | The data type of the Map's key, which must be string. |
+| `schema` | required | [primitive schema](#primitive-schema) | must be *string* | The data type of the Map's key, which must be string. |
 
 ### MapValue
 
@@ -938,7 +940,7 @@ IRIs in DTDL are [JSON-LD IRIs](https://w3c.github.io/json-ld-syntax/#iris) and
 Some string properties in models are meant for display and, therefore, support localization.
 Digital twin models use JSON-LD's string internationalization support for localization.
 Each localizable property (e.g. `displayName` and `description`) is defined to be a JSON-LD language map (`"@container": "@language"`).
-The keys of the language map must be language tag strings (see [BCP 47](https://tools.ietf.org/html/bcp47)).
+The keys of the language map must be language tag strings (see [BCP 47](https://www.rfc-editor.org/info/bcp47)).
 [ISO 639](https://www.loc.gov/standards/iso639-2/php/code_list.php) provides a list of language tags.
 The default language for DTDL documents is English.
 
@@ -988,9 +990,14 @@ The chart below lists the language extensions that are currently available for u
 | --- | --- | --- |
 | [QuantitativeTypes v1](./DTDL.quantitativeTypes.v1.md) | feature | A set of standard semantic types, unit types, and units. |
 | [Historization v1](./DTDL.historization.v1.md) | feature | Record the historical sequence of values of a Property or Telemetry and the times at which values change. |
+| [Historization v2](../v4/DTDL.historization.v2.md) | feature | Record the historical sequence of values of a Property or Telemetry and the times at which values change. |
 | [Annotation v1](./DTDL.annotation.v1.md) | feature | Add custom metadata to a Property or a Telemetry. |
+| [Annotation v2](../v4/DTDL.annotation.v2.md) | feature | Add custom metadata to a Property or a Telemetry. |
 | [Overriding v1](./DTDL.overriding.v1.md) | feature | Override a model property with an instance value. |
+| [Overriding v2](../v4/DTDL.overriding.v2.md) | feature | Override a model property with an instance value. |
 | [MQTT v1](./DTDL.mqtt.v1.md) | feature | Specify Interface properties to facilitate communication via the MQTT pub/sub protocol. |
+| [MQTT v2](../v4/DTDL.mqtt.v2.md) | feature | Specify Interface properties to facilitate communication via the MQTT pub/sub protocol. |
+| [Requirement v1](../v4/DTDL.requirement.v1.md) | feature | Selectively designate one or more fields in an Object as required. |
 
 ## Changes from Version 2
 
diff --git a/DTDL/v3/metamodel/DTDL.v3.ModelElements.json b/DTDL/v3/metamodel/DTDL.v3.ModelElements.json
index 51de015e..761ced71 100644
--- a/DTDL/v3/metamodel/DTDL.v3.ModelElements.json
+++ b/DTDL/v3/metamodel/DTDL.v3.ModelElements.json
@@ -16,7 +16,7 @@
     "aliasFor": "dtmi:dtdl:instance:Schema:double;2",
     "displayName": "double",
     "description": {
-      "en-US": "a finite numeric value that is expressible in IEEE 754 double-precision floating point format, conformant with xsd:double"
+      "en-US": "a finite numeric value that is expressible in IEEE 754 double-precision floating point format, conformant with the numeric range of xsd:double"
     }
   },
   {
@@ -26,7 +26,7 @@
     "aliasFor": "dtmi:dtdl:instance:Schema:float;2",
     "displayName": "float",
     "description": {
-      "en-US": "a finite numeric value that is expressible in IEEE 754 single-precision floating point format, conformant with xsd:float"
+      "en-US": "a finite numeric value that is expressible in IEEE 754 single-precision floating point format, conformant with the numeric range of xsd:float"
     }
   },
   {
diff --git a/DTDL/v3/spec/Allowance-ClassArrayOptionalPropertiesV3.json b/DTDL/v3/spec/Allowance-ClassArrayOptionalPropertiesV3.json
index 7a0cbdda..6d6451ad 100644
--- a/DTDL/v3/spec/Allowance-ClassArrayOptionalPropertiesV3.json
+++ b/DTDL/v3/spec/Allowance-ClassArrayOptionalPropertiesV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_pi;1",
+        "@id": "dtmi:example:flunn_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nuh_omicron",
+          "name": "flunn_nu",
           "schema": {
             "@context": [],
             "@type": "Array",
@@ -29,11 +29,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_sigma;1",
+        "@id": "dtmi:example:flunn_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nuh_rho",
+          "name": "flunn_omicron",
           "schema": {
             "@type": "Array",
             "elementSchema": "dateTime"
@@ -50,10 +50,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_upsilon;1",
+        "@id": "dtmi:example:flunn_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_tau;1",
+          "@id": "dtmi:example:flunn_rho;1",
           "@type": "Array",
           "elementSchema": "double"
         }
@@ -68,10 +68,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_chi;1",
+        "@id": "dtmi:example:flunn_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_phi;1",
+          "@id": "dtmi:example:flunn_tau;1",
           "@type": "Array",
           "elementSchema": "duration"
         }
@@ -86,10 +86,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_omega;1",
+        "@id": "dtmi:example:flunn_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_psi;1",
+          "@id": "dtmi:example:flunn_phi;1",
           "@type": "Array",
           "elementSchema": "float"
         }
diff --git a/DTDL/v3/spec/Allowance-ClassArrayPropertyCommentDtmiV3.json b/DTDL/v3/spec/Allowance-ClassArrayPropertyCommentDtmiV3.json
index f4a5320b..395d0d39 100644
--- a/DTDL/v3/spec/Allowance-ClassArrayPropertyCommentDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassArrayPropertyCommentDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_kappa;1",
+        "@id": "dtmi:example:hi_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_theta;1",
+          "@id": "dtmi:example:hi_kappa;1",
           "@type": "Array",
-          "dtmi:dtdl:property:comment;3": "spazz_iota",
-          "elementSchema": "time"
+          "dtmi:dtdl:property:comment;3": "hi_lambda",
+          "elementSchema": "date"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassArrayPropertyDescriptionDtmiV3.json b/DTDL/v3/spec/Allowance-ClassArrayPropertyDescriptionDtmiV3.json
index 39721f87..d3416ac9 100644
--- a/DTDL/v3/spec/Allowance-ClassArrayPropertyDescriptionDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassArrayPropertyDescriptionDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_jogg;1",
+        "@id": "dtmi:example:alpha_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_floob;1",
+          "@id": "dtmi:example:alpha_jogg;1",
           "@type": "Array",
           "dtmi:dtdl:property:description;3": [
-            "floob_zatz"
+            "alpha_flunn"
           ],
-          "elementSchema": "date"
+          "elementSchema": "double"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassArrayPropertyDisplayNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassArrayPropertyDisplayNameDtmiV3.json
index 0ef95561..43be897d 100644
--- a/DTDL/v3/spec/Allowance-ClassArrayPropertyDisplayNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassArrayPropertyDisplayNameDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_psi;1",
+        "@id": "dtmi:example:gamma_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_phi;1",
+          "@id": "dtmi:example:gamma_psi;1",
           "@type": "Array",
           "dtmi:dtdl:property:displayName;3": [
-            "jogg_chi"
+            "gamma_omega"
           ],
-          "elementSchema": "double"
+          "elementSchema": "float"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassArrayPropertyElementSchemaDtmiV3.json b/DTDL/v3/spec/Allowance-ClassArrayPropertyElementSchemaDtmiV3.json
index f49be5f5..9a832d5f 100644
--- a/DTDL/v3/spec/Allowance-ClassArrayPropertyElementSchemaDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassArrayPropertyElementSchemaDtmiV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_zeta;1",
+        "@id": "dtmi:example:flunn_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_epsilon;1",
+          "@id": "dtmi:example:flunn_gamma;1",
           "@type": "Array",
           "dtmi:dtdl:property:elementSchema;3": "duration"
         }
diff --git a/DTDL/v3/spec/Allowance-ClassCommandOptionalPropertiesV3.json b/DTDL/v3/spec/Allowance-ClassCommandOptionalPropertiesV3.json
index 8821ab44..d037bf90 100644
--- a/DTDL/v3/spec/Allowance-ClassCommandOptionalPropertiesV3.json
+++ b/DTDL/v3/spec/Allowance-ClassCommandOptionalPropertiesV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_chi;1",
+        "@id": "dtmi:example:theta_omega;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:hi_phi;1",
+          "@id": "dtmi:example:theta_psi;1",
           "@type": "Interface",
           "contents": {
             "@context": [],
             "@type": "Command",
-            "name": "hi_upsilon"
+            "name": "theta_chi"
           }
         }
       }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_yuzz;1",
+        "@id": "dtmi:example:theta_um;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:hi_omega;1",
+          "@id": "dtmi:example:theta_wum;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "hi_psi"
+            "name": "theta_yuzz"
           }
         }
       }
@@ -50,11 +50,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_um;1",
+        "@id": "dtmi:example:theta_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_wum"
+          "name": "theta_humpf"
         }
       }
     ]
@@ -67,11 +67,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_fuddle;1",
+        "@id": "dtmi:example:theta_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_humpf"
+          "name": "theta_glikk"
         }
       }
     ]
@@ -84,11 +84,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_nuh;1",
+        "@id": "dtmi:example:theta_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_glikk"
+          "name": "theta_snee"
         }
       }
     ]
@@ -101,11 +101,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_quan;1",
+        "@id": "dtmi:example:theta_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_snee"
+          "name": "theta_thnad"
         }
       }
     ]
@@ -118,11 +118,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_spazz;1",
+        "@id": "dtmi:example:theta_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_thnad"
+          "name": "theta_floob"
         }
       }
     ]
@@ -135,11 +135,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_zatz;1",
+        "@id": "dtmi:example:theta_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_floob"
+          "name": "theta_jogg"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassCommandPropertyCommandTypeDtmiV3.json b/DTDL/v3/spec/Allowance-ClassCommandPropertyCommandTypeDtmiV3.json
index 5189d896..0c2db962 100644
--- a/DTDL/v3/spec/Allowance-ClassCommandPropertyCommandTypeDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassCommandPropertyCommandTypeDtmiV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_omega;1",
+        "@id": "dtmi:example:rho_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "dtmi:dtdl:property:commandType;3": "asynchronous",
-          "name": "iota_psi"
+          "name": "rho_nuh"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassCommandPropertyCommentDtmiV3.json b/DTDL/v3/spec/Allowance-ClassCommandPropertyCommentDtmiV3.json
index 28cb4e94..1807492c 100644
--- a/DTDL/v3/spec/Allowance-ClassCommandPropertyCommentDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassCommandPropertyCommentDtmiV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_itch;1",
+        "@id": "dtmi:example:tau_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "dtmi:dtdl:property:comment;3": "kappa_jogg",
-          "name": "kappa_flunn"
+          "dtmi:dtdl:property:comment;3": "tau_gamma",
+          "name": "tau_delta"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassCommandPropertyDescriptionDtmiV3.json b/DTDL/v3/spec/Allowance-ClassCommandPropertyDescriptionDtmiV3.json
index 8e395c2f..dc020245 100644
--- a/DTDL/v3/spec/Allowance-ClassCommandPropertyDescriptionDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassCommandPropertyDescriptionDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_yuzz;1",
+        "@id": "dtmi:example:upsilon_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "dtmi:dtdl:property:description;3": [
-            "mu_psi"
+            "upsilon_nuh"
           ],
-          "name": "mu_omega"
+          "name": "upsilon_snee"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassCommandPropertyDisplayNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassCommandPropertyDisplayNameDtmiV3.json
index 63c15dce..bb3138a7 100644
--- a/DTDL/v3/spec/Allowance-ClassCommandPropertyDisplayNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassCommandPropertyDisplayNameDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_kappa;1",
+        "@id": "dtmi:example:chi_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "dtmi:dtdl:property:displayName;3": [
-            "xi_theta"
+            "chi_pi"
           ],
-          "name": "xi_iota"
+          "name": "chi_rho"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassCommandPropertyNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassCommandPropertyNameDtmiV3.json
index 69691618..a7bbfaba 100644
--- a/DTDL/v3/spec/Allowance-ClassCommandPropertyNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassCommandPropertyNameDtmiV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_iota;1",
+        "@id": "dtmi:example:theta_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "dtmi:dtdl:property:name;3": "hi_theta"
+          "dtmi:dtdl:property:name;3": "theta_kappa"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassCommandPropertyRequestDtmiV3.json b/DTDL/v3/spec/Allowance-ClassCommandPropertyRequestDtmiV3.json
index 9da8ab52..ccc76e3e 100644
--- a/DTDL/v3/spec/Allowance-ClassCommandPropertyRequestDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassCommandPropertyRequestDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_omega;1",
+        "@id": "dtmi:example:wum_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_chi",
+          "name": "wum_itch",
           "dtmi:dtdl:property:request;3": {
-            "name": "sigma_psi",
-            "schema": "float"
+            "name": "wum_yekk",
+            "schema": "time"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassCommandPropertyResponseDtmiV3.json b/DTDL/v3/spec/Allowance-ClassCommandPropertyResponseDtmiV3.json
index 55297f41..6aec936e 100644
--- a/DTDL/v3/spec/Allowance-ClassCommandPropertyResponseDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassCommandPropertyResponseDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_jogg;1",
+        "@id": "dtmi:example:nuh_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_floob",
+          "name": "nuh_phi",
           "dtmi:dtdl:property:response;3": {
-            "name": "chi_zatz",
-            "schema": "float"
+            "name": "nuh_chi",
+            "schema": "date"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassCommandRequestOptionalPropertiesV3.json b/DTDL/v3/spec/Allowance-ClassCommandRequestOptionalPropertiesV3.json
index 1df65c27..f722ad15 100644
--- a/DTDL/v3/spec/Allowance-ClassCommandRequestOptionalPropertiesV3.json
+++ b/DTDL/v3/spec/Allowance-ClassCommandRequestOptionalPropertiesV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_itch;1",
+        "@id": "dtmi:example:vroo_spazz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:quan_flunn;1",
+          "@id": "dtmi:example:vroo_thnad;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "quan_jogg",
+            "name": "vroo_quan",
             "request": {
               "@context": [],
-              "name": "quan_zatz",
-              "schema": "time"
+              "name": "vroo_snee",
+              "schema": "long"
             }
           }
         }
@@ -33,14 +33,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_hi;1",
+        "@id": "dtmi:example:vroo_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_vroo",
+          "name": "vroo_zatz",
           "request": {
-            "name": "quan_yekk",
-            "schema": "boolean"
+            "name": "vroo_floob",
+            "schema": "string"
           }
         }
       }
@@ -54,17 +54,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_delta;1",
+        "@id": "dtmi:example:vroo_vroo;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:thnad_gamma;1",
+          "@id": "dtmi:example:vroo_yekk;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "thnad_beta",
+            "name": "vroo_itch",
             "request": {
-              "name": "thnad_alpha",
-              "schema": "date"
+              "name": "vroo_flunn",
+              "schema": "time"
             }
           }
         }
@@ -79,14 +79,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_eta;1",
+        "@id": "dtmi:example:hi_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "thnad_zeta",
+          "name": "hi_alpha",
           "request": {
-            "name": "thnad_epsilon",
-            "schema": "dateTime"
+            "name": "vroo_hi",
+            "schema": "boolean"
           }
         }
       }
@@ -100,14 +100,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_kappa;1",
+        "@id": "dtmi:example:hi_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "thnad_iota",
+          "name": "hi_delta",
           "request": {
-            "name": "thnad_theta",
-            "schema": "double"
+            "name": "hi_gamma",
+            "schema": "date"
           }
         }
       }
@@ -121,14 +121,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_nu;1",
+        "@id": "dtmi:example:hi_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "thnad_mu",
+          "name": "hi_eta",
           "request": {
-            "name": "thnad_lambda",
-            "schema": "duration"
+            "name": "hi_zeta",
+            "schema": "dateTime"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassCommandRequestPropertyCommentDtmiV3.json b/DTDL/v3/spec/Allowance-ClassCommandRequestPropertyCommentDtmiV3.json
index f524581f..e4c0bdb0 100644
--- a/DTDL/v3/spec/Allowance-ClassCommandRequestPropertyCommentDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassCommandRequestPropertyCommentDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_beta;1",
+        "@id": "dtmi:example:lambda_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "beta_alpha",
+          "name": "lambda_delta",
           "request": {
-            "dtmi:dtdl:property:comment;3": "alpha_vroo",
-            "name": "alpha_hi",
+            "dtmi:dtdl:property:comment;3": "lambda_beta",
+            "name": "lambda_gamma",
             "schema": "double"
           }
         }
diff --git a/DTDL/v3/spec/Allowance-ClassCommandRequestPropertyDescriptionDtmiV3.json b/DTDL/v3/spec/Allowance-ClassCommandRequestPropertyDescriptionDtmiV3.json
index d7c840ab..37ab37e1 100644
--- a/DTDL/v3/spec/Allowance-ClassCommandRequestPropertyDescriptionDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassCommandRequestPropertyDescriptionDtmiV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_tau;1",
+        "@id": "dtmi:example:nu_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_sigma",
+          "name": "nu_phi",
           "request": {
             "dtmi:dtdl:property:description;3": [
-              "delta_pi"
+              "nu_tau"
             ],
-            "name": "delta_rho",
+            "name": "nu_upsilon",
             "schema": "float"
           }
         }
diff --git a/DTDL/v3/spec/Allowance-ClassCommandRequestPropertyDisplayNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassCommandRequestPropertyDisplayNameDtmiV3.json
index 86c0588d..8adc2ab5 100644
--- a/DTDL/v3/spec/Allowance-ClassCommandRequestPropertyDisplayNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassCommandRequestPropertyDisplayNameDtmiV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_floob;1",
+        "@id": "dtmi:example:omicron_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_spazz",
+          "name": "omicron_jogg",
           "request": {
             "dtmi:dtdl:property:displayName;3": [
-              "zeta_quan"
+              "omicron_floob"
             ],
-            "name": "zeta_thnad",
+            "name": "omicron_zatz",
             "schema": "long"
           }
         }
diff --git a/DTDL/v3/spec/Allowance-ClassCommandRequestPropertyNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassCommandRequestPropertyNameDtmiV3.json
index 94bfeafe..7c9ad227 100644
--- a/DTDL/v3/spec/Allowance-ClassCommandRequestPropertyNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassCommandRequestPropertyNameDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_yekk;1",
+        "@id": "dtmi:example:spazz_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_itch",
+          "name": "spazz_yuzz",
           "request": {
-            "dtmi:dtdl:property:name;3": "wum_flunn",
-            "schema": "duration"
+            "dtmi:dtdl:property:name;3": "spazz_omega",
+            "schema": "boolean"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassCommandRequestPropertySchemaDtmiV3.json b/DTDL/v3/spec/Allowance-ClassCommandRequestPropertySchemaDtmiV3.json
index 3a81793f..e68b762b 100644
--- a/DTDL/v3/spec/Allowance-ClassCommandRequestPropertySchemaDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassCommandRequestPropertySchemaDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_omega;1",
+        "@id": "dtmi:example:vroo_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_psi",
+          "name": "vroo_sigma",
           "request": {
-            "name": "quan_chi",
-            "dtmi:dtdl:property:schema;3": "dateTime"
+            "name": "vroo_rho",
+            "dtmi:dtdl:property:schema;3": "boolean"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassCommandResponseOptionalPropertiesV3.json b/DTDL/v3/spec/Allowance-ClassCommandResponseOptionalPropertiesV3.json
index 17ca8297..50a8ed27 100644
--- a/DTDL/v3/spec/Allowance-ClassCommandResponseOptionalPropertiesV3.json
+++ b/DTDL/v3/spec/Allowance-ClassCommandResponseOptionalPropertiesV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_psi;1",
+        "@id": "dtmi:example:um_floob;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:sigma_chi;1",
+          "@id": "dtmi:example:um_spazz;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "sigma_phi",
+            "name": "um_thnad",
             "response": {
               "@context": [],
-              "name": "sigma_upsilon",
-              "schema": "double"
+              "name": "um_quan",
+              "schema": "float"
             }
           }
         }
@@ -33,14 +33,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_wum;1",
+        "@id": "dtmi:example:um_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_yuzz",
+          "name": "um_jogg",
           "response": {
-            "name": "sigma_omega",
-            "schema": "duration"
+            "name": "um_zatz",
+            "schema": "integer"
           }
         }
       }
@@ -54,17 +54,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_glikk;1",
+        "@id": "dtmi:example:um_hi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:sigma_fuddle;1",
+          "@id": "dtmi:example:um_vroo;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "sigma_humpf",
+            "name": "um_yekk",
             "response": {
-              "name": "sigma_um",
-              "schema": "float"
+              "name": "um_itch",
+              "schema": "long"
             }
           }
         }
@@ -79,14 +79,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_quan;1",
+        "@id": "dtmi:example:humpf_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_snee",
+          "name": "humpf_beta",
           "response": {
-            "name": "sigma_nuh",
-            "schema": "integer"
+            "name": "humpf_alpha",
+            "schema": "string"
           }
         }
       }
@@ -100,14 +100,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_floob;1",
+        "@id": "dtmi:example:humpf_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_spazz",
+          "name": "humpf_epsilon",
           "response": {
-            "name": "sigma_thnad",
-            "schema": "long"
+            "name": "humpf_delta",
+            "schema": "time"
           }
         }
       }
@@ -121,14 +121,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_flunn;1",
+        "@id": "dtmi:example:humpf_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_jogg",
+          "name": "humpf_theta",
           "response": {
-            "name": "sigma_zatz",
-            "schema": "string"
+            "name": "humpf_eta",
+            "schema": "boolean"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassCommandResponsePropertyCommentDtmiV3.json b/DTDL/v3/spec/Allowance-ClassCommandResponsePropertyCommentDtmiV3.json
index a634b5ca..727e379a 100644
--- a/DTDL/v3/spec/Allowance-ClassCommandResponsePropertyCommentDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassCommandResponsePropertyCommentDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_humpf;1",
+        "@id": "dtmi:example:flunn_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_um",
+          "name": "flunn_epsilon",
           "response": {
-            "dtmi:dtdl:property:comment;3": "fuddle_yuzz",
-            "name": "fuddle_wum",
-            "schema": "long"
+            "dtmi:dtdl:property:comment;3": "flunn_gamma",
+            "name": "flunn_delta",
+            "schema": "date"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassCommandResponsePropertyDescriptionDtmiV3.json b/DTDL/v3/spec/Allowance-ClassCommandResponsePropertyDescriptionDtmiV3.json
index eda6d353..f0e997b5 100644
--- a/DTDL/v3/spec/Allowance-ClassCommandResponsePropertyDescriptionDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassCommandResponsePropertyDescriptionDtmiV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_beta;1",
+        "@id": "dtmi:example:yekk_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_alpha",
+          "name": "yekk_chi",
           "response": {
             "dtmi:dtdl:property:description;3": [
-              "nuh_vroo"
+              "yekk_upsilon"
             ],
-            "name": "nuh_hi",
-            "schema": "time"
+            "name": "yekk_phi",
+            "schema": "double"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassCommandResponsePropertyDisplayNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassCommandResponsePropertyDisplayNameDtmiV3.json
index 6793874b..70730773 100644
--- a/DTDL/v3/spec/Allowance-ClassCommandResponsePropertyDisplayNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassCommandResponsePropertyDisplayNameDtmiV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_tau;1",
+        "@id": "dtmi:example:hi_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "thnad_sigma",
+          "name": "hi_flunn",
           "response": {
             "dtmi:dtdl:property:displayName;3": [
-              "thnad_pi"
+              "hi_zatz"
             ],
-            "name": "thnad_rho",
-            "schema": "date"
+            "name": "hi_jogg",
+            "schema": "float"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassCommandResponsePropertyNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassCommandResponsePropertyNameDtmiV3.json
index 086efb77..bd7e3975 100644
--- a/DTDL/v3/spec/Allowance-ClassCommandResponsePropertyNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassCommandResponsePropertyNameDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_omega;1",
+        "@id": "dtmi:example:upsilon_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_psi",
+          "name": "upsilon_wum",
           "response": {
-            "dtmi:dtdl:property:name;3": "lambda_chi",
+            "dtmi:dtdl:property:name;3": "upsilon_yuzz",
             "schema": "string"
           }
         }
diff --git a/DTDL/v3/spec/Allowance-ClassCommandResponsePropertySchemaDtmiV3.json b/DTDL/v3/spec/Allowance-ClassCommandResponsePropertySchemaDtmiV3.json
index 2f293c54..1f9ed1ae 100644
--- a/DTDL/v3/spec/Allowance-ClassCommandResponsePropertySchemaDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassCommandResponsePropertySchemaDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_eta;1",
+        "@id": "dtmi:example:um_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_zeta",
+          "name": "um_tau",
           "response": {
-            "name": "sigma_epsilon",
-            "dtmi:dtdl:property:schema;3": "integer"
+            "name": "um_sigma",
+            "dtmi:dtdl:property:schema;3": "string"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassComponentOptionalPropertiesV3.json b/DTDL/v3/spec/Allowance-ClassComponentOptionalPropertiesV3.json
index 51751c0c..8f12234e 100644
--- a/DTDL/v3/spec/Allowance-ClassComponentOptionalPropertiesV3.json
+++ b/DTDL/v3/spec/Allowance-ClassComponentOptionalPropertiesV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_snee;1",
+        "@id": "dtmi:example:nu_sigma;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:gamma_nuh;1",
+          "@id": "dtmi:example:nu_rho;1",
           "@type": "Interface",
           "contents": {
             "@context": [],
             "@type": "Component",
-            "name": "gamma_fuddle",
+            "name": "nu_omicron",
             "schema": {
-              "@id": "dtmi:example:gamma_glikk;1",
+              "@id": "dtmi:example:nu_pi;1",
               "@type": "Interface"
             }
           }
@@ -33,16 +33,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_floob;1",
+        "@id": "dtmi:example:nu_chi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:gamma_spazz;1",
+          "@id": "dtmi:example:nu_phi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "gamma_quan",
+            "name": "nu_tau",
             "schema": {
-              "@id": "dtmi:example:gamma_thnad;1",
+              "@id": "dtmi:example:nu_upsilon;1",
               "@type": "Interface"
             }
           }
@@ -58,13 +58,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_flunn;1",
+        "@id": "dtmi:example:nu_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "gamma_zatz",
+          "name": "nu_psi",
           "schema": {
-            "@id": "dtmi:example:gamma_jogg;1",
+            "@id": "dtmi:example:nu_omega;1",
             "@type": "Interface"
           }
         }
@@ -79,13 +79,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_vroo;1",
+        "@id": "dtmi:example:nu_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "gamma_itch",
+          "name": "nu_wum",
           "schema": {
-            "@id": "dtmi:example:gamma_yekk;1",
+            "@id": "dtmi:example:nu_um;1",
             "@type": "Interface"
           }
         }
@@ -100,13 +100,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_beta;1",
+        "@id": "dtmi:example:nu_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "gamma_hi",
+          "name": "nu_fuddle",
           "schema": {
-            "@id": "dtmi:example:delta_alpha;1",
+            "@id": "dtmi:example:nu_glikk;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v3/spec/Allowance-ClassComponentPropertyCommentDtmiV3.json b/DTDL/v3/spec/Allowance-ClassComponentPropertyCommentDtmiV3.json
index 638fce2c..2953c31c 100644
--- a/DTDL/v3/spec/Allowance-ClassComponentPropertyCommentDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassComponentPropertyCommentDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_gamma;1",
+        "@id": "dtmi:example:phi_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "dtmi:dtdl:property:comment;3": "lambda_hi",
-          "name": "mu_alpha",
+          "dtmi:dtdl:property:comment;3": "phi_zatz",
+          "name": "phi_jogg",
           "schema": {
-            "@id": "dtmi:example:mu_beta;1",
+            "@id": "dtmi:example:phi_flunn;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v3/spec/Allowance-ClassComponentPropertyDescriptionDtmiV3.json b/DTDL/v3/spec/Allowance-ClassComponentPropertyDescriptionDtmiV3.json
index 997c0591..6ba74ede 100644
--- a/DTDL/v3/spec/Allowance-ClassComponentPropertyDescriptionDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassComponentPropertyDescriptionDtmiV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_upsilon;1",
+        "@id": "dtmi:example:omega_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "dtmi:dtdl:property:description;3": [
-            "xi_rho"
+            "omega_lambda"
           ],
-          "name": "xi_sigma",
+          "name": "omega_mu",
           "schema": {
-            "@id": "dtmi:example:xi_tau;1",
+            "@id": "dtmi:example:omega_nu;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v3/spec/Allowance-ClassComponentPropertyDisplayNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassComponentPropertyDisplayNameDtmiV3.json
index cc908472..ad101768 100644
--- a/DTDL/v3/spec/Allowance-ClassComponentPropertyDisplayNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassComponentPropertyDisplayNameDtmiV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_zatz;1",
+        "@id": "dtmi:example:wum_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "dtmi:dtdl:property:displayName;3": [
-            "pi_thnad"
+            "wum_humpf"
           ],
-          "name": "pi_spazz",
+          "name": "wum_fuddle",
           "schema": {
-            "@id": "dtmi:example:pi_floob;1",
+            "@id": "dtmi:example:wum_glikk;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v3/spec/Allowance-ClassComponentPropertyNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassComponentPropertyNameDtmiV3.json
index 17049be0..4fbf5da2 100644
--- a/DTDL/v3/spec/Allowance-ClassComponentPropertyNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassComponentPropertyNameDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_theta;1",
+        "@id": "dtmi:example:theta_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "dtmi:dtdl:property:name;3": "vroo_zeta",
+          "dtmi:dtdl:property:name;3": "theta_um",
           "schema": {
-            "@id": "dtmi:example:vroo_eta;1",
+            "@id": "dtmi:example:theta_humpf;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v3/spec/Allowance-ClassComponentPropertySchemaDtmiV3.json b/DTDL/v3/spec/Allowance-ClassComponentPropertySchemaDtmiV3.json
index d59d1e45..66f3c05c 100644
--- a/DTDL/v3/spec/Allowance-ClassComponentPropertySchemaDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassComponentPropertySchemaDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_xi;1",
+        "@id": "dtmi:example:mu_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "gamma_mu",
+          "name": "mu_yekk",
           "dtmi:dtdl:property:schema;3": {
-            "@id": "dtmi:example:gamma_nu;1",
+            "@id": "dtmi:example:mu_vroo;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v3/spec/Allowance-ClassEnumOptionalPropertiesV3.json b/DTDL/v3/spec/Allowance-ClassEnumOptionalPropertiesV3.json
index f77039a0..d4a335a0 100644
--- a/DTDL/v3/spec/Allowance-ClassEnumOptionalPropertiesV3.json
+++ b/DTDL/v3/spec/Allowance-ClassEnumOptionalPropertiesV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_eta;1",
+        "@id": "dtmi:example:floob_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_zeta",
+          "name": "spazz_hi",
           "schema": {
             "@context": [],
             "@type": "Enum",
@@ -29,11 +29,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_iota;1",
+        "@id": "dtmi:example:floob_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_theta",
+          "name": "floob_beta",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer"
@@ -50,10 +50,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_lambda;1",
+        "@id": "dtmi:example:floob_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_kappa;1",
+          "@id": "dtmi:example:floob_delta;1",
           "@type": "Enum",
           "valueSchema": "integer"
         }
@@ -68,10 +68,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_nu;1",
+        "@id": "dtmi:example:floob_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_mu;1",
+          "@id": "dtmi:example:floob_zeta;1",
           "@type": "Enum",
           "valueSchema": "integer"
         }
@@ -86,10 +86,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_omicron;1",
+        "@id": "dtmi:example:floob_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_xi;1",
+          "@id": "dtmi:example:floob_theta;1",
           "@type": "Enum",
           "valueSchema": "integer"
         }
@@ -104,10 +104,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_rho;1",
+        "@id": "dtmi:example:floob_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_pi;1",
+          "@id": "dtmi:example:floob_kappa;1",
           "@type": "Enum",
           "valueSchema": "integer"
         }
diff --git a/DTDL/v3/spec/Allowance-ClassEnumPropertyCommentDtmiV3.json b/DTDL/v3/spec/Allowance-ClassEnumPropertyCommentDtmiV3.json
index 0c4df5d2..2cf60755 100644
--- a/DTDL/v3/spec/Allowance-ClassEnumPropertyCommentDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassEnumPropertyCommentDtmiV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_gamma;1",
+        "@id": "dtmi:example:itch_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_alpha;1",
+          "@id": "dtmi:example:flunn_vroo;1",
           "@type": "Enum",
-          "dtmi:dtdl:property:comment;3": "glikk_beta",
+          "dtmi:dtdl:property:comment;3": "flunn_hi",
           "valueSchema": "integer"
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassEnumPropertyDescriptionDtmiV3.json b/DTDL/v3/spec/Allowance-ClassEnumPropertyDescriptionDtmiV3.json
index c26134b6..175d7850 100644
--- a/DTDL/v3/spec/Allowance-ClassEnumPropertyDescriptionDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassEnumPropertyDescriptionDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_nuh;1",
+        "@id": "dtmi:example:yekk_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_fuddle;1",
+          "@id": "dtmi:example:yekk_um;1",
           "@type": "Enum",
           "dtmi:dtdl:property:description;3": [
-            "nuh_glikk"
+            "yekk_humpf"
           ],
           "valueSchema": "integer"
         }
diff --git a/DTDL/v3/spec/Allowance-ClassEnumPropertyDisplayNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassEnumPropertyDisplayNameDtmiV3.json
index 41991ae3..3fcb053e 100644
--- a/DTDL/v3/spec/Allowance-ClassEnumPropertyDisplayNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassEnumPropertyDisplayNameDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_pi;1",
+        "@id": "dtmi:example:hi_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_xi;1",
+          "@id": "dtmi:example:hi_mu;1",
           "@type": "Enum",
           "dtmi:dtdl:property:displayName;3": [
-            "quan_omicron"
+            "hi_nu"
           ],
           "valueSchema": "integer"
         }
diff --git a/DTDL/v3/spec/Allowance-ClassEnumPropertyEnumValuesDtmiV3.json b/DTDL/v3/spec/Allowance-ClassEnumPropertyEnumValuesDtmiV3.json
index 85cbea25..7e37a213 100644
--- a/DTDL/v3/spec/Allowance-ClassEnumPropertyEnumValuesDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassEnumPropertyEnumValuesDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_rho;1",
+        "@id": "dtmi:example:delta_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_omicron;1",
+          "@id": "dtmi:example:delta_phi;1",
           "@type": "Enum",
           "dtmi:dtdl:property:enumValues;3": [
             {
-              "enumValue": 1128,
-              "name": "zatz_pi"
+              "enumValue": 1143,
+              "name": "delta_chi"
             }
           ],
           "valueSchema": "integer"
diff --git a/DTDL/v3/spec/Allowance-ClassEnumPropertyValueSchemaDtmiV3.json b/DTDL/v3/spec/Allowance-ClassEnumPropertyValueSchemaDtmiV3.json
index 76cda285..561a5799 100644
--- a/DTDL/v3/spec/Allowance-ClassEnumPropertyValueSchemaDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassEnumPropertyValueSchemaDtmiV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_itch;1",
+        "@id": "dtmi:example:spazz_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_flunn;1",
+          "@id": "dtmi:example:spazz_quan;1",
           "@type": "Enum",
           "dtmi:dtdl:property:valueSchema;3": "integer"
         }
diff --git a/DTDL/v3/spec/Allowance-ClassEnumValueOptionalPropertiesV3.json b/DTDL/v3/spec/Allowance-ClassEnumValueOptionalPropertiesV3.json
index e920230a..f287639f 100644
--- a/DTDL/v3/spec/Allowance-ClassEnumValueOptionalPropertiesV3.json
+++ b/DTDL/v3/spec/Allowance-ClassEnumValueOptionalPropertiesV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_vroo;1",
+        "@id": "dtmi:example:nu_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "beta_yekk",
+          "name": "nu_delta",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
               "@context": [],
-              "enumValue": 1205,
-              "name": "beta_itch"
+              "enumValue": 1220,
+              "name": "nu_gamma"
             }
           }
         }
@@ -33,15 +33,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_beta;1",
+        "@id": "dtmi:example:nu_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_alpha;1",
+          "@id": "dtmi:example:nu_eta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1206,
-            "name": "beta_hi"
+            "enumValue": 1221,
+            "name": "nu_zeta"
           }
         }
       }
@@ -55,17 +55,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_epsilon;1",
+        "@id": "dtmi:example:nu_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "gamma_delta",
+          "name": "nu_kappa",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 1207,
-              "name": "gamma_gamma"
+              "enumValue": 1222,
+              "name": "nu_iota"
             }
           }
         }
@@ -80,15 +80,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_theta;1",
+        "@id": "dtmi:example:nu_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_eta;1",
+          "@id": "dtmi:example:nu_nu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1208,
-            "name": "gamma_zeta"
+            "enumValue": 1223,
+            "name": "nu_mu"
           }
         }
       }
@@ -102,15 +102,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_lambda;1",
+        "@id": "dtmi:example:nu_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_kappa;1",
+          "@id": "dtmi:example:nu_pi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1209,
-            "name": "gamma_iota"
+            "enumValue": 1224,
+            "name": "nu_omicron"
           }
         }
       }
@@ -124,15 +124,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_xi;1",
+        "@id": "dtmi:example:nu_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_nu;1",
+          "@id": "dtmi:example:nu_tau;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1210,
-            "name": "gamma_mu"
+            "enumValue": 1225,
+            "name": "nu_sigma"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassEnumValuePropertyCommentDtmiV3.json b/DTDL/v3/spec/Allowance-ClassEnumValuePropertyCommentDtmiV3.json
index 5684897d..730196fa 100644
--- a/DTDL/v3/spec/Allowance-ClassEnumValuePropertyCommentDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassEnumValuePropertyCommentDtmiV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_snee;1",
+        "@id": "dtmi:example:omega_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_nuh;1",
+          "@id": "dtmi:example:psi_hi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "dtmi:dtdl:property:comment;3": "nu_fuddle",
-            "enumValue": 1359,
-            "name": "nu_glikk"
+            "dtmi:dtdl:property:comment;3": "psi_yekk",
+            "enumValue": 1376,
+            "name": "psi_vroo"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassEnumValuePropertyDescriptionDtmiV3.json b/DTDL/v3/spec/Allowance-ClassEnumValuePropertyDescriptionDtmiV3.json
index ff5dc4fd..9bb80447 100644
--- a/DTDL/v3/spec/Allowance-ClassEnumValuePropertyDescriptionDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassEnumValuePropertyDescriptionDtmiV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_zeta;1",
+        "@id": "dtmi:example:wum_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_epsilon;1",
+          "@id": "dtmi:example:wum_rho;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "dtmi:dtdl:property:description;3": [
-              "pi_gamma"
+              "wum_omicron"
             ],
-            "enumValue": 1391,
-            "name": "pi_delta"
+            "enumValue": 1408,
+            "name": "wum_pi"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassEnumValuePropertyDisplayNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassEnumValuePropertyDisplayNameDtmiV3.json
index ad1bb1b2..b1ef7d55 100644
--- a/DTDL/v3/spec/Allowance-ClassEnumValuePropertyDisplayNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassEnumValuePropertyDisplayNameDtmiV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_psi;1",
+        "@id": "dtmi:example:humpf_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_chi;1",
+          "@id": "dtmi:example:humpf_thnad;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "dtmi:dtdl:property:displayName;3": [
-              "sigma_upsilon"
+              "humpf_snee"
             ],
-            "enumValue": 1423,
-            "name": "sigma_phi"
+            "enumValue": 1440,
+            "name": "humpf_quan"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassEnumValuePropertyEnumValueDtmiV3.json b/DTDL/v3/spec/Allowance-ClassEnumValuePropertyEnumValueDtmiV3.json
index a4b6ef0a..2154db6e 100644
--- a/DTDL/v3/spec/Allowance-ClassEnumValuePropertyEnumValueDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassEnumValuePropertyEnumValueDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_quan;1",
+        "@id": "dtmi:example:iota_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_snee;1",
+          "@id": "dtmi:example:iota_jogg;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "dtmi:dtdl:property:enumValue;3": 1137,
-            "name": "vroo_nuh"
+            "dtmi:dtdl:property:enumValue;3": 1152,
+            "name": "iota_zatz"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassEnumValuePropertyNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassEnumValuePropertyNameDtmiV3.json
index 137df419..a455d279 100644
--- a/DTDL/v3/spec/Allowance-ClassEnumValuePropertyNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassEnumValuePropertyNameDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_yuzz;1",
+        "@id": "dtmi:example:mu_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_omega;1",
+          "@id": "dtmi:example:mu_glikk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1200,
-            "dtmi:dtdl:property:name;3": "beta_psi"
+            "enumValue": 1215,
+            "dtmi:dtdl:property:name;3": "mu_fuddle"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassFieldOptionalPropertiesV3.json b/DTDL/v3/spec/Allowance-ClassFieldOptionalPropertiesV3.json
index fd07ef7f..176e6c64 100644
--- a/DTDL/v3/spec/Allowance-ClassFieldOptionalPropertiesV3.json
+++ b/DTDL/v3/spec/Allowance-ClassFieldOptionalPropertiesV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_kappa;1",
+        "@id": "dtmi:example:itch_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "glikk_iota",
+          "name": "itch_fuddle",
           "schema": {
             "@type": "Object",
             "fields": {
               "@context": [],
-              "name": "glikk_theta",
-              "schema": "float"
+              "name": "itch_humpf",
+              "schema": "date"
             }
           }
         }
@@ -32,14 +32,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_nu;1",
+        "@id": "dtmi:example:itch_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_mu;1",
+          "@id": "dtmi:example:itch_snee;1",
           "@type": "Object",
           "fields": {
-            "name": "glikk_lambda",
-            "schema": "integer"
+            "name": "itch_nuh",
+            "schema": "dateTime"
           }
         }
       }
@@ -53,16 +53,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_pi;1",
+        "@id": "dtmi:example:itch_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "glikk_omicron",
+          "name": "itch_spazz",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "glikk_xi",
-              "schema": "long"
+              "name": "itch_thnad",
+              "schema": "double"
             }
           }
         }
@@ -77,14 +77,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_tau;1",
+        "@id": "dtmi:example:itch_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_sigma;1",
+          "@id": "dtmi:example:itch_jogg;1",
           "@type": "Object",
           "fields": {
-            "name": "glikk_rho",
-            "schema": "string"
+            "name": "itch_zatz",
+            "schema": "duration"
           }
         }
       }
@@ -98,14 +98,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_chi;1",
+        "@id": "dtmi:example:itch_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_phi;1",
+          "@id": "dtmi:example:itch_yekk;1",
           "@type": "Object",
           "fields": {
-            "name": "glikk_upsilon",
-            "schema": "time"
+            "name": "itch_itch",
+            "schema": "float"
           }
         }
       }
@@ -119,14 +119,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_yuzz;1",
+        "@id": "dtmi:example:yekk_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_omega;1",
+          "@id": "dtmi:example:yekk_alpha;1",
           "@type": "Object",
           "fields": {
-            "name": "glikk_psi",
-            "schema": "boolean"
+            "name": "itch_hi",
+            "schema": "integer"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassFieldPropertyCommentDtmiV3.json b/DTDL/v3/spec/Allowance-ClassFieldPropertyCommentDtmiV3.json
index a4126747..49f16044 100644
--- a/DTDL/v3/spec/Allowance-ClassFieldPropertyCommentDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassFieldPropertyCommentDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_hi;1",
+        "@id": "dtmi:example:theta_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_vroo;1",
+          "@id": "dtmi:example:theta_yuzz;1",
           "@type": "Object",
           "fields": {
-            "dtmi:dtdl:property:comment;3": "itch_itch",
-            "name": "itch_yekk",
-            "schema": "time"
+            "dtmi:dtdl:property:comment;3": "theta_psi",
+            "name": "theta_omega",
+            "schema": "long"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassFieldPropertyDescriptionDtmiV3.json b/DTDL/v3/spec/Allowance-ClassFieldPropertyDescriptionDtmiV3.json
index de05cb6b..8502e90b 100644
--- a/DTDL/v3/spec/Allowance-ClassFieldPropertyDescriptionDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassFieldPropertyDescriptionDtmiV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_rho;1",
+        "@id": "dtmi:example:kappa_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_pi;1",
+          "@id": "dtmi:example:kappa_vroo;1",
           "@type": "Object",
           "fields": {
             "dtmi:dtdl:property:description;3": [
-              "hi_xi"
+              "kappa_itch"
             ],
-            "name": "hi_omicron",
-            "schema": "date"
+            "name": "kappa_yekk",
+            "schema": "time"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassFieldPropertyDisplayNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassFieldPropertyDisplayNameDtmiV3.json
index 213e019d..4588d024 100644
--- a/DTDL/v3/spec/Allowance-ClassFieldPropertyDisplayNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassFieldPropertyDisplayNameDtmiV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_thnad;1",
+        "@id": "dtmi:example:nu_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_quan;1",
+          "@id": "dtmi:example:nu_pi;1",
           "@type": "Object",
           "fields": {
             "dtmi:dtdl:property:displayName;3": [
-              "beta_nuh"
+              "nu_xi"
             ],
-            "name": "beta_snee",
-            "schema": "double"
+            "name": "nu_omicron",
+            "schema": "date"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassFieldPropertyNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassFieldPropertyNameDtmiV3.json
index 2d2a81b0..92a06b4d 100644
--- a/DTDL/v3/spec/Allowance-ClassFieldPropertyNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassFieldPropertyNameDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_rho;1",
+        "@id": "dtmi:example:quan_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_pi;1",
+          "@id": "dtmi:example:quan_humpf;1",
           "@type": "Object",
           "fields": {
-            "dtmi:dtdl:property:name;3": "psi_omicron",
-            "schema": "boolean"
+            "dtmi:dtdl:property:name;3": "quan_um",
+            "schema": "duration"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassFieldPropertySchemaDtmiV3.json b/DTDL/v3/spec/Allowance-ClassFieldPropertySchemaDtmiV3.json
index 7113145a..d394fc26 100644
--- a/DTDL/v3/spec/Allowance-ClassFieldPropertySchemaDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassFieldPropertySchemaDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_jogg;1",
+        "@id": "dtmi:example:itch_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_zatz;1",
+          "@id": "dtmi:example:itch_xi;1",
           "@type": "Object",
           "fields": {
-            "name": "fuddle_floob",
-            "dtmi:dtdl:property:schema;3": "string"
+            "name": "itch_nu",
+            "dtmi:dtdl:property:schema;3": "duration"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassInterfaceOptionalPropertiesV3.json b/DTDL/v3/spec/Allowance-ClassInterfaceOptionalPropertiesV3.json
index 09e90379..e349c53c 100644
--- a/DTDL/v3/spec/Allowance-ClassInterfaceOptionalPropertiesV3.json
+++ b/DTDL/v3/spec/Allowance-ClassInterfaceOptionalPropertiesV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_vroo;1",
+        "@id": "dtmi:example:pi_yuzz;1",
         "@type": "Interface",
         "extends": {
           "@context": [],
-          "@id": "dtmi:example:epsilon_yekk;1",
+          "@id": "dtmi:example:pi_omega;1",
           "@type": "Interface"
         }
       }
@@ -25,7 +25,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_hi;1",
+        "@id": "dtmi:example:pi_wum;1",
         "@type": "Interface"
       }
     ]
@@ -38,7 +38,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_alpha;1",
+        "@id": "dtmi:example:pi_um;1",
         "@type": "Interface"
       }
     ]
@@ -51,7 +51,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_beta;1",
+        "@id": "dtmi:example:pi_humpf;1",
         "@type": "Interface"
       }
     ]
@@ -64,7 +64,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_gamma;1",
+        "@id": "dtmi:example:pi_fuddle;1",
         "@type": "Interface"
       }
     ]
@@ -77,7 +77,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_delta;1",
+        "@id": "dtmi:example:pi_glikk;1",
         "@type": "Interface"
       }
     ]
@@ -90,7 +90,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_epsilon;1",
+        "@id": "dtmi:example:pi_nuh;1",
         "@type": "Interface"
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassInterfacePropertyCommentDtmiV3.json b/DTDL/v3/spec/Allowance-ClassInterfacePropertyCommentDtmiV3.json
index 801a45a9..e1d742cd 100644
--- a/DTDL/v3/spec/Allowance-ClassInterfacePropertyCommentDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassInterfacePropertyCommentDtmiV3.json
@@ -7,9 +7,9 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_psi;1",
+        "@id": "dtmi:example:sigma_kappa;1",
         "@type": "Interface",
-        "dtmi:dtdl:property:comment;3": "eta_omega"
+        "dtmi:dtdl:property:comment;3": "sigma_lambda"
       }
     ]
   }
diff --git a/DTDL/v3/spec/Allowance-ClassInterfacePropertyContentsDtmiV3.json b/DTDL/v3/spec/Allowance-ClassInterfacePropertyContentsDtmiV3.json
index a97372ac..bae7bcb8 100644
--- a/DTDL/v3/spec/Allowance-ClassInterfacePropertyContentsDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassInterfacePropertyContentsDtmiV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_eta;1",
+        "@id": "dtmi:example:phi_beta;1",
         "@type": "Interface",
         "dtmi:dtdl:property:contents;3": [
           {
             "@type": "Command",
-            "name": "kappa_theta"
+            "name": "phi_gamma"
           }
         ]
       }
diff --git a/DTDL/v3/spec/Allowance-ClassInterfacePropertyDescriptionDtmiV3.json b/DTDL/v3/spec/Allowance-ClassInterfacePropertyDescriptionDtmiV3.json
index 9aa99833..416809e6 100644
--- a/DTDL/v3/spec/Allowance-ClassInterfacePropertyDescriptionDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassInterfacePropertyDescriptionDtmiV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_gamma;1",
+        "@id": "dtmi:example:phi_yekk;1",
         "@type": "Interface",
         "dtmi:dtdl:property:description;3": [
-          "lambda_delta"
+          "phi_vroo"
         ]
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassInterfacePropertyDisplayNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassInterfacePropertyDisplayNameDtmiV3.json
index d38b33f9..904463c1 100644
--- a/DTDL/v3/spec/Allowance-ClassInterfacePropertyDisplayNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassInterfacePropertyDisplayNameDtmiV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_vroo;1",
+        "@id": "dtmi:example:chi_zatz;1",
         "@type": "Interface",
         "dtmi:dtdl:property:displayName;3": [
-          "lambda_hi"
+          "chi_jogg"
         ]
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassInterfacePropertyExtendsDtmiV3.json b/DTDL/v3/spec/Allowance-ClassInterfacePropertyExtendsDtmiV3.json
index 141e7a94..e3d51fbc 100644
--- a/DTDL/v3/spec/Allowance-ClassInterfacePropertyExtendsDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassInterfacePropertyExtendsDtmiV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_jogg;1",
+        "@id": "dtmi:example:yuzz_flunn;1",
         "@type": "Interface",
         "dtmi:dtdl:property:extends;3": [
           {
-            "@id": "dtmi:example:xi_flunn;1",
+            "@id": "dtmi:example:yuzz_itch;1",
             "@type": "Interface"
           }
         ]
diff --git a/DTDL/v3/spec/Allowance-ClassInterfacePropertySchemasDtmiV3.json b/DTDL/v3/spec/Allowance-ClassInterfacePropertySchemasDtmiV3.json
index 5a6401b7..efd66a13 100644
--- a/DTDL/v3/spec/Allowance-ClassInterfacePropertySchemasDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassInterfacePropertySchemasDtmiV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_yuzz;1",
+        "@id": "dtmi:example:humpf_snee;1",
         "@type": "Interface",
         "dtmi:dtdl:property:schemas;3": [
           {
-            "@id": "dtmi:example:rho_wum;1",
+            "@id": "dtmi:example:humpf_quan;1",
             "@type": "Array",
             "elementSchema": "date"
           }
diff --git a/DTDL/v3/spec/Allowance-ClassMapKeyOptionalPropertiesV3.json b/DTDL/v3/spec/Allowance-ClassMapKeyOptionalPropertiesV3.json
index 58526331..9800d908 100644
--- a/DTDL/v3/spec/Allowance-ClassMapKeyOptionalPropertiesV3.json
+++ b/DTDL/v3/spec/Allowance-ClassMapKeyOptionalPropertiesV3.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_xi;1",
+        "@id": "dtmi:example:thnad_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "chi_nu",
+          "name": "thnad_epsilon",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "chi_mu",
-              "schema": "string"
+              "name": "thnad_delta",
+              "schema": "duration"
             },
             "mapKey": {
               "@context": [],
-              "name": "chi_lambda",
+              "name": "thnad_gamma",
               "schema": "string"
             }
           }
@@ -36,17 +36,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_sigma;1",
+        "@id": "dtmi:example:thnad_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_pi;1",
+          "@id": "dtmi:example:thnad_theta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "chi_rho",
-            "schema": "time"
+            "name": "thnad_iota",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "chi_omicron",
+            "name": "thnad_eta",
             "schema": "string"
           }
         }
@@ -61,19 +61,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_chi;1",
+        "@id": "dtmi:example:thnad_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "chi_phi",
+          "name": "thnad_nu",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "chi_upsilon",
-              "schema": "boolean"
+              "name": "thnad_mu",
+              "schema": "integer"
             },
             "mapKey": {
-              "name": "chi_tau",
+              "name": "thnad_lambda",
               "schema": "string"
             }
           }
@@ -89,17 +89,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_wum;1",
+        "@id": "dtmi:example:thnad_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_omega;1",
+          "@id": "dtmi:example:thnad_pi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "chi_yuzz",
-            "schema": "date"
+            "name": "thnad_rho",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "chi_psi",
+            "name": "thnad_omicron",
             "schema": "string"
           }
         }
@@ -114,17 +114,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_glikk;1",
+        "@id": "dtmi:example:thnad_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_humpf;1",
+          "@id": "dtmi:example:thnad_upsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "chi_fuddle",
-            "schema": "dateTime"
+            "name": "thnad_phi",
+            "schema": "string"
           },
           "mapKey": {
-            "name": "chi_um",
+            "name": "thnad_tau",
             "schema": "string"
           }
         }
@@ -139,17 +139,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_thnad;1",
+        "@id": "dtmi:example:thnad_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_snee;1",
+          "@id": "dtmi:example:thnad_omega;1",
           "@type": "Map",
           "mapValue": {
-            "name": "chi_quan",
-            "schema": "double"
+            "name": "thnad_yuzz",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "chi_nuh",
+            "name": "thnad_psi",
             "schema": "string"
           }
         }
diff --git a/DTDL/v3/spec/Allowance-ClassMapKeyPropertyCommentDtmiV3.json b/DTDL/v3/spec/Allowance-ClassMapKeyPropertyCommentDtmiV3.json
index 776ef7d1..4ab8a402 100644
--- a/DTDL/v3/spec/Allowance-ClassMapKeyPropertyCommentDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassMapKeyPropertyCommentDtmiV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_fuddle;1",
+        "@id": "dtmi:example:epsilon_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_um;1",
+          "@id": "dtmi:example:epsilon_um;1",
           "@type": "Map",
           "mapValue": {
-            "name": "floob_humpf",
-            "schema": "dateTime"
+            "name": "epsilon_humpf",
+            "schema": "boolean"
           },
           "mapKey": {
-            "dtmi:dtdl:property:comment;3": "floob_yuzz",
-            "name": "floob_wum",
+            "dtmi:dtdl:property:comment;3": "epsilon_yuzz",
+            "name": "epsilon_wum",
             "schema": "string"
           }
         }
diff --git a/DTDL/v3/spec/Allowance-ClassMapKeyPropertyDescriptionDtmiV3.json b/DTDL/v3/spec/Allowance-ClassMapKeyPropertyDescriptionDtmiV3.json
index 4cfcf68a..15f96652 100644
--- a/DTDL/v3/spec/Allowance-ClassMapKeyPropertyDescriptionDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassMapKeyPropertyDescriptionDtmiV3.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_spazz;1",
+        "@id": "dtmi:example:theta_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_quan;1",
+          "@id": "dtmi:example:theta_quan;1",
           "@type": "Map",
           "mapValue": {
-            "name": "flunn_thnad",
-            "schema": "duration"
+            "name": "theta_thnad",
+            "schema": "dateTime"
           },
           "mapKey": {
             "dtmi:dtdl:property:description;3": [
-              "flunn_nuh"
+              "theta_nuh"
             ],
-            "name": "flunn_snee",
+            "name": "theta_snee",
             "schema": "string"
           }
         }
diff --git a/DTDL/v3/spec/Allowance-ClassMapKeyPropertyDisplayNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassMapKeyPropertyDisplayNameDtmiV3.json
index 5fcf1994..9ff91e9d 100644
--- a/DTDL/v3/spec/Allowance-ClassMapKeyPropertyDisplayNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassMapKeyPropertyDisplayNameDtmiV3.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_yekk;1",
+        "@id": "dtmi:example:lambda_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_flunn;1",
+          "@id": "dtmi:example:lambda_flunn;1",
           "@type": "Map",
           "mapValue": {
-            "name": "vroo_itch",
-            "schema": "integer"
+            "name": "lambda_itch",
+            "schema": "duration"
           },
           "mapKey": {
             "dtmi:dtdl:property:displayName;3": [
-              "vroo_zatz"
+              "lambda_zatz"
             ],
-            "name": "vroo_jogg",
+            "name": "lambda_jogg",
             "schema": "string"
           }
         }
diff --git a/DTDL/v3/spec/Allowance-ClassMapKeyPropertyNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassMapKeyPropertyNameDtmiV3.json
index 65079b52..a7c74814 100644
--- a/DTDL/v3/spec/Allowance-ClassMapKeyPropertyNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassMapKeyPropertyNameDtmiV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_wum;1",
+        "@id": "dtmi:example:omega_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_omega;1",
+          "@id": "dtmi:example:omega_pi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "mu_yuzz",
-            "schema": "duration"
+            "name": "omega_rho",
+            "schema": "boolean"
           },
           "mapKey": {
-            "dtmi:dtdl:property:name;3": "mu_psi",
+            "dtmi:dtdl:property:name;3": "omega_omicron",
             "schema": "string"
           }
         }
diff --git a/DTDL/v3/spec/Allowance-ClassMapKeyPropertySchemaDtmiV3.json b/DTDL/v3/spec/Allowance-ClassMapKeyPropertySchemaDtmiV3.json
index 88208c7a..a9288cd8 100644
--- a/DTDL/v3/spec/Allowance-ClassMapKeyPropertySchemaDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassMapKeyPropertySchemaDtmiV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_zatz;1",
+        "@id": "dtmi:example:quan_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_spazz;1",
+          "@id": "dtmi:example:quan_um;1",
           "@type": "Map",
           "mapValue": {
-            "name": "phi_floob",
-            "schema": "double"
+            "name": "quan_humpf",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "phi_thnad",
+            "name": "quan_wum",
             "dtmi:dtdl:property:schema;3": "string"
           }
         }
diff --git a/DTDL/v3/spec/Allowance-ClassMapOptionalPropertiesV3.json b/DTDL/v3/spec/Allowance-ClassMapOptionalPropertiesV3.json
index d30f4008..68d28e34 100644
--- a/DTDL/v3/spec/Allowance-ClassMapOptionalPropertiesV3.json
+++ b/DTDL/v3/spec/Allowance-ClassMapOptionalPropertiesV3.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_xi;1",
+        "@id": "dtmi:example:alpha_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "quan_nu",
+          "name": "alpha_itch",
           "schema": {
             "@context": [],
             "@type": "Map",
             "mapKey": {
-              "name": "quan_lambda",
+              "name": "alpha_jogg",
               "schema": "string"
             },
             "mapValue": {
-              "name": "quan_mu",
-              "schema": "time"
+              "name": "alpha_flunn",
+              "schema": "double"
             }
           }
         }
@@ -36,20 +36,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_sigma;1",
+        "@id": "dtmi:example:beta_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "quan_rho",
+          "name": "beta_alpha",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "quan_omicron",
+              "name": "alpha_vroo",
               "schema": "string"
             },
             "mapValue": {
-              "name": "quan_pi",
-              "schema": "boolean"
+              "name": "alpha_hi",
+              "schema": "duration"
             }
           }
         }
@@ -64,18 +64,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_chi;1",
+        "@id": "dtmi:example:beta_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_tau;1",
+          "@id": "dtmi:example:beta_gamma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_upsilon",
+            "name": "beta_delta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "quan_phi",
-            "schema": "date"
+            "name": "beta_epsilon",
+            "schema": "float"
           }
         }
       }
@@ -89,18 +89,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_wum;1",
+        "@id": "dtmi:example:beta_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_psi;1",
+          "@id": "dtmi:example:beta_eta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_omega",
+            "name": "beta_theta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "quan_yuzz",
-            "schema": "dateTime"
+            "name": "beta_iota",
+            "schema": "integer"
           }
         }
       }
@@ -114,18 +114,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_glikk;1",
+        "@id": "dtmi:example:beta_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_um;1",
+          "@id": "dtmi:example:beta_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_humpf",
+            "name": "beta_mu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "quan_fuddle",
-            "schema": "double"
+            "name": "beta_nu",
+            "schema": "long"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassMapPropertyCommentDtmiV3.json b/DTDL/v3/spec/Allowance-ClassMapPropertyCommentDtmiV3.json
index 5272d09b..679a3873 100644
--- a/DTDL/v3/spec/Allowance-ClassMapPropertyCommentDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassMapPropertyCommentDtmiV3.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_fuddle;1",
+        "@id": "dtmi:example:lambda_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_yuzz;1",
+          "@id": "dtmi:example:lambda_rho;1",
           "@type": "Map",
-          "dtmi:dtdl:property:comment;3": "vroo_wum",
+          "dtmi:dtdl:property:comment;3": "lambda_sigma",
           "mapKey": {
-            "name": "vroo_um",
+            "name": "lambda_tau",
             "schema": "string"
           },
           "mapValue": {
-            "name": "vroo_humpf",
-            "schema": "long"
+            "name": "lambda_upsilon",
+            "schema": "double"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassMapPropertyDescriptionDtmiV3.json b/DTDL/v3/spec/Allowance-ClassMapPropertyDescriptionDtmiV3.json
index 0c7bdcb1..4aab353e 100644
--- a/DTDL/v3/spec/Allowance-ClassMapPropertyDescriptionDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassMapPropertyDescriptionDtmiV3.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_spazz;1",
+        "@id": "dtmi:example:xi_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_nuh;1",
+          "@id": "dtmi:example:xi_psi;1",
           "@type": "Map",
           "dtmi:dtdl:property:description;3": [
-            "beta_snee"
+            "xi_omega"
           ],
           "mapKey": {
-            "name": "beta_quan",
+            "name": "xi_yuzz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "beta_thnad",
-            "schema": "time"
+            "name": "xi_wum",
+            "schema": "float"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassMapPropertyDisplayNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassMapPropertyDisplayNameDtmiV3.json
index 15932a0c..dffc25a4 100644
--- a/DTDL/v3/spec/Allowance-ClassMapPropertyDisplayNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassMapPropertyDisplayNameDtmiV3.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_yekk;1",
+        "@id": "dtmi:example:rho_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_zatz;1",
+          "@id": "dtmi:example:rho_fuddle;1",
           "@type": "Map",
           "dtmi:dtdl:property:displayName;3": [
-            "epsilon_jogg"
+            "rho_glikk"
           ],
           "mapKey": {
-            "name": "epsilon_flunn",
+            "name": "rho_nuh",
             "schema": "string"
           },
           "mapValue": {
-            "name": "epsilon_itch",
-            "schema": "date"
+            "name": "rho_snee",
+            "schema": "long"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassMapPropertyMapKeyDtmiV3.json b/DTDL/v3/spec/Allowance-ClassMapPropertyMapKeyDtmiV3.json
index 0c248504..2335fab1 100644
--- a/DTDL/v3/spec/Allowance-ClassMapPropertyMapKeyDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassMapPropertyMapKeyDtmiV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_tau;1",
+        "@id": "dtmi:example:jogg_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_pi;1",
+          "@id": "dtmi:example:jogg_quan;1",
           "@type": "Map",
           "dtmi:dtdl:property:mapKey;3": {
-            "name": "um_rho",
+            "name": "jogg_thnad",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_sigma",
-            "schema": "dateTime"
+            "name": "jogg_spazz",
+            "schema": "duration"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassMapPropertyMapValueDtmiV3.json b/DTDL/v3/spec/Allowance-ClassMapPropertyMapValueDtmiV3.json
index 7541d46f..634692f1 100644
--- a/DTDL/v3/spec/Allowance-ClassMapPropertyMapValueDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassMapPropertyMapValueDtmiV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_spazz;1",
+        "@id": "dtmi:example:alpha_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_snee;1",
+          "@id": "dtmi:example:alpha_pi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_quan",
+            "name": "alpha_rho",
             "schema": "string"
           },
           "dtmi:dtdl:property:mapValue;3": {
-            "name": "snee_thnad",
-            "schema": "dateTime"
+            "name": "alpha_sigma",
+            "schema": "integer"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassMapValueOptionalPropertiesV3.json b/DTDL/v3/spec/Allowance-ClassMapValueOptionalPropertiesV3.json
index 29247938..779acfb7 100644
--- a/DTDL/v3/spec/Allowance-ClassMapValueOptionalPropertiesV3.json
+++ b/DTDL/v3/spec/Allowance-ClassMapValueOptionalPropertiesV3.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_mu;1",
+        "@id": "dtmi:example:um_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omicron_lambda",
+          "name": "um_phi",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "omicron_kappa",
+              "name": "um_upsilon",
               "schema": "string"
             },
             "mapValue": {
               "@context": [],
-              "name": "omicron_iota",
+              "name": "um_tau",
               "schema": "dateTime"
             }
           }
@@ -36,17 +36,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_pi;1",
+        "@id": "dtmi:example:um_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_xi;1",
+          "@id": "dtmi:example:um_omega;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omicron_omicron",
+            "name": "um_yuzz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omicron_nu",
+            "name": "um_psi",
             "schema": "double"
           }
         }
@@ -61,19 +61,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_upsilon;1",
+        "@id": "dtmi:example:um_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omicron_tau",
+          "name": "um_fuddle",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "omicron_sigma",
+              "name": "um_humpf",
               "schema": "string"
             },
             "mapValue": {
-              "name": "omicron_rho",
+              "name": "um_um",
               "schema": "duration"
             }
           }
@@ -89,17 +89,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_omega;1",
+        "@id": "dtmi:example:um_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_chi;1",
+          "@id": "dtmi:example:um_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omicron_psi",
+            "name": "um_quan",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omicron_phi",
+            "name": "um_nuh",
             "schema": "float"
           }
         }
@@ -114,17 +114,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_humpf;1",
+        "@id": "dtmi:example:um_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_wum;1",
+          "@id": "dtmi:example:um_floob;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omicron_um",
+            "name": "um_zatz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omicron_yuzz",
+            "name": "um_spazz",
             "schema": "integer"
           }
         }
@@ -139,17 +139,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_snee;1",
+        "@id": "dtmi:example:um_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_glikk;1",
+          "@id": "dtmi:example:um_itch;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omicron_nuh",
+            "name": "um_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omicron_fuddle",
+            "name": "um_flunn",
             "schema": "long"
           }
         }
diff --git a/DTDL/v3/spec/Allowance-ClassMapValuePropertyCommentDtmiV3.json b/DTDL/v3/spec/Allowance-ClassMapValuePropertyCommentDtmiV3.json
index 4deafcfe..691ba42b 100644
--- a/DTDL/v3/spec/Allowance-ClassMapValuePropertyCommentDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassMapValuePropertyCommentDtmiV3.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_um;1",
+        "@id": "dtmi:example:vroo_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_yuzz;1",
+          "@id": "dtmi:example:yekk_hi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_wum",
+            "name": "vroo_alpha",
             "schema": "string"
           },
           "mapValue": {
-            "dtmi:dtdl:property:comment;3": "fuddle_psi",
-            "name": "fuddle_omega",
-            "schema": "integer"
+            "dtmi:dtdl:property:comment;3": "yekk_yekk",
+            "name": "yekk_vroo",
+            "schema": "string"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassMapValuePropertyDescriptionDtmiV3.json b/DTDL/v3/spec/Allowance-ClassMapValuePropertyDescriptionDtmiV3.json
index 15e0fad7..7acc263c 100644
--- a/DTDL/v3/spec/Allowance-ClassMapValuePropertyDescriptionDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassMapValuePropertyDescriptionDtmiV3.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_quan;1",
+        "@id": "dtmi:example:beta_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_nuh;1",
+          "@id": "dtmi:example:beta_zeta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_snee",
+            "name": "beta_eta",
             "schema": "string"
           },
           "mapValue": {
             "dtmi:dtdl:property:description;3": [
-              "snee_fuddle"
+              "beta_delta"
             ],
-            "name": "snee_glikk",
-            "schema": "string"
+            "name": "beta_epsilon",
+            "schema": "boolean"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassMapValuePropertyDisplayNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassMapValuePropertyDisplayNameDtmiV3.json
index 5149dc11..56a6a284 100644
--- a/DTDL/v3/spec/Allowance-ClassMapValuePropertyDisplayNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassMapValuePropertyDisplayNameDtmiV3.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_flunn;1",
+        "@id": "dtmi:example:epsilon_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_zatz;1",
+          "@id": "dtmi:example:epsilon_mu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_jogg",
+            "name": "epsilon_nu",
             "schema": "string"
           },
           "mapValue": {
             "dtmi:dtdl:property:displayName;3": [
-              "spazz_spazz"
+              "epsilon_kappa"
             ],
-            "name": "spazz_floob",
-            "schema": "boolean"
+            "name": "epsilon_lambda",
+            "schema": "dateTime"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassMapValuePropertyNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassMapValuePropertyNameDtmiV3.json
index 1bdeeb28..198e2058 100644
--- a/DTDL/v3/spec/Allowance-ClassMapValuePropertyNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassMapValuePropertyNameDtmiV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_wum;1",
+        "@id": "dtmi:example:sigma_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_omega;1",
+          "@id": "dtmi:example:sigma_omega;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_yuzz",
+            "name": "sigma_yuzz",
             "schema": "string"
           },
           "mapValue": {
-            "dtmi:dtdl:property:name;3": "zeta_psi",
-            "schema": "long"
+            "dtmi:dtdl:property:name;3": "sigma_psi",
+            "schema": "float"
           }
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassMapValuePropertySchemaDtmiV3.json b/DTDL/v3/spec/Allowance-ClassMapValuePropertySchemaDtmiV3.json
index df9ba232..66256639 100644
--- a/DTDL/v3/spec/Allowance-ClassMapValuePropertySchemaDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassMapValuePropertySchemaDtmiV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_spazz;1",
+        "@id": "dtmi:example:um_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_quan;1",
+          "@id": "dtmi:example:wum_hi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "xi_thnad",
+            "name": "um_alpha",
             "schema": "string"
           },
           "mapValue": {
-            "name": "xi_snee",
+            "name": "wum_vroo",
             "dtmi:dtdl:property:schema;3": "float"
           }
         }
diff --git a/DTDL/v3/spec/Allowance-ClassObjectOptionalPropertiesV3.json b/DTDL/v3/spec/Allowance-ClassObjectOptionalPropertiesV3.json
index 03af547b..db5b5ed2 100644
--- a/DTDL/v3/spec/Allowance-ClassObjectOptionalPropertiesV3.json
+++ b/DTDL/v3/spec/Allowance-ClassObjectOptionalPropertiesV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_wum;1",
+        "@id": "dtmi:example:kappa_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "itch_yuzz",
+          "name": "iota_hi",
           "schema": {
             "@context": [],
             "@type": "Object"
@@ -28,11 +28,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_humpf;1",
+        "@id": "dtmi:example:kappa_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "itch_um",
+          "name": "kappa_beta",
           "schema": {
             "@type": "Object"
           }
@@ -48,10 +48,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_glikk;1",
+        "@id": "dtmi:example:kappa_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_fuddle;1",
+          "@id": "dtmi:example:kappa_delta;1",
           "@type": "Object"
         }
       }
@@ -65,10 +65,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_snee;1",
+        "@id": "dtmi:example:kappa_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_nuh;1",
+          "@id": "dtmi:example:kappa_zeta;1",
           "@type": "Object"
         }
       }
@@ -82,10 +82,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_thnad;1",
+        "@id": "dtmi:example:kappa_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_quan;1",
+          "@id": "dtmi:example:kappa_theta;1",
           "@type": "Object"
         }
       }
@@ -99,10 +99,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_floob;1",
+        "@id": "dtmi:example:kappa_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_spazz;1",
+          "@id": "dtmi:example:kappa_kappa;1",
           "@type": "Object"
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassObjectPropertyCommentDtmiV3.json b/DTDL/v3/spec/Allowance-ClassObjectPropertyCommentDtmiV3.json
index dac0a442..0e2b76e0 100644
--- a/DTDL/v3/spec/Allowance-ClassObjectPropertyCommentDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassObjectPropertyCommentDtmiV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_chi;1",
+        "@id": "dtmi:example:xi_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_upsilon;1",
+          "@id": "dtmi:example:nu_vroo;1",
           "@type": "Object",
-          "dtmi:dtdl:property:comment;3": "alpha_phi"
+          "dtmi:dtdl:property:comment;3": "nu_hi"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassObjectPropertyDescriptionDtmiV3.json b/DTDL/v3/spec/Allowance-ClassObjectPropertyDescriptionDtmiV3.json
index 43f0cf05..7f4843a5 100644
--- a/DTDL/v3/spec/Allowance-ClassObjectPropertyDescriptionDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassObjectPropertyDescriptionDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_eta;1",
+        "@id": "dtmi:example:omicron_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_epsilon;1",
+          "@id": "dtmi:example:omicron_um;1",
           "@type": "Object",
           "dtmi:dtdl:property:description;3": [
-            "gamma_zeta"
+            "omicron_humpf"
           ]
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassObjectPropertyDisplayNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassObjectPropertyDisplayNameDtmiV3.json
index e4f4891d..48061642 100644
--- a/DTDL/v3/spec/Allowance-ClassObjectPropertyDisplayNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassObjectPropertyDisplayNameDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_spazz;1",
+        "@id": "dtmi:example:rho_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_quan;1",
+          "@id": "dtmi:example:rho_mu;1",
           "@type": "Object",
           "dtmi:dtdl:property:displayName;3": [
-            "delta_thnad"
+            "rho_nu"
           ]
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassObjectPropertyFieldsDtmiV3.json b/DTDL/v3/spec/Allowance-ClassObjectPropertyFieldsDtmiV3.json
index 71fcdd45..2ae56543 100644
--- a/DTDL/v3/spec/Allowance-ClassObjectPropertyFieldsDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassObjectPropertyFieldsDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_floob;1",
+        "@id": "dtmi:example:phi_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_thnad;1",
+          "@id": "dtmi:example:phi_phi;1",
           "@type": "Object",
           "dtmi:dtdl:property:fields;3": [
             {
-              "name": "theta_spazz",
-              "schema": "dateTime"
+              "name": "phi_chi",
+              "schema": "integer"
             }
           ]
         }
diff --git a/DTDL/v3/spec/Allowance-ClassPropertyOptionalPropertiesV3.json b/DTDL/v3/spec/Allowance-ClassPropertyOptionalPropertiesV3.json
index 2451b58d..21f8aeed 100644
--- a/DTDL/v3/spec/Allowance-ClassPropertyOptionalPropertiesV3.json
+++ b/DTDL/v3/spec/Allowance-ClassPropertyOptionalPropertiesV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_jogg;1",
+        "@id": "dtmi:example:nuh_quan;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:sigma_zatz;1",
+          "@id": "dtmi:example:nuh_snee;1",
           "@type": "Interface",
           "contents": {
             "@context": [],
             "@type": "Property",
-            "name": "sigma_floob",
-            "schema": "time"
+            "name": "nuh_nuh",
+            "schema": "float"
           }
         }
       }
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_yekk;1",
+        "@id": "dtmi:example:nuh_floob;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:sigma_itch;1",
+          "@id": "dtmi:example:nuh_spazz;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "sigma_flunn",
-            "schema": "boolean"
+            "name": "nuh_thnad",
+            "schema": "integer"
           }
         }
       }
@@ -52,12 +52,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_hi;1",
+        "@id": "dtmi:example:nuh_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "sigma_vroo",
-          "schema": "date"
+          "name": "nuh_zatz",
+          "schema": "long"
         }
       }
     ]
@@ -70,12 +70,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_beta;1",
+        "@id": "dtmi:example:nuh_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "tau_alpha",
-          "schema": "dateTime"
+          "name": "nuh_flunn",
+          "schema": "string"
         }
       }
     ]
@@ -88,12 +88,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_delta;1",
+        "@id": "dtmi:example:nuh_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "tau_gamma",
-          "schema": "double"
+          "name": "nuh_yekk",
+          "schema": "time"
         }
       }
     ]
@@ -106,12 +106,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_zeta;1",
+        "@id": "dtmi:example:snee_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "tau_epsilon",
-          "schema": "duration"
+          "name": "nuh_hi",
+          "schema": "boolean"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassPropertyPropertyCommentDtmiV3.json b/DTDL/v3/spec/Allowance-ClassPropertyPropertyCommentDtmiV3.json
index fe15d048..9efe3108 100644
--- a/DTDL/v3/spec/Allowance-ClassPropertyPropertyCommentDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassPropertyPropertyCommentDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_wum;1",
+        "@id": "dtmi:example:zatz_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "dtmi:dtdl:property:comment;3": "omega_omega",
-          "name": "omega_yuzz",
-          "schema": "duration"
+          "dtmi:dtdl:property:comment;3": "zatz_yuzz",
+          "name": "zatz_wum",
+          "schema": "dateTime"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassPropertyPropertyDescriptionDtmiV3.json b/DTDL/v3/spec/Allowance-ClassPropertyPropertyDescriptionDtmiV3.json
index 664e7b6f..e155c2e5 100644
--- a/DTDL/v3/spec/Allowance-ClassPropertyPropertyDescriptionDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassPropertyPropertyDescriptionDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_lambda;1",
+        "@id": "dtmi:example:flunn_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
           "dtmi:dtdl:property:description;3": [
-            "wum_iota"
+            "flunn_kappa"
           ],
-          "name": "wum_kappa",
-          "schema": "integer"
+          "name": "flunn_lambda",
+          "schema": "duration"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassPropertyPropertyDisplayNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassPropertyPropertyDisplayNameDtmiV3.json
index 2ad29f31..55a904c3 100644
--- a/DTDL/v3/spec/Allowance-ClassPropertyPropertyDisplayNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassPropertyPropertyDisplayNameDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_flunn;1",
+        "@id": "dtmi:example:itch_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
           "dtmi:dtdl:property:displayName;3": [
-            "um_zatz"
+            "itch_jogg"
           ],
-          "name": "um_jogg",
-          "schema": "string"
+          "name": "itch_flunn",
+          "schema": "integer"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassPropertyPropertyNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassPropertyPropertyNameDtmiV3.json
index bc24aee0..749cc25d 100644
--- a/DTDL/v3/spec/Allowance-ClassPropertyPropertyNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassPropertyPropertyNameDtmiV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_snee;1",
+        "@id": "dtmi:example:wum_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "dtmi:dtdl:property:name;3": "nu_nuh",
-          "schema": "duration"
+          "dtmi:dtdl:property:name;3": "wum_sigma",
+          "schema": "string"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassPropertyPropertySchemaDtmiV3.json b/DTDL/v3/spec/Allowance-ClassPropertyPropertySchemaDtmiV3.json
index 986ec063..86d42c10 100644
--- a/DTDL/v3/spec/Allowance-ClassPropertyPropertySchemaDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassPropertyPropertySchemaDtmiV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_um;1",
+        "@id": "dtmi:example:nuh_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "sigma_wum",
-          "dtmi:dtdl:property:schema;3": "dateTime"
+          "name": "nuh_phi",
+          "dtmi:dtdl:property:schema;3": "string"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassPropertyPropertyWritableDtmiV3.json b/DTDL/v3/spec/Allowance-ClassPropertyPropertyWritableDtmiV3.json
index 72cd4049..ec416881 100644
--- a/DTDL/v3/spec/Allowance-ClassPropertyPropertyWritableDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassPropertyPropertyWritableDtmiV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_tau;1",
+        "@id": "dtmi:example:vroo_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_sigma",
-          "schema": "string",
+          "name": "vroo_tau",
+          "schema": "integer",
           "dtmi:dtdl:property:writable;3": false
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassRelationshipOptionalPropertiesV3.json b/DTDL/v3/spec/Allowance-ClassRelationshipOptionalPropertiesV3.json
index a30f8009..63441cc2 100644
--- a/DTDL/v3/spec/Allowance-ClassRelationshipOptionalPropertiesV3.json
+++ b/DTDL/v3/spec/Allowance-ClassRelationshipOptionalPropertiesV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_mu;1",
+        "@id": "dtmi:example:delta_nu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:thnad_lambda;1",
+          "@id": "dtmi:example:delta_mu;1",
           "@type": "Interface",
           "contents": {
             "@context": [],
             "@type": "Relationship",
-            "name": "thnad_kappa"
+            "name": "delta_lambda"
           }
         }
       }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_omicron;1",
+        "@id": "dtmi:example:delta_pi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:thnad_xi;1",
+          "@id": "dtmi:example:delta_omicron;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "thnad_nu"
+            "name": "delta_xi"
           }
         }
       }
@@ -50,11 +50,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_rho;1",
+        "@id": "dtmi:example:delta_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "thnad_pi"
+          "name": "delta_rho"
         }
       }
     ]
@@ -67,11 +67,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_tau;1",
+        "@id": "dtmi:example:delta_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "thnad_sigma"
+          "name": "delta_tau"
         }
       }
     ]
@@ -84,11 +84,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_phi;1",
+        "@id": "dtmi:example:delta_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "thnad_upsilon"
+          "name": "delta_phi"
         }
       }
     ]
@@ -101,11 +101,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_psi;1",
+        "@id": "dtmi:example:delta_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "thnad_chi"
+          "name": "delta_psi"
         }
       }
     ]
@@ -118,11 +118,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_yuzz;1",
+        "@id": "dtmi:example:delta_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "thnad_omega"
+          "name": "delta_yuzz"
         }
       }
     ]
@@ -135,11 +135,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_um;1",
+        "@id": "dtmi:example:delta_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "thnad_wum"
+          "name": "delta_um"
         }
       }
     ]
@@ -152,11 +152,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_fuddle;1",
+        "@id": "dtmi:example:delta_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "thnad_humpf"
+          "name": "delta_fuddle"
         }
       }
     ]
@@ -169,11 +169,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_nuh;1",
+        "@id": "dtmi:example:delta_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "thnad_glikk"
+          "name": "delta_nuh"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassRelationshipPropertyCommentDtmiV3.json b/DTDL/v3/spec/Allowance-ClassRelationshipPropertyCommentDtmiV3.json
index 11857f43..41785f6f 100644
--- a/DTDL/v3/spec/Allowance-ClassRelationshipPropertyCommentDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassRelationshipPropertyCommentDtmiV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_theta;1",
+        "@id": "dtmi:example:kappa_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "dtmi:dtdl:property:comment;3": "itch_zeta",
-          "name": "itch_eta"
+          "dtmi:dtdl:property:comment;3": "kappa_nu",
+          "name": "kappa_xi"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassRelationshipPropertyDescriptionDtmiV3.json b/DTDL/v3/spec/Allowance-ClassRelationshipPropertyDescriptionDtmiV3.json
index 2d842b32..08b33e3f 100644
--- a/DTDL/v3/spec/Allowance-ClassRelationshipPropertyDescriptionDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassRelationshipPropertyDescriptionDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_floob;1",
+        "@id": "dtmi:example:lambda_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "dtmi:dtdl:property:description;3": [
-            "yekk_thnad"
+            "lambda_yekk"
           ],
-          "name": "yekk_spazz"
+          "name": "lambda_vroo"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassRelationshipPropertyDisplayNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassRelationshipPropertyDisplayNameDtmiV3.json
index 803a240d..bb643070 100644
--- a/DTDL/v3/spec/Allowance-ClassRelationshipPropertyDisplayNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassRelationshipPropertyDisplayNameDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_phi;1",
+        "@id": "dtmi:example:nu_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "dtmi:dtdl:property:displayName;3": [
-            "hi_tau"
+            "nu_wum"
           ],
-          "name": "hi_upsilon"
+          "name": "nu_um"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassRelationshipPropertyMaxMultiplicityDtmiV3.json b/DTDL/v3/spec/Allowance-ClassRelationshipPropertyMaxMultiplicityDtmiV3.json
index 53de43b3..9ae49637 100644
--- a/DTDL/v3/spec/Allowance-ClassRelationshipPropertyMaxMultiplicityDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassRelationshipPropertyMaxMultiplicityDtmiV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_vroo;1",
+        "@id": "dtmi:example:omicron_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "dtmi:dtdl:property:maxMultiplicity;3": 1470,
-          "name": "alpha_yekk"
+          "dtmi:dtdl:property:maxMultiplicity;3": 1487,
+          "name": "omicron_epsilon"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassRelationshipPropertyMinMultiplicityDtmiV3.json b/DTDL/v3/spec/Allowance-ClassRelationshipPropertyMinMultiplicityDtmiV3.json
index 5ce4b306..becd82ad 100644
--- a/DTDL/v3/spec/Allowance-ClassRelationshipPropertyMinMultiplicityDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassRelationshipPropertyMinMultiplicityDtmiV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_sigma;1",
+        "@id": "dtmi:example:pi_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "dtmi:dtdl:property:minMultiplicity;3": 0,
-          "name": "gamma_rho"
+          "name": "pi_omega"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassRelationshipPropertyNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassRelationshipPropertyNameDtmiV3.json
index fe55a6fb..74b78ac5 100644
--- a/DTDL/v3/spec/Allowance-ClassRelationshipPropertyNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassRelationshipPropertyNameDtmiV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_vroo;1",
+        "@id": "dtmi:example:gamma_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "dtmi:dtdl:property:name;3": "quan_yekk"
+          "dtmi:dtdl:property:name;3": "gamma_vroo"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassRelationshipPropertyPropertiesDtmiV3.json b/DTDL/v3/spec/Allowance-ClassRelationshipPropertyPropertiesDtmiV3.json
index 929cb816..d98dedd0 100644
--- a/DTDL/v3/spec/Allowance-ClassRelationshipPropertyPropertiesDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassRelationshipPropertyPropertiesDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_xi;1",
+        "@id": "dtmi:example:upsilon_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "eta_mu",
+          "name": "upsilon_fuddle",
           "dtmi:dtdl:property:properties;3": [
             {
               "@type": "Property",
-              "name": "eta_nu",
+              "name": "upsilon_glikk",
               "schema": "time"
             }
           ]
diff --git a/DTDL/v3/spec/Allowance-ClassRelationshipPropertyTargetDtmiV3.json b/DTDL/v3/spec/Allowance-ClassRelationshipPropertyTargetDtmiV3.json
index cc353838..74df8441 100644
--- a/DTDL/v3/spec/Allowance-ClassRelationshipPropertyTargetDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassRelationshipPropertyTargetDtmiV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_omega;1",
+        "@id": "dtmi:example:psi_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "kappa_chi",
-          "dtmi:dtdl:property:target;3": "dtmi:example:kappa_psi;1"
+          "name": "psi_flunn",
+          "dtmi:dtdl:property:target;3": "dtmi:example:psi_itch;1"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassRelationshipPropertyWritableDtmiV3.json b/DTDL/v3/spec/Allowance-ClassRelationshipPropertyWritableDtmiV3.json
index b07d9fa5..859d8850 100644
--- a/DTDL/v3/spec/Allowance-ClassRelationshipPropertyWritableDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassRelationshipPropertyWritableDtmiV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_delta;1",
+        "@id": "dtmi:example:yuzz_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "mu_gamma",
+          "name": "yuzz_upsilon",
           "dtmi:dtdl:property:writable;3": true
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassTelemetryOptionalPropertiesV3.json b/DTDL/v3/spec/Allowance-ClassTelemetryOptionalPropertiesV3.json
index cd227bc5..d03e6f5d 100644
--- a/DTDL/v3/spec/Allowance-ClassTelemetryOptionalPropertiesV3.json
+++ b/DTDL/v3/spec/Allowance-ClassTelemetryOptionalPropertiesV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_zatz;1",
+        "@id": "dtmi:example:spazz_tau;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:phi_floob;1",
+          "@id": "dtmi:example:spazz_sigma;1",
           "@type": "Interface",
           "contents": {
             "@context": [],
             "@type": "Telemetry",
-            "name": "phi_spazz",
-            "schema": "boolean"
+            "name": "spazz_rho",
+            "schema": "dateTime"
           }
         }
       }
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_itch;1",
+        "@id": "dtmi:example:spazz_chi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:phi_flunn;1",
+          "@id": "dtmi:example:spazz_phi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "phi_jogg",
-            "schema": "date"
+            "name": "spazz_upsilon",
+            "schema": "double"
           }
         }
       }
@@ -52,12 +52,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_vroo;1",
+        "@id": "dtmi:example:spazz_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "phi_yekk",
-          "schema": "dateTime"
+          "name": "spazz_psi",
+          "schema": "duration"
         }
       }
     ]
@@ -70,12 +70,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_alpha;1",
+        "@id": "dtmi:example:spazz_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "phi_hi",
-          "schema": "double"
+          "name": "spazz_yuzz",
+          "schema": "float"
         }
       }
     ]
@@ -88,12 +88,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_gamma;1",
+        "@id": "dtmi:example:spazz_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "chi_beta",
-          "schema": "duration"
+          "name": "spazz_um",
+          "schema": "integer"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassTelemetryPropertyCommentDtmiV3.json b/DTDL/v3/spec/Allowance-ClassTelemetryPropertyCommentDtmiV3.json
index 21243592..58872b24 100644
--- a/DTDL/v3/spec/Allowance-ClassTelemetryPropertyCommentDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassTelemetryPropertyCommentDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_psi;1",
+        "@id": "dtmi:example:yekk_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "dtmi:dtdl:property:comment;3": "um_phi",
-          "name": "um_chi",
-          "schema": "duration"
+          "dtmi:dtdl:property:comment;3": "yekk_iota",
+          "name": "yekk_kappa",
+          "schema": "string"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassTelemetryPropertyDescriptionDtmiV3.json b/DTDL/v3/spec/Allowance-ClassTelemetryPropertyDescriptionDtmiV3.json
index fdeb2967..f0ab24f4 100644
--- a/DTDL/v3/spec/Allowance-ClassTelemetryPropertyDescriptionDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassTelemetryPropertyDescriptionDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_theta;1",
+        "@id": "dtmi:example:vroo_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
           "dtmi:dtdl:property:description;3": [
-            "fuddle_zeta"
+            "vroo_zatz"
           ],
-          "name": "fuddle_eta",
-          "schema": "integer"
+          "name": "vroo_jogg",
+          "schema": "boolean"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassTelemetryPropertyDisplayNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassTelemetryPropertyDisplayNameDtmiV3.json
index b7098c98..c0201c75 100644
--- a/DTDL/v3/spec/Allowance-ClassTelemetryPropertyDisplayNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassTelemetryPropertyDisplayNameDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_floob;1",
+        "@id": "dtmi:example:alpha_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
           "dtmi:dtdl:property:displayName;3": [
-            "glikk_thnad"
+            "alpha_chi"
           ],
-          "name": "glikk_spazz",
-          "schema": "string"
+          "name": "alpha_psi",
+          "schema": "dateTime"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Allowance-ClassTelemetryPropertyNameDtmiV3.json b/DTDL/v3/spec/Allowance-ClassTelemetryPropertyNameDtmiV3.json
index 4b3d7406..11fc9af6 100644
--- a/DTDL/v3/spec/Allowance-ClassTelemetryPropertyNameDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassTelemetryPropertyNameDtmiV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_nuh;1",
+        "@id": "dtmi:example:glikk_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "dtmi:dtdl:property:name;3": "pi_glikk",
+          "dtmi:dtdl:property:name;3": "glikk_delta",
           "schema": "float"
         }
       }
diff --git a/DTDL/v3/spec/Allowance-ClassTelemetryPropertySchemaDtmiV3.json b/DTDL/v3/spec/Allowance-ClassTelemetryPropertySchemaDtmiV3.json
index 2b152620..c13495e6 100644
--- a/DTDL/v3/spec/Allowance-ClassTelemetryPropertySchemaDtmiV3.json
+++ b/DTDL/v3/spec/Allowance-ClassTelemetryPropertySchemaDtmiV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_wum;1",
+        "@id": "dtmi:example:spazz_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "phi_yuzz",
-          "dtmi:dtdl:property:schema;3": "double"
+          "name": "spazz_eta",
+          "dtmi:dtdl:property:schema;3": "float"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Completion-ClassArrayPropertyElementSchemaDependentReferenceV3.json b/DTDL/v3/spec/Completion-ClassArrayPropertyElementSchemaDependentReferenceV3.json
index 47f7cdf8..5c8df2b6 100644
--- a/DTDL/v3/spec/Completion-ClassArrayPropertyElementSchemaDependentReferenceV3.json
+++ b/DTDL/v3/spec/Completion-ClassArrayPropertyElementSchemaDependentReferenceV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_nu;1",
+        "@id": "dtmi:example:floob_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_mu",
+          "name": "floob_kappa",
           "schema": {
             "@type": "Array",
             "elementSchema": "dtmi:ex:dependentRef;1"
@@ -33,11 +33,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_omicron;1",
+        "@id": "dtmi:example:floob_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_xi",
+          "name": "floob_mu",
           "schema": {
             "@type": "Array",
             "elementSchema": [
diff --git a/DTDL/v3/spec/Completion-ClassArrayPropertyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassArrayPropertyIrrelevantDtmiOrTermV3.json
index 885affac..7a476a92 100644
--- a/DTDL/v3/spec/Completion-ClassArrayPropertyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassArrayPropertyIrrelevantDtmiOrTermV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_mu;1",
+        "@id": "dtmi:example:delta_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_lambda;1",
+          "@id": "dtmi:example:delta_nu;1",
           "@type": [
             "Array",
             "Foobar"
           ],
-          "elementSchema": "integer",
+          "elementSchema": "string",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -29,16 +29,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_xi;1",
+        "@id": "dtmi:example:delta_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_nu;1",
+          "@id": "dtmi:example:delta_omicron;1",
           "@type": [
             "Array",
             "Foobar"
           ],
-          "elementSchema": "long",
+          "elementSchema": "time",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -52,15 +52,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_pi;1",
+        "@id": "dtmi:example:delta_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_omicron;1",
+          "@id": "dtmi:example:delta_rho;1",
           "@type": [
             "Array",
             "Foobar"
           ],
-          "elementSchema": "string",
+          "elementSchema": "boolean",
           "boolean": null
         }
       }
@@ -74,16 +74,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_sigma;1",
+        "@id": "dtmi:example:delta_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_rho;1",
+          "@id": "dtmi:example:delta_tau;1",
           "@type": [
             "Array",
             "Foobar"
           ],
-          "elementSchema": "time",
+          "elementSchema": "date",
           "boolean": null
         }
       }
diff --git a/DTDL/v3/spec/Completion-ClassArrayPropertyUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassArrayPropertyUndefinedTermV3.json
index 7555c6e9..894691ec 100644
--- a/DTDL/v3/spec/Completion-ClassArrayPropertyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassArrayPropertyUndefinedTermV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_floob;1",
+        "@id": "dtmi:example:delta_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_spazz;1",
+          "@id": "dtmi:example:delta_zatz;1",
           "@type": [
             "Array",
             "Foobar"
           ],
-          "elementSchema": "string",
+          "elementSchema": "boolean",
           "foobar": {}
         }
       }
@@ -29,16 +29,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_jogg;1",
+        "@id": "dtmi:example:delta_itch;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_zatz;1",
+          "@id": "dtmi:example:delta_flunn;1",
           "@type": [
             "Array",
             "Foobar"
           ],
-          "elementSchema": "time",
+          "elementSchema": "date",
           "foobar": {}
         }
       }
diff --git a/DTDL/v3/spec/Completion-ClassArrayTypeIncludesIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassArrayTypeIncludesIrrelevantDtmiOrTermV3.json
index 38fefe28..91905116 100644
--- a/DTDL/v3/spec/Completion-ClassArrayTypeIncludesIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassArrayTypeIncludesIrrelevantDtmiOrTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_eta;1",
+        "@id": "dtmi:example:quan_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_zeta;1",
+          "@id": "dtmi:example:quan_yekk;1",
           "@type": [
             "Array",
             "dtmi:foo:bar;1"
@@ -28,11 +28,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_iota;1",
+        "@id": "dtmi:example:thnad_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:wum_theta;1",
+          "@id": "dtmi:example:quan_hi;1",
           "@type": [
             "Array",
             "dtmi:foo:bar;1"
@@ -50,10 +50,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_lambda;1",
+        "@id": "dtmi:example:thnad_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_kappa;1",
+          "@id": "dtmi:example:thnad_beta;1",
           "@type": [
             "Array",
             "boolean"
@@ -71,11 +71,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_nu;1",
+        "@id": "dtmi:example:thnad_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:wum_mu;1",
+          "@id": "dtmi:example:thnad_delta;1",
           "@type": [
             "Array",
             "boolean"
diff --git a/DTDL/v3/spec/Completion-ClassArrayTypeIncludesUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassArrayTypeIncludesUndefinedTermV3.json
index bb3a85f0..e26d84ff 100644
--- a/DTDL/v3/spec/Completion-ClassArrayTypeIncludesUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassArrayTypeIncludesUndefinedTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_psi;1",
+        "@id": "dtmi:example:thnad_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_chi;1",
+          "@id": "dtmi:example:thnad_xi;1",
           "@type": [
             "Array",
             "Foobar"
@@ -28,11 +28,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_yuzz;1",
+        "@id": "dtmi:example:thnad_rho;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:wum_omega;1",
+          "@id": "dtmi:example:thnad_pi;1",
           "@type": [
             "Array",
             "Foobar"
diff --git a/DTDL/v3/spec/Completion-ClassCommandPropertyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassCommandPropertyIrrelevantDtmiOrTermV3.json
index b2f39caf..5f03a7a6 100644
--- a/DTDL/v3/spec/Completion-ClassCommandPropertyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassCommandPropertyIrrelevantDtmiOrTermV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_um;1",
+        "@id": "dtmi:example:snee_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Command",
             "Foobar"
           ],
-          "name": "psi_wum",
+          "name": "snee_lambda",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_fuddle;1",
+        "@id": "dtmi:example:snee_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,7 +36,7 @@
             "Command",
             "Foobar"
           ],
-          "name": "psi_humpf",
+          "name": "snee_nu",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -50,14 +50,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_nuh;1",
+        "@id": "dtmi:example:snee_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Command",
             "Foobar"
           ],
-          "name": "psi_glikk",
+          "name": "snee_omicron",
           "boolean": null
         }
       }
@@ -71,7 +71,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_quan;1",
+        "@id": "dtmi:example:snee_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -79,7 +79,7 @@
             "Command",
             "Foobar"
           ],
-          "name": "psi_snee",
+          "name": "snee_rho",
           "boolean": null
         }
       }
diff --git a/DTDL/v3/spec/Completion-ClassCommandPropertyRequestDependentReferenceV3.json b/DTDL/v3/spec/Completion-ClassCommandPropertyRequestDependentReferenceV3.json
index e11426e1..abd0f5dc 100644
--- a/DTDL/v3/spec/Completion-ClassCommandPropertyRequestDependentReferenceV3.json
+++ b/DTDL/v3/spec/Completion-ClassCommandPropertyRequestDependentReferenceV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_um;1",
+        "@id": "dtmi:example:omega_beta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omicron_wum;1",
+          "@id": "dtmi:example:omega_alpha;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "omicron_yuzz",
+            "name": "psi_hi",
             "request": "dtmi:ex:dependentRef;1"
           }
         }
@@ -34,14 +34,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_glikk;1",
+        "@id": "dtmi:example:omega_epsilon;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omicron_fuddle;1",
+          "@id": "dtmi:example:omega_delta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "omicron_humpf",
+            "name": "omega_gamma",
             "request": [
               "dtmi:ex:dependentRef;1"
             ]
diff --git a/DTDL/v3/spec/Completion-ClassCommandPropertyResponseDependentReferenceV3.json b/DTDL/v3/spec/Completion-ClassCommandPropertyResponseDependentReferenceV3.json
index 1fa61da7..f1f8ea3c 100644
--- a/DTDL/v3/spec/Completion-ClassCommandPropertyResponseDependentReferenceV3.json
+++ b/DTDL/v3/spec/Completion-ClassCommandPropertyResponseDependentReferenceV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_yekk;1",
+        "@id": "dtmi:example:humpf_wum;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_itch;1",
+          "@id": "dtmi:example:humpf_yuzz;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "tau_flunn",
+            "name": "humpf_omega",
             "response": "dtmi:ex:dependentRef;1"
           }
         }
@@ -34,14 +34,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_alpha;1",
+        "@id": "dtmi:example:humpf_fuddle;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_hi;1",
+          "@id": "dtmi:example:humpf_humpf;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "tau_vroo",
+            "name": "humpf_um",
             "response": [
               "dtmi:ex:dependentRef;1"
             ]
diff --git a/DTDL/v3/spec/Completion-ClassCommandPropertyUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassCommandPropertyUndefinedTermV3.json
index d311783d..33e43980 100644
--- a/DTDL/v3/spec/Completion-ClassCommandPropertyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassCommandPropertyUndefinedTermV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_theta;1",
+        "@id": "dtmi:example:snee_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Command",
             "Foobar"
           ],
-          "name": "omega_eta",
+          "name": "snee_spazz",
           "foobar": {}
         }
       }
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_kappa;1",
+        "@id": "dtmi:example:snee_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,7 +36,7 @@
             "Command",
             "Foobar"
           ],
-          "name": "omega_iota",
+          "name": "snee_zatz",
           "foobar": {}
         }
       }
diff --git a/DTDL/v3/spec/Completion-ClassCommandRequestPropertyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassCommandRequestPropertyIrrelevantDtmiOrTermV3.json
index 1cc7a83d..5982e6ba 100644
--- a/DTDL/v3/spec/Completion-ClassCommandRequestPropertyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassCommandRequestPropertyIrrelevantDtmiOrTermV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_jogg;1",
+        "@id": "dtmi:example:pi_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_zatz",
+          "name": "pi_itch",
           "request": {
             "@type": [
               "CommandRequest",
               "Foobar"
             ],
-            "name": "eta_floob",
+            "name": "pi_flunn",
             "schema": "boolean",
             "dtmi:foo:bar;1": 626
           }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_yekk;1",
+        "@id": "dtmi:example:rho_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_itch",
+          "name": "pi_hi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": [
               "CommandRequest",
               "Foobar"
             ],
-            "name": "eta_flunn",
+            "name": "pi_vroo",
             "schema": "date",
             "dtmi:foo:bar;1": 626
           }
@@ -60,17 +60,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_alpha;1",
+        "@id": "dtmi:example:rho_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_hi",
+          "name": "rho_gamma",
           "request": {
             "@type": [
               "CommandRequest",
               "Foobar"
             ],
-            "name": "eta_vroo",
+            "name": "rho_beta",
             "schema": "dateTime",
             "boolean": null
           }
@@ -86,18 +86,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_delta;1",
+        "@id": "dtmi:example:rho_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_gamma",
+          "name": "rho_zeta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": [
               "CommandRequest",
               "Foobar"
             ],
-            "name": "theta_beta",
+            "name": "rho_epsilon",
             "schema": "double",
             "boolean": null
           }
diff --git a/DTDL/v3/spec/Completion-ClassCommandRequestPropertySchemaDependentReferenceV3.json b/DTDL/v3/spec/Completion-ClassCommandRequestPropertySchemaDependentReferenceV3.json
index 4e00cfe3..90a19e40 100644
--- a/DTDL/v3/spec/Completion-ClassCommandRequestPropertySchemaDependentReferenceV3.json
+++ b/DTDL/v3/spec/Completion-ClassCommandRequestPropertySchemaDependentReferenceV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_flunn;1",
+        "@id": "dtmi:example:jogg_thnad;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:fuddle_jogg;1",
+          "@id": "dtmi:example:jogg_quan;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "fuddle_zatz",
+            "name": "jogg_snee",
             "request": {
-              "name": "fuddle_floob",
+              "name": "jogg_nuh",
               "schema": "dtmi:ex:dependentRef;1"
             }
           }
@@ -37,16 +37,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_hi;1",
+        "@id": "dtmi:example:jogg_jogg;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:fuddle_vroo;1",
+          "@id": "dtmi:example:jogg_zatz;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "fuddle_yekk",
+            "name": "jogg_floob",
             "request": {
-              "name": "fuddle_itch",
+              "name": "jogg_spazz",
               "schema": [
                 "dtmi:ex:dependentRef;1"
               ]
diff --git a/DTDL/v3/spec/Completion-ClassCommandRequestPropertyUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassCommandRequestPropertyUndefinedTermV3.json
index 665fbc42..13bf0f57 100644
--- a/DTDL/v3/spec/Completion-ClassCommandRequestPropertyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassCommandRequestPropertyUndefinedTermV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_nuh;1",
+        "@id": "dtmi:example:rho_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_glikk",
+          "name": "rho_quan",
           "request": {
             "@type": [
               "CommandRequest",
               "Foobar"
             ],
-            "name": "theta_fuddle",
+            "name": "rho_snee",
             "schema": "dateTime",
             "foobar": {}
           }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_thnad;1",
+        "@id": "dtmi:example:rho_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_quan",
+          "name": "rho_floob",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": [
               "CommandRequest",
               "Foobar"
             ],
-            "name": "theta_snee",
+            "name": "rho_spazz",
             "schema": "double",
             "foobar": {}
           }
diff --git a/DTDL/v3/spec/Completion-ClassCommandRequestTypeIncludesIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassCommandRequestTypeIncludesIrrelevantDtmiOrTermV3.json
index 9609d4db..aed286ca 100644
--- a/DTDL/v3/spec/Completion-ClassCommandRequestTypeIncludesIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassCommandRequestTypeIncludesIrrelevantDtmiOrTermV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_glikk;1",
+        "@id": "dtmi:example:gamma_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zatz_fuddle",
+          "name": "gamma_snee",
           "request": {
             "@type": [
               "CommandRequest",
               "dtmi:foo:bar;1"
             ],
-            "name": "zatz_humpf",
+            "name": "gamma_nuh",
             "schema": "string"
           }
         }
@@ -32,18 +32,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_quan;1",
+        "@id": "dtmi:example:gamma_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zatz_snee",
+          "name": "gamma_spazz",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": [
               "CommandRequest",
               "dtmi:foo:bar;1"
             ],
-            "name": "zatz_nuh",
+            "name": "gamma_thnad",
             "schema": "time"
           }
         }
@@ -58,17 +58,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_floob;1",
+        "@id": "dtmi:example:gamma_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zatz_spazz",
+          "name": "gamma_jogg",
           "request": {
             "@type": [
               "CommandRequest",
               "boolean"
             ],
-            "name": "zatz_thnad",
+            "name": "gamma_zatz",
             "schema": "boolean"
           }
         }
@@ -83,18 +83,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_flunn;1",
+        "@id": "dtmi:example:gamma_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zatz_jogg",
+          "name": "gamma_yekk",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": [
               "CommandRequest",
               "boolean"
             ],
-            "name": "zatz_zatz",
+            "name": "gamma_itch",
             "schema": "date"
           }
         }
diff --git a/DTDL/v3/spec/Completion-ClassCommandRequestTypeIncludesUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassCommandRequestTypeIncludesUndefinedTermV3.json
index 8d5ff284..ad3cc468 100644
--- a/DTDL/v3/spec/Completion-ClassCommandRequestTypeIncludesUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassCommandRequestTypeIncludesUndefinedTermV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_lambda;1",
+        "@id": "dtmi:example:delta_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "jogg_kappa",
+          "name": "delta_nu",
           "request": {
             "@type": [
               "CommandRequest",
               "Foobar"
             ],
-            "name": "jogg_iota",
+            "name": "delta_mu",
             "schema": "integer"
           }
         }
@@ -32,18 +32,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_xi;1",
+        "@id": "dtmi:example:delta_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "jogg_nu",
+          "name": "delta_pi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": [
               "CommandRequest",
               "Foobar"
             ],
-            "name": "jogg_mu",
+            "name": "delta_omicron",
             "schema": "long"
           }
         }
diff --git a/DTDL/v3/spec/Completion-ClassCommandResponsePropertyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassCommandResponsePropertyIrrelevantDtmiOrTermV3.json
index 4acbca9e..2c58b2a8 100644
--- a/DTDL/v3/spec/Completion-ClassCommandResponsePropertyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassCommandResponsePropertyIrrelevantDtmiOrTermV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_phi;1",
+        "@id": "dtmi:example:alpha_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_upsilon",
+          "name": "alpha_yekk",
           "response": {
             "@type": [
               "CommandResponse",
               "Foobar"
             ],
-            "name": "spazz_tau",
-            "schema": "duration",
+            "name": "alpha_itch",
+            "schema": "string",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_omega;1",
+        "@id": "dtmi:example:beta_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_psi",
+          "name": "beta_alpha",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": [
               "CommandResponse",
               "Foobar"
             ],
-            "name": "spazz_chi",
-            "schema": "float",
+            "name": "alpha_hi",
+            "schema": "time",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -60,18 +60,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_um;1",
+        "@id": "dtmi:example:beta_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_wum",
+          "name": "beta_delta",
           "response": {
             "@type": [
               "CommandResponse",
               "Foobar"
             ],
-            "name": "spazz_yuzz",
-            "schema": "integer",
+            "name": "beta_gamma",
+            "schema": "boolean",
             "boolean": null
           }
         }
@@ -86,19 +86,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_glikk;1",
+        "@id": "dtmi:example:beta_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_fuddle",
+          "name": "beta_eta",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": [
               "CommandResponse",
               "Foobar"
             ],
-            "name": "spazz_humpf",
-            "schema": "long",
+            "name": "beta_zeta",
+            "schema": "date",
             "boolean": null
           }
         }
diff --git a/DTDL/v3/spec/Completion-ClassCommandResponsePropertySchemaDependentReferenceV3.json b/DTDL/v3/spec/Completion-ClassCommandResponsePropertySchemaDependentReferenceV3.json
index 7502f2d5..3794ce89 100644
--- a/DTDL/v3/spec/Completion-ClassCommandResponsePropertySchemaDependentReferenceV3.json
+++ b/DTDL/v3/spec/Completion-ClassCommandResponsePropertySchemaDependentReferenceV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_chi;1",
+        "@id": "dtmi:example:psi_spazz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_phi;1",
+          "@id": "dtmi:example:psi_thnad;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "xi_upsilon",
+            "name": "psi_quan",
             "response": {
-              "name": "xi_tau",
+              "name": "psi_snee",
               "schema": "dtmi:ex:dependentRef;1"
             }
           }
@@ -37,16 +37,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_wum;1",
+        "@id": "dtmi:example:psi_flunn;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_yuzz;1",
+          "@id": "dtmi:example:psi_jogg;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "xi_omega",
+            "name": "psi_zatz",
             "response": {
-              "name": "xi_psi",
+              "name": "psi_floob",
               "schema": [
                 "dtmi:ex:dependentRef;1"
               ]
diff --git a/DTDL/v3/spec/Completion-ClassCommandResponsePropertyUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassCommandResponsePropertyUndefinedTermV3.json
index 9d667ede..64ee5385 100644
--- a/DTDL/v3/spec/Completion-ClassCommandResponsePropertyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassCommandResponsePropertyUndefinedTermV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_xi;1",
+        "@id": "dtmi:example:beta_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_nu",
+          "name": "beta_thnad",
           "response": {
             "@type": [
               "CommandResponse",
               "Foobar"
             ],
-            "name": "floob_mu",
-            "schema": "integer",
+            "name": "beta_quan",
+            "schema": "boolean",
             "foobar": {}
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_rho;1",
+        "@id": "dtmi:example:beta_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_pi",
+          "name": "beta_zatz",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": [
               "CommandResponse",
               "Foobar"
             ],
-            "name": "floob_omicron",
-            "schema": "long",
+            "name": "beta_floob",
+            "schema": "date",
             "foobar": {}
           }
         }
diff --git a/DTDL/v3/spec/Completion-ClassCommandResponseTypeIncludesIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassCommandResponseTypeIncludesIrrelevantDtmiOrTermV3.json
index 51c05ee2..146b64df 100644
--- a/DTDL/v3/spec/Completion-ClassCommandResponseTypeIncludesIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassCommandResponseTypeIncludesIrrelevantDtmiOrTermV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_nu;1",
+        "@id": "dtmi:example:nuh_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_mu",
+          "name": "nuh_quan",
           "response": {
             "@type": [
               "CommandResponse",
               "dtmi:foo:bar;1"
             ],
-            "name": "chi_lambda",
-            "schema": "dateTime"
+            "name": "nuh_snee",
+            "schema": "integer"
           }
         }
       }
@@ -32,19 +32,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_pi;1",
+        "@id": "dtmi:example:nuh_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_omicron",
+          "name": "nuh_floob",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": [
               "CommandResponse",
               "dtmi:foo:bar;1"
             ],
-            "name": "chi_xi",
-            "schema": "double"
+            "name": "nuh_spazz",
+            "schema": "long"
           }
         }
       }
@@ -58,18 +58,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_tau;1",
+        "@id": "dtmi:example:nuh_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_sigma",
+          "name": "nuh_flunn",
           "response": {
             "@type": [
               "CommandResponse",
               "boolean"
             ],
-            "name": "chi_rho",
-            "schema": "duration"
+            "name": "nuh_jogg",
+            "schema": "string"
           }
         }
       }
@@ -83,19 +83,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_chi;1",
+        "@id": "dtmi:example:nuh_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_phi",
+          "name": "nuh_vroo",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": [
               "CommandResponse",
               "boolean"
             ],
-            "name": "chi_upsilon",
-            "schema": "float"
+            "name": "nuh_yekk",
+            "schema": "time"
           }
         }
       }
diff --git a/DTDL/v3/spec/Completion-ClassCommandResponseTypeIncludesUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassCommandResponseTypeIncludesUndefinedTermV3.json
index 6b2041b8..87883f04 100644
--- a/DTDL/v3/spec/Completion-ClassCommandResponseTypeIncludesUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassCommandResponseTypeIncludesUndefinedTermV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_zatz;1",
+        "@id": "dtmi:example:snee_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_floob",
+          "name": "snee_xi",
           "response": {
             "@type": [
               "CommandResponse",
               "Foobar"
             ],
-            "name": "chi_spazz",
-            "schema": "boolean"
+            "name": "snee_nu",
+            "schema": "duration"
           }
         }
       }
@@ -32,19 +32,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_itch;1",
+        "@id": "dtmi:example:snee_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_flunn",
+          "name": "snee_rho",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": [
               "CommandResponse",
               "Foobar"
             ],
-            "name": "chi_jogg",
-            "schema": "date"
+            "name": "snee_pi",
+            "schema": "float"
           }
         }
       }
diff --git a/DTDL/v3/spec/Completion-ClassCommandTypeIncludesIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassCommandTypeIncludesIrrelevantDtmiOrTermV3.json
index 6c1b16d9..bea65637 100644
--- a/DTDL/v3/spec/Completion-ClassCommandTypeIncludesIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassCommandTypeIncludesIrrelevantDtmiOrTermV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_chi;1",
+        "@id": "dtmi:example:zeta_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Command",
             "dtmi:foo:bar;1"
           ],
-          "name": "yekk_phi"
+          "name": "zeta_psi"
         }
       }
     ]
@@ -27,7 +27,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_omega;1",
+        "@id": "dtmi:example:zeta_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -35,7 +35,7 @@
             "Command",
             "dtmi:foo:bar;1"
           ],
-          "name": "yekk_psi"
+          "name": "zeta_yuzz"
         }
       }
     ]
@@ -48,14 +48,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_wum;1",
+        "@id": "dtmi:example:zeta_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Command",
             "boolean"
           ],
-          "name": "yekk_yuzz"
+          "name": "zeta_um"
         }
       }
     ]
@@ -68,7 +68,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_humpf;1",
+        "@id": "dtmi:example:zeta_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -76,7 +76,7 @@
             "Command",
             "boolean"
           ],
-          "name": "yekk_um"
+          "name": "zeta_fuddle"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Completion-ClassCommandTypeIncludesUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassCommandTypeIncludesUndefinedTermV3.json
index c470afb0..1f505d6f 100644
--- a/DTDL/v3/spec/Completion-ClassCommandTypeIncludesUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassCommandTypeIncludesUndefinedTermV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_jogg;1",
+        "@id": "dtmi:example:zeta_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Command",
             "Foobar"
           ],
-          "name": "yekk_zatz"
+          "name": "zeta_flunn"
         }
       }
     ]
@@ -27,7 +27,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_itch;1",
+        "@id": "dtmi:example:zeta_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -35,7 +35,7 @@
             "Command",
             "Foobar"
           ],
-          "name": "yekk_flunn"
+          "name": "zeta_yekk"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Completion-ClassComponentPropertyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassComponentPropertyIrrelevantDtmiOrTermV3.json
index 9e19668d..30d8b510 100644
--- a/DTDL/v3/spec/Completion-ClassComponentPropertyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassComponentPropertyIrrelevantDtmiOrTermV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_flunn;1",
+        "@id": "dtmi:example:um_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Component",
             "Foobar"
           ],
-          "name": "rho_zatz",
+          "name": "um_nuh",
           "schema": {
-            "@id": "dtmi:example:rho_jogg;1",
+            "@id": "dtmi:example:um_snee;1",
             "@type": "Interface"
           },
           "dtmi:foo:bar;1": 626
@@ -32,7 +32,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_vroo;1",
+        "@id": "dtmi:example:um_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -40,9 +40,9 @@
             "Component",
             "Foobar"
           ],
-          "name": "rho_itch",
+          "name": "um_thnad",
           "schema": {
-            "@id": "dtmi:example:rho_yekk;1",
+            "@id": "dtmi:example:um_spazz;1",
             "@type": "Interface"
           },
           "dtmi:foo:bar;1": 626
@@ -58,16 +58,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_beta;1",
+        "@id": "dtmi:example:um_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Component",
             "Foobar"
           ],
-          "name": "rho_hi",
+          "name": "um_zatz",
           "schema": {
-            "@id": "dtmi:example:sigma_alpha;1",
+            "@id": "dtmi:example:um_jogg;1",
             "@type": "Interface"
           },
           "boolean": null
@@ -83,7 +83,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_epsilon;1",
+        "@id": "dtmi:example:um_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -91,9 +91,9 @@
             "Component",
             "Foobar"
           ],
-          "name": "sigma_gamma",
+          "name": "um_itch",
           "schema": {
-            "@id": "dtmi:example:sigma_delta;1",
+            "@id": "dtmi:example:um_yekk;1",
             "@type": "Interface"
           },
           "boolean": null
diff --git a/DTDL/v3/spec/Completion-ClassComponentPropertySchemaDependentReferenceV3.json b/DTDL/v3/spec/Completion-ClassComponentPropertySchemaDependentReferenceV3.json
index faeb1d82..eaa077f5 100644
--- a/DTDL/v3/spec/Completion-ClassComponentPropertySchemaDependentReferenceV3.json
+++ b/DTDL/v3/spec/Completion-ClassComponentPropertySchemaDependentReferenceV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_pi;1",
+        "@id": "dtmi:example:kappa_beta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:hi_omicron;1",
+          "@id": "dtmi:example:kappa_alpha;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "hi_xi",
+            "name": "iota_hi",
             "schema": "dtmi:ex:dependentRef;1"
           }
         }
@@ -34,14 +34,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_tau;1",
+        "@id": "dtmi:example:kappa_epsilon;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:hi_sigma;1",
+          "@id": "dtmi:example:kappa_delta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "hi_rho",
+            "name": "kappa_gamma",
             "schema": [
               "dtmi:ex:dependentRef;1"
             ]
diff --git a/DTDL/v3/spec/Completion-ClassComponentPropertyUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassComponentPropertyUndefinedTermV3.json
index aed8ee96..13cf6e97 100644
--- a/DTDL/v3/spec/Completion-ClassComponentPropertyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassComponentPropertyUndefinedTermV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_snee;1",
+        "@id": "dtmi:example:humpf_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Component",
             "Foobar"
           ],
-          "name": "sigma_glikk",
+          "name": "humpf_omega",
           "schema": {
-            "@id": "dtmi:example:sigma_nuh;1",
+            "@id": "dtmi:example:humpf_yuzz;1",
             "@type": "Interface"
           },
           "foobar": {}
@@ -32,7 +32,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_spazz;1",
+        "@id": "dtmi:example:humpf_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -40,9 +40,9 @@
             "Component",
             "Foobar"
           ],
-          "name": "sigma_quan",
+          "name": "humpf_um",
           "schema": {
-            "@id": "dtmi:example:sigma_thnad;1",
+            "@id": "dtmi:example:humpf_humpf;1",
             "@type": "Interface"
           },
           "foobar": {}
diff --git a/DTDL/v3/spec/Completion-ClassComponentTypeIncludesIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassComponentTypeIncludesIrrelevantDtmiOrTermV3.json
index 7f1d8532..8cd89cca 100644
--- a/DTDL/v3/spec/Completion-ClassComponentTypeIncludesIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassComponentTypeIncludesIrrelevantDtmiOrTermV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_yekk;1",
+        "@id": "dtmi:example:epsilon_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Component",
             "dtmi:foo:bar;1"
           ],
-          "name": "jogg_flunn",
+          "name": "epsilon_rho",
           "schema": {
-            "@id": "dtmi:example:jogg_itch;1",
+            "@id": "dtmi:example:epsilon_sigma;1",
             "@type": "Interface"
           }
         }
@@ -31,7 +31,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_alpha;1",
+        "@id": "dtmi:example:epsilon_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -39,9 +39,9 @@
             "Component",
             "dtmi:foo:bar;1"
           ],
-          "name": "jogg_vroo",
+          "name": "epsilon_upsilon",
           "schema": {
-            "@id": "dtmi:example:jogg_hi;1",
+            "@id": "dtmi:example:epsilon_phi;1",
             "@type": "Interface"
           }
         }
@@ -56,16 +56,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_delta;1",
+        "@id": "dtmi:example:epsilon_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Component",
             "boolean"
           ],
-          "name": "flunn_beta",
+          "name": "epsilon_psi",
           "schema": {
-            "@id": "dtmi:example:flunn_gamma;1",
+            "@id": "dtmi:example:epsilon_omega;1",
             "@type": "Interface"
           }
         }
@@ -80,7 +80,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_eta;1",
+        "@id": "dtmi:example:epsilon_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -88,9 +88,9 @@
             "Component",
             "boolean"
           ],
-          "name": "flunn_epsilon",
+          "name": "epsilon_wum",
           "schema": {
-            "@id": "dtmi:example:flunn_zeta;1",
+            "@id": "dtmi:example:epsilon_um;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v3/spec/Completion-ClassComponentTypeIncludesUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassComponentTypeIncludesUndefinedTermV3.json
index 62c99001..4220735c 100644
--- a/DTDL/v3/spec/Completion-ClassComponentTypeIncludesUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassComponentTypeIncludesUndefinedTermV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_chi;1",
+        "@id": "dtmi:example:epsilon_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Component",
             "Foobar"
           ],
-          "name": "flunn_upsilon",
+          "name": "epsilon_yekk",
           "schema": {
-            "@id": "dtmi:example:flunn_phi;1",
+            "@id": "dtmi:example:epsilon_vroo;1",
             "@type": "Interface"
           }
         }
@@ -31,7 +31,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_yuzz;1",
+        "@id": "dtmi:example:zeta_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -39,9 +39,9 @@
             "Component",
             "Foobar"
           ],
-          "name": "flunn_psi",
+          "name": "zeta_alpha",
           "schema": {
-            "@id": "dtmi:example:flunn_omega;1",
+            "@id": "dtmi:example:zeta_beta;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v3/spec/Completion-ClassEnumPropertyEnumValuesDependentReferenceV3.json b/DTDL/v3/spec/Completion-ClassEnumPropertyEnumValuesDependentReferenceV3.json
index d06ed254..7959db19 100644
--- a/DTDL/v3/spec/Completion-ClassEnumPropertyEnumValuesDependentReferenceV3.json
+++ b/DTDL/v3/spec/Completion-ClassEnumPropertyEnumValuesDependentReferenceV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_phi;1",
+        "@id": "dtmi:example:alpha_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_upsilon",
+          "name": "alpha_wum",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
@@ -34,11 +34,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_psi;1",
+        "@id": "dtmi:example:alpha_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_chi",
+          "name": "alpha_humpf",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
diff --git a/DTDL/v3/spec/Completion-ClassEnumPropertyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassEnumPropertyIrrelevantDtmiOrTermV3.json
index e4de151d..45c0f975 100644
--- a/DTDL/v3/spec/Completion-ClassEnumPropertyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassEnumPropertyIrrelevantDtmiOrTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_zeta;1",
+        "@id": "dtmi:example:epsilon_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_epsilon;1",
+          "@id": "dtmi:example:epsilon_lambda;1",
           "@type": [
             "Enum",
             "Foobar"
@@ -29,11 +29,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_theta;1",
+        "@id": "dtmi:example:epsilon_xi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:jogg_eta;1",
+          "@id": "dtmi:example:epsilon_nu;1",
           "@type": [
             "Enum",
             "Foobar"
@@ -52,10 +52,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_kappa;1",
+        "@id": "dtmi:example:epsilon_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_iota;1",
+          "@id": "dtmi:example:epsilon_omicron;1",
           "@type": [
             "Enum",
             "Foobar"
@@ -74,11 +74,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_mu;1",
+        "@id": "dtmi:example:epsilon_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:jogg_lambda;1",
+          "@id": "dtmi:example:epsilon_rho;1",
           "@type": [
             "Enum",
             "Foobar"
diff --git a/DTDL/v3/spec/Completion-ClassEnumPropertyUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassEnumPropertyUndefinedTermV3.json
index 186f35d4..9718aa90 100644
--- a/DTDL/v3/spec/Completion-ClassEnumPropertyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassEnumPropertyUndefinedTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_glikk;1",
+        "@id": "dtmi:example:epsilon_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_fuddle;1",
+          "@id": "dtmi:example:epsilon_spazz;1",
           "@type": [
             "Enum",
             "Foobar"
@@ -29,11 +29,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_snee;1",
+        "@id": "dtmi:example:epsilon_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:jogg_nuh;1",
+          "@id": "dtmi:example:epsilon_zatz;1",
           "@type": [
             "Enum",
             "Foobar"
diff --git a/DTDL/v3/spec/Completion-ClassEnumTypeIncludesIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassEnumTypeIncludesIrrelevantDtmiOrTermV3.json
index 1988ca67..13c8947b 100644
--- a/DTDL/v3/spec/Completion-ClassEnumTypeIncludesIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassEnumTypeIncludesIrrelevantDtmiOrTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_psi;1",
+        "@id": "dtmi:example:glikk_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_chi;1",
+          "@id": "dtmi:example:glikk_pi;1",
           "@type": [
             "Enum",
             "dtmi:foo:bar;1"
@@ -28,11 +28,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_yuzz;1",
+        "@id": "dtmi:example:glikk_tau;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:upsilon_omega;1",
+          "@id": "dtmi:example:glikk_sigma;1",
           "@type": [
             "Enum",
             "dtmi:foo:bar;1"
@@ -50,10 +50,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_um;1",
+        "@id": "dtmi:example:glikk_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_wum;1",
+          "@id": "dtmi:example:glikk_upsilon;1",
           "@type": [
             "Enum",
             "boolean"
@@ -71,11 +71,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_fuddle;1",
+        "@id": "dtmi:example:glikk_psi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:upsilon_humpf;1",
+          "@id": "dtmi:example:glikk_chi;1",
           "@type": [
             "Enum",
             "boolean"
diff --git a/DTDL/v3/spec/Completion-ClassEnumTypeIncludesUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassEnumTypeIncludesUndefinedTermV3.json
index 10786db3..bc9c3693 100644
--- a/DTDL/v3/spec/Completion-ClassEnumTypeIncludesUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassEnumTypeIncludesUndefinedTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_flunn;1",
+        "@id": "dtmi:example:glikk_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_jogg;1",
+          "@id": "dtmi:example:glikk_snee;1",
           "@type": [
             "Enum",
             "Foobar"
@@ -28,11 +28,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_yekk;1",
+        "@id": "dtmi:example:glikk_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:upsilon_itch;1",
+          "@id": "dtmi:example:glikk_thnad;1",
           "@type": [
             "Enum",
             "Foobar"
diff --git a/DTDL/v3/spec/Completion-ClassEnumValuePropertyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassEnumValuePropertyIrrelevantDtmiOrTermV3.json
index afbba0c0..fc58a643 100644
--- a/DTDL/v3/spec/Completion-ClassEnumValuePropertyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassEnumValuePropertyIrrelevantDtmiOrTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_yuzz;1",
+        "@id": "dtmi:example:fuddle_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_omega;1",
+          "@id": "dtmi:example:fuddle_floob;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -18,8 +18,8 @@
               "EnumValue",
               "Foobar"
             ],
-            "enumValue": 1436,
-            "name": "tau_psi",
+            "enumValue": 1453,
+            "name": "fuddle_spazz",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -34,10 +34,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_humpf;1",
+        "@id": "dtmi:example:fuddle_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_um;1",
+          "@id": "dtmi:example:fuddle_flunn;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -46,8 +46,8 @@
               "EnumValue",
               "Foobar"
             ],
-            "enumValue": 1437,
-            "name": "tau_wum",
+            "enumValue": 1454,
+            "name": "fuddle_jogg",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -62,10 +62,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_nuh;1",
+        "@id": "dtmi:example:fuddle_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_glikk;1",
+          "@id": "dtmi:example:fuddle_vroo;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -73,8 +73,8 @@
               "EnumValue",
               "Foobar"
             ],
-            "enumValue": 1438,
-            "name": "tau_fuddle",
+            "enumValue": 1455,
+            "name": "fuddle_yekk",
             "boolean": null
           }
         }
@@ -89,10 +89,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_thnad;1",
+        "@id": "dtmi:example:glikk_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_quan;1",
+          "@id": "dtmi:example:glikk_beta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -101,8 +101,8 @@
               "EnumValue",
               "Foobar"
             ],
-            "enumValue": 1439,
-            "name": "tau_snee",
+            "enumValue": 1456,
+            "name": "glikk_alpha",
             "boolean": null
           }
         }
diff --git a/DTDL/v3/spec/Completion-ClassEnumValuePropertyUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassEnumValuePropertyUndefinedTermV3.json
index 5a95898a..39812eeb 100644
--- a/DTDL/v3/spec/Completion-ClassEnumValuePropertyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassEnumValuePropertyUndefinedTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_sigma;1",
+        "@id": "dtmi:example:glikk_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_rho;1",
+          "@id": "dtmi:example:glikk_fuddle;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -18,8 +18,8 @@
               "EnumValue",
               "Foobar"
             ],
-            "enumValue": 1448,
-            "name": "upsilon_pi",
+            "enumValue": 1465,
+            "name": "glikk_humpf",
             "foobar": {}
           }
         }
@@ -34,10 +34,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_phi;1",
+        "@id": "dtmi:example:glikk_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_upsilon;1",
+          "@id": "dtmi:example:glikk_snee;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -46,8 +46,8 @@
               "EnumValue",
               "Foobar"
             ],
-            "enumValue": 1449,
-            "name": "upsilon_tau",
+            "enumValue": 1466,
+            "name": "glikk_nuh",
             "foobar": {}
           }
         }
diff --git a/DTDL/v3/spec/Completion-ClassEnumValueTypeIncludesIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassEnumValueTypeIncludesIrrelevantDtmiOrTermV3.json
index f2705c7b..150d45e5 100644
--- a/DTDL/v3/spec/Completion-ClassEnumValueTypeIncludesIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassEnumValueTypeIncludesIrrelevantDtmiOrTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_rho;1",
+        "@id": "dtmi:example:pi_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_pi;1",
+          "@id": "dtmi:example:pi_humpf;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -18,8 +18,8 @@
               "EnumValue",
               "dtmi:foo:bar;1"
             ],
-            "enumValue": 1254,
-            "name": "zeta_omicron"
+            "enumValue": 1271,
+            "name": "pi_um"
           }
         }
       }
@@ -33,10 +33,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_upsilon;1",
+        "@id": "dtmi:example:pi_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_tau;1",
+          "@id": "dtmi:example:pi_nuh;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -45,8 +45,8 @@
               "EnumValue",
               "dtmi:foo:bar;1"
             ],
-            "enumValue": 1255,
-            "name": "zeta_sigma"
+            "enumValue": 1272,
+            "name": "pi_glikk"
           }
         }
       }
@@ -60,10 +60,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_psi;1",
+        "@id": "dtmi:example:pi_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_chi;1",
+          "@id": "dtmi:example:pi_thnad;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -71,8 +71,8 @@
               "EnumValue",
               "boolean"
             ],
-            "enumValue": 1256,
-            "name": "zeta_phi"
+            "enumValue": 1273,
+            "name": "pi_quan"
           }
         }
       }
@@ -86,10 +86,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_wum;1",
+        "@id": "dtmi:example:pi_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_yuzz;1",
+          "@id": "dtmi:example:pi_zatz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -98,8 +98,8 @@
               "EnumValue",
               "boolean"
             ],
-            "enumValue": 1257,
-            "name": "zeta_omega"
+            "enumValue": 1274,
+            "name": "pi_floob"
           }
         }
       }
diff --git a/DTDL/v3/spec/Completion-ClassEnumValueTypeIncludesUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassEnumValueTypeIncludesUndefinedTermV3.json
index c00ad727..fb8819ef 100644
--- a/DTDL/v3/spec/Completion-ClassEnumValueTypeIncludesUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassEnumValueTypeIncludesUndefinedTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_yekk;1",
+        "@id": "dtmi:example:rho_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_itch;1",
+          "@id": "dtmi:example:rho_iota;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -18,8 +18,8 @@
               "EnumValue",
               "Foobar"
             ],
-            "enumValue": 1262,
-            "name": "zeta_flunn"
+            "enumValue": 1279,
+            "name": "rho_theta"
           }
         }
       }
@@ -33,10 +33,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_alpha;1",
+        "@id": "dtmi:example:rho_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_hi;1",
+          "@id": "dtmi:example:rho_mu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -45,8 +45,8 @@
               "EnumValue",
               "Foobar"
             ],
-            "enumValue": 1263,
-            "name": "zeta_vroo"
+            "enumValue": 1280,
+            "name": "rho_lambda"
           }
         }
       }
diff --git a/DTDL/v3/spec/Completion-ClassFieldPropertyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassFieldPropertyIrrelevantDtmiOrTermV3.json
index 3a456f7a..b32878aa 100644
--- a/DTDL/v3/spec/Completion-ClassFieldPropertyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassFieldPropertyIrrelevantDtmiOrTermV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_floob;1",
+        "@id": "dtmi:example:xi_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_spazz;1",
+          "@id": "dtmi:example:xi_sigma;1",
           "@type": "Object",
           "fields": {
             "@type": [
               "Field",
               "Foobar"
             ],
-            "name": "gamma_thnad",
-            "schema": "integer",
+            "name": "xi_rho",
+            "schema": "duration",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -33,10 +33,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_flunn;1",
+        "@id": "dtmi:example:xi_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_jogg;1",
+          "@id": "dtmi:example:xi_phi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -44,8 +44,8 @@
               "Field",
               "Foobar"
             ],
-            "name": "gamma_zatz",
-            "schema": "long",
+            "name": "xi_upsilon",
+            "schema": "float",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -60,18 +60,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_vroo;1",
+        "@id": "dtmi:example:xi_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_yekk;1",
+          "@id": "dtmi:example:xi_omega;1",
           "@type": "Object",
           "fields": {
             "@type": [
               "Field",
               "Foobar"
             ],
-            "name": "gamma_itch",
-            "schema": "string",
+            "name": "xi_psi",
+            "schema": "integer",
             "boolean": null
           }
         }
@@ -86,10 +86,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_beta;1",
+        "@id": "dtmi:example:xi_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_alpha;1",
+          "@id": "dtmi:example:xi_um;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -97,8 +97,8 @@
               "Field",
               "Foobar"
             ],
-            "name": "gamma_hi",
-            "schema": "time",
+            "name": "xi_wum",
+            "schema": "long",
             "boolean": null
           }
         }
diff --git a/DTDL/v3/spec/Completion-ClassFieldPropertySchemaDependentReferenceV3.json b/DTDL/v3/spec/Completion-ClassFieldPropertySchemaDependentReferenceV3.json
index 8d67aed5..ad11abeb 100644
--- a/DTDL/v3/spec/Completion-ClassFieldPropertySchemaDependentReferenceV3.json
+++ b/DTDL/v3/spec/Completion-ClassFieldPropertySchemaDependentReferenceV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_lambda;1",
+        "@id": "dtmi:example:floob_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_kappa",
+          "name": "floob_glikk",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "wum_iota",
+              "name": "floob_fuddle",
               "schema": "dtmi:ex:dependentRef;1"
             }
           }
@@ -36,15 +36,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_xi;1",
+        "@id": "dtmi:example:floob_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_nu",
+          "name": "floob_quan",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "wum_mu",
+              "name": "floob_snee",
               "schema": [
                 "dtmi:ex:dependentRef;1"
               ]
diff --git a/DTDL/v3/spec/Completion-ClassFieldPropertyUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassFieldPropertyUndefinedTermV3.json
index cb603e4a..39f8b8ed 100644
--- a/DTDL/v3/spec/Completion-ClassFieldPropertyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassFieldPropertyUndefinedTermV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_fuddle;1",
+        "@id": "dtmi:example:omicron_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_humpf;1",
+          "@id": "dtmi:example:omicron_lambda;1",
           "@type": "Object",
           "fields": {
             "@type": [
               "Field",
               "Foobar"
             ],
-            "name": "delta_um",
-            "schema": "string",
+            "name": "omicron_kappa",
+            "schema": "integer",
             "foobar": {}
           }
         }
@@ -33,10 +33,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_snee;1",
+        "@id": "dtmi:example:omicron_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_nuh;1",
+          "@id": "dtmi:example:omicron_xi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -44,8 +44,8 @@
               "Field",
               "Foobar"
             ],
-            "name": "delta_glikk",
-            "schema": "time",
+            "name": "omicron_nu",
+            "schema": "long",
             "foobar": {}
           }
         }
diff --git a/DTDL/v3/spec/Completion-ClassFieldTypeIncludesIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassFieldTypeIncludesIrrelevantDtmiOrTermV3.json
index 8348f1c0..fda06705 100644
--- a/DTDL/v3/spec/Completion-ClassFieldTypeIncludesIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassFieldTypeIncludesIrrelevantDtmiOrTermV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_humpf;1",
+        "@id": "dtmi:example:alpha_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_um;1",
+          "@id": "dtmi:example:alpha_kappa;1",
           "@type": "Object",
           "fields": {
             "@type": [
               "Field",
               "dtmi:foo:bar;1"
             ],
-            "name": "quan_wum",
-            "schema": "duration"
+            "name": "alpha_iota",
+            "schema": "dateTime"
           }
         }
       }
@@ -32,10 +32,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_nuh;1",
+        "@id": "dtmi:example:alpha_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_glikk;1",
+          "@id": "dtmi:example:alpha_nu;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -43,8 +43,8 @@
               "Field",
               "dtmi:foo:bar;1"
             ],
-            "name": "quan_fuddle",
-            "schema": "float"
+            "name": "alpha_mu",
+            "schema": "double"
           }
         }
       }
@@ -58,18 +58,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_thnad;1",
+        "@id": "dtmi:example:alpha_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_quan;1",
+          "@id": "dtmi:example:alpha_pi;1",
           "@type": "Object",
           "fields": {
             "@type": [
               "Field",
               "boolean"
             ],
-            "name": "quan_snee",
-            "schema": "integer"
+            "name": "alpha_omicron",
+            "schema": "duration"
           }
         }
       }
@@ -83,10 +83,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_zatz;1",
+        "@id": "dtmi:example:alpha_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_floob;1",
+          "@id": "dtmi:example:alpha_tau;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -94,8 +94,8 @@
               "Field",
               "boolean"
             ],
-            "name": "quan_spazz",
-            "schema": "long"
+            "name": "alpha_sigma",
+            "schema": "float"
           }
         }
       }
diff --git a/DTDL/v3/spec/Completion-ClassFieldTypeIncludesUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassFieldTypeIncludesUndefinedTermV3.json
index 318f41f1..12b548bb 100644
--- a/DTDL/v3/spec/Completion-ClassFieldTypeIncludesUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassFieldTypeIncludesUndefinedTermV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_iota;1",
+        "@id": "dtmi:example:alpha_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_theta;1",
+          "@id": "dtmi:example:alpha_thnad;1",
           "@type": "Object",
           "fields": {
             "@type": [
               "Field",
               "Foobar"
             ],
-            "name": "thnad_eta",
-            "schema": "dateTime"
+            "name": "alpha_quan",
+            "schema": "boolean"
           }
         }
       }
@@ -32,10 +32,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_mu;1",
+        "@id": "dtmi:example:alpha_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_lambda;1",
+          "@id": "dtmi:example:alpha_zatz;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -43,8 +43,8 @@
               "Field",
               "Foobar"
             ],
-            "name": "thnad_kappa",
-            "schema": "double"
+            "name": "alpha_floob",
+            "schema": "date"
           }
         }
       }
diff --git a/DTDL/v3/spec/Completion-ClassInterfacePropertyContentsDependentReferenceV3.json b/DTDL/v3/spec/Completion-ClassInterfacePropertyContentsDependentReferenceV3.json
index 849ecc18..a249066e 100644
--- a/DTDL/v3/spec/Completion-ClassInterfacePropertyContentsDependentReferenceV3.json
+++ b/DTDL/v3/spec/Completion-ClassInterfacePropertyContentsDependentReferenceV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_xi;1",
+        "@id": "dtmi:example:tau_iota;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:theta_nu;1",
+          "@id": "dtmi:example:tau_theta;1",
           "@type": "Interface",
           "contents": "dtmi:ex:dependentRef;1"
         }
@@ -30,10 +30,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_pi;1",
+        "@id": "dtmi:example:tau_lambda;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:theta_omicron;1",
+          "@id": "dtmi:example:tau_kappa;1",
           "@type": "Interface",
           "contents": [
             "dtmi:ex:dependentRef;1"
diff --git a/DTDL/v3/spec/Completion-ClassInterfacePropertyExtendsDependentReferenceV3.json b/DTDL/v3/spec/Completion-ClassInterfacePropertyExtendsDependentReferenceV3.json
index b2825b16..7f03a72c 100644
--- a/DTDL/v3/spec/Completion-ClassInterfacePropertyExtendsDependentReferenceV3.json
+++ b/DTDL/v3/spec/Completion-ClassInterfacePropertyExtendsDependentReferenceV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_nuh;1",
+        "@id": "dtmi:example:psi_snee;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:mu_glikk;1",
+          "@id": "dtmi:example:psi_nuh;1",
           "@type": "Interface",
           "extends": "dtmi:ex:dependentRef;1"
         }
@@ -30,10 +30,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_quan;1",
+        "@id": "dtmi:example:psi_thnad;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:mu_snee;1",
+          "@id": "dtmi:example:psi_quan;1",
           "@type": "Interface",
           "extends": [
             "dtmi:ex:dependentRef;1"
diff --git a/DTDL/v3/spec/Completion-ClassInterfacePropertyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassInterfacePropertyIrrelevantDtmiOrTermV3.json
index 6b4eeef2..856102db 100644
--- a/DTDL/v3/spec/Completion-ClassInterfacePropertyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassInterfacePropertyIrrelevantDtmiOrTermV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_beta;1",
+        "@id": "dtmi:example:fuddle_iota;1",
         "@type": [
           "Interface",
           "Foobar"
@@ -27,7 +27,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:sigma_gamma;1",
+        "@id": "dtmi:example:fuddle_kappa;1",
         "@type": [
           "Interface",
           "Foobar"
@@ -44,7 +44,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_delta;1",
+        "@id": "dtmi:example:fuddle_lambda;1",
         "@type": [
           "Interface",
           "Foobar"
@@ -64,7 +64,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:sigma_epsilon;1",
+        "@id": "dtmi:example:fuddle_mu;1",
         "@type": [
           "Interface",
           "Foobar"
diff --git a/DTDL/v3/spec/Completion-ClassInterfacePropertySchemasDependentReferenceV3.json b/DTDL/v3/spec/Completion-ClassInterfacePropertySchemasDependentReferenceV3.json
index efcd6470..803f37ce 100644
--- a/DTDL/v3/spec/Completion-ClassInterfacePropertySchemasDependentReferenceV3.json
+++ b/DTDL/v3/spec/Completion-ClassInterfacePropertySchemasDependentReferenceV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_wum;1",
+        "@id": "dtmi:example:wum_quan;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omicron_yuzz;1",
+          "@id": "dtmi:example:wum_snee;1",
           "@type": "Interface",
           "schemas": "dtmi:ex:dependentRef;1"
         }
@@ -30,10 +30,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_humpf;1",
+        "@id": "dtmi:example:wum_spazz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omicron_um;1",
+          "@id": "dtmi:example:wum_thnad;1",
           "@type": "Interface",
           "schemas": [
             "dtmi:ex:dependentRef;1"
diff --git a/DTDL/v3/spec/Completion-ClassInterfacePropertyUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassInterfacePropertyUndefinedTermV3.json
index e16f9a48..d0905c4d 100644
--- a/DTDL/v3/spec/Completion-ClassInterfacePropertyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassInterfacePropertyUndefinedTermV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_xi;1",
+        "@id": "dtmi:example:fuddle_phi;1",
         "@type": [
           "Interface",
           "Foobar"
@@ -27,7 +27,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:sigma_omicron;1",
+        "@id": "dtmi:example:fuddle_chi;1",
         "@type": [
           "Interface",
           "Foobar"
diff --git a/DTDL/v3/spec/Completion-ClassInterfaceTypeIncludesIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassInterfaceTypeIncludesIrrelevantDtmiOrTermV3.json
index 3e6a58cd..8406e064 100644
--- a/DTDL/v3/spec/Completion-ClassInterfaceTypeIncludesIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassInterfaceTypeIncludesIrrelevantDtmiOrTermV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_fuddle;1",
+        "@id": "dtmi:example:pi_mu;1",
         "@type": [
           "Interface",
           "dtmi:foo:bar;1"
@@ -26,7 +26,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:epsilon_glikk;1",
+        "@id": "dtmi:example:pi_nu;1",
         "@type": [
           "Interface",
           "dtmi:foo:bar;1"
@@ -42,7 +42,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_nuh;1",
+        "@id": "dtmi:example:pi_xi;1",
         "@type": [
           "Interface",
           "boolean"
@@ -61,7 +61,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:epsilon_snee;1",
+        "@id": "dtmi:example:pi_omicron;1",
         "@type": [
           "Interface",
           "boolean"
diff --git a/DTDL/v3/spec/Completion-ClassInterfaceTypeIncludesUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassInterfaceTypeIncludesUndefinedTermV3.json
index c76ac29e..e8868b07 100644
--- a/DTDL/v3/spec/Completion-ClassInterfaceTypeIncludesUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassInterfaceTypeIncludesUndefinedTermV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_zatz;1",
+        "@id": "dtmi:example:pi_upsilon;1",
         "@type": [
           "Interface",
           "Foobar"
@@ -26,7 +26,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:epsilon_jogg;1",
+        "@id": "dtmi:example:pi_phi;1",
         "@type": [
           "Interface",
           "Foobar"
diff --git a/DTDL/v3/spec/Completion-ClassMapKeyPropertyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassMapKeyPropertyIrrelevantDtmiOrTermV3.json
index 6bf58490..efd4874d 100644
--- a/DTDL/v3/spec/Completion-ClassMapKeyPropertyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassMapKeyPropertyIrrelevantDtmiOrTermV3.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_nu;1",
+        "@id": "dtmi:example:nu_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_lambda;1",
+          "@id": "dtmi:example:nu_lambda;1",
           "@type": "Map",
           "mapValue": {
-            "name": "alpha_mu",
-            "schema": "time"
+            "name": "nu_mu",
+            "schema": "long"
           },
           "mapKey": {
             "@type": [
               "MapKey",
               "Foobar"
             ],
-            "name": "alpha_kappa",
+            "name": "nu_kappa",
             "schema": "string",
             "dtmi:foo:bar;1": 626
           }
@@ -37,14 +37,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_rho;1",
+        "@id": "dtmi:example:nu_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_omicron;1",
+          "@id": "dtmi:example:nu_omicron;1",
           "@type": "Map",
           "mapValue": {
-            "name": "alpha_pi",
-            "schema": "boolean"
+            "name": "nu_pi",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -52,7 +52,7 @@
               "MapKey",
               "Foobar"
             ],
-            "name": "alpha_xi",
+            "name": "nu_xi",
             "schema": "string",
             "dtmi:foo:bar;1": 626
           }
@@ -68,21 +68,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_phi;1",
+        "@id": "dtmi:example:nu_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_tau;1",
+          "@id": "dtmi:example:nu_tau;1",
           "@type": "Map",
           "mapValue": {
-            "name": "alpha_upsilon",
-            "schema": "date"
+            "name": "nu_upsilon",
+            "schema": "time"
           },
           "mapKey": {
             "@type": [
               "MapKey",
               "Foobar"
             ],
-            "name": "alpha_sigma",
+            "name": "nu_sigma",
             "schema": "string",
             "boolean": null
           }
@@ -98,14 +98,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_yuzz;1",
+        "@id": "dtmi:example:nu_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_psi;1",
+          "@id": "dtmi:example:nu_psi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "alpha_omega",
-            "schema": "dateTime"
+            "name": "nu_omega",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -113,7 +113,7 @@
               "MapKey",
               "Foobar"
             ],
-            "name": "alpha_chi",
+            "name": "nu_chi",
             "schema": "string",
             "boolean": null
           }
diff --git a/DTDL/v3/spec/Completion-ClassMapKeyPropertyUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassMapKeyPropertyUndefinedTermV3.json
index 9adc8577..295fce1b 100644
--- a/DTDL/v3/spec/Completion-ClassMapKeyPropertyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassMapKeyPropertyUndefinedTermV3.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_sigma;1",
+        "@id": "dtmi:example:xi_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_pi;1",
+          "@id": "dtmi:example:xi_pi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "beta_rho",
-            "schema": "date"
+            "name": "xi_rho",
+            "schema": "time"
           },
           "mapKey": {
             "@type": [
               "MapKey",
               "Foobar"
             ],
-            "name": "beta_omicron",
+            "name": "xi_omicron",
             "schema": "string",
             "foobar": {}
           }
@@ -37,14 +37,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_chi;1",
+        "@id": "dtmi:example:xi_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_upsilon;1",
+          "@id": "dtmi:example:xi_upsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "beta_phi",
-            "schema": "dateTime"
+            "name": "xi_phi",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -52,7 +52,7 @@
               "MapKey",
               "Foobar"
             ],
-            "name": "beta_tau",
+            "name": "xi_tau",
             "schema": "string",
             "foobar": {}
           }
diff --git a/DTDL/v3/spec/Completion-ClassMapKeyTypeIncludesIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassMapKeyTypeIncludesIrrelevantDtmiOrTermV3.json
index 93dc1508..51ece4d8 100644
--- a/DTDL/v3/spec/Completion-ClassMapKeyTypeIncludesIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassMapKeyTypeIncludesIrrelevantDtmiOrTermV3.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_jogg;1",
+        "@id": "dtmi:example:jogg_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_floob;1",
+          "@id": "dtmi:example:jogg_floob;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_zatz",
-            "schema": "long"
+            "name": "jogg_zatz",
+            "schema": "float"
           },
           "mapKey": {
             "@type": [
               "MapKey",
               "dtmi:foo:bar;1"
             ],
-            "name": "wum_spazz",
+            "name": "jogg_spazz",
             "schema": "string"
           }
         }
@@ -36,14 +36,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_vroo;1",
+        "@id": "dtmi:example:jogg_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_itch;1",
+          "@id": "dtmi:example:jogg_itch;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_yekk",
-            "schema": "string"
+            "name": "jogg_yekk",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -51,7 +51,7 @@
               "MapKey",
               "dtmi:foo:bar;1"
             ],
-            "name": "wum_flunn",
+            "name": "jogg_flunn",
             "schema": "string"
           }
         }
@@ -66,21 +66,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_gamma;1",
+        "@id": "dtmi:example:flunn_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_alpha;1",
+          "@id": "dtmi:example:flunn_alpha;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_beta",
-            "schema": "time"
+            "name": "flunn_beta",
+            "schema": "long"
           },
           "mapKey": {
             "@type": [
               "MapKey",
               "boolean"
             ],
-            "name": "wum_hi",
+            "name": "jogg_hi",
             "schema": "string"
           }
         }
@@ -95,14 +95,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_eta;1",
+        "@id": "dtmi:example:flunn_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_epsilon;1",
+          "@id": "dtmi:example:flunn_epsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_zeta",
-            "schema": "boolean"
+            "name": "flunn_zeta",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -110,7 +110,7 @@
               "MapKey",
               "boolean"
             ],
-            "name": "um_delta",
+            "name": "flunn_delta",
             "schema": "string"
           }
         }
diff --git a/DTDL/v3/spec/Completion-ClassMapKeyTypeIncludesUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassMapKeyTypeIncludesUndefinedTermV3.json
index 30be5e02..317f08d1 100644
--- a/DTDL/v3/spec/Completion-ClassMapKeyTypeIncludesUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassMapKeyTypeIncludesUndefinedTermV3.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_um;1",
+        "@id": "dtmi:example:flunn_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_yuzz;1",
+          "@id": "dtmi:example:flunn_yuzz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_wum",
-            "schema": "float"
+            "name": "flunn_wum",
+            "schema": "double"
           },
           "mapKey": {
             "@type": [
               "MapKey",
               "Foobar"
             ],
-            "name": "um_omega",
+            "name": "flunn_omega",
             "schema": "string"
           }
         }
@@ -36,14 +36,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_nuh;1",
+        "@id": "dtmi:example:flunn_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_fuddle;1",
+          "@id": "dtmi:example:flunn_fuddle;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_glikk",
-            "schema": "integer"
+            "name": "flunn_glikk",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -51,7 +51,7 @@
               "MapKey",
               "Foobar"
             ],
-            "name": "um_humpf",
+            "name": "flunn_humpf",
             "schema": "string"
           }
         }
diff --git a/DTDL/v3/spec/Completion-ClassMapPropertyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassMapPropertyIrrelevantDtmiOrTermV3.json
index df932fef..8670a079 100644
--- a/DTDL/v3/spec/Completion-ClassMapPropertyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassMapPropertyIrrelevantDtmiOrTermV3.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_nu;1",
+        "@id": "dtmi:example:tau_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_kappa;1",
+          "@id": "dtmi:example:tau_beta;1",
           "@type": [
             "Map",
             "Foobar"
           ],
           "mapKey": {
-            "name": "eta_lambda",
+            "name": "tau_gamma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "eta_mu",
-            "schema": "duration"
+            "name": "tau_delta",
+            "schema": "boolean"
           },
           "dtmi:foo:bar;1": 626
         }
@@ -36,22 +36,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_rho;1",
+        "@id": "dtmi:example:tau_iota;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:eta_xi;1",
+          "@id": "dtmi:example:tau_zeta;1",
           "@type": [
             "Map",
             "Foobar"
           ],
           "mapKey": {
-            "name": "eta_omicron",
+            "name": "tau_eta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "eta_pi",
-            "schema": "float"
+            "name": "tau_theta",
+            "schema": "date"
           },
           "dtmi:foo:bar;1": 626
         }
@@ -66,21 +66,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_phi;1",
+        "@id": "dtmi:example:tau_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_sigma;1",
+          "@id": "dtmi:example:tau_kappa;1",
           "@type": [
             "Map",
             "Foobar"
           ],
           "mapKey": {
-            "name": "eta_tau",
+            "name": "tau_lambda",
             "schema": "string"
           },
           "mapValue": {
-            "name": "eta_upsilon",
-            "schema": "integer"
+            "name": "tau_mu",
+            "schema": "dateTime"
           },
           "boolean": null
         }
@@ -95,22 +95,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_yuzz;1",
+        "@id": "dtmi:example:tau_rho;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:eta_chi;1",
+          "@id": "dtmi:example:tau_xi;1",
           "@type": [
             "Map",
             "Foobar"
           ],
           "mapKey": {
-            "name": "eta_psi",
+            "name": "tau_omicron",
             "schema": "string"
           },
           "mapValue": {
-            "name": "eta_omega",
-            "schema": "long"
+            "name": "tau_pi",
+            "schema": "double"
           },
           "boolean": null
         }
diff --git a/DTDL/v3/spec/Completion-ClassMapPropertyMapKeyDependentReferenceV3.json b/DTDL/v3/spec/Completion-ClassMapPropertyMapKeyDependentReferenceV3.json
index 381812a0..ec367994 100644
--- a/DTDL/v3/spec/Completion-ClassMapPropertyMapKeyDependentReferenceV3.json
+++ b/DTDL/v3/spec/Completion-ClassMapPropertyMapKeyDependentReferenceV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_quan;1",
+        "@id": "dtmi:example:spazz_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_snee",
+          "name": "spazz_zeta",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "psi_nuh",
-              "schema": "double"
+              "name": "spazz_epsilon",
+              "schema": "float"
             },
             "mapKey": "dtmi:ex:dependentRef;1"
           }
@@ -37,16 +37,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_floob;1",
+        "@id": "dtmi:example:spazz_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_spazz",
+          "name": "spazz_iota",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "psi_thnad",
-              "schema": "duration"
+              "name": "spazz_theta",
+              "schema": "integer"
             },
             "mapKey": [
               "dtmi:ex:dependentRef;1"
diff --git a/DTDL/v3/spec/Completion-ClassMapPropertyMapValueDependentReferenceV3.json b/DTDL/v3/spec/Completion-ClassMapPropertyMapValueDependentReferenceV3.json
index 32d8b365..06300247 100644
--- a/DTDL/v3/spec/Completion-ClassMapPropertyMapValueDependentReferenceV3.json
+++ b/DTDL/v3/spec/Completion-ClassMapPropertyMapValueDependentReferenceV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_zeta;1",
+        "@id": "dtmi:example:itch_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_epsilon",
+          "name": "itch_snee",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "fuddle_delta",
+              "name": "itch_nuh",
               "schema": "string"
             },
             "mapValue": "dtmi:ex:dependentRef;1"
@@ -37,15 +37,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_iota;1",
+        "@id": "dtmi:example:itch_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_theta",
+          "name": "itch_spazz",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "fuddle_eta",
+              "name": "itch_thnad",
               "schema": "string"
             },
             "mapValue": [
diff --git a/DTDL/v3/spec/Completion-ClassMapPropertyUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassMapPropertyUndefinedTermV3.json
index 1660bea0..ef17cc07 100644
--- a/DTDL/v3/spec/Completion-ClassMapPropertyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassMapPropertyUndefinedTermV3.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_sigma;1",
+        "@id": "dtmi:example:upsilon_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_omicron;1",
+          "@id": "dtmi:example:upsilon_eta;1",
           "@type": [
             "Map",
             "Foobar"
           ],
           "mapKey": {
-            "name": "theta_pi",
+            "name": "upsilon_theta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_rho",
-            "schema": "integer"
+            "name": "upsilon_iota",
+            "schema": "dateTime"
           },
           "foobar": {}
         }
@@ -36,22 +36,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_chi;1",
+        "@id": "dtmi:example:upsilon_xi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:theta_tau;1",
+          "@id": "dtmi:example:upsilon_lambda;1",
           "@type": [
             "Map",
             "Foobar"
           ],
           "mapKey": {
-            "name": "theta_upsilon",
+            "name": "upsilon_mu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_phi",
-            "schema": "long"
+            "name": "upsilon_nu",
+            "schema": "double"
           },
           "foobar": {}
         }
diff --git a/DTDL/v3/spec/Completion-ClassMapTypeIncludesIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassMapTypeIncludesIrrelevantDtmiOrTermV3.json
index b25a469a..98bfbdc2 100644
--- a/DTDL/v3/spec/Completion-ClassMapTypeIncludesIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassMapTypeIncludesIrrelevantDtmiOrTermV3.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_humpf;1",
+        "@id": "dtmi:example:snee_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_yuzz;1",
+          "@id": "dtmi:example:snee_snee;1",
           "@type": [
             "Map",
             "dtmi:foo:bar;1"
           ],
           "mapKey": {
-            "name": "phi_wum",
+            "name": "snee_quan",
             "schema": "string"
           },
           "mapValue": {
-            "name": "phi_um",
+            "name": "snee_thnad",
             "schema": "date"
           }
         }
@@ -35,21 +35,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_snee;1",
+        "@id": "dtmi:example:snee_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:phi_fuddle;1",
+          "@id": "dtmi:example:snee_floob;1",
           "@type": [
             "Map",
             "dtmi:foo:bar;1"
           ],
           "mapKey": {
-            "name": "phi_glikk",
+            "name": "snee_zatz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "phi_nuh",
+            "name": "snee_jogg",
             "schema": "dateTime"
           }
         }
@@ -64,20 +64,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_floob;1",
+        "@id": "dtmi:example:snee_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_quan;1",
+          "@id": "dtmi:example:snee_itch;1",
           "@type": [
             "Map",
             "boolean"
           ],
           "mapKey": {
-            "name": "phi_thnad",
+            "name": "snee_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "phi_spazz",
+            "name": "snee_vroo",
             "schema": "double"
           }
         }
@@ -92,21 +92,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_itch;1",
+        "@id": "dtmi:example:quan_delta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:phi_zatz;1",
+          "@id": "dtmi:example:quan_alpha;1",
           "@type": [
             "Map",
             "boolean"
           ],
           "mapKey": {
-            "name": "phi_jogg",
+            "name": "quan_beta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "phi_flunn",
+            "name": "quan_gamma",
             "schema": "duration"
           }
         }
diff --git a/DTDL/v3/spec/Completion-ClassMapTypeIncludesUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassMapTypeIncludesUndefinedTermV3.json
index dcb4950f..90b6549a 100644
--- a/DTDL/v3/spec/Completion-ClassMapTypeIncludesUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassMapTypeIncludesUndefinedTermV3.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_rho;1",
+        "@id": "dtmi:example:quan_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_xi;1",
+          "@id": "dtmi:example:quan_phi;1",
           "@type": [
             "Map",
             "Foobar"
           ],
           "mapKey": {
-            "name": "chi_omicron",
+            "name": "quan_chi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "chi_pi",
+            "name": "quan_psi",
             "schema": "time"
           }
         }
@@ -35,21 +35,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_phi;1",
+        "@id": "dtmi:example:quan_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:chi_sigma;1",
+          "@id": "dtmi:example:quan_yuzz;1",
           "@type": [
             "Map",
             "Foobar"
           ],
           "mapKey": {
-            "name": "chi_tau",
+            "name": "quan_wum",
             "schema": "string"
           },
           "mapValue": {
-            "name": "chi_upsilon",
+            "name": "quan_um",
             "schema": "boolean"
           }
         }
diff --git a/DTDL/v3/spec/Completion-ClassMapValuePropertyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassMapValuePropertyIrrelevantDtmiOrTermV3.json
index a28441d2..763bc17d 100644
--- a/DTDL/v3/spec/Completion-ClassMapValuePropertyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassMapValuePropertyIrrelevantDtmiOrTermV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_lambda;1",
+        "@id": "dtmi:example:zeta_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_iota;1",
+          "@id": "dtmi:example:zeta_um;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_kappa",
+            "name": "zeta_humpf",
             "schema": "string"
           },
           "mapValue": {
@@ -21,8 +21,8 @@
               "MapValue",
               "Foobar"
             ],
-            "name": "zatz_theta",
-            "schema": "double",
+            "name": "zeta_wum",
+            "schema": "float",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -37,13 +37,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_omicron;1",
+        "@id": "dtmi:example:zeta_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_nu;1",
+          "@id": "dtmi:example:zeta_nuh;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_xi",
+            "name": "zeta_snee",
             "schema": "string"
           },
           "mapValue": {
@@ -52,8 +52,8 @@
               "MapValue",
               "Foobar"
             ],
-            "name": "zatz_mu",
-            "schema": "duration",
+            "name": "zeta_glikk",
+            "schema": "integer",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -68,13 +68,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_tau;1",
+        "@id": "dtmi:example:zeta_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_rho;1",
+          "@id": "dtmi:example:zeta_spazz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_sigma",
+            "name": "zeta_floob",
             "schema": "string"
           },
           "mapValue": {
@@ -82,8 +82,8 @@
               "MapValue",
               "Foobar"
             ],
-            "name": "zatz_pi",
-            "schema": "float",
+            "name": "zeta_thnad",
+            "schema": "long",
             "boolean": null
           }
         }
@@ -98,13 +98,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_psi;1",
+        "@id": "dtmi:example:zeta_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_phi;1",
+          "@id": "dtmi:example:zeta_flunn;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_chi",
+            "name": "zeta_itch",
             "schema": "string"
           },
           "mapValue": {
@@ -113,8 +113,8 @@
               "MapValue",
               "Foobar"
             ],
-            "name": "zatz_upsilon",
-            "schema": "integer",
+            "name": "zeta_jogg",
+            "schema": "string",
             "boolean": null
           }
         }
diff --git a/DTDL/v3/spec/Completion-ClassMapValuePropertySchemaDependentReferenceV3.json b/DTDL/v3/spec/Completion-ClassMapValuePropertySchemaDependentReferenceV3.json
index d0192f01..f90fd7cf 100644
--- a/DTDL/v3/spec/Completion-ClassMapValuePropertySchemaDependentReferenceV3.json
+++ b/DTDL/v3/spec/Completion-ClassMapValuePropertySchemaDependentReferenceV3.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_rho;1",
+        "@id": "dtmi:example:chi_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "kappa_pi",
+          "name": "chi_wum",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "kappa_omicron",
+              "name": "chi_yuzz",
               "schema": "string"
             },
             "mapValue": {
-              "name": "kappa_xi",
+              "name": "chi_omega",
               "schema": "dtmi:ex:dependentRef;1"
             }
           }
@@ -40,19 +40,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_phi;1",
+        "@id": "dtmi:example:chi_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "kappa_upsilon",
+          "name": "chi_glikk",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "kappa_tau",
+              "name": "chi_fuddle",
               "schema": "string"
             },
             "mapValue": {
-              "name": "kappa_sigma",
+              "name": "chi_humpf",
               "schema": [
                 "dtmi:ex:dependentRef;1"
               ]
diff --git a/DTDL/v3/spec/Completion-ClassMapValuePropertyUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassMapValuePropertyUndefinedTermV3.json
index 91a255ba..226f7c0d 100644
--- a/DTDL/v3/spec/Completion-ClassMapValuePropertyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassMapValuePropertyUndefinedTermV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_pi;1",
+        "@id": "dtmi:example:eta_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_xi;1",
+          "@id": "dtmi:example:eta_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_omicron",
+            "name": "eta_quan",
             "schema": "string"
           },
           "mapValue": {
@@ -21,8 +21,8 @@
               "MapValue",
               "Foobar"
             ],
-            "name": "jogg_nu",
-            "schema": "float",
+            "name": "eta_nuh",
+            "schema": "long",
             "foobar": {}
           }
         }
@@ -37,13 +37,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_upsilon;1",
+        "@id": "dtmi:example:eta_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_sigma;1",
+          "@id": "dtmi:example:eta_floob;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_tau",
+            "name": "eta_zatz",
             "schema": "string"
           },
           "mapValue": {
@@ -52,8 +52,8 @@
               "MapValue",
               "Foobar"
             ],
-            "name": "jogg_rho",
-            "schema": "integer",
+            "name": "eta_spazz",
+            "schema": "string",
             "foobar": {}
           }
         }
diff --git a/DTDL/v3/spec/Completion-ClassMapValueTypeIncludesIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassMapValueTypeIncludesIrrelevantDtmiOrTermV3.json
index 05f3fd34..fd65c052 100644
--- a/DTDL/v3/spec/Completion-ClassMapValueTypeIncludesIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassMapValueTypeIncludesIrrelevantDtmiOrTermV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_floob;1",
+        "@id": "dtmi:example:snee_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_thnad;1",
+          "@id": "dtmi:example:snee_iota;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_spazz",
+            "name": "snee_kappa",
             "schema": "string"
           },
           "mapValue": {
@@ -21,8 +21,8 @@
               "MapValue",
               "dtmi:foo:bar;1"
             ],
-            "name": "tau_quan",
-            "schema": "date"
+            "name": "snee_theta",
+            "schema": "double"
           }
         }
       }
@@ -36,13 +36,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_itch;1",
+        "@id": "dtmi:example:snee_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_jogg;1",
+          "@id": "dtmi:example:snee_nu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_flunn",
+            "name": "snee_xi",
             "schema": "string"
           },
           "mapValue": {
@@ -51,8 +51,8 @@
               "MapValue",
               "dtmi:foo:bar;1"
             ],
-            "name": "tau_zatz",
-            "schema": "dateTime"
+            "name": "snee_mu",
+            "schema": "duration"
           }
         }
       }
@@ -66,13 +66,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_alpha;1",
+        "@id": "dtmi:example:snee_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_vroo;1",
+          "@id": "dtmi:example:snee_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_hi",
+            "name": "snee_sigma",
             "schema": "string"
           },
           "mapValue": {
@@ -80,8 +80,8 @@
               "MapValue",
               "boolean"
             ],
-            "name": "tau_yekk",
-            "schema": "double"
+            "name": "snee_pi",
+            "schema": "float"
           }
         }
       }
@@ -95,13 +95,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_epsilon;1",
+        "@id": "dtmi:example:snee_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_gamma;1",
+          "@id": "dtmi:example:snee_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_delta",
+            "name": "snee_chi",
             "schema": "string"
           },
           "mapValue": {
@@ -110,8 +110,8 @@
               "MapValue",
               "boolean"
             ],
-            "name": "upsilon_beta",
-            "schema": "duration"
+            "name": "snee_upsilon",
+            "schema": "integer"
           }
         }
       }
diff --git a/DTDL/v3/spec/Completion-ClassMapValueTypeIncludesUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassMapValueTypeIncludesUndefinedTermV3.json
index b705902e..65cb6eb9 100644
--- a/DTDL/v3/spec/Completion-ClassMapValueTypeIncludesUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassMapValueTypeIncludesUndefinedTermV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_yuzz;1",
+        "@id": "dtmi:example:snee_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_psi;1",
+          "@id": "dtmi:example:snee_yekk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_omega",
+            "name": "snee_vroo",
             "schema": "string"
           },
           "mapValue": {
@@ -21,8 +21,8 @@
               "MapValue",
               "Foobar"
             ],
-            "name": "upsilon_chi",
-            "schema": "time"
+            "name": "snee_itch",
+            "schema": "date"
           }
         }
       }
@@ -36,13 +36,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_fuddle;1",
+        "@id": "dtmi:example:quan_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_um;1",
+          "@id": "dtmi:example:quan_beta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_humpf",
+            "name": "quan_gamma",
             "schema": "string"
           },
           "mapValue": {
@@ -51,8 +51,8 @@
               "MapValue",
               "Foobar"
             ],
-            "name": "upsilon_wum",
-            "schema": "boolean"
+            "name": "quan_alpha",
+            "schema": "dateTime"
           }
         }
       }
diff --git a/DTDL/v3/spec/Completion-ClassObjectPropertyFieldsDependentReferenceV3.json b/DTDL/v3/spec/Completion-ClassObjectPropertyFieldsDependentReferenceV3.json
index 692915c7..2afec79b 100644
--- a/DTDL/v3/spec/Completion-ClassObjectPropertyFieldsDependentReferenceV3.json
+++ b/DTDL/v3/spec/Completion-ClassObjectPropertyFieldsDependentReferenceV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_itch;1",
+        "@id": "dtmi:example:sigma_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "epsilon_flunn",
+          "name": "sigma_wum",
           "schema": {
             "@type": "Object",
             "fields": "dtmi:ex:dependentRef;1"
@@ -33,11 +33,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_vroo;1",
+        "@id": "dtmi:example:sigma_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "epsilon_yekk",
+          "name": "sigma_humpf",
           "schema": {
             "@type": "Object",
             "fields": [
diff --git a/DTDL/v3/spec/Completion-ClassObjectPropertyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassObjectPropertyIrrelevantDtmiOrTermV3.json
index 23755b73..04bcd0d1 100644
--- a/DTDL/v3/spec/Completion-ClassObjectPropertyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassObjectPropertyIrrelevantDtmiOrTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_yuzz;1",
+        "@id": "dtmi:example:chi_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_omega;1",
+          "@id": "dtmi:example:chi_lambda;1",
           "@type": [
             "Object",
             "Foobar"
@@ -28,11 +28,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_um;1",
+        "@id": "dtmi:example:chi_xi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:iota_wum;1",
+          "@id": "dtmi:example:chi_nu;1",
           "@type": [
             "Object",
             "Foobar"
@@ -50,10 +50,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_fuddle;1",
+        "@id": "dtmi:example:chi_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_humpf;1",
+          "@id": "dtmi:example:chi_omicron;1",
           "@type": [
             "Object",
             "Foobar"
@@ -71,11 +71,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_nuh;1",
+        "@id": "dtmi:example:chi_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:iota_glikk;1",
+          "@id": "dtmi:example:chi_rho;1",
           "@type": [
             "Object",
             "Foobar"
diff --git a/DTDL/v3/spec/Completion-ClassObjectPropertyUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassObjectPropertyUndefinedTermV3.json
index 3a8e7631..7fe97f58 100644
--- a/DTDL/v3/spec/Completion-ClassObjectPropertyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassObjectPropertyUndefinedTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_zeta;1",
+        "@id": "dtmi:example:chi_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_epsilon;1",
+          "@id": "dtmi:example:chi_spazz;1",
           "@type": [
             "Object",
             "Foobar"
@@ -28,11 +28,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_theta;1",
+        "@id": "dtmi:example:chi_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:kappa_eta;1",
+          "@id": "dtmi:example:chi_zatz;1",
           "@type": [
             "Object",
             "Foobar"
diff --git a/DTDL/v3/spec/Completion-ClassObjectTypeIncludesIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassObjectTypeIncludesIrrelevantDtmiOrTermV3.json
index 985302d0..ea5b3348 100644
--- a/DTDL/v3/spec/Completion-ClassObjectTypeIncludesIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassObjectTypeIncludesIrrelevantDtmiOrTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_zeta;1",
+        "@id": "dtmi:example:iota_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_epsilon;1",
+          "@id": "dtmi:example:iota_psi;1",
           "@type": [
             "Object",
             "dtmi:foo:bar;1"
@@ -27,11 +27,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_theta;1",
+        "@id": "dtmi:example:iota_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:itch_eta;1",
+          "@id": "dtmi:example:iota_yuzz;1",
           "@type": [
             "Object",
             "dtmi:foo:bar;1"
@@ -48,10 +48,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_kappa;1",
+        "@id": "dtmi:example:iota_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_iota;1",
+          "@id": "dtmi:example:iota_um;1",
           "@type": [
             "Object",
             "boolean"
@@ -68,11 +68,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_mu;1",
+        "@id": "dtmi:example:iota_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:itch_lambda;1",
+          "@id": "dtmi:example:iota_fuddle;1",
           "@type": [
             "Object",
             "boolean"
diff --git a/DTDL/v3/spec/Completion-ClassObjectTypeIncludesUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassObjectTypeIncludesUndefinedTermV3.json
index 2a7f4942..e2232dcf 100644
--- a/DTDL/v3/spec/Completion-ClassObjectTypeIncludesUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassObjectTypeIncludesUndefinedTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_chi;1",
+        "@id": "dtmi:example:iota_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_phi;1",
+          "@id": "dtmi:example:iota_flunn;1",
           "@type": [
             "Object",
             "Foobar"
@@ -27,11 +27,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_omega;1",
+        "@id": "dtmi:example:iota_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:itch_psi;1",
+          "@id": "dtmi:example:iota_yekk;1",
           "@type": [
             "Object",
             "Foobar"
diff --git a/DTDL/v3/spec/Completion-ClassPropertyPropertyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassPropertyPropertyIrrelevantDtmiOrTermV3.json
index b33ed5f3..35e3dfff 100644
--- a/DTDL/v3/spec/Completion-ClassPropertyPropertyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassPropertyPropertyIrrelevantDtmiOrTermV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_beta;1",
+        "@id": "dtmi:example:hi_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Foobar"
           ],
-          "name": "glikk_alpha",
-          "schema": "date",
+          "name": "hi_beta",
+          "schema": "time",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -29,7 +29,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_delta;1",
+        "@id": "dtmi:example:hi_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -37,8 +37,8 @@
             "Property",
             "Foobar"
           ],
-          "name": "glikk_gamma",
-          "schema": "dateTime",
+          "name": "hi_delta",
+          "schema": "boolean",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -52,15 +52,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_zeta;1",
+        "@id": "dtmi:example:hi_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Foobar"
           ],
-          "name": "glikk_epsilon",
-          "schema": "double",
+          "name": "hi_zeta",
+          "schema": "date",
           "boolean": null
         }
       }
@@ -74,7 +74,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_theta;1",
+        "@id": "dtmi:example:hi_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -82,8 +82,8 @@
             "Property",
             "Foobar"
           ],
-          "name": "glikk_eta",
-          "schema": "duration",
+          "name": "hi_theta",
+          "schema": "dateTime",
           "boolean": null
         }
       }
diff --git a/DTDL/v3/spec/Completion-ClassPropertyPropertySchemaDependentReferenceV3.json b/DTDL/v3/spec/Completion-ClassPropertyPropertySchemaDependentReferenceV3.json
index 37f49250..6e2f7e17 100644
--- a/DTDL/v3/spec/Completion-ClassPropertyPropertySchemaDependentReferenceV3.json
+++ b/DTDL/v3/spec/Completion-ClassPropertyPropertySchemaDependentReferenceV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_quan;1",
+        "@id": "dtmi:example:humpf_humpf;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omicron_snee;1",
+          "@id": "dtmi:example:humpf_um;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "omicron_nuh",
+            "name": "humpf_wum",
             "schema": "dtmi:ex:dependentRef;1"
           }
         }
@@ -34,14 +34,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_floob;1",
+        "@id": "dtmi:example:humpf_nuh;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omicron_spazz;1",
+          "@id": "dtmi:example:humpf_glikk;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "omicron_thnad",
+            "name": "humpf_fuddle",
             "schema": [
               "dtmi:ex:dependentRef;1"
             ]
diff --git a/DTDL/v3/spec/Completion-ClassPropertyPropertyUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassPropertyPropertyUndefinedTermV3.json
index 7f929b79..68f006f6 100644
--- a/DTDL/v3/spec/Completion-ClassPropertyPropertyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassPropertyPropertyUndefinedTermV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_wum;1",
+        "@id": "dtmi:example:hi_um;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Foobar"
           ],
-          "name": "glikk_yuzz",
-          "schema": "double",
+          "name": "hi_wum",
+          "schema": "date",
           "foobar": {}
         }
       }
@@ -29,7 +29,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_humpf;1",
+        "@id": "dtmi:example:hi_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -37,8 +37,8 @@
             "Property",
             "Foobar"
           ],
-          "name": "glikk_um",
-          "schema": "duration",
+          "name": "hi_humpf",
+          "schema": "dateTime",
           "foobar": {}
         }
       }
diff --git a/DTDL/v3/spec/Completion-ClassPropertyTypeIncludesIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassPropertyTypeIncludesIrrelevantDtmiOrTermV3.json
index a2bd41b0..8bb480ef 100644
--- a/DTDL/v3/spec/Completion-ClassPropertyTypeIncludesIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassPropertyTypeIncludesIrrelevantDtmiOrTermV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_flunn;1",
+        "@id": "dtmi:example:omega_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:foo:bar;1"
           ],
-          "name": "lambda_jogg",
-          "schema": "dateTime"
+          "name": "omega_yuzz",
+          "schema": "integer"
         }
       }
     ]
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_yekk;1",
+        "@id": "dtmi:example:omega_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,8 +36,8 @@
             "Property",
             "dtmi:foo:bar;1"
           ],
-          "name": "lambda_itch",
-          "schema": "double"
+          "name": "omega_um",
+          "schema": "long"
         }
       }
     ]
@@ -50,15 +50,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_hi;1",
+        "@id": "dtmi:example:omega_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "boolean"
           ],
-          "name": "lambda_vroo",
-          "schema": "duration"
+          "name": "omega_fuddle",
+          "schema": "string"
         }
       }
     ]
@@ -71,7 +71,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_beta;1",
+        "@id": "dtmi:example:omega_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -79,8 +79,8 @@
             "Property",
             "boolean"
           ],
-          "name": "mu_alpha",
-          "schema": "float"
+          "name": "omega_nuh",
+          "schema": "time"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Completion-ClassPropertyTypeIncludesUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassPropertyTypeIncludesUndefinedTermV3.json
index 22046cec..f2e103c1 100644
--- a/DTDL/v3/spec/Completion-ClassPropertyTypeIncludesUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassPropertyTypeIncludesUndefinedTermV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_mu;1",
+        "@id": "dtmi:example:omega_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Foobar"
           ],
-          "name": "mu_lambda",
-          "schema": "boolean"
+          "name": "omega_yekk",
+          "schema": "duration"
         }
       }
     ]
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_xi;1",
+        "@id": "dtmi:example:yuzz_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,8 +36,8 @@
             "Property",
             "Foobar"
           ],
-          "name": "mu_nu",
-          "schema": "date"
+          "name": "omega_hi",
+          "schema": "float"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Completion-ClassRelationshipPropertyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassRelationshipPropertyIrrelevantDtmiOrTermV3.json
index 680cb069..872721ea 100644
--- a/DTDL/v3/spec/Completion-ClassRelationshipPropertyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassRelationshipPropertyIrrelevantDtmiOrTermV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_glikk;1",
+        "@id": "dtmi:example:wum_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Relationship",
             "Foobar"
           ],
-          "name": "mu_fuddle",
+          "name": "wum_gamma",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_snee;1",
+        "@id": "dtmi:example:wum_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,7 +36,7 @@
             "Relationship",
             "Foobar"
           ],
-          "name": "mu_nuh",
+          "name": "wum_epsilon",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -50,14 +50,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_thnad;1",
+        "@id": "dtmi:example:wum_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Relationship",
             "Foobar"
           ],
-          "name": "mu_quan",
+          "name": "wum_eta",
           "boolean": null
         }
       }
@@ -71,7 +71,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_floob;1",
+        "@id": "dtmi:example:wum_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -79,7 +79,7 @@
             "Relationship",
             "Foobar"
           ],
-          "name": "mu_spazz",
+          "name": "wum_iota",
           "boolean": null
         }
       }
diff --git a/DTDL/v3/spec/Completion-ClassRelationshipPropertyPropertiesDependentReferenceV3.json b/DTDL/v3/spec/Completion-ClassRelationshipPropertyPropertiesDependentReferenceV3.json
index 78ca4572..9ddff378 100644
--- a/DTDL/v3/spec/Completion-ClassRelationshipPropertyPropertiesDependentReferenceV3.json
+++ b/DTDL/v3/spec/Completion-ClassRelationshipPropertyPropertiesDependentReferenceV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_rho;1",
+        "@id": "dtmi:example:rho_thnad;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:delta_pi;1",
+          "@id": "dtmi:example:rho_quan;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "delta_omicron",
+            "name": "rho_snee",
             "properties": "dtmi:ex:dependentRef;1"
           }
         }
@@ -34,14 +34,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_upsilon;1",
+        "@id": "dtmi:example:rho_zatz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:delta_tau;1",
+          "@id": "dtmi:example:rho_floob;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "delta_sigma",
+            "name": "rho_spazz",
             "properties": [
               "dtmi:ex:dependentRef;1"
             ]
diff --git a/DTDL/v3/spec/Completion-ClassRelationshipPropertyUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassRelationshipPropertyUndefinedTermV3.json
index bbd8badc..150396fd 100644
--- a/DTDL/v3/spec/Completion-ClassRelationshipPropertyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassRelationshipPropertyUndefinedTermV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_lambda;1",
+        "@id": "dtmi:example:wum_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Relationship",
             "Foobar"
           ],
-          "name": "nu_kappa",
+          "name": "wum_um",
           "foobar": {}
         }
       }
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_nu;1",
+        "@id": "dtmi:example:wum_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,7 +36,7 @@
             "Relationship",
             "Foobar"
           ],
-          "name": "nu_mu",
+          "name": "wum_fuddle",
           "foobar": {}
         }
       }
diff --git a/DTDL/v3/spec/Completion-ClassRelationshipTypeIncludesIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassRelationshipTypeIncludesIrrelevantDtmiOrTermV3.json
index 2d881c75..b72ebf5e 100644
--- a/DTDL/v3/spec/Completion-ClassRelationshipTypeIncludesIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassRelationshipTypeIncludesIrrelevantDtmiOrTermV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_mu;1",
+        "@id": "dtmi:example:beta_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Relationship",
             "dtmi:foo:bar;1"
           ],
-          "name": "snee_lambda"
+          "name": "beta_mu"
         }
       }
     ]
@@ -27,7 +27,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_xi;1",
+        "@id": "dtmi:example:beta_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -35,7 +35,7 @@
             "Relationship",
             "dtmi:foo:bar;1"
           ],
-          "name": "snee_nu"
+          "name": "beta_xi"
         }
       }
     ]
@@ -48,14 +48,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_pi;1",
+        "@id": "dtmi:example:beta_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Relationship",
             "boolean"
           ],
-          "name": "snee_omicron"
+          "name": "beta_pi"
         }
       }
     ]
@@ -68,7 +68,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_sigma;1",
+        "@id": "dtmi:example:beta_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -76,7 +76,7 @@
             "Relationship",
             "boolean"
           ],
-          "name": "snee_rho"
+          "name": "beta_sigma"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Completion-ClassRelationshipTypeIncludesUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassRelationshipTypeIncludesUndefinedTermV3.json
index f8978f68..91da2921 100644
--- a/DTDL/v3/spec/Completion-ClassRelationshipTypeIncludesUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassRelationshipTypeIncludesUndefinedTermV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_humpf;1",
+        "@id": "dtmi:example:beta_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Relationship",
             "Foobar"
           ],
-          "name": "snee_um"
+          "name": "beta_humpf"
         }
       }
     ]
@@ -27,7 +27,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_glikk;1",
+        "@id": "dtmi:example:beta_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -35,7 +35,7 @@
             "Relationship",
             "Foobar"
           ],
-          "name": "snee_fuddle"
+          "name": "beta_glikk"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Completion-ClassTelemetryPropertyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassTelemetryPropertyIrrelevantDtmiOrTermV3.json
index d5d026f4..ad34d430 100644
--- a/DTDL/v3/spec/Completion-ClassTelemetryPropertyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassTelemetryPropertyIrrelevantDtmiOrTermV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_yuzz;1",
+        "@id": "dtmi:example:beta_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Foobar"
           ],
-          "name": "nuh_omega",
-          "schema": "date",
+          "name": "beta_mu",
+          "schema": "float",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -29,7 +29,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_um;1",
+        "@id": "dtmi:example:beta_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -37,8 +37,8 @@
             "Telemetry",
             "Foobar"
           ],
-          "name": "nuh_wum",
-          "schema": "dateTime",
+          "name": "beta_xi",
+          "schema": "integer",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -52,15 +52,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_fuddle;1",
+        "@id": "dtmi:example:beta_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Foobar"
           ],
-          "name": "nuh_humpf",
-          "schema": "double",
+          "name": "beta_pi",
+          "schema": "long",
           "boolean": null
         }
       }
@@ -74,7 +74,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_nuh;1",
+        "@id": "dtmi:example:beta_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -82,8 +82,8 @@
             "Telemetry",
             "Foobar"
           ],
-          "name": "nuh_glikk",
-          "schema": "duration",
+          "name": "beta_sigma",
+          "schema": "string",
           "boolean": null
         }
       }
diff --git a/DTDL/v3/spec/Completion-ClassTelemetryPropertySchemaDependentReferenceV3.json b/DTDL/v3/spec/Completion-ClassTelemetryPropertySchemaDependentReferenceV3.json
index cf7d13e0..312a6cff 100644
--- a/DTDL/v3/spec/Completion-ClassTelemetryPropertySchemaDependentReferenceV3.json
+++ b/DTDL/v3/spec/Completion-ClassTelemetryPropertySchemaDependentReferenceV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_snee;1",
+        "@id": "dtmi:example:snee_xi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:sigma_nuh;1",
+          "@id": "dtmi:example:snee_nu;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "sigma_glikk",
+            "name": "snee_mu",
             "schema": "dtmi:ex:dependentRef;1"
           }
         }
@@ -34,14 +34,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_spazz;1",
+        "@id": "dtmi:example:snee_rho;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:sigma_thnad;1",
+          "@id": "dtmi:example:snee_pi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "sigma_quan",
+            "name": "snee_omicron",
             "schema": [
               "dtmi:ex:dependentRef;1"
             ]
diff --git a/DTDL/v3/spec/Completion-ClassTelemetryPropertyUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassTelemetryPropertyUndefinedTermV3.json
index 9f2323c8..ba057252 100644
--- a/DTDL/v3/spec/Completion-ClassTelemetryPropertyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassTelemetryPropertyUndefinedTermV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_zeta;1",
+        "@id": "dtmi:example:beta_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Foobar"
           ],
-          "name": "snee_epsilon",
-          "schema": "double",
+          "name": "beta_floob",
+          "schema": "long",
           "foobar": {}
         }
       }
@@ -29,7 +29,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_theta;1",
+        "@id": "dtmi:example:beta_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -37,8 +37,8 @@
             "Telemetry",
             "Foobar"
           ],
-          "name": "snee_eta",
-          "schema": "duration",
+          "name": "beta_jogg",
+          "schema": "string",
           "foobar": {}
         }
       }
diff --git a/DTDL/v3/spec/Completion-ClassTelemetryTypeIncludesIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Completion-ClassTelemetryTypeIncludesIrrelevantDtmiOrTermV3.json
index 4737366c..b927bb6b 100644
--- a/DTDL/v3/spec/Completion-ClassTelemetryTypeIncludesIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassTelemetryTypeIncludesIrrelevantDtmiOrTermV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_alpha;1",
+        "@id": "dtmi:example:humpf_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:foo:bar;1"
           ],
-          "name": "xi_hi",
+          "name": "humpf_rho",
           "schema": "time"
         }
       }
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_gamma;1",
+        "@id": "dtmi:example:humpf_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,7 +36,7 @@
             "Telemetry",
             "dtmi:foo:bar;1"
           ],
-          "name": "omicron_beta",
+          "name": "humpf_tau",
           "schema": "boolean"
         }
       }
@@ -50,14 +50,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_epsilon;1",
+        "@id": "dtmi:example:humpf_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "boolean"
           ],
-          "name": "omicron_delta",
+          "name": "humpf_phi",
           "schema": "date"
         }
       }
@@ -71,7 +71,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_eta;1",
+        "@id": "dtmi:example:humpf_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -79,7 +79,7 @@
             "Telemetry",
             "boolean"
           ],
-          "name": "omicron_zeta",
+          "name": "humpf_psi",
           "schema": "dateTime"
         }
       }
diff --git a/DTDL/v3/spec/Completion-ClassTelemetryTypeIncludesUndefinedTermV3.json b/DTDL/v3/spec/Completion-ClassTelemetryTypeIncludesUndefinedTermV3.json
index cfb5eb2b..cc74e8e0 100644
--- a/DTDL/v3/spec/Completion-ClassTelemetryTypeIncludesUndefinedTermV3.json
+++ b/DTDL/v3/spec/Completion-ClassTelemetryTypeIncludesUndefinedTermV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_rho;1",
+        "@id": "dtmi:example:humpf_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Foobar"
           ],
-          "name": "omicron_pi",
+          "name": "humpf_quan",
           "schema": "long"
         }
       }
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_tau;1",
+        "@id": "dtmi:example:humpf_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,7 +36,7 @@
             "Telemetry",
             "Foobar"
           ],
-          "name": "omicron_sigma",
+          "name": "humpf_spazz",
           "schema": "string"
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassArrayPropertyCommentTermV3.json b/DTDL/v3/spec/Recommendation-ClassArrayPropertyCommentTermV3.json
index f7136457..57873940 100644
--- a/DTDL/v3/spec/Recommendation-ClassArrayPropertyCommentTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassArrayPropertyCommentTermV3.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_nu;1",
+        "@id": "dtmi:example:hi_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_lambda;1",
+          "@id": "dtmi:example:hi_nu;1",
           "@type": "Array",
-          "comment": "spazz_mu",
-          "elementSchema": "boolean"
+          "comment": "hi_xi",
+          "elementSchema": "dateTime"
         }
       }
     ]
@@ -28,13 +28,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_pi;1",
+        "@id": "dtmi:example:hi_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_xi;1",
+          "@id": "dtmi:example:hi_pi;1",
           "@type": "Array",
-          "dtmi:dtdl:property:comment;3": "spazz_omicron",
-          "elementSchema": "date"
+          "dtmi:dtdl:property:comment;3": "hi_rho",
+          "elementSchema": "double"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassArrayPropertyDescriptionTermV3.json b/DTDL/v3/spec/Recommendation-ClassArrayPropertyDescriptionTermV3.json
index 1412955d..abd86bd9 100644
--- a/DTDL/v3/spec/Recommendation-ClassArrayPropertyDescriptionTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassArrayPropertyDescriptionTermV3.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_yekk;1",
+        "@id": "dtmi:example:alpha_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_flunn;1",
+          "@id": "dtmi:example:alpha_yekk;1",
           "@type": "Array",
           "description": [
-            "floob_itch"
+            "alpha_vroo"
           ],
-          "elementSchema": "dateTime"
+          "elementSchema": "duration"
         }
       }
     ]
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_alpha;1",
+        "@id": "dtmi:example:beta_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_vroo;1",
+          "@id": "dtmi:example:beta_alpha;1",
           "@type": "Array",
           "dtmi:dtdl:property:description;3": [
-            "floob_hi"
+            "beta_beta"
           ],
-          "elementSchema": "double"
+          "elementSchema": "float"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassArrayPropertyDisplayNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassArrayPropertyDisplayNameTermV3.json
index 9fd2ada3..7d8af74c 100644
--- a/DTDL/v3/spec/Recommendation-ClassArrayPropertyDisplayNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassArrayPropertyDisplayNameTermV3.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_wum;1",
+        "@id": "dtmi:example:gamma_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_omega;1",
+          "@id": "dtmi:example:gamma_wum;1",
           "@type": "Array",
           "displayName": [
-            "jogg_yuzz"
+            "gamma_um"
           ],
-          "elementSchema": "duration"
+          "elementSchema": "integer"
         }
       }
     ]
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_fuddle;1",
+        "@id": "dtmi:example:gamma_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_um;1",
+          "@id": "dtmi:example:gamma_fuddle;1",
           "@type": "Array",
           "dtmi:dtdl:property:displayName;3": [
-            "jogg_humpf"
+            "gamma_glikk"
           ],
-          "elementSchema": "float"
+          "elementSchema": "long"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassArrayPropertyElementSchemaPreferTermToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassArrayPropertyElementSchemaPreferTermToDtmiV3.json
index ce4fe2e5..01587e45 100644
--- a/DTDL/v3/spec/Recommendation-ClassArrayPropertyElementSchemaPreferTermToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassArrayPropertyElementSchemaPreferTermToDtmiV3.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_yekk;1",
+        "@id": "dtmi:example:jogg_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_itch;1",
+          "@id": "dtmi:example:jogg_jogg;1",
           "@type": "Array",
           "elementSchema": "date"
         }
@@ -27,10 +27,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_hi;1",
+        "@id": "dtmi:example:jogg_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_vroo;1",
+          "@id": "dtmi:example:jogg_itch;1",
           "@type": "Array",
           "elementSchema": "dtmi:dtdl:instance:Schema:date;3"
         }
@@ -46,10 +46,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_beta;1",
+        "@id": "dtmi:example:jogg_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_alpha;1",
+          "@id": "dtmi:example:jogg_vroo;1",
           "@type": "Array",
           "elementSchema": "point"
         }
@@ -65,10 +65,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_delta;1",
+        "@id": "dtmi:example:flunn_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_gamma;1",
+          "@id": "dtmi:example:flunn_alpha;1",
           "@type": "Array",
           "elementSchema": "dtmi:standard:schema:geospatial:point;3"
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassArrayPropertyElementSchemaTermV3.json b/DTDL/v3/spec/Recommendation-ClassArrayPropertyElementSchemaTermV3.json
index 3b62ffb4..cda60f34 100644
--- a/DTDL/v3/spec/Recommendation-ClassArrayPropertyElementSchemaTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassArrayPropertyElementSchemaTermV3.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_theta;1",
+        "@id": "dtmi:example:flunn_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_eta;1",
+          "@id": "dtmi:example:flunn_epsilon;1",
           "@type": "Array",
           "elementSchema": "float"
         }
@@ -27,10 +27,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_kappa;1",
+        "@id": "dtmi:example:flunn_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_iota;1",
+          "@id": "dtmi:example:flunn_eta;1",
           "@type": "Array",
           "dtmi:dtdl:property:elementSchema;3": "integer"
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassArrayTypeDuplicatesMaterialV3.json b/DTDL/v3/spec/Recommendation-ClassArrayTypeDuplicatesMaterialV3.json
index 9dc2e6f3..55ab10ed 100644
--- a/DTDL/v3/spec/Recommendation-ClassArrayTypeDuplicatesMaterialV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassArrayTypeDuplicatesMaterialV3.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_vroo;1",
+        "@id": "dtmi:example:quan_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_yekk;1",
+          "@id": "dtmi:example:quan_quan;1",
           "elementSchema": "integer",
           "@type": [
             "Array",
@@ -30,10 +30,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_alpha;1",
+        "@id": "dtmi:example:quan_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_hi;1",
+          "@id": "dtmi:example:quan_spazz;1",
           "elementSchema": "long",
           "@type": [
             "dtmi:dtdl:class:Array;3",
diff --git a/DTDL/v3/spec/Recommendation-ClassArrayTypeIncludesTermAndDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassArrayTypeIncludesTermAndDtmiV3.json
index 3617c2ea..c27fb1bc 100644
--- a/DTDL/v3/spec/Recommendation-ClassArrayTypeIncludesTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassArrayTypeIncludesTermAndDtmiV3.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_itch;1",
+        "@id": "dtmi:example:quan_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_flunn;1",
+          "@id": "dtmi:example:quan_nuh;1",
           "elementSchema": "float",
           "@type": [
             "Array",
diff --git a/DTDL/v3/spec/Recommendation-ClassArrayTypePreferTermToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassArrayTypePreferTermToDtmiV3.json
index 1cfd3896..ebe3c31b 100644
--- a/DTDL/v3/spec/Recommendation-ClassArrayTypePreferTermToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassArrayTypePreferTermToDtmiV3.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_gamma;1",
+        "@id": "dtmi:example:quan_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_beta;1",
+          "@id": "dtmi:example:quan_zatz;1",
           "elementSchema": "string",
           "@type": "Array"
         }
@@ -27,10 +27,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_epsilon;1",
+        "@id": "dtmi:example:quan_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_delta;1",
+          "@id": "dtmi:example:quan_flunn;1",
           "elementSchema": "time",
           "@type": "dtmi:dtdl:class:Array;3"
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandPropertyCommandTypeDeprecatedV3.json b/DTDL/v3/spec/Recommendation-ClassCommandPropertyCommandTypeDeprecatedV3.json
index 2a939604..09181589 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandPropertyCommandTypeDeprecatedV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandPropertyCommandTypeDeprecatedV3.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_theta;1",
+        "@id": "dtmi:example:nu_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "commandType": "asynchronous",
-          "name": "epsilon_eta"
+          "name": "nu_omicron"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandPropertyCommandTypeTermV3.json b/DTDL/v3/spec/Recommendation-ClassCommandPropertyCommandTypeTermV3.json
index 236f99c1..6323fb25 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandPropertyCommandTypeTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandPropertyCommandTypeTermV3.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_wum;1",
+        "@id": "dtmi:example:rho_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "commandType": "asynchronous",
-          "name": "iota_yuzz"
+          "name": "rho_quan"
         }
       }
     ]
@@ -27,12 +27,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_humpf;1",
+        "@id": "dtmi:example:rho_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "dtmi:dtdl:property:commandType;3": "asynchronous",
-          "name": "iota_um"
+          "name": "rho_spazz"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandPropertyCommentTermV3.json b/DTDL/v3/spec/Recommendation-ClassCommandPropertyCommentTermV3.json
index 32cbf6d0..6537e5e2 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandPropertyCommentTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandPropertyCommentTermV3.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_hi;1",
+        "@id": "dtmi:example:tau_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "comment": "kappa_yekk",
-          "name": "kappa_vroo"
+          "comment": "tau_zeta",
+          "name": "tau_eta"
         }
       }
     ]
@@ -27,12 +27,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_gamma;1",
+        "@id": "dtmi:example:tau_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "dtmi:dtdl:property:comment;3": "lambda_alpha",
-          "name": "lambda_beta"
+          "dtmi:dtdl:property:comment;3": "tau_iota",
+          "name": "tau_kappa"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandPropertyDescriptionTermV3.json b/DTDL/v3/spec/Recommendation-ClassCommandPropertyDescriptionTermV3.json
index e100a322..5cc134bc 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandPropertyDescriptionTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandPropertyDescriptionTermV3.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_humpf;1",
+        "@id": "dtmi:example:upsilon_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "description": [
-            "mu_wum"
+            "upsilon_thnad"
           ],
-          "name": "mu_um"
+          "name": "upsilon_spazz"
         }
       }
     ]
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_nuh;1",
+        "@id": "dtmi:example:upsilon_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "dtmi:dtdl:property:description;3": [
-            "mu_fuddle"
+            "upsilon_zatz"
           ],
-          "name": "mu_glikk"
+          "name": "upsilon_jogg"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandPropertyDisplayNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassCommandPropertyDisplayNameTermV3.json
index 9fc5aead..6954a54d 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandPropertyDisplayNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandPropertyDisplayNameTermV3.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_nu;1",
+        "@id": "dtmi:example:chi_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "displayName": [
-            "xi_lambda"
+            "chi_tau"
           ],
-          "name": "xi_mu"
+          "name": "chi_upsilon"
         }
       }
     ]
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_pi;1",
+        "@id": "dtmi:example:chi_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "dtmi:dtdl:property:displayName;3": [
-            "xi_xi"
+            "chi_chi"
           ],
-          "name": "xi_omicron"
+          "name": "chi_psi"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandPropertyNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassCommandPropertyNameTermV3.json
index 4b617c25..31a076c6 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandPropertyNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandPropertyNameTermV3.json
@@ -8,11 +8,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_lambda;1",
+        "@id": "dtmi:example:theta_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_kappa"
+          "name": "theta_mu"
         }
       }
     ]
@@ -26,11 +26,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_nu;1",
+        "@id": "dtmi:example:theta_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "dtmi:dtdl:property:name;3": "hi_mu"
+          "dtmi:dtdl:property:name;3": "theta_xi"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandPropertyRequestTermV3.json b/DTDL/v3/spec/Recommendation-ClassCommandPropertyRequestTermV3.json
index 15c32678..5171f5cb 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandPropertyRequestTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandPropertyRequestTermV3.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_um;1",
+        "@id": "dtmi:example:um_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_yuzz",
+          "name": "wum_hi",
           "request": {
-            "name": "sigma_wum",
-            "schema": "integer"
+            "name": "um_alpha",
+            "schema": "boolean"
           }
         }
       }
@@ -30,14 +30,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_glikk;1",
+        "@id": "dtmi:example:um_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_humpf",
+          "name": "um_gamma",
           "dtmi:dtdl:property:request;3": {
-            "name": "sigma_fuddle",
-            "schema": "long"
+            "name": "um_delta",
+            "schema": "date"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandPropertyResponseTermV3.json b/DTDL/v3/spec/Recommendation-ClassCommandPropertyResponseTermV3.json
index e3e433bf..be97b943 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandPropertyResponseTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandPropertyResponseTermV3.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_yekk;1",
+        "@id": "dtmi:example:nuh_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_flunn",
+          "name": "nuh_omega",
           "response": {
-            "name": "chi_itch",
-            "schema": "integer"
+            "name": "nuh_yuzz",
+            "schema": "dateTime"
           }
         }
       }
@@ -30,14 +30,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_alpha;1",
+        "@id": "dtmi:example:nuh_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_vroo",
+          "name": "nuh_um",
           "dtmi:dtdl:property:response;3": {
-            "name": "chi_hi",
-            "schema": "long"
+            "name": "nuh_humpf",
+            "schema": "double"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandRequestPropertyCommentTermV3.json b/DTDL/v3/spec/Recommendation-ClassCommandRequestPropertyCommentTermV3.json
index 7da83cc6..f26a8be8 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandRequestPropertyCommentTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandRequestPropertyCommentTermV3.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_zeta;1",
+        "@id": "dtmi:example:lambda_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "beta_epsilon",
+          "name": "lambda_theta",
           "request": {
-            "comment": "beta_gamma",
-            "name": "beta_delta",
+            "comment": "lambda_zeta",
+            "name": "lambda_eta",
             "schema": "duration"
           }
         }
@@ -31,14 +31,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_kappa;1",
+        "@id": "dtmi:example:lambda_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "beta_iota",
+          "name": "lambda_mu",
           "request": {
-            "dtmi:dtdl:property:comment;3": "beta_eta",
-            "name": "beta_theta",
+            "dtmi:dtdl:property:comment;3": "lambda_kappa",
+            "name": "lambda_lambda",
             "schema": "float"
           }
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandRequestPropertyDescriptionTermV3.json b/DTDL/v3/spec/Recommendation-ClassCommandRequestPropertyDescriptionTermV3.json
index c018b237..becfb3b5 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandRequestPropertyDescriptionTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandRequestPropertyDescriptionTermV3.json
@@ -8,16 +8,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_psi;1",
+        "@id": "dtmi:example:nu_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_chi",
+          "name": "nu_yuzz",
           "request": {
             "description": [
-              "delta_upsilon"
+              "nu_psi"
             ],
-            "name": "delta_phi",
+            "name": "nu_omega",
             "schema": "integer"
           }
         }
@@ -33,16 +33,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_um;1",
+        "@id": "dtmi:example:nu_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_wum",
+          "name": "nu_fuddle",
           "request": {
             "dtmi:dtdl:property:description;3": [
-              "delta_omega"
+              "nu_um"
             ],
-            "name": "delta_yuzz",
+            "name": "nu_humpf",
             "schema": "long"
           }
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandRequestPropertyDisplayNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassCommandRequestPropertyDisplayNameTermV3.json
index fed11ca6..042a1cc7 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandRequestPropertyDisplayNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandRequestPropertyDisplayNameTermV3.json
@@ -8,16 +8,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_itch;1",
+        "@id": "dtmi:example:omicron_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_flunn",
+          "name": "omicron_vroo",
           "request": {
             "displayName": [
-              "zeta_zatz"
+              "omicron_itch"
             ],
-            "name": "zeta_jogg",
+            "name": "omicron_yekk",
             "schema": "string"
           }
         }
@@ -33,16 +33,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_alpha;1",
+        "@id": "dtmi:example:pi_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_hi",
+          "name": "pi_gamma",
           "request": {
             "dtmi:dtdl:property:displayName;3": [
-              "zeta_yekk"
+              "pi_alpha"
             ],
-            "name": "zeta_vroo",
+            "name": "pi_beta",
             "schema": "time"
           }
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandRequestPropertyNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassCommandRequestPropertyNameTermV3.json
index b45d272c..cf0854fa 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandRequestPropertyNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandRequestPropertyNameTermV3.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_alpha;1",
+        "@id": "dtmi:example:spazz_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_hi",
+          "name": "spazz_humpf",
           "request": {
-            "name": "wum_vroo",
-            "schema": "float"
+            "name": "spazz_um",
+            "schema": "date"
           }
         }
       }
@@ -30,14 +30,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_delta;1",
+        "@id": "dtmi:example:spazz_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_gamma",
+          "name": "spazz_nuh",
           "request": {
-            "dtmi:dtdl:property:name;3": "um_beta",
-            "schema": "integer"
+            "dtmi:dtdl:property:name;3": "spazz_glikk",
+            "schema": "dateTime"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandRequestPropertySchemaPreferTermToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassCommandRequestPropertySchemaPreferTermToDtmiV3.json
index c2795cb7..0ecfc9e3 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandRequestPropertySchemaPreferTermToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandRequestPropertySchemaPreferTermToDtmiV3.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_mu;1",
+        "@id": "dtmi:example:vroo_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_lambda",
+          "name": "vroo_zeta",
           "request": {
-            "name": "quan_kappa",
+            "name": "vroo_epsilon",
             "schema": "double"
           }
         }
@@ -30,13 +30,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_omicron;1",
+        "@id": "dtmi:example:vroo_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_xi",
+          "name": "vroo_iota",
           "request": {
-            "name": "quan_nu",
+            "name": "vroo_theta",
             "schema": "dtmi:dtdl:instance:Schema:double;3"
           }
         }
@@ -52,13 +52,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_sigma;1",
+        "@id": "dtmi:example:vroo_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_rho",
+          "name": "vroo_mu",
           "request": {
-            "name": "quan_pi",
+            "name": "vroo_lambda",
             "schema": "point"
           }
         }
@@ -74,13 +74,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_phi;1",
+        "@id": "dtmi:example:vroo_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_upsilon",
+          "name": "vroo_omicron",
           "request": {
-            "name": "quan_tau",
+            "name": "vroo_xi",
             "schema": "dtmi:standard:schema:geospatial:point;3"
           }
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandRequestPropertySchemaTermV3.json b/DTDL/v3/spec/Recommendation-ClassCommandRequestPropertySchemaTermV3.json
index 5c971342..860c9f8b 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandRequestPropertySchemaTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandRequestPropertySchemaTermV3.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_um;1",
+        "@id": "dtmi:example:vroo_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_wum",
+          "name": "vroo_phi",
           "request": {
-            "name": "quan_yuzz",
-            "schema": "double"
+            "name": "vroo_upsilon",
+            "schema": "date"
           }
         }
       }
@@ -30,14 +30,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_glikk;1",
+        "@id": "dtmi:example:vroo_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_fuddle",
+          "name": "vroo_omega",
           "request": {
-            "name": "quan_humpf",
-            "dtmi:dtdl:property:schema;3": "duration"
+            "name": "vroo_psi",
+            "dtmi:dtdl:property:schema;3": "dateTime"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandRequestTypeDuplicatesMaterialV3.json b/DTDL/v3/spec/Recommendation-ClassCommandRequestTypeDuplicatesMaterialV3.json
index a6ff4ee0..758e144e 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandRequestTypeDuplicatesMaterialV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandRequestTypeDuplicatesMaterialV3.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_sigma;1",
+        "@id": "dtmi:example:gamma_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zatz_rho",
+          "name": "gamma_upsilon",
           "request": {
-            "name": "zatz_pi",
+            "name": "gamma_tau",
             "schema": "duration",
             "@type": [
               "CommandRequest",
@@ -34,13 +34,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_phi;1",
+        "@id": "dtmi:example:gamma_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zatz_upsilon",
+          "name": "gamma_psi",
           "request": {
-            "name": "zatz_tau",
+            "name": "gamma_chi",
             "schema": "float",
             "@type": [
               "dtmi:dtdl:class:CommandRequest;3",
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandRequestTypeIncludesTermAndDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassCommandRequestTypeIncludesTermAndDtmiV3.json
index c023eacb..b30db093 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandRequestTypeIncludesTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandRequestTypeIncludesTermAndDtmiV3.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_omicron;1",
+        "@id": "dtmi:example:gamma_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zatz_xi",
+          "name": "gamma_rho",
           "request": {
-            "name": "zatz_nu",
+            "name": "gamma_pi",
             "schema": "double",
             "@type": [
               "CommandRequest",
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandRequestTypePreferTermToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassCommandRequestTypePreferTermToDtmiV3.json
index 65c4bba8..e73370ef 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandRequestTypePreferTermToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandRequestTypePreferTermToDtmiV3.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_omega;1",
+        "@id": "dtmi:example:gamma_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zatz_psi",
+          "name": "gamma_wum",
           "request": {
-            "name": "zatz_chi",
+            "name": "gamma_yuzz",
             "schema": "integer",
             "@type": "CommandRequest"
           }
@@ -31,13 +31,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_um;1",
+        "@id": "dtmi:example:gamma_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zatz_wum",
+          "name": "gamma_fuddle",
           "request": {
-            "name": "zatz_yuzz",
+            "name": "gamma_humpf",
             "schema": "long",
             "@type": "dtmi:dtdl:class:CommandRequest;3"
           }
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandResponsePropertyCommentTermV3.json b/DTDL/v3/spec/Recommendation-ClassCommandResponsePropertyCommentTermV3.json
index 804909d1..3923a2f6 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandResponsePropertyCommentTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandResponsePropertyCommentTermV3.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_snee;1",
+        "@id": "dtmi:example:flunn_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_nuh",
+          "name": "flunn_iota",
           "response": {
-            "comment": "fuddle_fuddle",
-            "name": "fuddle_glikk",
-            "schema": "string"
+            "comment": "flunn_eta",
+            "name": "flunn_theta",
+            "schema": "dateTime"
           }
         }
       }
@@ -31,15 +31,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_floob;1",
+        "@id": "dtmi:example:flunn_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_spazz",
+          "name": "flunn_nu",
           "response": {
-            "dtmi:dtdl:property:comment;3": "fuddle_quan",
-            "name": "fuddle_thnad",
-            "schema": "time"
+            "dtmi:dtdl:property:comment;3": "flunn_lambda",
+            "name": "flunn_mu",
+            "schema": "double"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandResponsePropertyDescriptionTermV3.json b/DTDL/v3/spec/Recommendation-ClassCommandResponsePropertyDescriptionTermV3.json
index cac78727..ec373489 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandResponsePropertyDescriptionTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandResponsePropertyDescriptionTermV3.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_zeta;1",
+        "@id": "dtmi:example:yekk_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_epsilon",
+          "name": "yekk_wum",
           "response": {
             "description": [
-              "snee_gamma"
+              "yekk_omega"
             ],
-            "name": "snee_delta",
-            "schema": "boolean"
+            "name": "yekk_yuzz",
+            "schema": "duration"
           }
         }
       }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_kappa;1",
+        "@id": "dtmi:example:yekk_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_iota",
+          "name": "yekk_glikk",
           "response": {
             "dtmi:dtdl:property:description;3": [
-              "snee_eta"
+              "yekk_humpf"
             ],
-            "name": "snee_theta",
-            "schema": "date"
+            "name": "yekk_fuddle",
+            "schema": "float"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandResponsePropertyDisplayNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassCommandResponsePropertyDisplayNameTermV3.json
index bf2de74f..63c54181 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandResponsePropertyDisplayNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandResponsePropertyDisplayNameTermV3.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_psi;1",
+        "@id": "dtmi:example:alpha_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "thnad_chi",
+          "name": "hi_hi",
           "response": {
             "displayName": [
-              "thnad_upsilon"
+              "hi_yekk"
             ],
-            "name": "thnad_phi",
-            "schema": "dateTime"
+            "name": "hi_vroo",
+            "schema": "integer"
           }
         }
       }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_um;1",
+        "@id": "dtmi:example:alpha_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "thnad_wum",
+          "name": "alpha_delta",
           "response": {
             "dtmi:dtdl:property:displayName;3": [
-              "thnad_omega"
+              "alpha_beta"
             ],
-            "name": "thnad_yuzz",
-            "schema": "double"
+            "name": "alpha_gamma",
+            "schema": "long"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandResponsePropertyNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassCommandResponsePropertyNameTermV3.json
index b1a5cf75..2e38cf56 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandResponsePropertyNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandResponsePropertyNameTermV3.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_um;1",
+        "@id": "dtmi:example:upsilon_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_wum",
+          "name": "upsilon_fuddle",
           "response": {
-            "name": "lambda_yuzz",
+            "name": "upsilon_humpf",
             "schema": "time"
           }
         }
@@ -30,13 +30,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_glikk;1",
+        "@id": "dtmi:example:upsilon_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_fuddle",
+          "name": "upsilon_snee",
           "response": {
-            "dtmi:dtdl:property:name;3": "lambda_humpf",
+            "dtmi:dtdl:property:name;3": "upsilon_nuh",
             "schema": "boolean"
           }
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandResponsePropertySchemaPreferTermToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassCommandResponsePropertySchemaPreferTermToDtmiV3.json
index 02931867..0194ccd8 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandResponsePropertySchemaPreferTermToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandResponsePropertySchemaPreferTermToDtmiV3.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_jogg;1",
+        "@id": "dtmi:example:um_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_zatz",
+          "name": "um_eta",
           "response": {
-            "name": "rho_floob",
+            "name": "um_zeta",
             "schema": "float"
           }
         }
@@ -30,13 +30,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_yekk;1",
+        "@id": "dtmi:example:um_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_itch",
+          "name": "um_kappa",
           "response": {
-            "name": "rho_flunn",
+            "name": "um_iota",
             "schema": "dtmi:dtdl:instance:Schema:float;3"
           }
         }
@@ -52,13 +52,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_alpha;1",
+        "@id": "dtmi:example:um_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_hi",
+          "name": "um_nu",
           "response": {
-            "name": "rho_vroo",
+            "name": "um_mu",
             "schema": "point"
           }
         }
@@ -74,13 +74,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_delta;1",
+        "@id": "dtmi:example:um_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_gamma",
+          "name": "um_pi",
           "response": {
-            "name": "sigma_beta",
+            "name": "um_omicron",
             "schema": "dtmi:standard:schema:geospatial:point;3"
           }
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandResponsePropertySchemaTermV3.json b/DTDL/v3/spec/Recommendation-ClassCommandResponsePropertySchemaTermV3.json
index e17aa6ab..86a3e8f7 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandResponsePropertySchemaTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandResponsePropertySchemaTermV3.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_kappa;1",
+        "@id": "dtmi:example:um_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_iota",
+          "name": "um_chi",
           "response": {
-            "name": "sigma_theta",
-            "schema": "long"
+            "name": "um_phi",
+            "schema": "time"
           }
         }
       }
@@ -30,14 +30,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_nu;1",
+        "@id": "dtmi:example:um_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_mu",
+          "name": "um_yuzz",
           "response": {
-            "name": "sigma_lambda",
-            "dtmi:dtdl:property:schema;3": "string"
+            "name": "um_omega",
+            "dtmi:dtdl:property:schema;3": "boolean"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandResponseTypeDuplicatesMaterialV3.json b/DTDL/v3/spec/Recommendation-ClassCommandResponseTypeDuplicatesMaterialV3.json
index a2d8d5a8..6c824ab8 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandResponseTypeDuplicatesMaterialV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandResponseTypeDuplicatesMaterialV3.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_alpha;1",
+        "@id": "dtmi:example:nuh_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_hi",
+          "name": "nuh_phi",
           "response": {
-            "name": "phi_vroo",
-            "schema": "string",
+            "name": "nuh_upsilon",
+            "schema": "dateTime",
             "@type": [
               "CommandResponse",
               "CommandResponse"
@@ -34,14 +34,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_delta;1",
+        "@id": "dtmi:example:nuh_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_gamma",
+          "name": "nuh_omega",
           "response": {
-            "name": "chi_beta",
-            "schema": "time",
+            "name": "nuh_psi",
+            "schema": "double",
             "@type": [
               "dtmi:dtdl:class:CommandResponse;3",
               "dtmi:dtdl:class:CommandResponse;3"
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandResponseTypeIncludesTermAndDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassCommandResponseTypeIncludesTermAndDtmiV3.json
index 16d72d6a..7ee23312 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandResponseTypeIncludesTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandResponseTypeIncludesTermAndDtmiV3.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_yekk;1",
+        "@id": "dtmi:example:nuh_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_itch",
+          "name": "nuh_sigma",
           "response": {
-            "name": "phi_flunn",
-            "schema": "long",
+            "name": "nuh_rho",
+            "schema": "date",
             "@type": [
               "CommandResponse",
               "dtmi:dtdl:class:CommandResponse;3"
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandResponseTypePreferTermToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassCommandResponseTypePreferTermToDtmiV3.json
index c3dab413..8ffc621d 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandResponseTypePreferTermToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandResponseTypePreferTermToDtmiV3.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_eta;1",
+        "@id": "dtmi:example:nuh_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_zeta",
+          "name": "nuh_um",
           "response": {
-            "name": "chi_epsilon",
-            "schema": "boolean",
+            "name": "nuh_wum",
+            "schema": "duration",
             "@type": "CommandResponse"
           }
         }
@@ -31,14 +31,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_kappa;1",
+        "@id": "dtmi:example:nuh_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_iota",
+          "name": "nuh_glikk",
           "response": {
-            "name": "chi_theta",
-            "schema": "date",
+            "name": "nuh_fuddle",
+            "schema": "float",
             "@type": "dtmi:dtdl:class:CommandResponse;3"
           }
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandTypeDuplicatesMaterialV3.json b/DTDL/v3/spec/Recommendation-ClassCommandTypeDuplicatesMaterialV3.json
index b8d42b86..6c46608b 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandTypeDuplicatesMaterialV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandTypeDuplicatesMaterialV3.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_xi;1",
+        "@id": "dtmi:example:zeta_pi;1",
         "@type": "Interface",
         "contents": {
-          "name": "yekk_nu",
+          "name": "zeta_omicron",
           "@type": [
             "Command",
             "Command"
@@ -29,10 +29,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_pi;1",
+        "@id": "dtmi:example:zeta_sigma;1",
         "@type": "Interface",
         "contents": {
-          "name": "yekk_omicron",
+          "name": "zeta_rho",
           "@type": [
             "dtmi:dtdl:class:Command;3",
             "dtmi:dtdl:class:Command;3"
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandTypeIncludesTermAndDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassCommandTypeIncludesTermAndDtmiV3.json
index 711d1968..0605dad8 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandTypeIncludesTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandTypeIncludesTermAndDtmiV3.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_mu;1",
+        "@id": "dtmi:example:zeta_xi;1",
         "@type": "Interface",
         "contents": {
-          "name": "yekk_lambda",
+          "name": "zeta_nu",
           "@type": [
             "Command",
             "dtmi:dtdl:class:Command;3"
diff --git a/DTDL/v3/spec/Recommendation-ClassCommandTypePreferTermToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassCommandTypePreferTermToDtmiV3.json
index c6080679..e9963612 100644
--- a/DTDL/v3/spec/Recommendation-ClassCommandTypePreferTermToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassCommandTypePreferTermToDtmiV3.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_sigma;1",
+        "@id": "dtmi:example:zeta_upsilon;1",
         "@type": "Interface",
         "contents": {
-          "name": "yekk_rho",
+          "name": "zeta_tau",
           "@type": "Command"
         }
       }
@@ -26,10 +26,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_upsilon;1",
+        "@id": "dtmi:example:zeta_chi;1",
         "@type": "Interface",
         "contents": {
-          "name": "yekk_tau",
+          "name": "zeta_phi",
           "@type": "dtmi:dtdl:class:Command;3"
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassComponentPropertyCommentTermV3.json b/DTDL/v3/spec/Recommendation-ClassComponentPropertyCommentTermV3.json
index 7c6e228e..260c8b88 100644
--- a/DTDL/v3/spec/Recommendation-ClassComponentPropertyCommentTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassComponentPropertyCommentTermV3.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_eta;1",
+        "@id": "dtmi:example:chi_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "comment": "mu_delta",
-          "name": "mu_epsilon",
+          "comment": "phi_yekk",
+          "name": "phi_vroo",
           "schema": {
-            "@id": "dtmi:example:mu_zeta;1",
+            "@id": "dtmi:example:phi_hi;1",
             "@type": "Interface"
           }
         }
@@ -31,14 +31,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_lambda;1",
+        "@id": "dtmi:example:chi_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "dtmi:dtdl:property:comment;3": "mu_theta",
-          "name": "mu_iota",
+          "dtmi:dtdl:property:comment;3": "chi_beta",
+          "name": "chi_gamma",
           "schema": {
-            "@id": "dtmi:example:mu_kappa;1",
+            "@id": "dtmi:example:chi_delta;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassComponentPropertyDescriptionTermV3.json b/DTDL/v3/spec/Recommendation-ClassComponentPropertyDescriptionTermV3.json
index 79356ccf..862ac2bd 100644
--- a/DTDL/v3/spec/Recommendation-ClassComponentPropertyDescriptionTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassComponentPropertyDescriptionTermV3.json
@@ -8,16 +8,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_omega;1",
+        "@id": "dtmi:example:omega_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "description": [
-            "xi_phi"
+            "omega_omicron"
           ],
-          "name": "xi_chi",
+          "name": "omega_pi",
           "schema": {
-            "@id": "dtmi:example:xi_psi;1",
+            "@id": "dtmi:example:omega_rho;1",
             "@type": "Interface"
           }
         }
@@ -33,16 +33,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_humpf;1",
+        "@id": "dtmi:example:omega_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "dtmi:dtdl:property:description;3": [
-            "xi_yuzz"
+            "omega_tau"
           ],
-          "name": "xi_wum",
+          "name": "omega_upsilon",
           "schema": {
-            "@id": "dtmi:example:xi_um;1",
+            "@id": "dtmi:example:omega_phi;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassComponentPropertyDisplayNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassComponentPropertyDisplayNameTermV3.json
index 4bb8f25d..0413d165 100644
--- a/DTDL/v3/spec/Recommendation-ClassComponentPropertyDisplayNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassComponentPropertyDisplayNameTermV3.json
@@ -8,16 +8,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_yekk;1",
+        "@id": "dtmi:example:wum_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "displayName": [
-            "pi_jogg"
+            "wum_snee"
           ],
-          "name": "pi_flunn",
+          "name": "wum_quan",
           "schema": {
-            "@id": "dtmi:example:pi_itch;1",
+            "@id": "dtmi:example:wum_thnad;1",
             "@type": "Interface"
           }
         }
@@ -33,16 +33,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_beta;1",
+        "@id": "dtmi:example:wum_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "dtmi:dtdl:property:displayName;3": [
-            "pi_vroo"
+            "wum_floob"
           ],
-          "name": "pi_hi",
+          "name": "wum_zatz",
           "schema": {
-            "@id": "dtmi:example:rho_alpha;1",
+            "@id": "dtmi:example:wum_jogg;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassComponentPropertyNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassComponentPropertyNameTermV3.json
index 13cd0f1a..114d4cad 100644
--- a/DTDL/v3/spec/Recommendation-ClassComponentPropertyNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassComponentPropertyNameTermV3.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_lambda;1",
+        "@id": "dtmi:example:theta_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "vroo_iota",
+          "name": "theta_glikk",
           "schema": {
-            "@id": "dtmi:example:vroo_kappa;1",
+            "@id": "dtmi:example:theta_nuh;1",
             "@type": "Interface"
           }
         }
@@ -30,13 +30,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_xi;1",
+        "@id": "dtmi:example:theta_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "dtmi:dtdl:property:name;3": "vroo_mu",
+          "dtmi:dtdl:property:name;3": "theta_quan",
           "schema": {
-            "@id": "dtmi:example:vroo_nu;1",
+            "@id": "dtmi:example:theta_thnad;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassComponentPropertySchemaTermV3.json b/DTDL/v3/spec/Recommendation-ClassComponentPropertySchemaTermV3.json
index 771ed6d9..bb713dcd 100644
--- a/DTDL/v3/spec/Recommendation-ClassComponentPropertySchemaTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassComponentPropertySchemaTermV3.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_rho;1",
+        "@id": "dtmi:example:nu_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "gamma_omicron",
+          "name": "nu_alpha",
           "schema": {
-            "@id": "dtmi:example:gamma_pi;1",
+            "@id": "dtmi:example:nu_beta;1",
             "@type": "Interface"
           }
         }
@@ -30,13 +30,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_upsilon;1",
+        "@id": "dtmi:example:nu_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "gamma_sigma",
+          "name": "nu_delta",
           "dtmi:dtdl:property:schema;3": {
-            "@id": "dtmi:example:gamma_tau;1",
+            "@id": "dtmi:example:nu_epsilon;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassComponentTypeDuplicatesMaterialV3.json b/DTDL/v3/spec/Recommendation-ClassComponentTypeDuplicatesMaterialV3.json
index 74483f7a..7b4f5917 100644
--- a/DTDL/v3/spec/Recommendation-ClassComponentTypeDuplicatesMaterialV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassComponentTypeDuplicatesMaterialV3.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_fuddle;1",
+        "@id": "dtmi:example:epsilon_eta;1",
         "@type": "Interface",
         "contents": {
-          "name": "jogg_um",
+          "name": "epsilon_epsilon",
           "schema": {
-            "@id": "dtmi:example:jogg_humpf;1",
+            "@id": "dtmi:example:epsilon_zeta;1",
             "@type": "Interface"
           },
           "@type": [
@@ -33,12 +33,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_snee;1",
+        "@id": "dtmi:example:epsilon_kappa;1",
         "@type": "Interface",
         "contents": {
-          "name": "jogg_glikk",
+          "name": "epsilon_theta",
           "schema": {
-            "@id": "dtmi:example:jogg_nuh;1",
+            "@id": "dtmi:example:epsilon_iota;1",
             "@type": "Interface"
           },
           "@type": [
diff --git a/DTDL/v3/spec/Recommendation-ClassComponentTypeIncludesTermAndDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassComponentTypeIncludesTermAndDtmiV3.json
index 0ab8e3de..0289e347 100644
--- a/DTDL/v3/spec/Recommendation-ClassComponentTypeIncludesTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassComponentTypeIncludesTermAndDtmiV3.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_wum;1",
+        "@id": "dtmi:example:epsilon_delta;1",
         "@type": "Interface",
         "contents": {
-          "name": "jogg_omega",
+          "name": "epsilon_beta",
           "schema": {
-            "@id": "dtmi:example:jogg_yuzz;1",
+            "@id": "dtmi:example:epsilon_gamma;1",
             "@type": "Interface"
           },
           "@type": [
diff --git a/DTDL/v3/spec/Recommendation-ClassComponentTypePreferTermToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassComponentTypePreferTermToDtmiV3.json
index ab6b3eac..eb4a28ac 100644
--- a/DTDL/v3/spec/Recommendation-ClassComponentTypePreferTermToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassComponentTypePreferTermToDtmiV3.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_spazz;1",
+        "@id": "dtmi:example:epsilon_nu;1",
         "@type": "Interface",
         "contents": {
-          "name": "jogg_quan",
+          "name": "epsilon_lambda",
           "schema": {
-            "@id": "dtmi:example:jogg_thnad;1",
+            "@id": "dtmi:example:epsilon_mu;1",
             "@type": "Interface"
           },
           "@type": "Component"
@@ -30,12 +30,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_jogg;1",
+        "@id": "dtmi:example:epsilon_pi;1",
         "@type": "Interface",
         "contents": {
-          "name": "jogg_floob",
+          "name": "epsilon_xi",
           "schema": {
-            "@id": "dtmi:example:jogg_zatz;1",
+            "@id": "dtmi:example:epsilon_omicron;1",
             "@type": "Interface"
           },
           "@type": "dtmi:dtdl:class:Component;3"
diff --git a/DTDL/v3/spec/Recommendation-ClassEnumPropertyCommentTermV3.json b/DTDL/v3/spec/Recommendation-ClassEnumPropertyCommentTermV3.json
index e57f4d69..27ac9bf2 100644
--- a/DTDL/v3/spec/Recommendation-ClassEnumPropertyCommentTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassEnumPropertyCommentTermV3.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_zeta;1",
+        "@id": "dtmi:example:itch_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_delta;1",
+          "@id": "dtmi:example:itch_beta;1",
           "@type": "Enum",
-          "comment": "glikk_epsilon",
+          "comment": "itch_gamma",
           "valueSchema": "integer"
         }
       }
@@ -28,12 +28,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_iota;1",
+        "@id": "dtmi:example:itch_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_eta;1",
+          "@id": "dtmi:example:itch_epsilon;1",
           "@type": "Enum",
-          "dtmi:dtdl:property:comment;3": "glikk_theta",
+          "dtmi:dtdl:property:comment;3": "itch_zeta",
           "valueSchema": "integer"
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassEnumPropertyDescriptionTermV3.json b/DTDL/v3/spec/Recommendation-ClassEnumPropertyDescriptionTermV3.json
index 38f213fd..20929f1c 100644
--- a/DTDL/v3/spec/Recommendation-ClassEnumPropertyDescriptionTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassEnumPropertyDescriptionTermV3.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_thnad;1",
+        "@id": "dtmi:example:yekk_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_snee;1",
+          "@id": "dtmi:example:yekk_glikk;1",
           "@type": "Enum",
           "description": [
-            "nuh_quan"
+            "yekk_nuh"
           ],
           "valueSchema": "integer"
         }
@@ -30,13 +30,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_zatz;1",
+        "@id": "dtmi:example:yekk_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_spazz;1",
+          "@id": "dtmi:example:yekk_quan;1",
           "@type": "Enum",
           "dtmi:dtdl:property:description;3": [
-            "nuh_floob"
+            "yekk_thnad"
           ],
           "valueSchema": "integer"
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassEnumPropertyDisplayNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassEnumPropertyDisplayNameTermV3.json
index fc14e877..e5ffcb1d 100644
--- a/DTDL/v3/spec/Recommendation-ClassEnumPropertyDisplayNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassEnumPropertyDisplayNameTermV3.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_tau;1",
+        "@id": "dtmi:example:hi_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_rho;1",
+          "@id": "dtmi:example:hi_omicron;1",
           "@type": "Enum",
           "displayName": [
-            "quan_sigma"
+            "hi_pi"
           ],
           "valueSchema": "integer"
         }
@@ -30,13 +30,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_chi;1",
+        "@id": "dtmi:example:hi_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_upsilon;1",
+          "@id": "dtmi:example:hi_sigma;1",
           "@type": "Enum",
           "dtmi:dtdl:property:displayName;3": [
-            "quan_phi"
+            "hi_tau"
           ],
           "valueSchema": "integer"
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassEnumPropertyEnumValuesTermV3.json b/DTDL/v3/spec/Recommendation-ClassEnumPropertyEnumValuesTermV3.json
index cd3ba433..bcfee13d 100644
--- a/DTDL/v3/spec/Recommendation-ClassEnumPropertyEnumValuesTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassEnumPropertyEnumValuesTermV3.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_upsilon;1",
+        "@id": "dtmi:example:delta_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_sigma;1",
+          "@id": "dtmi:example:delta_omega;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 1129,
-              "name": "zatz_tau"
+              "enumValue": 1144,
+              "name": "delta_yuzz"
             }
           ],
           "valueSchema": "integer"
@@ -33,15 +33,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_psi;1",
+        "@id": "dtmi:example:delta_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_phi;1",
+          "@id": "dtmi:example:delta_um;1",
           "@type": "Enum",
           "dtmi:dtdl:property:enumValues;3": [
             {
-              "enumValue": 1130,
-              "name": "zatz_chi"
+              "enumValue": 1145,
+              "name": "delta_humpf"
             }
           ],
           "valueSchema": "integer"
diff --git a/DTDL/v3/spec/Recommendation-ClassEnumPropertyValueSchemaTermV3.json b/DTDL/v3/spec/Recommendation-ClassEnumPropertyValueSchemaTermV3.json
index e527bdfd..fb33eba0 100644
--- a/DTDL/v3/spec/Recommendation-ClassEnumPropertyValueSchemaTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassEnumPropertyValueSchemaTermV3.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_vroo;1",
+        "@id": "dtmi:example:spazz_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_yekk;1",
+          "@id": "dtmi:example:spazz_spazz;1",
           "@type": "Enum",
           "valueSchema": "integer"
         }
@@ -27,10 +27,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_alpha;1",
+        "@id": "dtmi:example:spazz_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_hi;1",
+          "@id": "dtmi:example:spazz_zatz;1",
           "@type": "Enum",
           "dtmi:dtdl:property:valueSchema;3": "integer"
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassEnumPropertyValueSchemaValueIntegerPreferToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassEnumPropertyValueSchemaValueIntegerPreferToDtmiV3.json
index 625d22e9..c36666e5 100644
--- a/DTDL/v3/spec/Recommendation-ClassEnumPropertyValueSchemaValueIntegerPreferToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassEnumPropertyValueSchemaValueIntegerPreferToDtmiV3.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_fuddle;1",
+        "@id": "dtmi:example:spazz_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_humpf;1",
+          "@id": "dtmi:example:spazz_chi;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "yuzz_um",
+            "name": "spazz_phi",
             "enumValue": 10
           },
           "valueSchema": "integer"
@@ -31,13 +31,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_snee;1",
+        "@id": "dtmi:example:spazz_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_nuh;1",
+          "@id": "dtmi:example:spazz_yuzz;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "yuzz_glikk",
+            "name": "spazz_omega",
             "enumValue": 10
           },
           "valueSchema": "dtmi:dtdl:instance:Schema:integer;3"
diff --git a/DTDL/v3/spec/Recommendation-ClassEnumPropertyValueSchemaValueStringPreferToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassEnumPropertyValueSchemaValueStringPreferToDtmiV3.json
index 9b0e8696..0a199665 100644
--- a/DTDL/v3/spec/Recommendation-ClassEnumPropertyValueSchemaValueStringPreferToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassEnumPropertyValueSchemaValueStringPreferToDtmiV3.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_spazz;1",
+        "@id": "dtmi:example:spazz_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_thnad;1",
+          "@id": "dtmi:example:spazz_humpf;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "yuzz_quan",
-            "enumValue": "beta_jogg"
+            "name": "spazz_um",
+            "enumValue": "beta_hi"
           },
           "valueSchema": "string"
         }
@@ -31,14 +31,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_jogg;1",
+        "@id": "dtmi:example:spazz_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_zatz;1",
+          "@id": "dtmi:example:spazz_nuh;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "yuzz_floob",
-            "enumValue": "beta_jogg"
+            "name": "spazz_glikk",
+            "enumValue": "beta_hi"
           },
           "valueSchema": "dtmi:dtdl:instance:Schema:string;3"
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassEnumTypeDuplicatesMaterialV3.json b/DTDL/v3/spec/Recommendation-ClassEnumTypeDuplicatesMaterialV3.json
index c20b4af5..c46b2f0d 100644
--- a/DTDL/v3/spec/Recommendation-ClassEnumTypeDuplicatesMaterialV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassEnumTypeDuplicatesMaterialV3.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_omicron;1",
+        "@id": "dtmi:example:glikk_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_xi;1",
+          "@id": "dtmi:example:glikk_theta;1",
           "valueSchema": "integer",
           "@type": [
             "Enum",
@@ -30,10 +30,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_rho;1",
+        "@id": "dtmi:example:glikk_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_pi;1",
+          "@id": "dtmi:example:glikk_kappa;1",
           "valueSchema": "integer",
           "@type": [
             "dtmi:dtdl:class:Enum;3",
diff --git a/DTDL/v3/spec/Recommendation-ClassEnumTypeIncludesTermAndDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassEnumTypeIncludesTermAndDtmiV3.json
index a6e7e563..75ea6523 100644
--- a/DTDL/v3/spec/Recommendation-ClassEnumTypeIncludesTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassEnumTypeIncludesTermAndDtmiV3.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_nu;1",
+        "@id": "dtmi:example:glikk_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_mu;1",
+          "@id": "dtmi:example:glikk_zeta;1",
           "valueSchema": "integer",
           "@type": [
             "Enum",
diff --git a/DTDL/v3/spec/Recommendation-ClassEnumTypePreferTermToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassEnumTypePreferTermToDtmiV3.json
index 21fa51fc..0665889b 100644
--- a/DTDL/v3/spec/Recommendation-ClassEnumTypePreferTermToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassEnumTypePreferTermToDtmiV3.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_tau;1",
+        "@id": "dtmi:example:glikk_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_sigma;1",
+          "@id": "dtmi:example:glikk_mu;1",
           "valueSchema": "integer",
           "@type": "Enum"
         }
@@ -27,10 +27,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_phi;1",
+        "@id": "dtmi:example:glikk_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_upsilon;1",
+          "@id": "dtmi:example:glikk_xi;1",
           "valueSchema": "integer",
           "@type": "dtmi:dtdl:class:Enum;3"
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassEnumValuePropertyCommentTermV3.json b/DTDL/v3/spec/Recommendation-ClassEnumValuePropertyCommentTermV3.json
index 5c40e88a..1b06f8e5 100644
--- a/DTDL/v3/spec/Recommendation-ClassEnumValuePropertyCommentTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassEnumValuePropertyCommentTermV3.json
@@ -8,16 +8,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_floob;1",
+        "@id": "dtmi:example:omega_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_spazz;1",
+          "@id": "dtmi:example:omega_delta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "comment": "nu_quan",
-            "enumValue": 1360,
-            "name": "nu_thnad"
+            "comment": "omega_beta",
+            "enumValue": 1377,
+            "name": "omega_gamma"
           }
         }
       }
@@ -32,16 +32,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_itch;1",
+        "@id": "dtmi:example:omega_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_flunn;1",
+          "@id": "dtmi:example:omega_theta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "dtmi:dtdl:property:comment;3": "nu_zatz",
-            "enumValue": 1361,
-            "name": "nu_jogg"
+            "dtmi:dtdl:property:comment;3": "omega_zeta",
+            "enumValue": 1378,
+            "name": "omega_eta"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassEnumValuePropertyDescriptionTermV3.json b/DTDL/v3/spec/Recommendation-ClassEnumValuePropertyDescriptionTermV3.json
index 63a015b2..683de342 100644
--- a/DTDL/v3/spec/Recommendation-ClassEnumValuePropertyDescriptionTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassEnumValuePropertyDescriptionTermV3.json
@@ -8,18 +8,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_kappa;1",
+        "@id": "dtmi:example:wum_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_iota;1",
+          "@id": "dtmi:example:wum_phi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "description": [
-              "pi_eta"
+              "wum_tau"
             ],
-            "enumValue": 1392,
-            "name": "pi_theta"
+            "enumValue": 1409,
+            "name": "wum_upsilon"
           }
         }
       }
@@ -34,18 +34,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_xi;1",
+        "@id": "dtmi:example:wum_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_nu;1",
+          "@id": "dtmi:example:wum_yuzz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "dtmi:dtdl:property:description;3": [
-              "pi_lambda"
+              "wum_psi"
             ],
-            "enumValue": 1393,
-            "name": "pi_mu"
+            "enumValue": 1410,
+            "name": "wum_omega"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassEnumValuePropertyDisplayNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassEnumValuePropertyDisplayNameTermV3.json
index 7098c42d..7d744119 100644
--- a/DTDL/v3/spec/Recommendation-ClassEnumValuePropertyDisplayNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassEnumValuePropertyDisplayNameTermV3.json
@@ -8,18 +8,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_um;1",
+        "@id": "dtmi:example:humpf_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_wum;1",
+          "@id": "dtmi:example:humpf_jogg;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "displayName": [
-              "sigma_omega"
+              "humpf_floob"
             ],
-            "enumValue": 1424,
-            "name": "sigma_yuzz"
+            "enumValue": 1441,
+            "name": "humpf_zatz"
           }
         }
       }
@@ -34,18 +34,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_nuh;1",
+        "@id": "dtmi:example:humpf_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_glikk;1",
+          "@id": "dtmi:example:humpf_vroo;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "dtmi:dtdl:property:displayName;3": [
-              "sigma_humpf"
+              "humpf_itch"
             ],
-            "enumValue": 1425,
-            "name": "sigma_fuddle"
+            "enumValue": 1442,
+            "name": "humpf_yekk"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassEnumValuePropertyEnumValueTermV3.json b/DTDL/v3/spec/Recommendation-ClassEnumValuePropertyEnumValueTermV3.json
index ff39b7c4..3d7e4319 100644
--- a/DTDL/v3/spec/Recommendation-ClassEnumValuePropertyEnumValueTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassEnumValuePropertyEnumValueTermV3.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_floob;1",
+        "@id": "dtmi:example:iota_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_spazz;1",
+          "@id": "dtmi:example:iota_yekk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1138,
-            "name": "vroo_thnad"
+            "enumValue": 1153,
+            "name": "iota_itch"
           }
         }
       }
@@ -31,15 +31,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_flunn;1",
+        "@id": "dtmi:example:kappa_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_jogg;1",
+          "@id": "dtmi:example:kappa_alpha;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "dtmi:dtdl:property:enumValue;3": 1139,
-            "name": "vroo_zatz"
+            "dtmi:dtdl:property:enumValue;3": 1154,
+            "name": "iota_hi"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassEnumValuePropertyNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassEnumValuePropertyNameTermV3.json
index ece82a62..7762c329 100644
--- a/DTDL/v3/spec/Recommendation-ClassEnumValuePropertyNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassEnumValuePropertyNameTermV3.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_humpf;1",
+        "@id": "dtmi:example:mu_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_um;1",
+          "@id": "dtmi:example:mu_quan;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1201,
-            "name": "beta_wum"
+            "enumValue": 1216,
+            "name": "mu_snee"
           }
         }
       }
@@ -31,15 +31,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_nuh;1",
+        "@id": "dtmi:example:mu_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_glikk;1",
+          "@id": "dtmi:example:mu_floob;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1202,
-            "dtmi:dtdl:property:name;3": "beta_fuddle"
+            "enumValue": 1217,
+            "dtmi:dtdl:property:name;3": "mu_spazz"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassEnumValueTypeDuplicatesMaterialV3.json b/DTDL/v3/spec/Recommendation-ClassEnumValueTypeDuplicatesMaterialV3.json
index 88614083..53db5e7e 100644
--- a/DTDL/v3/spec/Recommendation-ClassEnumValueTypeDuplicatesMaterialV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassEnumValueTypeDuplicatesMaterialV3.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_epsilon;1",
+        "@id": "dtmi:example:pi_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_delta;1",
+          "@id": "dtmi:example:pi_pi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1250,
-            "name": "zeta_gamma",
+            "enumValue": 1267,
+            "name": "pi_omicron",
             "@type": [
               "EnumValue",
               "EnumValue"
@@ -35,15 +35,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_theta;1",
+        "@id": "dtmi:example:pi_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_eta;1",
+          "@id": "dtmi:example:pi_tau;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1251,
-            "name": "zeta_zeta",
+            "enumValue": 1268,
+            "name": "pi_sigma",
             "@type": [
               "dtmi:dtdl:class:EnumValue;3",
               "dtmi:dtdl:class:EnumValue;3"
diff --git a/DTDL/v3/spec/Recommendation-ClassEnumValueTypeIncludesTermAndDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassEnumValueTypeIncludesTermAndDtmiV3.json
index c459ada5..ddf9e0de 100644
--- a/DTDL/v3/spec/Recommendation-ClassEnumValueTypeIncludesTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassEnumValueTypeIncludesTermAndDtmiV3.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_beta;1",
+        "@id": "dtmi:example:pi_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_alpha;1",
+          "@id": "dtmi:example:pi_nu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1249,
-            "name": "epsilon_hi",
+            "enumValue": 1266,
+            "name": "pi_mu",
             "@type": [
               "EnumValue",
               "dtmi:dtdl:class:EnumValue;3"
diff --git a/DTDL/v3/spec/Recommendation-ClassEnumValueTypePreferTermToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassEnumValueTypePreferTermToDtmiV3.json
index 4d203631..5547350f 100644
--- a/DTDL/v3/spec/Recommendation-ClassEnumValueTypePreferTermToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassEnumValueTypePreferTermToDtmiV3.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_lambda;1",
+        "@id": "dtmi:example:pi_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_kappa;1",
+          "@id": "dtmi:example:pi_chi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1252,
-            "name": "zeta_iota",
+            "enumValue": 1269,
+            "name": "pi_phi",
             "@type": "EnumValue"
           }
         }
@@ -32,15 +32,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_xi;1",
+        "@id": "dtmi:example:pi_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_nu;1",
+          "@id": "dtmi:example:pi_yuzz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1253,
-            "name": "zeta_mu",
+            "enumValue": 1270,
+            "name": "pi_omega",
             "@type": "dtmi:dtdl:class:EnumValue;3"
           }
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassFieldPropertyCommentTermV3.json b/DTDL/v3/spec/Recommendation-ClassFieldPropertyCommentTermV3.json
index cf480068..2b1427c4 100644
--- a/DTDL/v3/spec/Recommendation-ClassFieldPropertyCommentTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassFieldPropertyCommentTermV3.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_delta;1",
+        "@id": "dtmi:example:theta_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_gamma;1",
+          "@id": "dtmi:example:theta_fuddle;1",
           "@type": "Object",
           "fields": {
-            "comment": "yekk_alpha",
-            "name": "yekk_beta",
-            "schema": "boolean"
+            "comment": "theta_um",
+            "name": "theta_humpf",
+            "schema": "string"
           }
         }
       }
@@ -31,15 +31,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_theta;1",
+        "@id": "dtmi:example:theta_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_eta;1",
+          "@id": "dtmi:example:theta_quan;1",
           "@type": "Object",
           "fields": {
-            "dtmi:dtdl:property:comment;3": "yekk_epsilon",
-            "name": "yekk_zeta",
-            "schema": "date"
+            "dtmi:dtdl:property:comment;3": "theta_nuh",
+            "name": "theta_snee",
+            "schema": "time"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassFieldPropertyDescriptionTermV3.json b/DTDL/v3/spec/Recommendation-ClassFieldPropertyDescriptionTermV3.json
index 4f17bc7c..c5a2d6fd 100644
--- a/DTDL/v3/spec/Recommendation-ClassFieldPropertyDescriptionTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassFieldPropertyDescriptionTermV3.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_phi;1",
+        "@id": "dtmi:example:lambda_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_upsilon;1",
+          "@id": "dtmi:example:lambda_gamma;1",
           "@type": "Object",
           "fields": {
             "description": [
-              "hi_sigma"
+              "lambda_alpha"
             ],
-            "name": "hi_tau",
-            "schema": "dateTime"
+            "name": "lambda_beta",
+            "schema": "boolean"
           }
         }
       }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_yuzz;1",
+        "@id": "dtmi:example:lambda_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_omega;1",
+          "@id": "dtmi:example:lambda_eta;1",
           "@type": "Object",
           "fields": {
             "dtmi:dtdl:property:description;3": [
-              "hi_chi"
+              "lambda_epsilon"
             ],
-            "name": "hi_psi",
-            "schema": "double"
+            "name": "lambda_zeta",
+            "schema": "date"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassFieldPropertyDisplayNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassFieldPropertyDisplayNameTermV3.json
index 81cea406..d12f8eb3 100644
--- a/DTDL/v3/spec/Recommendation-ClassFieldPropertyDisplayNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassFieldPropertyDisplayNameTermV3.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_jogg;1",
+        "@id": "dtmi:example:nu_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_zatz;1",
+          "@id": "dtmi:example:nu_upsilon;1",
           "@type": "Object",
           "fields": {
             "displayName": [
-              "beta_spazz"
+              "nu_sigma"
             ],
-            "name": "beta_floob",
-            "schema": "duration"
+            "name": "nu_tau",
+            "schema": "dateTime"
           }
         }
       }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_vroo;1",
+        "@id": "dtmi:example:nu_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_yekk;1",
+          "@id": "dtmi:example:nu_omega;1",
           "@type": "Object",
           "fields": {
             "dtmi:dtdl:property:displayName;3": [
-              "beta_flunn"
+              "nu_chi"
             ],
-            "name": "beta_itch",
-            "schema": "float"
+            "name": "nu_psi",
+            "schema": "double"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassFieldPropertyNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassFieldPropertyNameTermV3.json
index 185e455d..41a0073c 100644
--- a/DTDL/v3/spec/Recommendation-ClassFieldPropertyNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassFieldPropertyNameTermV3.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_upsilon;1",
+        "@id": "dtmi:example:quan_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_tau;1",
+          "@id": "dtmi:example:quan_nuh;1",
           "@type": "Object",
           "fields": {
-            "name": "psi_sigma",
-            "schema": "date"
+            "name": "quan_glikk",
+            "schema": "float"
           }
         }
       }
@@ -30,14 +30,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_psi;1",
+        "@id": "dtmi:example:quan_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_chi;1",
+          "@id": "dtmi:example:quan_thnad;1",
           "@type": "Object",
           "fields": {
-            "dtmi:dtdl:property:name;3": "psi_phi",
-            "schema": "dateTime"
+            "dtmi:dtdl:property:name;3": "quan_quan",
+            "schema": "integer"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassFieldPropertySchemaPreferTermToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassFieldPropertySchemaPreferTermToDtmiV3.json
index 4ffac39b..3c15f23f 100644
--- a/DTDL/v3/spec/Recommendation-ClassFieldPropertySchemaPreferTermToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassFieldPropertySchemaPreferTermToDtmiV3.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_wum;1",
+        "@id": "dtmi:example:itch_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_yuzz;1",
+          "@id": "dtmi:example:itch_beta;1",
           "@type": "Object",
           "fields": {
-            "name": "fuddle_omega",
+            "name": "itch_alpha",
             "schema": "long"
           }
         }
@@ -30,13 +30,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_fuddle;1",
+        "@id": "dtmi:example:itch_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_humpf;1",
+          "@id": "dtmi:example:itch_epsilon;1",
           "@type": "Object",
           "fields": {
-            "name": "fuddle_um",
+            "name": "itch_delta",
             "schema": "dtmi:dtdl:instance:Schema:long;3"
           }
         }
@@ -52,13 +52,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_snee;1",
+        "@id": "dtmi:example:itch_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_nuh;1",
+          "@id": "dtmi:example:itch_theta;1",
           "@type": "Object",
           "fields": {
-            "name": "fuddle_glikk",
+            "name": "itch_eta",
             "schema": "point"
           }
         }
@@ -74,13 +74,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_spazz;1",
+        "@id": "dtmi:example:itch_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_thnad;1",
+          "@id": "dtmi:example:itch_lambda;1",
           "@type": "Object",
           "fields": {
-            "name": "fuddle_quan",
+            "name": "itch_kappa",
             "schema": "dtmi:standard:schema:geospatial:point;3"
           }
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassFieldPropertySchemaTermV3.json b/DTDL/v3/spec/Recommendation-ClassFieldPropertySchemaTermV3.json
index 4e1cdd95..6387d6dd 100644
--- a/DTDL/v3/spec/Recommendation-ClassFieldPropertySchemaTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassFieldPropertySchemaTermV3.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_yekk;1",
+        "@id": "dtmi:example:itch_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_itch;1",
+          "@id": "dtmi:example:itch_rho;1",
           "@type": "Object",
           "fields": {
-            "name": "fuddle_flunn",
-            "schema": "time"
+            "name": "itch_pi",
+            "schema": "float"
           }
         }
       }
@@ -30,14 +30,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_alpha;1",
+        "@id": "dtmi:example:itch_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_hi;1",
+          "@id": "dtmi:example:itch_upsilon;1",
           "@type": "Object",
           "fields": {
-            "name": "fuddle_vroo",
-            "dtmi:dtdl:property:schema;3": "boolean"
+            "name": "itch_tau",
+            "dtmi:dtdl:property:schema;3": "integer"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassFieldTypeDuplicatesMaterialV3.json b/DTDL/v3/spec/Recommendation-ClassFieldTypeDuplicatesMaterialV3.json
index 950fdf6e..22f91d39 100644
--- a/DTDL/v3/spec/Recommendation-ClassFieldTypeDuplicatesMaterialV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassFieldTypeDuplicatesMaterialV3.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_pi;1",
+        "@id": "dtmi:example:hi_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_omicron;1",
+          "@id": "dtmi:example:hi_yekk;1",
           "@type": "Object",
           "fields": {
-            "name": "quan_xi",
-            "schema": "boolean",
+            "name": "hi_itch",
+            "schema": "string",
             "@type": [
               "Field",
               "Field"
@@ -34,14 +34,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_tau;1",
+        "@id": "dtmi:example:alpha_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_sigma;1",
+          "@id": "dtmi:example:alpha_alpha;1",
           "@type": "Object",
           "fields": {
-            "name": "quan_rho",
-            "schema": "date",
+            "name": "hi_hi",
+            "schema": "time",
             "@type": [
               "dtmi:dtdl:class:Field;3",
               "dtmi:dtdl:class:Field;3"
diff --git a/DTDL/v3/spec/Recommendation-ClassFieldTypeIncludesTermAndDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassFieldTypeIncludesTermAndDtmiV3.json
index bd296a8c..0c7af4fc 100644
--- a/DTDL/v3/spec/Recommendation-ClassFieldTypeIncludesTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassFieldTypeIncludesTermAndDtmiV3.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_nu;1",
+        "@id": "dtmi:example:hi_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_mu;1",
+          "@id": "dtmi:example:hi_jogg;1",
           "@type": "Object",
           "fields": {
-            "name": "quan_lambda",
-            "schema": "time",
+            "name": "hi_zatz",
+            "schema": "long",
             "@type": [
               "Field",
               "dtmi:dtdl:class:Field;3"
diff --git a/DTDL/v3/spec/Recommendation-ClassFieldTypePreferTermToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassFieldTypePreferTermToDtmiV3.json
index 86734c59..d61bde78 100644
--- a/DTDL/v3/spec/Recommendation-ClassFieldTypePreferTermToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassFieldTypePreferTermToDtmiV3.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_chi;1",
+        "@id": "dtmi:example:alpha_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_phi;1",
+          "@id": "dtmi:example:alpha_delta;1",
           "@type": "Object",
           "fields": {
-            "name": "quan_upsilon",
-            "schema": "dateTime",
+            "name": "alpha_gamma",
+            "schema": "boolean",
             "@type": "Field"
           }
         }
@@ -31,14 +31,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_yuzz;1",
+        "@id": "dtmi:example:alpha_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_omega;1",
+          "@id": "dtmi:example:alpha_eta;1",
           "@type": "Object",
           "fields": {
-            "name": "quan_psi",
-            "schema": "double",
+            "name": "alpha_zeta",
+            "schema": "date",
             "@type": "dtmi:dtdl:class:Field;3"
           }
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassInterfacePropertyCommentTermV3.json b/DTDL/v3/spec/Recommendation-ClassInterfacePropertyCommentTermV3.json
index 3f7c5c8c..4f644442 100644
--- a/DTDL/v3/spec/Recommendation-ClassInterfacePropertyCommentTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassInterfacePropertyCommentTermV3.json
@@ -8,9 +8,9 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_yuzz;1",
+        "@id": "dtmi:example:sigma_mu;1",
         "@type": "Interface",
-        "comment": "eta_wum"
+        "comment": "sigma_nu"
       }
     ]
   },
@@ -23,9 +23,9 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_um;1",
+        "@id": "dtmi:example:sigma_xi;1",
         "@type": "Interface",
-        "dtmi:dtdl:property:comment;3": "eta_humpf"
+        "dtmi:dtdl:property:comment;3": "sigma_omicron"
       }
     ]
   }
diff --git a/DTDL/v3/spec/Recommendation-ClassInterfacePropertyContentsTermV3.json b/DTDL/v3/spec/Recommendation-ClassInterfacePropertyContentsTermV3.json
index 24c3b16a..37692eb4 100644
--- a/DTDL/v3/spec/Recommendation-ClassInterfacePropertyContentsTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassInterfacePropertyContentsTermV3.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_iota;1",
+        "@id": "dtmi:example:phi_delta;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Command",
-            "name": "kappa_kappa"
+            "name": "phi_epsilon"
           }
         ]
       }
@@ -28,12 +28,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_lambda;1",
+        "@id": "dtmi:example:phi_zeta;1",
         "@type": "Interface",
         "dtmi:dtdl:property:contents;3": [
           {
             "@type": "Command",
-            "name": "kappa_mu"
+            "name": "phi_eta"
           }
         ]
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassInterfacePropertyDescriptionTermV3.json b/DTDL/v3/spec/Recommendation-ClassInterfacePropertyDescriptionTermV3.json
index f13fcbe9..562d6c98 100644
--- a/DTDL/v3/spec/Recommendation-ClassInterfacePropertyDescriptionTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassInterfacePropertyDescriptionTermV3.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_epsilon;1",
+        "@id": "dtmi:example:phi_hi;1",
         "@type": "Interface",
         "description": [
-          "lambda_zeta"
+          "chi_alpha"
         ]
       }
     ]
@@ -25,10 +25,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_eta;1",
+        "@id": "dtmi:example:chi_beta;1",
         "@type": "Interface",
         "dtmi:dtdl:property:description;3": [
-          "lambda_theta"
+          "chi_gamma"
         ]
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassInterfacePropertyDisplayNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassInterfacePropertyDisplayNameTermV3.json
index 4802866a..64a38b17 100644
--- a/DTDL/v3/spec/Recommendation-ClassInterfacePropertyDisplayNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassInterfacePropertyDisplayNameTermV3.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_alpha;1",
+        "@id": "dtmi:example:chi_flunn;1",
         "@type": "Interface",
         "displayName": [
-          "mu_beta"
+          "chi_itch"
         ]
       }
     ]
@@ -25,10 +25,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_gamma;1",
+        "@id": "dtmi:example:chi_yekk;1",
         "@type": "Interface",
         "dtmi:dtdl:property:displayName;3": [
-          "mu_delta"
+          "chi_vroo"
         ]
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassInterfacePropertyExtendsTermV3.json b/DTDL/v3/spec/Recommendation-ClassInterfacePropertyExtendsTermV3.json
index 949143d9..b410cf80 100644
--- a/DTDL/v3/spec/Recommendation-ClassInterfacePropertyExtendsTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassInterfacePropertyExtendsTermV3.json
@@ -8,11 +8,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_itch;1",
+        "@id": "dtmi:example:yuzz_yekk;1",
         "@type": "Interface",
         "extends": [
           {
-            "@id": "dtmi:example:xi_yekk;1",
+            "@id": "dtmi:example:yuzz_vroo;1",
             "@type": "Interface"
           }
         ]
@@ -28,11 +28,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_vroo;1",
+        "@id": "dtmi:example:yuzz_hi;1",
         "@type": "Interface",
         "dtmi:dtdl:property:extends;3": [
           {
-            "@id": "dtmi:example:xi_hi;1",
+            "@id": "dtmi:example:wum_alpha;1",
             "@type": "Interface"
           }
         ]
diff --git a/DTDL/v3/spec/Recommendation-ClassInterfacePropertySchemasTermV3.json b/DTDL/v3/spec/Recommendation-ClassInterfacePropertySchemasTermV3.json
index 524ef771..d9a2a965 100644
--- a/DTDL/v3/spec/Recommendation-ClassInterfacePropertySchemasTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassInterfacePropertySchemasTermV3.json
@@ -8,11 +8,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_um;1",
+        "@id": "dtmi:example:humpf_thnad;1",
         "@type": "Interface",
         "schemas": [
           {
-            "@id": "dtmi:example:rho_humpf;1",
+            "@id": "dtmi:example:humpf_spazz;1",
             "@type": "Array",
             "elementSchema": "dateTime"
           }
@@ -29,11 +29,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_fuddle;1",
+        "@id": "dtmi:example:humpf_floob;1",
         "@type": "Interface",
         "dtmi:dtdl:property:schemas;3": [
           {
-            "@id": "dtmi:example:rho_glikk;1",
+            "@id": "dtmi:example:humpf_zatz;1",
             "@type": "Array",
             "elementSchema": "double"
           }
diff --git a/DTDL/v3/spec/Recommendation-ClassInterfaceTypeDuplicatesMaterialV3.json b/DTDL/v3/spec/Recommendation-ClassInterfaceTypeDuplicatesMaterialV3.json
index 95800f27..3290bc42 100644
--- a/DTDL/v3/spec/Recommendation-ClassInterfaceTypeDuplicatesMaterialV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassInterfaceTypeDuplicatesMaterialV3.json
@@ -8,7 +8,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_yuzz;1",
+        "@id": "dtmi:example:pi_theta;1",
         "@type": [
           "Interface",
           "Interface"
@@ -25,7 +25,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_wum;1",
+        "@id": "dtmi:example:pi_iota;1",
         "@type": [
           "dtmi:dtdl:class:Interface;3",
           "dtmi:dtdl:class:Interface;3"
diff --git a/DTDL/v3/spec/Recommendation-ClassInterfaceTypeIncludesTermAndDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassInterfaceTypeIncludesTermAndDtmiV3.json
index 26406c47..5d8ec727 100644
--- a/DTDL/v3/spec/Recommendation-ClassInterfaceTypeIncludesTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassInterfaceTypeIncludesTermAndDtmiV3.json
@@ -8,7 +8,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_omega;1",
+        "@id": "dtmi:example:pi_eta;1",
         "@type": [
           "Interface",
           "dtmi:dtdl:class:Interface;3"
diff --git a/DTDL/v3/spec/Recommendation-ClassInterfaceTypePreferTermToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassInterfaceTypePreferTermToDtmiV3.json
index 53cbe314..940ef940 100644
--- a/DTDL/v3/spec/Recommendation-ClassInterfaceTypePreferTermToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassInterfaceTypePreferTermToDtmiV3.json
@@ -8,7 +8,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_um;1",
+        "@id": "dtmi:example:pi_kappa;1",
         "@type": "Interface"
       }
     ]
@@ -22,7 +22,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_humpf;1",
+        "@id": "dtmi:example:pi_lambda;1",
         "@type": "dtmi:dtdl:class:Interface;3"
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassMapKeyPropertyCommentTermV3.json b/DTDL/v3/spec/Recommendation-ClassMapKeyPropertyCommentTermV3.json
index 0b387a92..effc5595 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapKeyPropertyCommentTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapKeyPropertyCommentTermV3.json
@@ -8,18 +8,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_thnad;1",
+        "@id": "dtmi:example:epsilon_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_snee;1",
+          "@id": "dtmi:example:epsilon_snee;1",
           "@type": "Map",
           "mapValue": {
-            "name": "floob_quan",
-            "schema": "double"
+            "name": "epsilon_quan",
+            "schema": "date"
           },
           "mapKey": {
-            "comment": "floob_glikk",
-            "name": "floob_nuh",
+            "comment": "epsilon_glikk",
+            "name": "epsilon_nuh",
             "schema": "string"
           }
         }
@@ -35,18 +35,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_flunn;1",
+        "@id": "dtmi:example:epsilon_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_zatz;1",
+          "@id": "dtmi:example:epsilon_zatz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "floob_jogg",
-            "schema": "duration"
+            "name": "epsilon_jogg",
+            "schema": "dateTime"
           },
           "mapKey": {
-            "dtmi:dtdl:property:comment;3": "floob_spazz",
-            "name": "floob_floob",
+            "dtmi:dtdl:property:comment;3": "epsilon_spazz",
+            "name": "epsilon_floob",
             "schema": "string"
           }
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassMapKeyPropertyDescriptionTermV3.json b/DTDL/v3/spec/Recommendation-ClassMapKeyPropertyDescriptionTermV3.json
index 22545a56..8680c9b3 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapKeyPropertyDescriptionTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapKeyPropertyDescriptionTermV3.json
@@ -8,20 +8,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_itch;1",
+        "@id": "dtmi:example:theta_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_jogg;1",
+          "@id": "dtmi:example:theta_jogg;1",
           "@type": "Map",
           "mapValue": {
-            "name": "flunn_flunn",
-            "schema": "float"
+            "name": "theta_flunn",
+            "schema": "double"
           },
           "mapKey": {
             "description": [
-              "flunn_floob"
+              "theta_floob"
             ],
-            "name": "flunn_zatz",
+            "name": "theta_zatz",
             "schema": "string"
           }
         }
@@ -37,20 +37,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_beta;1",
+        "@id": "dtmi:example:iota_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_hi;1",
+          "@id": "dtmi:example:theta_hi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "itch_alpha",
-            "schema": "integer"
+            "name": "iota_alpha",
+            "schema": "duration"
           },
           "mapKey": {
             "dtmi:dtdl:property:description;3": [
-              "flunn_yekk"
+              "theta_yekk"
             ],
-            "name": "flunn_vroo",
+            "name": "theta_vroo",
             "schema": "string"
           }
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassMapKeyPropertyDisplayNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassMapKeyPropertyDisplayNameTermV3.json
index e63f7a1b..7b4b9c3f 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapKeyPropertyDisplayNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapKeyPropertyDisplayNameTermV3.json
@@ -8,20 +8,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_gamma;1",
+        "@id": "dtmi:example:mu_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_alpha;1",
+          "@id": "dtmi:example:mu_alpha;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_beta",
-            "schema": "long"
+            "name": "mu_beta",
+            "schema": "float"
           },
           "mapKey": {
             "displayName": [
-              "vroo_vroo"
+              "lambda_vroo"
             ],
-            "name": "vroo_hi",
+            "name": "lambda_hi",
             "schema": "string"
           }
         }
@@ -37,20 +37,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_theta;1",
+        "@id": "dtmi:example:mu_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_zeta;1",
+          "@id": "dtmi:example:mu_zeta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_eta",
-            "schema": "string"
+            "name": "mu_eta",
+            "schema": "integer"
           },
           "mapKey": {
             "dtmi:dtdl:property:displayName;3": [
-              "hi_delta"
+              "mu_delta"
             ],
-            "name": "hi_epsilon",
+            "name": "mu_epsilon",
             "schema": "string"
           }
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassMapKeyPropertyNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassMapKeyPropertyNameTermV3.json
index 96db6e93..46aab41b 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapKeyPropertyNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapKeyPropertyNameTermV3.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_glikk;1",
+        "@id": "dtmi:example:omega_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_humpf;1",
+          "@id": "dtmi:example:omega_upsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "mu_fuddle",
-            "schema": "float"
+            "name": "omega_phi",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "mu_um",
+            "name": "omega_tau",
             "schema": "string"
           }
         }
@@ -34,17 +34,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_thnad;1",
+        "@id": "dtmi:example:omega_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_snee;1",
+          "@id": "dtmi:example:omega_omega;1",
           "@type": "Map",
           "mapValue": {
-            "name": "mu_quan",
-            "schema": "integer"
+            "name": "omega_yuzz",
+            "schema": "dateTime"
           },
           "mapKey": {
-            "dtmi:dtdl:property:name;3": "mu_nuh",
+            "dtmi:dtdl:property:name;3": "omega_psi",
             "schema": "string"
           }
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassMapKeyPropertySchemaTermV3.json b/DTDL/v3/spec/Recommendation-ClassMapKeyPropertySchemaTermV3.json
index 286dbe26..16dbc230 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapKeyPropertySchemaTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapKeyPropertySchemaTermV3.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_yekk;1",
+        "@id": "dtmi:example:quan_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_flunn;1",
+          "@id": "dtmi:example:quan_nuh;1",
           "@type": "Map",
           "mapValue": {
-            "name": "phi_itch",
-            "schema": "duration"
+            "name": "quan_snee",
+            "schema": "boolean"
           },
           "mapKey": {
-            "name": "phi_jogg",
+            "name": "quan_glikk",
             "schema": "string"
           }
         }
@@ -34,17 +34,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_beta;1",
+        "@id": "dtmi:example:quan_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_hi;1",
+          "@id": "dtmi:example:quan_spazz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "chi_alpha",
-            "schema": "float"
+            "name": "quan_floob",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "phi_vroo",
+            "name": "quan_thnad",
             "dtmi:dtdl:property:schema;3": "string"
           }
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassMapKeyPropertySchemaValueStringPreferToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassMapKeyPropertySchemaValueStringPreferToDtmiV3.json
index 77df431c..9c954253 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapKeyPropertySchemaValueStringPreferToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapKeyPropertySchemaValueStringPreferToDtmiV3.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_fuddle;1",
+        "@id": "dtmi:example:quan_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_um;1",
+          "@id": "dtmi:example:quan_tau;1",
           "@type": "Map",
           "mapValue": {
-            "name": "phi_humpf",
-            "schema": "date"
+            "name": "quan_upsilon",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "phi_wum",
+            "name": "quan_sigma",
             "schema": "string"
           }
         }
@@ -34,17 +34,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_quan;1",
+        "@id": "dtmi:example:quan_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_nuh;1",
+          "@id": "dtmi:example:quan_psi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "phi_snee",
-            "schema": "dateTime"
+            "name": "quan_omega",
+            "schema": "string"
           },
           "mapKey": {
-            "name": "phi_glikk",
+            "name": "quan_chi",
             "schema": "dtmi:dtdl:instance:Schema:string;3"
           }
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassMapKeyTypeDuplicatesMaterialV3.json b/DTDL/v3/spec/Recommendation-ClassMapKeyTypeDuplicatesMaterialV3.json
index 37a91608..95afd61d 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapKeyTypeDuplicatesMaterialV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapKeyTypeDuplicatesMaterialV3.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_chi;1",
+        "@id": "dtmi:example:jogg_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_upsilon;1",
+          "@id": "dtmi:example:jogg_upsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_phi",
-            "schema": "double"
+            "name": "jogg_phi",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "wum_tau",
+            "name": "jogg_tau",
             "schema": "string",
             "@type": [
               "MapKey",
@@ -38,17 +38,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_wum;1",
+        "@id": "dtmi:example:jogg_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_omega;1",
+          "@id": "dtmi:example:jogg_omega;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_yuzz",
-            "schema": "duration"
+            "name": "jogg_yuzz",
+            "schema": "dateTime"
           },
           "mapKey": {
-            "name": "wum_psi",
+            "name": "jogg_psi",
             "schema": "string",
             "@type": [
               "dtmi:dtdl:class:MapKey;3",
diff --git a/DTDL/v3/spec/Recommendation-ClassMapKeyTypeIncludesTermAndDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassMapKeyTypeIncludesTermAndDtmiV3.json
index 9394b735..9a6060fe 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapKeyTypeIncludesTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapKeyTypeIncludesTermAndDtmiV3.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_sigma;1",
+        "@id": "dtmi:example:jogg_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_pi;1",
+          "@id": "dtmi:example:jogg_pi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_rho",
-            "schema": "dateTime"
+            "name": "jogg_rho",
+            "schema": "boolean"
           },
           "mapKey": {
-            "name": "wum_omicron",
+            "name": "jogg_omicron",
             "schema": "string",
             "@type": [
               "MapKey",
diff --git a/DTDL/v3/spec/Recommendation-ClassMapKeyTypePreferTermToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassMapKeyTypePreferTermToDtmiV3.json
index d9c0b6d0..4647327d 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapKeyTypePreferTermToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapKeyTypePreferTermToDtmiV3.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_glikk;1",
+        "@id": "dtmi:example:jogg_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_humpf;1",
+          "@id": "dtmi:example:jogg_humpf;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_fuddle",
-            "schema": "float"
+            "name": "jogg_fuddle",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "wum_um",
+            "name": "jogg_um",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -35,17 +35,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_thnad;1",
+        "@id": "dtmi:example:jogg_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_snee;1",
+          "@id": "dtmi:example:jogg_snee;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_quan",
-            "schema": "integer"
+            "name": "jogg_quan",
+            "schema": "duration"
           },
           "mapKey": {
-            "name": "wum_nuh",
+            "name": "jogg_nuh",
             "schema": "string",
             "@type": "dtmi:dtdl:class:MapKey;3"
           }
diff --git a/DTDL/v3/spec/Recommendation-ClassMapPropertyCommentTermV3.json b/DTDL/v3/spec/Recommendation-ClassMapPropertyCommentTermV3.json
index e0179be1..1878a079 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapPropertyCommentTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapPropertyCommentTermV3.json
@@ -8,19 +8,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_thnad;1",
+        "@id": "dtmi:example:lambda_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_glikk;1",
+          "@id": "dtmi:example:lambda_chi;1",
           "@type": "Map",
-          "comment": "vroo_nuh",
+          "comment": "lambda_psi",
           "mapKey": {
-            "name": "vroo_snee",
+            "name": "lambda_omega",
             "schema": "string"
           },
           "mapValue": {
-            "name": "vroo_quan",
-            "schema": "string"
+            "name": "lambda_yuzz",
+            "schema": "duration"
           }
         }
       }
@@ -35,19 +35,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_flunn;1",
+        "@id": "dtmi:example:lambda_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_spazz;1",
+          "@id": "dtmi:example:lambda_um;1",
           "@type": "Map",
-          "dtmi:dtdl:property:comment;3": "vroo_floob",
+          "dtmi:dtdl:property:comment;3": "lambda_humpf",
           "mapKey": {
-            "name": "vroo_zatz",
+            "name": "lambda_fuddle",
             "schema": "string"
           },
           "mapValue": {
-            "name": "vroo_jogg",
-            "schema": "time"
+            "name": "lambda_glikk",
+            "schema": "float"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassMapPropertyDescriptionTermV3.json b/DTDL/v3/spec/Recommendation-ClassMapPropertyDescriptionTermV3.json
index 554bac69..899e24d7 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapPropertyDescriptionTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapPropertyDescriptionTermV3.json
@@ -8,21 +8,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_itch;1",
+        "@id": "dtmi:example:xi_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_floob;1",
+          "@id": "dtmi:example:xi_humpf;1",
           "@type": "Map",
           "description": [
-            "beta_zatz"
+            "xi_fuddle"
           ],
           "mapKey": {
-            "name": "beta_jogg",
+            "name": "xi_glikk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "beta_flunn",
-            "schema": "boolean"
+            "name": "xi_nuh",
+            "schema": "integer"
           }
         }
       }
@@ -37,21 +37,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_beta;1",
+        "@id": "dtmi:example:xi_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_yekk;1",
+          "@id": "dtmi:example:xi_quan;1",
           "@type": "Map",
           "dtmi:dtdl:property:description;3": [
-            "beta_vroo"
+            "xi_thnad"
           ],
           "mapKey": {
-            "name": "beta_hi",
+            "name": "xi_spazz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "gamma_alpha",
-            "schema": "date"
+            "name": "xi_floob",
+            "schema": "long"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassMapPropertyDisplayNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassMapPropertyDisplayNameTermV3.json
index 0cdeb79e..ea1a1f02 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapPropertyDisplayNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapPropertyDisplayNameTermV3.json
@@ -8,21 +8,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_gamma;1",
+        "@id": "dtmi:example:rho_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_vroo;1",
+          "@id": "dtmi:example:rho_thnad;1",
           "@type": "Map",
           "displayName": [
-            "epsilon_hi"
+            "rho_spazz"
           ],
           "mapKey": {
-            "name": "zeta_alpha",
+            "name": "rho_floob",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zeta_beta",
-            "schema": "dateTime"
+            "name": "rho_zatz",
+            "schema": "string"
           }
         }
       }
@@ -37,21 +37,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_theta;1",
+        "@id": "dtmi:example:rho_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_delta;1",
+          "@id": "dtmi:example:rho_flunn;1",
           "@type": "Map",
           "dtmi:dtdl:property:displayName;3": [
-            "zeta_epsilon"
+            "rho_itch"
           ],
           "mapKey": {
-            "name": "zeta_zeta",
+            "name": "rho_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zeta_eta",
-            "schema": "double"
+            "name": "rho_vroo",
+            "schema": "time"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassMapPropertyMapKeyTermV3.json b/DTDL/v3/spec/Recommendation-ClassMapPropertyMapKeyTermV3.json
index 3222eda5..a7ba310e 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapPropertyMapKeyTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapPropertyMapKeyTermV3.json
@@ -8,18 +8,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_psi;1",
+        "@id": "dtmi:example:jogg_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_upsilon;1",
+          "@id": "dtmi:example:jogg_zatz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "um_phi",
+            "name": "jogg_jogg",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_chi",
-            "schema": "double"
+            "name": "jogg_flunn",
+            "schema": "float"
           }
         }
       }
@@ -34,18 +34,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_um;1",
+        "@id": "dtmi:example:flunn_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_omega;1",
+          "@id": "dtmi:example:jogg_yekk;1",
           "@type": "Map",
           "dtmi:dtdl:property:mapKey;3": {
-            "name": "um_yuzz",
+            "name": "jogg_vroo",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_wum",
-            "schema": "duration"
+            "name": "jogg_hi",
+            "schema": "integer"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassMapPropertyMapValueTermV3.json b/DTDL/v3/spec/Recommendation-ClassMapPropertyMapValueTermV3.json
index ba61bcb5..e734e4bc 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapPropertyMapValueTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapPropertyMapValueTermV3.json
@@ -8,18 +8,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_flunn;1",
+        "@id": "dtmi:example:alpha_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_floob;1",
+          "@id": "dtmi:example:alpha_upsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_zatz",
+            "name": "alpha_phi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "snee_jogg",
-            "schema": "double"
+            "name": "alpha_chi",
+            "schema": "long"
           }
         }
       }
@@ -34,18 +34,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_hi;1",
+        "@id": "dtmi:example:alpha_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_itch;1",
+          "@id": "dtmi:example:alpha_omega;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_yekk",
+            "name": "alpha_yuzz",
             "schema": "string"
           },
           "dtmi:dtdl:property:mapValue;3": {
-            "name": "snee_vroo",
-            "schema": "duration"
+            "name": "alpha_wum",
+            "schema": "string"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassMapTypeDuplicatesMaterialV3.json b/DTDL/v3/spec/Recommendation-ClassMapTypeDuplicatesMaterialV3.json
index 8f01c590..e5a8fd29 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapTypeDuplicatesMaterialV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapTypeDuplicatesMaterialV3.json
@@ -8,16 +8,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_mu;1",
+        "@id": "dtmi:example:snee_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_iota;1",
+          "@id": "dtmi:example:snee_pi;1",
           "mapKey": {
-            "name": "phi_kappa",
+            "name": "snee_rho",
             "schema": "string"
           },
           "mapValue": {
-            "name": "phi_lambda",
+            "name": "snee_sigma",
             "schema": "long"
           },
           "@type": [
@@ -37,16 +37,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_pi;1",
+        "@id": "dtmi:example:snee_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_nu;1",
+          "@id": "dtmi:example:snee_upsilon;1",
           "mapKey": {
-            "name": "phi_xi",
+            "name": "snee_phi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "phi_omicron",
+            "name": "snee_chi",
             "schema": "string"
           },
           "@type": [
diff --git a/DTDL/v3/spec/Recommendation-ClassMapTypeIncludesTermAndDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassMapTypeIncludesTermAndDtmiV3.json
index c58ad95c..802c43be 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapTypeIncludesTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapTypeIncludesTermAndDtmiV3.json
@@ -8,16 +8,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_theta;1",
+        "@id": "dtmi:example:snee_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_epsilon;1",
+          "@id": "dtmi:example:snee_mu;1",
           "mapKey": {
-            "name": "phi_zeta",
+            "name": "snee_nu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "phi_eta",
+            "name": "snee_xi",
             "schema": "integer"
           },
           "@type": [
diff --git a/DTDL/v3/spec/Recommendation-ClassMapTypePreferTermToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassMapTypePreferTermToDtmiV3.json
index 0db50b03..0ac63c15 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapTypePreferTermToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapTypePreferTermToDtmiV3.json
@@ -8,16 +8,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_upsilon;1",
+        "@id": "dtmi:example:snee_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_rho;1",
+          "@id": "dtmi:example:snee_omega;1",
           "mapKey": {
-            "name": "phi_sigma",
+            "name": "snee_yuzz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "phi_tau",
+            "name": "snee_wum",
             "schema": "time"
           },
           "@type": "Map"
@@ -34,16 +34,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_omega;1",
+        "@id": "dtmi:example:snee_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_phi;1",
+          "@id": "dtmi:example:snee_humpf;1",
           "mapKey": {
-            "name": "phi_chi",
+            "name": "snee_fuddle",
             "schema": "string"
           },
           "mapValue": {
-            "name": "phi_psi",
+            "name": "snee_glikk",
             "schema": "boolean"
           },
           "@type": "dtmi:dtdl:class:Map;3"
diff --git a/DTDL/v3/spec/Recommendation-ClassMapValuePropertyCommentTermV3.json b/DTDL/v3/spec/Recommendation-ClassMapValuePropertyCommentTermV3.json
index 5b0c8c25..8509bbe6 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapValuePropertyCommentTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapValuePropertyCommentTermV3.json
@@ -8,19 +8,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_snee;1",
+        "@id": "dtmi:example:vroo_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_glikk;1",
+          "@id": "dtmi:example:vroo_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_nuh",
+            "name": "vroo_zeta",
             "schema": "string"
           },
           "mapValue": {
-            "comment": "fuddle_humpf",
-            "name": "fuddle_fuddle",
-            "schema": "long"
+            "comment": "vroo_gamma",
+            "name": "vroo_delta",
+            "schema": "time"
           }
         }
       }
@@ -35,19 +35,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_zatz;1",
+        "@id": "dtmi:example:vroo_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_spazz;1",
+          "@id": "dtmi:example:vroo_kappa;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_floob",
+            "name": "vroo_lambda",
             "schema": "string"
           },
           "mapValue": {
-            "dtmi:dtdl:property:comment;3": "fuddle_quan",
-            "name": "fuddle_thnad",
-            "schema": "string"
+            "dtmi:dtdl:property:comment;3": "vroo_theta",
+            "name": "vroo_iota",
+            "schema": "boolean"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassMapValuePropertyDescriptionTermV3.json b/DTDL/v3/spec/Recommendation-ClassMapValuePropertyDescriptionTermV3.json
index ee286305..4b5e4b51 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapValuePropertyDescriptionTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapValuePropertyDescriptionTermV3.json
@@ -8,21 +8,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_jogg;1",
+        "@id": "dtmi:example:beta_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_floob;1",
+          "@id": "dtmi:example:beta_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_zatz",
+            "name": "beta_mu",
             "schema": "string"
           },
           "mapValue": {
             "description": [
-              "snee_thnad"
+              "beta_iota"
             ],
-            "name": "snee_spazz",
-            "schema": "time"
+            "name": "beta_kappa",
+            "schema": "date"
           }
         }
       }
@@ -37,21 +37,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_hi;1",
+        "@id": "dtmi:example:beta_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_yekk;1",
+          "@id": "dtmi:example:beta_pi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_vroo",
+            "name": "beta_rho",
             "schema": "string"
           },
           "mapValue": {
             "dtmi:dtdl:property:description;3": [
-              "snee_flunn"
+              "beta_xi"
             ],
-            "name": "snee_itch",
-            "schema": "boolean"
+            "name": "beta_omicron",
+            "schema": "dateTime"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassMapValuePropertyDisplayNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassMapValuePropertyDisplayNameTermV3.json
index bb3eb76c..4adad4df 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapValuePropertyDisplayNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapValuePropertyDisplayNameTermV3.json
@@ -8,21 +8,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_alpha;1",
+        "@id": "dtmi:example:epsilon_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_vroo;1",
+          "@id": "dtmi:example:epsilon_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_hi",
+            "name": "epsilon_sigma",
             "schema": "string"
           },
           "mapValue": {
             "displayName": [
-              "spazz_itch"
+              "epsilon_omicron"
             ],
-            "name": "spazz_yekk",
-            "schema": "date"
+            "name": "epsilon_pi",
+            "schema": "double"
           }
         }
       }
@@ -37,21 +37,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_zeta;1",
+        "@id": "dtmi:example:epsilon_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_delta;1",
+          "@id": "dtmi:example:epsilon_chi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_epsilon",
+            "name": "epsilon_psi",
             "schema": "string"
           },
           "mapValue": {
             "dtmi:dtdl:property:displayName;3": [
-              "floob_beta"
+              "epsilon_upsilon"
             ],
-            "name": "floob_gamma",
-            "schema": "dateTime"
+            "name": "epsilon_phi",
+            "schema": "duration"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassMapValuePropertyNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassMapValuePropertyNameTermV3.json
index 840408a1..a628d688 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapValuePropertyNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapValuePropertyNameTermV3.json
@@ -8,18 +8,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_glikk;1",
+        "@id": "dtmi:example:sigma_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_humpf;1",
+          "@id": "dtmi:example:sigma_humpf;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_fuddle",
+            "name": "sigma_fuddle",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zeta_um",
-            "schema": "string"
+            "name": "sigma_um",
+            "schema": "integer"
           }
         }
       }
@@ -34,18 +34,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_thnad;1",
+        "@id": "dtmi:example:sigma_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_snee;1",
+          "@id": "dtmi:example:sigma_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_quan",
+            "name": "sigma_quan",
             "schema": "string"
           },
           "mapValue": {
-            "dtmi:dtdl:property:name;3": "zeta_nuh",
-            "schema": "time"
+            "dtmi:dtdl:property:name;3": "sigma_nuh",
+            "schema": "long"
           }
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassMapValuePropertySchemaPreferTermToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassMapValuePropertySchemaPreferTermToDtmiV3.json
index 3d420d77..55ad4ff9 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapValuePropertySchemaPreferTermToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapValuePropertySchemaPreferTermToDtmiV3.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_tau;1",
+        "@id": "dtmi:example:wum_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_rho;1",
+          "@id": "dtmi:example:wum_um;1",
           "@type": "Map",
           "mapKey": {
-            "name": "xi_sigma",
+            "name": "wum_humpf",
             "schema": "string"
           },
           "mapValue": {
-            "name": "xi_pi",
+            "name": "wum_wum",
             "schema": "time"
           }
         }
@@ -34,17 +34,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_psi;1",
+        "@id": "dtmi:example:wum_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_phi;1",
+          "@id": "dtmi:example:wum_nuh;1",
           "@type": "Map",
           "mapKey": {
-            "name": "xi_chi",
+            "name": "wum_snee",
             "schema": "string"
           },
           "mapValue": {
-            "name": "xi_upsilon",
+            "name": "wum_glikk",
             "schema": "dtmi:dtdl:instance:Schema:time;3"
           }
         }
@@ -60,17 +60,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_um;1",
+        "@id": "dtmi:example:wum_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_yuzz;1",
+          "@id": "dtmi:example:wum_spazz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "xi_wum",
+            "name": "wum_floob",
             "schema": "string"
           },
           "mapValue": {
-            "name": "xi_omega",
+            "name": "wum_thnad",
             "schema": "point"
           }
         }
@@ -86,17 +86,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_nuh;1",
+        "@id": "dtmi:example:wum_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_fuddle;1",
+          "@id": "dtmi:example:wum_flunn;1",
           "@type": "Map",
           "mapKey": {
-            "name": "xi_glikk",
+            "name": "wum_itch",
             "schema": "string"
           },
           "mapValue": {
-            "name": "xi_humpf",
+            "name": "wum_jogg",
             "schema": "dtmi:standard:schema:geospatial:point;3"
           }
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassMapValuePropertySchemaTermV3.json b/DTDL/v3/spec/Recommendation-ClassMapValuePropertySchemaTermV3.json
index 04e0ba5b..517eb129 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapValuePropertySchemaTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapValuePropertySchemaTermV3.json
@@ -8,17 +8,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_flunn;1",
+        "@id": "dtmi:example:um_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_zatz;1",
+          "@id": "dtmi:example:um_delta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "xi_jogg",
+            "name": "um_epsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "xi_floob",
+            "name": "um_gamma",
             "schema": "integer"
           }
         }
@@ -34,17 +34,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_hi;1",
+        "@id": "dtmi:example:um_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_yekk;1",
+          "@id": "dtmi:example:um_theta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "xi_vroo",
+            "name": "um_iota",
             "schema": "string"
           },
           "mapValue": {
-            "name": "xi_itch",
+            "name": "um_eta",
             "dtmi:dtdl:property:schema;3": "long"
           }
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassMapValueTypeDuplicatesMaterialV3.json b/DTDL/v3/spec/Recommendation-ClassMapValueTypeDuplicatesMaterialV3.json
index 881c4aea..d72758b5 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapValueTypeDuplicatesMaterialV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapValueTypeDuplicatesMaterialV3.json
@@ -8,18 +8,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_upsilon;1",
+        "@id": "dtmi:example:nuh_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_sigma;1",
+          "@id": "dtmi:example:nuh_floob;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_tau",
+            "name": "nuh_zatz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "tau_rho",
-            "schema": "long",
+            "name": "nuh_spazz",
+            "schema": "time",
             "@type": [
               "MapValue",
               "MapValue"
@@ -38,18 +38,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_omega;1",
+        "@id": "dtmi:example:nuh_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_chi;1",
+          "@id": "dtmi:example:nuh_itch;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_psi",
+            "name": "nuh_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "tau_phi",
-            "schema": "string",
+            "name": "nuh_flunn",
+            "schema": "boolean",
             "@type": [
               "dtmi:dtdl:class:MapValue;3",
               "dtmi:dtdl:class:MapValue;3"
diff --git a/DTDL/v3/spec/Recommendation-ClassMapValueTypeIncludesTermAndDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassMapValueTypeIncludesTermAndDtmiV3.json
index d6a5a4b6..696e48b1 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapValueTypeIncludesTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapValueTypeIncludesTermAndDtmiV3.json
@@ -8,18 +8,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_pi;1",
+        "@id": "dtmi:example:nuh_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_xi;1",
+          "@id": "dtmi:example:nuh_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_omicron",
+            "name": "nuh_quan",
             "schema": "string"
           },
           "mapValue": {
-            "name": "tau_nu",
-            "schema": "integer",
+            "name": "nuh_nuh",
+            "schema": "string",
             "@type": [
               "MapValue",
               "dtmi:dtdl:class:MapValue;3"
diff --git a/DTDL/v3/spec/Recommendation-ClassMapValueTypePreferTermToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassMapValueTypePreferTermToDtmiV3.json
index 71a41d7e..ef66453a 100644
--- a/DTDL/v3/spec/Recommendation-ClassMapValueTypePreferTermToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassMapValueTypePreferTermToDtmiV3.json
@@ -8,18 +8,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_humpf;1",
+        "@id": "dtmi:example:snee_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_wum;1",
+          "@id": "dtmi:example:snee_alpha;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_um",
+            "name": "snee_beta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "tau_yuzz",
-            "schema": "time",
+            "name": "nuh_hi",
+            "schema": "date",
             "@type": "MapValue"
           }
         }
@@ -35,18 +35,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_snee;1",
+        "@id": "dtmi:example:snee_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_glikk;1",
+          "@id": "dtmi:example:snee_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_nuh",
+            "name": "snee_zeta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "tau_fuddle",
-            "schema": "boolean",
+            "name": "snee_delta",
+            "schema": "dateTime",
             "@type": "dtmi:dtdl:class:MapValue;3"
           }
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassObjectPropertyCommentTermV3.json b/DTDL/v3/spec/Recommendation-ClassObjectPropertyCommentTermV3.json
index c5782f8f..ad226ba1 100644
--- a/DTDL/v3/spec/Recommendation-ClassObjectPropertyCommentTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassObjectPropertyCommentTermV3.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_yuzz;1",
+        "@id": "dtmi:example:xi_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_psi;1",
+          "@id": "dtmi:example:xi_beta;1",
           "@type": "Object",
-          "comment": "alpha_omega"
+          "comment": "xi_gamma"
         }
       }
     ]
@@ -27,12 +27,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_humpf;1",
+        "@id": "dtmi:example:xi_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_wum;1",
+          "@id": "dtmi:example:xi_epsilon;1",
           "@type": "Object",
-          "dtmi:dtdl:property:comment;3": "alpha_um"
+          "dtmi:dtdl:property:comment;3": "xi_zeta"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassObjectPropertyDescriptionTermV3.json b/DTDL/v3/spec/Recommendation-ClassObjectPropertyDescriptionTermV3.json
index 8c1e0e4a..1b3e7c0e 100644
--- a/DTDL/v3/spec/Recommendation-ClassObjectPropertyDescriptionTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassObjectPropertyDescriptionTermV3.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_kappa;1",
+        "@id": "dtmi:example:omicron_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_theta;1",
+          "@id": "dtmi:example:omicron_glikk;1",
           "@type": "Object",
           "description": [
-            "gamma_iota"
+            "omicron_nuh"
           ]
         }
       }
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_nu;1",
+        "@id": "dtmi:example:omicron_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_lambda;1",
+          "@id": "dtmi:example:omicron_quan;1",
           "@type": "Object",
           "dtmi:dtdl:property:description;3": [
-            "gamma_mu"
+            "omicron_thnad"
           ]
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassObjectPropertyDisplayNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassObjectPropertyDisplayNameTermV3.json
index 6637c70d..18d5242f 100644
--- a/DTDL/v3/spec/Recommendation-ClassObjectPropertyDisplayNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassObjectPropertyDisplayNameTermV3.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_jogg;1",
+        "@id": "dtmi:example:rho_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_floob;1",
+          "@id": "dtmi:example:rho_omicron;1",
           "@type": "Object",
           "displayName": [
-            "delta_zatz"
+            "rho_pi"
           ]
         }
       }
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_yekk;1",
+        "@id": "dtmi:example:rho_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_flunn;1",
+          "@id": "dtmi:example:rho_sigma;1",
           "@type": "Object",
           "dtmi:dtdl:property:displayName;3": [
-            "delta_itch"
+            "rho_tau"
           ]
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassObjectPropertyFieldsTermV3.json b/DTDL/v3/spec/Recommendation-ClassObjectPropertyFieldsTermV3.json
index 46cb0cad..b1c48456 100644
--- a/DTDL/v3/spec/Recommendation-ClassObjectPropertyFieldsTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassObjectPropertyFieldsTermV3.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_flunn;1",
+        "@id": "dtmi:example:phi_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_zatz;1",
+          "@id": "dtmi:example:phi_omega;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "theta_jogg",
-              "schema": "double"
+              "name": "phi_yuzz",
+              "schema": "long"
             }
           ]
         }
@@ -32,15 +32,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_vroo;1",
+        "@id": "dtmi:example:phi_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_itch;1",
+          "@id": "dtmi:example:phi_um;1",
           "@type": "Object",
           "dtmi:dtdl:property:fields;3": [
             {
-              "name": "theta_yekk",
-              "schema": "duration"
+              "name": "phi_humpf",
+              "schema": "string"
             }
           ]
         }
diff --git a/DTDL/v3/spec/Recommendation-ClassObjectTypeDuplicatesMaterialV3.json b/DTDL/v3/spec/Recommendation-ClassObjectTypeDuplicatesMaterialV3.json
index 2b22aaba..e61033ab 100644
--- a/DTDL/v3/spec/Recommendation-ClassObjectTypeDuplicatesMaterialV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassObjectTypeDuplicatesMaterialV3.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_yekk;1",
+        "@id": "dtmi:example:iota_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_itch;1",
+          "@id": "dtmi:example:iota_omicron;1",
           "@type": [
             "Object",
             "Object"
@@ -29,10 +29,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_hi;1",
+        "@id": "dtmi:example:iota_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_vroo;1",
+          "@id": "dtmi:example:iota_rho;1",
           "@type": [
             "dtmi:dtdl:class:Object;3",
             "dtmi:dtdl:class:Object;3"
diff --git a/DTDL/v3/spec/Recommendation-ClassObjectTypeIncludesTermAndDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassObjectTypeIncludesTermAndDtmiV3.json
index 403dcb46..0c736eef 100644
--- a/DTDL/v3/spec/Recommendation-ClassObjectTypeIncludesTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassObjectTypeIncludesTermAndDtmiV3.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_flunn;1",
+        "@id": "dtmi:example:iota_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_jogg;1",
+          "@id": "dtmi:example:iota_nu;1",
           "@type": [
             "Object",
             "dtmi:dtdl:class:Object;3"
diff --git a/DTDL/v3/spec/Recommendation-ClassObjectTypePreferTermToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassObjectTypePreferTermToDtmiV3.json
index c305d098..a4a6eb01 100644
--- a/DTDL/v3/spec/Recommendation-ClassObjectTypePreferTermToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassObjectTypePreferTermToDtmiV3.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_beta;1",
+        "@id": "dtmi:example:iota_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_alpha;1",
+          "@id": "dtmi:example:iota_tau;1",
           "@type": "Object"
         }
       }
@@ -26,10 +26,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_delta;1",
+        "@id": "dtmi:example:iota_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_gamma;1",
+          "@id": "dtmi:example:iota_phi;1",
           "@type": "dtmi:dtdl:class:Object;3"
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassPropertyPropertyCommentTermV3.json b/DTDL/v3/spec/Recommendation-ClassPropertyPropertyCommentTermV3.json
index 5f678406..fcc860e6 100644
--- a/DTDL/v3/spec/Recommendation-ClassPropertyPropertyCommentTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassPropertyPropertyCommentTermV3.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_fuddle;1",
+        "@id": "dtmi:example:zatz_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "comment": "omega_um",
-          "name": "omega_humpf",
-          "schema": "float"
+          "comment": "zatz_humpf",
+          "name": "zatz_fuddle",
+          "schema": "double"
         }
       }
     ]
@@ -28,13 +28,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_snee;1",
+        "@id": "dtmi:example:zatz_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "dtmi:dtdl:property:comment;3": "omega_glikk",
-          "name": "omega_nuh",
-          "schema": "integer"
+          "dtmi:dtdl:property:comment;3": "zatz_nuh",
+          "name": "zatz_snee",
+          "schema": "duration"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassPropertyPropertyDescriptionTermV3.json b/DTDL/v3/spec/Recommendation-ClassPropertyPropertyDescriptionTermV3.json
index 7b9ec8de..5008c554 100644
--- a/DTDL/v3/spec/Recommendation-ClassPropertyPropertyDescriptionTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassPropertyPropertyDescriptionTermV3.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_xi;1",
+        "@id": "dtmi:example:flunn_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
           "description": [
-            "wum_mu"
+            "flunn_nu"
           ],
-          "name": "wum_nu",
-          "schema": "long"
+          "name": "flunn_xi",
+          "schema": "float"
         }
       }
     ]
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_rho;1",
+        "@id": "dtmi:example:flunn_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
           "dtmi:dtdl:property:description;3": [
-            "wum_omicron"
+            "flunn_pi"
           ],
-          "name": "wum_pi",
-          "schema": "string"
+          "name": "flunn_rho",
+          "schema": "integer"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassPropertyPropertyDisplayNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassPropertyPropertyDisplayNameTermV3.json
index 68c944ae..c17912bf 100644
--- a/DTDL/v3/spec/Recommendation-ClassPropertyPropertyDisplayNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassPropertyPropertyDisplayNameTermV3.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_vroo;1",
+        "@id": "dtmi:example:itch_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
           "displayName": [
-            "um_itch"
+            "itch_yekk"
           ],
-          "name": "um_yekk",
-          "schema": "time"
+          "name": "itch_vroo",
+          "schema": "long"
         }
       }
     ]
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_beta;1",
+        "@id": "dtmi:example:yekk_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
           "dtmi:dtdl:property:displayName;3": [
-            "um_hi"
+            "yekk_alpha"
           ],
-          "name": "humpf_alpha",
-          "schema": "boolean"
+          "name": "yekk_beta",
+          "schema": "string"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassPropertyPropertyNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassPropertyPropertyNameTermV3.json
index bc7ba2b1..239ec3cc 100644
--- a/DTDL/v3/spec/Recommendation-ClassPropertyPropertyNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassPropertyPropertyNameTermV3.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_thnad;1",
+        "@id": "dtmi:example:wum_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nu_quan",
-          "schema": "float"
+          "name": "wum_upsilon",
+          "schema": "time"
         }
       }
     ]
@@ -27,12 +27,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_floob;1",
+        "@id": "dtmi:example:wum_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "dtmi:dtdl:property:name;3": "nu_spazz",
-          "schema": "integer"
+          "dtmi:dtdl:property:name;3": "wum_chi",
+          "schema": "boolean"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassPropertyPropertySchemaPreferTermToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassPropertyPropertySchemaPreferTermToDtmiV3.json
index b3952458..a5b1b572 100644
--- a/DTDL/v3/spec/Recommendation-ClassPropertyPropertySchemaPreferTermToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassPropertyPropertySchemaPreferTermToDtmiV3.json
@@ -8,11 +8,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_tau;1",
+        "@id": "dtmi:example:nuh_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "sigma_sigma",
+          "name": "nuh_nu",
           "schema": "date"
         }
       }
@@ -27,11 +27,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_phi;1",
+        "@id": "dtmi:example:nuh_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "sigma_upsilon",
+          "name": "nuh_omicron",
           "schema": "dtmi:dtdl:instance:Schema:date;3"
         }
       }
@@ -46,11 +46,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_psi;1",
+        "@id": "dtmi:example:nuh_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "sigma_chi",
+          "name": "nuh_rho",
           "schema": "point"
         }
       }
@@ -65,11 +65,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_yuzz;1",
+        "@id": "dtmi:example:nuh_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "sigma_omega",
+          "name": "nuh_tau",
           "schema": "dtmi:standard:schema:geospatial:point;3"
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassPropertyPropertySchemaTermV3.json b/DTDL/v3/spec/Recommendation-ClassPropertyPropertySchemaTermV3.json
index 27ba41cb..e06631d6 100644
--- a/DTDL/v3/spec/Recommendation-ClassPropertyPropertySchemaTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassPropertyPropertySchemaTermV3.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_fuddle;1",
+        "@id": "dtmi:example:nuh_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "sigma_humpf",
-          "schema": "double"
+          "name": "nuh_psi",
+          "schema": "time"
         }
       }
     ]
@@ -27,12 +27,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_nuh;1",
+        "@id": "dtmi:example:nuh_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "sigma_glikk",
-          "dtmi:dtdl:property:schema;3": "duration"
+          "name": "nuh_yuzz",
+          "dtmi:dtdl:property:schema;3": "boolean"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassPropertyPropertyWritableTermV3.json b/DTDL/v3/spec/Recommendation-ClassPropertyPropertyWritableTermV3.json
index 1bfa7df5..ead08759 100644
--- a/DTDL/v3/spec/Recommendation-ClassPropertyPropertyWritableTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassPropertyPropertyWritableTermV3.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_phi;1",
+        "@id": "dtmi:example:vroo_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_upsilon",
-          "schema": "time",
+          "name": "vroo_phi",
+          "schema": "long",
           "writable": true
         }
       }
@@ -28,12 +28,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_psi;1",
+        "@id": "dtmi:example:vroo_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_chi",
-          "schema": "boolean",
+          "name": "vroo_psi",
+          "schema": "string",
           "dtmi:dtdl:property:writable;3": false
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassPropertyTypeDuplicatesMaterialV3.json b/DTDL/v3/spec/Recommendation-ClassPropertyTypeDuplicatesMaterialV3.json
index 2a386408..3a1fb5ef 100644
--- a/DTDL/v3/spec/Recommendation-ClassPropertyTypeDuplicatesMaterialV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassPropertyTypeDuplicatesMaterialV3.json
@@ -8,11 +8,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_nuh;1",
+        "@id": "dtmi:example:omega_sigma;1",
         "@type": "Interface",
         "contents": {
-          "name": "lambda_glikk",
-          "schema": "string",
+          "name": "omega_rho",
+          "schema": "dateTime",
           "@type": [
             "Property",
             "Property"
@@ -30,11 +30,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_quan;1",
+        "@id": "dtmi:example:omega_upsilon;1",
         "@type": "Interface",
         "contents": {
-          "name": "lambda_snee",
-          "schema": "time",
+          "name": "omega_tau",
+          "schema": "double",
           "@type": [
             "dtmi:dtdl:class:Property;3",
             "dtmi:dtdl:class:Property;3"
diff --git a/DTDL/v3/spec/Recommendation-ClassPropertyTypeIncludesTermAndDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassPropertyTypeIncludesTermAndDtmiV3.json
index fc2adae9..2e6b9851 100644
--- a/DTDL/v3/spec/Recommendation-ClassPropertyTypeIncludesTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassPropertyTypeIncludesTermAndDtmiV3.json
@@ -8,11 +8,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_fuddle;1",
+        "@id": "dtmi:example:omega_pi;1",
         "@type": "Interface",
         "contents": {
-          "name": "lambda_humpf",
-          "schema": "long",
+          "name": "omega_omicron",
+          "schema": "date",
           "@type": [
             "Property",
             "dtmi:dtdl:class:Property;3"
diff --git a/DTDL/v3/spec/Recommendation-ClassPropertyTypePreferTermToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassPropertyTypePreferTermToDtmiV3.json
index c13b1fbc..5131b80e 100644
--- a/DTDL/v3/spec/Recommendation-ClassPropertyTypePreferTermToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassPropertyTypePreferTermToDtmiV3.json
@@ -8,11 +8,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_spazz;1",
+        "@id": "dtmi:example:omega_chi;1",
         "@type": "Interface",
         "contents": {
-          "name": "lambda_thnad",
-          "schema": "boolean",
+          "name": "omega_phi",
+          "schema": "duration",
           "@type": "Property"
         }
       }
@@ -27,11 +27,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_zatz;1",
+        "@id": "dtmi:example:omega_omega;1",
         "@type": "Interface",
         "contents": {
-          "name": "lambda_floob",
-          "schema": "date",
+          "name": "omega_psi",
+          "schema": "float",
           "@type": "dtmi:dtdl:class:Property;3"
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyCommentTermV3.json b/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyCommentTermV3.json
index dedcdb35..a4692d16 100644
--- a/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyCommentTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyCommentTermV3.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_lambda;1",
+        "@id": "dtmi:example:kappa_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "comment": "itch_iota",
-          "name": "itch_kappa"
+          "comment": "kappa_pi",
+          "name": "kappa_rho"
         }
       }
     ]
@@ -27,12 +27,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_xi;1",
+        "@id": "dtmi:example:kappa_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "dtmi:dtdl:property:comment;3": "itch_mu",
-          "name": "itch_nu"
+          "dtmi:dtdl:property:comment;3": "kappa_tau",
+          "name": "kappa_upsilon"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyDescriptionTermV3.json b/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyDescriptionTermV3.json
index f67cc8d7..79f5cbf8 100644
--- a/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyDescriptionTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyDescriptionTermV3.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_flunn;1",
+        "@id": "dtmi:example:mu_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "description": [
-            "yekk_zatz"
+            "mu_alpha"
           ],
-          "name": "yekk_jogg"
+          "name": "mu_beta"
         }
       }
     ]
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_vroo;1",
+        "@id": "dtmi:example:mu_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "dtmi:dtdl:property:description;3": [
-            "yekk_itch"
+            "mu_delta"
           ],
-          "name": "yekk_yekk"
+          "name": "mu_epsilon"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyDisplayNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyDisplayNameTermV3.json
index 6cb83844..f9a3bc8e 100644
--- a/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyDisplayNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyDisplayNameTermV3.json
@@ -8,14 +8,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_omega;1",
+        "@id": "dtmi:example:nu_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "displayName": [
-            "hi_chi"
+            "nu_fuddle"
           ],
-          "name": "hi_psi"
+          "name": "nu_glikk"
         }
       }
     ]
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_um;1",
+        "@id": "dtmi:example:nu_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "dtmi:dtdl:property:displayName;3": [
-            "hi_yuzz"
+            "nu_snee"
           ],
-          "name": "hi_wum"
+          "name": "nu_quan"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyMaxMultiplicityTermV3.json b/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyMaxMultiplicityTermV3.json
index c7128f5e..6ac7a5ac 100644
--- a/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyMaxMultiplicityTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyMaxMultiplicityTermV3.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_alpha;1",
+        "@id": "dtmi:example:omicron_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "maxMultiplicity": 1471,
-          "name": "alpha_hi"
+          "maxMultiplicity": 1488,
+          "name": "omicron_eta"
         }
       }
     ]
@@ -27,12 +27,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_gamma;1",
+        "@id": "dtmi:example:omicron_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "dtmi:dtdl:property:maxMultiplicity;3": 1472,
-          "name": "beta_beta"
+          "dtmi:dtdl:property:maxMultiplicity;3": 1489,
+          "name": "omicron_iota"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyMinMultiplicityTermV3.json b/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyMinMultiplicityTermV3.json
index 0733c27d..13fce426 100644
--- a/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyMinMultiplicityTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyMinMultiplicityTermV3.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_upsilon;1",
+        "@id": "dtmi:example:pi_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "minMultiplicity": 0,
-          "name": "gamma_tau"
+          "name": "pi_wum"
         }
       }
     ]
@@ -27,12 +27,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_chi;1",
+        "@id": "dtmi:example:pi_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "dtmi:dtdl:property:minMultiplicity;3": 0,
-          "name": "gamma_phi"
+          "name": "pi_humpf"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyNameTermV3.json
index dad6c75a..5d5c5dea 100644
--- a/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyNameTermV3.json
@@ -8,11 +8,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_alpha;1",
+        "@id": "dtmi:example:delta_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "quan_hi"
+          "name": "delta_alpha"
         }
       }
     ]
@@ -26,11 +26,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_gamma;1",
+        "@id": "dtmi:example:delta_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "dtmi:dtdl:property:name;3": "thnad_beta"
+          "dtmi:dtdl:property:name;3": "delta_gamma"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyPropertiesTermV3.json b/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyPropertiesTermV3.json
index c910f097..3fbf6bb6 100644
--- a/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyPropertiesTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyPropertiesTermV3.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_rho;1",
+        "@id": "dtmi:example:upsilon_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "eta_omicron",
+          "name": "upsilon_snee",
           "properties": [
             {
               "@type": "Property",
-              "name": "eta_pi",
+              "name": "upsilon_quan",
               "schema": "boolean"
             }
           ]
@@ -33,15 +33,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_upsilon;1",
+        "@id": "dtmi:example:upsilon_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "eta_sigma",
+          "name": "upsilon_spazz",
           "dtmi:dtdl:property:properties;3": [
             {
               "@type": "Property",
-              "name": "eta_tau",
+              "name": "upsilon_floob",
               "schema": "date"
             }
           ]
diff --git a/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyTargetTermV3.json b/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyTargetTermV3.json
index d85f7c3e..a8e3eb7a 100644
--- a/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyTargetTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyTargetTermV3.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_um;1",
+        "@id": "dtmi:example:omega_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "kappa_yuzz",
-          "target": "dtmi:example:kappa_wum;1"
+          "name": "psi_vroo",
+          "target": "dtmi:example:psi_hi;1"
         }
       }
     ]
@@ -27,12 +27,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_glikk;1",
+        "@id": "dtmi:example:omega_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "kappa_humpf",
-          "dtmi:dtdl:property:target;3": "dtmi:example:kappa_fuddle;1"
+          "name": "omega_beta",
+          "dtmi:dtdl:property:target;3": "dtmi:example:omega_gamma;1"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyWritableTermV3.json b/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyWritableTermV3.json
index 0119e8d3..793251f0 100644
--- a/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyWritableTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassRelationshipPropertyWritableTermV3.json
@@ -8,11 +8,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_zeta;1",
+        "@id": "dtmi:example:yuzz_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "mu_epsilon",
+          "name": "yuzz_chi",
           "writable": false
         }
       }
@@ -27,11 +27,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_theta;1",
+        "@id": "dtmi:example:yuzz_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "mu_eta",
+          "name": "yuzz_omega",
           "dtmi:dtdl:property:writable;3": true
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassRelationshipTypeDuplicatesMaterialV3.json b/DTDL/v3/spec/Recommendation-ClassRelationshipTypeDuplicatesMaterialV3.json
index dea6540c..b86a5790 100644
--- a/DTDL/v3/spec/Recommendation-ClassRelationshipTypeDuplicatesMaterialV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassRelationshipTypeDuplicatesMaterialV3.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_delta;1",
+        "@id": "dtmi:example:beta_epsilon;1",
         "@type": "Interface",
         "contents": {
-          "name": "snee_gamma",
+          "name": "beta_delta",
           "@type": [
             "Relationship",
             "Relationship"
@@ -29,10 +29,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_zeta;1",
+        "@id": "dtmi:example:beta_eta;1",
         "@type": "Interface",
         "contents": {
-          "name": "snee_epsilon",
+          "name": "beta_zeta",
           "@type": [
             "dtmi:dtdl:class:Relationship;3",
             "dtmi:dtdl:class:Relationship;3"
diff --git a/DTDL/v3/spec/Recommendation-ClassRelationshipTypeIncludesTermAndDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassRelationshipTypeIncludesTermAndDtmiV3.json
index 438cd66c..953de4b9 100644
--- a/DTDL/v3/spec/Recommendation-ClassRelationshipTypeIncludesTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassRelationshipTypeIncludesTermAndDtmiV3.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_beta;1",
+        "@id": "dtmi:example:beta_gamma;1",
         "@type": "Interface",
         "contents": {
-          "name": "snee_alpha",
+          "name": "beta_beta",
           "@type": [
             "Relationship",
             "dtmi:dtdl:class:Relationship;3"
diff --git a/DTDL/v3/spec/Recommendation-ClassRelationshipTypePreferTermToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassRelationshipTypePreferTermToDtmiV3.json
index 03c5fea0..96ac4346 100644
--- a/DTDL/v3/spec/Recommendation-ClassRelationshipTypePreferTermToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassRelationshipTypePreferTermToDtmiV3.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_theta;1",
+        "@id": "dtmi:example:beta_iota;1",
         "@type": "Interface",
         "contents": {
-          "name": "snee_eta",
+          "name": "beta_theta",
           "@type": "Relationship"
         }
       }
@@ -26,10 +26,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_kappa;1",
+        "@id": "dtmi:example:beta_lambda;1",
         "@type": "Interface",
         "contents": {
-          "name": "snee_iota",
+          "name": "beta_kappa",
           "@type": "dtmi:dtdl:class:Relationship;3"
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassTelemetryPropertyCommentTermV3.json b/DTDL/v3/spec/Recommendation-ClassTelemetryPropertyCommentTermV3.json
index 9f786dbe..a9479c56 100644
--- a/DTDL/v3/spec/Recommendation-ClassTelemetryPropertyCommentTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassTelemetryPropertyCommentTermV3.json
@@ -8,13 +8,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_wum;1",
+        "@id": "dtmi:example:yekk_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "comment": "um_omega",
-          "name": "um_yuzz",
-          "schema": "float"
+          "comment": "yekk_mu",
+          "name": "yekk_nu",
+          "schema": "time"
         }
       }
     ]
@@ -28,13 +28,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_fuddle;1",
+        "@id": "dtmi:example:yekk_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "dtmi:dtdl:property:comment;3": "um_um",
-          "name": "um_humpf",
-          "schema": "integer"
+          "dtmi:dtdl:property:comment;3": "yekk_omicron",
+          "name": "yekk_pi",
+          "schema": "boolean"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassTelemetryPropertyDescriptionTermV3.json b/DTDL/v3/spec/Recommendation-ClassTelemetryPropertyDescriptionTermV3.json
index 93da5924..703e741e 100644
--- a/DTDL/v3/spec/Recommendation-ClassTelemetryPropertyDescriptionTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassTelemetryPropertyDescriptionTermV3.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_lambda;1",
+        "@id": "dtmi:example:vroo_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
           "description": [
-            "fuddle_iota"
+            "vroo_itch"
           ],
-          "name": "fuddle_kappa",
-          "schema": "long"
+          "name": "vroo_yekk",
+          "schema": "date"
         }
       }
     ]
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_xi;1",
+        "@id": "dtmi:example:hi_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
           "dtmi:dtdl:property:description;3": [
-            "fuddle_mu"
+            "vroo_hi"
           ],
-          "name": "fuddle_nu",
-          "schema": "string"
+          "name": "hi_alpha",
+          "schema": "dateTime"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassTelemetryPropertyDisplayNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassTelemetryPropertyDisplayNameTermV3.json
index 68af9d36..c62523a8 100644
--- a/DTDL/v3/spec/Recommendation-ClassTelemetryPropertyDisplayNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassTelemetryPropertyDisplayNameTermV3.json
@@ -8,15 +8,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_flunn;1",
+        "@id": "dtmi:example:alpha_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
           "displayName": [
-            "glikk_zatz"
+            "alpha_yuzz"
           ],
-          "name": "glikk_jogg",
-          "schema": "time"
+          "name": "alpha_wum",
+          "schema": "double"
         }
       }
     ]
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_vroo;1",
+        "@id": "dtmi:example:alpha_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
           "dtmi:dtdl:property:displayName;3": [
-            "glikk_itch"
+            "alpha_humpf"
           ],
-          "name": "glikk_yekk",
-          "schema": "boolean"
+          "name": "alpha_fuddle",
+          "schema": "duration"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassTelemetryPropertyNameTermV3.json b/DTDL/v3/spec/Recommendation-ClassTelemetryPropertyNameTermV3.json
index f7a1440f..7887288c 100644
--- a/DTDL/v3/spec/Recommendation-ClassTelemetryPropertyNameTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassTelemetryPropertyNameTermV3.json
@@ -8,11 +8,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_quan;1",
+        "@id": "dtmi:example:glikk_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "pi_snee",
+          "name": "glikk_zeta",
           "schema": "integer"
         }
       }
@@ -27,11 +27,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_spazz;1",
+        "@id": "dtmi:example:glikk_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "dtmi:dtdl:property:name;3": "pi_thnad",
+          "dtmi:dtdl:property:name;3": "glikk_theta",
           "schema": "long"
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassTelemetryPropertySchemaPreferTermToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassTelemetryPropertySchemaPreferTermToDtmiV3.json
index 1d128227..a6d3410a 100644
--- a/DTDL/v3/spec/Recommendation-ClassTelemetryPropertySchemaPreferTermToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassTelemetryPropertySchemaPreferTermToDtmiV3.json
@@ -8,11 +8,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_sigma;1",
+        "@id": "dtmi:example:thnad_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "phi_rho",
+          "name": "thnad_vroo",
           "schema": "double"
         }
       }
@@ -27,11 +27,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_upsilon;1",
+        "@id": "dtmi:example:spazz_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "phi_tau",
+          "name": "spazz_alpha",
           "schema": "dtmi:dtdl:instance:Schema:double;3"
         }
       }
@@ -46,11 +46,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_chi;1",
+        "@id": "dtmi:example:spazz_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "phi_phi",
+          "name": "spazz_gamma",
           "schema": "point"
         }
       }
@@ -65,11 +65,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_omega;1",
+        "@id": "dtmi:example:spazz_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "phi_psi",
+          "name": "spazz_epsilon",
           "schema": "dtmi:standard:schema:geospatial:point;3"
         }
       }
diff --git a/DTDL/v3/spec/Recommendation-ClassTelemetryPropertySchemaTermV3.json b/DTDL/v3/spec/Recommendation-ClassTelemetryPropertySchemaTermV3.json
index ed1e9f45..b6d336c3 100644
--- a/DTDL/v3/spec/Recommendation-ClassTelemetryPropertySchemaTermV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassTelemetryPropertySchemaTermV3.json
@@ -8,12 +8,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_humpf;1",
+        "@id": "dtmi:example:spazz_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "phi_um",
-          "schema": "duration"
+          "name": "spazz_iota",
+          "schema": "integer"
         }
       }
     ]
@@ -27,12 +27,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_glikk;1",
+        "@id": "dtmi:example:spazz_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "phi_fuddle",
-          "dtmi:dtdl:property:schema;3": "float"
+          "name": "spazz_lambda",
+          "dtmi:dtdl:property:schema;3": "long"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Recommendation-ClassTelemetryTypeDuplicatesMaterialV3.json b/DTDL/v3/spec/Recommendation-ClassTelemetryTypeDuplicatesMaterialV3.json
index 49741c64..a0eed47b 100644
--- a/DTDL/v3/spec/Recommendation-ClassTelemetryTypeDuplicatesMaterialV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassTelemetryTypeDuplicatesMaterialV3.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_floob;1",
+        "@id": "dtmi:example:humpf_kappa;1",
         "@type": "Interface",
         "contents": {
-          "name": "xi_spazz",
+          "name": "humpf_iota",
           "schema": "float",
           "@type": [
             "Telemetry",
@@ -30,10 +30,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_jogg;1",
+        "@id": "dtmi:example:humpf_mu;1",
         "@type": "Interface",
         "contents": {
-          "name": "xi_zatz",
+          "name": "humpf_lambda",
           "schema": "integer",
           "@type": [
             "dtmi:dtdl:class:Telemetry;3",
diff --git a/DTDL/v3/spec/Recommendation-ClassTelemetryTypeIncludesTermAndDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassTelemetryTypeIncludesTermAndDtmiV3.json
index 154395c2..19116cbe 100644
--- a/DTDL/v3/spec/Recommendation-ClassTelemetryTypeIncludesTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassTelemetryTypeIncludesTermAndDtmiV3.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_thnad;1",
+        "@id": "dtmi:example:humpf_theta;1",
         "@type": "Interface",
         "contents": {
-          "name": "xi_quan",
+          "name": "humpf_eta",
           "schema": "duration",
           "@type": [
             "Telemetry",
diff --git a/DTDL/v3/spec/Recommendation-ClassTelemetryTypePreferTermToDtmiV3.json b/DTDL/v3/spec/Recommendation-ClassTelemetryTypePreferTermToDtmiV3.json
index 01ff7b28..8998c920 100644
--- a/DTDL/v3/spec/Recommendation-ClassTelemetryTypePreferTermToDtmiV3.json
+++ b/DTDL/v3/spec/Recommendation-ClassTelemetryTypePreferTermToDtmiV3.json
@@ -8,10 +8,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_itch;1",
+        "@id": "dtmi:example:humpf_xi;1",
         "@type": "Interface",
         "contents": {
-          "name": "xi_flunn",
+          "name": "humpf_nu",
           "schema": "long",
           "@type": "Telemetry"
         }
@@ -27,10 +27,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_vroo;1",
+        "@id": "dtmi:example:humpf_pi;1",
         "@type": "Interface",
         "contents": {
-          "name": "xi_yekk",
+          "name": "humpf_omicron",
           "schema": "string",
           "@type": "dtmi:dtdl:class:Telemetry;3"
         }
diff --git a/DTDL/v3/spec/Requirement-ClassArrayContextConformsV3.json b/DTDL/v3/spec/Requirement-ClassArrayContextConformsV3.json
index 391af64a..f0e623c9 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayContextConformsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayContextConformsV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_wum;1",
+        "@id": "dtmi:example:flunn_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nuh_yuzz",
+          "name": "flunn_psi",
           "schema": {
             "@type": "Array",
             "elementSchema": "integer",
@@ -29,11 +29,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_humpf;1",
+        "@id": "dtmi:example:flunn_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nuh_um",
+          "name": "flunn_yuzz",
           "schema": {
             "@type": "Array",
             "elementSchema": "long",
@@ -51,11 +51,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_glikk;1",
+        "@id": "dtmi:example:flunn_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nuh_fuddle",
+          "name": "flunn_um",
           "schema": {
             "@type": "Array",
             "elementSchema": "string",
@@ -75,11 +75,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_snee;1",
+        "@id": "dtmi:example:flunn_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nuh_nuh",
+          "name": "flunn_fuddle",
           "schema": {
             "@type": "Array",
             "elementSchema": "time",
@@ -97,11 +97,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_thnad;1",
+        "@id": "dtmi:example:flunn_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nuh_quan",
+          "name": "flunn_nuh",
           "schema": {
             "@type": "Array",
             "elementSchema": "boolean",
@@ -119,11 +119,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_floob;1",
+        "@id": "dtmi:example:flunn_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nuh_spazz",
+          "name": "flunn_quan",
           "schema": {
             "@type": "Array",
             "elementSchema": "date",
@@ -141,11 +141,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_jogg;1",
+        "@id": "dtmi:example:flunn_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nuh_zatz",
+          "name": "flunn_spazz",
           "schema": {
             "@type": "Array",
             "elementSchema": "dateTime",
@@ -165,11 +165,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_itch;1",
+        "@id": "dtmi:example:flunn_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nuh_flunn",
+          "name": "flunn_zatz",
           "schema": {
             "@type": "Array",
             "elementSchema": "double",
@@ -189,11 +189,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_vroo;1",
+        "@id": "dtmi:example:flunn_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nuh_yekk",
+          "name": "flunn_flunn",
           "schema": {
             "@type": "Array",
             "elementSchema": "duration",
@@ -213,15 +213,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_alpha;1",
+        "@id": "dtmi:example:flunn_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nuh_hi",
+          "name": "flunn_yekk",
           "schema": {
             "@type": "Array",
             "elementSchema": "float",
-            "@context": {}
+            "@context": "dtmi:dtdl:extension:quantitativeTypes"
           }
         }
       }
@@ -235,17 +235,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_gamma;1",
+        "@id": "dtmi:example:itch_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "snee_beta",
+          "name": "flunn_hi",
           "schema": {
             "@type": "Array",
             "elementSchema": "integer",
-            "@context": [
-              {}
-            ]
+            "@context": "http://dtdl/extension/quantitativeTypes/1"
           }
         }
       }
@@ -259,15 +257,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_epsilon;1",
+        "@id": "dtmi:example:itch_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "snee_delta",
+          "name": "itch_beta",
           "schema": {
             "@type": "Array",
             "elementSchema": "long",
-            "@context": "dtmi:dtdl:extension:quantitativeTypes"
+            "@context": "quantitativeTypes;1"
           }
         }
       }
@@ -281,15 +279,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_eta;1",
+        "@id": "dtmi:example:itch_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "snee_zeta",
+          "name": "itch_delta",
           "schema": {
             "@type": "Array",
             "elementSchema": "string",
-            "@context": "http://dtdl/extension/quantitativeTypes/1"
+            "@context": {}
           }
         }
       }
@@ -303,15 +301,67 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_iota;1",
+        "@id": "dtmi:example:itch_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "snee_theta",
+          "name": "itch_zeta",
           "schema": {
             "@type": "Array",
             "elementSchema": "time",
-            "@context": "quantitativeTypes;1"
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:itch_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "itch_theta",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "boolean",
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:itch_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "itch_kappa",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "date",
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassArrayIdDuplicateV3.json b/DTDL/v3/spec/Requirement-ClassArrayIdDuplicateV3.json
index cc9bd4de..d6f26771 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayIdDuplicateV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayIdDuplicateV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_vroo;1",
+        "@id": "dtmi:example:vroo_alpha;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:quan_vroo;1",
+          "@id": "dtmi:example:vroo_alpha;1",
           "@type": "Property",
-          "name": "quan_hi",
+          "name": "vroo_beta",
           "schema": {
-            "@id": "dtmi:example:quan_vroo;1",
+            "@id": "dtmi:example:vroo_alpha;1",
             "@type": "Array",
-            "elementSchema": "double"
+            "elementSchema": "float"
           }
         }
       }
@@ -30,17 +30,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_alpha;1",
+        "@id": "dtmi:example:vroo_gamma;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:thnad_alpha;1",
+          "@id": "dtmi:example:vroo_gamma;1",
           "@type": "Property",
-          "name": "thnad_beta",
+          "name": "vroo_delta",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "@id": "dtmi:example:thnad_alpha;1",
+            "@id": "dtmi:example:vroo_gamma;1",
             "@type": "Array",
-            "elementSchema": "duration"
+            "elementSchema": "integer"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassArrayIdIsDtmiV3.json b/DTDL/v3/spec/Requirement-ClassArrayIdIsDtmiV3.json
index bcd85fd0..7f5b5011 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayIdIsDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayIdIsDtmiV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_pi;1",
+        "@id": "dtmi:example:itch_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;7",
           "@type": "Array",
-          "elementSchema": "duration"
+          "elementSchema": "integer"
         }
       }
     ]
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_rho;1",
+        "@id": "dtmi:example:itch_tau;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;108675309",
           "@type": "Array",
-          "elementSchema": "float"
+          "elementSchema": "long"
         }
       }
     ]
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_sigma;1",
+        "@id": "dtmi:example:itch_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;999999999",
           "@type": "Array",
-          "elementSchema": "integer"
+          "elementSchema": "string"
         }
       }
     ]
@@ -61,12 +61,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_tau;1",
+        "@id": "dtmi:example:itch_phi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo;1",
           "@type": "Array",
-          "elementSchema": "long"
+          "elementSchema": "time"
         }
       }
     ]
@@ -79,12 +79,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_upsilon;1",
+        "@id": "dtmi:example:itch_chi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar",
           "@type": "Array",
-          "elementSchema": "string"
+          "elementSchema": "boolean"
         }
       }
     ]
@@ -97,12 +97,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_phi;1",
+        "@id": "dtmi:example:itch_psi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.14",
           "@type": "Array",
-          "elementSchema": "time"
+          "elementSchema": "date"
         }
       }
     ]
@@ -115,12 +115,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_chi;1",
+        "@id": "dtmi:example:itch_omega;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.141592",
           "@type": "Array",
-          "elementSchema": "boolean"
+          "elementSchema": "dateTime"
         }
       }
     ]
@@ -133,12 +133,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_psi;1",
+        "@id": "dtmi:example:itch_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@id": null,
           "@type": "Array",
-          "elementSchema": "date"
+          "elementSchema": "double"
         }
       }
     ]
@@ -151,13 +151,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_omega;1",
+        "@id": "dtmi:example:itch_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": null,
           "@type": "Array",
-          "elementSchema": "dateTime"
+          "elementSchema": "duration"
         }
       }
     ]
@@ -170,12 +170,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_yuzz;1",
+        "@id": "dtmi:example:itch_um;1",
         "@type": "Interface",
         "schemas": {
           "@id": 626,
           "@type": "Array",
-          "elementSchema": "double"
+          "elementSchema": "float"
         }
       }
     ]
@@ -188,13 +188,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_wum;1",
+        "@id": "dtmi:example:itch_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": 626,
           "@type": "Array",
-          "elementSchema": "duration"
+          "elementSchema": "integer"
         }
       }
     ]
@@ -207,12 +207,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_um;1",
+        "@id": "dtmi:example:itch_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@id": true,
           "@type": "Array",
-          "elementSchema": "float"
+          "elementSchema": "long"
         }
       }
     ]
@@ -225,13 +225,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_humpf;1",
+        "@id": "dtmi:example:itch_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": true,
           "@type": "Array",
-          "elementSchema": "integer"
+          "elementSchema": "string"
         }
       }
     ]
@@ -244,14 +244,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_fuddle;1",
+        "@id": "dtmi:example:itch_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@id": {
             "@value": "dtmi:apparently:valid:identifier;3"
           },
           "@type": "Array",
-          "elementSchema": "long"
+          "elementSchema": "time"
         }
       }
     ]
@@ -264,7 +264,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_glikk;1",
+        "@id": "dtmi:example:itch_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -272,7 +272,7 @@
             "@value": "dtmi:apparently:valid:identifier;3"
           },
           "@type": "Array",
-          "elementSchema": "string"
+          "elementSchema": "boolean"
         }
       }
     ]
@@ -285,12 +285,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_nuh;1",
+        "@id": "dtmi:example:itch_quan;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;0",
           "@type": "Array",
-          "elementSchema": "time"
+          "elementSchema": "date"
         }
       }
     ]
@@ -303,13 +303,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_snee;1",
+        "@id": "dtmi:example:itch_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0",
           "@type": "Array",
-          "elementSchema": "boolean"
+          "elementSchema": "dateTime"
         }
       }
     ]
@@ -322,12 +322,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_quan;1",
+        "@id": "dtmi:example:itch_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Array",
-          "elementSchema": "date"
+          "elementSchema": "double"
         }
       }
     ]
@@ -340,13 +340,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_thnad;1",
+        "@id": "dtmi:example:itch_floob;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Array",
-          "elementSchema": "dateTime"
+          "elementSchema": "duration"
         }
       }
     ]
@@ -359,12 +359,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_spazz;1",
+        "@id": "dtmi:example:itch_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Array",
-          "elementSchema": "double"
+          "elementSchema": "float"
         }
       }
     ]
@@ -377,13 +377,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_floob;1",
+        "@id": "dtmi:example:itch_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Array",
-          "elementSchema": "duration"
+          "elementSchema": "integer"
         }
       }
     ]
@@ -396,12 +396,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_zatz;1",
+        "@id": "dtmi:example:itch_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;1a",
           "@type": "Array",
-          "elementSchema": "float"
+          "elementSchema": "long"
         }
       }
     ]
@@ -414,13 +414,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_jogg;1",
+        "@id": "dtmi:example:itch_itch;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1a",
           "@type": "Array",
-          "elementSchema": "integer"
+          "elementSchema": "string"
         }
       }
     ]
@@ -433,12 +433,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_flunn;1",
+        "@id": "dtmi:example:itch_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Array",
-          "elementSchema": "long"
+          "elementSchema": "time"
         }
       }
     ]
@@ -451,13 +451,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_itch;1",
+        "@id": "dtmi:example:itch_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Array",
-          "elementSchema": "string"
+          "elementSchema": "boolean"
         }
       }
     ]
@@ -470,12 +470,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_yekk;1",
+        "@id": "dtmi:example:itch_hi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Array",
-          "elementSchema": "time"
+          "elementSchema": "date"
         }
       }
     ]
@@ -488,13 +488,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_vroo;1",
+        "@id": "dtmi:example:yekk_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Array",
-          "elementSchema": "boolean"
+          "elementSchema": "dateTime"
         }
       }
     ]
@@ -507,12 +507,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_hi;1",
+        "@id": "dtmi:example:yekk_beta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Array",
-          "elementSchema": "date"
+          "elementSchema": "double"
         }
       }
     ]
@@ -525,13 +525,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_alpha;1",
+        "@id": "dtmi:example:yekk_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Array",
-          "elementSchema": "dateTime"
+          "elementSchema": "duration"
         }
       }
     ]
@@ -544,12 +544,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_beta;1",
+        "@id": "dtmi:example:yekk_delta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Array",
-          "elementSchema": "double"
+          "elementSchema": "float"
         }
       }
     ]
@@ -562,13 +562,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_gamma;1",
+        "@id": "dtmi:example:yekk_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Array",
-          "elementSchema": "duration"
+          "elementSchema": "integer"
         }
       }
     ]
@@ -581,12 +581,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_delta;1",
+        "@id": "dtmi:example:yekk_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;01",
           "@type": "Array",
-          "elementSchema": "float"
+          "elementSchema": "long"
         }
       }
     ]
@@ -599,13 +599,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_epsilon;1",
+        "@id": "dtmi:example:yekk_eta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;01",
           "@type": "Array",
-          "elementSchema": "integer"
+          "elementSchema": "string"
         }
       }
     ]
@@ -618,12 +618,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_zeta;1",
+        "@id": "dtmi:example:yekk_theta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;",
           "@type": "Array",
-          "elementSchema": "long"
+          "elementSchema": "time"
         }
       }
     ]
@@ -636,13 +636,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_eta;1",
+        "@id": "dtmi:example:yekk_iota;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;",
           "@type": "Array",
-          "elementSchema": "string"
+          "elementSchema": "boolean"
         }
       }
     ]
@@ -655,12 +655,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_theta;1",
+        "@id": "dtmi:example:yekk_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Array",
-          "elementSchema": "time"
+          "elementSchema": "date"
         }
       }
     ]
@@ -673,13 +673,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_iota;1",
+        "@id": "dtmi:example:yekk_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Array",
-          "elementSchema": "boolean"
+          "elementSchema": "dateTime"
         }
       }
     ]
@@ -692,12 +692,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_kappa;1",
+        "@id": "dtmi:example:yekk_mu;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Array",
-          "elementSchema": "date"
+          "elementSchema": "double"
         }
       }
     ]
@@ -710,13 +710,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_lambda;1",
+        "@id": "dtmi:example:yekk_nu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Array",
-          "elementSchema": "dateTime"
+          "elementSchema": "duration"
         }
       }
     ]
@@ -729,12 +729,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_mu;1",
+        "@id": "dtmi:example:yekk_xi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:test:1seg;1",
           "@type": "Array",
-          "elementSchema": "double"
+          "elementSchema": "float"
         }
       }
     ]
@@ -747,13 +747,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_nu;1",
+        "@id": "dtmi:example:yekk_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:1seg;1",
           "@type": "Array",
-          "elementSchema": "duration"
+          "elementSchema": "integer"
         }
       }
     ]
@@ -766,12 +766,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_xi;1",
+        "@id": "dtmi:example:yekk_pi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Array",
-          "elementSchema": "float"
+          "elementSchema": "long"
         }
       }
     ]
@@ -784,13 +784,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_omicron;1",
+        "@id": "dtmi:example:yekk_rho;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Array",
-          "elementSchema": "integer"
+          "elementSchema": "string"
         }
       }
     ]
@@ -803,12 +803,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_pi;1",
+        "@id": "dtmi:example:yekk_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo::bar;1",
           "@type": "Array",
-          "elementSchema": "long"
+          "elementSchema": "time"
         }
       }
     ]
@@ -821,13 +821,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_rho;1",
+        "@id": "dtmi:example:yekk_tau;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo::bar;1",
           "@type": "Array",
-          "elementSchema": "string"
+          "elementSchema": "boolean"
         }
       }
     ]
@@ -840,12 +840,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_sigma;1",
+        "@id": "dtmi:example:yekk_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@id": "urn:foo:bar:1",
           "@type": "Array",
-          "elementSchema": "time"
+          "elementSchema": "date"
         }
       }
     ]
@@ -858,13 +858,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_tau;1",
+        "@id": "dtmi:example:yekk_phi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "urn:foo:bar:1",
           "@type": "Array",
-          "elementSchema": "boolean"
+          "elementSchema": "dateTime"
         }
       }
     ]
@@ -877,12 +877,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_upsilon;1",
+        "@id": "dtmi:example:yekk_chi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "http://foo/bar/baz",
           "@type": "Array",
-          "elementSchema": "date"
+          "elementSchema": "double"
         }
       }
     ]
@@ -895,13 +895,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_phi;1",
+        "@id": "dtmi:example:yekk_psi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "http://foo/bar/baz",
           "@type": "Array",
-          "elementSchema": "dateTime"
+          "elementSchema": "duration"
         }
       }
     ]
@@ -914,12 +914,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_chi;1",
+        "@id": "dtmi:example:yekk_omega;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:;1",
           "@type": "Array",
-          "elementSchema": "double"
+          "elementSchema": "float"
         }
       }
     ]
@@ -932,13 +932,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_psi;1",
+        "@id": "dtmi:example:yekk_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:;1",
           "@type": "Array",
-          "elementSchema": "duration"
+          "elementSchema": "integer"
         }
       }
     ]
@@ -951,12 +951,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_omega;1",
+        "@id": "dtmi:example:yekk_wum;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:dtdl:example;1",
           "@type": "Array",
-          "elementSchema": "float"
+          "elementSchema": "long"
         }
       }
     ]
@@ -969,13 +969,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_yuzz;1",
+        "@id": "dtmi:example:yekk_um;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:dtdl:example;1",
           "@type": "Array",
-          "elementSchema": "integer"
+          "elementSchema": "string"
         }
       }
     ]
@@ -988,12 +988,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_wum;1",
+        "@id": "dtmi:example:yekk_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:standard:example;1",
           "@type": "Array",
-          "elementSchema": "long"
+          "elementSchema": "time"
         }
       }
     ]
@@ -1006,13 +1006,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_um;1",
+        "@id": "dtmi:example:yekk_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:standard:example;1",
           "@type": "Array",
-          "elementSchema": "string"
+          "elementSchema": "boolean"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassArrayIdNotArrayV3.json b/DTDL/v3/spec/Requirement-ClassArrayIdNotArrayV3.json
index 1c6bb542..48c8e8ad 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayIdNotArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayIdNotArrayV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_humpf;1",
+        "@id": "dtmi:example:yekk_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
             "dtmi:foo:bar;7"
           ],
           "@type": "Array",
-          "elementSchema": "time"
+          "elementSchema": "date"
         }
       }
     ]
@@ -27,7 +27,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_fuddle;1",
+        "@id": "dtmi:example:yekk_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -35,7 +35,7 @@
             "dtmi:foo:bar;7"
           ],
           "@type": "Array",
-          "elementSchema": "boolean"
+          "elementSchema": "dateTime"
         }
       }
     ]
@@ -48,14 +48,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_glikk;1",
+        "@id": "dtmi:example:yekk_snee;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
             "dtmi:foo:bar;108675309"
           ],
           "@type": "Array",
-          "elementSchema": "date"
+          "elementSchema": "double"
         }
       }
     ]
@@ -68,7 +68,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_nuh;1",
+        "@id": "dtmi:example:yekk_quan;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -76,7 +76,7 @@
             "dtmi:foo:bar;108675309"
           ],
           "@type": "Array",
-          "elementSchema": "dateTime"
+          "elementSchema": "duration"
         }
       }
     ]
@@ -89,14 +89,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_snee;1",
+        "@id": "dtmi:example:yekk_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
             "dtmi:foo:bar;999999999"
           ],
           "@type": "Array",
-          "elementSchema": "double"
+          "elementSchema": "float"
         }
       }
     ]
@@ -109,7 +109,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_quan;1",
+        "@id": "dtmi:example:yekk_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -117,7 +117,7 @@
             "dtmi:foo:bar;999999999"
           ],
           "@type": "Array",
-          "elementSchema": "duration"
+          "elementSchema": "integer"
         }
       }
     ]
@@ -130,14 +130,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_thnad;1",
+        "@id": "dtmi:example:yekk_floob;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
             "dtmi:foo;1"
           ],
           "@type": "Array",
-          "elementSchema": "float"
+          "elementSchema": "long"
         }
       }
     ]
@@ -150,7 +150,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_spazz;1",
+        "@id": "dtmi:example:yekk_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -158,7 +158,7 @@
             "dtmi:foo;1"
           ],
           "@type": "Array",
-          "elementSchema": "integer"
+          "elementSchema": "string"
         }
       }
     ]
@@ -171,14 +171,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_floob;1",
+        "@id": "dtmi:example:yekk_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
             "dtmi:foo:bar"
           ],
           "@type": "Array",
-          "elementSchema": "long"
+          "elementSchema": "time"
         }
       }
     ]
@@ -191,7 +191,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_zatz;1",
+        "@id": "dtmi:example:yekk_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -199,7 +199,7 @@
             "dtmi:foo:bar"
           ],
           "@type": "Array",
-          "elementSchema": "string"
+          "elementSchema": "boolean"
         }
       }
     ]
@@ -212,14 +212,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_jogg;1",
+        "@id": "dtmi:example:yekk_itch;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
             "dtmi:foo:bar;3.14"
           ],
           "@type": "Array",
-          "elementSchema": "time"
+          "elementSchema": "date"
         }
       }
     ]
@@ -232,7 +232,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_flunn;1",
+        "@id": "dtmi:example:yekk_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -240,7 +240,7 @@
             "dtmi:foo:bar;3.14"
           ],
           "@type": "Array",
-          "elementSchema": "boolean"
+          "elementSchema": "dateTime"
         }
       }
     ]
@@ -253,14 +253,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_itch;1",
+        "@id": "dtmi:example:yekk_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
             "dtmi:foo:bar;3.141592"
           ],
           "@type": "Array",
-          "elementSchema": "date"
+          "elementSchema": "double"
         }
       }
     ]
@@ -273,7 +273,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_yekk;1",
+        "@id": "dtmi:example:yekk_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -281,7 +281,7 @@
             "dtmi:foo:bar;3.141592"
           ],
           "@type": "Array",
-          "elementSchema": "dateTime"
+          "elementSchema": "duration"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassArrayIdRequiredV3.json b/DTDL/v3/spec/Requirement-ClassArrayIdRequiredV3.json
index 8844714c..98b7c57f 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayIdRequiredV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayIdRequiredV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_lambda;1",
+        "@id": "dtmi:example:itch_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "snee_kappa",
+          "name": "itch_mu",
           "schema": {
             "@type": "Array",
-            "elementSchema": "boolean"
+            "elementSchema": "dateTime"
           }
         }
       }
@@ -28,12 +28,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_nu;1",
+        "@id": "dtmi:example:itch_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_mu;1",
+          "@id": "dtmi:example:itch_xi;1",
           "@type": "Array",
-          "elementSchema": "date"
+          "elementSchema": "double"
         }
       }
     ]
@@ -46,11 +46,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_xi;1",
+        "@id": "dtmi:example:itch_pi;1",
         "@type": "Interface",
         "schemas": {
           "@type": "Array",
-          "elementSchema": "dateTime"
+          "elementSchema": "duration"
         }
       }
     ]
@@ -63,12 +63,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_omicron;1",
+        "@id": "dtmi:example:itch_rho;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Array",
-          "elementSchema": "double"
+          "elementSchema": "float"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassArrayInvalidKeywordsV3.json b/DTDL/v3/spec/Requirement-ClassArrayInvalidKeywordsV3.json
index a82737b5..28d118d2 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayInvalidKeywordsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayInvalidKeywordsV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_flunn;1",
+        "@id": "dtmi:example:gamma_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_jogg;1",
+          "@id": "dtmi:example:gamma_itch;1",
           "@type": "Array",
-          "elementSchema": "string",
+          "elementSchema": "boolean",
           "@graph": {}
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_yekk;1",
+        "@id": "dtmi:example:gamma_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:jogg_itch;1",
+          "@id": "dtmi:example:gamma_vroo;1",
           "@type": "Array",
-          "elementSchema": "time",
+          "elementSchema": "date",
           "@graph": {}
         }
       }
@@ -46,12 +46,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_hi;1",
+        "@id": "dtmi:example:delta_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_vroo;1",
+          "@id": "dtmi:example:delta_alpha;1",
           "@type": "Array",
-          "elementSchema": "boolean",
+          "elementSchema": "dateTime",
           "@value": 626
         }
       }
@@ -65,13 +65,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_beta;1",
+        "@id": "dtmi:example:delta_delta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_alpha;1",
+          "@id": "dtmi:example:delta_gamma;1",
           "@type": "Array",
-          "elementSchema": "date",
+          "elementSchema": "double",
           "@value": 626
         }
       }
@@ -85,12 +85,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_delta;1",
+        "@id": "dtmi:example:delta_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_gamma;1",
+          "@id": "dtmi:example:delta_epsilon;1",
           "@type": "Array",
-          "elementSchema": "dateTime",
+          "elementSchema": "duration",
           "@language": "en"
         }
       }
@@ -104,13 +104,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_zeta;1",
+        "@id": "dtmi:example:delta_theta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_epsilon;1",
+          "@id": "dtmi:example:delta_eta;1",
           "@type": "Array",
-          "elementSchema": "double",
+          "elementSchema": "float",
           "@language": "en"
         }
       }
@@ -124,12 +124,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_theta;1",
+        "@id": "dtmi:example:delta_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_eta;1",
+          "@id": "dtmi:example:delta_iota;1",
           "@type": "Array",
-          "elementSchema": "duration",
+          "elementSchema": "integer",
           "@foobar": true
         }
       }
@@ -143,13 +143,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_kappa;1",
+        "@id": "dtmi:example:delta_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_iota;1",
+          "@id": "dtmi:example:delta_lambda;1",
           "@type": "Array",
-          "elementSchema": "float",
+          "elementSchema": "long",
           "@foobar": true
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassArrayPropertiesElementSchemaSchemaMaxDepthV3.json b/DTDL/v3/spec/Requirement-ClassArrayPropertiesElementSchemaSchemaMaxDepthV3.json
index a65dfe0d..9c846cc7 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayPropertiesElementSchemaSchemaMaxDepthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayPropertiesElementSchemaSchemaMaxDepthV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_xi;1",
+        "@id": "dtmi:example:gamma_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "snee_nu",
+          "name": "gamma_alpha",
           "schema": {
             "@type": "Array",
             "elementSchema": {
@@ -40,11 +40,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_pi;1",
+        "@id": "dtmi:example:gamma_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "snee_omicron",
+          "name": "gamma_gamma",
           "schema": {
             "@type": "Array",
             "elementSchema": {
@@ -76,11 +76,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_sigma;1",
+        "@id": "dtmi:example:gamma_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "snee_rho",
+          "name": "gamma_epsilon",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Array",
diff --git a/DTDL/v3/spec/Requirement-ClassArrayPropertiesElementSchemaSchemaSelfReferenceV3.json b/DTDL/v3/spec/Requirement-ClassArrayPropertiesElementSchemaSchemaSelfReferenceV3.json
new file mode 100644
index 00000000..ace0ccfc
--- /dev/null
+++ b/DTDL/v3/spec/Requirement-ClassArrayPropertiesElementSchemaSchemaSelfReferenceV3.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:gamma_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_eta",
+          "schema": {
+            "@id": "dtmi:foo:gamma_vroo;1",
+            "@type": "Array",
+            "elementSchema": "dtmi:foo:gamma_vroo;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:gamma_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_iota",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:gamma_vroo;1",
+            "@type": "Array",
+            "elementSchema": "dtmi:foo:gamma_vroo;1"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v3/spec/Requirement-ClassArrayPropertyCommentStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassArrayPropertyCommentStringLengthV3.json
index 459b2073..44f4fda6 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayPropertyCommentStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayPropertyCommentStringLengthV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_gamma;1",
+        "@id": "dtmi:example:hi_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_beta;1",
+          "@id": "dtmi:example:hi_delta;1",
           "@type": "Array",
-          "elementSchema": "integer",
+          "elementSchema": "string",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_epsilon;1",
+        "@id": "dtmi:example:hi_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_delta;1",
+          "@id": "dtmi:example:hi_zeta;1",
           "@type": "Array",
-          "elementSchema": "long",
+          "elementSchema": "time",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -45,13 +45,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_eta;1",
+        "@id": "dtmi:example:hi_iota;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:spazz_zeta;1",
+          "@id": "dtmi:example:hi_theta;1",
           "@type": "Array",
-          "elementSchema": "string",
+          "elementSchema": "boolean",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassArrayPropertyCommentStringV3.json b/DTDL/v3/spec/Requirement-ClassArrayPropertyCommentStringV3.json
index e5cffba3..12390eb5 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayPropertyCommentStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayPropertyCommentStringV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_delta;1",
+        "@id": "dtmi:example:vroo_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_gamma;1",
+          "@id": "dtmi:example:vroo_epsilon;1",
           "@type": "Array",
-          "elementSchema": "float",
+          "elementSchema": "long",
           "comment": "hello"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_zeta;1",
+        "@id": "dtmi:example:vroo_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_epsilon;1",
+          "@id": "dtmi:example:vroo_eta;1",
           "@type": "Array",
-          "elementSchema": "integer",
+          "elementSchema": "string",
           "comment": [
             "hello"
           ]
@@ -47,12 +47,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_theta;1",
+        "@id": "dtmi:example:vroo_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_eta;1",
+          "@id": "dtmi:example:vroo_iota;1",
           "@type": "Array",
-          "elementSchema": "long",
+          "elementSchema": "time",
           "comment": {
             "@value": "hello",
             "@type": "xsd:string"
@@ -69,12 +69,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_kappa;1",
+        "@id": "dtmi:example:vroo_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_iota;1",
+          "@id": "dtmi:example:vroo_lambda;1",
           "@type": "Array",
-          "elementSchema": "string",
+          "elementSchema": "boolean",
           "comment": [
             {
               "@value": "hello",
@@ -93,12 +93,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_mu;1",
+        "@id": "dtmi:example:vroo_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_lambda;1",
+          "@id": "dtmi:example:vroo_nu;1",
           "@type": "Array",
-          "elementSchema": "time",
+          "elementSchema": "date",
           "comment": []
         }
       }
@@ -112,12 +112,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_xi;1",
+        "@id": "dtmi:example:vroo_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_nu;1",
+          "@id": "dtmi:example:vroo_omicron;1",
           "@type": "Array",
-          "elementSchema": "boolean",
+          "elementSchema": "dateTime",
           "comment": null
         }
       }
@@ -131,13 +131,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_pi;1",
+        "@id": "dtmi:example:vroo_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:thnad_omicron;1",
+          "@id": "dtmi:example:vroo_rho;1",
           "@type": "Array",
-          "elementSchema": "date",
+          "elementSchema": "double",
           "comment": null
         }
       }
@@ -151,12 +151,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_sigma;1",
+        "@id": "dtmi:example:vroo_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_rho;1",
+          "@id": "dtmi:example:vroo_tau;1",
           "@type": "Array",
-          "elementSchema": "dateTime",
+          "elementSchema": "duration",
           "comment": true
         }
       }
@@ -170,13 +170,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_upsilon;1",
+        "@id": "dtmi:example:vroo_chi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:thnad_tau;1",
+          "@id": "dtmi:example:vroo_phi;1",
           "@type": "Array",
-          "elementSchema": "double",
+          "elementSchema": "float",
           "comment": true
         }
       }
@@ -190,12 +190,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_chi;1",
+        "@id": "dtmi:example:vroo_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_phi;1",
+          "@id": "dtmi:example:vroo_psi;1",
           "@type": "Array",
-          "elementSchema": "duration",
+          "elementSchema": "integer",
           "comment": 626
         }
       }
@@ -209,13 +209,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_omega;1",
+        "@id": "dtmi:example:vroo_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:thnad_psi;1",
+          "@id": "dtmi:example:vroo_yuzz;1",
           "@type": "Array",
-          "elementSchema": "float",
+          "elementSchema": "long",
           "comment": 626
         }
       }
@@ -229,12 +229,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_wum;1",
+        "@id": "dtmi:example:vroo_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_yuzz;1",
+          "@id": "dtmi:example:vroo_um;1",
           "@type": "Array",
-          "elementSchema": "integer",
+          "elementSchema": "string",
           "comment": [
             null
           ]
@@ -250,13 +250,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_humpf;1",
+        "@id": "dtmi:example:vroo_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:thnad_um;1",
+          "@id": "dtmi:example:vroo_fuddle;1",
           "@type": "Array",
-          "elementSchema": "long",
+          "elementSchema": "time",
           "comment": [
             null
           ]
@@ -272,12 +272,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_glikk;1",
+        "@id": "dtmi:example:vroo_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_fuddle;1",
+          "@id": "dtmi:example:vroo_nuh;1",
           "@type": "Array",
-          "elementSchema": "string",
+          "elementSchema": "boolean",
           "comment": [
             true
           ]
@@ -293,13 +293,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_snee;1",
+        "@id": "dtmi:example:vroo_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:thnad_nuh;1",
+          "@id": "dtmi:example:vroo_quan;1",
           "@type": "Array",
-          "elementSchema": "time",
+          "elementSchema": "date",
           "comment": [
             true
           ]
@@ -315,12 +315,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_thnad;1",
+        "@id": "dtmi:example:vroo_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_quan;1",
+          "@id": "dtmi:example:vroo_spazz;1",
           "@type": "Array",
-          "elementSchema": "boolean",
+          "elementSchema": "dateTime",
           "comment": [
             626
           ]
@@ -336,13 +336,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_floob;1",
+        "@id": "dtmi:example:vroo_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:thnad_spazz;1",
+          "@id": "dtmi:example:vroo_zatz;1",
           "@type": "Array",
-          "elementSchema": "date",
+          "elementSchema": "double",
           "comment": [
             626
           ]
@@ -358,12 +358,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_jogg;1",
+        "@id": "dtmi:example:vroo_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_zatz;1",
+          "@id": "dtmi:example:vroo_flunn;1",
           "@type": "Array",
-          "elementSchema": "dateTime",
+          "elementSchema": "duration",
           "comment": {}
         }
       }
@@ -377,13 +377,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_itch;1",
+        "@id": "dtmi:example:vroo_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:thnad_flunn;1",
+          "@id": "dtmi:example:vroo_yekk;1",
           "@type": "Array",
-          "elementSchema": "double",
+          "elementSchema": "float",
           "comment": {}
         }
       }
@@ -397,12 +397,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_vroo;1",
+        "@id": "dtmi:example:hi_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_yekk;1",
+          "@id": "dtmi:example:vroo_hi;1",
           "@type": "Array",
-          "elementSchema": "duration",
+          "elementSchema": "integer",
           "comment": [
             {}
           ]
@@ -418,13 +418,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_alpha;1",
+        "@id": "dtmi:example:hi_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:thnad_hi;1",
+          "@id": "dtmi:example:hi_beta;1",
           "@type": "Array",
-          "elementSchema": "float",
+          "elementSchema": "long",
           "comment": [
             {}
           ]
diff --git a/DTDL/v3/spec/Requirement-ClassArrayPropertyCommentTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassArrayPropertyCommentTermAndDtmiV3.json
index 9ab0f292..0d6ed2bd 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayPropertyCommentTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayPropertyCommentTermAndDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_upsilon;1",
+        "@id": "dtmi:example:hi_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_rho;1",
+          "@id": "dtmi:example:hi_tau;1",
           "@type": "Array",
-          "comment": "spazz_sigma",
-          "dtmi:dtdl:property:comment;3": "spazz_tau",
-          "elementSchema": "dateTime"
+          "comment": "hi_upsilon",
+          "dtmi:dtdl:property:comment;3": "hi_phi",
+          "elementSchema": "duration"
         }
       }
     ]
@@ -27,15 +27,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_omega;1",
+        "@id": "dtmi:example:hi_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:spazz_phi;1",
+          "@id": "dtmi:example:hi_psi;1",
           "@type": "Array",
-          "comment": "spazz_chi",
-          "dtmi:dtdl:property:comment;3": "spazz_psi",
-          "elementSchema": "double"
+          "comment": "hi_omega",
+          "dtmi:dtdl:property:comment;3": "hi_yuzz",
+          "elementSchema": "float"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassArrayPropertyDescriptionLangStringV3.json b/DTDL/v3/spec/Requirement-ClassArrayPropertyDescriptionLangStringV3.json
index 7513ee81..4be08ae9 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayPropertyDescriptionLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayPropertyDescriptionLangStringV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_wum;1",
+        "@id": "dtmi:example:hi_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_yuzz;1",
+          "@id": "dtmi:example:hi_um;1",
           "@type": "Array",
-          "elementSchema": "duration",
+          "elementSchema": "integer",
           "description": "hello"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_humpf;1",
+        "@id": "dtmi:example:hi_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_um;1",
+          "@id": "dtmi:example:hi_fuddle;1",
           "@type": "Array",
-          "elementSchema": "float",
+          "elementSchema": "long",
           "description": [
             "hello"
           ]
@@ -47,12 +47,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_glikk;1",
+        "@id": "dtmi:example:hi_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_fuddle;1",
+          "@id": "dtmi:example:hi_nuh;1",
           "@type": "Array",
-          "elementSchema": "integer",
+          "elementSchema": "string",
           "description": {
             "en": "hello"
           }
@@ -68,12 +68,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_snee;1",
+        "@id": "dtmi:example:hi_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_nuh;1",
+          "@id": "dtmi:example:hi_quan;1",
           "@type": "Array",
-          "elementSchema": "long",
+          "elementSchema": "time",
           "description": [
             {
               "@value": "hello",
@@ -92,12 +92,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_thnad;1",
+        "@id": "dtmi:example:hi_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_quan;1",
+          "@id": "dtmi:example:hi_spazz;1",
           "@type": "Array",
-          "elementSchema": "string",
+          "elementSchema": "boolean",
           "description": {}
         }
       }
@@ -111,12 +111,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_floob;1",
+        "@id": "dtmi:example:hi_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_spazz;1",
+          "@id": "dtmi:example:hi_zatz;1",
           "@type": "Array",
-          "elementSchema": "time",
+          "elementSchema": "date",
           "description": []
         }
       }
@@ -130,12 +130,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_jogg;1",
+        "@id": "dtmi:example:hi_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_zatz;1",
+          "@id": "dtmi:example:hi_flunn;1",
           "@type": "Array",
-          "elementSchema": "boolean",
+          "elementSchema": "dateTime",
           "description": null
         }
       }
@@ -149,13 +149,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_itch;1",
+        "@id": "dtmi:example:hi_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:spazz_flunn;1",
+          "@id": "dtmi:example:hi_yekk;1",
           "@type": "Array",
-          "elementSchema": "date",
+          "elementSchema": "double",
           "description": null
         }
       }
@@ -169,12 +169,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_vroo;1",
+        "@id": "dtmi:example:alpha_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_yekk;1",
+          "@id": "dtmi:example:hi_hi;1",
           "@type": "Array",
-          "elementSchema": "dateTime",
+          "elementSchema": "duration",
           "description": true
         }
       }
@@ -188,13 +188,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_alpha;1",
+        "@id": "dtmi:example:alpha_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:spazz_hi;1",
+          "@id": "dtmi:example:alpha_beta;1",
           "@type": "Array",
-          "elementSchema": "double",
+          "elementSchema": "float",
           "description": true
         }
       }
@@ -208,12 +208,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_gamma;1",
+        "@id": "dtmi:example:alpha_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_beta;1",
+          "@id": "dtmi:example:alpha_delta;1",
           "@type": "Array",
-          "elementSchema": "duration",
+          "elementSchema": "integer",
           "description": 626
         }
       }
@@ -227,13 +227,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_epsilon;1",
+        "@id": "dtmi:example:alpha_eta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:floob_delta;1",
+          "@id": "dtmi:example:alpha_zeta;1",
           "@type": "Array",
-          "elementSchema": "float",
+          "elementSchema": "long",
           "description": 626
         }
       }
@@ -247,12 +247,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_eta;1",
+        "@id": "dtmi:example:alpha_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_zeta;1",
+          "@id": "dtmi:example:alpha_theta;1",
           "@type": "Array",
-          "elementSchema": "integer",
+          "elementSchema": "string",
           "description": [
             null
           ]
@@ -268,13 +268,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_iota;1",
+        "@id": "dtmi:example:alpha_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:floob_theta;1",
+          "@id": "dtmi:example:alpha_kappa;1",
           "@type": "Array",
-          "elementSchema": "long",
+          "elementSchema": "time",
           "description": [
             null
           ]
@@ -290,12 +290,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_lambda;1",
+        "@id": "dtmi:example:alpha_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_kappa;1",
+          "@id": "dtmi:example:alpha_mu;1",
           "@type": "Array",
-          "elementSchema": "string",
+          "elementSchema": "boolean",
           "description": [
             true
           ]
@@ -311,13 +311,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_nu;1",
+        "@id": "dtmi:example:alpha_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:floob_mu;1",
+          "@id": "dtmi:example:alpha_xi;1",
           "@type": "Array",
-          "elementSchema": "time",
+          "elementSchema": "date",
           "description": [
             true
           ]
@@ -333,12 +333,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_omicron;1",
+        "@id": "dtmi:example:alpha_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_xi;1",
+          "@id": "dtmi:example:alpha_pi;1",
           "@type": "Array",
-          "elementSchema": "boolean",
+          "elementSchema": "dateTime",
           "description": [
             626
           ]
@@ -354,13 +354,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_rho;1",
+        "@id": "dtmi:example:alpha_tau;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:floob_pi;1",
+          "@id": "dtmi:example:alpha_sigma;1",
           "@type": "Array",
-          "elementSchema": "date",
+          "elementSchema": "double",
           "description": [
             626
           ]
@@ -376,12 +376,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_tau;1",
+        "@id": "dtmi:example:alpha_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_sigma;1",
+          "@id": "dtmi:example:alpha_upsilon;1",
           "@type": "Array",
-          "elementSchema": "dateTime",
+          "elementSchema": "duration",
           "description": [
             {}
           ]
@@ -397,13 +397,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_phi;1",
+        "@id": "dtmi:example:alpha_psi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:floob_upsilon;1",
+          "@id": "dtmi:example:alpha_chi;1",
           "@type": "Array",
-          "elementSchema": "double",
+          "elementSchema": "float",
           "description": [
             {}
           ]
@@ -419,12 +419,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_psi;1",
+        "@id": "dtmi:example:alpha_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_chi;1",
+          "@id": "dtmi:example:alpha_omega;1",
           "@type": "Array",
-          "elementSchema": "duration",
+          "elementSchema": "integer",
           "description": {
             "@value": "hello",
             "@language": "en"
@@ -441,13 +441,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_yuzz;1",
+        "@id": "dtmi:example:alpha_um;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:floob_omega;1",
+          "@id": "dtmi:example:alpha_wum;1",
           "@type": "Array",
-          "elementSchema": "float",
+          "elementSchema": "long",
           "description": {
             "@value": "hello",
             "@language": "en"
@@ -464,12 +464,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_um;1",
+        "@id": "dtmi:example:alpha_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_wum;1",
+          "@id": "dtmi:example:alpha_humpf;1",
           "@type": "Array",
-          "elementSchema": "integer",
+          "elementSchema": "string",
           "description": [
             {
               "en": "hello"
@@ -487,13 +487,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_fuddle;1",
+        "@id": "dtmi:example:alpha_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:floob_humpf;1",
+          "@id": "dtmi:example:alpha_glikk;1",
           "@type": "Array",
-          "elementSchema": "long",
+          "elementSchema": "time",
           "description": [
             {
               "en": "hello"
diff --git a/DTDL/v3/spec/Requirement-ClassArrayPropertyDescriptionStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassArrayPropertyDescriptionStringLengthV3.json
index e31e6167..a998eda2 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayPropertyDescriptionStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayPropertyDescriptionStringLengthV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_nuh;1",
+        "@id": "dtmi:example:alpha_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_glikk;1",
+          "@id": "dtmi:example:alpha_snee;1",
           "@type": "Array",
-          "elementSchema": "string",
+          "elementSchema": "boolean",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_quan;1",
+        "@id": "dtmi:example:alpha_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_snee;1",
+          "@id": "dtmi:example:alpha_thnad;1",
           "@type": "Array",
-          "elementSchema": "time",
+          "elementSchema": "date",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -45,13 +45,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_spazz;1",
+        "@id": "dtmi:example:alpha_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:floob_thnad;1",
+          "@id": "dtmi:example:alpha_floob;1",
           "@type": "Array",
-          "elementSchema": "boolean",
+          "elementSchema": "dateTime",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassArrayPropertyDescriptionTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassArrayPropertyDescriptionTermAndDtmiV3.json
index 665d8351..d6a2f272 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayPropertyDescriptionTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayPropertyDescriptionTermAndDtmiV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_epsilon;1",
+        "@id": "dtmi:example:beta_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_beta;1",
+          "@id": "dtmi:example:beta_delta;1",
           "@type": "Array",
           "description": [
-            "zatz_gamma"
+            "beta_epsilon"
           ],
           "dtmi:dtdl:property:description;3": [
-            "zatz_delta"
+            "beta_zeta"
           ],
-          "elementSchema": "duration"
+          "elementSchema": "integer"
         }
       }
     ]
@@ -31,19 +31,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_iota;1",
+        "@id": "dtmi:example:beta_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zatz_zeta;1",
+          "@id": "dtmi:example:beta_theta;1",
           "@type": "Array",
           "description": [
-            "zatz_eta"
+            "beta_iota"
           ],
           "dtmi:dtdl:property:description;3": [
-            "zatz_theta"
+            "beta_kappa"
           ],
-          "elementSchema": "float"
+          "elementSchema": "long"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassArrayPropertyDisplayNameLangStringV3.json b/DTDL/v3/spec/Requirement-ClassArrayPropertyDisplayNameLangStringV3.json
index 997a908e..dfa3a743 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayPropertyDisplayNameLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayPropertyDisplayNameLangStringV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_lambda;1",
+        "@id": "dtmi:example:beta_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_kappa;1",
+          "@id": "dtmi:example:beta_mu;1",
           "@type": "Array",
-          "elementSchema": "integer",
+          "elementSchema": "string",
           "displayName": "hello"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_nu;1",
+        "@id": "dtmi:example:beta_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_mu;1",
+          "@id": "dtmi:example:beta_xi;1",
           "@type": "Array",
-          "elementSchema": "long",
+          "elementSchema": "time",
           "displayName": [
             "hello"
           ]
@@ -47,12 +47,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_omicron;1",
+        "@id": "dtmi:example:beta_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_xi;1",
+          "@id": "dtmi:example:beta_pi;1",
           "@type": "Array",
-          "elementSchema": "string",
+          "elementSchema": "boolean",
           "displayName": {
             "en": "hello"
           }
@@ -68,12 +68,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_rho;1",
+        "@id": "dtmi:example:beta_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_pi;1",
+          "@id": "dtmi:example:beta_sigma;1",
           "@type": "Array",
-          "elementSchema": "time",
+          "elementSchema": "date",
           "displayName": [
             {
               "@value": "hello",
@@ -92,12 +92,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_tau;1",
+        "@id": "dtmi:example:beta_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_sigma;1",
+          "@id": "dtmi:example:beta_upsilon;1",
           "@type": "Array",
-          "elementSchema": "boolean",
+          "elementSchema": "dateTime",
           "displayName": {}
         }
       }
@@ -111,12 +111,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_phi;1",
+        "@id": "dtmi:example:beta_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_upsilon;1",
+          "@id": "dtmi:example:beta_chi;1",
           "@type": "Array",
-          "elementSchema": "date",
+          "elementSchema": "double",
           "displayName": []
         }
       }
@@ -130,12 +130,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_psi;1",
+        "@id": "dtmi:example:beta_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_chi;1",
+          "@id": "dtmi:example:beta_omega;1",
           "@type": "Array",
-          "elementSchema": "dateTime",
+          "elementSchema": "duration",
           "displayName": null
         }
       }
@@ -149,13 +149,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_yuzz;1",
+        "@id": "dtmi:example:beta_um;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zatz_omega;1",
+          "@id": "dtmi:example:beta_wum;1",
           "@type": "Array",
-          "elementSchema": "double",
+          "elementSchema": "float",
           "displayName": null
         }
       }
@@ -169,12 +169,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_um;1",
+        "@id": "dtmi:example:beta_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_wum;1",
+          "@id": "dtmi:example:beta_humpf;1",
           "@type": "Array",
-          "elementSchema": "duration",
+          "elementSchema": "integer",
           "displayName": true
         }
       }
@@ -188,13 +188,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_fuddle;1",
+        "@id": "dtmi:example:beta_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zatz_humpf;1",
+          "@id": "dtmi:example:beta_glikk;1",
           "@type": "Array",
-          "elementSchema": "float",
+          "elementSchema": "long",
           "displayName": true
         }
       }
@@ -208,12 +208,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_nuh;1",
+        "@id": "dtmi:example:beta_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_glikk;1",
+          "@id": "dtmi:example:beta_snee;1",
           "@type": "Array",
-          "elementSchema": "integer",
+          "elementSchema": "string",
           "displayName": 626
         }
       }
@@ -227,13 +227,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_quan;1",
+        "@id": "dtmi:example:beta_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zatz_snee;1",
+          "@id": "dtmi:example:beta_thnad;1",
           "@type": "Array",
-          "elementSchema": "long",
+          "elementSchema": "time",
           "displayName": 626
         }
       }
@@ -247,12 +247,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_spazz;1",
+        "@id": "dtmi:example:beta_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_thnad;1",
+          "@id": "dtmi:example:beta_floob;1",
           "@type": "Array",
-          "elementSchema": "string",
+          "elementSchema": "boolean",
           "displayName": [
             null
           ]
@@ -268,13 +268,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_zatz;1",
+        "@id": "dtmi:example:beta_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zatz_floob;1",
+          "@id": "dtmi:example:beta_jogg;1",
           "@type": "Array",
-          "elementSchema": "time",
+          "elementSchema": "date",
           "displayName": [
             null
           ]
@@ -290,12 +290,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_flunn;1",
+        "@id": "dtmi:example:beta_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_jogg;1",
+          "@id": "dtmi:example:beta_itch;1",
           "@type": "Array",
-          "elementSchema": "boolean",
+          "elementSchema": "dateTime",
           "displayName": [
             true
           ]
@@ -311,13 +311,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_yekk;1",
+        "@id": "dtmi:example:beta_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zatz_itch;1",
+          "@id": "dtmi:example:beta_vroo;1",
           "@type": "Array",
-          "elementSchema": "date",
+          "elementSchema": "double",
           "displayName": [
             true
           ]
@@ -333,12 +333,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_hi;1",
+        "@id": "dtmi:example:gamma_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_vroo;1",
+          "@id": "dtmi:example:gamma_alpha;1",
           "@type": "Array",
-          "elementSchema": "dateTime",
+          "elementSchema": "duration",
           "displayName": [
             626
           ]
@@ -354,13 +354,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_beta;1",
+        "@id": "dtmi:example:gamma_delta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:jogg_alpha;1",
+          "@id": "dtmi:example:gamma_gamma;1",
           "@type": "Array",
-          "elementSchema": "double",
+          "elementSchema": "float",
           "displayName": [
             626
           ]
@@ -376,12 +376,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_delta;1",
+        "@id": "dtmi:example:gamma_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_gamma;1",
+          "@id": "dtmi:example:gamma_epsilon;1",
           "@type": "Array",
-          "elementSchema": "duration",
+          "elementSchema": "integer",
           "displayName": [
             {}
           ]
@@ -397,13 +397,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_zeta;1",
+        "@id": "dtmi:example:gamma_theta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:jogg_epsilon;1",
+          "@id": "dtmi:example:gamma_eta;1",
           "@type": "Array",
-          "elementSchema": "float",
+          "elementSchema": "long",
           "displayName": [
             {}
           ]
@@ -419,12 +419,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_theta;1",
+        "@id": "dtmi:example:gamma_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_eta;1",
+          "@id": "dtmi:example:gamma_iota;1",
           "@type": "Array",
-          "elementSchema": "integer",
+          "elementSchema": "string",
           "displayName": {
             "@value": "hello",
             "@language": "en"
@@ -441,13 +441,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_kappa;1",
+        "@id": "dtmi:example:gamma_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:jogg_iota;1",
+          "@id": "dtmi:example:gamma_lambda;1",
           "@type": "Array",
-          "elementSchema": "long",
+          "elementSchema": "time",
           "displayName": {
             "@value": "hello",
             "@language": "en"
@@ -464,12 +464,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_mu;1",
+        "@id": "dtmi:example:gamma_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_lambda;1",
+          "@id": "dtmi:example:gamma_nu;1",
           "@type": "Array",
-          "elementSchema": "string",
+          "elementSchema": "boolean",
           "displayName": [
             {
               "en": "hello"
@@ -487,13 +487,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_xi;1",
+        "@id": "dtmi:example:gamma_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:jogg_nu;1",
+          "@id": "dtmi:example:gamma_omicron;1",
           "@type": "Array",
-          "elementSchema": "time",
+          "elementSchema": "date",
           "displayName": [
             {
               "en": "hello"
diff --git a/DTDL/v3/spec/Requirement-ClassArrayPropertyDisplayNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassArrayPropertyDisplayNameStringLengthV3.json
index 31bc12df..76cabaa8 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayPropertyDisplayNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayPropertyDisplayNameStringLengthV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_pi;1",
+        "@id": "dtmi:example:gamma_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_omicron;1",
+          "@id": "dtmi:example:gamma_rho;1",
           "@type": "Array",
-          "elementSchema": "boolean",
+          "elementSchema": "dateTime",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_sigma;1",
+        "@id": "dtmi:example:gamma_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_rho;1",
+          "@id": "dtmi:example:gamma_tau;1",
           "@type": "Array",
-          "elementSchema": "date",
+          "elementSchema": "double",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -45,13 +45,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_upsilon;1",
+        "@id": "dtmi:example:gamma_chi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:jogg_tau;1",
+          "@id": "dtmi:example:gamma_phi;1",
           "@type": "Array",
-          "elementSchema": "dateTime",
+          "elementSchema": "duration",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassArrayPropertyDisplayNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassArrayPropertyDisplayNameTermAndDtmiV3.json
index 19b30e87..5a43dd28 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayPropertyDisplayNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayPropertyDisplayNameTermAndDtmiV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_quan;1",
+        "@id": "dtmi:example:gamma_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_glikk;1",
+          "@id": "dtmi:example:gamma_snee;1",
           "@type": "Array",
           "displayName": [
-            "jogg_nuh"
+            "gamma_quan"
           ],
           "dtmi:dtdl:property:displayName;3": [
-            "jogg_snee"
+            "gamma_thnad"
           ],
-          "elementSchema": "integer"
+          "elementSchema": "string"
         }
       }
     ]
@@ -31,19 +31,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_zatz;1",
+        "@id": "dtmi:example:gamma_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:jogg_thnad;1",
+          "@id": "dtmi:example:gamma_floob;1",
           "@type": "Array",
           "displayName": [
-            "jogg_spazz"
+            "gamma_zatz"
           ],
           "dtmi:dtdl:property:displayName;3": [
-            "jogg_floob"
+            "gamma_jogg"
           ],
-          "elementSchema": "long"
+          "elementSchema": "time"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassArrayPropertyElementSchemaElementV3.json b/DTDL/v3/spec/Requirement-ClassArrayPropertyElementSchemaElementV3.json
index 10984ae4..3faabf02 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayPropertyElementSchemaElementV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayPropertyElementSchemaElementV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_um;1",
+        "@id": "dtmi:example:thnad_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_wum",
+          "name": "thnad_sigma",
           "schema": {
             "@type": "Array",
             "elementSchema": {
@@ -31,11 +31,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_fuddle;1",
+        "@id": "dtmi:example:thnad_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_humpf",
+          "name": "thnad_upsilon",
           "schema": {
             "@type": "Array",
             "elementSchema": [
@@ -57,7 +57,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_glikk;1",
+        "@id": "dtmi:example:thnad_chi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
@@ -66,7 +66,7 @@
         },
         "contents": {
           "@type": "Property",
-          "name": "wum_nuh",
+          "name": "thnad_psi",
           "schema": {
             "@type": "Array",
             "elementSchema": "dtmi:ex:dependentRef;1"
@@ -83,7 +83,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_snee;1",
+        "@id": "dtmi:example:thnad_omega;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
@@ -92,7 +92,7 @@
         },
         "contents": {
           "@type": "Property",
-          "name": "wum_quan",
+          "name": "thnad_yuzz",
           "schema": {
             "@type": "Array",
             "elementSchema": [
@@ -111,20 +111,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_zatz;1",
+        "@id": "dtmi:example:thnad_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_floob",
+          "name": "thnad_humpf",
           "schema": {
             "@type": "Array",
             "elementSchema": {
-              "@id": "dtmi:example:wum_thnad;1",
+              "@id": "dtmi:example:thnad_wum;1",
               "@type": "Enum",
               "enumValues": [
                 {
-                  "enumValue": 1106,
-                  "name": "wum_spazz"
+                  "enumValue": 1119,
+                  "name": "thnad_um"
                 }
               ],
               "valueSchema": "integer",
@@ -143,7 +143,60 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_jogg;1",
+        "@id": "dtmi:example:thnad_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "thnad_nuh",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": {
+              "@id": "dtmi:example:thnad_glikk;1",
+              "@type": "Enum",
+              "valueSchema": "integer",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:thnad_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "thnad_thnad",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Array",
+            "elementSchema": {
+              "@id": "dtmi:example:thnad_quan;1",
+              "@type": "Enum",
+              "valueSchema": "integer",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:thnad_floob;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
@@ -152,7 +205,7 @@
         },
         "contents": {
           "@type": "Property",
-          "name": "wum_flunn",
+          "name": "thnad_zatz",
           "schema": {
             "@type": "Array",
             "elementSchema": [
@@ -175,7 +228,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_itch;1",
+        "@id": "dtmi:example:thnad_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
@@ -184,7 +237,7 @@
         },
         "contents": {
           "@type": "Property",
-          "name": "wum_yekk",
+          "name": "thnad_flunn",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Array",
@@ -208,10 +261,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_hi;1",
+        "@id": "dtmi:example:thnad_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_vroo;1",
+          "@id": "dtmi:example:thnad_itch;1",
           "@type": "Array",
           "elementSchema": "boolean"
         }
@@ -226,10 +279,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_beta;1",
+        "@id": "dtmi:example:thnad_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_alpha;1",
+          "@id": "dtmi:example:thnad_vroo;1",
           "@type": "Array",
           "elementSchema": [
             "boolean"
@@ -246,10 +299,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_delta;1",
+        "@id": "dtmi:example:spazz_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_gamma;1",
+          "@id": "dtmi:example:spazz_alpha;1",
           "@type": "Array",
           "elementSchema": "dtmi:dtdl:instance:Schema:boolean;3"
         }
@@ -264,10 +317,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_zeta;1",
+        "@id": "dtmi:example:spazz_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_epsilon;1",
+          "@id": "dtmi:example:spazz_gamma;1",
           "@type": "Array",
           "elementSchema": [
             "dtmi:dtdl:instance:Schema:boolean;3"
@@ -284,10 +337,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_theta;1",
+        "@id": "dtmi:example:spazz_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_eta;1",
+          "@id": "dtmi:example:spazz_epsilon;1",
           "@type": "Array",
           "elementSchema": "point"
         }
@@ -302,10 +355,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_kappa;1",
+        "@id": "dtmi:example:spazz_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_iota;1",
+          "@id": "dtmi:example:spazz_eta;1",
           "@type": "Array",
           "elementSchema": [
             "point"
@@ -322,10 +375,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_mu;1",
+        "@id": "dtmi:example:spazz_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_lambda;1",
+          "@id": "dtmi:example:spazz_iota;1",
           "@type": "Array",
           "elementSchema": "dtmi:standard:schema:geospatial:point;3"
         }
@@ -340,10 +393,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_xi;1",
+        "@id": "dtmi:example:spazz_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_nu;1",
+          "@id": "dtmi:example:spazz_lambda;1",
           "@type": "Array",
           "elementSchema": [
             "dtmi:standard:schema:geospatial:point;3"
@@ -360,10 +413,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_pi;1",
+        "@id": "dtmi:example:spazz_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_omicron;1",
+          "@id": "dtmi:example:spazz_nu;1",
           "@type": "Array",
           "elementSchema": "Foobar"
         }
@@ -378,11 +431,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_sigma;1",
+        "@id": "dtmi:example:spazz_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:um_rho;1",
+          "@id": "dtmi:example:spazz_omicron;1",
           "@type": "Array",
           "elementSchema": "Foobar"
         }
@@ -397,10 +450,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_upsilon;1",
+        "@id": "dtmi:example:spazz_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_tau;1",
+          "@id": "dtmi:example:spazz_rho;1",
           "@type": "Array",
           "elementSchema": null
         }
@@ -415,11 +468,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_chi;1",
+        "@id": "dtmi:example:spazz_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:um_phi;1",
+          "@id": "dtmi:example:spazz_tau;1",
           "@type": "Array",
           "elementSchema": null
         }
@@ -434,10 +487,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_omega;1",
+        "@id": "dtmi:example:spazz_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_psi;1",
+          "@id": "dtmi:example:spazz_phi;1",
           "@type": "Array",
           "elementSchema": true
         }
@@ -452,11 +505,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_wum;1",
+        "@id": "dtmi:example:spazz_omega;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:um_yuzz;1",
+          "@id": "dtmi:example:spazz_psi;1",
           "@type": "Array",
           "elementSchema": true
         }
@@ -471,10 +524,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_humpf;1",
+        "@id": "dtmi:example:spazz_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_um;1",
+          "@id": "dtmi:example:spazz_yuzz;1",
           "@type": "Array",
           "elementSchema": 626
         }
@@ -489,11 +542,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_glikk;1",
+        "@id": "dtmi:example:spazz_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:um_fuddle;1",
+          "@id": "dtmi:example:spazz_um;1",
           "@type": "Array",
           "elementSchema": 626
         }
@@ -508,10 +561,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_snee;1",
+        "@id": "dtmi:example:spazz_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_nuh;1",
+          "@id": "dtmi:example:spazz_fuddle;1",
           "@type": "Array",
           "elementSchema": [
             null
@@ -528,11 +581,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_thnad;1",
+        "@id": "dtmi:example:spazz_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:um_quan;1",
+          "@id": "dtmi:example:spazz_nuh;1",
           "@type": "Array",
           "elementSchema": [
             null
@@ -549,10 +602,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_floob;1",
+        "@id": "dtmi:example:spazz_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_spazz;1",
+          "@id": "dtmi:example:spazz_quan;1",
           "@type": "Array",
           "elementSchema": [
             true
@@ -569,11 +622,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_jogg;1",
+        "@id": "dtmi:example:spazz_floob;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:um_zatz;1",
+          "@id": "dtmi:example:spazz_spazz;1",
           "@type": "Array",
           "elementSchema": [
             true
@@ -590,10 +643,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_itch;1",
+        "@id": "dtmi:example:spazz_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_flunn;1",
+          "@id": "dtmi:example:spazz_zatz;1",
           "@type": "Array",
           "elementSchema": [
             626
@@ -610,11 +663,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_vroo;1",
+        "@id": "dtmi:example:spazz_itch;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:um_yekk;1",
+          "@id": "dtmi:example:spazz_flunn;1",
           "@type": "Array",
           "elementSchema": [
             626
@@ -631,10 +684,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_alpha;1",
+        "@id": "dtmi:example:spazz_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_hi;1",
+          "@id": "dtmi:example:spazz_yekk;1",
           "@type": "Array",
           "elementSchema": {}
         }
@@ -649,11 +702,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_gamma;1",
+        "@id": "dtmi:example:floob_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:humpf_beta;1",
+          "@id": "dtmi:example:spazz_hi;1",
           "@type": "Array",
           "elementSchema": {}
         }
@@ -668,10 +721,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_epsilon;1",
+        "@id": "dtmi:example:floob_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_delta;1",
+          "@id": "dtmi:example:floob_beta;1",
           "@type": "Array",
           "elementSchema": [
             {}
@@ -688,11 +741,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_eta;1",
+        "@id": "dtmi:example:floob_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:humpf_zeta;1",
+          "@id": "dtmi:example:floob_delta;1",
           "@type": "Array",
           "elementSchema": [
             {}
@@ -709,10 +762,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_iota;1",
+        "@id": "dtmi:example:floob_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_theta;1",
+          "@id": "dtmi:example:floob_zeta;1",
           "@type": "Array",
           "elementSchema": []
         }
@@ -727,11 +780,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_lambda;1",
+        "@id": "dtmi:example:floob_iota;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:humpf_kappa;1",
+          "@id": "dtmi:example:floob_theta;1",
           "@type": "Array",
           "elementSchema": []
         }
diff --git a/DTDL/v3/spec/Requirement-ClassArrayPropertyElementSchemaTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassArrayPropertyElementSchemaTermAndDtmiV3.json
index c92424a9..67d1e3f3 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayPropertyElementSchemaTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayPropertyElementSchemaTermAndDtmiV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_mu;1",
+        "@id": "dtmi:example:flunn_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_lambda;1",
+          "@id": "dtmi:example:flunn_iota;1",
           "@type": "Array",
           "elementSchema": "long",
           "dtmi:dtdl:property:elementSchema;3": "string"
@@ -26,11 +26,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_xi;1",
+        "@id": "dtmi:example:flunn_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_nu;1",
+          "@id": "dtmi:example:flunn_lambda;1",
           "@type": "Array",
           "elementSchema": "time",
           "dtmi:dtdl:property:elementSchema;3": "boolean"
diff --git a/DTDL/v3/spec/Requirement-ClassArrayPropertyElementSchemaTypeConformanceV3.json b/DTDL/v3/spec/Requirement-ClassArrayPropertyElementSchemaTypeConformanceV3.json
index 400e4761..7002880f 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayPropertyElementSchemaTypeConformanceV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayPropertyElementSchemaTypeConformanceV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_sigma;1",
+        "@id": "dtmi:example:floob_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_rho;1",
+          "@id": "dtmi:example:floob_omicron;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:humpf_pi;1",
+            "@id": "dtmi:example:floob_xi;1",
             "elementSchema": "boolean",
             "@type": "Array"
           }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_chi;1",
+        "@id": "dtmi:example:floob_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_phi;1",
+          "@id": "dtmi:example:floob_tau;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:humpf_tau;1",
-            "name": "humpf_upsilon",
+            "@id": "dtmi:example:floob_rho;1",
+            "name": "floob_sigma",
             "@type": "Command"
           }
         }
@@ -51,15 +51,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_wum;1",
+        "@id": "dtmi:example:floob_omega;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:humpf_yuzz;1",
+          "@id": "dtmi:example:floob_psi;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:humpf_psi;1",
-            "name": "humpf_omega",
+            "@id": "dtmi:example:floob_phi;1",
+            "name": "floob_chi",
             "@type": "Command"
           }
         }
@@ -74,14 +74,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_glikk;1",
+        "@id": "dtmi:example:floob_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_fuddle;1",
+          "@id": "dtmi:example:floob_um;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:humpf_um;1",
-            "name": "humpf_humpf",
+            "@id": "dtmi:example:floob_yuzz;1",
+            "name": "floob_wum",
             "schema": "date",
             "@type": "CommandRequest"
           }
@@ -97,15 +97,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_thnad;1",
+        "@id": "dtmi:example:floob_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:humpf_quan;1",
+          "@id": "dtmi:example:floob_nuh;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:humpf_nuh;1",
-            "name": "humpf_snee",
+            "@id": "dtmi:example:floob_fuddle;1",
+            "name": "floob_glikk",
             "schema": "dateTime",
             "@type": "CommandRequest"
           }
@@ -121,14 +121,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_jogg;1",
+        "@id": "dtmi:example:floob_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_zatz;1",
+          "@id": "dtmi:example:floob_spazz;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:humpf_spazz;1",
-            "name": "humpf_floob",
+            "@id": "dtmi:example:floob_quan;1",
+            "name": "floob_thnad",
             "schema": "double",
             "@type": "CommandResponse"
           }
@@ -144,15 +144,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_vroo;1",
+        "@id": "dtmi:example:floob_itch;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:humpf_yekk;1",
+          "@id": "dtmi:example:floob_flunn;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:humpf_flunn;1",
-            "name": "humpf_itch",
+            "@id": "dtmi:example:floob_zatz;1",
+            "name": "floob_jogg",
             "schema": "duration",
             "@type": "CommandResponse"
           }
@@ -168,16 +168,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_delta;1",
+        "@id": "dtmi:example:zatz_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_gamma;1",
+          "@id": "dtmi:example:zatz_alpha;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:humpf_hi;1",
-            "name": "fuddle_alpha",
+            "@id": "dtmi:example:floob_yekk;1",
+            "name": "floob_vroo",
             "schema": {
-              "@id": "dtmi:example:fuddle_beta;1",
+              "@id": "dtmi:example:floob_hi;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -194,17 +194,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_iota;1",
+        "@id": "dtmi:example:zatz_eta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_theta;1",
+          "@id": "dtmi:example:zatz_zeta;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:fuddle_epsilon;1",
-            "name": "fuddle_zeta",
+            "@id": "dtmi:example:zatz_gamma;1",
+            "name": "zatz_delta",
             "schema": {
-              "@id": "dtmi:example:fuddle_eta;1",
+              "@id": "dtmi:example:zatz_epsilon;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -221,13 +221,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_mu;1",
+        "@id": "dtmi:example:zatz_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_lambda;1",
+          "@id": "dtmi:example:zatz_iota;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:fuddle_kappa;1",
+            "@id": "dtmi:example:zatz_theta;1",
             "valueSchema": "integer",
             "@type": "Enum"
           }
@@ -243,15 +243,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_pi;1",
+        "@id": "dtmi:example:zatz_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_omicron;1",
+          "@id": "dtmi:example:zatz_nu;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:fuddle_nu;1",
-            "enumValue": 1107,
-            "name": "fuddle_xi",
+            "@id": "dtmi:example:zatz_lambda;1",
+            "enumValue": 1120,
+            "name": "zatz_mu",
             "@type": "EnumValue"
           }
         }
@@ -266,16 +266,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_upsilon;1",
+        "@id": "dtmi:example:zatz_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_tau;1",
+          "@id": "dtmi:example:zatz_rho;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:fuddle_rho;1",
-            "enumValue": 1108,
-            "name": "fuddle_sigma",
+            "@id": "dtmi:example:zatz_omicron;1",
+            "enumValue": 1121,
+            "name": "zatz_pi",
             "@type": "EnumValue"
           }
         }
@@ -290,14 +290,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_omega;1",
+        "@id": "dtmi:example:zatz_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_psi;1",
+          "@id": "dtmi:example:zatz_phi;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:fuddle_phi;1",
-            "name": "fuddle_chi",
+            "@id": "dtmi:example:zatz_tau;1",
+            "name": "zatz_upsilon",
             "schema": "float",
             "@type": "Field"
           }
@@ -313,15 +313,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_humpf;1",
+        "@id": "dtmi:example:zatz_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_um;1",
+          "@id": "dtmi:example:zatz_yuzz;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:fuddle_yuzz;1",
-            "name": "fuddle_wum",
+            "@id": "dtmi:example:zatz_psi;1",
+            "name": "zatz_omega",
             "schema": "integer",
             "@type": "Field"
           }
@@ -337,13 +337,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_nuh;1",
+        "@id": "dtmi:example:zatz_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_glikk;1",
+          "@id": "dtmi:example:zatz_humpf;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:fuddle_fuddle;1",
+            "@id": "dtmi:example:zatz_um;1",
             "@type": "Interface"
           }
         }
@@ -358,14 +358,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_thnad;1",
+        "@id": "dtmi:example:zatz_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_quan;1",
+          "@id": "dtmi:example:zatz_nuh;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:fuddle_snee;1",
+            "@id": "dtmi:example:zatz_glikk;1",
             "@type": "Interface"
           }
         }
@@ -380,19 +380,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_flunn;1",
+        "@id": "dtmi:example:zatz_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_jogg;1",
+          "@id": "dtmi:example:zatz_floob;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:fuddle_spazz;1",
+            "@id": "dtmi:example:zatz_quan;1",
             "mapKey": {
-              "name": "fuddle_floob",
+              "name": "zatz_thnad",
               "schema": "string"
             },
             "mapValue": {
-              "name": "fuddle_zatz",
+              "name": "zatz_spazz",
               "schema": "long"
             },
             "@type": "Map"
@@ -409,14 +409,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_hi;1",
+        "@id": "dtmi:example:zatz_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_vroo;1",
+          "@id": "dtmi:example:zatz_itch;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:fuddle_itch;1",
-            "name": "fuddle_yekk",
+            "@id": "dtmi:example:zatz_jogg;1",
+            "name": "zatz_flunn",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -432,15 +432,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_delta;1",
+        "@id": "dtmi:example:jogg_beta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_gamma;1",
+          "@id": "dtmi:example:jogg_alpha;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:glikk_alpha;1",
-            "name": "glikk_beta",
+            "@id": "dtmi:example:zatz_vroo;1",
+            "name": "zatz_hi",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -456,14 +456,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_theta;1",
+        "@id": "dtmi:example:jogg_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_eta;1",
+          "@id": "dtmi:example:jogg_epsilon;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:glikk_epsilon;1",
-            "name": "glikk_zeta",
+            "@id": "dtmi:example:jogg_gamma;1",
+            "name": "jogg_delta",
             "schema": "string",
             "@type": "MapValue"
           }
@@ -479,15 +479,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_mu;1",
+        "@id": "dtmi:example:jogg_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_lambda;1",
+          "@id": "dtmi:example:jogg_iota;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:glikk_iota;1",
-            "name": "glikk_kappa",
+            "@id": "dtmi:example:jogg_eta;1",
+            "name": "jogg_theta",
             "schema": "time",
             "@type": "MapValue"
           }
@@ -503,13 +503,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_omicron;1",
+        "@id": "dtmi:example:jogg_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_xi;1",
+          "@id": "dtmi:example:jogg_mu;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:glikk_nu;1",
+            "@id": "dtmi:example:jogg_lambda;1",
             "@type": "Object"
           }
         }
@@ -524,14 +524,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_tau;1",
+        "@id": "dtmi:example:jogg_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_sigma;1",
+          "@id": "dtmi:example:jogg_pi;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:glikk_pi;1",
-            "name": "glikk_rho",
+            "@id": "dtmi:example:jogg_xi;1",
+            "name": "jogg_omicron",
             "schema": "boolean",
             "@type": "Property"
           }
@@ -547,15 +547,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_psi;1",
+        "@id": "dtmi:example:jogg_phi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_chi;1",
+          "@id": "dtmi:example:jogg_upsilon;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:glikk_upsilon;1",
-            "name": "glikk_phi",
+            "@id": "dtmi:example:jogg_sigma;1",
+            "name": "jogg_tau",
             "schema": "date",
             "@type": "Property"
           }
@@ -571,14 +571,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_um;1",
+        "@id": "dtmi:example:jogg_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_wum;1",
+          "@id": "dtmi:example:jogg_omega;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:glikk_omega;1",
-            "name": "glikk_yuzz",
+            "@id": "dtmi:example:jogg_chi;1",
+            "name": "jogg_psi",
             "@type": "Relationship"
           }
         }
@@ -593,15 +593,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_nuh;1",
+        "@id": "dtmi:example:jogg_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_glikk;1",
+          "@id": "dtmi:example:jogg_humpf;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:glikk_humpf;1",
-            "name": "glikk_fuddle",
+            "@id": "dtmi:example:jogg_wum;1",
+            "name": "jogg_um",
             "@type": "Relationship"
           }
         }
@@ -616,14 +616,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_spazz;1",
+        "@id": "dtmi:example:jogg_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_thnad;1",
+          "@id": "dtmi:example:jogg_snee;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:glikk_snee;1",
-            "name": "glikk_quan",
+            "@id": "dtmi:example:jogg_glikk;1",
+            "name": "jogg_nuh",
             "schema": "dateTime",
             "@type": "Telemetry"
           }
@@ -639,15 +639,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_flunn;1",
+        "@id": "dtmi:example:jogg_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_jogg;1",
+          "@id": "dtmi:example:jogg_floob;1",
           "@type": "Array",
           "elementSchema": {
-            "@id": "dtmi:example:glikk_floob;1",
-            "name": "glikk_zatz",
+            "@id": "dtmi:example:jogg_thnad;1",
+            "name": "jogg_spazz",
             "schema": "double",
             "@type": "Telemetry"
           }
diff --git a/DTDL/v3/spec/Requirement-ClassArrayPropertyFormallyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Requirement-ClassArrayPropertyFormallyIrrelevantDtmiOrTermV3.json
index 792bcf17..592b3b97 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayPropertyFormallyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayPropertyFormallyIrrelevantDtmiOrTermV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_upsilon;1",
+        "@id": "dtmi:example:delta_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_tau;1",
+          "@id": "dtmi:example:delta_phi;1",
           "@type": "Array",
-          "elementSchema": "boolean",
+          "elementSchema": "dateTime",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_chi;1",
+        "@id": "dtmi:example:delta_omega;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_phi;1",
+          "@id": "dtmi:example:delta_psi;1",
           "@type": "Array",
-          "elementSchema": "date",
+          "elementSchema": "double",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -46,12 +46,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_omega;1",
+        "@id": "dtmi:example:delta_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_psi;1",
+          "@id": "dtmi:example:delta_yuzz;1",
           "@type": "Array",
-          "elementSchema": "dateTime",
+          "elementSchema": "duration",
           "boolean": null
         }
       }
@@ -65,13 +65,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_wum;1",
+        "@id": "dtmi:example:delta_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_yuzz;1",
+          "@id": "dtmi:example:delta_um;1",
           "@type": "Array",
-          "elementSchema": "double",
+          "elementSchema": "float",
           "boolean": null
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassArrayPropertyFormallyUndefinedTermV3.json b/DTDL/v3/spec/Requirement-ClassArrayPropertyFormallyUndefinedTermV3.json
index f98f69aa..5037cc3e 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayPropertyFormallyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayPropertyFormallyUndefinedTermV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_itch;1",
+        "@id": "dtmi:example:delta_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_flunn;1",
+          "@id": "dtmi:example:delta_yekk;1",
           "@type": "Array",
-          "elementSchema": "boolean",
+          "elementSchema": "dateTime",
           "foobar": {}
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_vroo;1",
+        "@id": "dtmi:example:epsilon_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_yekk;1",
+          "@id": "dtmi:example:delta_hi;1",
           "@type": "Array",
-          "elementSchema": "date",
+          "elementSchema": "double",
           "foobar": {}
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassArrayPropertyInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassArrayPropertyInvalidDtmiV3.json
index 7bb57021..83bbbf40 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayPropertyInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayPropertyInvalidDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_humpf;1",
+        "@id": "dtmi:example:delta_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_um;1",
+          "@id": "dtmi:example:delta_fuddle;1",
           "@type": [
             "Array",
             "Foobar"
           ],
-          "elementSchema": "duration",
+          "elementSchema": "integer",
           "dtmi:foo//bar": 626
         }
       }
@@ -29,16 +29,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_glikk;1",
+        "@id": "dtmi:example:delta_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_fuddle;1",
+          "@id": "dtmi:example:delta_nuh;1",
           "@type": [
             "Array",
             "Foobar"
           ],
-          "elementSchema": "float",
+          "elementSchema": "long",
           "dtmi:foo//bar": 626
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassArrayPropertyNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassArrayPropertyNotDtmiNorTermV3.json
index 0be658d1..657b144e 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayPropertyNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayPropertyNotDtmiNorTermV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_snee;1",
+        "@id": "dtmi:example:delta_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_nuh;1",
+          "@id": "dtmi:example:delta_quan;1",
           "@type": [
             "Array",
             "Foobar"
           ],
-          "elementSchema": "integer",
+          "elementSchema": "string",
           "http://foo.com/bar": true
         }
       }
@@ -29,16 +29,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_thnad;1",
+        "@id": "dtmi:example:delta_floob;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_quan;1",
+          "@id": "dtmi:example:delta_spazz;1",
           "@type": [
             "Array",
             "Foobar"
           ],
-          "elementSchema": "long",
+          "elementSchema": "time",
           "http://foo.com/bar": true
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassArrayRequiredPropertiesV3.json b/DTDL/v3/spec/Requirement-ClassArrayRequiredPropertiesV3.json
index daef700f..4b931b10 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayRequiredPropertiesV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayRequiredPropertiesV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_um;1",
+        "@id": "dtmi:example:snee_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_wum;1",
+          "@id": "dtmi:example:snee_sigma;1",
           "elementSchema": "time"
         }
       }
@@ -24,11 +24,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_fuddle;1",
+        "@id": "dtmi:example:snee_phi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omega_humpf;1",
+          "@id": "dtmi:example:snee_upsilon;1",
           "elementSchema": "boolean"
         }
       }
@@ -42,10 +42,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_nuh;1",
+        "@id": "dtmi:example:snee_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_glikk;1",
+          "@id": "dtmi:example:snee_chi;1",
           "@type": "Array"
         }
       }
@@ -59,11 +59,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_quan;1",
+        "@id": "dtmi:example:snee_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omega_snee;1",
+          "@id": "dtmi:example:snee_omega;1",
           "@type": "Array"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassArrayTypeIncludesInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassArrayTypeIncludesInvalidDtmiV3.json
index df00d3c3..a7326235 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayTypeIncludesInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayTypeIncludesInvalidDtmiV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_omicron;1",
+        "@id": "dtmi:example:thnad_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_xi;1",
+          "@id": "dtmi:example:thnad_zeta;1",
           "@type": [
             "Array",
             "dtmi:foo//bar"
@@ -28,11 +28,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_rho;1",
+        "@id": "dtmi:example:thnad_iota;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:wum_pi;1",
+          "@id": "dtmi:example:thnad_theta;1",
           "@type": [
             "Array",
             "dtmi:foo//bar"
diff --git a/DTDL/v3/spec/Requirement-ClassArrayTypeIncludesMaterialV3.json b/DTDL/v3/spec/Requirement-ClassArrayTypeIncludesMaterialV3.json
index ee8e88d3..2450e722 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayTypeIncludesMaterialV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayTypeIncludesMaterialV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_omega;1",
+        "@id": "dtmi:example:quan_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_psi;1",
+          "@id": "dtmi:example:quan_omicron;1",
           "elementSchema": "long",
           "@type": "Array"
         }
@@ -25,10 +25,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_wum;1",
+        "@id": "dtmi:example:quan_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_yuzz;1",
+          "@id": "dtmi:example:quan_rho;1",
           "elementSchema": "string",
           "@type": [
             "Array"
@@ -45,10 +45,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_humpf;1",
+        "@id": "dtmi:example:quan_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_um;1",
+          "@id": "dtmi:example:quan_tau;1",
           "elementSchema": "time",
           "@type": "dtmi:dtdl:class:Array;3"
         }
@@ -63,10 +63,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_glikk;1",
+        "@id": "dtmi:example:quan_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_fuddle;1",
+          "@id": "dtmi:example:quan_phi;1",
           "elementSchema": "boolean",
           "@type": [
             "dtmi:dtdl:class:Array;3"
@@ -83,10 +83,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_snee;1",
+        "@id": "dtmi:example:quan_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_nuh;1",
+          "@id": "dtmi:example:quan_psi;1",
           "elementSchema": "date",
           "@type": "Something"
         }
@@ -101,11 +101,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_thnad;1",
+        "@id": "dtmi:example:quan_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yuzz_quan;1",
+          "@id": "dtmi:example:quan_yuzz;1",
           "elementSchema": "dateTime",
           "@type": "Something"
         }
@@ -120,10 +120,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_floob;1",
+        "@id": "dtmi:example:quan_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_spazz;1",
+          "@id": "dtmi:example:quan_um;1",
           "elementSchema": "double",
           "@type": [
             "Something"
@@ -140,11 +140,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_jogg;1",
+        "@id": "dtmi:example:quan_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yuzz_zatz;1",
+          "@id": "dtmi:example:quan_fuddle;1",
           "elementSchema": "duration",
           "@type": [
             "Something"
diff --git a/DTDL/v3/spec/Requirement-ClassArrayTypeIncludesNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassArrayTypeIncludesNotDtmiNorTermV3.json
index 4586c8da..2d3725f2 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayTypeIncludesNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayTypeIncludesNotDtmiNorTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_tau;1",
+        "@id": "dtmi:example:thnad_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_sigma;1",
+          "@id": "dtmi:example:thnad_kappa;1",
           "@type": [
             "Array",
             "http://foo.com/bar"
@@ -28,11 +28,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_phi;1",
+        "@id": "dtmi:example:thnad_nu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:wum_upsilon;1",
+          "@id": "dtmi:example:thnad_mu;1",
           "@type": [
             "Array",
             "http://foo.com/bar"
diff --git a/DTDL/v3/spec/Requirement-ClassArrayTypeStringOrArrayV3.json b/DTDL/v3/spec/Requirement-ClassArrayTypeStringOrArrayV3.json
index 361a49d9..95e99a40 100644
--- a/DTDL/v3/spec/Requirement-ClassArrayTypeStringOrArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassArrayTypeStringOrArrayV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_spazz;1",
+        "@id": "dtmi:example:snee_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_thnad;1",
+          "@id": "dtmi:example:snee_wum;1",
           "elementSchema": "date",
           "@type": 626
         }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_zatz;1",
+        "@id": "dtmi:example:snee_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omega_floob;1",
+          "@id": "dtmi:example:snee_humpf;1",
           "elementSchema": "dateTime",
           "@type": 626
         }
@@ -44,10 +44,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_flunn;1",
+        "@id": "dtmi:example:snee_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_jogg;1",
+          "@id": "dtmi:example:snee_glikk;1",
           "elementSchema": "double",
           "@type": null
         }
@@ -62,11 +62,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_yekk;1",
+        "@id": "dtmi:example:snee_quan;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omega_itch;1",
+          "@id": "dtmi:example:snee_snee;1",
           "elementSchema": "duration",
           "@type": null
         }
@@ -81,10 +81,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_hi;1",
+        "@id": "dtmi:example:snee_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_vroo;1",
+          "@id": "dtmi:example:snee_thnad;1",
           "elementSchema": "float",
           "@type": true
         }
@@ -99,11 +99,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_beta;1",
+        "@id": "dtmi:example:snee_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yuzz_alpha;1",
+          "@id": "dtmi:example:snee_floob;1",
           "elementSchema": "integer",
           "@type": true
         }
@@ -118,10 +118,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_delta;1",
+        "@id": "dtmi:example:snee_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_gamma;1",
+          "@id": "dtmi:example:snee_jogg;1",
           "elementSchema": "long",
           "@type": {}
         }
@@ -136,11 +136,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_zeta;1",
+        "@id": "dtmi:example:snee_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yuzz_epsilon;1",
+          "@id": "dtmi:example:snee_itch;1",
           "elementSchema": "string",
           "@type": {}
         }
@@ -155,10 +155,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_theta;1",
+        "@id": "dtmi:example:snee_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_eta;1",
+          "@id": "dtmi:example:snee_vroo;1",
           "elementSchema": "time",
           "@type": [
             626
@@ -175,11 +175,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_kappa;1",
+        "@id": "dtmi:example:quan_beta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yuzz_iota;1",
+          "@id": "dtmi:example:quan_alpha;1",
           "elementSchema": "boolean",
           "@type": [
             626
@@ -196,10 +196,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_mu;1",
+        "@id": "dtmi:example:quan_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_lambda;1",
+          "@id": "dtmi:example:quan_gamma;1",
           "elementSchema": "date",
           "@type": [
             null
@@ -216,11 +216,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_xi;1",
+        "@id": "dtmi:example:quan_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yuzz_nu;1",
+          "@id": "dtmi:example:quan_epsilon;1",
           "elementSchema": "dateTime",
           "@type": [
             null
@@ -237,10 +237,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_pi;1",
+        "@id": "dtmi:example:quan_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_omicron;1",
+          "@id": "dtmi:example:quan_eta;1",
           "elementSchema": "double",
           "@type": [
             true
@@ -257,11 +257,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_sigma;1",
+        "@id": "dtmi:example:quan_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yuzz_rho;1",
+          "@id": "dtmi:example:quan_iota;1",
           "elementSchema": "duration",
           "@type": [
             true
@@ -278,10 +278,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_upsilon;1",
+        "@id": "dtmi:example:quan_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_tau;1",
+          "@id": "dtmi:example:quan_lambda;1",
           "elementSchema": "float",
           "@type": [
             {}
@@ -298,11 +298,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_chi;1",
+        "@id": "dtmi:example:quan_xi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yuzz_phi;1",
+          "@id": "dtmi:example:quan_nu;1",
           "elementSchema": "integer",
           "@type": [
             {}
diff --git a/DTDL/v3/spec/Requirement-ClassCommandContextConformsV3.json b/DTDL/v3/spec/Requirement-ClassCommandContextConformsV3.json
index a3987cc1..96508fb5 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandContextConformsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandContextConformsV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_itch;1",
+        "@id": "dtmi:example:theta_vroo;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:hi_flunn;1",
+          "@id": "dtmi:example:theta_yekk;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "hi_jogg",
+            "name": "theta_itch",
             "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_hi;1",
+        "@id": "dtmi:example:iota_beta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:hi_vroo;1",
+          "@id": "dtmi:example:iota_alpha;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "hi_yekk",
+            "name": "theta_hi",
             "@context": []
           }
         }
@@ -51,14 +51,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_gamma;1",
+        "@id": "dtmi:example:iota_epsilon;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:alpha_beta;1",
+          "@id": "dtmi:example:iota_delta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "alpha_alpha",
+            "name": "iota_gamma",
             "@context": [
               "dtmi:dtdl:extension:quantitativeTypes;1"
             ]
@@ -75,14 +75,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_zeta;1",
+        "@id": "dtmi:example:iota_theta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:alpha_epsilon;1",
+          "@id": "dtmi:example:iota_eta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "alpha_delta",
+            "name": "iota_zeta",
             "@context": null
           }
         }
@@ -97,14 +97,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_iota;1",
+        "@id": "dtmi:example:iota_lambda;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:alpha_theta;1",
+          "@id": "dtmi:example:iota_kappa;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "alpha_eta",
+            "name": "iota_iota",
             "@context": 626
           }
         }
@@ -119,14 +119,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_mu;1",
+        "@id": "dtmi:example:iota_xi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:alpha_lambda;1",
+          "@id": "dtmi:example:iota_nu;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "alpha_kappa",
+            "name": "iota_mu",
             "@context": true
           }
         }
@@ -141,14 +141,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_omicron;1",
+        "@id": "dtmi:example:iota_rho;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:alpha_xi;1",
+          "@id": "dtmi:example:iota_pi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "alpha_nu",
+            "name": "iota_omicron",
             "@context": [
               null
             ]
@@ -165,14 +165,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_sigma;1",
+        "@id": "dtmi:example:iota_upsilon;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:alpha_rho;1",
+          "@id": "dtmi:example:iota_tau;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "alpha_pi",
+            "name": "iota_sigma",
             "@context": [
               626
             ]
@@ -189,14 +189,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_phi;1",
+        "@id": "dtmi:example:iota_psi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:alpha_upsilon;1",
+          "@id": "dtmi:example:iota_chi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "alpha_tau",
+            "name": "iota_phi",
             "@context": [
               true
             ]
@@ -213,15 +213,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_omega;1",
+        "@id": "dtmi:example:iota_wum;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:alpha_psi;1",
+          "@id": "dtmi:example:iota_yuzz;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "alpha_chi",
-            "@context": {}
+            "name": "iota_omega",
+            "@context": "dtmi:dtdl:extension:quantitativeTypes"
           }
         }
       }
@@ -235,17 +235,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_um;1",
+        "@id": "dtmi:example:iota_fuddle;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:alpha_wum;1",
+          "@id": "dtmi:example:iota_humpf;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "alpha_yuzz",
-            "@context": [
-              {}
-            ]
+            "name": "iota_um",
+            "@context": "http://dtdl/extension/quantitativeTypes/1"
           }
         }
       }
@@ -259,15 +257,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_glikk;1",
+        "@id": "dtmi:example:iota_snee;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:alpha_fuddle;1",
+          "@id": "dtmi:example:iota_nuh;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "alpha_humpf",
-            "@context": "dtmi:dtdl:extension:quantitativeTypes"
+            "name": "iota_glikk",
+            "@context": "quantitativeTypes;1"
           }
         }
       }
@@ -281,15 +279,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_quan;1",
+        "@id": "dtmi:example:iota_spazz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:alpha_snee;1",
+          "@id": "dtmi:example:iota_thnad;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "alpha_nuh",
-            "@context": "http://dtdl/extension/quantitativeTypes/1"
+            "name": "iota_quan",
+            "@context": {}
           }
         }
       }
@@ -303,15 +301,67 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_floob;1",
+        "@id": "dtmi:example:iota_jogg;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:alpha_spazz;1",
+          "@id": "dtmi:example:iota_zatz;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "alpha_thnad",
-            "@context": "quantitativeTypes;1"
+            "name": "iota_floob",
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:iota_yekk;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:iota_itch;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "iota_flunn",
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:kappa_alpha;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:iota_hi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "iota_vroo",
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandIdDuplicateV3.json b/DTDL/v3/spec/Requirement-ClassCommandIdDuplicateV3.json
index 54e8352b..191c7f17 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandIdDuplicateV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandIdDuplicateV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_gamma;1",
+        "@id": "dtmi:example:nu_lambda;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:epsilon_gamma;1",
+          "@id": "dtmi:example:nu_lambda;1",
           "@type": "Interface",
           "contents": {
-            "@id": "dtmi:example:epsilon_gamma;1",
+            "@id": "dtmi:example:nu_lambda;1",
             "@type": "Command",
-            "name": "epsilon_delta"
+            "name": "nu_mu"
           }
         }
       }
@@ -29,16 +29,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_epsilon;1",
+        "@id": "dtmi:example:nu_nu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:epsilon_epsilon;1",
+          "@id": "dtmi:example:nu_nu;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "@id": "dtmi:example:epsilon_epsilon;1",
+            "@id": "dtmi:example:nu_nu;1",
             "@type": "Command",
-            "name": "epsilon_zeta"
+            "name": "nu_xi"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandIdIsDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandIdIsDtmiV3.json
index 38ec0e95..b7836a99 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandIdIsDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandIdIsDtmiV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_jogg;1",
+        "@id": "dtmi:example:kappa_gamma;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;7",
           "@type": "Command",
-          "name": "alpha_zatz"
+          "name": "kappa_beta"
         }
       }
     ]
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_itch;1",
+        "@id": "dtmi:example:kappa_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;108675309",
           "@type": "Command",
-          "name": "alpha_flunn"
+          "name": "kappa_delta"
         }
       }
     ]
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_vroo;1",
+        "@id": "dtmi:example:kappa_eta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;999999999",
           "@type": "Command",
-          "name": "alpha_yekk"
+          "name": "kappa_zeta"
         }
       }
     ]
@@ -61,12 +61,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_alpha;1",
+        "@id": "dtmi:example:kappa_iota;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo;1",
           "@type": "Command",
-          "name": "alpha_hi"
+          "name": "kappa_theta"
         }
       }
     ]
@@ -79,12 +79,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_gamma;1",
+        "@id": "dtmi:example:kappa_lambda;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar",
           "@type": "Command",
-          "name": "beta_beta"
+          "name": "kappa_kappa"
         }
       }
     ]
@@ -97,12 +97,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_epsilon;1",
+        "@id": "dtmi:example:kappa_nu;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.14",
           "@type": "Command",
-          "name": "beta_delta"
+          "name": "kappa_mu"
         }
       }
     ]
@@ -115,12 +115,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_eta;1",
+        "@id": "dtmi:example:kappa_omicron;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.141592",
           "@type": "Command",
-          "name": "beta_zeta"
+          "name": "kappa_xi"
         }
       }
     ]
@@ -133,12 +133,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_iota;1",
+        "@id": "dtmi:example:kappa_rho;1",
         "@type": "Interface",
         "contents": {
           "@id": null,
           "@type": "Command",
-          "name": "beta_theta"
+          "name": "kappa_pi"
         }
       }
     ]
@@ -151,13 +151,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_lambda;1",
+        "@id": "dtmi:example:kappa_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": null,
           "@type": "Command",
-          "name": "beta_kappa"
+          "name": "kappa_sigma"
         }
       }
     ]
@@ -170,12 +170,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_nu;1",
+        "@id": "dtmi:example:kappa_phi;1",
         "@type": "Interface",
         "contents": {
           "@id": 626,
           "@type": "Command",
-          "name": "beta_mu"
+          "name": "kappa_upsilon"
         }
       }
     ]
@@ -188,13 +188,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_omicron;1",
+        "@id": "dtmi:example:kappa_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": 626,
           "@type": "Command",
-          "name": "beta_xi"
+          "name": "kappa_chi"
         }
       }
     ]
@@ -207,12 +207,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_rho;1",
+        "@id": "dtmi:example:kappa_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@id": true,
           "@type": "Command",
-          "name": "beta_pi"
+          "name": "kappa_omega"
         }
       }
     ]
@@ -225,13 +225,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_tau;1",
+        "@id": "dtmi:example:kappa_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": true,
           "@type": "Command",
-          "name": "beta_sigma"
+          "name": "kappa_wum"
         }
       }
     ]
@@ -244,14 +244,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_phi;1",
+        "@id": "dtmi:example:kappa_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@id": {
             "@value": "dtmi:apparently:valid:identifier;3"
           },
           "@type": "Command",
-          "name": "beta_upsilon"
+          "name": "kappa_humpf"
         }
       }
     ]
@@ -264,7 +264,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_psi;1",
+        "@id": "dtmi:example:kappa_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -272,7 +272,7 @@
             "@value": "dtmi:apparently:valid:identifier;3"
           },
           "@type": "Command",
-          "name": "beta_chi"
+          "name": "kappa_glikk"
         }
       }
     ]
@@ -285,12 +285,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_yuzz;1",
+        "@id": "dtmi:example:kappa_quan;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0",
           "@type": "Command",
-          "name": "beta_omega"
+          "name": "kappa_snee"
         }
       }
     ]
@@ -303,13 +303,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_um;1",
+        "@id": "dtmi:example:kappa_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0",
           "@type": "Command",
-          "name": "beta_wum"
+          "name": "kappa_thnad"
         }
       }
     ]
@@ -322,12 +322,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_fuddle;1",
+        "@id": "dtmi:example:kappa_zatz;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Command",
-          "name": "beta_humpf"
+          "name": "kappa_floob"
         }
       }
     ]
@@ -340,13 +340,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_nuh;1",
+        "@id": "dtmi:example:kappa_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Command",
-          "name": "beta_glikk"
+          "name": "kappa_jogg"
         }
       }
     ]
@@ -359,12 +359,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_quan;1",
+        "@id": "dtmi:example:kappa_yekk;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Command",
-          "name": "beta_snee"
+          "name": "kappa_itch"
         }
       }
     ]
@@ -377,13 +377,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_spazz;1",
+        "@id": "dtmi:example:kappa_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Command",
-          "name": "beta_thnad"
+          "name": "kappa_vroo"
         }
       }
     ]
@@ -396,12 +396,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_zatz;1",
+        "@id": "dtmi:example:lambda_beta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;1a",
           "@type": "Command",
-          "name": "beta_floob"
+          "name": "lambda_alpha"
         }
       }
     ]
@@ -414,13 +414,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_flunn;1",
+        "@id": "dtmi:example:lambda_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1a",
           "@type": "Command",
-          "name": "beta_jogg"
+          "name": "lambda_gamma"
         }
       }
     ]
@@ -433,12 +433,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_yekk;1",
+        "@id": "dtmi:example:lambda_zeta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Command",
-          "name": "beta_itch"
+          "name": "lambda_epsilon"
         }
       }
     ]
@@ -451,13 +451,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_hi;1",
+        "@id": "dtmi:example:lambda_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Command",
-          "name": "beta_vroo"
+          "name": "lambda_eta"
         }
       }
     ]
@@ -470,12 +470,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_beta;1",
+        "@id": "dtmi:example:lambda_kappa;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Command",
-          "name": "gamma_alpha"
+          "name": "lambda_iota"
         }
       }
     ]
@@ -488,13 +488,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_delta;1",
+        "@id": "dtmi:example:lambda_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Command",
-          "name": "gamma_gamma"
+          "name": "lambda_lambda"
         }
       }
     ]
@@ -507,12 +507,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_zeta;1",
+        "@id": "dtmi:example:lambda_xi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Command",
-          "name": "gamma_epsilon"
+          "name": "lambda_nu"
         }
       }
     ]
@@ -525,13 +525,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_theta;1",
+        "@id": "dtmi:example:lambda_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Command",
-          "name": "gamma_eta"
+          "name": "lambda_omicron"
         }
       }
     ]
@@ -544,12 +544,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_kappa;1",
+        "@id": "dtmi:example:lambda_sigma;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Command",
-          "name": "gamma_iota"
+          "name": "lambda_rho"
         }
       }
     ]
@@ -562,13 +562,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_mu;1",
+        "@id": "dtmi:example:lambda_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Command",
-          "name": "gamma_lambda"
+          "name": "lambda_tau"
         }
       }
     ]
@@ -581,12 +581,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_xi;1",
+        "@id": "dtmi:example:lambda_chi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;01",
           "@type": "Command",
-          "name": "gamma_nu"
+          "name": "lambda_phi"
         }
       }
     ]
@@ -599,13 +599,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_pi;1",
+        "@id": "dtmi:example:lambda_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;01",
           "@type": "Command",
-          "name": "gamma_omicron"
+          "name": "lambda_psi"
         }
       }
     ]
@@ -618,12 +618,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_sigma;1",
+        "@id": "dtmi:example:lambda_wum;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;",
           "@type": "Command",
-          "name": "gamma_rho"
+          "name": "lambda_yuzz"
         }
       }
     ]
@@ -636,13 +636,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_upsilon;1",
+        "@id": "dtmi:example:lambda_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;",
           "@type": "Command",
-          "name": "gamma_tau"
+          "name": "lambda_um"
         }
       }
     ]
@@ -655,12 +655,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_chi;1",
+        "@id": "dtmi:example:lambda_glikk;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Command",
-          "name": "gamma_phi"
+          "name": "lambda_fuddle"
         }
       }
     ]
@@ -673,13 +673,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_omega;1",
+        "@id": "dtmi:example:lambda_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Command",
-          "name": "gamma_psi"
+          "name": "lambda_nuh"
         }
       }
     ]
@@ -692,12 +692,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_wum;1",
+        "@id": "dtmi:example:lambda_thnad;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Command",
-          "name": "gamma_yuzz"
+          "name": "lambda_quan"
         }
       }
     ]
@@ -710,13 +710,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_humpf;1",
+        "@id": "dtmi:example:lambda_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Command",
-          "name": "gamma_um"
+          "name": "lambda_spazz"
         }
       }
     ]
@@ -729,12 +729,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_glikk;1",
+        "@id": "dtmi:example:lambda_jogg;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:1seg;1",
           "@type": "Command",
-          "name": "gamma_fuddle"
+          "name": "lambda_zatz"
         }
       }
     ]
@@ -747,13 +747,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_snee;1",
+        "@id": "dtmi:example:lambda_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:1seg;1",
           "@type": "Command",
-          "name": "gamma_nuh"
+          "name": "lambda_flunn"
         }
       }
     ]
@@ -766,12 +766,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_thnad;1",
+        "@id": "dtmi:example:lambda_vroo;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Command",
-          "name": "gamma_quan"
+          "name": "lambda_yekk"
         }
       }
     ]
@@ -784,13 +784,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_floob;1",
+        "@id": "dtmi:example:mu_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Command",
-          "name": "gamma_spazz"
+          "name": "lambda_hi"
         }
       }
     ]
@@ -803,12 +803,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_jogg;1",
+        "@id": "dtmi:example:mu_gamma;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo::bar;1",
           "@type": "Command",
-          "name": "gamma_zatz"
+          "name": "mu_beta"
         }
       }
     ]
@@ -821,13 +821,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_itch;1",
+        "@id": "dtmi:example:mu_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo::bar;1",
           "@type": "Command",
-          "name": "gamma_flunn"
+          "name": "mu_delta"
         }
       }
     ]
@@ -840,12 +840,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_vroo;1",
+        "@id": "dtmi:example:mu_eta;1",
         "@type": "Interface",
         "contents": {
           "@id": "urn:foo:bar:1",
           "@type": "Command",
-          "name": "gamma_yekk"
+          "name": "mu_zeta"
         }
       }
     ]
@@ -858,13 +858,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_alpha;1",
+        "@id": "dtmi:example:mu_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "urn:foo:bar:1",
           "@type": "Command",
-          "name": "gamma_hi"
+          "name": "mu_theta"
         }
       }
     ]
@@ -877,12 +877,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_gamma;1",
+        "@id": "dtmi:example:mu_lambda;1",
         "@type": "Interface",
         "contents": {
           "@id": "http://foo/bar/baz",
           "@type": "Command",
-          "name": "delta_beta"
+          "name": "mu_kappa"
         }
       }
     ]
@@ -895,13 +895,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_epsilon;1",
+        "@id": "dtmi:example:mu_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "http://foo/bar/baz",
           "@type": "Command",
-          "name": "delta_delta"
+          "name": "mu_mu"
         }
       }
     ]
@@ -914,12 +914,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_eta;1",
+        "@id": "dtmi:example:mu_omicron;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:;1",
           "@type": "Command",
-          "name": "delta_zeta"
+          "name": "mu_xi"
         }
       }
     ]
@@ -932,13 +932,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_iota;1",
+        "@id": "dtmi:example:mu_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:;1",
           "@type": "Command",
-          "name": "delta_theta"
+          "name": "mu_pi"
         }
       }
     ]
@@ -951,12 +951,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_lambda;1",
+        "@id": "dtmi:example:mu_tau;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:dtdl:example;1",
           "@type": "Command",
-          "name": "delta_kappa"
+          "name": "mu_sigma"
         }
       }
     ]
@@ -969,13 +969,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_nu;1",
+        "@id": "dtmi:example:mu_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:dtdl:example;1",
           "@type": "Command",
-          "name": "delta_mu"
+          "name": "mu_upsilon"
         }
       }
     ]
@@ -988,12 +988,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_omicron;1",
+        "@id": "dtmi:example:mu_psi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:standard:example;1",
           "@type": "Command",
-          "name": "delta_xi"
+          "name": "mu_chi"
         }
       }
     ]
@@ -1006,13 +1006,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_rho;1",
+        "@id": "dtmi:example:mu_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:standard:example;1",
           "@type": "Command",
-          "name": "delta_pi"
+          "name": "mu_omega"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassCommandIdNotArrayV3.json b/DTDL/v3/spec/Requirement-ClassCommandIdNotArrayV3.json
index 18da20e5..4b5df1c6 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandIdNotArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandIdNotArrayV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_tau;1",
+        "@id": "dtmi:example:mu_um;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;7"
           ],
           "@type": "Command",
-          "name": "delta_sigma"
+          "name": "mu_wum"
         }
       }
     ]
@@ -27,7 +27,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_phi;1",
+        "@id": "dtmi:example:mu_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -35,7 +35,7 @@
             "dtmi:foo:bar;7"
           ],
           "@type": "Command",
-          "name": "delta_upsilon"
+          "name": "mu_humpf"
         }
       }
     ]
@@ -48,14 +48,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_psi;1",
+        "@id": "dtmi:example:mu_nuh;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;108675309"
           ],
           "@type": "Command",
-          "name": "delta_chi"
+          "name": "mu_glikk"
         }
       }
     ]
@@ -68,7 +68,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_yuzz;1",
+        "@id": "dtmi:example:mu_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -76,7 +76,7 @@
             "dtmi:foo:bar;108675309"
           ],
           "@type": "Command",
-          "name": "delta_omega"
+          "name": "mu_snee"
         }
       }
     ]
@@ -89,14 +89,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_um;1",
+        "@id": "dtmi:example:mu_spazz;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;999999999"
           ],
           "@type": "Command",
-          "name": "delta_wum"
+          "name": "mu_thnad"
         }
       }
     ]
@@ -109,7 +109,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_fuddle;1",
+        "@id": "dtmi:example:mu_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -117,7 +117,7 @@
             "dtmi:foo:bar;999999999"
           ],
           "@type": "Command",
-          "name": "delta_humpf"
+          "name": "mu_floob"
         }
       }
     ]
@@ -130,14 +130,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_nuh;1",
+        "@id": "dtmi:example:mu_flunn;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo;1"
           ],
           "@type": "Command",
-          "name": "delta_glikk"
+          "name": "mu_jogg"
         }
       }
     ]
@@ -150,7 +150,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_quan;1",
+        "@id": "dtmi:example:mu_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -158,7 +158,7 @@
             "dtmi:foo;1"
           ],
           "@type": "Command",
-          "name": "delta_snee"
+          "name": "mu_itch"
         }
       }
     ]
@@ -171,14 +171,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_spazz;1",
+        "@id": "dtmi:example:mu_hi;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar"
           ],
           "@type": "Command",
-          "name": "delta_thnad"
+          "name": "mu_vroo"
         }
       }
     ]
@@ -191,7 +191,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_zatz;1",
+        "@id": "dtmi:example:nu_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -199,7 +199,7 @@
             "dtmi:foo:bar"
           ],
           "@type": "Command",
-          "name": "delta_floob"
+          "name": "nu_alpha"
         }
       }
     ]
@@ -212,14 +212,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_flunn;1",
+        "@id": "dtmi:example:nu_delta;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;3.14"
           ],
           "@type": "Command",
-          "name": "delta_jogg"
+          "name": "nu_gamma"
         }
       }
     ]
@@ -232,7 +232,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_yekk;1",
+        "@id": "dtmi:example:nu_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -240,7 +240,7 @@
             "dtmi:foo:bar;3.14"
           ],
           "@type": "Command",
-          "name": "delta_itch"
+          "name": "nu_epsilon"
         }
       }
     ]
@@ -253,14 +253,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_hi;1",
+        "@id": "dtmi:example:nu_theta;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;3.141592"
           ],
           "@type": "Command",
-          "name": "delta_vroo"
+          "name": "nu_eta"
         }
       }
     ]
@@ -273,7 +273,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_beta;1",
+        "@id": "dtmi:example:nu_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -281,7 +281,7 @@
             "dtmi:foo:bar;3.141592"
           ],
           "@type": "Command",
-          "name": "epsilon_alpha"
+          "name": "nu_iota"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassCommandInvalidKeywordsV3.json b/DTDL/v3/spec/Requirement-ClassCommandInvalidKeywordsV3.json
index ee4c6470..8c3850a3 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandInvalidKeywordsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandInvalidKeywordsV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_lambda;1",
+        "@id": "dtmi:example:nuh_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_kappa",
+          "name": "nuh_jogg",
           "@graph": {}
         }
       }
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_nu;1",
+        "@id": "dtmi:example:nuh_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "psi_mu",
+          "name": "nuh_itch",
           "@graph": {}
         }
       }
@@ -44,11 +44,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_omicron;1",
+        "@id": "dtmi:example:nuh_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_xi",
+          "name": "nuh_vroo",
           "@value": 626
         }
       }
@@ -62,12 +62,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_rho;1",
+        "@id": "dtmi:example:snee_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "psi_pi",
+          "name": "snee_alpha",
           "@value": 626
         }
       }
@@ -81,11 +81,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_tau;1",
+        "@id": "dtmi:example:snee_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_sigma",
+          "name": "snee_gamma",
           "@language": "en"
         }
       }
@@ -99,12 +99,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_phi;1",
+        "@id": "dtmi:example:snee_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "psi_upsilon",
+          "name": "snee_epsilon",
           "@language": "en"
         }
       }
@@ -118,11 +118,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_psi;1",
+        "@id": "dtmi:example:snee_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_chi",
+          "name": "snee_eta",
           "@foobar": true
         }
       }
@@ -136,12 +136,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_yuzz;1",
+        "@id": "dtmi:example:snee_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "psi_omega",
+          "name": "snee_iota",
           "@foobar": true
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyCommandTypeSpecificValuesV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyCommandTypeSpecificValuesV3.json
index 5c2d2e7c..64686227 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyCommandTypeSpecificValuesV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyCommandTypeSpecificValuesV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_kappa;1",
+        "@id": "dtmi:example:nu_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_iota",
+          "name": "nu_rho",
           "commandType": "asynchronous"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_mu;1",
+        "@id": "dtmi:example:nu_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_lambda",
+          "name": "nu_tau",
           "commandType": [
             "asynchronous"
           ]
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_xi;1",
+        "@id": "dtmi:example:nu_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_nu",
+          "name": "nu_phi",
           "commandType": "dtmi:dtdl:instance:CommandType:asynchronous;3"
         }
       }
@@ -63,11 +63,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_pi;1",
+        "@id": "dtmi:example:nu_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_omicron",
+          "name": "nu_psi",
           "commandType": [
             "dtmi:dtdl:instance:CommandType:asynchronous;3"
           ]
@@ -83,11 +83,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_sigma;1",
+        "@id": "dtmi:example:nu_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_rho",
+          "name": "nu_yuzz",
           "commandType": [
             "asynchronous",
             "dtmi:dtdl:instance:CommandType:asynchronous;3"
@@ -104,12 +104,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_upsilon;1",
+        "@id": "dtmi:example:nu_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "epsilon_tau",
+          "name": "nu_um",
           "commandType": [
             "asynchronous",
             "dtmi:dtdl:instance:CommandType:asynchronous;3"
@@ -126,11 +126,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_chi;1",
+        "@id": "dtmi:example:nu_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_phi",
+          "name": "nu_fuddle",
           "commandType": "synchronous"
         }
       }
@@ -144,11 +144,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_omega;1",
+        "@id": "dtmi:example:nu_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_psi",
+          "name": "nu_nuh",
           "commandType": [
             "synchronous"
           ]
@@ -164,11 +164,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_wum;1",
+        "@id": "dtmi:example:nu_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_yuzz",
+          "name": "nu_quan",
           "commandType": "dtmi:dtdl:instance:CommandType:synchronous;3"
         }
       }
@@ -182,11 +182,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_humpf;1",
+        "@id": "dtmi:example:nu_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_um",
+          "name": "nu_spazz",
           "commandType": [
             "dtmi:dtdl:instance:CommandType:synchronous;3"
           ]
@@ -202,11 +202,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_glikk;1",
+        "@id": "dtmi:example:nu_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_fuddle",
+          "name": "nu_zatz",
           "commandType": [
             "synchronous",
             "dtmi:dtdl:instance:CommandType:synchronous;3"
@@ -223,12 +223,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_snee;1",
+        "@id": "dtmi:example:nu_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "epsilon_nuh",
+          "name": "nu_flunn",
           "commandType": [
             "synchronous",
             "dtmi:dtdl:instance:CommandType:synchronous;3"
@@ -245,11 +245,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_thnad;1",
+        "@id": "dtmi:example:nu_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_quan",
+          "name": "nu_yekk",
           "commandType": []
         }
       }
@@ -263,11 +263,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_floob;1",
+        "@id": "dtmi:example:xi_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_spazz",
+          "name": "nu_hi",
           "commandType": null
         }
       }
@@ -281,12 +281,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_jogg;1",
+        "@id": "dtmi:example:xi_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "epsilon_zatz",
+          "name": "xi_beta",
           "commandType": null
         }
       }
@@ -300,11 +300,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_itch;1",
+        "@id": "dtmi:example:xi_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_flunn",
+          "name": "xi_delta",
           "commandType": true
         }
       }
@@ -318,12 +318,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_vroo;1",
+        "@id": "dtmi:example:xi_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "epsilon_yekk",
+          "name": "xi_zeta",
           "commandType": true
         }
       }
@@ -337,11 +337,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_alpha;1",
+        "@id": "dtmi:example:xi_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_hi",
+          "name": "xi_theta",
           "commandType": 626
         }
       }
@@ -355,12 +355,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_gamma;1",
+        "@id": "dtmi:example:xi_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "zeta_beta",
+          "name": "xi_kappa",
           "commandType": 626
         }
       }
@@ -374,11 +374,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_epsilon;1",
+        "@id": "dtmi:example:xi_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_delta",
+          "name": "xi_mu",
           "commandType": [
             null
           ]
@@ -394,12 +394,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_eta;1",
+        "@id": "dtmi:example:xi_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "zeta_zeta",
+          "name": "xi_xi",
           "commandType": [
             null
           ]
@@ -415,11 +415,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_iota;1",
+        "@id": "dtmi:example:xi_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_theta",
+          "name": "xi_pi",
           "commandType": [
             true
           ]
@@ -435,12 +435,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_lambda;1",
+        "@id": "dtmi:example:xi_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "zeta_kappa",
+          "name": "xi_sigma",
           "commandType": [
             true
           ]
@@ -456,11 +456,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_nu;1",
+        "@id": "dtmi:example:xi_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_mu",
+          "name": "xi_upsilon",
           "commandType": [
             626
           ]
@@ -476,12 +476,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_omicron;1",
+        "@id": "dtmi:example:xi_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "zeta_xi",
+          "name": "xi_chi",
           "commandType": [
             626
           ]
@@ -497,11 +497,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_rho;1",
+        "@id": "dtmi:example:xi_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_pi",
+          "name": "xi_omega",
           "commandType": {}
         }
       }
@@ -515,12 +515,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_tau;1",
+        "@id": "dtmi:example:xi_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "zeta_sigma",
+          "name": "xi_wum",
           "commandType": {}
         }
       }
@@ -534,11 +534,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_phi;1",
+        "@id": "dtmi:example:xi_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_upsilon",
+          "name": "xi_humpf",
           "commandType": [
             {}
           ]
@@ -554,12 +554,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_psi;1",
+        "@id": "dtmi:example:xi_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "zeta_chi",
+          "name": "xi_glikk",
           "commandType": [
             {}
           ]
@@ -575,11 +575,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_yuzz;1",
+        "@id": "dtmi:example:xi_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_omega",
+          "name": "xi_snee",
           "commandType": "boolean"
         }
       }
@@ -593,12 +593,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_um;1",
+        "@id": "dtmi:example:xi_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "zeta_wum",
+          "name": "xi_thnad",
           "commandType": "boolean"
         }
       }
@@ -612,11 +612,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_fuddle;1",
+        "@id": "dtmi:example:xi_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_humpf",
+          "name": "xi_floob",
           "commandType": "dtmi:dtdl:instance:Schema:boolean;3"
         }
       }
@@ -630,12 +630,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_nuh;1",
+        "@id": "dtmi:example:xi_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "zeta_glikk",
+          "name": "xi_jogg",
           "commandType": "dtmi:dtdl:instance:Schema:boolean;3"
         }
       }
@@ -649,11 +649,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_quan;1",
+        "@id": "dtmi:example:xi_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_snee",
+          "name": "xi_itch",
           "commandType": "date"
         }
       }
@@ -667,12 +667,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_spazz;1",
+        "@id": "dtmi:example:xi_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "zeta_thnad",
+          "name": "xi_vroo",
           "commandType": "date"
         }
       }
@@ -686,11 +686,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_zatz;1",
+        "@id": "dtmi:example:omicron_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_floob",
+          "name": "omicron_alpha",
           "commandType": "dtmi:dtdl:instance:Schema:date;3"
         }
       }
@@ -704,12 +704,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_flunn;1",
+        "@id": "dtmi:example:omicron_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "zeta_jogg",
+          "name": "omicron_gamma",
           "commandType": "dtmi:dtdl:instance:Schema:date;3"
         }
       }
@@ -723,11 +723,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_yekk;1",
+        "@id": "dtmi:example:omicron_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_itch",
+          "name": "omicron_epsilon",
           "commandType": "dateTime"
         }
       }
@@ -741,12 +741,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_hi;1",
+        "@id": "dtmi:example:omicron_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "zeta_vroo",
+          "name": "omicron_eta",
           "commandType": "dateTime"
         }
       }
@@ -760,11 +760,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_beta;1",
+        "@id": "dtmi:example:omicron_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_alpha",
+          "name": "omicron_iota",
           "commandType": "dtmi:dtdl:instance:Schema:dateTime;3"
         }
       }
@@ -778,12 +778,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_delta;1",
+        "@id": "dtmi:example:omicron_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "eta_gamma",
+          "name": "omicron_lambda",
           "commandType": "dtmi:dtdl:instance:Schema:dateTime;3"
         }
       }
@@ -797,11 +797,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_zeta;1",
+        "@id": "dtmi:example:omicron_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_epsilon",
+          "name": "omicron_nu",
           "commandType": "double"
         }
       }
@@ -815,12 +815,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_theta;1",
+        "@id": "dtmi:example:omicron_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "eta_eta",
+          "name": "omicron_omicron",
           "commandType": "double"
         }
       }
@@ -834,11 +834,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_kappa;1",
+        "@id": "dtmi:example:omicron_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_iota",
+          "name": "omicron_rho",
           "commandType": "dtmi:dtdl:instance:Schema:double;3"
         }
       }
@@ -852,12 +852,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_mu;1",
+        "@id": "dtmi:example:omicron_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "eta_lambda",
+          "name": "omicron_tau",
           "commandType": "dtmi:dtdl:instance:Schema:double;3"
         }
       }
@@ -871,11 +871,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_xi;1",
+        "@id": "dtmi:example:omicron_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_nu",
+          "name": "omicron_phi",
           "commandType": "duration"
         }
       }
@@ -889,12 +889,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_pi;1",
+        "@id": "dtmi:example:omicron_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "eta_omicron",
+          "name": "omicron_psi",
           "commandType": "duration"
         }
       }
@@ -908,11 +908,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_sigma;1",
+        "@id": "dtmi:example:omicron_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_rho",
+          "name": "omicron_yuzz",
           "commandType": "dtmi:dtdl:instance:Schema:duration;3"
         }
       }
@@ -926,12 +926,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_upsilon;1",
+        "@id": "dtmi:example:omicron_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "eta_tau",
+          "name": "omicron_um",
           "commandType": "dtmi:dtdl:instance:Schema:duration;3"
         }
       }
@@ -945,11 +945,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_chi;1",
+        "@id": "dtmi:example:omicron_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_phi",
+          "name": "omicron_fuddle",
           "commandType": "float"
         }
       }
@@ -963,12 +963,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_omega;1",
+        "@id": "dtmi:example:omicron_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "eta_psi",
+          "name": "omicron_nuh",
           "commandType": "float"
         }
       }
@@ -982,11 +982,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_wum;1",
+        "@id": "dtmi:example:omicron_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_yuzz",
+          "name": "omicron_quan",
           "commandType": "dtmi:dtdl:instance:Schema:float;3"
         }
       }
@@ -1000,12 +1000,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_humpf;1",
+        "@id": "dtmi:example:omicron_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "eta_um",
+          "name": "omicron_spazz",
           "commandType": "dtmi:dtdl:instance:Schema:float;3"
         }
       }
@@ -1019,11 +1019,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_glikk;1",
+        "@id": "dtmi:example:omicron_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_fuddle",
+          "name": "omicron_zatz",
           "commandType": "integer"
         }
       }
@@ -1037,12 +1037,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_snee;1",
+        "@id": "dtmi:example:omicron_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "eta_nuh",
+          "name": "omicron_flunn",
           "commandType": "integer"
         }
       }
@@ -1056,11 +1056,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_thnad;1",
+        "@id": "dtmi:example:omicron_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_quan",
+          "name": "omicron_yekk",
           "commandType": "dtmi:dtdl:instance:Schema:integer;3"
         }
       }
@@ -1074,12 +1074,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_floob;1",
+        "@id": "dtmi:example:pi_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "eta_spazz",
+          "name": "omicron_hi",
           "commandType": "dtmi:dtdl:instance:Schema:integer;3"
         }
       }
@@ -1093,11 +1093,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_jogg;1",
+        "@id": "dtmi:example:pi_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_zatz",
+          "name": "pi_beta",
           "commandType": "long"
         }
       }
@@ -1111,12 +1111,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_itch;1",
+        "@id": "dtmi:example:pi_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "eta_flunn",
+          "name": "pi_delta",
           "commandType": "long"
         }
       }
@@ -1130,11 +1130,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_vroo;1",
+        "@id": "dtmi:example:pi_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_yekk",
+          "name": "pi_zeta",
           "commandType": "dtmi:dtdl:instance:Schema:long;3"
         }
       }
@@ -1148,12 +1148,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_alpha;1",
+        "@id": "dtmi:example:pi_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "eta_hi",
+          "name": "pi_theta",
           "commandType": "dtmi:dtdl:instance:Schema:long;3"
         }
       }
@@ -1167,11 +1167,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_gamma;1",
+        "@id": "dtmi:example:pi_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_beta",
+          "name": "pi_kappa",
           "commandType": "string"
         }
       }
@@ -1185,12 +1185,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_epsilon;1",
+        "@id": "dtmi:example:pi_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "theta_delta",
+          "name": "pi_mu",
           "commandType": "string"
         }
       }
@@ -1204,11 +1204,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_eta;1",
+        "@id": "dtmi:example:pi_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_zeta",
+          "name": "pi_xi",
           "commandType": "dtmi:dtdl:instance:Schema:string;3"
         }
       }
@@ -1222,12 +1222,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_iota;1",
+        "@id": "dtmi:example:pi_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "theta_theta",
+          "name": "pi_pi",
           "commandType": "dtmi:dtdl:instance:Schema:string;3"
         }
       }
@@ -1241,11 +1241,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_lambda;1",
+        "@id": "dtmi:example:pi_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_kappa",
+          "name": "pi_sigma",
           "commandType": "time"
         }
       }
@@ -1259,12 +1259,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_nu;1",
+        "@id": "dtmi:example:pi_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "theta_mu",
+          "name": "pi_upsilon",
           "commandType": "time"
         }
       }
@@ -1278,11 +1278,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_omicron;1",
+        "@id": "dtmi:example:pi_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_xi",
+          "name": "pi_chi",
           "commandType": "dtmi:dtdl:instance:Schema:time;3"
         }
       }
@@ -1296,12 +1296,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_rho;1",
+        "@id": "dtmi:example:pi_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "theta_pi",
+          "name": "pi_omega",
           "commandType": "dtmi:dtdl:instance:Schema:time;3"
         }
       }
@@ -1315,11 +1315,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_tau;1",
+        "@id": "dtmi:example:pi_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_sigma",
+          "name": "pi_wum",
           "commandType": "lineString"
         }
       }
@@ -1333,12 +1333,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_phi;1",
+        "@id": "dtmi:example:pi_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "theta_upsilon",
+          "name": "pi_humpf",
           "commandType": "lineString"
         }
       }
@@ -1352,11 +1352,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_psi;1",
+        "@id": "dtmi:example:pi_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_chi",
+          "name": "pi_glikk",
           "commandType": "dtmi:standard:schema:geospatial:lineString;3"
         }
       }
@@ -1370,12 +1370,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_yuzz;1",
+        "@id": "dtmi:example:pi_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "theta_omega",
+          "name": "pi_snee",
           "commandType": "dtmi:standard:schema:geospatial:lineString;3"
         }
       }
@@ -1389,11 +1389,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_um;1",
+        "@id": "dtmi:example:pi_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_wum",
+          "name": "pi_thnad",
           "commandType": "multiLineString"
         }
       }
@@ -1407,12 +1407,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_fuddle;1",
+        "@id": "dtmi:example:pi_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "theta_humpf",
+          "name": "pi_floob",
           "commandType": "multiLineString"
         }
       }
@@ -1426,11 +1426,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_nuh;1",
+        "@id": "dtmi:example:pi_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_glikk",
+          "name": "pi_jogg",
           "commandType": "dtmi:standard:schema:geospatial:multiLineString;3"
         }
       }
@@ -1444,12 +1444,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_quan;1",
+        "@id": "dtmi:example:pi_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "theta_snee",
+          "name": "pi_itch",
           "commandType": "dtmi:standard:schema:geospatial:multiLineString;3"
         }
       }
@@ -1463,11 +1463,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_spazz;1",
+        "@id": "dtmi:example:pi_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_thnad",
+          "name": "pi_vroo",
           "commandType": "multiPoint"
         }
       }
@@ -1481,12 +1481,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_zatz;1",
+        "@id": "dtmi:example:rho_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "theta_floob",
+          "name": "rho_alpha",
           "commandType": "multiPoint"
         }
       }
@@ -1500,11 +1500,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_flunn;1",
+        "@id": "dtmi:example:rho_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_jogg",
+          "name": "rho_gamma",
           "commandType": "dtmi:standard:schema:geospatial:multiPoint;3"
         }
       }
@@ -1518,12 +1518,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_yekk;1",
+        "@id": "dtmi:example:rho_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "theta_itch",
+          "name": "rho_epsilon",
           "commandType": "dtmi:standard:schema:geospatial:multiPoint;3"
         }
       }
@@ -1537,11 +1537,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_hi;1",
+        "@id": "dtmi:example:rho_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_vroo",
+          "name": "rho_eta",
           "commandType": "multiPolygon"
         }
       }
@@ -1555,12 +1555,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_beta;1",
+        "@id": "dtmi:example:rho_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "iota_alpha",
+          "name": "rho_iota",
           "commandType": "multiPolygon"
         }
       }
@@ -1574,11 +1574,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_delta;1",
+        "@id": "dtmi:example:rho_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_gamma",
+          "name": "rho_lambda",
           "commandType": "dtmi:standard:schema:geospatial:multiPolygon;3"
         }
       }
@@ -1592,12 +1592,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_zeta;1",
+        "@id": "dtmi:example:rho_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "iota_epsilon",
+          "name": "rho_nu",
           "commandType": "dtmi:standard:schema:geospatial:multiPolygon;3"
         }
       }
@@ -1611,11 +1611,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_theta;1",
+        "@id": "dtmi:example:rho_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_eta",
+          "name": "rho_omicron",
           "commandType": "point"
         }
       }
@@ -1629,12 +1629,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_kappa;1",
+        "@id": "dtmi:example:rho_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "iota_iota",
+          "name": "rho_rho",
           "commandType": "point"
         }
       }
@@ -1648,11 +1648,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_mu;1",
+        "@id": "dtmi:example:rho_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_lambda",
+          "name": "rho_tau",
           "commandType": "dtmi:standard:schema:geospatial:point;3"
         }
       }
@@ -1666,12 +1666,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_xi;1",
+        "@id": "dtmi:example:rho_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "iota_nu",
+          "name": "rho_phi",
           "commandType": "dtmi:standard:schema:geospatial:point;3"
         }
       }
@@ -1685,11 +1685,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_pi;1",
+        "@id": "dtmi:example:rho_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_omicron",
+          "name": "rho_psi",
           "commandType": "polygon"
         }
       }
@@ -1703,12 +1703,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_sigma;1",
+        "@id": "dtmi:example:rho_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "iota_rho",
+          "name": "rho_yuzz",
           "commandType": "polygon"
         }
       }
@@ -1722,11 +1722,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_upsilon;1",
+        "@id": "dtmi:example:rho_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_tau",
+          "name": "rho_um",
           "commandType": "dtmi:standard:schema:geospatial:polygon;3"
         }
       }
@@ -1740,12 +1740,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_chi;1",
+        "@id": "dtmi:example:rho_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "iota_phi",
+          "name": "rho_fuddle",
           "commandType": "dtmi:standard:schema:geospatial:polygon;3"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyCommandTypeTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyCommandTypeTermAndDtmiV3.json
index 3c79a515..2acfa4c0 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyCommandTypeTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyCommandTypeTermAndDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_glikk;1",
+        "@id": "dtmi:example:rho_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "commandType": "asynchronous",
           "dtmi:dtdl:property:commandType;3": "asynchronous",
-          "name": "iota_fuddle"
+          "name": "rho_zatz"
         }
       }
     ]
@@ -26,14 +26,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_snee;1",
+        "@id": "dtmi:example:rho_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
           "commandType": "asynchronous",
           "dtmi:dtdl:property:commandType;3": "asynchronous",
-          "name": "iota_nuh"
+          "name": "rho_flunn"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyCommentStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyCommentStringLengthV3.json
index a2db84cc..fb68abe5 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyCommentStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyCommentStringLengthV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_quan;1",
+        "@id": "dtmi:example:sigma_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_snee",
+          "name": "sigma_itch",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_spazz;1",
+        "@id": "dtmi:example:sigma_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_thnad",
+          "name": "sigma_vroo",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_zatz;1",
+        "@id": "dtmi:example:tau_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "kappa_floob",
+          "name": "tau_alpha",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyCommentStringV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyCommentStringV3.json
index 1d292e5c..31b7587c 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyCommentStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyCommentStringV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_thnad;1",
+        "@id": "dtmi:example:rho_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_quan",
+          "name": "rho_yekk",
           "comment": "hello"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_floob;1",
+        "@id": "dtmi:example:sigma_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_spazz",
+          "name": "rho_hi",
           "comment": [
             "hello"
           ]
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_jogg;1",
+        "@id": "dtmi:example:sigma_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_zatz",
+          "name": "sigma_beta",
           "comment": {
             "@value": "hello",
             "@type": "xsd:string"
@@ -66,11 +66,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_itch;1",
+        "@id": "dtmi:example:sigma_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_flunn",
+          "name": "sigma_delta",
           "comment": [
             {
               "@value": "hello",
@@ -89,11 +89,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_vroo;1",
+        "@id": "dtmi:example:sigma_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_yekk",
+          "name": "sigma_zeta",
           "comment": []
         }
       }
@@ -107,11 +107,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_alpha;1",
+        "@id": "dtmi:example:sigma_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_hi",
+          "name": "sigma_theta",
           "comment": null
         }
       }
@@ -125,12 +125,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_gamma;1",
+        "@id": "dtmi:example:sigma_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "kappa_beta",
+          "name": "sigma_kappa",
           "comment": null
         }
       }
@@ -144,11 +144,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_epsilon;1",
+        "@id": "dtmi:example:sigma_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_delta",
+          "name": "sigma_mu",
           "comment": true
         }
       }
@@ -162,12 +162,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_eta;1",
+        "@id": "dtmi:example:sigma_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "kappa_zeta",
+          "name": "sigma_xi",
           "comment": true
         }
       }
@@ -181,11 +181,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_iota;1",
+        "@id": "dtmi:example:sigma_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_theta",
+          "name": "sigma_pi",
           "comment": 626
         }
       }
@@ -199,12 +199,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_lambda;1",
+        "@id": "dtmi:example:sigma_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "kappa_kappa",
+          "name": "sigma_sigma",
           "comment": 626
         }
       }
@@ -218,11 +218,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_nu;1",
+        "@id": "dtmi:example:sigma_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_mu",
+          "name": "sigma_upsilon",
           "comment": [
             null
           ]
@@ -238,12 +238,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_omicron;1",
+        "@id": "dtmi:example:sigma_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "kappa_xi",
+          "name": "sigma_chi",
           "comment": [
             null
           ]
@@ -259,11 +259,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_rho;1",
+        "@id": "dtmi:example:sigma_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_pi",
+          "name": "sigma_omega",
           "comment": [
             true
           ]
@@ -279,12 +279,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_tau;1",
+        "@id": "dtmi:example:sigma_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "kappa_sigma",
+          "name": "sigma_wum",
           "comment": [
             true
           ]
@@ -300,11 +300,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_phi;1",
+        "@id": "dtmi:example:sigma_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_upsilon",
+          "name": "sigma_humpf",
           "comment": [
             626
           ]
@@ -320,12 +320,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_psi;1",
+        "@id": "dtmi:example:sigma_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "kappa_chi",
+          "name": "sigma_glikk",
           "comment": [
             626
           ]
@@ -341,11 +341,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_yuzz;1",
+        "@id": "dtmi:example:sigma_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_omega",
+          "name": "sigma_snee",
           "comment": {}
         }
       }
@@ -359,12 +359,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_um;1",
+        "@id": "dtmi:example:sigma_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "kappa_wum",
+          "name": "sigma_thnad",
           "comment": {}
         }
       }
@@ -378,11 +378,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_fuddle;1",
+        "@id": "dtmi:example:sigma_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_humpf",
+          "name": "sigma_floob",
           "comment": [
             {}
           ]
@@ -398,12 +398,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_nuh;1",
+        "@id": "dtmi:example:sigma_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "kappa_glikk",
+          "name": "sigma_jogg",
           "comment": [
             {}
           ]
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyCommentTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyCommentTermAndDtmiV3.json
index 8ed1a85d..d1d97235 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyCommentTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyCommentTermAndDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_eta;1",
+        "@id": "dtmi:example:tau_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "comment": "lambda_delta",
-          "dtmi:dtdl:property:comment;3": "lambda_epsilon",
-          "name": "lambda_zeta"
+          "comment": "tau_mu",
+          "dtmi:dtdl:property:comment;3": "tau_nu",
+          "name": "tau_xi"
         }
       }
     ]
@@ -26,14 +26,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_lambda;1",
+        "@id": "dtmi:example:tau_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "comment": "lambda_theta",
-          "dtmi:dtdl:property:comment;3": "lambda_iota",
-          "name": "lambda_kappa"
+          "comment": "tau_pi",
+          "dtmi:dtdl:property:comment;3": "tau_rho",
+          "name": "tau_sigma"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyDescriptionLangStringV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyDescriptionLangStringV3.json
index 148e9095..873b76d3 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyDescriptionLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyDescriptionLangStringV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_nu;1",
+        "@id": "dtmi:example:tau_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_mu",
+          "name": "tau_upsilon",
           "description": "hello"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_omicron;1",
+        "@id": "dtmi:example:tau_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_xi",
+          "name": "tau_chi",
           "description": [
             "hello"
           ]
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_rho;1",
+        "@id": "dtmi:example:tau_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_pi",
+          "name": "tau_omega",
           "description": {
             "en": "hello"
           }
@@ -65,11 +65,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_tau;1",
+        "@id": "dtmi:example:tau_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_sigma",
+          "name": "tau_wum",
           "description": [
             {
               "@value": "hello",
@@ -88,11 +88,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_phi;1",
+        "@id": "dtmi:example:tau_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_upsilon",
+          "name": "tau_humpf",
           "description": {}
         }
       }
@@ -106,11 +106,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_psi;1",
+        "@id": "dtmi:example:tau_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_chi",
+          "name": "tau_glikk",
           "description": []
         }
       }
@@ -124,11 +124,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_yuzz;1",
+        "@id": "dtmi:example:tau_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_omega",
+          "name": "tau_snee",
           "description": null
         }
       }
@@ -142,12 +142,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_um;1",
+        "@id": "dtmi:example:tau_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "lambda_wum",
+          "name": "tau_thnad",
           "description": null
         }
       }
@@ -161,11 +161,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_fuddle;1",
+        "@id": "dtmi:example:tau_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_humpf",
+          "name": "tau_floob",
           "description": true
         }
       }
@@ -179,12 +179,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_nuh;1",
+        "@id": "dtmi:example:tau_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "lambda_glikk",
+          "name": "tau_jogg",
           "description": true
         }
       }
@@ -198,11 +198,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_quan;1",
+        "@id": "dtmi:example:tau_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_snee",
+          "name": "tau_itch",
           "description": 626
         }
       }
@@ -216,12 +216,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_spazz;1",
+        "@id": "dtmi:example:tau_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "lambda_thnad",
+          "name": "tau_vroo",
           "description": 626
         }
       }
@@ -235,11 +235,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_zatz;1",
+        "@id": "dtmi:example:upsilon_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_floob",
+          "name": "upsilon_alpha",
           "description": [
             null
           ]
@@ -255,12 +255,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_flunn;1",
+        "@id": "dtmi:example:upsilon_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "lambda_jogg",
+          "name": "upsilon_gamma",
           "description": [
             null
           ]
@@ -276,11 +276,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_yekk;1",
+        "@id": "dtmi:example:upsilon_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_itch",
+          "name": "upsilon_epsilon",
           "description": [
             true
           ]
@@ -296,12 +296,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_hi;1",
+        "@id": "dtmi:example:upsilon_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "lambda_vroo",
+          "name": "upsilon_eta",
           "description": [
             true
           ]
@@ -317,11 +317,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_beta;1",
+        "@id": "dtmi:example:upsilon_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_alpha",
+          "name": "upsilon_iota",
           "description": [
             626
           ]
@@ -337,12 +337,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_delta;1",
+        "@id": "dtmi:example:upsilon_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "mu_gamma",
+          "name": "upsilon_lambda",
           "description": [
             626
           ]
@@ -358,11 +358,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_zeta;1",
+        "@id": "dtmi:example:upsilon_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_epsilon",
+          "name": "upsilon_nu",
           "description": [
             {}
           ]
@@ -378,12 +378,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_theta;1",
+        "@id": "dtmi:example:upsilon_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "mu_eta",
+          "name": "upsilon_omicron",
           "description": [
             {}
           ]
@@ -399,11 +399,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_kappa;1",
+        "@id": "dtmi:example:upsilon_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_iota",
+          "name": "upsilon_rho",
           "description": {
             "@value": "hello",
             "@language": "en"
@@ -420,12 +420,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_mu;1",
+        "@id": "dtmi:example:upsilon_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "mu_lambda",
+          "name": "upsilon_tau",
           "description": {
             "@value": "hello",
             "@language": "en"
@@ -442,11 +442,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_xi;1",
+        "@id": "dtmi:example:upsilon_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_nu",
+          "name": "upsilon_phi",
           "description": [
             {
               "en": "hello"
@@ -464,12 +464,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_pi;1",
+        "@id": "dtmi:example:upsilon_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "mu_omicron",
+          "name": "upsilon_psi",
           "description": [
             {
               "en": "hello"
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyDescriptionStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyDescriptionStringLengthV3.json
index 2077452f..c8b5c646 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyDescriptionStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyDescriptionStringLengthV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_sigma;1",
+        "@id": "dtmi:example:upsilon_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_rho",
+          "name": "upsilon_yuzz",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_upsilon;1",
+        "@id": "dtmi:example:upsilon_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_tau",
+          "name": "upsilon_um",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_chi;1",
+        "@id": "dtmi:example:upsilon_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "mu_phi",
+          "name": "upsilon_fuddle",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyDescriptionTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyDescriptionTermAndDtmiV3.json
index 24a4d412..20e62819 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyDescriptionTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyDescriptionTermAndDtmiV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_spazz;1",
+        "@id": "dtmi:example:upsilon_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "description": [
-            "mu_snee"
+            "upsilon_itch"
           ],
           "dtmi:dtdl:property:description;3": [
-            "mu_quan"
+            "upsilon_yekk"
           ],
-          "name": "mu_thnad"
+          "name": "upsilon_vroo"
         }
       }
     ]
@@ -30,18 +30,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_flunn;1",
+        "@id": "dtmi:example:phi_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
           "description": [
-            "mu_floob"
+            "phi_alpha"
           ],
           "dtmi:dtdl:property:description;3": [
-            "mu_zatz"
+            "phi_beta"
           ],
-          "name": "mu_jogg"
+          "name": "phi_gamma"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyDisplayNameLangStringV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyDisplayNameLangStringV3.json
index 7deab3b0..50cc7da4 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyDisplayNameLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyDisplayNameLangStringV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_yekk;1",
+        "@id": "dtmi:example:phi_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_itch",
+          "name": "phi_epsilon",
           "displayName": "hello"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_hi;1",
+        "@id": "dtmi:example:phi_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_vroo",
+          "name": "phi_eta",
           "displayName": [
             "hello"
           ]
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_beta;1",
+        "@id": "dtmi:example:phi_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_alpha",
+          "name": "phi_iota",
           "displayName": {
             "en": "hello"
           }
@@ -65,11 +65,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_delta;1",
+        "@id": "dtmi:example:phi_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_gamma",
+          "name": "phi_lambda",
           "displayName": [
             {
               "@value": "hello",
@@ -88,11 +88,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_zeta;1",
+        "@id": "dtmi:example:phi_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_epsilon",
+          "name": "phi_nu",
           "displayName": {}
         }
       }
@@ -106,11 +106,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_theta;1",
+        "@id": "dtmi:example:phi_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_eta",
+          "name": "phi_omicron",
           "displayName": []
         }
       }
@@ -124,11 +124,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_kappa;1",
+        "@id": "dtmi:example:phi_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_iota",
+          "name": "phi_rho",
           "displayName": null
         }
       }
@@ -142,12 +142,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_mu;1",
+        "@id": "dtmi:example:phi_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "nu_lambda",
+          "name": "phi_tau",
           "displayName": null
         }
       }
@@ -161,11 +161,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_xi;1",
+        "@id": "dtmi:example:phi_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_nu",
+          "name": "phi_phi",
           "displayName": true
         }
       }
@@ -179,12 +179,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_pi;1",
+        "@id": "dtmi:example:phi_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "nu_omicron",
+          "name": "phi_psi",
           "displayName": true
         }
       }
@@ -198,11 +198,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_sigma;1",
+        "@id": "dtmi:example:phi_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_rho",
+          "name": "phi_yuzz",
           "displayName": 626
         }
       }
@@ -216,12 +216,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_upsilon;1",
+        "@id": "dtmi:example:phi_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "nu_tau",
+          "name": "phi_um",
           "displayName": 626
         }
       }
@@ -235,11 +235,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_chi;1",
+        "@id": "dtmi:example:phi_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_phi",
+          "name": "phi_fuddle",
           "displayName": [
             null
           ]
@@ -255,12 +255,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_omega;1",
+        "@id": "dtmi:example:phi_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "nu_psi",
+          "name": "phi_nuh",
           "displayName": [
             null
           ]
@@ -276,11 +276,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_wum;1",
+        "@id": "dtmi:example:phi_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_yuzz",
+          "name": "phi_quan",
           "displayName": [
             true
           ]
@@ -296,12 +296,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_humpf;1",
+        "@id": "dtmi:example:phi_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "nu_um",
+          "name": "phi_spazz",
           "displayName": [
             true
           ]
@@ -317,11 +317,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_glikk;1",
+        "@id": "dtmi:example:phi_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_fuddle",
+          "name": "phi_zatz",
           "displayName": [
             626
           ]
@@ -337,12 +337,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_snee;1",
+        "@id": "dtmi:example:phi_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "nu_nuh",
+          "name": "phi_flunn",
           "displayName": [
             626
           ]
@@ -358,11 +358,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_thnad;1",
+        "@id": "dtmi:example:phi_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_quan",
+          "name": "phi_yekk",
           "displayName": [
             {}
           ]
@@ -378,12 +378,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_floob;1",
+        "@id": "dtmi:example:chi_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "nu_spazz",
+          "name": "phi_hi",
           "displayName": [
             {}
           ]
@@ -399,11 +399,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_jogg;1",
+        "@id": "dtmi:example:chi_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_zatz",
+          "name": "chi_beta",
           "displayName": {
             "@value": "hello",
             "@language": "en"
@@ -420,12 +420,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_itch;1",
+        "@id": "dtmi:example:chi_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "nu_flunn",
+          "name": "chi_delta",
           "displayName": {
             "@value": "hello",
             "@language": "en"
@@ -442,11 +442,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_vroo;1",
+        "@id": "dtmi:example:chi_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_yekk",
+          "name": "chi_zeta",
           "displayName": [
             {
               "en": "hello"
@@ -464,12 +464,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_alpha;1",
+        "@id": "dtmi:example:chi_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "nu_hi",
+          "name": "chi_theta",
           "displayName": [
             {
               "en": "hello"
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyDisplayNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyDisplayNameStringLengthV3.json
index 32b83a3a..6080d824 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyDisplayNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyDisplayNameStringLengthV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_gamma;1",
+        "@id": "dtmi:example:chi_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "xi_beta",
+          "name": "chi_kappa",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_epsilon;1",
+        "@id": "dtmi:example:chi_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "xi_delta",
+          "name": "chi_mu",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_eta;1",
+        "@id": "dtmi:example:chi_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "xi_zeta",
+          "name": "chi_xi",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyDisplayNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyDisplayNameTermAndDtmiV3.json
index 889076b5..1c830992 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyDisplayNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyDisplayNameTermAndDtmiV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_upsilon;1",
+        "@id": "dtmi:example:chi_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
           "displayName": [
-            "xi_rho"
+            "chi_yuzz"
           ],
           "dtmi:dtdl:property:displayName;3": [
-            "xi_sigma"
+            "chi_wum"
           ],
-          "name": "xi_tau"
+          "name": "chi_um"
         }
       }
     ]
@@ -30,18 +30,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_omega;1",
+        "@id": "dtmi:example:chi_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
           "displayName": [
-            "xi_phi"
+            "chi_fuddle"
           ],
           "dtmi:dtdl:property:displayName;3": [
-            "xi_chi"
+            "chi_glikk"
           ],
-          "name": "xi_psi"
+          "name": "chi_nuh"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyFormallyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyFormallyIrrelevantDtmiOrTermV3.json
index 7dfa517b..9966ab56 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyFormallyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyFormallyIrrelevantDtmiOrTermV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_spazz;1",
+        "@id": "dtmi:example:snee_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_thnad",
+          "name": "snee_tau",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_zatz;1",
+        "@id": "dtmi:example:snee_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "psi_floob",
+          "name": "snee_phi",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -44,11 +44,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_flunn;1",
+        "@id": "dtmi:example:snee_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_jogg",
+          "name": "snee_psi",
           "boolean": null
         }
       }
@@ -62,12 +62,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_yekk;1",
+        "@id": "dtmi:example:snee_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "psi_itch",
+          "name": "snee_yuzz",
           "boolean": null
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyFormallyUndefinedTermV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyFormallyUndefinedTermV3.json
index b94bd530..74173c10 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyFormallyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyFormallyUndefinedTermV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_mu;1",
+        "@id": "dtmi:example:snee_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_lambda",
+          "name": "snee_flunn",
           "foobar": {}
         }
       }
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_xi;1",
+        "@id": "dtmi:example:snee_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "omega_nu",
+          "name": "snee_yekk",
           "foobar": {}
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyInvalidDtmiV3.json
index 8d0cb03f..44694ee0 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyInvalidDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_hi;1",
+        "@id": "dtmi:example:snee_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Command",
             "Foobar"
           ],
-          "name": "psi_vroo",
+          "name": "snee_um",
           "dtmi:foo//bar": 626
         }
       }
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_beta;1",
+        "@id": "dtmi:example:snee_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,7 +36,7 @@
             "Command",
             "Foobar"
           ],
-          "name": "omega_alpha",
+          "name": "snee_fuddle",
           "dtmi:foo//bar": 626
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyNamePatternV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyNamePatternV3.json
index 38558b7c..4376754a 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyNamePatternV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyNamePatternV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_psi;1",
+        "@id": "dtmi:example:eta_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -24,7 +24,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_omega;1",
+        "@id": "dtmi:example:eta_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -41,7 +41,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_yuzz;1",
+        "@id": "dtmi:example:eta_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -58,7 +58,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_wum;1",
+        "@id": "dtmi:example:eta_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -75,7 +75,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_um;1",
+        "@id": "dtmi:example:eta_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -92,7 +92,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_humpf;1",
+        "@id": "dtmi:example:eta_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -109,7 +109,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_fuddle;1",
+        "@id": "dtmi:example:eta_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -127,7 +127,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_glikk;1",
+        "@id": "dtmi:example:eta_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -144,7 +144,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_nuh;1",
+        "@id": "dtmi:example:eta_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -162,7 +162,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_snee;1",
+        "@id": "dtmi:example:eta_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -179,7 +179,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_quan;1",
+        "@id": "dtmi:example:eta_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -197,7 +197,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_thnad;1",
+        "@id": "dtmi:example:eta_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -214,7 +214,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_spazz;1",
+        "@id": "dtmi:example:eta_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -232,7 +232,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_floob;1",
+        "@id": "dtmi:example:eta_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -249,7 +249,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_zatz;1",
+        "@id": "dtmi:example:eta_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -267,7 +267,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_jogg;1",
+        "@id": "dtmi:example:eta_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -284,7 +284,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_flunn;1",
+        "@id": "dtmi:example:eta_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -302,7 +302,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_itch;1",
+        "@id": "dtmi:example:eta_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -319,7 +319,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_yekk;1",
+        "@id": "dtmi:example:eta_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -337,7 +337,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_vroo;1",
+        "@id": "dtmi:example:theta_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -354,7 +354,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_hi;1",
+        "@id": "dtmi:example:theta_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -372,7 +372,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_alpha;1",
+        "@id": "dtmi:example:theta_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -389,7 +389,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_beta;1",
+        "@id": "dtmi:example:theta_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -407,7 +407,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_gamma;1",
+        "@id": "dtmi:example:theta_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -424,7 +424,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_delta;1",
+        "@id": "dtmi:example:theta_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyNameStringLengthV3.json
index 19489cc1..f22d617b 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyNameStringLengthV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_upsilon;1",
+        "@id": "dtmi:example:eta_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -24,7 +24,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_phi;1",
+        "@id": "dtmi:example:eta_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -41,7 +41,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_chi;1",
+        "@id": "dtmi:example:eta_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyNameStringV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyNameStringV3.json
index 04b82ecf..a97e0f6c 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyNameStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyNameStringV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_yekk;1",
+        "@id": "dtmi:example:zeta_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -24,7 +24,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_vroo;1",
+        "@id": "dtmi:example:eta_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -43,7 +43,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_hi;1",
+        "@id": "dtmi:example:eta_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -63,7 +63,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_alpha;1",
+        "@id": "dtmi:example:eta_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -85,7 +85,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_beta;1",
+        "@id": "dtmi:example:eta_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -102,7 +102,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_gamma;1",
+        "@id": "dtmi:example:eta_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -120,7 +120,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_delta;1",
+        "@id": "dtmi:example:eta_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -137,7 +137,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_epsilon;1",
+        "@id": "dtmi:example:eta_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -155,7 +155,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_zeta;1",
+        "@id": "dtmi:example:eta_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -172,7 +172,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_eta;1",
+        "@id": "dtmi:example:eta_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -190,7 +190,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_theta;1",
+        "@id": "dtmi:example:eta_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -209,7 +209,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_iota;1",
+        "@id": "dtmi:example:eta_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -229,7 +229,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_kappa;1",
+        "@id": "dtmi:example:eta_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -248,7 +248,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_lambda;1",
+        "@id": "dtmi:example:eta_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -268,7 +268,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_mu;1",
+        "@id": "dtmi:example:eta_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -287,7 +287,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_nu;1",
+        "@id": "dtmi:example:eta_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -307,7 +307,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_xi;1",
+        "@id": "dtmi:example:eta_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -324,7 +324,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_omicron;1",
+        "@id": "dtmi:example:eta_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -342,7 +342,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_pi;1",
+        "@id": "dtmi:example:eta_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -361,7 +361,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_rho;1",
+        "@id": "dtmi:example:eta_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -381,7 +381,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_sigma;1",
+        "@id": "dtmi:example:eta_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
@@ -398,7 +398,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_tau;1",
+        "@id": "dtmi:example:eta_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyNameTermAndDtmiV3.json
index 65e4ff54..0c18eb25 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyNameTermAndDtmiV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_pi;1",
+        "@id": "dtmi:example:theta_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_xi",
-          "dtmi:dtdl:property:name;3": "hi_omicron"
+          "name": "theta_pi",
+          "dtmi:dtdl:property:name;3": "theta_rho"
         }
       }
     ]
@@ -25,13 +25,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_tau;1",
+        "@id": "dtmi:example:theta_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "hi_rho",
-          "dtmi:dtdl:property:name;3": "hi_sigma"
+          "name": "theta_tau",
+          "dtmi:dtdl:property:name;3": "theta_upsilon"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyNameUniqueAmongInterfaceContentsV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyNameUniqueAmongInterfaceContentsV3.json
index fedb1b94..ae600e97 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyNameUniqueAmongInterfaceContentsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyNameUniqueAmongInterfaceContentsV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_epsilon;1",
+        "@id": "dtmi:example:theta_eta;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Command",
-            "name": "beta_psi"
+            "name": "beta_humpf"
           },
           {
             "@type": "Command",
-            "name": "beta_omega"
+            "name": "beta_fuddle"
           }
         ]
       }
@@ -30,16 +30,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_zeta;1",
+        "@id": "dtmi:example:theta_theta;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Command",
-            "name": "beta_psi"
+            "name": "beta_humpf"
           },
           {
             "@type": "Command",
-            "name": "beta_psi"
+            "name": "beta_humpf"
           }
         ]
       }
@@ -56,16 +56,16 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:hi_eta;1",
+        "@id": "dtmi:example:theta_iota;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Command",
-            "name": "beta_psi"
+            "name": "beta_humpf"
           },
           {
             "@type": "Command",
-            "name": "beta_psi"
+            "name": "beta_humpf"
           }
         ]
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyNotDtmiNorTermV3.json
index 6c4d8983..c3b7aa38 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyNotDtmiNorTermV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_delta;1",
+        "@id": "dtmi:example:snee_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Command",
             "Foobar"
           ],
-          "name": "omega_gamma",
+          "name": "snee_nuh",
           "http://foo.com/bar": true
         }
       }
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_zeta;1",
+        "@id": "dtmi:example:snee_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,7 +36,7 @@
             "Command",
             "Foobar"
           ],
-          "name": "omega_epsilon",
+          "name": "snee_quan",
           "http://foo.com/bar": true
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyRequestElementV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyRequestElementV3.json
index ef21e722..5f50317b 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyRequestElementV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyRequestElementV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_fuddle;1",
+        "@id": "dtmi:example:chi_zatz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_humpf;1",
+          "@id": "dtmi:example:chi_floob;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "xi_um",
+            "name": "chi_spazz",
             "request": {
-              "@id": "dtmi:example:xi_yuzz;1",
-              "name": "xi_wum",
-              "schema": "dateTime"
+              "@id": "dtmi:example:chi_quan;1",
+              "name": "chi_thnad",
+              "schema": "duration"
             }
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_thnad;1",
+        "@id": "dtmi:example:chi_vroo;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_quan;1",
+          "@id": "dtmi:example:chi_yekk;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "xi_snee",
+            "name": "chi_itch",
             "request": [
               {
-                "@id": "dtmi:example:xi_glikk;1",
-                "name": "xi_nuh",
-                "schema": "double"
+                "@id": "dtmi:example:chi_jogg;1",
+                "name": "chi_flunn",
+                "schema": "float"
               }
             ]
           }
@@ -61,21 +61,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_zatz;1",
+        "@id": "dtmi:example:psi_beta;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Command",
-            "name": "xi_floob",
+            "name": "psi_alpha",
             "request": {
               "@id": "dtmi:ex:dependentRef;1",
-              "name": "xi_spazz",
-              "schema": "duration"
+              "name": "chi_hi",
+              "schema": "integer"
             }
           },
           {
             "@type": "Command",
-            "name": "xi_jogg",
+            "name": "psi_gamma",
             "request": "dtmi:ex:dependentRef;1"
           }
         ]
@@ -90,21 +90,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_yekk;1",
+        "@id": "dtmi:example:psi_zeta;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Command",
-            "name": "xi_itch",
+            "name": "psi_epsilon",
             "request": {
               "@id": "dtmi:ex:dependentRef;1",
-              "name": "xi_flunn",
-              "schema": "float"
+              "name": "psi_delta",
+              "schema": "long"
             }
           },
           {
             "@type": "Command",
-            "name": "xi_vroo",
+            "name": "psi_eta",
             "request": [
               "dtmi:ex:dependentRef;1"
             ]
@@ -121,16 +121,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_gamma;1",
+        "@id": "dtmi:example:psi_lambda;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omicron_beta;1",
+          "@id": "dtmi:example:psi_kappa;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "omicron_alpha",
+            "name": "psi_iota",
             "request": {
-              "@id": "dtmi:example:xi_hi;1",
+              "@id": "dtmi:example:psi_theta;1",
               "@type": "CommandRequest",
               "@context": "dtmi:dtdl:context;2"
             }
@@ -147,17 +147,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_eta;1",
+        "@id": "dtmi:example:psi_omicron;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omicron_zeta;1",
+          "@id": "dtmi:example:psi_xi;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Command",
-            "name": "omicron_epsilon",
+            "name": "psi_nu",
             "request": {
-              "@id": "dtmi:example:omicron_delta;1",
+              "@id": "dtmi:example:psi_mu;1",
               "@type": "CommandRequest",
               "@context": "dtmi:dtdl:context;2"
             }
@@ -166,6 +166,61 @@
       }
     ]
   },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:psi_upsilon;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:psi_tau;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "psi_sigma",
+            "request": {
+              "@id": "dtmi:example:psi_pi;1",
+              "name": "psi_rho",
+              "schema": "date",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:psi_yuzz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:psi_omega;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Command",
+            "name": "psi_psi",
+            "request": {
+              "@id": "dtmi:example:psi_phi;1",
+              "name": "psi_chi",
+              "schema": "dateTime",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
   {
     "valid": true,
     "options": [
@@ -174,14 +229,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_kappa;1",
+        "@id": "dtmi:example:psi_humpf;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omicron_iota;1",
+          "@id": "dtmi:example:psi_um;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "omicron_theta",
+            "name": "psi_wum",
             "request": []
           }
         }
@@ -196,24 +251,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_rho;1",
+        "@id": "dtmi:example:psi_spazz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omicron_pi;1",
+          "@id": "dtmi:example:psi_thnad;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "omicron_omicron",
+            "name": "psi_quan",
             "request": [
               {
-                "@id": "dtmi:example:omicron_lambda;1",
-                "name": "omicron_mu",
-                "schema": "integer"
+                "@id": "dtmi:example:psi_fuddle;1",
+                "name": "psi_glikk",
+                "schema": "boolean"
               },
               {
-                "@id": "dtmi:example:omicron_nu;1",
-                "name": "omicron_xi",
-                "schema": "long"
+                "@id": "dtmi:example:psi_nuh;1",
+                "name": "psi_snee",
+                "schema": "date"
               }
             ]
           }
@@ -229,25 +284,25 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_omega;1",
+        "@id": "dtmi:example:psi_vroo;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omicron_psi;1",
+          "@id": "dtmi:example:psi_yekk;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Command",
-            "name": "omicron_chi",
+            "name": "psi_itch",
             "request": [
               {
-                "@id": "dtmi:example:omicron_sigma;1",
-                "name": "omicron_tau",
-                "schema": "string"
+                "@id": "dtmi:example:psi_floob;1",
+                "name": "psi_zatz",
+                "schema": "dateTime"
               },
               {
-                "@id": "dtmi:example:omicron_upsilon;1",
-                "name": "omicron_phi",
-                "schema": "time"
+                "@id": "dtmi:example:psi_jogg;1",
+                "name": "psi_flunn",
+                "schema": "double"
               }
             ]
           }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyRequestTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyRequestTermAndDtmiV3.json
index 2e259464..558c027c 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyRequestTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyRequestTermAndDtmiV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_thnad;1",
+        "@id": "dtmi:example:um_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_nuh",
+          "name": "um_zeta",
           "request": {
-            "name": "sigma_snee",
-            "schema": "string"
+            "name": "um_eta",
+            "schema": "dateTime"
           },
           "dtmi:dtdl:property:request;3": {
-            "name": "sigma_quan",
-            "schema": "time"
+            "name": "um_theta",
+            "schema": "double"
           }
         }
       }
@@ -32,19 +32,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_jogg;1",
+        "@id": "dtmi:example:um_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "sigma_spazz",
+          "name": "um_kappa",
           "request": {
-            "name": "sigma_floob",
-            "schema": "boolean"
+            "name": "um_lambda",
+            "schema": "duration"
           },
           "dtmi:dtdl:property:request;3": {
-            "name": "sigma_zatz",
-            "schema": "date"
+            "name": "um_mu",
+            "schema": "float"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyRequestTypeConformanceV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyRequestTypeConformanceV3.json
index e56be917..ca51be81 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyRequestTypeConformanceV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyRequestTypeConformanceV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_quan;1",
+        "@id": "dtmi:example:omega_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_snee",
+          "name": "omega_eta",
           "request": {
-            "@id": "dtmi:example:omicron_nuh;1",
-            "elementSchema": "boolean",
+            "@id": "dtmi:example:omega_zeta;1",
+            "elementSchema": "duration",
             "@type": "Array"
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_floob;1",
+        "@id": "dtmi:example:omega_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "omicron_spazz",
+          "name": "omega_kappa",
           "request": {
-            "@id": "dtmi:example:omicron_thnad;1",
-            "elementSchema": "date",
+            "@id": "dtmi:example:omega_iota;1",
+            "elementSchema": "float",
             "@type": "Array"
           }
         }
@@ -52,14 +52,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_itch;1",
+        "@id": "dtmi:example:omega_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_flunn",
+          "name": "omega_xi",
           "request": {
-            "@id": "dtmi:example:omicron_zatz;1",
-            "name": "omicron_jogg",
+            "@id": "dtmi:example:omega_mu;1",
+            "name": "omega_nu",
             "@type": "Command"
           }
         }
@@ -74,15 +74,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_alpha;1",
+        "@id": "dtmi:example:omega_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "omicron_hi",
+          "name": "omega_sigma",
           "request": {
-            "@id": "dtmi:example:omicron_yekk;1",
-            "name": "omicron_vroo",
+            "@id": "dtmi:example:omega_pi;1",
+            "name": "omega_rho",
             "@type": "Command"
           }
         }
@@ -97,15 +97,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_epsilon;1",
+        "@id": "dtmi:example:omega_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_delta",
+          "name": "omega_chi",
           "request": {
-            "@id": "dtmi:example:pi_beta;1",
-            "name": "pi_gamma",
-            "schema": "dateTime",
+            "@id": "dtmi:example:omega_upsilon;1",
+            "name": "omega_phi",
+            "schema": "integer",
             "@type": "CommandRequest"
           }
         }
@@ -120,15 +120,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_iota;1",
+        "@id": "dtmi:example:omega_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_theta",
+          "name": "omega_wum",
           "request": {
-            "@id": "dtmi:example:pi_zeta;1",
-            "name": "pi_eta",
-            "schema": "double",
+            "@id": "dtmi:example:omega_omega;1",
+            "name": "omega_yuzz",
+            "schema": "long",
             "@type": "CommandResponse"
           }
         }
@@ -143,16 +143,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_nu;1",
+        "@id": "dtmi:example:omega_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "pi_mu",
+          "name": "omega_glikk",
           "request": {
-            "@id": "dtmi:example:pi_kappa;1",
-            "name": "pi_lambda",
-            "schema": "duration",
+            "@id": "dtmi:example:omega_humpf;1",
+            "name": "omega_fuddle",
+            "schema": "string",
             "@type": "CommandResponse"
           }
         }
@@ -167,16 +167,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_sigma;1",
+        "@id": "dtmi:example:omega_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_rho",
+          "name": "omega_spazz",
           "request": {
-            "@id": "dtmi:example:pi_xi;1",
-            "name": "pi_omicron",
+            "@id": "dtmi:example:omega_snee;1",
+            "name": "omega_quan",
             "schema": {
-              "@id": "dtmi:example:pi_pi;1",
+              "@id": "dtmi:example:omega_thnad;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -193,17 +193,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_psi;1",
+        "@id": "dtmi:example:omega_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "pi_chi",
+          "name": "omega_itch",
           "request": {
-            "@id": "dtmi:example:pi_tau;1",
-            "name": "pi_upsilon",
+            "@id": "dtmi:example:omega_zatz;1",
+            "name": "omega_jogg",
             "schema": {
-              "@id": "dtmi:example:pi_phi;1",
+              "@id": "dtmi:example:omega_flunn;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -220,13 +220,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_wum;1",
+        "@id": "dtmi:example:yuzz_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_yuzz",
+          "name": "omega_hi",
           "request": {
-            "@id": "dtmi:example:pi_omega;1",
+            "@id": "dtmi:example:omega_vroo;1",
             "valueSchema": "integer",
             "@type": "Enum"
           }
@@ -242,14 +242,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_fuddle;1",
+        "@id": "dtmi:example:yuzz_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "pi_humpf",
+          "name": "yuzz_gamma",
           "request": {
-            "@id": "dtmi:example:pi_um;1",
+            "@id": "dtmi:example:yuzz_beta;1",
             "valueSchema": "integer",
             "@type": "Enum"
           }
@@ -265,15 +265,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_quan;1",
+        "@id": "dtmi:example:yuzz_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_snee",
+          "name": "yuzz_eta",
           "request": {
-            "@id": "dtmi:example:pi_glikk;1",
-            "enumValue": 1109,
-            "name": "pi_nuh",
+            "@id": "dtmi:example:yuzz_epsilon;1",
+            "enumValue": 1122,
+            "name": "yuzz_zeta",
             "@type": "EnumValue"
           }
         }
@@ -288,16 +288,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_zatz;1",
+        "@id": "dtmi:example:yuzz_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "pi_floob",
+          "name": "yuzz_lambda",
           "request": {
-            "@id": "dtmi:example:pi_thnad;1",
-            "enumValue": 1110,
-            "name": "pi_spazz",
+            "@id": "dtmi:example:yuzz_iota;1",
+            "enumValue": 1123,
+            "name": "yuzz_kappa",
             "@type": "EnumValue"
           }
         }
@@ -312,15 +312,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_yekk;1",
+        "@id": "dtmi:example:yuzz_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_itch",
+          "name": "yuzz_omicron",
           "request": {
-            "@id": "dtmi:example:pi_jogg;1",
-            "name": "pi_flunn",
-            "schema": "float",
+            "@id": "dtmi:example:yuzz_nu;1",
+            "name": "yuzz_xi",
+            "schema": "time",
             "@type": "Field"
           }
         }
@@ -335,16 +335,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_beta;1",
+        "@id": "dtmi:example:yuzz_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "rho_alpha",
+          "name": "yuzz_tau",
           "request": {
-            "@id": "dtmi:example:pi_vroo;1",
-            "name": "pi_hi",
-            "schema": "integer",
+            "@id": "dtmi:example:yuzz_rho;1",
+            "name": "yuzz_sigma",
+            "schema": "boolean",
             "@type": "Field"
           }
         }
@@ -359,13 +359,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_epsilon;1",
+        "@id": "dtmi:example:yuzz_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_delta",
+          "name": "yuzz_chi",
           "request": {
-            "@id": "dtmi:example:rho_gamma;1",
+            "@id": "dtmi:example:yuzz_phi;1",
             "@type": "Interface"
           }
         }
@@ -380,14 +380,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_theta;1",
+        "@id": "dtmi:example:yuzz_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "rho_eta",
+          "name": "yuzz_yuzz",
           "request": {
-            "@id": "dtmi:example:rho_zeta;1",
+            "@id": "dtmi:example:yuzz_omega;1",
             "@type": "Interface"
           }
         }
@@ -402,20 +402,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_nu;1",
+        "@id": "dtmi:example:yuzz_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_mu",
+          "name": "yuzz_glikk",
           "request": {
-            "@id": "dtmi:example:rho_iota;1",
+            "@id": "dtmi:example:yuzz_um;1",
             "mapKey": {
-              "name": "rho_kappa",
+              "name": "yuzz_humpf",
               "schema": "string"
             },
             "mapValue": {
-              "name": "rho_lambda",
-              "schema": "long"
+              "name": "yuzz_fuddle",
+              "schema": "date"
             },
             "@type": "Map"
           }
@@ -431,21 +431,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_sigma;1",
+        "@id": "dtmi:example:yuzz_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "rho_rho",
+          "name": "yuzz_spazz",
           "request": {
-            "@id": "dtmi:example:rho_xi;1",
+            "@id": "dtmi:example:yuzz_snee;1",
             "mapKey": {
-              "name": "rho_omicron",
+              "name": "yuzz_quan",
               "schema": "string"
             },
             "mapValue": {
-              "name": "rho_pi",
-              "schema": "string"
+              "name": "yuzz_thnad",
+              "schema": "dateTime"
             },
             "@type": "Map"
           }
@@ -461,14 +461,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_chi;1",
+        "@id": "dtmi:example:yuzz_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_phi",
+          "name": "yuzz_flunn",
           "request": {
-            "@id": "dtmi:example:rho_tau;1",
-            "name": "rho_upsilon",
+            "@id": "dtmi:example:yuzz_zatz;1",
+            "name": "yuzz_jogg",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -484,15 +484,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_wum;1",
+        "@id": "dtmi:example:wum_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "rho_yuzz",
+          "name": "yuzz_hi",
           "request": {
-            "@id": "dtmi:example:rho_psi;1",
-            "name": "rho_omega",
+            "@id": "dtmi:example:yuzz_yekk;1",
+            "name": "yuzz_vroo",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -508,15 +508,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_glikk;1",
+        "@id": "dtmi:example:wum_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_fuddle",
+          "name": "wum_delta",
           "request": {
-            "@id": "dtmi:example:rho_um;1",
-            "name": "rho_humpf",
-            "schema": "time",
+            "@id": "dtmi:example:wum_beta;1",
+            "name": "wum_gamma",
+            "schema": "double",
             "@type": "MapValue"
           }
         }
@@ -531,16 +531,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_thnad;1",
+        "@id": "dtmi:example:wum_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "rho_quan",
+          "name": "wum_theta",
           "request": {
-            "@id": "dtmi:example:rho_nuh;1",
-            "name": "rho_snee",
-            "schema": "boolean",
+            "@id": "dtmi:example:wum_zeta;1",
+            "name": "wum_eta",
+            "schema": "duration",
             "@type": "MapValue"
           }
         }
@@ -555,13 +555,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_zatz;1",
+        "@id": "dtmi:example:wum_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_floob",
+          "name": "wum_lambda",
           "request": {
-            "@id": "dtmi:example:rho_spazz;1",
+            "@id": "dtmi:example:wum_kappa;1",
             "@type": "Object"
           }
         }
@@ -576,14 +576,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_itch;1",
+        "@id": "dtmi:example:wum_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "rho_flunn",
+          "name": "wum_xi",
           "request": {
-            "@id": "dtmi:example:rho_jogg;1",
+            "@id": "dtmi:example:wum_nu;1",
             "@type": "Object"
           }
         }
@@ -598,15 +598,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_alpha;1",
+        "@id": "dtmi:example:wum_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_hi",
+          "name": "wum_sigma",
           "request": {
-            "@id": "dtmi:example:rho_yekk;1",
-            "name": "rho_vroo",
-            "schema": "date",
+            "@id": "dtmi:example:wum_pi;1",
+            "name": "wum_rho",
+            "schema": "float",
             "@type": "Property"
           }
         }
@@ -621,16 +621,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_epsilon;1",
+        "@id": "dtmi:example:wum_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "sigma_delta",
+          "name": "wum_chi",
           "request": {
-            "@id": "dtmi:example:sigma_beta;1",
-            "name": "sigma_gamma",
-            "schema": "dateTime",
+            "@id": "dtmi:example:wum_upsilon;1",
+            "name": "wum_phi",
+            "schema": "integer",
             "@type": "Property"
           }
         }
@@ -645,14 +645,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_iota;1",
+        "@id": "dtmi:example:wum_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_theta",
+          "name": "wum_wum",
           "request": {
-            "@id": "dtmi:example:sigma_zeta;1",
-            "name": "sigma_eta",
+            "@id": "dtmi:example:wum_omega;1",
+            "name": "wum_yuzz",
             "@type": "Relationship"
           }
         }
@@ -667,15 +667,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_nu;1",
+        "@id": "dtmi:example:wum_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "sigma_mu",
+          "name": "wum_glikk",
           "request": {
-            "@id": "dtmi:example:sigma_kappa;1",
-            "name": "sigma_lambda",
+            "@id": "dtmi:example:wum_humpf;1",
+            "name": "wum_fuddle",
             "@type": "Relationship"
           }
         }
@@ -690,15 +690,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_rho;1",
+        "@id": "dtmi:example:wum_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_pi",
+          "name": "wum_thnad",
           "request": {
-            "@id": "dtmi:example:sigma_xi;1",
-            "name": "sigma_omicron",
-            "schema": "double",
+            "@id": "dtmi:example:wum_snee;1",
+            "name": "wum_quan",
+            "schema": "long",
             "@type": "Telemetry"
           }
         }
@@ -713,16 +713,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_phi;1",
+        "@id": "dtmi:example:wum_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "sigma_upsilon",
+          "name": "wum_jogg",
           "request": {
-            "@id": "dtmi:example:sigma_sigma;1",
-            "name": "sigma_tau",
-            "schema": "duration",
+            "@id": "dtmi:example:wum_floob;1",
+            "name": "wum_zatz",
+            "schema": "string",
             "@type": "Telemetry"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyResponseElementV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyResponseElementV3.json
index f6b0bf9c..11fc6037 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyResponseElementV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyResponseElementV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_hi;1",
+        "@id": "dtmi:example:um_sigma;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:sigma_vroo;1",
+          "@id": "dtmi:example:um_rho;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "sigma_yekk",
+            "name": "um_pi",
             "response": {
-              "@id": "dtmi:example:sigma_flunn;1",
-              "name": "sigma_itch",
-              "schema": "dateTime"
+              "@id": "dtmi:example:um_xi;1",
+              "name": "um_omicron",
+              "schema": "integer"
             }
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_epsilon;1",
+        "@id": "dtmi:example:um_psi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_delta;1",
+          "@id": "dtmi:example:um_chi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "tau_gamma",
+            "name": "um_phi",
             "response": [
               {
-                "@id": "dtmi:example:tau_alpha;1",
-                "name": "tau_beta",
-                "schema": "double"
+                "@id": "dtmi:example:um_tau;1",
+                "name": "um_upsilon",
+                "schema": "long"
               }
             ]
           }
@@ -61,21 +61,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_theta;1",
+        "@id": "dtmi:example:um_wum;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Command",
-            "name": "tau_eta",
+            "name": "um_yuzz",
             "response": {
               "@id": "dtmi:ex:dependentRef;1",
-              "name": "tau_zeta",
-              "schema": "duration"
+              "name": "um_omega",
+              "schema": "string"
             }
           },
           {
             "@type": "Command",
-            "name": "tau_iota",
+            "name": "um_um",
             "response": "dtmi:ex:dependentRef;1"
           }
         ]
@@ -90,21 +90,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_mu;1",
+        "@id": "dtmi:example:um_glikk;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Command",
-            "name": "tau_lambda",
+            "name": "um_fuddle",
             "response": {
               "@id": "dtmi:ex:dependentRef;1",
-              "name": "tau_kappa",
-              "schema": "float"
+              "name": "um_humpf",
+              "schema": "time"
             }
           },
           {
             "@type": "Command",
-            "name": "tau_nu",
+            "name": "um_nuh",
             "response": [
               "dtmi:ex:dependentRef;1"
             ]
@@ -121,16 +121,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_rho;1",
+        "@id": "dtmi:example:um_spazz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_pi;1",
+          "@id": "dtmi:example:um_thnad;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "tau_omicron",
+            "name": "um_quan",
             "response": {
-              "@id": "dtmi:example:tau_xi;1",
+              "@id": "dtmi:example:um_snee;1",
               "@type": "CommandResponse",
               "@context": "dtmi:dtdl:context;2"
             }
@@ -147,17 +147,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_phi;1",
+        "@id": "dtmi:example:um_flunn;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_upsilon;1",
+          "@id": "dtmi:example:um_jogg;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Command",
-            "name": "tau_tau",
+            "name": "um_zatz",
             "response": {
-              "@id": "dtmi:example:tau_sigma;1",
+              "@id": "dtmi:example:um_floob;1",
               "@type": "CommandResponse",
               "@context": "dtmi:dtdl:context;2"
             }
@@ -166,6 +166,61 @@
       }
     ]
   },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:humpf_alpha;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_hi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "um_vroo",
+            "response": {
+              "@id": "dtmi:example:um_itch;1",
+              "name": "um_yekk",
+              "schema": "unsignedLong",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:humpf_zeta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:humpf_epsilon;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Command",
+            "name": "humpf_delta",
+            "response": {
+              "@id": "dtmi:example:humpf_beta;1",
+              "name": "humpf_gamma",
+              "schema": "unsignedShort",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
   {
     "valid": true,
     "options": [
@@ -174,14 +229,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_omega;1",
+        "@id": "dtmi:example:humpf_iota;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_psi;1",
+          "@id": "dtmi:example:humpf_theta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "tau_chi",
+            "name": "humpf_eta",
             "response": []
           }
         }
@@ -196,24 +251,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_nuh;1",
+        "@id": "dtmi:example:humpf_pi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_glikk;1",
+          "@id": "dtmi:example:humpf_omicron;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "tau_fuddle",
+            "name": "humpf_xi",
             "response": [
               {
-                "@id": "dtmi:example:tau_yuzz;1",
-                "name": "tau_wum",
-                "schema": "integer"
+                "@id": "dtmi:example:humpf_kappa;1",
+                "name": "humpf_lambda",
+                "schema": "dateTime"
               },
               {
-                "@id": "dtmi:example:tau_um;1",
-                "name": "tau_humpf",
-                "schema": "long"
+                "@id": "dtmi:example:humpf_mu;1",
+                "name": "humpf_nu",
+                "schema": "double"
               }
             ]
           }
@@ -229,25 +284,25 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_jogg;1",
+        "@id": "dtmi:example:humpf_psi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_zatz;1",
+          "@id": "dtmi:example:humpf_chi;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Command",
-            "name": "tau_floob",
+            "name": "humpf_phi",
             "response": [
               {
-                "@id": "dtmi:example:tau_snee;1",
-                "name": "tau_quan",
-                "schema": "string"
+                "@id": "dtmi:example:humpf_rho;1",
+                "name": "humpf_sigma",
+                "schema": "duration"
               },
               {
-                "@id": "dtmi:example:tau_thnad;1",
-                "name": "tau_spazz",
-                "schema": "time"
+                "@id": "dtmi:example:humpf_tau;1",
+                "name": "humpf_upsilon",
+                "schema": "float"
               }
             ]
           }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyResponseTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyResponseTermAndDtmiV3.json
index c6adc89f..855faeb8 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyResponseTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyResponseTermAndDtmiV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_epsilon;1",
+        "@id": "dtmi:example:nuh_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_beta",
+          "name": "nuh_glikk",
           "response": {
-            "name": "psi_gamma",
-            "schema": "string"
+            "name": "nuh_nuh",
+            "schema": "duration"
           },
           "dtmi:dtdl:property:response;3": {
-            "name": "psi_delta",
-            "schema": "time"
+            "name": "nuh_snee",
+            "schema": "float"
           }
         }
       }
@@ -32,19 +32,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_iota;1",
+        "@id": "dtmi:example:nuh_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "psi_zeta",
+          "name": "nuh_thnad",
           "response": {
-            "name": "psi_eta",
-            "schema": "boolean"
+            "name": "nuh_spazz",
+            "schema": "integer"
           },
           "dtmi:dtdl:property:response;3": {
-            "name": "psi_theta",
-            "schema": "date"
+            "name": "nuh_floob",
+            "schema": "long"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandPropertyResponseTypeConformanceV3.json b/DTDL/v3/spec/Requirement-ClassCommandPropertyResponseTypeConformanceV3.json
index cc23ec05..d78f7b77 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandPropertyResponseTypeConformanceV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandPropertyResponseTypeConformanceV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_delta;1",
+        "@id": "dtmi:example:humpf_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_gamma",
+          "name": "humpf_nuh",
           "response": {
-            "@id": "dtmi:example:upsilon_beta;1",
-            "elementSchema": "boolean",
+            "@id": "dtmi:example:humpf_glikk;1",
+            "elementSchema": "integer",
             "@type": "Array"
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_eta;1",
+        "@id": "dtmi:example:humpf_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "upsilon_zeta",
+          "name": "humpf_thnad",
           "response": {
-            "@id": "dtmi:example:upsilon_epsilon;1",
-            "elementSchema": "date",
+            "@id": "dtmi:example:humpf_quan;1",
+            "elementSchema": "long",
             "@type": "Array"
           }
         }
@@ -52,14 +52,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_lambda;1",
+        "@id": "dtmi:example:humpf_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_kappa",
+          "name": "humpf_jogg",
           "response": {
-            "@id": "dtmi:example:upsilon_theta;1",
-            "name": "upsilon_iota",
+            "@id": "dtmi:example:humpf_floob;1",
+            "name": "humpf_zatz",
             "@type": "Command"
           }
         }
@@ -74,15 +74,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_omicron;1",
+        "@id": "dtmi:example:humpf_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "upsilon_xi",
+          "name": "humpf_vroo",
           "response": {
-            "@id": "dtmi:example:upsilon_mu;1",
-            "name": "upsilon_nu",
+            "@id": "dtmi:example:humpf_itch;1",
+            "name": "humpf_yekk",
             "@type": "Command"
           }
         }
@@ -97,15 +97,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_tau;1",
+        "@id": "dtmi:example:fuddle_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_sigma",
+          "name": "fuddle_gamma",
           "response": {
-            "@id": "dtmi:example:upsilon_pi;1",
-            "name": "upsilon_rho",
-            "schema": "dateTime",
+            "@id": "dtmi:example:fuddle_alpha;1",
+            "name": "fuddle_beta",
+            "schema": "string",
             "@type": "CommandRequest"
           }
         }
@@ -120,16 +120,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_psi;1",
+        "@id": "dtmi:example:fuddle_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "upsilon_chi",
+          "name": "fuddle_eta",
           "response": {
-            "@id": "dtmi:example:upsilon_upsilon;1",
-            "name": "upsilon_phi",
-            "schema": "double",
+            "@id": "dtmi:example:fuddle_epsilon;1",
+            "name": "fuddle_zeta",
+            "schema": "time",
             "@type": "CommandRequest"
           }
         }
@@ -144,15 +144,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_um;1",
+        "@id": "dtmi:example:fuddle_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_wum",
+          "name": "fuddle_lambda",
           "response": {
-            "@id": "dtmi:example:upsilon_omega;1",
-            "name": "upsilon_yuzz",
-            "schema": "duration",
+            "@id": "dtmi:example:fuddle_iota;1",
+            "name": "fuddle_kappa",
+            "schema": "boolean",
             "@type": "CommandResponse"
           }
         }
@@ -167,16 +167,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_snee;1",
+        "@id": "dtmi:example:fuddle_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_nuh",
+          "name": "fuddle_pi",
           "response": {
-            "@id": "dtmi:example:upsilon_humpf;1",
-            "name": "upsilon_fuddle",
+            "@id": "dtmi:example:fuddle_nu;1",
+            "name": "fuddle_xi",
             "schema": {
-              "@id": "dtmi:example:upsilon_glikk;1",
+              "@id": "dtmi:example:fuddle_omicron;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -193,17 +193,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_zatz;1",
+        "@id": "dtmi:example:fuddle_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "upsilon_floob",
+          "name": "fuddle_phi",
           "response": {
-            "@id": "dtmi:example:upsilon_quan;1",
-            "name": "upsilon_thnad",
+            "@id": "dtmi:example:fuddle_sigma;1",
+            "name": "fuddle_tau",
             "schema": {
-              "@id": "dtmi:example:upsilon_spazz;1",
+              "@id": "dtmi:example:fuddle_upsilon;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -220,13 +220,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_itch;1",
+        "@id": "dtmi:example:fuddle_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_flunn",
+          "name": "fuddle_omega",
           "response": {
-            "@id": "dtmi:example:upsilon_jogg;1",
+            "@id": "dtmi:example:fuddle_psi;1",
             "valueSchema": "integer",
             "@type": "Enum"
           }
@@ -242,14 +242,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_hi;1",
+        "@id": "dtmi:example:fuddle_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "upsilon_vroo",
+          "name": "fuddle_um",
           "response": {
-            "@id": "dtmi:example:upsilon_yekk;1",
+            "@id": "dtmi:example:fuddle_wum;1",
             "valueSchema": "integer",
             "@type": "Enum"
           }
@@ -265,15 +265,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_delta;1",
+        "@id": "dtmi:example:fuddle_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_gamma",
+          "name": "fuddle_nuh",
           "response": {
-            "@id": "dtmi:example:phi_alpha;1",
-            "enumValue": 1111,
-            "name": "phi_beta",
+            "@id": "dtmi:example:fuddle_fuddle;1",
+            "enumValue": 1124,
+            "name": "fuddle_glikk",
             "@type": "EnumValue"
           }
         }
@@ -288,16 +288,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_theta;1",
+        "@id": "dtmi:example:fuddle_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "phi_eta",
+          "name": "fuddle_spazz",
           "response": {
-            "@id": "dtmi:example:phi_epsilon;1",
-            "enumValue": 1112,
-            "name": "phi_zeta",
+            "@id": "dtmi:example:fuddle_quan;1",
+            "enumValue": 1125,
+            "name": "fuddle_thnad",
             "@type": "EnumValue"
           }
         }
@@ -312,15 +312,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_mu;1",
+        "@id": "dtmi:example:fuddle_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_lambda",
+          "name": "fuddle_flunn",
           "response": {
-            "@id": "dtmi:example:phi_iota;1",
-            "name": "phi_kappa",
-            "schema": "float",
+            "@id": "dtmi:example:fuddle_zatz;1",
+            "name": "fuddle_jogg",
+            "schema": "date",
             "@type": "Field"
           }
         }
@@ -335,16 +335,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_pi;1",
+        "@id": "dtmi:example:glikk_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "phi_omicron",
+          "name": "fuddle_hi",
           "response": {
-            "@id": "dtmi:example:phi_nu;1",
-            "name": "phi_xi",
-            "schema": "integer",
+            "@id": "dtmi:example:fuddle_yekk;1",
+            "name": "fuddle_vroo",
+            "schema": "dateTime",
             "@type": "Field"
           }
         }
@@ -359,13 +359,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_tau;1",
+        "@id": "dtmi:example:glikk_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_sigma",
+          "name": "glikk_gamma",
           "response": {
-            "@id": "dtmi:example:phi_rho;1",
+            "@id": "dtmi:example:glikk_beta;1",
             "@type": "Interface"
           }
         }
@@ -380,14 +380,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_chi;1",
+        "@id": "dtmi:example:glikk_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "phi_phi",
+          "name": "glikk_zeta",
           "response": {
-            "@id": "dtmi:example:phi_upsilon;1",
+            "@id": "dtmi:example:glikk_epsilon;1",
             "@type": "Interface"
           }
         }
@@ -402,20 +402,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_um;1",
+        "@id": "dtmi:example:glikk_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_wum",
+          "name": "glikk_lambda",
           "response": {
-            "@id": "dtmi:example:phi_psi;1",
+            "@id": "dtmi:example:glikk_theta;1",
             "mapKey": {
-              "name": "phi_omega",
+              "name": "glikk_iota",
               "schema": "string"
             },
             "mapValue": {
-              "name": "phi_yuzz",
-              "schema": "long"
+              "name": "glikk_kappa",
+              "schema": "double"
             },
             "@type": "Map"
           }
@@ -431,21 +431,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_snee;1",
+        "@id": "dtmi:example:glikk_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "phi_nuh",
+          "name": "glikk_pi",
           "response": {
-            "@id": "dtmi:example:phi_humpf;1",
+            "@id": "dtmi:example:glikk_nu;1",
             "mapKey": {
-              "name": "phi_fuddle",
+              "name": "glikk_xi",
               "schema": "string"
             },
             "mapValue": {
-              "name": "phi_glikk",
-              "schema": "string"
+              "name": "glikk_omicron",
+              "schema": "duration"
             },
             "@type": "Map"
           }
@@ -461,14 +461,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_floob;1",
+        "@id": "dtmi:example:glikk_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_spazz",
+          "name": "glikk_upsilon",
           "response": {
-            "@id": "dtmi:example:phi_quan;1",
-            "name": "phi_thnad",
+            "@id": "dtmi:example:glikk_sigma;1",
+            "name": "glikk_tau",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -484,15 +484,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_itch;1",
+        "@id": "dtmi:example:glikk_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "phi_flunn",
+          "name": "glikk_omega",
           "response": {
-            "@id": "dtmi:example:phi_zatz;1",
-            "name": "phi_jogg",
+            "@id": "dtmi:example:glikk_chi;1",
+            "name": "glikk_psi",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -508,15 +508,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_alpha;1",
+        "@id": "dtmi:example:glikk_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_hi",
+          "name": "glikk_humpf",
           "response": {
-            "@id": "dtmi:example:phi_yekk;1",
-            "name": "phi_vroo",
-            "schema": "time",
+            "@id": "dtmi:example:glikk_wum;1",
+            "name": "glikk_um",
+            "schema": "float",
             "@type": "MapValue"
           }
         }
@@ -531,16 +531,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_epsilon;1",
+        "@id": "dtmi:example:glikk_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "chi_delta",
+          "name": "glikk_snee",
           "response": {
-            "@id": "dtmi:example:chi_beta;1",
-            "name": "chi_gamma",
-            "schema": "boolean",
+            "@id": "dtmi:example:glikk_glikk;1",
+            "name": "glikk_nuh",
+            "schema": "integer",
             "@type": "MapValue"
           }
         }
@@ -555,13 +555,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_theta;1",
+        "@id": "dtmi:example:glikk_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_eta",
+          "name": "glikk_spazz",
           "response": {
-            "@id": "dtmi:example:chi_zeta;1",
+            "@id": "dtmi:example:glikk_thnad;1",
             "@type": "Object"
           }
         }
@@ -576,14 +576,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_lambda;1",
+        "@id": "dtmi:example:glikk_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "chi_kappa",
+          "name": "glikk_jogg",
           "response": {
-            "@id": "dtmi:example:chi_iota;1",
+            "@id": "dtmi:example:glikk_zatz;1",
             "@type": "Object"
           }
         }
@@ -598,15 +598,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_omicron;1",
+        "@id": "dtmi:example:glikk_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_xi",
+          "name": "glikk_vroo",
           "response": {
-            "@id": "dtmi:example:chi_mu;1",
-            "name": "chi_nu",
-            "schema": "date",
+            "@id": "dtmi:example:glikk_itch;1",
+            "name": "glikk_yekk",
+            "schema": "long",
             "@type": "Property"
           }
         }
@@ -621,16 +621,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_tau;1",
+        "@id": "dtmi:example:nuh_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "chi_sigma",
+          "name": "nuh_gamma",
           "response": {
-            "@id": "dtmi:example:chi_pi;1",
-            "name": "chi_rho",
-            "schema": "dateTime",
+            "@id": "dtmi:example:nuh_alpha;1",
+            "name": "nuh_beta",
+            "schema": "string",
             "@type": "Property"
           }
         }
@@ -645,14 +645,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_psi;1",
+        "@id": "dtmi:example:nuh_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_chi",
+          "name": "nuh_eta",
           "response": {
-            "@id": "dtmi:example:chi_upsilon;1",
-            "name": "chi_phi",
+            "@id": "dtmi:example:nuh_epsilon;1",
+            "name": "nuh_zeta",
             "@type": "Relationship"
           }
         }
@@ -667,15 +667,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_um;1",
+        "@id": "dtmi:example:nuh_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "chi_wum",
+          "name": "nuh_lambda",
           "response": {
-            "@id": "dtmi:example:chi_omega;1",
-            "name": "chi_yuzz",
+            "@id": "dtmi:example:nuh_iota;1",
+            "name": "nuh_kappa",
             "@type": "Relationship"
           }
         }
@@ -690,15 +690,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_nuh;1",
+        "@id": "dtmi:example:nuh_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_glikk",
+          "name": "nuh_omicron",
           "response": {
-            "@id": "dtmi:example:chi_humpf;1",
-            "name": "chi_fuddle",
-            "schema": "double",
+            "@id": "dtmi:example:nuh_nu;1",
+            "name": "nuh_xi",
+            "schema": "time",
             "@type": "Telemetry"
           }
         }
@@ -713,16 +713,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_spazz;1",
+        "@id": "dtmi:example:nuh_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Command",
-          "name": "chi_thnad",
+          "name": "nuh_tau",
           "response": {
-            "@id": "dtmi:example:chi_snee;1",
-            "name": "chi_quan",
-            "schema": "duration",
+            "@id": "dtmi:example:nuh_rho;1",
+            "name": "nuh_sigma",
+            "schema": "boolean",
             "@type": "Telemetry"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestContextConformsV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestContextConformsV3.json
index cca3b669..5526722c 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestContextConformsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestContextConformsV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_rho;1",
+        "@id": "dtmi:example:hi_mu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:thnad_pi;1",
+          "@id": "dtmi:example:hi_lambda;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "thnad_omicron",
+            "name": "hi_kappa",
             "request": {
-              "name": "thnad_xi",
-              "schema": "float",
+              "name": "hi_iota",
+              "schema": "double",
               "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
             }
           }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_phi;1",
+        "@id": "dtmi:example:hi_pi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:thnad_upsilon;1",
+          "@id": "dtmi:example:hi_omicron;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "thnad_tau",
+            "name": "hi_xi",
             "request": {
-              "name": "thnad_sigma",
-              "schema": "integer",
+              "name": "hi_nu",
+              "schema": "duration",
               "@context": []
             }
           }
@@ -59,17 +59,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_yuzz;1",
+        "@id": "dtmi:example:hi_upsilon;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:thnad_omega;1",
+          "@id": "dtmi:example:hi_tau;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "thnad_psi",
+            "name": "hi_sigma",
             "request": {
-              "name": "thnad_chi",
-              "schema": "long",
+              "name": "hi_rho",
+              "schema": "float",
               "@context": [
                 "dtmi:dtdl:extension:quantitativeTypes;1"
               ]
@@ -87,17 +87,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_fuddle;1",
+        "@id": "dtmi:example:hi_omega;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:thnad_humpf;1",
+          "@id": "dtmi:example:hi_psi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "thnad_um",
+            "name": "hi_chi",
             "request": {
-              "name": "thnad_wum",
-              "schema": "string",
+              "name": "hi_phi",
+              "schema": "integer",
               "@context": null
             }
           }
@@ -113,17 +113,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_quan;1",
+        "@id": "dtmi:example:hi_humpf;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:thnad_snee;1",
+          "@id": "dtmi:example:hi_um;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "thnad_nuh",
+            "name": "hi_wum",
             "request": {
-              "name": "thnad_glikk",
-              "schema": "time",
+              "name": "hi_yuzz",
+              "schema": "long",
               "@context": 626
             }
           }
@@ -139,17 +139,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_zatz;1",
+        "@id": "dtmi:example:hi_snee;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:thnad_floob;1",
+          "@id": "dtmi:example:hi_nuh;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "thnad_spazz",
+            "name": "hi_glikk",
             "request": {
-              "name": "thnad_thnad",
-              "schema": "boolean",
+              "name": "hi_fuddle",
+              "schema": "string",
               "@context": true
             }
           }
@@ -165,17 +165,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_yekk;1",
+        "@id": "dtmi:example:hi_floob;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:thnad_itch;1",
+          "@id": "dtmi:example:hi_spazz;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "thnad_flunn",
+            "name": "hi_thnad",
             "request": {
-              "name": "thnad_jogg",
-              "schema": "date",
+              "name": "hi_quan",
+              "schema": "time",
               "@context": [
                 null
               ]
@@ -193,17 +193,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_beta;1",
+        "@id": "dtmi:example:hi_itch;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:spazz_alpha;1",
+          "@id": "dtmi:example:hi_flunn;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "thnad_hi",
+            "name": "hi_jogg",
             "request": {
-              "name": "thnad_vroo",
-              "schema": "dateTime",
+              "name": "hi_zatz",
+              "schema": "boolean",
               "@context": [
                 626
               ]
@@ -221,17 +221,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_zeta;1",
+        "@id": "dtmi:example:alpha_alpha;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:spazz_epsilon;1",
+          "@id": "dtmi:example:hi_hi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "spazz_delta",
+            "name": "hi_vroo",
             "request": {
-              "name": "spazz_gamma",
-              "schema": "double",
+              "name": "hi_yekk",
+              "schema": "date",
               "@context": [
                 true
               ]
@@ -249,18 +249,70 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_kappa;1",
+        "@id": "dtmi:example:alpha_epsilon;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:alpha_delta;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "alpha_gamma",
+            "request": {
+              "name": "alpha_beta",
+              "schema": "dateTime",
+              "@context": "dtmi:dtdl:extension:quantitativeTypes"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:alpha_iota;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:alpha_theta;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "alpha_eta",
+            "request": {
+              "name": "alpha_zeta",
+              "schema": "double",
+              "@context": "http://dtdl/extension/quantitativeTypes/1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:alpha_nu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:spazz_iota;1",
+          "@id": "dtmi:example:alpha_mu;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "spazz_theta",
+            "name": "alpha_lambda",
             "request": {
-              "name": "spazz_eta",
+              "name": "alpha_kappa",
               "schema": "duration",
-              "@context": {}
+              "@context": "quantitativeTypes;1"
             }
           }
         }
@@ -275,20 +327,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_xi;1",
+        "@id": "dtmi:example:alpha_rho;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:spazz_nu;1",
+          "@id": "dtmi:example:alpha_pi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "spazz_mu",
+            "name": "alpha_omicron",
             "request": {
-              "name": "spazz_lambda",
+              "name": "alpha_xi",
               "schema": "float",
-              "@context": [
-                {}
-              ]
+              "@context": {}
             }
           }
         }
@@ -303,18 +353,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_sigma;1",
+        "@id": "dtmi:example:alpha_phi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:spazz_rho;1",
+          "@id": "dtmi:example:alpha_upsilon;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "spazz_pi",
+            "name": "alpha_tau",
             "request": {
-              "name": "spazz_omicron",
+              "name": "alpha_sigma",
               "schema": "integer",
-              "@context": "dtmi:dtdl:extension:quantitativeTypes"
+              "@context": {
+                "foo": "dtmi:foo:bar;1"
+              }
             }
           }
         }
@@ -329,18 +381,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_chi;1",
+        "@id": "dtmi:example:alpha_yuzz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:spazz_phi;1",
+          "@id": "dtmi:example:alpha_omega;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "spazz_upsilon",
+            "name": "alpha_psi",
             "request": {
-              "name": "spazz_tau",
+              "name": "alpha_chi",
               "schema": "long",
-              "@context": "http://dtdl/extension/quantitativeTypes/1"
+              "@context": [
+                {}
+              ]
             }
           }
         }
@@ -355,18 +409,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_wum;1",
+        "@id": "dtmi:example:alpha_fuddle;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:spazz_yuzz;1",
+          "@id": "dtmi:example:alpha_humpf;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "spazz_omega",
+            "name": "alpha_um",
             "request": {
-              "name": "spazz_psi",
+              "name": "alpha_wum",
               "schema": "string",
-              "@context": "quantitativeTypes;1"
+              "@context": [
+                {
+                  "foo": "dtmi:foo:bar;1"
+                }
+              ]
             }
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestIdDuplicateV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestIdDuplicateV3.json
index 910523c4..faa776ea 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestIdDuplicateV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestIdDuplicateV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_eta;1",
+        "@id": "dtmi:example:iota_kappa;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:hi_eta;1",
+          "@id": "dtmi:example:iota_kappa;1",
           "@type": "Interface",
           "contents": {
-            "@id": "dtmi:example:hi_eta;1",
+            "@id": "dtmi:example:iota_kappa;1",
             "@type": "Command",
-            "name": "hi_iota",
+            "name": "iota_mu",
             "request": {
-              "@id": "dtmi:example:hi_eta;1",
-              "name": "hi_theta",
+              "@id": "dtmi:example:iota_kappa;1",
+              "name": "iota_lambda",
               "schema": "long"
             }
           }
@@ -34,19 +34,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_kappa;1",
+        "@id": "dtmi:example:iota_nu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:hi_kappa;1",
+          "@id": "dtmi:example:iota_nu;1",
           "@type": "Interface",
           "contents": {
-            "@id": "dtmi:example:hi_kappa;1",
+            "@id": "dtmi:example:iota_nu;1",
             "@type": "Command",
-            "name": "hi_mu",
+            "name": "iota_omicron",
             "request": {
               "@context": "dtmi:undefinedExtension:context;1",
-              "@id": "dtmi:example:hi_kappa;1",
-              "name": "hi_lambda",
+              "@id": "dtmi:example:iota_nu;1",
+              "name": "iota_xi",
               "schema": "string"
             }
           }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestIdIsDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestIdIsDtmiV3.json
index 64255054..bbad6af5 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestIdIsDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestIdIsDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_rho;1",
+        "@id": "dtmi:example:delta_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "jogg_pi",
+          "name": "delta_tau",
           "request": {
             "@id": "dtmi:foo:bar;7",
-            "name": "jogg_omicron",
+            "name": "delta_sigma",
             "schema": "string"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_upsilon;1",
+        "@id": "dtmi:example:delta_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "jogg_tau",
+          "name": "delta_chi",
           "request": {
             "@id": "dtmi:foo:bar;108675309",
-            "name": "jogg_sigma",
+            "name": "delta_phi",
             "schema": "time"
           }
         }
@@ -51,14 +51,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_psi;1",
+        "@id": "dtmi:example:delta_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "jogg_chi",
+          "name": "delta_yuzz",
           "request": {
             "@id": "dtmi:foo:bar;999999999",
-            "name": "jogg_phi",
+            "name": "delta_omega",
             "schema": "boolean"
           }
         }
@@ -73,14 +73,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_wum;1",
+        "@id": "dtmi:example:delta_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "jogg_yuzz",
+          "name": "delta_humpf",
           "request": {
             "@id": "dtmi:foo;1",
-            "name": "jogg_omega",
+            "name": "delta_um",
             "schema": "date"
           }
         }
@@ -95,14 +95,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_fuddle;1",
+        "@id": "dtmi:example:delta_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "jogg_humpf",
+          "name": "delta_nuh",
           "request": {
             "@id": "dtmi:foo:bar",
-            "name": "jogg_um",
+            "name": "delta_glikk",
             "schema": "dateTime"
           }
         }
@@ -117,14 +117,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_snee;1",
+        "@id": "dtmi:example:delta_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "jogg_nuh",
+          "name": "delta_thnad",
           "request": {
             "@id": "dtmi:foo:bar;3.14",
-            "name": "jogg_glikk",
+            "name": "delta_quan",
             "schema": "double"
           }
         }
@@ -139,14 +139,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_spazz;1",
+        "@id": "dtmi:example:delta_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "jogg_thnad",
+          "name": "delta_zatz",
           "request": {
             "@id": "dtmi:foo:bar;3.141592",
-            "name": "jogg_quan",
+            "name": "delta_floob",
             "schema": "duration"
           }
         }
@@ -161,14 +161,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_jogg;1",
+        "@id": "dtmi:example:delta_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "jogg_zatz",
+          "name": "delta_itch",
           "request": {
             "@id": null,
-            "name": "jogg_floob",
+            "name": "delta_flunn",
             "schema": "float"
           }
         }
@@ -183,15 +183,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_yekk;1",
+        "@id": "dtmi:example:epsilon_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "jogg_itch",
+          "name": "delta_hi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": null,
-            "name": "jogg_flunn",
+            "name": "delta_vroo",
             "schema": "integer"
           }
         }
@@ -206,14 +206,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_alpha;1",
+        "@id": "dtmi:example:epsilon_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "jogg_hi",
+          "name": "epsilon_gamma",
           "request": {
             "@id": 626,
-            "name": "jogg_vroo",
+            "name": "epsilon_beta",
             "schema": "long"
           }
         }
@@ -228,15 +228,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_delta;1",
+        "@id": "dtmi:example:epsilon_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "flunn_gamma",
+          "name": "epsilon_zeta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": 626,
-            "name": "flunn_beta",
+            "name": "epsilon_epsilon",
             "schema": "string"
           }
         }
@@ -251,14 +251,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_eta;1",
+        "@id": "dtmi:example:epsilon_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "flunn_zeta",
+          "name": "epsilon_iota",
           "request": {
             "@id": true,
-            "name": "flunn_epsilon",
+            "name": "epsilon_theta",
             "schema": "time"
           }
         }
@@ -273,15 +273,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_kappa;1",
+        "@id": "dtmi:example:epsilon_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "flunn_iota",
+          "name": "epsilon_mu",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": true,
-            "name": "flunn_theta",
+            "name": "epsilon_lambda",
             "schema": "boolean"
           }
         }
@@ -296,16 +296,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_nu;1",
+        "@id": "dtmi:example:epsilon_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "flunn_mu",
+          "name": "epsilon_omicron",
           "request": {
             "@id": {
               "@value": "dtmi:apparently:valid:identifier;3"
             },
-            "name": "flunn_lambda",
+            "name": "epsilon_xi",
             "schema": "date"
           }
         }
@@ -320,17 +320,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_pi;1",
+        "@id": "dtmi:example:epsilon_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "flunn_omicron",
+          "name": "epsilon_sigma",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": {
               "@value": "dtmi:apparently:valid:identifier;3"
             },
-            "name": "flunn_xi",
+            "name": "epsilon_rho",
             "schema": "dateTime"
           }
         }
@@ -345,14 +345,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_tau;1",
+        "@id": "dtmi:example:epsilon_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "flunn_sigma",
+          "name": "epsilon_phi",
           "request": {
             "@id": "dtmi:foo:bar;0",
-            "name": "flunn_rho",
+            "name": "epsilon_upsilon",
             "schema": "double"
           }
         }
@@ -367,15 +367,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_chi;1",
+        "@id": "dtmi:example:epsilon_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "flunn_phi",
+          "name": "epsilon_omega",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0",
-            "name": "flunn_upsilon",
+            "name": "epsilon_psi",
             "schema": "duration"
           }
         }
@@ -390,14 +390,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_yuzz;1",
+        "@id": "dtmi:example:epsilon_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "flunn_omega",
+          "name": "epsilon_um",
           "request": {
             "@id": "dtmi:foo:bar;0.0",
-            "name": "flunn_psi",
+            "name": "epsilon_wum",
             "schema": "float"
           }
         }
@@ -412,15 +412,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_humpf;1",
+        "@id": "dtmi:example:epsilon_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "flunn_um",
+          "name": "epsilon_glikk",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0.0",
-            "name": "flunn_wum",
+            "name": "epsilon_fuddle",
             "schema": "integer"
           }
         }
@@ -435,14 +435,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_nuh;1",
+        "@id": "dtmi:example:epsilon_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "flunn_glikk",
+          "name": "epsilon_quan",
           "request": {
             "@id": "dtmi:foo:bar;1234567890",
-            "name": "flunn_fuddle",
+            "name": "epsilon_snee",
             "schema": "long"
           }
         }
@@ -457,15 +457,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_thnad;1",
+        "@id": "dtmi:example:epsilon_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "flunn_quan",
+          "name": "epsilon_floob",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;1234567890",
-            "name": "flunn_snee",
+            "name": "epsilon_spazz",
             "schema": "string"
           }
         }
@@ -480,14 +480,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_zatz;1",
+        "@id": "dtmi:example:epsilon_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "flunn_floob",
+          "name": "epsilon_flunn",
           "request": {
             "@id": "dtmi:foo:bar;1a",
-            "name": "flunn_spazz",
+            "name": "epsilon_jogg",
             "schema": "time"
           }
         }
@@ -502,15 +502,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_itch;1",
+        "@id": "dtmi:example:epsilon_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "flunn_flunn",
+          "name": "epsilon_vroo",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;1a",
-            "name": "flunn_jogg",
+            "name": "epsilon_yekk",
             "schema": "boolean"
           }
         }
@@ -525,14 +525,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_hi;1",
+        "@id": "dtmi:example:zeta_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "flunn_vroo",
+          "name": "zeta_beta",
           "request": {
             "@id": "dtmi:foo:bar;3.0",
-            "name": "flunn_yekk",
+            "name": "zeta_alpha",
             "schema": "date"
           }
         }
@@ -547,15 +547,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_gamma;1",
+        "@id": "dtmi:example:zeta_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "itch_beta",
+          "name": "zeta_epsilon",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.0",
-            "name": "itch_alpha",
+            "name": "zeta_delta",
             "schema": "dateTime"
           }
         }
@@ -570,14 +570,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_zeta;1",
+        "@id": "dtmi:example:zeta_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "itch_epsilon",
+          "name": "zeta_theta",
           "request": {
             "@id": "dtmi:foo:bar;3.1415926",
-            "name": "itch_delta",
+            "name": "zeta_eta",
             "schema": "double"
           }
         }
@@ -592,15 +592,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_iota;1",
+        "@id": "dtmi:example:zeta_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "itch_theta",
+          "name": "zeta_lambda",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.1415926",
-            "name": "itch_eta",
+            "name": "zeta_kappa",
             "schema": "duration"
           }
         }
@@ -615,14 +615,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_mu;1",
+        "@id": "dtmi:example:zeta_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "itch_lambda",
+          "name": "zeta_xi",
           "request": {
             "@id": "dtmi:foo:bar;6.02",
-            "name": "itch_kappa",
+            "name": "zeta_nu",
             "schema": "float"
           }
         }
@@ -637,15 +637,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_omicron;1",
+        "@id": "dtmi:example:zeta_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "itch_xi",
+          "name": "zeta_rho",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;6.02",
-            "name": "itch_nu",
+            "name": "zeta_pi",
             "schema": "integer"
           }
         }
@@ -660,14 +660,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_sigma;1",
+        "@id": "dtmi:example:zeta_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "itch_rho",
+          "name": "zeta_upsilon",
           "request": {
             "@id": "dtmi:foo:bar;0.1",
-            "name": "itch_pi",
+            "name": "zeta_tau",
             "schema": "long"
           }
         }
@@ -682,15 +682,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_phi;1",
+        "@id": "dtmi:example:zeta_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "itch_upsilon",
+          "name": "zeta_psi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0.1",
-            "name": "itch_tau",
+            "name": "zeta_chi",
             "schema": "string"
           }
         }
@@ -705,14 +705,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_omega;1",
+        "@id": "dtmi:example:zeta_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "itch_psi",
+          "name": "zeta_wum",
           "request": {
             "@id": "dtmi:foo:bar;01",
-            "name": "itch_chi",
+            "name": "zeta_yuzz",
             "schema": "time"
           }
         }
@@ -727,15 +727,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_um;1",
+        "@id": "dtmi:example:zeta_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "itch_wum",
+          "name": "zeta_fuddle",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;01",
-            "name": "itch_yuzz",
+            "name": "zeta_humpf",
             "schema": "boolean"
           }
         }
@@ -750,14 +750,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_glikk;1",
+        "@id": "dtmi:example:zeta_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "itch_fuddle",
+          "name": "zeta_snee",
           "request": {
             "@id": "dtmi:foo:bar;",
-            "name": "itch_humpf",
+            "name": "zeta_nuh",
             "schema": "date"
           }
         }
@@ -772,15 +772,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_quan;1",
+        "@id": "dtmi:example:zeta_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "itch_snee",
+          "name": "zeta_spazz",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;",
-            "name": "itch_nuh",
+            "name": "zeta_thnad",
             "schema": "dateTime"
           }
         }
@@ -795,14 +795,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_floob;1",
+        "@id": "dtmi:example:zeta_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "itch_spazz",
+          "name": "zeta_jogg",
           "request": {
             "@id": "dtmi:test:invalidId_;1",
-            "name": "itch_thnad",
+            "name": "zeta_zatz",
             "schema": "double"
           }
         }
@@ -817,15 +817,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_flunn;1",
+        "@id": "dtmi:example:zeta_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "itch_jogg",
+          "name": "zeta_yekk",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:invalidId_;1",
-            "name": "itch_zatz",
+            "name": "zeta_itch",
             "schema": "duration"
           }
         }
@@ -840,14 +840,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_vroo;1",
+        "@id": "dtmi:example:eta_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "itch_yekk",
+          "name": "eta_alpha",
           "request": {
             "@id": "dtmi:test:_invalidUserId;1",
-            "name": "itch_itch",
+            "name": "zeta_hi",
             "schema": "float"
           }
         }
@@ -862,15 +862,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_beta;1",
+        "@id": "dtmi:example:eta_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yekk_alpha",
+          "name": "eta_delta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:_invalidUserId;1",
-            "name": "itch_hi",
+            "name": "eta_gamma",
             "schema": "integer"
           }
         }
@@ -885,14 +885,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_epsilon;1",
+        "@id": "dtmi:example:eta_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yekk_delta",
+          "name": "eta_eta",
           "request": {
             "@id": "dtmi:test:1seg;1",
-            "name": "yekk_gamma",
+            "name": "eta_zeta",
             "schema": "long"
           }
         }
@@ -907,15 +907,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_theta;1",
+        "@id": "dtmi:example:eta_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yekk_eta",
+          "name": "eta_kappa",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:1seg;1",
-            "name": "yekk_zeta",
+            "name": "eta_iota",
             "schema": "string"
           }
         }
@@ -930,14 +930,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_lambda;1",
+        "@id": "dtmi:example:eta_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yekk_kappa",
+          "name": "eta_nu",
           "request": {
             "@id": "dtmi:foo:bar.baz;1",
-            "name": "yekk_iota",
+            "name": "eta_mu",
             "schema": "time"
           }
         }
@@ -952,15 +952,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_xi;1",
+        "@id": "dtmi:example:eta_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yekk_nu",
+          "name": "eta_pi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar.baz;1",
-            "name": "yekk_mu",
+            "name": "eta_omicron",
             "schema": "boolean"
           }
         }
@@ -975,14 +975,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_rho;1",
+        "@id": "dtmi:example:eta_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yekk_pi",
+          "name": "eta_tau",
           "request": {
             "@id": "dtmi:foo::bar;1",
-            "name": "yekk_omicron",
+            "name": "eta_sigma",
             "schema": "date"
           }
         }
@@ -997,15 +997,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_upsilon;1",
+        "@id": "dtmi:example:eta_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yekk_tau",
+          "name": "eta_chi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo::bar;1",
-            "name": "yekk_sigma",
+            "name": "eta_phi",
             "schema": "dateTime"
           }
         }
@@ -1020,14 +1020,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_psi;1",
+        "@id": "dtmi:example:eta_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yekk_chi",
+          "name": "eta_yuzz",
           "request": {
             "@id": "urn:foo:bar:1",
-            "name": "yekk_phi",
+            "name": "eta_omega",
             "schema": "double"
           }
         }
@@ -1042,15 +1042,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_wum;1",
+        "@id": "dtmi:example:eta_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yekk_yuzz",
+          "name": "eta_humpf",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "urn:foo:bar:1",
-            "name": "yekk_omega",
+            "name": "eta_um",
             "schema": "duration"
           }
         }
@@ -1065,14 +1065,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_fuddle;1",
+        "@id": "dtmi:example:eta_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yekk_humpf",
+          "name": "eta_nuh",
           "request": {
             "@id": "http://foo/bar/baz",
-            "name": "yekk_um",
+            "name": "eta_glikk",
             "schema": "float"
           }
         }
@@ -1087,15 +1087,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_snee;1",
+        "@id": "dtmi:example:eta_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yekk_nuh",
+          "name": "eta_thnad",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "http://foo/bar/baz",
-            "name": "yekk_glikk",
+            "name": "eta_quan",
             "schema": "integer"
           }
         }
@@ -1110,14 +1110,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_spazz;1",
+        "@id": "dtmi:example:eta_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yekk_thnad",
+          "name": "eta_zatz",
           "request": {
             "@id": "dtmi:;1",
-            "name": "yekk_quan",
+            "name": "eta_floob",
             "schema": "long"
           }
         }
@@ -1132,15 +1132,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_jogg;1",
+        "@id": "dtmi:example:eta_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yekk_zatz",
+          "name": "eta_itch",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:;1",
-            "name": "yekk_floob",
+            "name": "eta_flunn",
             "schema": "string"
           }
         }
@@ -1155,14 +1155,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_yekk;1",
+        "@id": "dtmi:example:theta_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yekk_itch",
+          "name": "eta_hi",
           "request": {
             "@id": "dtmi:dtdl:example;1",
-            "name": "yekk_flunn",
+            "name": "eta_vroo",
             "schema": "time"
           }
         }
@@ -1177,15 +1177,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_alpha;1",
+        "@id": "dtmi:example:theta_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yekk_hi",
+          "name": "theta_gamma",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:dtdl:example;1",
-            "name": "yekk_vroo",
+            "name": "theta_beta",
             "schema": "boolean"
           }
         }
@@ -1200,14 +1200,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_delta;1",
+        "@id": "dtmi:example:theta_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "vroo_gamma",
+          "name": "theta_zeta",
           "request": {
             "@id": "dtmi:standard:example;1",
-            "name": "vroo_beta",
+            "name": "theta_epsilon",
             "schema": "date"
           }
         }
@@ -1222,15 +1222,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_eta;1",
+        "@id": "dtmi:example:theta_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "vroo_zeta",
+          "name": "theta_iota",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:standard:example;1",
-            "name": "vroo_epsilon",
+            "name": "theta_theta",
             "schema": "dateTime"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestIdNotArrayV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestIdNotArrayV3.json
index 8da12e49..56cee580 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestIdNotArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestIdNotArrayV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_kappa;1",
+        "@id": "dtmi:example:theta_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "vroo_iota",
+          "name": "theta_mu",
           "request": {
             "@id": [
               "dtmi:foo:bar;7"
             ],
-            "name": "vroo_theta",
+            "name": "theta_lambda",
             "schema": "double"
           }
         }
@@ -31,17 +31,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_nu;1",
+        "@id": "dtmi:example:theta_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "vroo_mu",
+          "name": "theta_omicron",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;7"
             ],
-            "name": "vroo_lambda",
+            "name": "theta_xi",
             "schema": "duration"
           }
         }
@@ -56,16 +56,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_pi;1",
+        "@id": "dtmi:example:theta_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "vroo_omicron",
+          "name": "theta_sigma",
           "request": {
             "@id": [
               "dtmi:foo:bar;108675309"
             ],
-            "name": "vroo_xi",
+            "name": "theta_rho",
             "schema": "float"
           }
         }
@@ -80,17 +80,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_tau;1",
+        "@id": "dtmi:example:theta_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "vroo_sigma",
+          "name": "theta_phi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;108675309"
             ],
-            "name": "vroo_rho",
+            "name": "theta_upsilon",
             "schema": "integer"
           }
         }
@@ -105,16 +105,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_chi;1",
+        "@id": "dtmi:example:theta_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "vroo_phi",
+          "name": "theta_omega",
           "request": {
             "@id": [
               "dtmi:foo:bar;999999999"
             ],
-            "name": "vroo_upsilon",
+            "name": "theta_psi",
             "schema": "long"
           }
         }
@@ -129,17 +129,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_yuzz;1",
+        "@id": "dtmi:example:theta_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "vroo_omega",
+          "name": "theta_um",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;999999999"
             ],
-            "name": "vroo_psi",
+            "name": "theta_wum",
             "schema": "string"
           }
         }
@@ -154,16 +154,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_humpf;1",
+        "@id": "dtmi:example:theta_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "vroo_um",
+          "name": "theta_glikk",
           "request": {
             "@id": [
               "dtmi:foo;1"
             ],
-            "name": "vroo_wum",
+            "name": "theta_fuddle",
             "schema": "time"
           }
         }
@@ -178,17 +178,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_nuh;1",
+        "@id": "dtmi:example:theta_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "vroo_glikk",
+          "name": "theta_quan",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo;1"
             ],
-            "name": "vroo_fuddle",
+            "name": "theta_snee",
             "schema": "boolean"
           }
         }
@@ -203,16 +203,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_thnad;1",
+        "@id": "dtmi:example:theta_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "vroo_quan",
+          "name": "theta_floob",
           "request": {
             "@id": [
               "dtmi:foo:bar"
             ],
-            "name": "vroo_snee",
+            "name": "theta_spazz",
             "schema": "date"
           }
         }
@@ -227,17 +227,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_zatz;1",
+        "@id": "dtmi:example:theta_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "vroo_floob",
+          "name": "theta_flunn",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar"
             ],
-            "name": "vroo_spazz",
+            "name": "theta_jogg",
             "schema": "dateTime"
           }
         }
@@ -252,16 +252,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_itch;1",
+        "@id": "dtmi:example:theta_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "vroo_flunn",
+          "name": "theta_vroo",
           "request": {
             "@id": [
               "dtmi:foo:bar;3.14"
             ],
-            "name": "vroo_jogg",
+            "name": "theta_yekk",
             "schema": "double"
           }
         }
@@ -276,17 +276,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_hi;1",
+        "@id": "dtmi:example:iota_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "vroo_vroo",
+          "name": "iota_beta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;3.14"
             ],
-            "name": "vroo_yekk",
+            "name": "iota_alpha",
             "schema": "duration"
           }
         }
@@ -301,16 +301,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_gamma;1",
+        "@id": "dtmi:example:iota_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_beta",
+          "name": "iota_epsilon",
           "request": {
             "@id": [
               "dtmi:foo:bar;3.141592"
             ],
-            "name": "hi_alpha",
+            "name": "iota_delta",
             "schema": "float"
           }
         }
@@ -325,17 +325,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_zeta;1",
+        "@id": "dtmi:example:iota_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_epsilon",
+          "name": "iota_theta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;3.141592"
             ],
-            "name": "hi_delta",
+            "name": "iota_eta",
             "schema": "integer"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestInvalidKeywordsV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestInvalidKeywordsV3.json
index f99819ae..dae3b611 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestInvalidKeywordsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestInvalidKeywordsV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_xi;1",
+        "@id": "dtmi:example:pi_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_nu",
+          "name": "pi_pi",
           "request": {
-            "name": "eta_mu",
+            "name": "pi_omicron",
             "schema": "dateTime",
             "@graph": {}
           }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_rho;1",
+        "@id": "dtmi:example:pi_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_pi",
+          "name": "pi_tau",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "eta_omicron",
+            "name": "pi_sigma",
             "schema": "double",
             "@graph": {}
           }
@@ -52,13 +52,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_upsilon;1",
+        "@id": "dtmi:example:pi_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_tau",
+          "name": "pi_chi",
           "request": {
-            "name": "eta_sigma",
+            "name": "pi_phi",
             "schema": "duration",
             "@value": 626
           }
@@ -74,14 +74,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_psi;1",
+        "@id": "dtmi:example:pi_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_chi",
+          "name": "pi_yuzz",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "eta_phi",
+            "name": "pi_omega",
             "schema": "float",
             "@value": 626
           }
@@ -97,13 +97,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_wum;1",
+        "@id": "dtmi:example:pi_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_yuzz",
+          "name": "pi_humpf",
           "request": {
-            "name": "eta_omega",
+            "name": "pi_um",
             "schema": "integer",
             "@language": "en"
           }
@@ -119,14 +119,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_fuddle;1",
+        "@id": "dtmi:example:pi_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_humpf",
+          "name": "pi_nuh",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "eta_um",
+            "name": "pi_glikk",
             "schema": "long",
             "@language": "en"
           }
@@ -142,13 +142,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_snee;1",
+        "@id": "dtmi:example:pi_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_nuh",
+          "name": "pi_thnad",
           "request": {
-            "name": "eta_glikk",
+            "name": "pi_quan",
             "schema": "string",
             "@foobar": true
           }
@@ -164,14 +164,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_spazz;1",
+        "@id": "dtmi:example:pi_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_thnad",
+          "name": "pi_zatz",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "eta_quan",
+            "name": "pi_floob",
             "schema": "time",
             "@foobar": true
           }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyCommentStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyCommentStringLengthV3.json
index 50f37a1f..4927ba3b 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyCommentStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyCommentStringLengthV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_spazz;1",
+        "@id": "dtmi:example:kappa_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "alpha_thnad",
+          "name": "kappa_zatz",
           "request": {
-            "name": "alpha_quan",
+            "name": "kappa_floob",
             "schema": "boolean",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_jogg;1",
+        "@id": "dtmi:example:kappa_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "alpha_zatz",
+          "name": "kappa_itch",
           "request": {
-            "name": "alpha_floob",
+            "name": "kappa_flunn",
             "schema": "date",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
@@ -51,14 +51,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_yekk;1",
+        "@id": "dtmi:example:lambda_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "alpha_itch",
+          "name": "kappa_hi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "alpha_flunn",
+            "name": "kappa_vroo",
             "schema": "dateTime",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyCommentStringV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyCommentStringV3.json
index 03ebb2cd..dce41a76 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyCommentStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyCommentStringV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_omicron;1",
+        "@id": "dtmi:example:iota_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_xi",
+          "name": "iota_rho",
           "request": {
-            "name": "hi_nu",
+            "name": "iota_pi",
             "schema": "time",
             "comment": "hello"
           }
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_sigma;1",
+        "@id": "dtmi:example:iota_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_rho",
+          "name": "iota_upsilon",
           "request": {
-            "name": "hi_pi",
+            "name": "iota_tau",
             "schema": "boolean",
             "comment": [
               "hello"
@@ -53,13 +53,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_phi;1",
+        "@id": "dtmi:example:iota_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_upsilon",
+          "name": "iota_psi",
           "request": {
-            "name": "hi_tau",
+            "name": "iota_chi",
             "schema": "date",
             "comment": {
               "@value": "hello",
@@ -78,13 +78,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_omega;1",
+        "@id": "dtmi:example:iota_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_psi",
+          "name": "iota_wum",
           "request": {
-            "name": "hi_chi",
+            "name": "iota_yuzz",
             "schema": "dateTime",
             "comment": [
               {
@@ -105,13 +105,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_um;1",
+        "@id": "dtmi:example:iota_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_wum",
+          "name": "iota_fuddle",
           "request": {
-            "name": "hi_yuzz",
+            "name": "iota_humpf",
             "schema": "double",
             "comment": []
           }
@@ -127,13 +127,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_glikk;1",
+        "@id": "dtmi:example:iota_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_fuddle",
+          "name": "iota_snee",
           "request": {
-            "name": "hi_humpf",
+            "name": "iota_nuh",
             "schema": "duration",
             "comment": null
           }
@@ -149,14 +149,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_quan;1",
+        "@id": "dtmi:example:iota_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_snee",
+          "name": "iota_spazz",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "hi_nuh",
+            "name": "iota_thnad",
             "schema": "float",
             "comment": null
           }
@@ -172,13 +172,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_floob;1",
+        "@id": "dtmi:example:iota_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_spazz",
+          "name": "iota_jogg",
           "request": {
-            "name": "hi_thnad",
+            "name": "iota_zatz",
             "schema": "integer",
             "comment": true
           }
@@ -194,14 +194,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_flunn;1",
+        "@id": "dtmi:example:iota_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_jogg",
+          "name": "iota_yekk",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "hi_zatz",
+            "name": "iota_itch",
             "schema": "long",
             "comment": true
           }
@@ -217,13 +217,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_vroo;1",
+        "@id": "dtmi:example:kappa_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "hi_yekk",
+          "name": "kappa_alpha",
           "request": {
-            "name": "hi_itch",
+            "name": "iota_hi",
             "schema": "string",
             "comment": 626
           }
@@ -239,14 +239,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_beta;1",
+        "@id": "dtmi:example:kappa_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "alpha_alpha",
+          "name": "kappa_delta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "hi_hi",
+            "name": "kappa_gamma",
             "schema": "time",
             "comment": 626
           }
@@ -262,13 +262,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_epsilon;1",
+        "@id": "dtmi:example:kappa_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "alpha_delta",
+          "name": "kappa_eta",
           "request": {
-            "name": "alpha_gamma",
+            "name": "kappa_zeta",
             "schema": "boolean",
             "comment": [
               null
@@ -286,14 +286,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_theta;1",
+        "@id": "dtmi:example:kappa_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "alpha_eta",
+          "name": "kappa_kappa",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "alpha_zeta",
+            "name": "kappa_iota",
             "schema": "date",
             "comment": [
               null
@@ -311,13 +311,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_lambda;1",
+        "@id": "dtmi:example:kappa_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "alpha_kappa",
+          "name": "kappa_nu",
           "request": {
-            "name": "alpha_iota",
+            "name": "kappa_mu",
             "schema": "dateTime",
             "comment": [
               true
@@ -335,14 +335,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_xi;1",
+        "@id": "dtmi:example:kappa_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "alpha_nu",
+          "name": "kappa_pi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "alpha_mu",
+            "name": "kappa_omicron",
             "schema": "double",
             "comment": [
               true
@@ -360,13 +360,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_rho;1",
+        "@id": "dtmi:example:kappa_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "alpha_pi",
+          "name": "kappa_tau",
           "request": {
-            "name": "alpha_omicron",
+            "name": "kappa_sigma",
             "schema": "duration",
             "comment": [
               626
@@ -384,14 +384,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_upsilon;1",
+        "@id": "dtmi:example:kappa_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "alpha_tau",
+          "name": "kappa_chi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "alpha_sigma",
+            "name": "kappa_phi",
             "schema": "float",
             "comment": [
               626
@@ -409,13 +409,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_psi;1",
+        "@id": "dtmi:example:kappa_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "alpha_chi",
+          "name": "kappa_yuzz",
           "request": {
-            "name": "alpha_phi",
+            "name": "kappa_omega",
             "schema": "integer",
             "comment": {}
           }
@@ -431,14 +431,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_wum;1",
+        "@id": "dtmi:example:kappa_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "alpha_yuzz",
+          "name": "kappa_humpf",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "alpha_omega",
+            "name": "kappa_um",
             "schema": "long",
             "comment": {}
           }
@@ -454,13 +454,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_fuddle;1",
+        "@id": "dtmi:example:kappa_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "alpha_humpf",
+          "name": "kappa_nuh",
           "request": {
-            "name": "alpha_um",
+            "name": "kappa_glikk",
             "schema": "string",
             "comment": [
               {}
@@ -478,14 +478,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_snee;1",
+        "@id": "dtmi:example:kappa_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "alpha_nuh",
+          "name": "kappa_thnad",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "alpha_glikk",
+            "name": "kappa_quan",
             "schema": "time",
             "comment": [
               {}
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyCommentTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyCommentTermAndDtmiV3.json
index b47b1cfc..5cd1a85f 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyCommentTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyCommentTermAndDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_omicron;1",
+        "@id": "dtmi:example:lambda_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "beta_xi",
+          "name": "lambda_rho",
           "request": {
-            "comment": "beta_lambda",
-            "dtmi:dtdl:property:comment;3": "beta_mu",
-            "name": "beta_nu",
+            "comment": "lambda_xi",
+            "dtmi:dtdl:property:comment;3": "lambda_omicron",
+            "name": "lambda_pi",
             "schema": "integer"
           }
         }
@@ -30,16 +30,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_upsilon;1",
+        "@id": "dtmi:example:lambda_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "beta_tau",
+          "name": "lambda_chi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "comment": "beta_pi",
-            "dtmi:dtdl:property:comment;3": "beta_rho",
-            "name": "beta_sigma",
+            "comment": "lambda_tau",
+            "dtmi:dtdl:property:comment;3": "lambda_upsilon",
+            "name": "lambda_phi",
             "schema": "long"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyDescriptionLangStringV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyDescriptionLangStringV3.json
index ea4ae3d1..9ee1117d 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyDescriptionLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyDescriptionLangStringV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_psi;1",
+        "@id": "dtmi:example:lambda_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "beta_chi",
+          "name": "lambda_yuzz",
           "request": {
-            "name": "beta_phi",
+            "name": "lambda_omega",
             "schema": "string",
             "description": "hello"
           }
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_wum;1",
+        "@id": "dtmi:example:lambda_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "beta_yuzz",
+          "name": "lambda_humpf",
           "request": {
-            "name": "beta_omega",
+            "name": "lambda_um",
             "schema": "time",
             "description": [
               "hello"
@@ -53,13 +53,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_fuddle;1",
+        "@id": "dtmi:example:lambda_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "beta_humpf",
+          "name": "lambda_nuh",
           "request": {
-            "name": "beta_um",
+            "name": "lambda_glikk",
             "schema": "boolean",
             "description": {
               "en": "hello"
@@ -77,13 +77,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_snee;1",
+        "@id": "dtmi:example:lambda_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "beta_nuh",
+          "name": "lambda_thnad",
           "request": {
-            "name": "beta_glikk",
+            "name": "lambda_quan",
             "schema": "date",
             "description": [
               {
@@ -104,13 +104,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_spazz;1",
+        "@id": "dtmi:example:lambda_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "beta_thnad",
+          "name": "lambda_zatz",
           "request": {
-            "name": "beta_quan",
+            "name": "lambda_floob",
             "schema": "dateTime",
             "description": {}
           }
@@ -126,13 +126,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_jogg;1",
+        "@id": "dtmi:example:lambda_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "beta_zatz",
+          "name": "lambda_itch",
           "request": {
-            "name": "beta_floob",
+            "name": "lambda_flunn",
             "schema": "double",
             "description": []
           }
@@ -148,13 +148,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_yekk;1",
+        "@id": "dtmi:example:mu_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "beta_itch",
+          "name": "lambda_hi",
           "request": {
-            "name": "beta_flunn",
+            "name": "lambda_vroo",
             "schema": "duration",
             "description": null
           }
@@ -170,14 +170,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_alpha;1",
+        "@id": "dtmi:example:mu_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "beta_hi",
+          "name": "mu_gamma",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "beta_vroo",
+            "name": "mu_beta",
             "schema": "float",
             "description": null
           }
@@ -193,13 +193,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_delta;1",
+        "@id": "dtmi:example:mu_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_gamma",
+          "name": "mu_zeta",
           "request": {
-            "name": "gamma_beta",
+            "name": "mu_epsilon",
             "schema": "integer",
             "description": true
           }
@@ -215,14 +215,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_eta;1",
+        "@id": "dtmi:example:mu_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_zeta",
+          "name": "mu_iota",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "gamma_epsilon",
+            "name": "mu_theta",
             "schema": "long",
             "description": true
           }
@@ -238,13 +238,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_kappa;1",
+        "@id": "dtmi:example:mu_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_iota",
+          "name": "mu_mu",
           "request": {
-            "name": "gamma_theta",
+            "name": "mu_lambda",
             "schema": "string",
             "description": 626
           }
@@ -260,14 +260,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_nu;1",
+        "@id": "dtmi:example:mu_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_mu",
+          "name": "mu_omicron",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "gamma_lambda",
+            "name": "mu_xi",
             "schema": "time",
             "description": 626
           }
@@ -283,13 +283,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_pi;1",
+        "@id": "dtmi:example:mu_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_omicron",
+          "name": "mu_sigma",
           "request": {
-            "name": "gamma_xi",
+            "name": "mu_rho",
             "schema": "boolean",
             "description": [
               null
@@ -307,14 +307,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_tau;1",
+        "@id": "dtmi:example:mu_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_sigma",
+          "name": "mu_phi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "gamma_rho",
+            "name": "mu_upsilon",
             "schema": "date",
             "description": [
               null
@@ -332,13 +332,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_chi;1",
+        "@id": "dtmi:example:mu_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_phi",
+          "name": "mu_omega",
           "request": {
-            "name": "gamma_upsilon",
+            "name": "mu_psi",
             "schema": "dateTime",
             "description": [
               true
@@ -356,14 +356,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_yuzz;1",
+        "@id": "dtmi:example:mu_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_omega",
+          "name": "mu_um",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "gamma_psi",
+            "name": "mu_wum",
             "schema": "double",
             "description": [
               true
@@ -381,13 +381,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_humpf;1",
+        "@id": "dtmi:example:mu_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_um",
+          "name": "mu_glikk",
           "request": {
-            "name": "gamma_wum",
+            "name": "mu_fuddle",
             "schema": "duration",
             "description": [
               626
@@ -405,14 +405,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_nuh;1",
+        "@id": "dtmi:example:mu_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_glikk",
+          "name": "mu_quan",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "gamma_fuddle",
+            "name": "mu_snee",
             "schema": "float",
             "description": [
               626
@@ -430,13 +430,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_thnad;1",
+        "@id": "dtmi:example:mu_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_quan",
+          "name": "mu_floob",
           "request": {
-            "name": "gamma_snee",
+            "name": "mu_spazz",
             "schema": "integer",
             "description": [
               {}
@@ -454,14 +454,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_zatz;1",
+        "@id": "dtmi:example:mu_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_floob",
+          "name": "mu_flunn",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "gamma_spazz",
+            "name": "mu_jogg",
             "schema": "long",
             "description": [
               {}
@@ -479,13 +479,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_itch;1",
+        "@id": "dtmi:example:mu_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_flunn",
+          "name": "mu_vroo",
           "request": {
-            "name": "gamma_jogg",
+            "name": "mu_yekk",
             "schema": "string",
             "description": {
               "@value": "hello",
@@ -504,14 +504,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_hi;1",
+        "@id": "dtmi:example:nu_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "gamma_vroo",
+          "name": "nu_beta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "gamma_yekk",
+            "name": "nu_alpha",
             "schema": "time",
             "description": {
               "@value": "hello",
@@ -530,13 +530,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_gamma;1",
+        "@id": "dtmi:example:nu_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_beta",
+          "name": "nu_epsilon",
           "request": {
-            "name": "delta_alpha",
+            "name": "nu_delta",
             "schema": "boolean",
             "description": [
               {
@@ -556,14 +556,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_zeta;1",
+        "@id": "dtmi:example:nu_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_epsilon",
+          "name": "nu_theta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "delta_delta",
+            "name": "nu_eta",
             "schema": "date",
             "description": [
               {
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyDescriptionStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyDescriptionStringLengthV3.json
index 0c75d9b5..16336330 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyDescriptionStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyDescriptionStringLengthV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_iota;1",
+        "@id": "dtmi:example:nu_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_theta",
+          "name": "nu_lambda",
           "request": {
-            "name": "delta_eta",
+            "name": "nu_kappa",
             "schema": "dateTime",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_mu;1",
+        "@id": "dtmi:example:nu_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_lambda",
+          "name": "nu_xi",
           "request": {
-            "name": "delta_kappa",
+            "name": "nu_nu",
             "schema": "double",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
@@ -51,14 +51,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_omicron;1",
+        "@id": "dtmi:example:nu_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_xi",
+          "name": "nu_rho",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "delta_nu",
+            "name": "nu_pi",
             "schema": "duration",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyDescriptionTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyDescriptionTermAndDtmiV3.json
index 8f666686..43aad6d9 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyDescriptionTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyDescriptionTermAndDtmiV3.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_snee;1",
+        "@id": "dtmi:example:nu_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_nuh",
+          "name": "nu_thnad",
           "request": {
             "description": [
-              "delta_humpf"
+              "nu_nuh"
             ],
             "dtmi:dtdl:property:description;3": [
-              "delta_fuddle"
+              "nu_snee"
             ],
-            "name": "delta_glikk",
+            "name": "nu_quan",
             "schema": "string"
           }
         }
@@ -34,20 +34,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_zatz;1",
+        "@id": "dtmi:example:nu_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_floob",
+          "name": "nu_flunn",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "description": [
-              "delta_quan"
+              "nu_floob"
             ],
             "dtmi:dtdl:property:description;3": [
-              "delta_thnad"
+              "nu_zatz"
             ],
-            "name": "delta_spazz",
+            "name": "nu_jogg",
             "schema": "time"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyDisplayNameLangStringV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyDisplayNameLangStringV3.json
index 6227e71c..96eeca25 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyDisplayNameLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyDisplayNameLangStringV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_itch;1",
+        "@id": "dtmi:example:nu_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_flunn",
+          "name": "nu_vroo",
           "request": {
-            "name": "delta_jogg",
+            "name": "nu_yekk",
             "schema": "boolean",
             "displayName": "hello"
           }
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_hi;1",
+        "@id": "dtmi:example:xi_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "delta_vroo",
+          "name": "xi_beta",
           "request": {
-            "name": "delta_yekk",
+            "name": "xi_alpha",
             "schema": "date",
             "displayName": [
               "hello"
@@ -53,13 +53,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_gamma;1",
+        "@id": "dtmi:example:xi_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_beta",
+          "name": "xi_epsilon",
           "request": {
-            "name": "epsilon_alpha",
+            "name": "xi_delta",
             "schema": "dateTime",
             "displayName": {
               "en": "hello"
@@ -77,13 +77,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_zeta;1",
+        "@id": "dtmi:example:xi_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_epsilon",
+          "name": "xi_theta",
           "request": {
-            "name": "epsilon_delta",
+            "name": "xi_eta",
             "schema": "double",
             "displayName": [
               {
@@ -104,13 +104,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_iota;1",
+        "@id": "dtmi:example:xi_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_theta",
+          "name": "xi_lambda",
           "request": {
-            "name": "epsilon_eta",
+            "name": "xi_kappa",
             "schema": "duration",
             "displayName": {}
           }
@@ -126,13 +126,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_mu;1",
+        "@id": "dtmi:example:xi_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_lambda",
+          "name": "xi_xi",
           "request": {
-            "name": "epsilon_kappa",
+            "name": "xi_nu",
             "schema": "float",
             "displayName": []
           }
@@ -148,13 +148,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_omicron;1",
+        "@id": "dtmi:example:xi_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_xi",
+          "name": "xi_rho",
           "request": {
-            "name": "epsilon_nu",
+            "name": "xi_pi",
             "schema": "integer",
             "displayName": null
           }
@@ -170,14 +170,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_sigma;1",
+        "@id": "dtmi:example:xi_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_rho",
+          "name": "xi_upsilon",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "epsilon_pi",
+            "name": "xi_tau",
             "schema": "long",
             "displayName": null
           }
@@ -193,13 +193,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_phi;1",
+        "@id": "dtmi:example:xi_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_upsilon",
+          "name": "xi_psi",
           "request": {
-            "name": "epsilon_tau",
+            "name": "xi_chi",
             "schema": "string",
             "displayName": true
           }
@@ -215,14 +215,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_omega;1",
+        "@id": "dtmi:example:xi_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_psi",
+          "name": "xi_wum",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "epsilon_chi",
+            "name": "xi_yuzz",
             "schema": "time",
             "displayName": true
           }
@@ -238,13 +238,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_um;1",
+        "@id": "dtmi:example:xi_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_wum",
+          "name": "xi_fuddle",
           "request": {
-            "name": "epsilon_yuzz",
+            "name": "xi_humpf",
             "schema": "boolean",
             "displayName": 626
           }
@@ -260,14 +260,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_glikk;1",
+        "@id": "dtmi:example:xi_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_fuddle",
+          "name": "xi_snee",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "epsilon_humpf",
+            "name": "xi_nuh",
             "schema": "date",
             "displayName": 626
           }
@@ -283,13 +283,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_quan;1",
+        "@id": "dtmi:example:xi_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_snee",
+          "name": "xi_spazz",
           "request": {
-            "name": "epsilon_nuh",
+            "name": "xi_thnad",
             "schema": "dateTime",
             "displayName": [
               null
@@ -307,14 +307,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_floob;1",
+        "@id": "dtmi:example:xi_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_spazz",
+          "name": "xi_jogg",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "epsilon_thnad",
+            "name": "xi_zatz",
             "schema": "double",
             "displayName": [
               null
@@ -332,13 +332,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_flunn;1",
+        "@id": "dtmi:example:xi_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_jogg",
+          "name": "xi_yekk",
           "request": {
-            "name": "epsilon_zatz",
+            "name": "xi_itch",
             "schema": "duration",
             "displayName": [
               true
@@ -356,14 +356,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_vroo;1",
+        "@id": "dtmi:example:omicron_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "epsilon_yekk",
+          "name": "omicron_alpha",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "epsilon_itch",
+            "name": "xi_hi",
             "schema": "float",
             "displayName": [
               true
@@ -381,13 +381,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_beta;1",
+        "@id": "dtmi:example:omicron_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_alpha",
+          "name": "omicron_delta",
           "request": {
-            "name": "epsilon_hi",
+            "name": "omicron_gamma",
             "schema": "integer",
             "displayName": [
               626
@@ -405,14 +405,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_epsilon;1",
+        "@id": "dtmi:example:omicron_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_delta",
+          "name": "omicron_eta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_gamma",
+            "name": "omicron_zeta",
             "schema": "long",
             "displayName": [
               626
@@ -430,13 +430,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_theta;1",
+        "@id": "dtmi:example:omicron_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_eta",
+          "name": "omicron_kappa",
           "request": {
-            "name": "zeta_zeta",
+            "name": "omicron_iota",
             "schema": "string",
             "displayName": [
               {}
@@ -454,14 +454,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_lambda;1",
+        "@id": "dtmi:example:omicron_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_kappa",
+          "name": "omicron_nu",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_iota",
+            "name": "omicron_mu",
             "schema": "time",
             "displayName": [
               {}
@@ -479,13 +479,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_xi;1",
+        "@id": "dtmi:example:omicron_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_nu",
+          "name": "omicron_pi",
           "request": {
-            "name": "zeta_mu",
+            "name": "omicron_omicron",
             "schema": "boolean",
             "displayName": {
               "@value": "hello",
@@ -504,14 +504,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_rho;1",
+        "@id": "dtmi:example:omicron_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_pi",
+          "name": "omicron_tau",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_omicron",
+            "name": "omicron_sigma",
             "schema": "date",
             "displayName": {
               "@value": "hello",
@@ -530,13 +530,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_upsilon;1",
+        "@id": "dtmi:example:omicron_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_tau",
+          "name": "omicron_chi",
           "request": {
-            "name": "zeta_sigma",
+            "name": "omicron_phi",
             "schema": "dateTime",
             "displayName": [
               {
@@ -556,14 +556,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_psi;1",
+        "@id": "dtmi:example:omicron_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_chi",
+          "name": "omicron_yuzz",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_phi",
+            "name": "omicron_omega",
             "schema": "double",
             "displayName": [
               {
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyDisplayNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyDisplayNameStringLengthV3.json
index fe3e0f20..881b5297 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyDisplayNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyDisplayNameStringLengthV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_wum;1",
+        "@id": "dtmi:example:omicron_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_yuzz",
+          "name": "omicron_humpf",
           "request": {
-            "name": "zeta_omega",
+            "name": "omicron_um",
             "schema": "duration",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_fuddle;1",
+        "@id": "dtmi:example:omicron_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_humpf",
+          "name": "omicron_nuh",
           "request": {
-            "name": "zeta_um",
+            "name": "omicron_glikk",
             "schema": "float",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
@@ -51,14 +51,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_snee;1",
+        "@id": "dtmi:example:omicron_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zeta_nuh",
+          "name": "omicron_thnad",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_glikk",
+            "name": "omicron_quan",
             "schema": "integer",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyDisplayNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyDisplayNameTermAndDtmiV3.json
index aee1f5c6..070c777a 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyDisplayNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyDisplayNameTermAndDtmiV3.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_zeta;1",
+        "@id": "dtmi:example:pi_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_epsilon",
+          "name": "pi_theta",
           "request": {
             "displayName": [
-              "eta_beta"
+              "pi_epsilon"
             ],
             "dtmi:dtdl:property:displayName;3": [
-              "eta_gamma"
+              "pi_zeta"
             ],
-            "name": "eta_delta",
+            "name": "pi_eta",
             "schema": "boolean"
           }
         }
@@ -34,20 +34,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_lambda;1",
+        "@id": "dtmi:example:pi_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "eta_kappa",
+          "name": "pi_nu",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "displayName": [
-              "eta_eta"
+              "pi_kappa"
             ],
             "dtmi:dtdl:property:displayName;3": [
-              "eta_theta"
+              "pi_lambda"
             ],
-            "name": "eta_iota",
+            "name": "pi_mu",
             "schema": "date"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyFormallyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyFormallyIrrelevantDtmiOrTermV3.json
index 6a8fb28b..09834448 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyFormallyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyFormallyIrrelevantDtmiOrTermV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_eta;1",
+        "@id": "dtmi:example:rho_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_zeta",
+          "name": "rho_iota",
           "request": {
-            "name": "theta_epsilon",
+            "name": "rho_theta",
             "schema": "duration",
             "dtmi:foo:bar;1": 626
           }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_kappa;1",
+        "@id": "dtmi:example:rho_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_iota",
+          "name": "rho_mu",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "theta_theta",
+            "name": "rho_lambda",
             "schema": "float",
             "dtmi:foo:bar;1": 626
           }
@@ -52,13 +52,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_nu;1",
+        "@id": "dtmi:example:rho_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_mu",
+          "name": "rho_omicron",
           "request": {
-            "name": "theta_lambda",
+            "name": "rho_xi",
             "schema": "integer",
             "boolean": null
           }
@@ -74,14 +74,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_pi;1",
+        "@id": "dtmi:example:rho_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_omicron",
+          "name": "rho_sigma",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "theta_xi",
+            "name": "rho_rho",
             "schema": "long",
             "boolean": null
           }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyFormallyUndefinedTermV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyFormallyUndefinedTermV3.json
index fb90842c..9dacb499 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyFormallyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyFormallyUndefinedTermV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_zatz;1",
+        "@id": "dtmi:example:rho_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_floob",
+          "name": "rho_flunn",
           "request": {
-            "name": "theta_spazz",
+            "name": "rho_jogg",
             "schema": "duration",
             "foobar": {}
           }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_itch;1",
+        "@id": "dtmi:example:rho_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_flunn",
+          "name": "rho_vroo",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "theta_jogg",
+            "name": "rho_yekk",
             "schema": "float",
             "foobar": {}
           }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyInvalidDtmiV3.json
index e477038c..006d10d9 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyInvalidDtmiV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_tau;1",
+        "@id": "dtmi:example:rho_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_sigma",
+          "name": "rho_phi",
           "request": {
             "@type": [
               "CommandRequest",
               "Foobar"
             ],
-            "name": "theta_rho",
+            "name": "rho_upsilon",
             "schema": "string",
             "dtmi:foo//bar": 626
           }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_chi;1",
+        "@id": "dtmi:example:rho_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_phi",
+          "name": "rho_omega",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": [
               "CommandRequest",
               "Foobar"
             ],
-            "name": "theta_upsilon",
+            "name": "rho_psi",
             "schema": "time",
             "dtmi:foo//bar": 626
           }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyNamePatternV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyNamePatternV3.json
index 917dbb1e..bc07e23b 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyNamePatternV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyNamePatternV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_quan;1",
+        "@id": "dtmi:example:thnad_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_snee",
+          "name": "thnad_rho",
           "request": {
-            "schema": "time",
+            "schema": "float",
             "name": "EARTH"
           }
         }
@@ -28,13 +28,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_spazz;1",
+        "@id": "dtmi:example:thnad_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_thnad",
+          "name": "thnad_tau",
           "request": {
-            "schema": "boolean",
+            "schema": "integer",
             "name": "Air"
           }
         }
@@ -49,13 +49,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_zatz;1",
+        "@id": "dtmi:example:thnad_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_floob",
+          "name": "thnad_phi",
           "request": {
-            "schema": "date",
+            "schema": "long",
             "name": "fire"
           }
         }
@@ -70,13 +70,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_flunn;1",
+        "@id": "dtmi:example:thnad_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_jogg",
+          "name": "thnad_psi",
           "request": {
-            "schema": "dateTime",
+            "schema": "string",
             "name": "hello_world"
           }
         }
@@ -91,13 +91,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_yekk;1",
+        "@id": "dtmi:example:thnad_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_itch",
+          "name": "thnad_yuzz",
           "request": {
-            "schema": "double",
+            "schema": "time",
             "name": "Anarchy99"
           }
         }
@@ -112,13 +112,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_hi;1",
+        "@id": "dtmi:example:thnad_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_vroo",
+          "name": "thnad_um",
           "request": {
-            "schema": "duration",
+            "schema": "boolean",
             "name": "23skidoo"
           }
         }
@@ -133,14 +133,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_beta;1",
+        "@id": "dtmi:example:thnad_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_alpha",
+          "name": "thnad_fuddle",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "float",
+            "schema": "date",
             "name": "23skidoo"
           }
         }
@@ -155,13 +155,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_delta;1",
+        "@id": "dtmi:example:thnad_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_gamma",
+          "name": "thnad_nuh",
           "request": {
-            "schema": "integer",
+            "schema": "dateTime",
             "name": "626"
           }
         }
@@ -176,14 +176,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_zeta;1",
+        "@id": "dtmi:example:thnad_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_epsilon",
+          "name": "thnad_quan",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "long",
+            "schema": "double",
             "name": "626"
           }
         }
@@ -198,13 +198,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_theta;1",
+        "@id": "dtmi:example:thnad_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_eta",
+          "name": "thnad_spazz",
           "request": {
-            "schema": "string",
+            "schema": "duration",
             "name": "goodbye-world"
           }
         }
@@ -219,14 +219,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_kappa;1",
+        "@id": "dtmi:example:thnad_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_iota",
+          "name": "thnad_zatz",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "time",
+            "schema": "float",
             "name": "goodbye-world"
           }
         }
@@ -241,13 +241,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_mu;1",
+        "@id": "dtmi:example:thnad_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_lambda",
+          "name": "thnad_flunn",
           "request": {
-            "schema": "boolean",
+            "schema": "integer",
             "name": "_haha"
           }
         }
@@ -262,14 +262,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_xi;1",
+        "@id": "dtmi:example:thnad_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_nu",
+          "name": "thnad_yekk",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "date",
+            "schema": "long",
             "name": "_haha"
           }
         }
@@ -284,13 +284,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_pi;1",
+        "@id": "dtmi:example:spazz_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_omicron",
+          "name": "thnad_hi",
           "request": {
-            "schema": "dateTime",
+            "schema": "string",
             "name": "toodaloo_"
           }
         }
@@ -305,14 +305,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_sigma;1",
+        "@id": "dtmi:example:spazz_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_rho",
+          "name": "spazz_beta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "double",
+            "schema": "time",
             "name": "toodaloo_"
           }
         }
@@ -327,13 +327,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_upsilon;1",
+        "@id": "dtmi:example:spazz_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_tau",
+          "name": "spazz_delta",
           "request": {
-            "schema": "duration",
+            "schema": "boolean",
             "name": "pro:con"
           }
         }
@@ -348,14 +348,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_chi;1",
+        "@id": "dtmi:example:spazz_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_phi",
+          "name": "spazz_zeta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "float",
+            "schema": "date",
             "name": "pro:con"
           }
         }
@@ -370,13 +370,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_omega;1",
+        "@id": "dtmi:example:spazz_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_psi",
+          "name": "spazz_theta",
           "request": {
-            "schema": "integer",
+            "schema": "dateTime",
             "name": "mish/mash"
           }
         }
@@ -391,14 +391,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_wum;1",
+        "@id": "dtmi:example:spazz_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_yuzz",
+          "name": "spazz_kappa",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "long",
+            "schema": "double",
             "name": "mish/mash"
           }
         }
@@ -413,13 +413,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_humpf;1",
+        "@id": "dtmi:example:spazz_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_um",
+          "name": "spazz_mu",
           "request": {
-            "schema": "string",
+            "schema": "duration",
             "name": "#tag"
           }
         }
@@ -434,14 +434,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_glikk;1",
+        "@id": "dtmi:example:spazz_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_fuddle",
+          "name": "spazz_xi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "time",
+            "schema": "float",
             "name": "#tag"
           }
         }
@@ -456,13 +456,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_snee;1",
+        "@id": "dtmi:example:spazz_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_nuh",
+          "name": "spazz_pi",
           "request": {
-            "schema": "boolean",
+            "schema": "integer",
             "name": "@tweet"
           }
         }
@@ -477,14 +477,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_thnad;1",
+        "@id": "dtmi:example:spazz_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_quan",
+          "name": "spazz_sigma",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "date",
+            "schema": "long",
             "name": "@tweet"
           }
         }
@@ -499,13 +499,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_floob;1",
+        "@id": "dtmi:example:spazz_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_spazz",
+          "name": "spazz_upsilon",
           "request": {
-            "schema": "dateTime",
+            "schema": "string",
             "name": "$money"
           }
         }
@@ -520,14 +520,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_jogg;1",
+        "@id": "dtmi:example:spazz_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_zatz",
+          "name": "spazz_chi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "double",
+            "schema": "time",
             "name": "$money"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyNameStringLengthV3.json
index 57b1c0e3..a1e950c0 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyNameStringLengthV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_um;1",
+        "@id": "dtmi:example:thnad_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_wum",
+          "name": "thnad_lambda",
           "request": {
-            "schema": "integer",
+            "schema": "dateTime",
             "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
         }
@@ -28,13 +28,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_fuddle;1",
+        "@id": "dtmi:example:thnad_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_humpf",
+          "name": "thnad_nu",
           "request": {
-            "schema": "long",
+            "schema": "double",
             "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
@@ -49,14 +49,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_nuh;1",
+        "@id": "dtmi:example:thnad_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_glikk",
+          "name": "thnad_omicron",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "string",
+            "schema": "duration",
             "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyNameStringV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyNameStringV3.json
index ffe77ecb..d5f9c4c6 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyNameStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyNameStringV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_wum;1",
+        "@id": "dtmi:example:quan_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_yuzz",
+          "name": "quan_kappa",
           "request": {
-            "schema": "duration",
+            "schema": "boolean",
             "name": "hello"
           }
         }
@@ -28,13 +28,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_humpf;1",
+        "@id": "dtmi:example:quan_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_um",
+          "name": "quan_mu",
           "request": {
-            "schema": "float",
+            "schema": "date",
             "name": [
               "hello"
             ]
@@ -51,13 +51,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_glikk;1",
+        "@id": "dtmi:example:quan_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_fuddle",
+          "name": "quan_xi",
           "request": {
-            "schema": "integer",
+            "schema": "dateTime",
             "name": {
               "@value": "hello",
               "@type": "xsd:string"
@@ -75,13 +75,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_snee;1",
+        "@id": "dtmi:example:quan_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_nuh",
+          "name": "quan_pi",
           "request": {
-            "schema": "long",
+            "schema": "double",
             "name": [
               {
                 "@value": "hello",
@@ -101,13 +101,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_thnad;1",
+        "@id": "dtmi:example:quan_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_quan",
+          "name": "quan_sigma",
           "request": {
-            "schema": "string",
+            "schema": "duration",
             "name": null
           }
         }
@@ -122,14 +122,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_floob;1",
+        "@id": "dtmi:example:quan_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_spazz",
+          "name": "quan_upsilon",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "time",
+            "schema": "float",
             "name": null
           }
         }
@@ -144,13 +144,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_jogg;1",
+        "@id": "dtmi:example:quan_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_zatz",
+          "name": "quan_chi",
           "request": {
-            "schema": "boolean",
+            "schema": "integer",
             "name": true
           }
         }
@@ -165,14 +165,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_itch;1",
+        "@id": "dtmi:example:quan_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_flunn",
+          "name": "quan_omega",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "date",
+            "schema": "long",
             "name": true
           }
         }
@@ -187,13 +187,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_vroo;1",
+        "@id": "dtmi:example:quan_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_yekk",
+          "name": "quan_wum",
           "request": {
-            "schema": "dateTime",
+            "schema": "string",
             "name": 626
           }
         }
@@ -208,14 +208,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_alpha;1",
+        "@id": "dtmi:example:quan_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_hi",
+          "name": "quan_humpf",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "double",
+            "schema": "time",
             "name": 626
           }
         }
@@ -230,13 +230,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_gamma;1",
+        "@id": "dtmi:example:quan_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_beta",
+          "name": "quan_glikk",
           "request": {
-            "schema": "duration",
+            "schema": "boolean",
             "name": [
               null
             ]
@@ -253,14 +253,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_epsilon;1",
+        "@id": "dtmi:example:quan_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_delta",
+          "name": "quan_snee",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "float",
+            "schema": "date",
             "name": [
               null
             ]
@@ -277,13 +277,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_eta;1",
+        "@id": "dtmi:example:quan_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_zeta",
+          "name": "quan_thnad",
           "request": {
-            "schema": "integer",
+            "schema": "dateTime",
             "name": [
               true
             ]
@@ -300,14 +300,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_iota;1",
+        "@id": "dtmi:example:quan_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_theta",
+          "name": "quan_floob",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "long",
+            "schema": "double",
             "name": [
               true
             ]
@@ -324,13 +324,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_lambda;1",
+        "@id": "dtmi:example:quan_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_kappa",
+          "name": "quan_jogg",
           "request": {
-            "schema": "string",
+            "schema": "duration",
             "name": [
               626
             ]
@@ -347,14 +347,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_nu;1",
+        "@id": "dtmi:example:quan_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_mu",
+          "name": "quan_itch",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "time",
+            "schema": "float",
             "name": [
               626
             ]
@@ -371,13 +371,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_omicron;1",
+        "@id": "dtmi:example:quan_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_xi",
+          "name": "quan_vroo",
           "request": {
-            "schema": "boolean",
+            "schema": "integer",
             "name": {}
           }
         }
@@ -392,14 +392,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_rho;1",
+        "@id": "dtmi:example:thnad_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_pi",
+          "name": "thnad_alpha",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "date",
+            "schema": "long",
             "name": {}
           }
         }
@@ -414,13 +414,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_tau;1",
+        "@id": "dtmi:example:thnad_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_sigma",
+          "name": "thnad_gamma",
           "request": {
-            "schema": "dateTime",
+            "schema": "string",
             "name": [
               {}
             ]
@@ -437,14 +437,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_phi;1",
+        "@id": "dtmi:example:thnad_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_upsilon",
+          "name": "thnad_epsilon",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "double",
+            "schema": "time",
             "name": [
               {}
             ]
@@ -461,13 +461,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_psi;1",
+        "@id": "dtmi:example:thnad_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_chi",
+          "name": "thnad_eta",
           "request": {
-            "schema": "duration",
+            "schema": "boolean",
             "name": []
           }
         }
@@ -482,14 +482,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_yuzz;1",
+        "@id": "dtmi:example:thnad_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_omega",
+          "name": "thnad_iota",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "float",
+            "schema": "date",
             "name": []
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyNameTermAndDtmiV3.json
index 3b924e03..c72f227d 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyNameTermAndDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_theta;1",
+        "@id": "dtmi:example:spazz_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_eta",
+          "name": "spazz_spazz",
           "request": {
-            "name": "um_epsilon",
-            "dtmi:dtdl:property:name;3": "um_zeta",
-            "schema": "long"
+            "name": "spazz_quan",
+            "dtmi:dtdl:property:name;3": "spazz_thnad",
+            "schema": "double"
           }
         }
       }
@@ -29,16 +29,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_mu;1",
+        "@id": "dtmi:example:spazz_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_lambda",
+          "name": "spazz_flunn",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "um_iota",
-            "dtmi:dtdl:property:name;3": "um_kappa",
-            "schema": "string"
+            "name": "spazz_zatz",
+            "dtmi:dtdl:property:name;3": "spazz_jogg",
+            "schema": "duration"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyNotDtmiNorTermV3.json
index ebeef31a..448e058f 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertyNotDtmiNorTermV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_yuzz;1",
+        "@id": "dtmi:example:rho_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_omega",
+          "name": "rho_um",
           "request": {
             "@type": [
               "CommandRequest",
               "Foobar"
             ],
-            "name": "theta_psi",
+            "name": "rho_wum",
             "schema": "boolean",
             "http://foo.com/bar": true
           }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_humpf;1",
+        "@id": "dtmi:example:rho_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_um",
+          "name": "rho_glikk",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": [
               "CommandRequest",
               "Foobar"
             ],
-            "name": "theta_wum",
+            "name": "rho_fuddle",
             "schema": "date",
             "http://foo.com/bar": true
           }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertySchemaElementV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertySchemaElementV3.json
index 92b76d52..ed17b2e5 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertySchemaElementV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertySchemaElementV3.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_pi;1",
+        "@id": "dtmi:example:floob_alpha;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:um_omicron;1",
+          "@id": "dtmi:example:spazz_hi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "um_xi",
+            "name": "spazz_vroo",
             "request": {
-              "name": "um_nu",
+              "name": "spazz_yekk",
               "schema": {
                 "@type": "Array",
-                "elementSchema": "time"
+                "elementSchema": "float"
               }
             }
           }
@@ -35,20 +35,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_upsilon;1",
+        "@id": "dtmi:example:floob_epsilon;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:um_tau;1",
+          "@id": "dtmi:example:floob_delta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "um_sigma",
+            "name": "floob_gamma",
             "request": {
-              "name": "um_rho",
+              "name": "floob_beta",
               "schema": [
                 {
                   "@type": "Array",
-                  "elementSchema": "boolean"
+                  "elementSchema": "integer"
                 }
               ]
             }
@@ -65,18 +65,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_phi;1",
+        "@id": "dtmi:example:floob_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Array",
-          "elementSchema": "date"
+          "elementSchema": "long"
         },
         "contents": {
           "@type": "Command",
-          "name": "um_psi",
+          "name": "floob_theta",
           "request": {
-            "name": "um_chi",
+            "name": "floob_eta",
             "schema": "dtmi:ex:dependentRef;1"
           }
         }
@@ -91,18 +91,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_omega;1",
+        "@id": "dtmi:example:floob_iota;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Array",
-          "elementSchema": "dateTime"
+          "elementSchema": "string"
         },
         "contents": {
           "@type": "Command",
-          "name": "um_wum",
+          "name": "floob_lambda",
           "request": {
-            "name": "um_yuzz",
+            "name": "floob_kappa",
             "schema": [
               "dtmi:ex:dependentRef;1"
             ]
@@ -119,20 +119,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_nuh;1",
+        "@id": "dtmi:example:floob_pi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:um_glikk;1",
+          "@id": "dtmi:example:floob_omicron;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "um_fuddle",
+            "name": "floob_xi",
             "request": {
-              "name": "um_humpf",
+              "name": "floob_nu",
               "schema": {
-                "@id": "dtmi:example:um_um;1",
+                "@id": "dtmi:example:floob_mu;1",
                 "@type": "Array",
-                "elementSchema": "double",
+                "elementSchema": "time",
                 "@context": "dtmi:dtdl:context;2"
               }
             }
@@ -149,22 +149,83 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_snee;1",
+        "@id": "dtmi:example:floob_phi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:floob_upsilon;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "floob_tau",
+            "request": {
+              "name": "floob_sigma",
+              "schema": {
+                "@id": "dtmi:example:floob_rho;1",
+                "@type": "Array",
+                "elementSchema": "short",
+                "@context": "dtmi:dtdl:context;4"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:floob_wum;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:floob_yuzz;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "floob_omega",
+            "request": {
+              "@context": "dtmi:undefinedExtension:context;1",
+              "name": "floob_psi",
+              "schema": {
+                "@id": "dtmi:example:floob_chi;1",
+                "@type": "Array",
+                "elementSchema": "string",
+                "@context": "dtmi:dtdl:context;4"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:floob_um;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Array",
-          "elementSchema": "float"
+          "elementSchema": "double"
         },
         "contents": {
           "@type": "Command",
-          "name": "um_thnad",
+          "name": "floob_fuddle",
           "request": {
-            "name": "um_quan",
+            "name": "floob_humpf",
             "schema": [
               {
                 "@type": "Array",
-                "elementSchema": "duration"
+                "elementSchema": "dateTime"
               },
               "dtmi:ex:dependentRef;1"
             ]
@@ -181,23 +242,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_spazz;1",
+        "@id": "dtmi:example:floob_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Array",
-          "elementSchema": "long"
+          "elementSchema": "float"
         },
         "contents": {
           "@type": "Command",
-          "name": "um_zatz",
+          "name": "floob_snee",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "um_floob",
+            "name": "floob_nuh",
             "schema": [
               {
                 "@type": "Array",
-                "elementSchema": "integer"
+                "elementSchema": "duration"
               },
               "dtmi:ex:dependentRef;1"
             ]
@@ -214,13 +275,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_itch;1",
+        "@id": "dtmi:example:floob_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_flunn",
+          "name": "floob_thnad",
           "request": {
-            "name": "um_jogg",
+            "name": "floob_quan",
             "schema": "dateTime"
           }
         }
@@ -235,13 +296,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_hi;1",
+        "@id": "dtmi:example:floob_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_vroo",
+          "name": "floob_zatz",
           "request": {
-            "name": "um_yekk",
+            "name": "floob_floob",
             "schema": [
               "dateTime"
             ]
@@ -258,13 +319,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_gamma;1",
+        "@id": "dtmi:example:floob_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_beta",
+          "name": "floob_itch",
           "request": {
-            "name": "humpf_alpha",
+            "name": "floob_flunn",
             "schema": "dtmi:dtdl:instance:Schema:dateTime;3"
           }
         }
@@ -279,13 +340,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_zeta;1",
+        "@id": "dtmi:example:zatz_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_epsilon",
+          "name": "floob_hi",
           "request": {
-            "name": "humpf_delta",
+            "name": "floob_vroo",
             "schema": [
               "dtmi:dtdl:instance:Schema:dateTime;3"
             ]
@@ -302,13 +363,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_iota;1",
+        "@id": "dtmi:example:zatz_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_theta",
+          "name": "zatz_gamma",
           "request": {
-            "name": "humpf_eta",
+            "name": "zatz_beta",
             "schema": "point"
           }
         }
@@ -323,13 +384,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_mu;1",
+        "@id": "dtmi:example:zatz_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_lambda",
+          "name": "zatz_zeta",
           "request": {
-            "name": "humpf_kappa",
+            "name": "zatz_epsilon",
             "schema": [
               "point"
             ]
@@ -346,13 +407,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_omicron;1",
+        "@id": "dtmi:example:zatz_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_xi",
+          "name": "zatz_iota",
           "request": {
-            "name": "humpf_nu",
+            "name": "zatz_theta",
             "schema": "dtmi:standard:schema:geospatial:point;3"
           }
         }
@@ -367,13 +428,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_sigma;1",
+        "@id": "dtmi:example:zatz_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_rho",
+          "name": "zatz_mu",
           "request": {
-            "name": "humpf_pi",
+            "name": "zatz_lambda",
             "schema": [
               "dtmi:standard:schema:geospatial:point;3"
             ]
@@ -390,13 +451,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_phi;1",
+        "@id": "dtmi:example:zatz_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_upsilon",
+          "name": "zatz_omicron",
           "request": {
-            "name": "humpf_tau",
+            "name": "zatz_xi",
             "schema": "Foobar"
           }
         }
@@ -411,14 +472,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_omega;1",
+        "@id": "dtmi:example:zatz_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_psi",
+          "name": "zatz_sigma",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "humpf_chi",
+            "name": "zatz_rho",
             "schema": "Foobar"
           }
         }
@@ -433,13 +494,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_um;1",
+        "@id": "dtmi:example:zatz_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_wum",
+          "name": "zatz_phi",
           "request": {
-            "name": "humpf_yuzz",
+            "name": "zatz_upsilon",
             "schema": null
           }
         }
@@ -454,14 +515,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_glikk;1",
+        "@id": "dtmi:example:zatz_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_fuddle",
+          "name": "zatz_omega",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "humpf_humpf",
+            "name": "zatz_psi",
             "schema": null
           }
         }
@@ -476,13 +537,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_quan;1",
+        "@id": "dtmi:example:zatz_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_snee",
+          "name": "zatz_um",
           "request": {
-            "name": "humpf_nuh",
+            "name": "zatz_wum",
             "schema": true
           }
         }
@@ -497,14 +558,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_floob;1",
+        "@id": "dtmi:example:zatz_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_spazz",
+          "name": "zatz_glikk",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "humpf_thnad",
+            "name": "zatz_fuddle",
             "schema": true
           }
         }
@@ -519,13 +580,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_flunn;1",
+        "@id": "dtmi:example:zatz_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_jogg",
+          "name": "zatz_quan",
           "request": {
-            "name": "humpf_zatz",
+            "name": "zatz_snee",
             "schema": 626
           }
         }
@@ -540,14 +601,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_vroo;1",
+        "@id": "dtmi:example:zatz_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_yekk",
+          "name": "zatz_floob",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "humpf_itch",
+            "name": "zatz_spazz",
             "schema": 626
           }
         }
@@ -562,13 +623,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_beta;1",
+        "@id": "dtmi:example:zatz_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_alpha",
+          "name": "zatz_flunn",
           "request": {
-            "name": "humpf_hi",
+            "name": "zatz_jogg",
             "schema": [
               null
             ]
@@ -585,14 +646,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_epsilon;1",
+        "@id": "dtmi:example:zatz_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_delta",
+          "name": "zatz_vroo",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "fuddle_gamma",
+            "name": "zatz_yekk",
             "schema": [
               null
             ]
@@ -609,13 +670,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_theta;1",
+        "@id": "dtmi:example:jogg_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_eta",
+          "name": "jogg_beta",
           "request": {
-            "name": "fuddle_zeta",
+            "name": "jogg_alpha",
             "schema": [
               true
             ]
@@ -632,14 +693,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_lambda;1",
+        "@id": "dtmi:example:jogg_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_kappa",
+          "name": "jogg_epsilon",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "fuddle_iota",
+            "name": "jogg_delta",
             "schema": [
               true
             ]
@@ -656,13 +717,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_xi;1",
+        "@id": "dtmi:example:jogg_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_nu",
+          "name": "jogg_theta",
           "request": {
-            "name": "fuddle_mu",
+            "name": "jogg_eta",
             "schema": [
               626
             ]
@@ -679,14 +740,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_rho;1",
+        "@id": "dtmi:example:jogg_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_pi",
+          "name": "jogg_lambda",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "fuddle_omicron",
+            "name": "jogg_kappa",
             "schema": [
               626
             ]
@@ -703,13 +764,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_upsilon;1",
+        "@id": "dtmi:example:jogg_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_tau",
+          "name": "jogg_xi",
           "request": {
-            "name": "fuddle_sigma",
+            "name": "jogg_nu",
             "schema": {}
           }
         }
@@ -724,14 +785,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_psi;1",
+        "@id": "dtmi:example:jogg_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_chi",
+          "name": "jogg_rho",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "fuddle_phi",
+            "name": "jogg_pi",
             "schema": {}
           }
         }
@@ -746,13 +807,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_wum;1",
+        "@id": "dtmi:example:jogg_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_yuzz",
+          "name": "jogg_upsilon",
           "request": {
-            "name": "fuddle_omega",
+            "name": "jogg_tau",
             "schema": [
               {}
             ]
@@ -769,14 +830,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_fuddle;1",
+        "@id": "dtmi:example:jogg_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_humpf",
+          "name": "jogg_psi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "fuddle_um",
+            "name": "jogg_chi",
             "schema": [
               {}
             ]
@@ -793,13 +854,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_snee;1",
+        "@id": "dtmi:example:jogg_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_nuh",
+          "name": "jogg_wum",
           "request": {
-            "name": "fuddle_glikk",
+            "name": "jogg_yuzz",
             "schema": []
           }
         }
@@ -814,14 +875,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_spazz;1",
+        "@id": "dtmi:example:jogg_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_thnad",
+          "name": "jogg_fuddle",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "fuddle_quan",
+            "name": "jogg_humpf",
             "schema": []
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertySchemaTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertySchemaTermAndDtmiV3.json
index 0299cf40..623a1ef7 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertySchemaTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertySchemaTermAndDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_quan;1",
+        "@id": "dtmi:example:vroo_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_snee",
+          "name": "vroo_um",
           "request": {
-            "name": "quan_nuh",
-            "schema": "float",
-            "dtmi:dtdl:property:schema;3": "integer"
+            "name": "vroo_wum",
+            "schema": "double",
+            "dtmi:dtdl:property:schema;3": "duration"
           }
         }
       }
@@ -29,16 +29,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_floob;1",
+        "@id": "dtmi:example:vroo_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_spazz",
+          "name": "vroo_glikk",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "quan_thnad",
-            "schema": "long",
-            "dtmi:dtdl:property:schema;3": "string"
+            "name": "vroo_fuddle",
+            "schema": "float",
+            "dtmi:dtdl:property:schema;3": "integer"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertySchemaTypeConformanceV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertySchemaTypeConformanceV3.json
index ba7ffc32..de97a0a9 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestPropertySchemaTypeConformanceV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestPropertySchemaTypeConformanceV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_delta;1",
+        "@id": "dtmi:example:jogg_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_gamma",
+          "name": "jogg_yekk",
           "request": {
-            "name": "glikk_beta",
+            "name": "jogg_itch",
             "schema": {
-              "@id": "dtmi:example:glikk_alpha;1",
-              "elementSchema": "string",
+              "@id": "dtmi:example:jogg_flunn;1",
+              "elementSchema": "integer",
               "@type": "Array"
             }
           }
@@ -32,16 +32,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_iota;1",
+        "@id": "dtmi:example:flunn_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_theta",
+          "name": "flunn_gamma",
           "request": {
-            "name": "glikk_eta",
+            "name": "flunn_beta",
             "schema": {
-              "@id": "dtmi:example:glikk_epsilon;1",
-              "name": "glikk_zeta",
+              "@id": "dtmi:example:jogg_hi;1",
+              "name": "flunn_alpha",
               "@type": "Command"
             }
           }
@@ -57,17 +57,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_xi;1",
+        "@id": "dtmi:example:flunn_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_nu",
+          "name": "flunn_theta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "glikk_mu",
+            "name": "flunn_eta",
             "schema": {
-              "@id": "dtmi:example:glikk_kappa;1",
-              "name": "glikk_lambda",
+              "@id": "dtmi:example:flunn_epsilon;1",
+              "name": "flunn_zeta",
               "@type": "Command"
             }
           }
@@ -83,17 +83,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_tau;1",
+        "@id": "dtmi:example:flunn_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_sigma",
+          "name": "flunn_nu",
           "request": {
-            "name": "glikk_rho",
+            "name": "flunn_mu",
             "schema": {
-              "@id": "dtmi:example:glikk_omicron;1",
-              "name": "glikk_pi",
-              "schema": "time",
+              "@id": "dtmi:example:flunn_kappa;1",
+              "name": "flunn_lambda",
+              "schema": "long",
               "@type": "CommandRequest"
             }
           }
@@ -109,18 +109,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_omega;1",
+        "@id": "dtmi:example:flunn_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_psi",
+          "name": "flunn_sigma",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "glikk_chi",
+            "name": "flunn_rho",
             "schema": {
-              "@id": "dtmi:example:glikk_upsilon;1",
-              "name": "glikk_phi",
-              "schema": "boolean",
+              "@id": "dtmi:example:flunn_omicron;1",
+              "name": "flunn_pi",
+              "schema": "string",
               "@type": "CommandRequest"
             }
           }
@@ -136,17 +136,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_fuddle;1",
+        "@id": "dtmi:example:flunn_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_humpf",
+          "name": "flunn_psi",
           "request": {
-            "name": "glikk_um",
+            "name": "flunn_chi",
             "schema": {
-              "@id": "dtmi:example:glikk_yuzz;1",
-              "name": "glikk_wum",
-              "schema": "date",
+              "@id": "dtmi:example:flunn_upsilon;1",
+              "name": "flunn_phi",
+              "schema": "time",
               "@type": "CommandResponse"
             }
           }
@@ -162,18 +162,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_thnad;1",
+        "@id": "dtmi:example:flunn_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_quan",
+          "name": "flunn_humpf",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "glikk_snee",
+            "name": "flunn_um",
             "schema": {
-              "@id": "dtmi:example:glikk_glikk;1",
-              "name": "glikk_nuh",
-              "schema": "dateTime",
+              "@id": "dtmi:example:flunn_yuzz;1",
+              "name": "flunn_wum",
+              "schema": "boolean",
               "@type": "CommandResponse"
             }
           }
@@ -189,18 +189,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_itch;1",
+        "@id": "dtmi:example:flunn_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_flunn",
+          "name": "flunn_thnad",
           "request": {
-            "name": "glikk_jogg",
+            "name": "flunn_quan",
             "schema": {
-              "@id": "dtmi:example:glikk_spazz;1",
-              "name": "glikk_floob",
+              "@id": "dtmi:example:flunn_glikk;1",
+              "name": "flunn_nuh",
               "schema": {
-                "@id": "dtmi:example:glikk_zatz;1",
+                "@id": "dtmi:example:flunn_snee;1",
                 "@type": "Interface"
               },
               "@type": "Component"
@@ -218,19 +218,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_gamma;1",
+        "@id": "dtmi:example:flunn_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_beta",
+          "name": "flunn_itch",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nuh_alpha",
+            "name": "flunn_flunn",
             "schema": {
-              "@id": "dtmi:example:glikk_yekk;1",
-              "name": "glikk_vroo",
+              "@id": "dtmi:example:flunn_floob;1",
+              "name": "flunn_zatz",
               "schema": {
-                "@id": "dtmi:example:glikk_hi;1",
+                "@id": "dtmi:example:flunn_jogg;1",
                 "@type": "Interface"
               },
               "@type": "Component"
@@ -248,15 +248,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_eta;1",
+        "@id": "dtmi:example:itch_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_zeta",
+          "name": "itch_alpha",
           "request": {
-            "name": "nuh_epsilon",
+            "name": "flunn_hi",
             "schema": {
-              "@id": "dtmi:example:nuh_delta;1",
+              "@id": "dtmi:example:flunn_vroo;1",
               "valueSchema": "integer",
               "@type": "Enum"
             }
@@ -273,17 +273,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_mu;1",
+        "@id": "dtmi:example:itch_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_lambda",
+          "name": "itch_zeta",
           "request": {
-            "name": "nuh_kappa",
+            "name": "itch_epsilon",
             "schema": {
-              "@id": "dtmi:example:nuh_theta;1",
-              "enumValue": 1113,
-              "name": "nuh_iota",
+              "@id": "dtmi:example:itch_gamma;1",
+              "enumValue": 1126,
+              "name": "itch_delta",
               "@type": "EnumValue"
             }
           }
@@ -299,18 +299,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_rho;1",
+        "@id": "dtmi:example:itch_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_pi",
+          "name": "itch_lambda",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nuh_omicron",
+            "name": "itch_kappa",
             "schema": {
-              "@id": "dtmi:example:nuh_nu;1",
-              "enumValue": 1114,
-              "name": "nuh_xi",
+              "@id": "dtmi:example:itch_theta;1",
+              "enumValue": 1127,
+              "name": "itch_iota",
               "@type": "EnumValue"
             }
           }
@@ -326,17 +326,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_chi;1",
+        "@id": "dtmi:example:itch_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_phi",
+          "name": "itch_pi",
           "request": {
-            "name": "nuh_upsilon",
+            "name": "itch_omicron",
             "schema": {
-              "@id": "dtmi:example:nuh_sigma;1",
-              "name": "nuh_tau",
-              "schema": "double",
+              "@id": "dtmi:example:itch_nu;1",
+              "name": "itch_xi",
+              "schema": "date",
               "@type": "Field"
             }
           }
@@ -352,18 +352,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_um;1",
+        "@id": "dtmi:example:itch_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_wum",
+          "name": "itch_phi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nuh_yuzz",
+            "name": "itch_upsilon",
             "schema": {
-              "@id": "dtmi:example:nuh_psi;1",
-              "name": "nuh_omega",
-              "schema": "duration",
+              "@id": "dtmi:example:itch_sigma;1",
+              "name": "itch_tau",
+              "schema": "dateTime",
               "@type": "Field"
             }
           }
@@ -379,15 +379,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_nuh;1",
+        "@id": "dtmi:example:itch_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_glikk",
+          "name": "itch_yuzz",
           "request": {
-            "name": "nuh_fuddle",
+            "name": "itch_omega",
             "schema": {
-              "@id": "dtmi:example:nuh_humpf;1",
+              "@id": "dtmi:example:itch_psi;1",
               "@type": "Interface"
             }
           }
@@ -403,16 +403,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_spazz;1",
+        "@id": "dtmi:example:itch_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_thnad",
+          "name": "itch_fuddle",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nuh_quan",
+            "name": "itch_humpf",
             "schema": {
-              "@id": "dtmi:example:nuh_snee;1",
+              "@id": "dtmi:example:itch_um;1",
               "@type": "Interface"
             }
           }
@@ -428,22 +428,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_yekk;1",
+        "@id": "dtmi:example:itch_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_itch",
+          "name": "itch_spazz",
           "request": {
-            "name": "nuh_flunn",
+            "name": "itch_thnad",
             "schema": {
-              "@id": "dtmi:example:nuh_floob;1",
+              "@id": "dtmi:example:itch_nuh;1",
               "mapKey": {
-                "name": "nuh_zatz",
+                "name": "itch_snee",
                 "schema": "string"
               },
               "mapValue": {
-                "name": "nuh_jogg",
-                "schema": "float"
+                "name": "itch_quan",
+                "schema": "double"
               },
               "@type": "Map"
             }
@@ -460,16 +460,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_gamma;1",
+        "@id": "dtmi:example:itch_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_beta",
+          "name": "itch_itch",
           "request": {
-            "name": "snee_alpha",
+            "name": "itch_flunn",
             "schema": {
-              "@id": "dtmi:example:nuh_vroo;1",
-              "name": "nuh_hi",
+              "@id": "dtmi:example:itch_zatz;1",
+              "name": "itch_jogg",
               "schema": "string",
               "@type": "MapKey"
             }
@@ -486,17 +486,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_theta;1",
+        "@id": "dtmi:example:yekk_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_eta",
+          "name": "yekk_beta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "snee_zeta",
+            "name": "yekk_alpha",
             "schema": {
-              "@id": "dtmi:example:snee_delta;1",
-              "name": "snee_epsilon",
+              "@id": "dtmi:example:itch_vroo;1",
+              "name": "itch_hi",
               "schema": "string",
               "@type": "MapKey"
             }
@@ -513,17 +513,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_nu;1",
+        "@id": "dtmi:example:yekk_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_mu",
+          "name": "yekk_eta",
           "request": {
-            "name": "snee_lambda",
+            "name": "yekk_zeta",
             "schema": {
-              "@id": "dtmi:example:snee_iota;1",
-              "name": "snee_kappa",
-              "schema": "integer",
+              "@id": "dtmi:example:yekk_delta;1",
+              "name": "yekk_epsilon",
+              "schema": "duration",
               "@type": "MapValue"
             }
           }
@@ -539,18 +539,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_sigma;1",
+        "@id": "dtmi:example:yekk_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_rho",
+          "name": "yekk_mu",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "snee_pi",
+            "name": "yekk_lambda",
             "schema": {
-              "@id": "dtmi:example:snee_xi;1",
-              "name": "snee_omicron",
-              "schema": "long",
+              "@id": "dtmi:example:yekk_iota;1",
+              "name": "yekk_kappa",
+              "schema": "float",
               "@type": "MapValue"
             }
           }
@@ -566,15 +566,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_chi;1",
+        "@id": "dtmi:example:yekk_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_phi",
+          "name": "yekk_pi",
           "request": {
-            "name": "snee_upsilon",
+            "name": "yekk_omicron",
             "schema": {
-              "@id": "dtmi:example:snee_tau;1",
+              "@id": "dtmi:example:yekk_xi;1",
               "@type": "Object"
             }
           }
@@ -590,17 +590,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_um;1",
+        "@id": "dtmi:example:yekk_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_wum",
+          "name": "yekk_phi",
           "request": {
-            "name": "snee_yuzz",
+            "name": "yekk_upsilon",
             "schema": {
-              "@id": "dtmi:example:snee_psi;1",
-              "name": "snee_omega",
-              "schema": "string",
+              "@id": "dtmi:example:yekk_sigma;1",
+              "name": "yekk_tau",
+              "schema": "integer",
               "@type": "Property"
             }
           }
@@ -616,18 +616,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_snee;1",
+        "@id": "dtmi:example:yekk_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_nuh",
+          "name": "yekk_wum",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "snee_glikk",
+            "name": "yekk_yuzz",
             "schema": {
-              "@id": "dtmi:example:snee_humpf;1",
-              "name": "snee_fuddle",
-              "schema": "time",
+              "@id": "dtmi:example:yekk_psi;1",
+              "name": "yekk_omega",
+              "schema": "long",
               "@type": "Property"
             }
           }
@@ -643,16 +643,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_zatz;1",
+        "@id": "dtmi:example:yekk_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_floob",
+          "name": "yekk_nuh",
           "request": {
-            "name": "snee_spazz",
+            "name": "yekk_glikk",
             "schema": {
-              "@id": "dtmi:example:snee_quan;1",
-              "name": "snee_thnad",
+              "@id": "dtmi:example:yekk_humpf;1",
+              "name": "yekk_fuddle",
               "@type": "Relationship"
             }
           }
@@ -668,17 +668,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_vroo;1",
+        "@id": "dtmi:example:yekk_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_yekk",
+          "name": "yekk_floob",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "snee_itch",
+            "name": "yekk_spazz",
             "schema": {
-              "@id": "dtmi:example:snee_jogg;1",
-              "name": "snee_flunn",
+              "@id": "dtmi:example:yekk_quan;1",
+              "name": "yekk_thnad",
               "@type": "Relationship"
             }
           }
@@ -694,17 +694,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_delta;1",
+        "@id": "dtmi:example:yekk_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_gamma",
+          "name": "yekk_yekk",
           "request": {
-            "name": "quan_beta",
+            "name": "yekk_itch",
             "schema": {
-              "@id": "dtmi:example:snee_hi;1",
-              "name": "quan_alpha",
-              "schema": "boolean",
+              "@id": "dtmi:example:yekk_jogg;1",
+              "name": "yekk_flunn",
+              "schema": "string",
               "@type": "Telemetry"
             }
           }
@@ -720,18 +720,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_iota;1",
+        "@id": "dtmi:example:vroo_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_theta",
+          "name": "vroo_gamma",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "quan_eta",
+            "name": "vroo_beta",
             "schema": {
-              "@id": "dtmi:example:quan_epsilon;1",
-              "name": "quan_zeta",
-              "schema": "date",
+              "@id": "dtmi:example:yekk_hi;1",
+              "name": "vroo_alpha",
+              "schema": "time",
               "@type": "Telemetry"
             }
           }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestRequiredPropertiesV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestRequiredPropertiesV3.json
index edf648bf..bcca526c 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestRequiredPropertiesV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestRequiredPropertiesV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_pi;1",
+        "@id": "dtmi:example:quan_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_omicron",
+          "name": "snee_hi",
           "request": {
-            "schema": "dateTime"
+            "schema": "string"
           }
         }
       }
@@ -27,14 +27,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_sigma;1",
+        "@id": "dtmi:example:quan_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_rho",
+          "name": "quan_beta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "double"
+            "schema": "time"
           }
         }
       }
@@ -48,13 +48,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_phi;1",
+        "@id": "dtmi:example:quan_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_upsilon",
+          "name": "quan_epsilon",
           "request": {
-            "name": "omega_tau"
+            "name": "quan_delta"
           }
         }
       }
@@ -68,14 +68,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_omega;1",
+        "@id": "dtmi:example:quan_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_psi",
+          "name": "quan_theta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omega_chi"
+            "name": "quan_eta"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestTypeIncludesInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestTypeIncludesInvalidDtmiV3.json
index 4fc2d0d3..b87888cf 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestTypeIncludesInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestTypeIncludesInvalidDtmiV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_vroo;1",
+        "@id": "dtmi:example:delta_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zatz_yekk",
+          "name": "delta_alpha",
           "request": {
             "@type": [
               "CommandRequest",
               "dtmi:foo//bar"
             ],
-            "name": "zatz_itch",
+            "name": "gamma_hi",
             "schema": "dateTime"
           }
         }
@@ -32,18 +32,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_beta;1",
+        "@id": "dtmi:example:delta_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "jogg_alpha",
+          "name": "delta_delta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": [
               "CommandRequest",
               "dtmi:foo//bar"
             ],
-            "name": "zatz_hi",
+            "name": "delta_gamma",
             "schema": "double"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestTypeIncludesMaterialV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestTypeIncludesMaterialV3.json
index 33f2bbf6..cb1baea8 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestTypeIncludesMaterialV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestTypeIncludesMaterialV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_thnad;1",
+        "@id": "dtmi:example:beta_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_quan",
+          "name": "beta_floob",
           "request": {
-            "name": "floob_snee",
+            "name": "beta_spazz",
             "schema": "float",
             "@type": "CommandRequest"
           }
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_zatz;1",
+        "@id": "dtmi:example:beta_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_floob",
+          "name": "beta_flunn",
           "request": {
-            "name": "floob_spazz",
+            "name": "beta_jogg",
             "schema": "integer",
             "@type": [
               "CommandRequest"
@@ -53,13 +53,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_itch;1",
+        "@id": "dtmi:example:beta_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_flunn",
+          "name": "beta_vroo",
           "request": {
-            "name": "floob_jogg",
+            "name": "beta_yekk",
             "schema": "long",
             "@type": "dtmi:dtdl:class:CommandRequest;3"
           }
@@ -75,13 +75,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_hi;1",
+        "@id": "dtmi:example:gamma_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_vroo",
+          "name": "gamma_beta",
           "request": {
-            "name": "floob_yekk",
+            "name": "gamma_alpha",
             "schema": "string",
             "@type": [
               "dtmi:dtdl:class:CommandRequest;3"
@@ -99,13 +99,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_gamma;1",
+        "@id": "dtmi:example:gamma_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zatz_beta",
+          "name": "gamma_epsilon",
           "request": {
-            "name": "zatz_alpha",
+            "name": "gamma_delta",
             "schema": "time",
             "@type": "Something"
           }
@@ -121,14 +121,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_zeta;1",
+        "@id": "dtmi:example:gamma_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zatz_epsilon",
+          "name": "gamma_theta",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zatz_delta",
+            "name": "gamma_eta",
             "schema": "boolean",
             "@type": "Something"
           }
@@ -144,13 +144,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_iota;1",
+        "@id": "dtmi:example:gamma_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zatz_theta",
+          "name": "gamma_lambda",
           "request": {
-            "name": "zatz_eta",
+            "name": "gamma_kappa",
             "schema": "date",
             "@type": [
               "Something"
@@ -168,14 +168,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_mu;1",
+        "@id": "dtmi:example:gamma_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "zatz_lambda",
+          "name": "gamma_xi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zatz_kappa",
+            "name": "gamma_nu",
             "schema": "dateTime",
             "@type": [
               "Something"
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestTypeIncludesNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestTypeIncludesNotDtmiNorTermV3.json
index db71c96e..34e61947 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestTypeIncludesNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestTypeIncludesNotDtmiNorTermV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_epsilon;1",
+        "@id": "dtmi:example:delta_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "jogg_delta",
+          "name": "delta_eta",
           "request": {
             "@type": [
               "CommandRequest",
               "http://foo.com/bar"
             ],
-            "name": "jogg_gamma",
+            "name": "delta_zeta",
             "schema": "duration"
           }
         }
@@ -32,18 +32,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_theta;1",
+        "@id": "dtmi:example:delta_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "jogg_eta",
+          "name": "delta_kappa",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": [
               "CommandRequest",
               "http://foo.com/bar"
             ],
-            "name": "jogg_zeta",
+            "name": "delta_iota",
             "schema": "float"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequestTypeStringOrArrayV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequestTypeStringOrArrayV3.json
index 5806c934..a9a41d7e 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequestTypeStringOrArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequestTypeStringOrArrayV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_fuddle;1",
+        "@id": "dtmi:example:alpha_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_humpf",
+          "name": "alpha_nuh",
           "request": {
-            "name": "spazz_um",
+            "name": "alpha_glikk",
             "schema": "time",
             "@type": 626
           }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_snee;1",
+        "@id": "dtmi:example:alpha_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_nuh",
+          "name": "alpha_thnad",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "spazz_glikk",
+            "name": "alpha_quan",
             "schema": "boolean",
             "@type": 626
           }
@@ -52,13 +52,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_spazz;1",
+        "@id": "dtmi:example:alpha_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_thnad",
+          "name": "alpha_zatz",
           "request": {
-            "name": "spazz_quan",
+            "name": "alpha_floob",
             "schema": "date",
             "@type": null
           }
@@ -74,14 +74,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_jogg;1",
+        "@id": "dtmi:example:alpha_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_zatz",
+          "name": "alpha_itch",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "spazz_floob",
+            "name": "alpha_flunn",
             "schema": "dateTime",
             "@type": null
           }
@@ -97,13 +97,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_yekk;1",
+        "@id": "dtmi:example:beta_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_itch",
+          "name": "alpha_hi",
           "request": {
-            "name": "spazz_flunn",
+            "name": "alpha_vroo",
             "schema": "double",
             "@type": true
           }
@@ -119,14 +119,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_alpha;1",
+        "@id": "dtmi:example:beta_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_hi",
+          "name": "beta_gamma",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "spazz_vroo",
+            "name": "beta_beta",
             "schema": "duration",
             "@type": true
           }
@@ -142,13 +142,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_delta;1",
+        "@id": "dtmi:example:beta_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_gamma",
+          "name": "beta_zeta",
           "request": {
-            "name": "floob_beta",
+            "name": "beta_epsilon",
             "schema": "float",
             "@type": {}
           }
@@ -164,14 +164,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_eta;1",
+        "@id": "dtmi:example:beta_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_zeta",
+          "name": "beta_iota",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "floob_epsilon",
+            "name": "beta_theta",
             "schema": "integer",
             "@type": {}
           }
@@ -187,13 +187,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_kappa;1",
+        "@id": "dtmi:example:beta_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_iota",
+          "name": "beta_mu",
           "request": {
-            "name": "floob_theta",
+            "name": "beta_lambda",
             "schema": "long",
             "@type": [
               626
@@ -211,14 +211,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_nu;1",
+        "@id": "dtmi:example:beta_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_mu",
+          "name": "beta_omicron",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "floob_lambda",
+            "name": "beta_xi",
             "schema": "string",
             "@type": [
               626
@@ -236,13 +236,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_pi;1",
+        "@id": "dtmi:example:beta_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_omicron",
+          "name": "beta_sigma",
           "request": {
-            "name": "floob_xi",
+            "name": "beta_rho",
             "schema": "time",
             "@type": [
               null
@@ -260,14 +260,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_tau;1",
+        "@id": "dtmi:example:beta_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_sigma",
+          "name": "beta_phi",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "floob_rho",
+            "name": "beta_upsilon",
             "schema": "boolean",
             "@type": [
               null
@@ -285,13 +285,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_chi;1",
+        "@id": "dtmi:example:beta_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_phi",
+          "name": "beta_omega",
           "request": {
-            "name": "floob_upsilon",
+            "name": "beta_psi",
             "schema": "date",
             "@type": [
               true
@@ -309,14 +309,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_yuzz;1",
+        "@id": "dtmi:example:beta_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_omega",
+          "name": "beta_um",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "floob_psi",
+            "name": "beta_wum",
             "schema": "dateTime",
             "@type": [
               true
@@ -334,13 +334,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_humpf;1",
+        "@id": "dtmi:example:beta_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_um",
+          "name": "beta_glikk",
           "request": {
-            "name": "floob_wum",
+            "name": "beta_fuddle",
             "schema": "double",
             "@type": [
               {}
@@ -358,14 +358,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_nuh;1",
+        "@id": "dtmi:example:beta_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_glikk",
+          "name": "beta_quan",
           "request": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "floob_fuddle",
+            "name": "beta_snee",
             "schema": "duration",
             "@type": [
               {}
diff --git a/DTDL/v3/spec/Requirement-ClassCommandRequiredPropertiesV3.json b/DTDL/v3/spec/Requirement-ClassCommandRequiredPropertiesV3.json
index ca067b84..217fc64b 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandRequiredPropertiesV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandRequiredPropertiesV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_alpha;1",
+        "@id": "dtmi:example:epsilon_gamma;1",
         "@type": "Interface",
         "contents": {
-          "name": "flunn_hi"
+          "name": "epsilon_beta"
         }
       }
     ]
@@ -23,11 +23,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_gamma;1",
+        "@id": "dtmi:example:epsilon_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "itch_beta"
+          "name": "epsilon_delta"
         }
       }
     ]
@@ -40,7 +40,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_delta;1",
+        "@id": "dtmi:example:epsilon_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command"
@@ -56,7 +56,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_epsilon;1",
+        "@id": "dtmi:example:epsilon_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponseContextConformsV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponseContextConformsV3.json
index 83371b8c..32a0c02c 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponseContextConformsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponseContextConformsV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_hi;1",
+        "@id": "dtmi:example:humpf_nu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:sigma_vroo;1",
+          "@id": "dtmi:example:humpf_mu;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "sigma_yekk",
+            "name": "humpf_lambda",
             "response": {
-              "name": "sigma_itch",
-              "schema": "time",
+              "name": "humpf_kappa",
+              "schema": "date",
               "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
             }
           }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_delta;1",
+        "@id": "dtmi:example:humpf_rho;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_gamma;1",
+          "@id": "dtmi:example:humpf_pi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "tau_beta",
+            "name": "humpf_omicron",
             "response": {
-              "name": "tau_alpha",
-              "schema": "boolean",
+              "name": "humpf_xi",
+              "schema": "dateTime",
               "@context": []
             }
           }
@@ -59,17 +59,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_theta;1",
+        "@id": "dtmi:example:humpf_phi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_eta;1",
+          "@id": "dtmi:example:humpf_upsilon;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "tau_zeta",
+            "name": "humpf_tau",
             "response": {
-              "name": "tau_epsilon",
-              "schema": "date",
+              "name": "humpf_sigma",
+              "schema": "double",
               "@context": [
                 "dtmi:dtdl:extension:quantitativeTypes;1"
               ]
@@ -87,17 +87,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_mu;1",
+        "@id": "dtmi:example:humpf_yuzz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_lambda;1",
+          "@id": "dtmi:example:humpf_omega;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "tau_kappa",
+            "name": "humpf_psi",
             "response": {
-              "name": "tau_iota",
-              "schema": "dateTime",
+              "name": "humpf_chi",
+              "schema": "duration",
               "@context": null
             }
           }
@@ -113,17 +113,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_pi;1",
+        "@id": "dtmi:example:humpf_fuddle;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_omicron;1",
+          "@id": "dtmi:example:humpf_humpf;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "tau_xi",
+            "name": "humpf_um",
             "response": {
-              "name": "tau_nu",
-              "schema": "double",
+              "name": "humpf_wum",
+              "schema": "float",
               "@context": 626
             }
           }
@@ -139,17 +139,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_upsilon;1",
+        "@id": "dtmi:example:humpf_quan;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_tau;1",
+          "@id": "dtmi:example:humpf_snee;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "tau_sigma",
+            "name": "humpf_nuh",
             "response": {
-              "name": "tau_rho",
-              "schema": "duration",
+              "name": "humpf_glikk",
+              "schema": "integer",
               "@context": true
             }
           }
@@ -165,17 +165,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_omega;1",
+        "@id": "dtmi:example:humpf_zatz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_psi;1",
+          "@id": "dtmi:example:humpf_floob;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "tau_chi",
+            "name": "humpf_spazz",
             "response": {
-              "name": "tau_phi",
-              "schema": "float",
+              "name": "humpf_thnad",
+              "schema": "long",
               "@context": [
                 null
               ]
@@ -193,17 +193,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_humpf;1",
+        "@id": "dtmi:example:humpf_yekk;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_um;1",
+          "@id": "dtmi:example:humpf_itch;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "tau_wum",
+            "name": "humpf_flunn",
             "response": {
-              "name": "tau_yuzz",
-              "schema": "integer",
+              "name": "humpf_jogg",
+              "schema": "string",
               "@context": [
                 626
               ]
@@ -221,17 +221,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_snee;1",
+        "@id": "dtmi:example:fuddle_beta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_nuh;1",
+          "@id": "dtmi:example:fuddle_alpha;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "tau_glikk",
+            "name": "humpf_hi",
             "response": {
-              "name": "tau_fuddle",
-              "schema": "long",
+              "name": "humpf_vroo",
+              "schema": "time",
               "@context": [
                 true
               ]
@@ -249,18 +249,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_floob;1",
+        "@id": "dtmi:example:fuddle_zeta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_spazz;1",
+          "@id": "dtmi:example:fuddle_epsilon;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "tau_thnad",
+            "name": "fuddle_delta",
             "response": {
-              "name": "tau_quan",
-              "schema": "string",
-              "@context": {}
+              "name": "fuddle_gamma",
+              "schema": "boolean",
+              "@context": "dtmi:dtdl:extension:quantitativeTypes"
             }
           }
         }
@@ -275,20 +275,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_itch;1",
+        "@id": "dtmi:example:fuddle_kappa;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_flunn;1",
+          "@id": "dtmi:example:fuddle_iota;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "tau_jogg",
+            "name": "fuddle_theta",
             "response": {
-              "name": "tau_zatz",
-              "schema": "time",
-              "@context": [
-                {}
-              ]
+              "name": "fuddle_eta",
+              "schema": "date",
+              "@context": "http://dtdl/extension/quantitativeTypes/1"
             }
           }
         }
@@ -303,18 +301,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_alpha;1",
+        "@id": "dtmi:example:fuddle_xi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_hi;1",
+          "@id": "dtmi:example:fuddle_nu;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "tau_vroo",
+            "name": "fuddle_mu",
             "response": {
-              "name": "tau_yekk",
-              "schema": "boolean",
-              "@context": "dtmi:dtdl:extension:quantitativeTypes"
+              "name": "fuddle_lambda",
+              "schema": "dateTime",
+              "@context": "quantitativeTypes;1"
             }
           }
         }
@@ -329,18 +327,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_epsilon;1",
+        "@id": "dtmi:example:fuddle_sigma;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:upsilon_delta;1",
+          "@id": "dtmi:example:fuddle_rho;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "upsilon_gamma",
+            "name": "fuddle_pi",
             "response": {
-              "name": "upsilon_beta",
-              "schema": "date",
-              "@context": "http://dtdl/extension/quantitativeTypes/1"
+              "name": "fuddle_omicron",
+              "schema": "double",
+              "@context": {}
             }
           }
         }
@@ -355,18 +353,78 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_iota;1",
+        "@id": "dtmi:example:fuddle_chi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:upsilon_theta;1",
+          "@id": "dtmi:example:fuddle_phi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "upsilon_eta",
+            "name": "fuddle_upsilon",
             "response": {
-              "name": "upsilon_zeta",
-              "schema": "dateTime",
-              "@context": "quantitativeTypes;1"
+              "name": "fuddle_tau",
+              "schema": "duration",
+              "@context": {
+                "foo": "dtmi:foo:bar;1"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:fuddle_wum;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:fuddle_yuzz;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "fuddle_omega",
+            "response": {
+              "name": "fuddle_psi",
+              "schema": "float",
+              "@context": [
+                {}
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:fuddle_glikk;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:fuddle_fuddle;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "fuddle_humpf",
+            "response": {
+              "name": "fuddle_um",
+              "schema": "integer",
+              "@context": [
+                {
+                  "foo": "dtmi:foo:bar;1"
+                }
+              ]
             }
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponseIdDuplicateV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponseIdDuplicateV3.json
index 3aef33ea..6a70788e 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponseIdDuplicateV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponseIdDuplicateV3.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_quan;1",
+        "@id": "dtmi:example:zatz_lambda;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:um_quan;1",
+          "@id": "dtmi:example:zatz_lambda;1",
           "@type": "Interface",
           "contents": {
-            "@id": "dtmi:example:um_quan;1",
+            "@id": "dtmi:example:zatz_lambda;1",
             "@type": "Command",
-            "name": "um_spazz",
+            "name": "zatz_nu",
             "response": {
-              "@id": "dtmi:example:um_quan;1",
-              "name": "um_thnad",
-              "schema": "date"
+              "@id": "dtmi:example:zatz_lambda;1",
+              "name": "zatz_mu",
+              "schema": "float"
             }
           }
         }
@@ -34,20 +34,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_floob;1",
+        "@id": "dtmi:example:zatz_xi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:um_floob;1",
+          "@id": "dtmi:example:zatz_xi;1",
           "@type": "Interface",
           "contents": {
-            "@id": "dtmi:example:um_floob;1",
+            "@id": "dtmi:example:zatz_xi;1",
             "@type": "Command",
-            "name": "um_jogg",
+            "name": "zatz_pi",
             "response": {
               "@context": "dtmi:undefinedExtension:context;1",
-              "@id": "dtmi:example:um_floob;1",
-              "name": "um_zatz",
-              "schema": "dateTime"
+              "@id": "dtmi:example:zatz_xi;1",
+              "name": "zatz_omicron",
+              "schema": "integer"
             }
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponseIdIsDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponseIdIsDtmiV3.json
index 5d354fc4..2fe5e8cf 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponseIdIsDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponseIdIsDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_hi;1",
+        "@id": "dtmi:example:snee_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_vroo",
+          "name": "snee_upsilon",
           "response": {
             "@id": "dtmi:foo:bar;7",
-            "name": "chi_yekk",
-            "schema": "dateTime"
+            "name": "snee_tau",
+            "schema": "integer"
           }
         }
       }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_gamma;1",
+        "@id": "dtmi:example:snee_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_beta",
+          "name": "snee_psi",
           "response": {
             "@id": "dtmi:foo:bar;108675309",
-            "name": "psi_alpha",
-            "schema": "double"
+            "name": "snee_chi",
+            "schema": "long"
           }
         }
       }
@@ -51,15 +51,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_zeta;1",
+        "@id": "dtmi:example:snee_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_epsilon",
+          "name": "snee_wum",
           "response": {
             "@id": "dtmi:foo:bar;999999999",
-            "name": "psi_delta",
-            "schema": "duration"
+            "name": "snee_yuzz",
+            "schema": "string"
           }
         }
       }
@@ -73,15 +73,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_iota;1",
+        "@id": "dtmi:example:snee_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_theta",
+          "name": "snee_fuddle",
           "response": {
             "@id": "dtmi:foo;1",
-            "name": "psi_eta",
-            "schema": "float"
+            "name": "snee_humpf",
+            "schema": "time"
           }
         }
       }
@@ -95,15 +95,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_mu;1",
+        "@id": "dtmi:example:snee_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_lambda",
+          "name": "snee_snee",
           "response": {
             "@id": "dtmi:foo:bar",
-            "name": "psi_kappa",
-            "schema": "integer"
+            "name": "snee_nuh",
+            "schema": "boolean"
           }
         }
       }
@@ -117,15 +117,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_omicron;1",
+        "@id": "dtmi:example:snee_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_xi",
+          "name": "snee_spazz",
           "response": {
             "@id": "dtmi:foo:bar;3.14",
-            "name": "psi_nu",
-            "schema": "long"
+            "name": "snee_thnad",
+            "schema": "date"
           }
         }
       }
@@ -139,15 +139,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_sigma;1",
+        "@id": "dtmi:example:snee_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_rho",
+          "name": "snee_jogg",
           "response": {
             "@id": "dtmi:foo:bar;3.141592",
-            "name": "psi_pi",
-            "schema": "string"
+            "name": "snee_zatz",
+            "schema": "dateTime"
           }
         }
       }
@@ -161,15 +161,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_phi;1",
+        "@id": "dtmi:example:snee_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_upsilon",
+          "name": "snee_yekk",
           "response": {
             "@id": null,
-            "name": "psi_tau",
-            "schema": "time"
+            "name": "snee_itch",
+            "schema": "double"
           }
         }
       }
@@ -183,16 +183,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_omega;1",
+        "@id": "dtmi:example:quan_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_psi",
+          "name": "quan_alpha",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": null,
-            "name": "psi_chi",
-            "schema": "boolean"
+            "name": "snee_hi",
+            "schema": "duration"
           }
         }
       }
@@ -206,15 +206,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_um;1",
+        "@id": "dtmi:example:quan_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_wum",
+          "name": "quan_delta",
           "response": {
             "@id": 626,
-            "name": "psi_yuzz",
-            "schema": "date"
+            "name": "quan_gamma",
+            "schema": "float"
           }
         }
       }
@@ -228,16 +228,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_glikk;1",
+        "@id": "dtmi:example:quan_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_fuddle",
+          "name": "quan_eta",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": 626,
-            "name": "psi_humpf",
-            "schema": "dateTime"
+            "name": "quan_zeta",
+            "schema": "integer"
           }
         }
       }
@@ -251,15 +251,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_quan;1",
+        "@id": "dtmi:example:quan_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_snee",
+          "name": "quan_kappa",
           "response": {
             "@id": true,
-            "name": "psi_nuh",
-            "schema": "double"
+            "name": "quan_iota",
+            "schema": "long"
           }
         }
       }
@@ -273,16 +273,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_floob;1",
+        "@id": "dtmi:example:quan_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_spazz",
+          "name": "quan_nu",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": true,
-            "name": "psi_thnad",
-            "schema": "duration"
+            "name": "quan_mu",
+            "schema": "string"
           }
         }
       }
@@ -296,17 +296,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_flunn;1",
+        "@id": "dtmi:example:quan_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_jogg",
+          "name": "quan_pi",
           "response": {
             "@id": {
               "@value": "dtmi:apparently:valid:identifier;3"
             },
-            "name": "psi_zatz",
-            "schema": "float"
+            "name": "quan_omicron",
+            "schema": "time"
           }
         }
       }
@@ -320,18 +320,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_vroo;1",
+        "@id": "dtmi:example:quan_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "psi_yekk",
+          "name": "quan_tau",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": {
               "@value": "dtmi:apparently:valid:identifier;3"
             },
-            "name": "psi_itch",
-            "schema": "integer"
+            "name": "quan_sigma",
+            "schema": "boolean"
           }
         }
       }
@@ -345,15 +345,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_beta;1",
+        "@id": "dtmi:example:quan_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_alpha",
+          "name": "quan_chi",
           "response": {
             "@id": "dtmi:foo:bar;0",
-            "name": "psi_hi",
-            "schema": "long"
+            "name": "quan_phi",
+            "schema": "date"
           }
         }
       }
@@ -367,16 +367,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_epsilon;1",
+        "@id": "dtmi:example:quan_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_delta",
+          "name": "quan_yuzz",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0",
-            "name": "omega_gamma",
-            "schema": "string"
+            "name": "quan_omega",
+            "schema": "dateTime"
           }
         }
       }
@@ -390,15 +390,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_theta;1",
+        "@id": "dtmi:example:quan_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_eta",
+          "name": "quan_humpf",
           "response": {
             "@id": "dtmi:foo:bar;0.0",
-            "name": "omega_zeta",
-            "schema": "time"
+            "name": "quan_um",
+            "schema": "double"
           }
         }
       }
@@ -412,16 +412,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_lambda;1",
+        "@id": "dtmi:example:quan_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_kappa",
+          "name": "quan_nuh",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0.0",
-            "name": "omega_iota",
-            "schema": "boolean"
+            "name": "quan_glikk",
+            "schema": "duration"
           }
         }
       }
@@ -435,15 +435,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_xi;1",
+        "@id": "dtmi:example:quan_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_nu",
+          "name": "quan_thnad",
           "response": {
             "@id": "dtmi:foo:bar;1234567890",
-            "name": "omega_mu",
-            "schema": "date"
+            "name": "quan_quan",
+            "schema": "float"
           }
         }
       }
@@ -457,16 +457,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_rho;1",
+        "@id": "dtmi:example:quan_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_pi",
+          "name": "quan_zatz",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;1234567890",
-            "name": "omega_omicron",
-            "schema": "dateTime"
+            "name": "quan_floob",
+            "schema": "integer"
           }
         }
       }
@@ -480,15 +480,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_upsilon;1",
+        "@id": "dtmi:example:quan_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_tau",
+          "name": "quan_itch",
           "response": {
             "@id": "dtmi:foo:bar;1a",
-            "name": "omega_sigma",
-            "schema": "double"
+            "name": "quan_flunn",
+            "schema": "long"
           }
         }
       }
@@ -502,16 +502,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_psi;1",
+        "@id": "dtmi:example:thnad_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_chi",
+          "name": "quan_hi",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;1a",
-            "name": "omega_phi",
-            "schema": "duration"
+            "name": "quan_vroo",
+            "schema": "string"
           }
         }
       }
@@ -525,15 +525,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_wum;1",
+        "@id": "dtmi:example:thnad_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_yuzz",
+          "name": "thnad_gamma",
           "response": {
             "@id": "dtmi:foo:bar;3.0",
-            "name": "omega_omega",
-            "schema": "float"
+            "name": "thnad_beta",
+            "schema": "time"
           }
         }
       }
@@ -547,16 +547,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_fuddle;1",
+        "@id": "dtmi:example:thnad_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_humpf",
+          "name": "thnad_zeta",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.0",
-            "name": "omega_um",
-            "schema": "integer"
+            "name": "thnad_epsilon",
+            "schema": "boolean"
           }
         }
       }
@@ -570,15 +570,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_snee;1",
+        "@id": "dtmi:example:thnad_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_nuh",
+          "name": "thnad_iota",
           "response": {
             "@id": "dtmi:foo:bar;3.1415926",
-            "name": "omega_glikk",
-            "schema": "long"
+            "name": "thnad_theta",
+            "schema": "date"
           }
         }
       }
@@ -592,16 +592,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_spazz;1",
+        "@id": "dtmi:example:thnad_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_thnad",
+          "name": "thnad_mu",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.1415926",
-            "name": "omega_quan",
-            "schema": "string"
+            "name": "thnad_lambda",
+            "schema": "dateTime"
           }
         }
       }
@@ -615,15 +615,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_jogg;1",
+        "@id": "dtmi:example:thnad_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_zatz",
+          "name": "thnad_omicron",
           "response": {
             "@id": "dtmi:foo:bar;6.02",
-            "name": "omega_floob",
-            "schema": "time"
+            "name": "thnad_xi",
+            "schema": "double"
           }
         }
       }
@@ -637,16 +637,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_yekk;1",
+        "@id": "dtmi:example:thnad_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_itch",
+          "name": "thnad_sigma",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;6.02",
-            "name": "omega_flunn",
-            "schema": "boolean"
+            "name": "thnad_rho",
+            "schema": "duration"
           }
         }
       }
@@ -660,15 +660,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_alpha;1",
+        "@id": "dtmi:example:thnad_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omega_hi",
+          "name": "thnad_phi",
           "response": {
             "@id": "dtmi:foo:bar;0.1",
-            "name": "omega_vroo",
-            "schema": "date"
+            "name": "thnad_upsilon",
+            "schema": "float"
           }
         }
       }
@@ -682,16 +682,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_delta;1",
+        "@id": "dtmi:example:thnad_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_gamma",
+          "name": "thnad_omega",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0.1",
-            "name": "yuzz_beta",
-            "schema": "dateTime"
+            "name": "thnad_psi",
+            "schema": "integer"
           }
         }
       }
@@ -705,15 +705,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_eta;1",
+        "@id": "dtmi:example:thnad_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_zeta",
+          "name": "thnad_um",
           "response": {
             "@id": "dtmi:foo:bar;01",
-            "name": "yuzz_epsilon",
-            "schema": "double"
+            "name": "thnad_wum",
+            "schema": "long"
           }
         }
       }
@@ -727,16 +727,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_kappa;1",
+        "@id": "dtmi:example:thnad_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_iota",
+          "name": "thnad_glikk",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;01",
-            "name": "yuzz_theta",
-            "schema": "duration"
+            "name": "thnad_fuddle",
+            "schema": "string"
           }
         }
       }
@@ -750,15 +750,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_nu;1",
+        "@id": "dtmi:example:thnad_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_mu",
+          "name": "thnad_quan",
           "response": {
             "@id": "dtmi:foo:bar;",
-            "name": "yuzz_lambda",
-            "schema": "float"
+            "name": "thnad_snee",
+            "schema": "time"
           }
         }
       }
@@ -772,16 +772,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_pi;1",
+        "@id": "dtmi:example:thnad_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_omicron",
+          "name": "thnad_floob",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;",
-            "name": "yuzz_xi",
-            "schema": "integer"
+            "name": "thnad_spazz",
+            "schema": "boolean"
           }
         }
       }
@@ -795,15 +795,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_tau;1",
+        "@id": "dtmi:example:thnad_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_sigma",
+          "name": "thnad_flunn",
           "response": {
             "@id": "dtmi:test:invalidId_;1",
-            "name": "yuzz_rho",
-            "schema": "long"
+            "name": "thnad_jogg",
+            "schema": "date"
           }
         }
       }
@@ -817,16 +817,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_chi;1",
+        "@id": "dtmi:example:thnad_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_phi",
+          "name": "thnad_vroo",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:invalidId_;1",
-            "name": "yuzz_upsilon",
-            "schema": "string"
+            "name": "thnad_yekk",
+            "schema": "dateTime"
           }
         }
       }
@@ -840,15 +840,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_yuzz;1",
+        "@id": "dtmi:example:spazz_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_omega",
+          "name": "spazz_beta",
           "response": {
             "@id": "dtmi:test:_invalidUserId;1",
-            "name": "yuzz_psi",
-            "schema": "time"
+            "name": "spazz_alpha",
+            "schema": "double"
           }
         }
       }
@@ -862,16 +862,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_humpf;1",
+        "@id": "dtmi:example:spazz_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_um",
+          "name": "spazz_epsilon",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:_invalidUserId;1",
-            "name": "yuzz_wum",
-            "schema": "boolean"
+            "name": "spazz_delta",
+            "schema": "duration"
           }
         }
       }
@@ -885,15 +885,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_nuh;1",
+        "@id": "dtmi:example:spazz_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_glikk",
+          "name": "spazz_theta",
           "response": {
             "@id": "dtmi:test:1seg;1",
-            "name": "yuzz_fuddle",
-            "schema": "date"
+            "name": "spazz_eta",
+            "schema": "float"
           }
         }
       }
@@ -907,16 +907,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_thnad;1",
+        "@id": "dtmi:example:spazz_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_quan",
+          "name": "spazz_lambda",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:1seg;1",
-            "name": "yuzz_snee",
-            "schema": "dateTime"
+            "name": "spazz_kappa",
+            "schema": "integer"
           }
         }
       }
@@ -930,15 +930,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_zatz;1",
+        "@id": "dtmi:example:spazz_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_floob",
+          "name": "spazz_xi",
           "response": {
             "@id": "dtmi:foo:bar.baz;1",
-            "name": "yuzz_spazz",
-            "schema": "double"
+            "name": "spazz_nu",
+            "schema": "long"
           }
         }
       }
@@ -952,16 +952,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_itch;1",
+        "@id": "dtmi:example:spazz_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_flunn",
+          "name": "spazz_rho",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar.baz;1",
-            "name": "yuzz_jogg",
-            "schema": "duration"
+            "name": "spazz_pi",
+            "schema": "string"
           }
         }
       }
@@ -975,15 +975,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_hi;1",
+        "@id": "dtmi:example:spazz_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "yuzz_vroo",
+          "name": "spazz_upsilon",
           "response": {
             "@id": "dtmi:foo::bar;1",
-            "name": "yuzz_yekk",
-            "schema": "float"
+            "name": "spazz_tau",
+            "schema": "time"
           }
         }
       }
@@ -997,16 +997,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_gamma;1",
+        "@id": "dtmi:example:spazz_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_beta",
+          "name": "spazz_psi",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo::bar;1",
-            "name": "wum_alpha",
-            "schema": "integer"
+            "name": "spazz_chi",
+            "schema": "boolean"
           }
         }
       }
@@ -1020,15 +1020,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_zeta;1",
+        "@id": "dtmi:example:spazz_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_epsilon",
+          "name": "spazz_wum",
           "response": {
             "@id": "urn:foo:bar:1",
-            "name": "wum_delta",
-            "schema": "long"
+            "name": "spazz_yuzz",
+            "schema": "date"
           }
         }
       }
@@ -1042,16 +1042,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_iota;1",
+        "@id": "dtmi:example:spazz_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_theta",
+          "name": "spazz_fuddle",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "urn:foo:bar:1",
-            "name": "wum_eta",
-            "schema": "string"
+            "name": "spazz_humpf",
+            "schema": "dateTime"
           }
         }
       }
@@ -1065,15 +1065,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_mu;1",
+        "@id": "dtmi:example:spazz_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_lambda",
+          "name": "spazz_snee",
           "response": {
             "@id": "http://foo/bar/baz",
-            "name": "wum_kappa",
-            "schema": "time"
+            "name": "spazz_nuh",
+            "schema": "double"
           }
         }
       }
@@ -1087,16 +1087,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_omicron;1",
+        "@id": "dtmi:example:spazz_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_xi",
+          "name": "spazz_spazz",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "http://foo/bar/baz",
-            "name": "wum_nu",
-            "schema": "boolean"
+            "name": "spazz_thnad",
+            "schema": "duration"
           }
         }
       }
@@ -1110,15 +1110,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_sigma;1",
+        "@id": "dtmi:example:spazz_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_rho",
+          "name": "spazz_jogg",
           "response": {
             "@id": "dtmi:;1",
-            "name": "wum_pi",
-            "schema": "date"
+            "name": "spazz_zatz",
+            "schema": "float"
           }
         }
       }
@@ -1132,16 +1132,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_phi;1",
+        "@id": "dtmi:example:spazz_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_upsilon",
+          "name": "spazz_yekk",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:;1",
-            "name": "wum_tau",
-            "schema": "dateTime"
+            "name": "spazz_itch",
+            "schema": "integer"
           }
         }
       }
@@ -1155,15 +1155,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_omega;1",
+        "@id": "dtmi:example:floob_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_psi",
+          "name": "floob_alpha",
           "response": {
             "@id": "dtmi:dtdl:example;1",
-            "name": "wum_chi",
-            "schema": "double"
+            "name": "spazz_hi",
+            "schema": "long"
           }
         }
       }
@@ -1177,16 +1177,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_um;1",
+        "@id": "dtmi:example:floob_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_wum",
+          "name": "floob_delta",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:dtdl:example;1",
-            "name": "wum_yuzz",
-            "schema": "duration"
+            "name": "floob_gamma",
+            "schema": "string"
           }
         }
       }
@@ -1200,15 +1200,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_glikk;1",
+        "@id": "dtmi:example:floob_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_fuddle",
+          "name": "floob_eta",
           "response": {
             "@id": "dtmi:standard:example;1",
-            "name": "wum_humpf",
-            "schema": "float"
+            "name": "floob_zeta",
+            "schema": "time"
           }
         }
       }
@@ -1222,16 +1222,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_quan;1",
+        "@id": "dtmi:example:floob_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_snee",
+          "name": "floob_kappa",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:standard:example;1",
-            "name": "wum_nuh",
-            "schema": "integer"
+            "name": "floob_iota",
+            "schema": "boolean"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponseIdNotArrayV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponseIdNotArrayV3.json
index 38fc85b3..f1d7fb2c 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponseIdNotArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponseIdNotArrayV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_floob;1",
+        "@id": "dtmi:example:floob_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_spazz",
+          "name": "floob_nu",
           "response": {
             "@id": [
               "dtmi:foo:bar;7"
             ],
-            "name": "wum_thnad",
-            "schema": "long"
+            "name": "floob_mu",
+            "schema": "date"
           }
         }
       }
@@ -31,18 +31,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_flunn;1",
+        "@id": "dtmi:example:floob_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_jogg",
+          "name": "floob_pi",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;7"
             ],
-            "name": "wum_zatz",
-            "schema": "string"
+            "name": "floob_omicron",
+            "schema": "dateTime"
           }
         }
       }
@@ -56,17 +56,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_vroo;1",
+        "@id": "dtmi:example:floob_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "wum_yekk",
+          "name": "floob_tau",
           "response": {
             "@id": [
               "dtmi:foo:bar;108675309"
             ],
-            "name": "wum_itch",
-            "schema": "time"
+            "name": "floob_sigma",
+            "schema": "double"
           }
         }
       }
@@ -80,18 +80,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_beta;1",
+        "@id": "dtmi:example:floob_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_alpha",
+          "name": "floob_chi",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;108675309"
             ],
-            "name": "wum_hi",
-            "schema": "boolean"
+            "name": "floob_phi",
+            "schema": "duration"
           }
         }
       }
@@ -105,17 +105,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_epsilon;1",
+        "@id": "dtmi:example:floob_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_delta",
+          "name": "floob_yuzz",
           "response": {
             "@id": [
               "dtmi:foo:bar;999999999"
             ],
-            "name": "um_gamma",
-            "schema": "date"
+            "name": "floob_omega",
+            "schema": "float"
           }
         }
       }
@@ -129,18 +129,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_theta;1",
+        "@id": "dtmi:example:floob_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_eta",
+          "name": "floob_humpf",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;999999999"
             ],
-            "name": "um_zeta",
-            "schema": "dateTime"
+            "name": "floob_um",
+            "schema": "integer"
           }
         }
       }
@@ -154,17 +154,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_lambda;1",
+        "@id": "dtmi:example:floob_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_kappa",
+          "name": "floob_nuh",
           "response": {
             "@id": [
               "dtmi:foo;1"
             ],
-            "name": "um_iota",
-            "schema": "double"
+            "name": "floob_glikk",
+            "schema": "long"
           }
         }
       }
@@ -178,18 +178,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_xi;1",
+        "@id": "dtmi:example:floob_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_nu",
+          "name": "floob_thnad",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo;1"
             ],
-            "name": "um_mu",
-            "schema": "duration"
+            "name": "floob_quan",
+            "schema": "string"
           }
         }
       }
@@ -203,17 +203,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_rho;1",
+        "@id": "dtmi:example:floob_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_pi",
+          "name": "floob_zatz",
           "response": {
             "@id": [
               "dtmi:foo:bar"
             ],
-            "name": "um_omicron",
-            "schema": "float"
+            "name": "floob_floob",
+            "schema": "time"
           }
         }
       }
@@ -227,18 +227,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_upsilon;1",
+        "@id": "dtmi:example:floob_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_tau",
+          "name": "floob_itch",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar"
             ],
-            "name": "um_sigma",
-            "schema": "integer"
+            "name": "floob_flunn",
+            "schema": "boolean"
           }
         }
       }
@@ -252,17 +252,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_psi;1",
+        "@id": "dtmi:example:zatz_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_chi",
+          "name": "floob_hi",
           "response": {
             "@id": [
               "dtmi:foo:bar;3.14"
             ],
-            "name": "um_phi",
-            "schema": "long"
+            "name": "floob_vroo",
+            "schema": "date"
           }
         }
       }
@@ -276,18 +276,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_wum;1",
+        "@id": "dtmi:example:zatz_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_yuzz",
+          "name": "zatz_gamma",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;3.14"
             ],
-            "name": "um_omega",
-            "schema": "string"
+            "name": "zatz_beta",
+            "schema": "dateTime"
           }
         }
       }
@@ -301,17 +301,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_fuddle;1",
+        "@id": "dtmi:example:zatz_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_humpf",
+          "name": "zatz_zeta",
           "response": {
             "@id": [
               "dtmi:foo:bar;3.141592"
             ],
-            "name": "um_um",
-            "schema": "time"
+            "name": "zatz_epsilon",
+            "schema": "double"
           }
         }
       }
@@ -325,18 +325,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_snee;1",
+        "@id": "dtmi:example:zatz_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_nuh",
+          "name": "zatz_iota",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;3.141592"
             ],
-            "name": "um_glikk",
-            "schema": "boolean"
+            "name": "zatz_theta",
+            "schema": "duration"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponseInvalidKeywordsV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponseInvalidKeywordsV3.json
index d3d637b3..21103daf 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponseInvalidKeywordsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponseInvalidKeywordsV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_itch;1",
+        "@id": "dtmi:example:alpha_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "thnad_flunn",
+          "name": "alpha_rho",
           "response": {
-            "name": "thnad_jogg",
-            "schema": "integer",
+            "name": "alpha_pi",
+            "schema": "boolean",
             "@graph": {}
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_hi;1",
+        "@id": "dtmi:example:alpha_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "thnad_vroo",
+          "name": "alpha_upsilon",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "thnad_yekk",
-            "schema": "long",
+            "name": "alpha_tau",
+            "schema": "date",
             "@graph": {}
           }
         }
@@ -52,14 +52,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_gamma;1",
+        "@id": "dtmi:example:alpha_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_beta",
+          "name": "alpha_psi",
           "response": {
-            "name": "spazz_alpha",
-            "schema": "string",
+            "name": "alpha_chi",
+            "schema": "dateTime",
             "@value": 626
           }
         }
@@ -74,15 +74,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_zeta;1",
+        "@id": "dtmi:example:alpha_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_epsilon",
+          "name": "alpha_wum",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "spazz_delta",
-            "schema": "time",
+            "name": "alpha_yuzz",
+            "schema": "double",
             "@value": 626
           }
         }
@@ -97,14 +97,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_iota;1",
+        "@id": "dtmi:example:alpha_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_theta",
+          "name": "alpha_fuddle",
           "response": {
-            "name": "spazz_eta",
-            "schema": "boolean",
+            "name": "alpha_humpf",
+            "schema": "duration",
             "@language": "en"
           }
         }
@@ -119,15 +119,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_mu;1",
+        "@id": "dtmi:example:alpha_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_lambda",
+          "name": "alpha_snee",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "spazz_kappa",
-            "schema": "date",
+            "name": "alpha_nuh",
+            "schema": "float",
             "@language": "en"
           }
         }
@@ -142,14 +142,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_omicron;1",
+        "@id": "dtmi:example:alpha_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_xi",
+          "name": "alpha_spazz",
           "response": {
-            "name": "spazz_nu",
-            "schema": "dateTime",
+            "name": "alpha_thnad",
+            "schema": "integer",
             "@foobar": true
           }
         }
@@ -164,15 +164,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_sigma;1",
+        "@id": "dtmi:example:alpha_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_rho",
+          "name": "alpha_jogg",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "spazz_pi",
-            "schema": "double",
+            "name": "alpha_zatz",
+            "schema": "long",
             "@foobar": true
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyCommentStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyCommentStringLengthV3.json
index 70a94d9f..258018d8 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyCommentStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyCommentStringLengthV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_sigma;1",
+        "@id": "dtmi:example:jogg_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_rho",
+          "name": "jogg_jogg",
           "response": {
-            "name": "fuddle_pi",
-            "schema": "duration",
+            "name": "jogg_zatz",
+            "schema": "string",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_phi;1",
+        "@id": "dtmi:example:jogg_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_upsilon",
+          "name": "jogg_yekk",
           "response": {
-            "name": "fuddle_tau",
-            "schema": "float",
+            "name": "jogg_itch",
+            "schema": "time",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
@@ -51,15 +51,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_omega;1",
+        "@id": "dtmi:example:flunn_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_psi",
+          "name": "flunn_alpha",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "fuddle_chi",
-            "schema": "integer",
+            "name": "jogg_hi",
+            "schema": "boolean",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyCommentStringV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyCommentStringV3.json
index 82f3ad6b..c4640df8 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyCommentStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyCommentStringV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_yekk;1",
+        "@id": "dtmi:example:zatz_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_itch",
+          "name": "zatz_sigma",
           "response": {
-            "name": "um_flunn",
-            "schema": "double",
+            "name": "zatz_rho",
+            "schema": "long",
             "comment": "hello"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_alpha;1",
+        "@id": "dtmi:example:zatz_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "um_hi",
+          "name": "zatz_phi",
           "response": {
-            "name": "um_vroo",
-            "schema": "duration",
+            "name": "zatz_upsilon",
+            "schema": "string",
             "comment": [
               "hello"
             ]
@@ -53,14 +53,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_delta;1",
+        "@id": "dtmi:example:zatz_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_gamma",
+          "name": "zatz_omega",
           "response": {
-            "name": "humpf_beta",
-            "schema": "float",
+            "name": "zatz_psi",
+            "schema": "time",
             "comment": {
               "@value": "hello",
               "@type": "xsd:string"
@@ -78,14 +78,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_eta;1",
+        "@id": "dtmi:example:zatz_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_zeta",
+          "name": "zatz_um",
           "response": {
-            "name": "humpf_epsilon",
-            "schema": "integer",
+            "name": "zatz_wum",
+            "schema": "boolean",
             "comment": [
               {
                 "@value": "hello",
@@ -105,14 +105,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_kappa;1",
+        "@id": "dtmi:example:zatz_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_iota",
+          "name": "zatz_glikk",
           "response": {
-            "name": "humpf_theta",
-            "schema": "long",
+            "name": "zatz_fuddle",
+            "schema": "date",
             "comment": []
           }
         }
@@ -127,14 +127,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_nu;1",
+        "@id": "dtmi:example:zatz_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_mu",
+          "name": "zatz_quan",
           "response": {
-            "name": "humpf_lambda",
-            "schema": "string",
+            "name": "zatz_snee",
+            "schema": "dateTime",
             "comment": null
           }
         }
@@ -149,15 +149,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_pi;1",
+        "@id": "dtmi:example:zatz_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_omicron",
+          "name": "zatz_floob",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "humpf_xi",
-            "schema": "time",
+            "name": "zatz_spazz",
+            "schema": "double",
             "comment": null
           }
         }
@@ -172,14 +172,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_tau;1",
+        "@id": "dtmi:example:zatz_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_sigma",
+          "name": "zatz_flunn",
           "response": {
-            "name": "humpf_rho",
-            "schema": "boolean",
+            "name": "zatz_jogg",
+            "schema": "duration",
             "comment": true
           }
         }
@@ -194,15 +194,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_chi;1",
+        "@id": "dtmi:example:zatz_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_phi",
+          "name": "zatz_vroo",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "humpf_upsilon",
-            "schema": "date",
+            "name": "zatz_yekk",
+            "schema": "float",
             "comment": true
           }
         }
@@ -217,14 +217,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_yuzz;1",
+        "@id": "dtmi:example:jogg_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_omega",
+          "name": "jogg_beta",
           "response": {
-            "name": "humpf_psi",
-            "schema": "dateTime",
+            "name": "jogg_alpha",
+            "schema": "integer",
             "comment": 626
           }
         }
@@ -239,15 +239,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_humpf;1",
+        "@id": "dtmi:example:jogg_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_um",
+          "name": "jogg_epsilon",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "humpf_wum",
-            "schema": "double",
+            "name": "jogg_delta",
+            "schema": "long",
             "comment": 626
           }
         }
@@ -262,14 +262,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_nuh;1",
+        "@id": "dtmi:example:jogg_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_glikk",
+          "name": "jogg_theta",
           "response": {
-            "name": "humpf_fuddle",
-            "schema": "duration",
+            "name": "jogg_eta",
+            "schema": "string",
             "comment": [
               null
             ]
@@ -286,15 +286,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_thnad;1",
+        "@id": "dtmi:example:jogg_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_quan",
+          "name": "jogg_lambda",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "humpf_snee",
-            "schema": "float",
+            "name": "jogg_kappa",
+            "schema": "time",
             "comment": [
               null
             ]
@@ -311,14 +311,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_zatz;1",
+        "@id": "dtmi:example:jogg_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_floob",
+          "name": "jogg_xi",
           "response": {
-            "name": "humpf_spazz",
-            "schema": "integer",
+            "name": "jogg_nu",
+            "schema": "boolean",
             "comment": [
               true
             ]
@@ -335,15 +335,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_itch;1",
+        "@id": "dtmi:example:jogg_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_flunn",
+          "name": "jogg_rho",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "humpf_jogg",
-            "schema": "long",
+            "name": "jogg_pi",
+            "schema": "date",
             "comment": [
               true
             ]
@@ -360,14 +360,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_hi;1",
+        "@id": "dtmi:example:jogg_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "humpf_vroo",
+          "name": "jogg_upsilon",
           "response": {
-            "name": "humpf_yekk",
-            "schema": "string",
+            "name": "jogg_tau",
+            "schema": "dateTime",
             "comment": [
               626
             ]
@@ -384,15 +384,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_gamma;1",
+        "@id": "dtmi:example:jogg_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_beta",
+          "name": "jogg_psi",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "fuddle_alpha",
-            "schema": "time",
+            "name": "jogg_chi",
+            "schema": "double",
             "comment": [
               626
             ]
@@ -409,14 +409,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_zeta;1",
+        "@id": "dtmi:example:jogg_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_epsilon",
+          "name": "jogg_wum",
           "response": {
-            "name": "fuddle_delta",
-            "schema": "boolean",
+            "name": "jogg_yuzz",
+            "schema": "duration",
             "comment": {}
           }
         }
@@ -431,15 +431,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_iota;1",
+        "@id": "dtmi:example:jogg_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_theta",
+          "name": "jogg_fuddle",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "fuddle_eta",
-            "schema": "date",
+            "name": "jogg_humpf",
+            "schema": "float",
             "comment": {}
           }
         }
@@ -454,14 +454,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_mu;1",
+        "@id": "dtmi:example:jogg_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_lambda",
+          "name": "jogg_snee",
           "response": {
-            "name": "fuddle_kappa",
-            "schema": "dateTime",
+            "name": "jogg_nuh",
+            "schema": "integer",
             "comment": [
               {}
             ]
@@ -478,15 +478,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_omicron;1",
+        "@id": "dtmi:example:jogg_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_xi",
+          "name": "jogg_spazz",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "fuddle_nu",
-            "schema": "double",
+            "name": "jogg_thnad",
+            "schema": "long",
             "comment": [
               {}
             ]
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyCommentTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyCommentTermAndDtmiV3.json
index 7f631434..985116a0 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyCommentTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyCommentTermAndDtmiV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_yekk;1",
+        "@id": "dtmi:example:flunn_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "fuddle_itch",
+          "name": "flunn_sigma",
           "response": {
-            "comment": "fuddle_zatz",
-            "dtmi:dtdl:property:comment;3": "fuddle_jogg",
-            "name": "fuddle_flunn",
-            "schema": "boolean"
+            "comment": "flunn_omicron",
+            "dtmi:dtdl:property:comment;3": "flunn_pi",
+            "name": "flunn_rho",
+            "schema": "duration"
           }
         }
       }
@@ -30,17 +30,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_gamma;1",
+        "@id": "dtmi:example:flunn_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_beta",
+          "name": "flunn_psi",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "comment": "fuddle_vroo",
-            "dtmi:dtdl:property:comment;3": "fuddle_hi",
-            "name": "glikk_alpha",
-            "schema": "date"
+            "comment": "flunn_upsilon",
+            "dtmi:dtdl:property:comment;3": "flunn_phi",
+            "name": "flunn_chi",
+            "schema": "float"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyDescriptionLangStringV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyDescriptionLangStringV3.json
index 0e2daaa8..284f236b 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyDescriptionLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyDescriptionLangStringV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_zeta;1",
+        "@id": "dtmi:example:flunn_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_epsilon",
+          "name": "flunn_wum",
           "response": {
-            "name": "glikk_delta",
-            "schema": "dateTime",
+            "name": "flunn_yuzz",
+            "schema": "integer",
             "description": "hello"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_iota;1",
+        "@id": "dtmi:example:flunn_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_theta",
+          "name": "flunn_fuddle",
           "response": {
-            "name": "glikk_eta",
-            "schema": "double",
+            "name": "flunn_humpf",
+            "schema": "long",
             "description": [
               "hello"
             ]
@@ -53,14 +53,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_mu;1",
+        "@id": "dtmi:example:flunn_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_lambda",
+          "name": "flunn_snee",
           "response": {
-            "name": "glikk_kappa",
-            "schema": "duration",
+            "name": "flunn_nuh",
+            "schema": "string",
             "description": {
               "en": "hello"
             }
@@ -77,14 +77,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_omicron;1",
+        "@id": "dtmi:example:flunn_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_xi",
+          "name": "flunn_spazz",
           "response": {
-            "name": "glikk_nu",
-            "schema": "float",
+            "name": "flunn_thnad",
+            "schema": "time",
             "description": [
               {
                 "@value": "hello",
@@ -104,14 +104,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_sigma;1",
+        "@id": "dtmi:example:flunn_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_rho",
+          "name": "flunn_jogg",
           "response": {
-            "name": "glikk_pi",
-            "schema": "integer",
+            "name": "flunn_zatz",
+            "schema": "boolean",
             "description": {}
           }
         }
@@ -126,14 +126,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_phi;1",
+        "@id": "dtmi:example:flunn_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_upsilon",
+          "name": "flunn_yekk",
           "response": {
-            "name": "glikk_tau",
-            "schema": "long",
+            "name": "flunn_itch",
+            "schema": "date",
             "description": []
           }
         }
@@ -148,14 +148,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_omega;1",
+        "@id": "dtmi:example:itch_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_psi",
+          "name": "itch_alpha",
           "response": {
-            "name": "glikk_chi",
-            "schema": "string",
+            "name": "flunn_hi",
+            "schema": "dateTime",
             "description": null
           }
         }
@@ -170,15 +170,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_um;1",
+        "@id": "dtmi:example:itch_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_wum",
+          "name": "itch_delta",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "glikk_yuzz",
-            "schema": "time",
+            "name": "itch_gamma",
+            "schema": "double",
             "description": null
           }
         }
@@ -193,14 +193,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_glikk;1",
+        "@id": "dtmi:example:itch_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_fuddle",
+          "name": "itch_eta",
           "response": {
-            "name": "glikk_humpf",
-            "schema": "boolean",
+            "name": "itch_zeta",
+            "schema": "duration",
             "description": true
           }
         }
@@ -215,15 +215,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_quan;1",
+        "@id": "dtmi:example:itch_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_snee",
+          "name": "itch_kappa",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "glikk_nuh",
-            "schema": "date",
+            "name": "itch_iota",
+            "schema": "float",
             "description": true
           }
         }
@@ -238,14 +238,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_floob;1",
+        "@id": "dtmi:example:itch_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_spazz",
+          "name": "itch_nu",
           "response": {
-            "name": "glikk_thnad",
-            "schema": "dateTime",
+            "name": "itch_mu",
+            "schema": "integer",
             "description": 626
           }
         }
@@ -260,15 +260,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_flunn;1",
+        "@id": "dtmi:example:itch_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_jogg",
+          "name": "itch_pi",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "glikk_zatz",
-            "schema": "double",
+            "name": "itch_omicron",
+            "schema": "long",
             "description": 626
           }
         }
@@ -283,14 +283,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_vroo;1",
+        "@id": "dtmi:example:itch_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "glikk_yekk",
+          "name": "itch_tau",
           "response": {
-            "name": "glikk_itch",
-            "schema": "duration",
+            "name": "itch_sigma",
+            "schema": "string",
             "description": [
               null
             ]
@@ -307,15 +307,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_beta;1",
+        "@id": "dtmi:example:itch_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_alpha",
+          "name": "itch_chi",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "glikk_hi",
-            "schema": "float",
+            "name": "itch_phi",
+            "schema": "time",
             "description": [
               null
             ]
@@ -332,14 +332,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_epsilon;1",
+        "@id": "dtmi:example:itch_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_delta",
+          "name": "itch_yuzz",
           "response": {
-            "name": "nuh_gamma",
-            "schema": "integer",
+            "name": "itch_omega",
+            "schema": "boolean",
             "description": [
               true
             ]
@@ -356,15 +356,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_theta;1",
+        "@id": "dtmi:example:itch_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_eta",
+          "name": "itch_humpf",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nuh_zeta",
-            "schema": "long",
+            "name": "itch_um",
+            "schema": "date",
             "description": [
               true
             ]
@@ -381,14 +381,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_lambda;1",
+        "@id": "dtmi:example:itch_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_kappa",
+          "name": "itch_nuh",
           "response": {
-            "name": "nuh_iota",
-            "schema": "string",
+            "name": "itch_glikk",
+            "schema": "dateTime",
             "description": [
               626
             ]
@@ -405,15 +405,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_xi;1",
+        "@id": "dtmi:example:itch_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_nu",
+          "name": "itch_thnad",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nuh_mu",
-            "schema": "time",
+            "name": "itch_quan",
+            "schema": "double",
             "description": [
               626
             ]
@@ -430,14 +430,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_rho;1",
+        "@id": "dtmi:example:itch_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_pi",
+          "name": "itch_zatz",
           "response": {
-            "name": "nuh_omicron",
-            "schema": "boolean",
+            "name": "itch_floob",
+            "schema": "duration",
             "description": [
               {}
             ]
@@ -454,15 +454,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_upsilon;1",
+        "@id": "dtmi:example:itch_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_tau",
+          "name": "itch_itch",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nuh_sigma",
-            "schema": "date",
+            "name": "itch_flunn",
+            "schema": "float",
             "description": [
               {}
             ]
@@ -479,14 +479,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_psi;1",
+        "@id": "dtmi:example:yekk_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_chi",
+          "name": "itch_hi",
           "response": {
-            "name": "nuh_phi",
-            "schema": "dateTime",
+            "name": "itch_vroo",
+            "schema": "integer",
             "description": {
               "@value": "hello",
               "@language": "en"
@@ -504,15 +504,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_wum;1",
+        "@id": "dtmi:example:yekk_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_yuzz",
+          "name": "yekk_gamma",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nuh_omega",
-            "schema": "double",
+            "name": "yekk_beta",
+            "schema": "long",
             "description": {
               "@value": "hello",
               "@language": "en"
@@ -530,14 +530,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_fuddle;1",
+        "@id": "dtmi:example:yekk_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_humpf",
+          "name": "yekk_zeta",
           "response": {
-            "name": "nuh_um",
-            "schema": "duration",
+            "name": "yekk_epsilon",
+            "schema": "string",
             "description": [
               {
                 "en": "hello"
@@ -556,15 +556,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_snee;1",
+        "@id": "dtmi:example:yekk_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_nuh",
+          "name": "yekk_iota",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nuh_glikk",
-            "schema": "float",
+            "name": "yekk_theta",
+            "schema": "time",
             "description": [
               {
                 "en": "hello"
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyDescriptionStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyDescriptionStringLengthV3.json
index e6b9c838..c2997a9b 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyDescriptionStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyDescriptionStringLengthV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_spazz;1",
+        "@id": "dtmi:example:yekk_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_thnad",
+          "name": "yekk_mu",
           "response": {
-            "name": "nuh_quan",
-            "schema": "integer",
+            "name": "yekk_lambda",
+            "schema": "boolean",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_jogg;1",
+        "@id": "dtmi:example:yekk_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_zatz",
+          "name": "yekk_omicron",
           "response": {
-            "name": "nuh_floob",
-            "schema": "long",
+            "name": "yekk_xi",
+            "schema": "date",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
@@ -51,15 +51,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_yekk;1",
+        "@id": "dtmi:example:yekk_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nuh_itch",
+          "name": "yekk_sigma",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nuh_flunn",
-            "schema": "string",
+            "name": "yekk_rho",
+            "schema": "dateTime",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyDescriptionTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyDescriptionTermAndDtmiV3.json
index e00e8c6b..ae3425f3 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyDescriptionTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyDescriptionTermAndDtmiV3.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_omicron;1",
+        "@id": "dtmi:example:yekk_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_xi",
+          "name": "yekk_spazz",
           "response": {
             "description": [
-              "snee_lambda"
+              "yekk_snee"
             ],
             "dtmi:dtdl:property:description;3": [
-              "snee_mu"
+              "yekk_quan"
             ],
-            "name": "snee_nu",
-            "schema": "dateTime"
+            "name": "yekk_thnad",
+            "schema": "integer"
           }
         }
       }
@@ -34,21 +34,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_upsilon;1",
+        "@id": "dtmi:example:yekk_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_tau",
+          "name": "yekk_itch",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "description": [
-              "snee_pi"
+              "yekk_zatz"
             ],
             "dtmi:dtdl:property:description;3": [
-              "snee_rho"
+              "yekk_jogg"
             ],
-            "name": "snee_sigma",
-            "schema": "double"
+            "name": "yekk_flunn",
+            "schema": "long"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyDisplayNameLangStringV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyDisplayNameLangStringV3.json
index e3a37ef6..6dd029f0 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyDisplayNameLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyDisplayNameLangStringV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_psi;1",
+        "@id": "dtmi:example:vroo_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_chi",
+          "name": "yekk_hi",
           "response": {
-            "name": "snee_phi",
-            "schema": "duration",
+            "name": "yekk_vroo",
+            "schema": "string",
             "displayName": "hello"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_wum;1",
+        "@id": "dtmi:example:vroo_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_yuzz",
+          "name": "vroo_gamma",
           "response": {
-            "name": "snee_omega",
-            "schema": "float",
+            "name": "vroo_beta",
+            "schema": "time",
             "displayName": [
               "hello"
             ]
@@ -53,14 +53,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_fuddle;1",
+        "@id": "dtmi:example:vroo_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_humpf",
+          "name": "vroo_zeta",
           "response": {
-            "name": "snee_um",
-            "schema": "integer",
+            "name": "vroo_epsilon",
+            "schema": "boolean",
             "displayName": {
               "en": "hello"
             }
@@ -77,14 +77,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_snee;1",
+        "@id": "dtmi:example:vroo_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_nuh",
+          "name": "vroo_iota",
           "response": {
-            "name": "snee_glikk",
-            "schema": "long",
+            "name": "vroo_theta",
+            "schema": "date",
             "displayName": [
               {
                 "@value": "hello",
@@ -104,14 +104,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_spazz;1",
+        "@id": "dtmi:example:vroo_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_thnad",
+          "name": "vroo_mu",
           "response": {
-            "name": "snee_quan",
-            "schema": "string",
+            "name": "vroo_lambda",
+            "schema": "dateTime",
             "displayName": {}
           }
         }
@@ -126,14 +126,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_jogg;1",
+        "@id": "dtmi:example:vroo_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_zatz",
+          "name": "vroo_omicron",
           "response": {
-            "name": "snee_floob",
-            "schema": "time",
+            "name": "vroo_xi",
+            "schema": "double",
             "displayName": []
           }
         }
@@ -148,14 +148,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_yekk;1",
+        "@id": "dtmi:example:vroo_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_itch",
+          "name": "vroo_sigma",
           "response": {
-            "name": "snee_flunn",
-            "schema": "boolean",
+            "name": "vroo_rho",
+            "schema": "duration",
             "displayName": null
           }
         }
@@ -170,15 +170,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_alpha;1",
+        "@id": "dtmi:example:vroo_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "snee_hi",
+          "name": "vroo_phi",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "snee_vroo",
-            "schema": "date",
+            "name": "vroo_upsilon",
+            "schema": "float",
             "displayName": null
           }
         }
@@ -193,14 +193,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_delta;1",
+        "@id": "dtmi:example:vroo_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_gamma",
+          "name": "vroo_omega",
           "response": {
-            "name": "quan_beta",
-            "schema": "dateTime",
+            "name": "vroo_psi",
+            "schema": "integer",
             "displayName": true
           }
         }
@@ -215,15 +215,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_eta;1",
+        "@id": "dtmi:example:vroo_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_zeta",
+          "name": "vroo_um",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "quan_epsilon",
-            "schema": "double",
+            "name": "vroo_wum",
+            "schema": "long",
             "displayName": true
           }
         }
@@ -238,14 +238,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_kappa;1",
+        "@id": "dtmi:example:vroo_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_iota",
+          "name": "vroo_glikk",
           "response": {
-            "name": "quan_theta",
-            "schema": "duration",
+            "name": "vroo_fuddle",
+            "schema": "string",
             "displayName": 626
           }
         }
@@ -260,15 +260,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_nu;1",
+        "@id": "dtmi:example:vroo_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_mu",
+          "name": "vroo_quan",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "quan_lambda",
-            "schema": "float",
+            "name": "vroo_snee",
+            "schema": "time",
             "displayName": 626
           }
         }
@@ -283,14 +283,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_pi;1",
+        "@id": "dtmi:example:vroo_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_omicron",
+          "name": "vroo_floob",
           "response": {
-            "name": "quan_xi",
-            "schema": "integer",
+            "name": "vroo_spazz",
+            "schema": "boolean",
             "displayName": [
               null
             ]
@@ -307,15 +307,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_tau;1",
+        "@id": "dtmi:example:vroo_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_sigma",
+          "name": "vroo_flunn",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "quan_rho",
-            "schema": "long",
+            "name": "vroo_jogg",
+            "schema": "date",
             "displayName": [
               null
             ]
@@ -332,14 +332,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_chi;1",
+        "@id": "dtmi:example:vroo_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_phi",
+          "name": "vroo_vroo",
           "response": {
-            "name": "quan_upsilon",
-            "schema": "string",
+            "name": "vroo_yekk",
+            "schema": "dateTime",
             "displayName": [
               true
             ]
@@ -356,15 +356,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_yuzz;1",
+        "@id": "dtmi:example:hi_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_omega",
+          "name": "hi_beta",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "quan_psi",
-            "schema": "time",
+            "name": "hi_alpha",
+            "schema": "double",
             "displayName": [
               true
             ]
@@ -381,14 +381,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_humpf;1",
+        "@id": "dtmi:example:hi_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_um",
+          "name": "hi_epsilon",
           "response": {
-            "name": "quan_wum",
-            "schema": "boolean",
+            "name": "hi_delta",
+            "schema": "duration",
             "displayName": [
               626
             ]
@@ -405,15 +405,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_nuh;1",
+        "@id": "dtmi:example:hi_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_glikk",
+          "name": "hi_theta",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "quan_fuddle",
-            "schema": "date",
+            "name": "hi_eta",
+            "schema": "float",
             "displayName": [
               626
             ]
@@ -430,14 +430,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_thnad;1",
+        "@id": "dtmi:example:hi_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_quan",
+          "name": "hi_lambda",
           "response": {
-            "name": "quan_snee",
-            "schema": "dateTime",
+            "name": "hi_kappa",
+            "schema": "integer",
             "displayName": [
               {}
             ]
@@ -454,15 +454,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_zatz;1",
+        "@id": "dtmi:example:hi_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_floob",
+          "name": "hi_xi",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "quan_spazz",
-            "schema": "double",
+            "name": "hi_nu",
+            "schema": "long",
             "displayName": [
               {}
             ]
@@ -479,14 +479,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_itch;1",
+        "@id": "dtmi:example:hi_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_flunn",
+          "name": "hi_rho",
           "response": {
-            "name": "quan_jogg",
-            "schema": "duration",
+            "name": "hi_pi",
+            "schema": "string",
             "displayName": {
               "@value": "hello",
               "@language": "en"
@@ -504,15 +504,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_hi;1",
+        "@id": "dtmi:example:hi_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "quan_vroo",
+          "name": "hi_upsilon",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "quan_yekk",
-            "schema": "float",
+            "name": "hi_tau",
+            "schema": "time",
             "displayName": {
               "@value": "hello",
               "@language": "en"
@@ -530,14 +530,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_gamma;1",
+        "@id": "dtmi:example:hi_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "thnad_beta",
+          "name": "hi_psi",
           "response": {
-            "name": "thnad_alpha",
-            "schema": "integer",
+            "name": "hi_chi",
+            "schema": "boolean",
             "displayName": [
               {
                 "en": "hello"
@@ -556,15 +556,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_zeta;1",
+        "@id": "dtmi:example:hi_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "thnad_epsilon",
+          "name": "hi_wum",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "thnad_delta",
-            "schema": "long",
+            "name": "hi_yuzz",
+            "schema": "date",
             "displayName": [
               {
                 "en": "hello"
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyDisplayNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyDisplayNameStringLengthV3.json
index 48176e3e..1bf9cfbe 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyDisplayNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyDisplayNameStringLengthV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_iota;1",
+        "@id": "dtmi:example:hi_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "thnad_theta",
+          "name": "hi_fuddle",
           "response": {
-            "name": "thnad_eta",
-            "schema": "string",
+            "name": "hi_humpf",
+            "schema": "dateTime",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_mu;1",
+        "@id": "dtmi:example:hi_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "thnad_lambda",
+          "name": "hi_snee",
           "response": {
-            "name": "thnad_kappa",
-            "schema": "time",
+            "name": "hi_nuh",
+            "schema": "double",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
@@ -51,15 +51,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_omicron;1",
+        "@id": "dtmi:example:hi_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "thnad_xi",
+          "name": "hi_spazz",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "thnad_nu",
-            "schema": "boolean",
+            "name": "hi_thnad",
+            "schema": "duration",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyDisplayNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyDisplayNameTermAndDtmiV3.json
index e8ead6b8..577daa7f 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyDisplayNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyDisplayNameTermAndDtmiV3.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_snee;1",
+        "@id": "dtmi:example:alpha_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "thnad_nuh",
+          "name": "alpha_iota",
           "response": {
             "displayName": [
-              "thnad_humpf"
+              "alpha_zeta"
             ],
             "dtmi:dtdl:property:displayName;3": [
-              "thnad_fuddle"
+              "alpha_eta"
             ],
-            "name": "thnad_glikk",
-            "schema": "duration"
+            "name": "alpha_theta",
+            "schema": "string"
           }
         }
       }
@@ -34,21 +34,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_zatz;1",
+        "@id": "dtmi:example:alpha_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "thnad_floob",
+          "name": "alpha_xi",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "displayName": [
-              "thnad_quan"
+              "alpha_lambda"
             ],
             "dtmi:dtdl:property:displayName;3": [
-              "thnad_thnad"
+              "alpha_mu"
             ],
-            "name": "thnad_spazz",
-            "schema": "float"
+            "name": "alpha_nu",
+            "schema": "time"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyFormallyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyFormallyIrrelevantDtmiOrTermV3.json
index 971e2de7..e51aa24c 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyFormallyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyFormallyIrrelevantDtmiOrTermV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_quan;1",
+        "@id": "dtmi:example:beta_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_snee",
+          "name": "beta_kappa",
           "response": {
-            "name": "spazz_nuh",
-            "schema": "string",
+            "name": "beta_iota",
+            "schema": "dateTime",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_floob;1",
+        "@id": "dtmi:example:beta_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_spazz",
+          "name": "beta_nu",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "spazz_thnad",
-            "schema": "time",
+            "name": "beta_mu",
+            "schema": "double",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -52,14 +52,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_flunn;1",
+        "@id": "dtmi:example:beta_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_jogg",
+          "name": "beta_pi",
           "response": {
-            "name": "spazz_zatz",
-            "schema": "boolean",
+            "name": "beta_omicron",
+            "schema": "duration",
             "boolean": null
           }
         }
@@ -74,15 +74,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_vroo;1",
+        "@id": "dtmi:example:beta_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "spazz_yekk",
+          "name": "beta_tau",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "spazz_itch",
-            "schema": "date",
+            "name": "beta_sigma",
+            "schema": "float",
             "boolean": null
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyFormallyUndefinedTermV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyFormallyUndefinedTermV3.json
index c4a52fec..90595e74 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyFormallyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyFormallyUndefinedTermV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_upsilon;1",
+        "@id": "dtmi:example:beta_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_tau",
+          "name": "beta_itch",
           "response": {
-            "name": "floob_sigma",
-            "schema": "string",
+            "name": "beta_flunn",
+            "schema": "dateTime",
             "foobar": {}
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_psi;1",
+        "@id": "dtmi:example:gamma_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_chi",
+          "name": "beta_hi",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "floob_phi",
-            "schema": "time",
+            "name": "beta_vroo",
+            "schema": "double",
             "foobar": {}
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyInvalidDtmiV3.json
index 80015b9d..ab483a04 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyInvalidDtmiV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_beta;1",
+        "@id": "dtmi:example:beta_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_alpha",
+          "name": "beta_chi",
           "response": {
             "@type": [
               "CommandResponse",
               "Foobar"
             ],
-            "name": "spazz_hi",
-            "schema": "dateTime",
+            "name": "beta_phi",
+            "schema": "integer",
             "dtmi:foo//bar": 626
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_epsilon;1",
+        "@id": "dtmi:example:beta_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_delta",
+          "name": "beta_yuzz",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": [
               "CommandResponse",
               "Foobar"
             ],
-            "name": "floob_gamma",
-            "schema": "double",
+            "name": "beta_omega",
+            "schema": "long",
             "dtmi:foo//bar": 626
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyNamePatternV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyNamePatternV3.json
index d8b7a8ce..ea05a752 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyNamePatternV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyNamePatternV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_pi;1",
+        "@id": "dtmi:example:tau_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_omicron",
+          "name": "tau_sigma",
           "response": {
             "schema": "double",
             "name": "EARTH"
@@ -28,11 +28,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_sigma;1",
+        "@id": "dtmi:example:tau_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_rho",
+          "name": "tau_upsilon",
           "response": {
             "schema": "duration",
             "name": "Air"
@@ -49,11 +49,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_upsilon;1",
+        "@id": "dtmi:example:tau_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_tau",
+          "name": "tau_chi",
           "response": {
             "schema": "float",
             "name": "fire"
@@ -70,11 +70,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_chi;1",
+        "@id": "dtmi:example:tau_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_phi",
+          "name": "tau_omega",
           "response": {
             "schema": "integer",
             "name": "hello_world"
@@ -91,11 +91,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_omega;1",
+        "@id": "dtmi:example:tau_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_psi",
+          "name": "tau_wum",
           "response": {
             "schema": "long",
             "name": "Anarchy99"
@@ -112,11 +112,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_wum;1",
+        "@id": "dtmi:example:tau_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_yuzz",
+          "name": "tau_humpf",
           "response": {
             "schema": "string",
             "name": "23skidoo"
@@ -133,11 +133,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_humpf;1",
+        "@id": "dtmi:example:tau_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_um",
+          "name": "tau_glikk",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "schema": "time",
@@ -155,11 +155,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_glikk;1",
+        "@id": "dtmi:example:tau_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_fuddle",
+          "name": "tau_snee",
           "response": {
             "schema": "boolean",
             "name": "626"
@@ -176,11 +176,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_snee;1",
+        "@id": "dtmi:example:tau_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_nuh",
+          "name": "tau_thnad",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "schema": "date",
@@ -198,11 +198,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_thnad;1",
+        "@id": "dtmi:example:tau_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_quan",
+          "name": "tau_floob",
           "response": {
             "schema": "dateTime",
             "name": "goodbye-world"
@@ -219,11 +219,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_floob;1",
+        "@id": "dtmi:example:tau_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_spazz",
+          "name": "tau_jogg",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "schema": "double",
@@ -241,11 +241,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_jogg;1",
+        "@id": "dtmi:example:tau_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_zatz",
+          "name": "tau_itch",
           "response": {
             "schema": "duration",
             "name": "_haha"
@@ -262,11 +262,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_itch;1",
+        "@id": "dtmi:example:tau_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_flunn",
+          "name": "tau_vroo",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "schema": "float",
@@ -284,11 +284,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_vroo;1",
+        "@id": "dtmi:example:upsilon_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_yekk",
+          "name": "upsilon_alpha",
           "response": {
             "schema": "integer",
             "name": "toodaloo_"
@@ -305,11 +305,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_alpha;1",
+        "@id": "dtmi:example:upsilon_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_hi",
+          "name": "upsilon_gamma",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "schema": "long",
@@ -327,11 +327,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_gamma;1",
+        "@id": "dtmi:example:upsilon_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_beta",
+          "name": "upsilon_epsilon",
           "response": {
             "schema": "string",
             "name": "pro:con"
@@ -348,11 +348,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_epsilon;1",
+        "@id": "dtmi:example:upsilon_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_delta",
+          "name": "upsilon_eta",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "schema": "time",
@@ -370,11 +370,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_eta;1",
+        "@id": "dtmi:example:upsilon_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_zeta",
+          "name": "upsilon_iota",
           "response": {
             "schema": "boolean",
             "name": "mish/mash"
@@ -391,11 +391,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_iota;1",
+        "@id": "dtmi:example:upsilon_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_theta",
+          "name": "upsilon_lambda",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "schema": "date",
@@ -413,11 +413,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_lambda;1",
+        "@id": "dtmi:example:upsilon_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_kappa",
+          "name": "upsilon_nu",
           "response": {
             "schema": "dateTime",
             "name": "#tag"
@@ -434,11 +434,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_nu;1",
+        "@id": "dtmi:example:upsilon_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_mu",
+          "name": "upsilon_omicron",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "schema": "double",
@@ -456,11 +456,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_omicron;1",
+        "@id": "dtmi:example:upsilon_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_xi",
+          "name": "upsilon_rho",
           "response": {
             "schema": "duration",
             "name": "@tweet"
@@ -477,11 +477,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_rho;1",
+        "@id": "dtmi:example:upsilon_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_pi",
+          "name": "upsilon_tau",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "schema": "float",
@@ -499,11 +499,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_tau;1",
+        "@id": "dtmi:example:upsilon_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_sigma",
+          "name": "upsilon_phi",
           "response": {
             "schema": "integer",
             "name": "$money"
@@ -520,11 +520,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_phi;1",
+        "@id": "dtmi:example:upsilon_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_upsilon",
+          "name": "upsilon_psi",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "schema": "long",
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyNameStringLengthV3.json
index 337ecec0..c97cb119 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyNameStringLengthV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_kappa;1",
+        "@id": "dtmi:example:tau_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_iota",
+          "name": "tau_mu",
           "response": {
             "schema": "boolean",
             "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
@@ -28,11 +28,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_mu;1",
+        "@id": "dtmi:example:tau_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_lambda",
+          "name": "tau_xi",
           "response": {
             "schema": "date",
             "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
@@ -49,11 +49,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_xi;1",
+        "@id": "dtmi:example:tau_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_nu",
+          "name": "tau_pi",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "schema": "dateTime",
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyNameStringV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyNameStringV3.json
index d51477c8..761aeb83 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyNameStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyNameStringV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_iota;1",
+        "@id": "dtmi:example:sigma_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_theta",
+          "name": "sigma_lambda",
           "response": {
             "schema": "string",
             "name": "hello"
@@ -28,11 +28,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_lambda;1",
+        "@id": "dtmi:example:sigma_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_kappa",
+          "name": "sigma_nu",
           "response": {
             "schema": "time",
             "name": [
@@ -51,11 +51,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_nu;1",
+        "@id": "dtmi:example:sigma_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_mu",
+          "name": "sigma_omicron",
           "response": {
             "schema": "boolean",
             "name": {
@@ -75,11 +75,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_omicron;1",
+        "@id": "dtmi:example:sigma_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_xi",
+          "name": "sigma_rho",
           "response": {
             "schema": "date",
             "name": [
@@ -101,11 +101,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_rho;1",
+        "@id": "dtmi:example:sigma_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_pi",
+          "name": "sigma_tau",
           "response": {
             "schema": "dateTime",
             "name": null
@@ -122,11 +122,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_tau;1",
+        "@id": "dtmi:example:sigma_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_sigma",
+          "name": "sigma_phi",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "schema": "double",
@@ -144,11 +144,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_phi;1",
+        "@id": "dtmi:example:sigma_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_upsilon",
+          "name": "sigma_psi",
           "response": {
             "schema": "duration",
             "name": true
@@ -165,11 +165,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_psi;1",
+        "@id": "dtmi:example:sigma_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_chi",
+          "name": "sigma_yuzz",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "schema": "float",
@@ -187,11 +187,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_yuzz;1",
+        "@id": "dtmi:example:sigma_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_omega",
+          "name": "sigma_um",
           "response": {
             "schema": "integer",
             "name": 626
@@ -208,11 +208,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_um;1",
+        "@id": "dtmi:example:sigma_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_wum",
+          "name": "sigma_fuddle",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "schema": "long",
@@ -230,11 +230,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_fuddle;1",
+        "@id": "dtmi:example:sigma_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_humpf",
+          "name": "sigma_nuh",
           "response": {
             "schema": "string",
             "name": [
@@ -253,11 +253,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_nuh;1",
+        "@id": "dtmi:example:sigma_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_glikk",
+          "name": "sigma_quan",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "schema": "time",
@@ -277,11 +277,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_quan;1",
+        "@id": "dtmi:example:sigma_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_snee",
+          "name": "sigma_spazz",
           "response": {
             "schema": "boolean",
             "name": [
@@ -300,11 +300,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_spazz;1",
+        "@id": "dtmi:example:sigma_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_thnad",
+          "name": "sigma_zatz",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "schema": "date",
@@ -324,11 +324,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_zatz;1",
+        "@id": "dtmi:example:sigma_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_floob",
+          "name": "sigma_flunn",
           "response": {
             "schema": "dateTime",
             "name": [
@@ -347,11 +347,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_flunn;1",
+        "@id": "dtmi:example:sigma_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_jogg",
+          "name": "sigma_yekk",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "schema": "double",
@@ -371,11 +371,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_yekk;1",
+        "@id": "dtmi:example:tau_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_itch",
+          "name": "sigma_hi",
           "response": {
             "schema": "duration",
             "name": {}
@@ -392,11 +392,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_hi;1",
+        "@id": "dtmi:example:tau_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_vroo",
+          "name": "tau_beta",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "schema": "float",
@@ -414,11 +414,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_beta;1",
+        "@id": "dtmi:example:tau_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_alpha",
+          "name": "tau_delta",
           "response": {
             "schema": "integer",
             "name": [
@@ -437,11 +437,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_delta;1",
+        "@id": "dtmi:example:tau_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_gamma",
+          "name": "tau_zeta",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "schema": "long",
@@ -461,11 +461,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_zeta;1",
+        "@id": "dtmi:example:tau_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_epsilon",
+          "name": "tau_theta",
           "response": {
             "schema": "string",
             "name": []
@@ -482,11 +482,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_theta;1",
+        "@id": "dtmi:example:tau_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "kappa_eta",
+          "name": "tau_kappa",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "schema": "time",
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyNameTermAndDtmiV3.json
index b2fca94f..337fb248 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyNameTermAndDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_thnad;1",
+        "@id": "dtmi:example:upsilon_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_quan",
+          "name": "upsilon_floob",
           "response": {
-            "name": "lambda_nuh",
-            "dtmi:dtdl:property:name;3": "lambda_snee",
+            "name": "upsilon_thnad",
+            "dtmi:dtdl:property:name;3": "upsilon_spazz",
             "schema": "date"
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_jogg;1",
+        "@id": "dtmi:example:upsilon_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "lambda_zatz",
+          "name": "upsilon_itch",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "lambda_spazz",
-            "dtmi:dtdl:property:name;3": "lambda_floob",
+            "name": "upsilon_jogg",
+            "dtmi:dtdl:property:name;3": "upsilon_flunn",
             "schema": "dateTime"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyNotDtmiNorTermV3.json
index 03524d82..2f62a286 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertyNotDtmiNorTermV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_theta;1",
+        "@id": "dtmi:example:beta_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_eta",
+          "name": "beta_humpf",
           "response": {
             "@type": [
               "CommandResponse",
               "Foobar"
             ],
-            "name": "floob_zeta",
-            "schema": "duration",
+            "name": "beta_um",
+            "schema": "string",
             "http://foo.com/bar": true
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_lambda;1",
+        "@id": "dtmi:example:beta_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "floob_kappa",
+          "name": "beta_nuh",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": [
               "CommandResponse",
               "Foobar"
             ],
-            "name": "floob_iota",
-            "schema": "float",
+            "name": "beta_glikk",
+            "schema": "time",
             "http://foo.com/bar": true
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertySchemaElementV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertySchemaElementV3.json
index 9fad3ce6..bb48405a 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertySchemaElementV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertySchemaElementV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_vroo;1",
+        "@id": "dtmi:example:phi_beta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:lambda_yekk;1",
+          "@id": "dtmi:example:phi_alpha;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "lambda_itch",
+            "name": "upsilon_hi",
             "response": {
-              "name": "lambda_flunn",
+              "name": "upsilon_vroo",
               "schema": {
                 "@type": "Array",
                 "elementSchema": "double"
@@ -35,16 +35,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_gamma;1",
+        "@id": "dtmi:example:phi_zeta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:mu_beta;1",
+          "@id": "dtmi:example:phi_epsilon;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "mu_alpha",
+            "name": "phi_delta",
             "response": {
-              "name": "lambda_hi",
+              "name": "phi_gamma",
               "schema": [
                 {
                   "@type": "Array",
@@ -65,7 +65,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_delta;1",
+        "@id": "dtmi:example:phi_eta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
@@ -74,9 +74,9 @@
         },
         "contents": {
           "@type": "Command",
-          "name": "mu_zeta",
+          "name": "phi_iota",
           "response": {
-            "name": "mu_epsilon",
+            "name": "phi_theta",
             "schema": "dtmi:ex:dependentRef;1"
           }
         }
@@ -91,7 +91,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_eta;1",
+        "@id": "dtmi:example:phi_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
@@ -100,9 +100,9 @@
         },
         "contents": {
           "@type": "Command",
-          "name": "mu_iota",
+          "name": "phi_mu",
           "response": {
-            "name": "mu_theta",
+            "name": "phi_lambda",
             "schema": [
               "dtmi:ex:dependentRef;1"
             ]
@@ -119,18 +119,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_xi;1",
+        "@id": "dtmi:example:phi_rho;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:mu_nu;1",
+          "@id": "dtmi:example:phi_pi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Command",
-            "name": "mu_mu",
+            "name": "phi_omicron",
             "response": {
-              "name": "mu_lambda",
+              "name": "phi_xi",
               "schema": {
-                "@id": "dtmi:example:mu_kappa;1",
+                "@id": "dtmi:example:phi_nu;1",
                 "@type": "Array",
                 "elementSchema": "long",
                 "@context": "dtmi:dtdl:context;2"
@@ -149,22 +149,83 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_omicron;1",
+        "@id": "dtmi:example:phi_chi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:phi_phi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "phi_upsilon",
+            "response": {
+              "name": "phi_tau",
+              "schema": {
+                "@id": "dtmi:example:phi_sigma;1",
+                "@type": "Array",
+                "elementSchema": "duration",
+                "@context": "dtmi:dtdl:context;4"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:phi_um;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:phi_wum;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "phi_yuzz",
+            "response": {
+              "@context": "dtmi:undefinedExtension:context;1",
+              "name": "phi_omega",
+              "schema": {
+                "@id": "dtmi:example:phi_psi;1",
+                "@type": "Array",
+                "elementSchema": "float",
+                "@context": "dtmi:dtdl:context;4"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:phi_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Array",
-          "elementSchema": "time"
+          "elementSchema": "date"
         },
         "contents": {
           "@type": "Command",
-          "name": "mu_rho",
+          "name": "phi_glikk",
           "response": {
-            "name": "mu_pi",
+            "name": "phi_fuddle",
             "schema": [
               {
                 "@type": "Array",
-                "elementSchema": "string"
+                "elementSchema": "boolean"
               },
               "dtmi:ex:dependentRef;1"
             ]
@@ -181,23 +242,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_sigma;1",
+        "@id": "dtmi:example:phi_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Array",
-          "elementSchema": "date"
+          "elementSchema": "double"
         },
         "contents": {
           "@type": "Command",
-          "name": "mu_upsilon",
+          "name": "phi_quan",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "mu_tau",
+            "name": "phi_snee",
             "schema": [
               {
                 "@type": "Array",
-                "elementSchema": "boolean"
+                "elementSchema": "dateTime"
               },
               "dtmi:ex:dependentRef;1"
             ]
@@ -214,13 +275,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_psi;1",
+        "@id": "dtmi:example:phi_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_chi",
+          "name": "phi_spazz",
           "response": {
-            "name": "mu_phi",
+            "name": "phi_thnad",
             "schema": "duration"
           }
         }
@@ -235,13 +296,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_wum;1",
+        "@id": "dtmi:example:phi_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_yuzz",
+          "name": "phi_jogg",
           "response": {
-            "name": "mu_omega",
+            "name": "phi_zatz",
             "schema": [
               "duration"
             ]
@@ -258,13 +319,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_fuddle;1",
+        "@id": "dtmi:example:phi_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_humpf",
+          "name": "phi_yekk",
           "response": {
-            "name": "mu_um",
+            "name": "phi_itch",
             "schema": "dtmi:dtdl:instance:Schema:duration;3"
           }
         }
@@ -279,13 +340,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_snee;1",
+        "@id": "dtmi:example:chi_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_nuh",
+          "name": "chi_alpha",
           "response": {
-            "name": "mu_glikk",
+            "name": "phi_hi",
             "schema": [
               "dtmi:dtdl:instance:Schema:duration;3"
             ]
@@ -302,13 +363,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_spazz;1",
+        "@id": "dtmi:example:chi_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_thnad",
+          "name": "chi_delta",
           "response": {
-            "name": "mu_quan",
+            "name": "chi_gamma",
             "schema": "point"
           }
         }
@@ -323,13 +384,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_jogg;1",
+        "@id": "dtmi:example:chi_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_zatz",
+          "name": "chi_eta",
           "response": {
-            "name": "mu_floob",
+            "name": "chi_zeta",
             "schema": [
               "point"
             ]
@@ -346,13 +407,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_yekk;1",
+        "@id": "dtmi:example:chi_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_itch",
+          "name": "chi_kappa",
           "response": {
-            "name": "mu_flunn",
+            "name": "chi_iota",
             "schema": "dtmi:standard:schema:geospatial:point;3"
           }
         }
@@ -367,13 +428,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_alpha;1",
+        "@id": "dtmi:example:chi_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "mu_hi",
+          "name": "chi_nu",
           "response": {
-            "name": "mu_vroo",
+            "name": "chi_mu",
             "schema": [
               "dtmi:standard:schema:geospatial:point;3"
             ]
@@ -390,13 +451,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_delta;1",
+        "@id": "dtmi:example:chi_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_gamma",
+          "name": "chi_pi",
           "response": {
-            "name": "nu_beta",
+            "name": "chi_omicron",
             "schema": "Foobar"
           }
         }
@@ -411,14 +472,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_eta;1",
+        "@id": "dtmi:example:chi_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_zeta",
+          "name": "chi_tau",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nu_epsilon",
+            "name": "chi_sigma",
             "schema": "Foobar"
           }
         }
@@ -433,13 +494,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_kappa;1",
+        "@id": "dtmi:example:chi_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_iota",
+          "name": "chi_chi",
           "response": {
-            "name": "nu_theta",
+            "name": "chi_phi",
             "schema": null
           }
         }
@@ -454,14 +515,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_nu;1",
+        "@id": "dtmi:example:chi_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_mu",
+          "name": "chi_yuzz",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nu_lambda",
+            "name": "chi_omega",
             "schema": null
           }
         }
@@ -476,13 +537,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_pi;1",
+        "@id": "dtmi:example:chi_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_omicron",
+          "name": "chi_humpf",
           "response": {
-            "name": "nu_xi",
+            "name": "chi_um",
             "schema": true
           }
         }
@@ -497,14 +558,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_tau;1",
+        "@id": "dtmi:example:chi_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_sigma",
+          "name": "chi_nuh",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nu_rho",
+            "name": "chi_glikk",
             "schema": true
           }
         }
@@ -519,13 +580,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_chi;1",
+        "@id": "dtmi:example:chi_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_phi",
+          "name": "chi_thnad",
           "response": {
-            "name": "nu_upsilon",
+            "name": "chi_quan",
             "schema": 626
           }
         }
@@ -540,14 +601,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_yuzz;1",
+        "@id": "dtmi:example:chi_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_omega",
+          "name": "chi_zatz",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nu_psi",
+            "name": "chi_floob",
             "schema": 626
           }
         }
@@ -562,13 +623,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_humpf;1",
+        "@id": "dtmi:example:chi_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_um",
+          "name": "chi_itch",
           "response": {
-            "name": "nu_wum",
+            "name": "chi_flunn",
             "schema": [
               null
             ]
@@ -585,14 +646,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_nuh;1",
+        "@id": "dtmi:example:psi_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_glikk",
+          "name": "chi_hi",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nu_fuddle",
+            "name": "chi_vroo",
             "schema": [
               null
             ]
@@ -609,13 +670,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_thnad;1",
+        "@id": "dtmi:example:psi_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_quan",
+          "name": "psi_gamma",
           "response": {
-            "name": "nu_snee",
+            "name": "psi_beta",
             "schema": [
               true
             ]
@@ -632,14 +693,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_zatz;1",
+        "@id": "dtmi:example:psi_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_floob",
+          "name": "psi_zeta",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nu_spazz",
+            "name": "psi_epsilon",
             "schema": [
               true
             ]
@@ -656,13 +717,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_itch;1",
+        "@id": "dtmi:example:psi_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_flunn",
+          "name": "psi_iota",
           "response": {
-            "name": "nu_jogg",
+            "name": "psi_theta",
             "schema": [
               626
             ]
@@ -679,14 +740,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_hi;1",
+        "@id": "dtmi:example:psi_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "nu_vroo",
+          "name": "psi_mu",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nu_yekk",
+            "name": "psi_lambda",
             "schema": [
               626
             ]
@@ -703,13 +764,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_gamma;1",
+        "@id": "dtmi:example:psi_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "xi_beta",
+          "name": "psi_omicron",
           "response": {
-            "name": "xi_alpha",
+            "name": "psi_xi",
             "schema": {}
           }
         }
@@ -724,14 +785,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_zeta;1",
+        "@id": "dtmi:example:psi_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "xi_epsilon",
+          "name": "psi_sigma",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "xi_delta",
+            "name": "psi_rho",
             "schema": {}
           }
         }
@@ -746,13 +807,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_iota;1",
+        "@id": "dtmi:example:psi_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "xi_theta",
+          "name": "psi_phi",
           "response": {
-            "name": "xi_eta",
+            "name": "psi_upsilon",
             "schema": [
               {}
             ]
@@ -769,14 +830,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_mu;1",
+        "@id": "dtmi:example:psi_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "xi_lambda",
+          "name": "psi_omega",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "xi_kappa",
+            "name": "psi_psi",
             "schema": [
               {}
             ]
@@ -793,13 +854,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_omicron;1",
+        "@id": "dtmi:example:psi_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "xi_xi",
+          "name": "psi_um",
           "response": {
-            "name": "xi_nu",
+            "name": "psi_wum",
             "schema": []
           }
         }
@@ -814,14 +875,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_sigma;1",
+        "@id": "dtmi:example:psi_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "xi_rho",
+          "name": "psi_glikk",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "xi_pi",
+            "name": "psi_fuddle",
             "schema": []
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertySchemaTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertySchemaTermAndDtmiV3.json
index 04ddcb73..ffe4aba0 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertySchemaTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertySchemaTermAndDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_pi;1",
+        "@id": "dtmi:example:um_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_omicron",
+          "name": "um_humpf",
           "response": {
-            "name": "sigma_xi",
-            "schema": "time",
-            "dtmi:dtdl:property:schema;3": "boolean"
+            "name": "um_um",
+            "schema": "date",
+            "dtmi:dtdl:property:schema;3": "dateTime"
           }
         }
       }
@@ -29,16 +29,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_tau;1",
+        "@id": "dtmi:example:um_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "sigma_sigma",
+          "name": "um_nuh",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "sigma_rho",
-            "schema": "date",
-            "dtmi:dtdl:property:schema;3": "dateTime"
+            "name": "um_glikk",
+            "schema": "double",
+            "dtmi:dtdl:property:schema;3": "duration"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertySchemaTypeConformanceV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertySchemaTypeConformanceV3.json
index 1af157ca..edba40f1 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponsePropertySchemaTypeConformanceV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponsePropertySchemaTypeConformanceV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_glikk;1",
+        "@id": "dtmi:example:psi_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "xi_fuddle",
+          "name": "psi_vroo",
           "response": {
-            "name": "xi_humpf",
+            "name": "psi_yekk",
             "schema": {
-              "@id": "dtmi:example:xi_um;1",
-              "elementSchema": "dateTime",
+              "@id": "dtmi:example:psi_itch;1",
+              "elementSchema": "duration",
               "@type": "Array"
             }
           }
@@ -32,16 +32,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_spazz;1",
+        "@id": "dtmi:example:omega_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "xi_thnad",
+          "name": "omega_delta",
           "response": {
-            "name": "xi_quan",
+            "name": "omega_gamma",
             "schema": {
-              "@id": "dtmi:example:xi_nuh;1",
-              "name": "xi_snee",
+              "@id": "dtmi:example:omega_alpha;1",
+              "name": "omega_beta",
               "@type": "Command"
             }
           }
@@ -57,17 +57,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_itch;1",
+        "@id": "dtmi:example:omega_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "xi_flunn",
+          "name": "omega_iota",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "xi_jogg",
+            "name": "omega_theta",
             "schema": {
-              "@id": "dtmi:example:xi_floob;1",
-              "name": "xi_zatz",
+              "@id": "dtmi:example:omega_zeta;1",
+              "name": "omega_eta",
               "@type": "Command"
             }
           }
@@ -83,17 +83,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_beta;1",
+        "@id": "dtmi:example:omega_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_alpha",
+          "name": "omega_xi",
           "response": {
-            "name": "xi_hi",
+            "name": "omega_nu",
             "schema": {
-              "@id": "dtmi:example:xi_yekk;1",
-              "name": "xi_vroo",
-              "schema": "double",
+              "@id": "dtmi:example:omega_lambda;1",
+              "name": "omega_mu",
+              "schema": "float",
               "@type": "CommandRequest"
             }
           }
@@ -109,18 +109,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_eta;1",
+        "@id": "dtmi:example:omega_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_zeta",
+          "name": "omega_tau",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omicron_epsilon",
+            "name": "omega_sigma",
             "schema": {
-              "@id": "dtmi:example:omicron_gamma;1",
-              "name": "omicron_delta",
-              "schema": "duration",
+              "@id": "dtmi:example:omega_pi;1",
+              "name": "omega_rho",
+              "schema": "integer",
               "@type": "CommandRequest"
             }
           }
@@ -136,17 +136,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_mu;1",
+        "@id": "dtmi:example:omega_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_lambda",
+          "name": "omega_omega",
           "response": {
-            "name": "omicron_kappa",
+            "name": "omega_psi",
             "schema": {
-              "@id": "dtmi:example:omicron_theta;1",
-              "name": "omicron_iota",
-              "schema": "float",
+              "@id": "dtmi:example:omega_phi;1",
+              "name": "omega_chi",
+              "schema": "long",
               "@type": "CommandResponse"
             }
           }
@@ -162,18 +162,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_rho;1",
+        "@id": "dtmi:example:omega_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_pi",
+          "name": "omega_fuddle",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omicron_omicron",
+            "name": "omega_humpf",
             "schema": {
-              "@id": "dtmi:example:omicron_nu;1",
-              "name": "omicron_xi",
-              "schema": "integer",
+              "@id": "dtmi:example:omega_wum;1",
+              "name": "omega_um",
+              "schema": "string",
               "@type": "CommandResponse"
             }
           }
@@ -189,18 +189,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_psi;1",
+        "@id": "dtmi:example:omega_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_chi",
+          "name": "omega_spazz",
           "response": {
-            "name": "omicron_phi",
+            "name": "omega_thnad",
             "schema": {
-              "@id": "dtmi:example:omicron_sigma;1",
-              "name": "omicron_tau",
+              "@id": "dtmi:example:omega_nuh;1",
+              "name": "omega_snee",
               "schema": {
-                "@id": "dtmi:example:omicron_upsilon;1",
+                "@id": "dtmi:example:omega_quan;1",
                 "@type": "Interface"
               },
               "@type": "Component"
@@ -218,19 +218,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_fuddle;1",
+        "@id": "dtmi:example:omega_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_humpf",
+          "name": "omega_yekk",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omicron_um",
+            "name": "omega_itch",
             "schema": {
-              "@id": "dtmi:example:omicron_omega;1",
-              "name": "omicron_yuzz",
+              "@id": "dtmi:example:omega_zatz;1",
+              "name": "omega_jogg",
               "schema": {
-                "@id": "dtmi:example:omicron_wum;1",
+                "@id": "dtmi:example:omega_flunn;1",
                 "@type": "Interface"
               },
               "@type": "Component"
@@ -248,15 +248,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_quan;1",
+        "@id": "dtmi:example:yuzz_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_snee",
+          "name": "yuzz_beta",
           "response": {
-            "name": "omicron_nuh",
+            "name": "yuzz_alpha",
             "schema": {
-              "@id": "dtmi:example:omicron_glikk;1",
+              "@id": "dtmi:example:omega_hi;1",
               "valueSchema": "integer",
               "@type": "Enum"
             }
@@ -273,17 +273,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_jogg;1",
+        "@id": "dtmi:example:yuzz_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_zatz",
+          "name": "yuzz_eta",
           "response": {
-            "name": "omicron_floob",
+            "name": "yuzz_zeta",
             "schema": {
-              "@id": "dtmi:example:omicron_thnad;1",
-              "enumValue": 1115,
-              "name": "omicron_spazz",
+              "@id": "dtmi:example:yuzz_delta;1",
+              "enumValue": 1128,
+              "name": "yuzz_epsilon",
               "@type": "EnumValue"
             }
           }
@@ -299,18 +299,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_hi;1",
+        "@id": "dtmi:example:yuzz_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "omicron_vroo",
+          "name": "yuzz_mu",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omicron_yekk",
+            "name": "yuzz_lambda",
             "schema": {
-              "@id": "dtmi:example:omicron_flunn;1",
-              "enumValue": 1116,
-              "name": "omicron_itch",
+              "@id": "dtmi:example:yuzz_iota;1",
+              "enumValue": 1129,
+              "name": "yuzz_kappa",
               "@type": "EnumValue"
             }
           }
@@ -326,17 +326,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_epsilon;1",
+        "@id": "dtmi:example:yuzz_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_delta",
+          "name": "yuzz_rho",
           "response": {
-            "name": "pi_gamma",
+            "name": "yuzz_pi",
             "schema": {
-              "@id": "dtmi:example:pi_alpha;1",
-              "name": "pi_beta",
-              "schema": "long",
+              "@id": "dtmi:example:yuzz_xi;1",
+              "name": "yuzz_omicron",
+              "schema": "time",
               "@type": "Field"
             }
           }
@@ -352,18 +352,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_kappa;1",
+        "@id": "dtmi:example:yuzz_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_iota",
+          "name": "yuzz_chi",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "pi_theta",
+            "name": "yuzz_phi",
             "schema": {
-              "@id": "dtmi:example:pi_zeta;1",
-              "name": "pi_eta",
-              "schema": "string",
+              "@id": "dtmi:example:yuzz_tau;1",
+              "name": "yuzz_upsilon",
+              "schema": "boolean",
               "@type": "Field"
             }
           }
@@ -379,15 +379,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_xi;1",
+        "@id": "dtmi:example:yuzz_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_nu",
+          "name": "yuzz_wum",
           "response": {
-            "name": "pi_mu",
+            "name": "yuzz_yuzz",
             "schema": {
-              "@id": "dtmi:example:pi_lambda;1",
+              "@id": "dtmi:example:yuzz_omega;1",
               "@type": "Interface"
             }
           }
@@ -403,16 +403,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_sigma;1",
+        "@id": "dtmi:example:yuzz_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_rho",
+          "name": "yuzz_glikk",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "pi_pi",
+            "name": "yuzz_fuddle",
             "schema": {
-              "@id": "dtmi:example:pi_omicron;1",
+              "@id": "dtmi:example:yuzz_humpf;1",
               "@type": "Interface"
             }
           }
@@ -428,22 +428,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_omega;1",
+        "@id": "dtmi:example:yuzz_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_psi",
+          "name": "yuzz_floob",
           "response": {
-            "name": "pi_chi",
+            "name": "yuzz_spazz",
             "schema": {
-              "@id": "dtmi:example:pi_tau;1",
+              "@id": "dtmi:example:yuzz_snee;1",
               "mapKey": {
-                "name": "pi_upsilon",
+                "name": "yuzz_quan",
                 "schema": "string"
               },
               "mapValue": {
-                "name": "pi_phi",
-                "schema": "time"
+                "name": "yuzz_thnad",
+                "schema": "date"
               },
               "@type": "Map"
             }
@@ -460,16 +460,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_fuddle;1",
+        "@id": "dtmi:example:yuzz_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_humpf",
+          "name": "yuzz_yekk",
           "response": {
-            "name": "pi_um",
+            "name": "yuzz_itch",
             "schema": {
-              "@id": "dtmi:example:pi_yuzz;1",
-              "name": "pi_wum",
+              "@id": "dtmi:example:yuzz_jogg;1",
+              "name": "yuzz_flunn",
               "schema": "string",
               "@type": "MapKey"
             }
@@ -486,17 +486,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_thnad;1",
+        "@id": "dtmi:example:wum_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_quan",
+          "name": "wum_gamma",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "pi_snee",
+            "name": "wum_beta",
             "schema": {
-              "@id": "dtmi:example:pi_glikk;1",
-              "name": "pi_nuh",
+              "@id": "dtmi:example:yuzz_hi;1",
+              "name": "wum_alpha",
               "schema": "string",
               "@type": "MapKey"
             }
@@ -513,17 +513,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_flunn;1",
+        "@id": "dtmi:example:wum_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_jogg",
+          "name": "wum_theta",
           "response": {
-            "name": "pi_zatz",
+            "name": "wum_eta",
             "schema": {
-              "@id": "dtmi:example:pi_spazz;1",
-              "name": "pi_floob",
-              "schema": "boolean",
+              "@id": "dtmi:example:wum_epsilon;1",
+              "name": "wum_zeta",
+              "schema": "dateTime",
               "@type": "MapValue"
             }
           }
@@ -539,18 +539,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_alpha;1",
+        "@id": "dtmi:example:wum_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "pi_hi",
+          "name": "wum_nu",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "pi_vroo",
+            "name": "wum_mu",
             "schema": {
-              "@id": "dtmi:example:pi_itch;1",
-              "name": "pi_yekk",
-              "schema": "date",
+              "@id": "dtmi:example:wum_kappa;1",
+              "name": "wum_lambda",
+              "schema": "double",
               "@type": "MapValue"
             }
           }
@@ -566,15 +566,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_epsilon;1",
+        "@id": "dtmi:example:wum_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_delta",
+          "name": "wum_rho",
           "response": {
-            "name": "rho_gamma",
+            "name": "wum_pi",
             "schema": {
-              "@id": "dtmi:example:rho_beta;1",
+              "@id": "dtmi:example:wum_omicron;1",
               "@type": "Object"
             }
           }
@@ -590,17 +590,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_kappa;1",
+        "@id": "dtmi:example:wum_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_iota",
+          "name": "wum_chi",
           "response": {
-            "name": "rho_theta",
+            "name": "wum_phi",
             "schema": {
-              "@id": "dtmi:example:rho_zeta;1",
-              "name": "rho_eta",
-              "schema": "dateTime",
+              "@id": "dtmi:example:wum_tau;1",
+              "name": "wum_upsilon",
+              "schema": "duration",
               "@type": "Property"
             }
           }
@@ -616,18 +616,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_omicron;1",
+        "@id": "dtmi:example:wum_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_xi",
+          "name": "wum_um",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "rho_nu",
+            "name": "wum_wum",
             "schema": {
-              "@id": "dtmi:example:rho_lambda;1",
-              "name": "rho_mu",
-              "schema": "double",
+              "@id": "dtmi:example:wum_omega;1",
+              "name": "wum_yuzz",
+              "schema": "float",
               "@type": "Property"
             }
           }
@@ -643,16 +643,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_upsilon;1",
+        "@id": "dtmi:example:wum_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_tau",
+          "name": "wum_snee",
           "response": {
-            "name": "rho_sigma",
+            "name": "wum_nuh",
             "schema": {
-              "@id": "dtmi:example:rho_pi;1",
-              "name": "rho_rho",
+              "@id": "dtmi:example:wum_fuddle;1",
+              "name": "wum_glikk",
               "@type": "Relationship"
             }
           }
@@ -668,17 +668,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_yuzz;1",
+        "@id": "dtmi:example:wum_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_omega",
+          "name": "wum_zatz",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "rho_psi",
+            "name": "wum_floob",
             "schema": {
-              "@id": "dtmi:example:rho_phi;1",
-              "name": "rho_chi",
+              "@id": "dtmi:example:wum_thnad;1",
+              "name": "wum_spazz",
               "@type": "Relationship"
             }
           }
@@ -694,17 +694,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_glikk;1",
+        "@id": "dtmi:example:wum_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_fuddle",
+          "name": "wum_vroo",
           "response": {
-            "name": "rho_humpf",
+            "name": "wum_yekk",
             "schema": {
-              "@id": "dtmi:example:rho_wum;1",
-              "name": "rho_um",
-              "schema": "duration",
+              "@id": "dtmi:example:wum_flunn;1",
+              "name": "wum_itch",
+              "schema": "integer",
               "@type": "Telemetry"
             }
           }
@@ -720,18 +720,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_spazz;1",
+        "@id": "dtmi:example:um_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "rho_thnad",
+          "name": "um_delta",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "rho_quan",
+            "name": "um_gamma",
             "schema": {
-              "@id": "dtmi:example:rho_nuh;1",
-              "name": "rho_snee",
-              "schema": "float",
+              "@id": "dtmi:example:um_alpha;1",
+              "name": "um_beta",
+              "schema": "long",
               "@type": "Telemetry"
             }
           }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponseRequiredPropertiesV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponseRequiredPropertiesV3.json
index 89be850e..71a70c59 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponseRequiredPropertiesV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponseRequiredPropertiesV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_vroo;1",
+        "@id": "dtmi:example:sigma_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_yekk",
+          "name": "sigma_alpha",
           "response": {
             "schema": "integer"
           }
@@ -27,11 +27,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_alpha;1",
+        "@id": "dtmi:example:sigma_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "theta_hi",
+          "name": "sigma_gamma",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "schema": "long"
@@ -48,13 +48,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_delta;1",
+        "@id": "dtmi:example:sigma_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_gamma",
+          "name": "sigma_zeta",
           "response": {
-            "name": "iota_beta"
+            "name": "sigma_epsilon"
           }
         }
       }
@@ -68,14 +68,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_eta;1",
+        "@id": "dtmi:example:sigma_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "iota_zeta",
+          "name": "sigma_iota",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "iota_epsilon"
+            "name": "sigma_theta"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponseTypeIncludesInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponseTypeIncludesInvalidDtmiV3.json
index a0ca2a54..19508a5a 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponseTypeIncludesInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponseTypeIncludesInvalidDtmiV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_yuzz;1",
+        "@id": "dtmi:example:snee_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_omega",
+          "name": "snee_beta",
           "response": {
             "@type": [
               "CommandResponse",
               "dtmi:foo//bar"
             ],
-            "name": "chi_psi",
-            "schema": "integer"
+            "name": "snee_alpha",
+            "schema": "boolean"
           }
         }
       }
@@ -32,19 +32,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_humpf;1",
+        "@id": "dtmi:example:snee_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_um",
+          "name": "snee_epsilon",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": [
               "CommandResponse",
               "dtmi:foo//bar"
             ],
-            "name": "chi_wum",
-            "schema": "long"
+            "name": "snee_delta",
+            "schema": "date"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponseTypeIncludesMaterialV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponseTypeIncludesMaterialV3.json
index 90031983..3f9fca49 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponseTypeIncludesMaterialV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponseTypeIncludesMaterialV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_rho;1",
+        "@id": "dtmi:example:glikk_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_pi",
+          "name": "glikk_zatz",
           "response": {
-            "name": "phi_omicron",
-            "schema": "time",
+            "name": "glikk_floob",
+            "schema": "double",
             "@type": "CommandResponse"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_upsilon;1",
+        "@id": "dtmi:example:glikk_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_tau",
+          "name": "glikk_itch",
           "response": {
-            "name": "phi_sigma",
-            "schema": "boolean",
+            "name": "glikk_flunn",
+            "schema": "duration",
             "@type": [
               "CommandResponse"
             ]
@@ -53,14 +53,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_psi;1",
+        "@id": "dtmi:example:nuh_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_chi",
+          "name": "glikk_hi",
           "response": {
-            "name": "phi_phi",
-            "schema": "date",
+            "name": "glikk_vroo",
+            "schema": "float",
             "@type": "dtmi:dtdl:class:CommandResponse;3"
           }
         }
@@ -75,14 +75,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_wum;1",
+        "@id": "dtmi:example:nuh_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_yuzz",
+          "name": "nuh_gamma",
           "response": {
-            "name": "phi_omega",
-            "schema": "dateTime",
+            "name": "nuh_beta",
+            "schema": "integer",
             "@type": [
               "dtmi:dtdl:class:CommandResponse;3"
             ]
@@ -99,14 +99,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_fuddle;1",
+        "@id": "dtmi:example:nuh_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_humpf",
+          "name": "nuh_zeta",
           "response": {
-            "name": "phi_um",
-            "schema": "double",
+            "name": "nuh_epsilon",
+            "schema": "long",
             "@type": "Something"
           }
         }
@@ -121,15 +121,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_snee;1",
+        "@id": "dtmi:example:nuh_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_nuh",
+          "name": "nuh_iota",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "phi_glikk",
-            "schema": "duration",
+            "name": "nuh_theta",
+            "schema": "string",
             "@type": "Something"
           }
         }
@@ -144,14 +144,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_spazz;1",
+        "@id": "dtmi:example:nuh_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_thnad",
+          "name": "nuh_mu",
           "response": {
-            "name": "phi_quan",
-            "schema": "float",
+            "name": "nuh_lambda",
+            "schema": "time",
             "@type": [
               "Something"
             ]
@@ -168,15 +168,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_jogg;1",
+        "@id": "dtmi:example:nuh_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_zatz",
+          "name": "nuh_omicron",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "phi_floob",
-            "schema": "integer",
+            "name": "nuh_xi",
+            "schema": "boolean",
             "@type": [
               "Something"
             ]
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponseTypeIncludesNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponseTypeIncludesNotDtmiNorTermV3.json
index 153599e3..cc35bdfd 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponseTypeIncludesNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponseTypeIncludesNotDtmiNorTermV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_nuh;1",
+        "@id": "dtmi:example:snee_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_glikk",
+          "name": "snee_theta",
           "response": {
             "@type": [
               "CommandResponse",
               "http://foo.com/bar"
             ],
-            "name": "chi_fuddle",
-            "schema": "string"
+            "name": "snee_eta",
+            "schema": "dateTime"
           }
         }
       }
@@ -32,19 +32,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_thnad;1",
+        "@id": "dtmi:example:snee_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "chi_quan",
+          "name": "snee_lambda",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": [
               "CommandResponse",
               "http://foo.com/bar"
             ],
-            "name": "chi_snee",
-            "schema": "time"
+            "name": "snee_kappa",
+            "schema": "double"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassCommandResponseTypeStringOrArrayV3.json b/DTDL/v3/spec/Requirement-ClassCommandResponseTypeStringOrArrayV3.json
index 1c4a9b48..7f759c1c 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandResponseTypeStringOrArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandResponseTypeStringOrArrayV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_mu;1",
+        "@id": "dtmi:example:fuddle_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_lambda",
+          "name": "fuddle_snee",
           "response": {
-            "name": "upsilon_kappa",
-            "schema": "double",
+            "name": "fuddle_nuh",
+            "schema": "long",
             "@type": 626
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_omicron;1",
+        "@id": "dtmi:example:fuddle_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_xi",
+          "name": "fuddle_spazz",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "upsilon_nu",
-            "schema": "duration",
+            "name": "fuddle_thnad",
+            "schema": "string",
             "@type": 626
           }
         }
@@ -52,14 +52,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_sigma;1",
+        "@id": "dtmi:example:fuddle_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_rho",
+          "name": "fuddle_jogg",
           "response": {
-            "name": "upsilon_pi",
-            "schema": "float",
+            "name": "fuddle_zatz",
+            "schema": "time",
             "@type": null
           }
         }
@@ -74,15 +74,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_phi;1",
+        "@id": "dtmi:example:fuddle_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_upsilon",
+          "name": "fuddle_yekk",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "upsilon_tau",
-            "schema": "integer",
+            "name": "fuddle_itch",
+            "schema": "boolean",
             "@type": null
           }
         }
@@ -97,14 +97,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_omega;1",
+        "@id": "dtmi:example:glikk_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_psi",
+          "name": "glikk_alpha",
           "response": {
-            "name": "upsilon_chi",
-            "schema": "long",
+            "name": "fuddle_hi",
+            "schema": "date",
             "@type": true
           }
         }
@@ -119,15 +119,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_um;1",
+        "@id": "dtmi:example:glikk_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_wum",
+          "name": "glikk_delta",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "upsilon_yuzz",
-            "schema": "string",
+            "name": "glikk_gamma",
+            "schema": "dateTime",
             "@type": true
           }
         }
@@ -142,14 +142,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_glikk;1",
+        "@id": "dtmi:example:glikk_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_fuddle",
+          "name": "glikk_eta",
           "response": {
-            "name": "upsilon_humpf",
-            "schema": "time",
+            "name": "glikk_zeta",
+            "schema": "double",
             "@type": {}
           }
         }
@@ -164,15 +164,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_quan;1",
+        "@id": "dtmi:example:glikk_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_snee",
+          "name": "glikk_kappa",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "upsilon_nuh",
-            "schema": "boolean",
+            "name": "glikk_iota",
+            "schema": "duration",
             "@type": {}
           }
         }
@@ -187,14 +187,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_floob;1",
+        "@id": "dtmi:example:glikk_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_spazz",
+          "name": "glikk_nu",
           "response": {
-            "name": "upsilon_thnad",
-            "schema": "date",
+            "name": "glikk_mu",
+            "schema": "float",
             "@type": [
               626
             ]
@@ -211,15 +211,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_flunn;1",
+        "@id": "dtmi:example:glikk_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_jogg",
+          "name": "glikk_pi",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "upsilon_zatz",
-            "schema": "dateTime",
+            "name": "glikk_omicron",
+            "schema": "integer",
             "@type": [
               626
             ]
@@ -236,14 +236,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_vroo;1",
+        "@id": "dtmi:example:glikk_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "upsilon_yekk",
+          "name": "glikk_tau",
           "response": {
-            "name": "upsilon_itch",
-            "schema": "double",
+            "name": "glikk_sigma",
+            "schema": "long",
             "@type": [
               null
             ]
@@ -260,15 +260,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_beta;1",
+        "@id": "dtmi:example:glikk_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_alpha",
+          "name": "glikk_chi",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "upsilon_hi",
-            "schema": "duration",
+            "name": "glikk_phi",
+            "schema": "string",
             "@type": [
               null
             ]
@@ -285,14 +285,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_epsilon;1",
+        "@id": "dtmi:example:glikk_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_delta",
+          "name": "glikk_yuzz",
           "response": {
-            "name": "phi_gamma",
-            "schema": "float",
+            "name": "glikk_omega",
+            "schema": "time",
             "@type": [
               true
             ]
@@ -309,15 +309,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_theta;1",
+        "@id": "dtmi:example:glikk_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_eta",
+          "name": "glikk_humpf",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "phi_zeta",
-            "schema": "integer",
+            "name": "glikk_um",
+            "schema": "boolean",
             "@type": [
               true
             ]
@@ -334,14 +334,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_lambda;1",
+        "@id": "dtmi:example:glikk_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_kappa",
+          "name": "glikk_nuh",
           "response": {
-            "name": "phi_iota",
-            "schema": "long",
+            "name": "glikk_glikk",
+            "schema": "date",
             "@type": [
               {}
             ]
@@ -358,15 +358,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_xi;1",
+        "@id": "dtmi:example:glikk_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Command",
-          "name": "phi_nu",
+          "name": "glikk_thnad",
           "response": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "phi_mu",
-            "schema": "string",
+            "name": "glikk_quan",
+            "schema": "dateTime",
             "@type": [
               {}
             ]
diff --git a/DTDL/v3/spec/Requirement-ClassCommandTypeIncludesInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassCommandTypeIncludesInvalidDtmiV3.json
index a37f656b..3860dace 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandTypeIncludesInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandTypeIncludesInvalidDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_glikk;1",
+        "@id": "dtmi:example:zeta_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Command",
             "dtmi:foo//bar"
           ],
-          "name": "yekk_fuddle"
+          "name": "zeta_nuh"
         }
       }
     ]
@@ -27,7 +27,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_snee;1",
+        "@id": "dtmi:example:zeta_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -35,7 +35,7 @@
             "Command",
             "dtmi:foo//bar"
           ],
-          "name": "yekk_nuh"
+          "name": "zeta_quan"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassCommandTypeIncludesMaterialV3.json b/DTDL/v3/spec/Requirement-ClassCommandTypeIncludesMaterialV3.json
index dc083cde..043ab27a 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandTypeIncludesMaterialV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandTypeIncludesMaterialV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_flunn;1",
+        "@id": "dtmi:example:epsilon_yekk;1",
         "@type": "Interface",
         "contents": {
-          "name": "itch_jogg",
+          "name": "epsilon_itch",
           "@type": "Command"
         }
       }
@@ -24,10 +24,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_yekk;1",
+        "@id": "dtmi:example:epsilon_hi;1",
         "@type": "Interface",
         "contents": {
-          "name": "itch_itch",
+          "name": "epsilon_vroo",
           "@type": [
             "Command"
           ]
@@ -43,10 +43,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_hi;1",
+        "@id": "dtmi:example:zeta_beta;1",
         "@type": "Interface",
         "contents": {
-          "name": "itch_vroo",
+          "name": "zeta_alpha",
           "@type": "dtmi:dtdl:class:Command;3"
         }
       }
@@ -60,10 +60,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_beta;1",
+        "@id": "dtmi:example:zeta_delta;1",
         "@type": "Interface",
         "contents": {
-          "name": "yekk_alpha",
+          "name": "zeta_gamma",
           "@type": [
             "dtmi:dtdl:class:Command;3"
           ]
@@ -79,10 +79,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_delta;1",
+        "@id": "dtmi:example:zeta_zeta;1",
         "@type": "Interface",
         "contents": {
-          "name": "yekk_gamma",
+          "name": "zeta_epsilon",
           "@type": "Something"
         }
       }
@@ -96,11 +96,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_zeta;1",
+        "@id": "dtmi:example:zeta_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "yekk_epsilon",
+          "name": "zeta_eta",
           "@type": "Something"
         }
       }
@@ -114,10 +114,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_theta;1",
+        "@id": "dtmi:example:zeta_kappa;1",
         "@type": "Interface",
         "contents": {
-          "name": "yekk_eta",
+          "name": "zeta_iota",
           "@type": [
             "Something"
           ]
@@ -133,11 +133,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_kappa;1",
+        "@id": "dtmi:example:zeta_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "yekk_iota",
+          "name": "zeta_lambda",
           "@type": [
             "Something"
           ]
diff --git a/DTDL/v3/spec/Requirement-ClassCommandTypeIncludesNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassCommandTypeIncludesNotDtmiNorTermV3.json
index 79034f8b..6ab6c738 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandTypeIncludesNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandTypeIncludesNotDtmiNorTermV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_thnad;1",
+        "@id": "dtmi:example:zeta_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Command",
             "http://foo.com/bar"
           ],
-          "name": "yekk_quan"
+          "name": "zeta_spazz"
         }
       }
     ]
@@ -27,7 +27,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_floob;1",
+        "@id": "dtmi:example:zeta_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -35,7 +35,7 @@
             "Command",
             "http://foo.com/bar"
           ],
-          "name": "yekk_spazz"
+          "name": "zeta_zatz"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassCommandTypeStringOrArrayV3.json b/DTDL/v3/spec/Requirement-ClassCommandTypeStringOrArrayV3.json
index 0029b72f..ca7dd60c 100644
--- a/DTDL/v3/spec/Requirement-ClassCommandTypeStringOrArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassCommandTypeStringOrArrayV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_eta;1",
+        "@id": "dtmi:example:epsilon_iota;1",
         "@type": "Interface",
         "contents": {
-          "name": "itch_zeta",
+          "name": "epsilon_theta",
           "@type": 626
         }
       }
@@ -24,11 +24,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_iota;1",
+        "@id": "dtmi:example:epsilon_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "itch_theta",
+          "name": "epsilon_kappa",
           "@type": 626
         }
       }
@@ -42,10 +42,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_lambda;1",
+        "@id": "dtmi:example:epsilon_nu;1",
         "@type": "Interface",
         "contents": {
-          "name": "itch_kappa",
+          "name": "epsilon_mu",
           "@type": null
         }
       }
@@ -59,11 +59,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_nu;1",
+        "@id": "dtmi:example:epsilon_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "itch_mu",
+          "name": "epsilon_xi",
           "@type": null
         }
       }
@@ -77,10 +77,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_omicron;1",
+        "@id": "dtmi:example:epsilon_rho;1",
         "@type": "Interface",
         "contents": {
-          "name": "itch_xi",
+          "name": "epsilon_pi",
           "@type": true
         }
       }
@@ -94,11 +94,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_rho;1",
+        "@id": "dtmi:example:epsilon_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "itch_pi",
+          "name": "epsilon_sigma",
           "@type": true
         }
       }
@@ -112,10 +112,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_tau;1",
+        "@id": "dtmi:example:epsilon_phi;1",
         "@type": "Interface",
         "contents": {
-          "name": "itch_sigma",
+          "name": "epsilon_upsilon",
           "@type": {}
         }
       }
@@ -129,11 +129,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_phi;1",
+        "@id": "dtmi:example:epsilon_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "itch_upsilon",
+          "name": "epsilon_chi",
           "@type": {}
         }
       }
@@ -147,10 +147,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_psi;1",
+        "@id": "dtmi:example:epsilon_yuzz;1",
         "@type": "Interface",
         "contents": {
-          "name": "itch_chi",
+          "name": "epsilon_omega",
           "@type": [
             626
           ]
@@ -166,11 +166,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_yuzz;1",
+        "@id": "dtmi:example:epsilon_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "itch_omega",
+          "name": "epsilon_wum",
           "@type": [
             626
           ]
@@ -186,10 +186,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_um;1",
+        "@id": "dtmi:example:epsilon_fuddle;1",
         "@type": "Interface",
         "contents": {
-          "name": "itch_wum",
+          "name": "epsilon_humpf",
           "@type": [
             null
           ]
@@ -205,11 +205,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_fuddle;1",
+        "@id": "dtmi:example:epsilon_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "itch_humpf",
+          "name": "epsilon_glikk",
           "@type": [
             null
           ]
@@ -225,10 +225,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_nuh;1",
+        "@id": "dtmi:example:epsilon_quan;1",
         "@type": "Interface",
         "contents": {
-          "name": "itch_glikk",
+          "name": "epsilon_snee",
           "@type": [
             true
           ]
@@ -244,11 +244,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_quan;1",
+        "@id": "dtmi:example:epsilon_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "itch_snee",
+          "name": "epsilon_thnad",
           "@type": [
             true
           ]
@@ -264,10 +264,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_spazz;1",
+        "@id": "dtmi:example:epsilon_zatz;1",
         "@type": "Interface",
         "contents": {
-          "name": "itch_thnad",
+          "name": "epsilon_floob",
           "@type": [
             {}
           ]
@@ -283,11 +283,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_zatz;1",
+        "@id": "dtmi:example:epsilon_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "itch_floob",
+          "name": "epsilon_jogg",
           "@type": [
             {}
           ]
diff --git a/DTDL/v3/spec/Requirement-ClassComponentContextConformsV3.json b/DTDL/v3/spec/Requirement-ClassComponentContextConformsV3.json
index a92c46d7..68a13601 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentContextConformsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentContextConformsV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_zeta;1",
+        "@id": "dtmi:example:nu_spazz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:delta_epsilon;1",
+          "@id": "dtmi:example:nu_thnad;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "delta_gamma",
+            "name": "nu_snee",
             "schema": {
-              "@id": "dtmi:example:delta_delta;1",
+              "@id": "dtmi:example:nu_quan;1",
               "@type": "Interface"
             },
             "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
@@ -33,16 +33,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_kappa;1",
+        "@id": "dtmi:example:nu_flunn;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:delta_iota;1",
+          "@id": "dtmi:example:nu_jogg;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "delta_eta",
+            "name": "nu_floob",
             "schema": {
-              "@id": "dtmi:example:delta_theta;1",
+              "@id": "dtmi:example:nu_zatz;1",
               "@type": "Interface"
             },
             "@context": []
@@ -59,16 +59,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_xi;1",
+        "@id": "dtmi:example:nu_hi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:delta_nu;1",
+          "@id": "dtmi:example:nu_vroo;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "delta_lambda",
+            "name": "nu_itch",
             "schema": {
-              "@id": "dtmi:example:delta_mu;1",
+              "@id": "dtmi:example:nu_yekk;1",
               "@type": "Interface"
             },
             "@context": [
@@ -87,16 +87,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_sigma;1",
+        "@id": "dtmi:example:xi_delta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:delta_rho;1",
+          "@id": "dtmi:example:xi_gamma;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "delta_omicron",
+            "name": "xi_alpha",
             "schema": {
-              "@id": "dtmi:example:delta_pi;1",
+              "@id": "dtmi:example:xi_beta;1",
               "@type": "Interface"
             },
             "@context": null
@@ -113,16 +113,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_chi;1",
+        "@id": "dtmi:example:xi_theta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:delta_phi;1",
+          "@id": "dtmi:example:xi_eta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "delta_tau",
+            "name": "xi_epsilon",
             "schema": {
-              "@id": "dtmi:example:delta_upsilon;1",
+              "@id": "dtmi:example:xi_zeta;1",
               "@type": "Interface"
             },
             "@context": 626
@@ -139,16 +139,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_wum;1",
+        "@id": "dtmi:example:xi_mu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:delta_yuzz;1",
+          "@id": "dtmi:example:xi_lambda;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "delta_psi",
+            "name": "xi_iota",
             "schema": {
-              "@id": "dtmi:example:delta_omega;1",
+              "@id": "dtmi:example:xi_kappa;1",
               "@type": "Interface"
             },
             "@context": true
@@ -165,16 +165,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_glikk;1",
+        "@id": "dtmi:example:xi_pi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:delta_fuddle;1",
+          "@id": "dtmi:example:xi_omicron;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "delta_um",
+            "name": "xi_nu",
             "schema": {
-              "@id": "dtmi:example:delta_humpf;1",
+              "@id": "dtmi:example:xi_xi;1",
               "@type": "Interface"
             },
             "@context": [
@@ -193,16 +193,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_thnad;1",
+        "@id": "dtmi:example:xi_upsilon;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:delta_quan;1",
+          "@id": "dtmi:example:xi_tau;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "delta_nuh",
+            "name": "xi_rho",
             "schema": {
-              "@id": "dtmi:example:delta_snee;1",
+              "@id": "dtmi:example:xi_sigma;1",
               "@type": "Interface"
             },
             "@context": [
@@ -221,16 +221,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_jogg;1",
+        "@id": "dtmi:example:xi_omega;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:delta_zatz;1",
+          "@id": "dtmi:example:xi_psi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "delta_spazz",
+            "name": "xi_phi",
             "schema": {
-              "@id": "dtmi:example:delta_floob;1",
+              "@id": "dtmi:example:xi_chi;1",
               "@type": "Interface"
             },
             "@context": [
@@ -249,19 +249,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_vroo;1",
+        "@id": "dtmi:example:xi_humpf;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:delta_yekk;1",
+          "@id": "dtmi:example:xi_um;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "delta_flunn",
+            "name": "xi_yuzz",
             "schema": {
-              "@id": "dtmi:example:delta_itch;1",
+              "@id": "dtmi:example:xi_wum;1",
               "@type": "Interface"
             },
-            "@context": {}
+            "@context": "dtmi:dtdl:extension:quantitativeTypes"
           }
         }
       }
@@ -275,21 +275,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_gamma;1",
+        "@id": "dtmi:example:xi_snee;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:epsilon_beta;1",
+          "@id": "dtmi:example:xi_nuh;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "delta_hi",
+            "name": "xi_fuddle",
             "schema": {
-              "@id": "dtmi:example:epsilon_alpha;1",
+              "@id": "dtmi:example:xi_glikk;1",
               "@type": "Interface"
             },
-            "@context": [
-              {}
-            ]
+            "@context": "http://dtdl/extension/quantitativeTypes/1"
           }
         }
       }
@@ -303,19 +301,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_eta;1",
+        "@id": "dtmi:example:xi_floob;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:epsilon_zeta;1",
+          "@id": "dtmi:example:xi_spazz;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "epsilon_delta",
+            "name": "xi_quan",
             "schema": {
-              "@id": "dtmi:example:epsilon_epsilon;1",
+              "@id": "dtmi:example:xi_thnad;1",
               "@type": "Interface"
             },
-            "@context": "dtmi:dtdl:extension:quantitativeTypes"
+            "@context": "quantitativeTypes;1"
           }
         }
       }
@@ -329,19 +327,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_lambda;1",
+        "@id": "dtmi:example:xi_itch;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:epsilon_kappa;1",
+          "@id": "dtmi:example:xi_flunn;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "epsilon_theta",
+            "name": "xi_zatz",
             "schema": {
-              "@id": "dtmi:example:epsilon_iota;1",
+              "@id": "dtmi:example:xi_jogg;1",
               "@type": "Interface"
             },
-            "@context": "http://dtdl/extension/quantitativeTypes/1"
+            "@context": {}
           }
         }
       }
@@ -355,19 +353,79 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_omicron;1",
+        "@id": "dtmi:example:omicron_alpha;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:epsilon_xi;1",
+          "@id": "dtmi:example:xi_hi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "epsilon_mu",
+            "name": "xi_yekk",
             "schema": {
-              "@id": "dtmi:example:epsilon_nu;1",
+              "@id": "dtmi:example:xi_vroo;1",
               "@type": "Interface"
             },
-            "@context": "quantitativeTypes;1"
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:omicron_epsilon;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:omicron_delta;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "omicron_beta",
+            "schema": {
+              "@id": "dtmi:example:omicron_gamma;1",
+              "@type": "Interface"
+            },
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:omicron_iota;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:omicron_theta;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "omicron_zeta",
+            "schema": {
+              "@id": "dtmi:example:omicron_eta;1",
+              "@type": "Interface"
+            },
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassComponentIdDuplicateV3.json b/DTDL/v3/spec/Requirement-ClassComponentIdDuplicateV3.json
index 77e5622b..e2eeecb6 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentIdDuplicateV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentIdDuplicateV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_theta;1",
+        "@id": "dtmi:example:upsilon_beta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:kappa_theta;1",
+          "@id": "dtmi:example:upsilon_beta;1",
           "@type": "Interface",
           "contents": {
-            "@id": "dtmi:example:kappa_theta;1",
+            "@id": "dtmi:example:upsilon_beta;1",
             "@type": "Component",
-            "name": "kappa_iota",
+            "name": "upsilon_gamma",
             "schema": {
-              "@id": "dtmi:example:kappa_kappa;1",
+              "@id": "dtmi:example:upsilon_delta;1",
               "@type": "Interface"
             }
           }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_lambda;1",
+        "@id": "dtmi:example:upsilon_epsilon;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:kappa_lambda;1",
+          "@id": "dtmi:example:upsilon_epsilon;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "@id": "dtmi:example:kappa_lambda;1",
+            "@id": "dtmi:example:upsilon_epsilon;1",
             "@type": "Component",
-            "name": "kappa_mu",
+            "name": "upsilon_zeta",
             "schema": {
-              "@id": "dtmi:example:kappa_nu;1",
+              "@id": "dtmi:example:upsilon_eta;1",
               "@type": "Interface"
             }
           }
diff --git a/DTDL/v3/spec/Requirement-ClassComponentIdIsDtmiV3.json b/DTDL/v3/spec/Requirement-ClassComponentIdIsDtmiV3.json
index 33ee6cfe..3a479f61 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentIdIsDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentIdIsDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_sigma;1",
+        "@id": "dtmi:example:omicron_mu;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;7",
           "@type": "Component",
-          "name": "epsilon_pi",
+          "name": "omicron_kappa",
           "schema": {
-            "@id": "dtmi:example:epsilon_rho;1",
+            "@id": "dtmi:example:omicron_lambda;1",
             "@type": "Interface"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_phi;1",
+        "@id": "dtmi:example:omicron_omicron;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;108675309",
           "@type": "Component",
-          "name": "epsilon_tau",
+          "name": "omicron_nu",
           "schema": {
-            "@id": "dtmi:example:epsilon_upsilon;1",
+            "@id": "dtmi:example:omicron_xi;1",
             "@type": "Interface"
           }
         }
@@ -51,14 +51,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_omega;1",
+        "@id": "dtmi:example:omicron_sigma;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;999999999",
           "@type": "Component",
-          "name": "epsilon_chi",
+          "name": "omicron_pi",
           "schema": {
-            "@id": "dtmi:example:epsilon_psi;1",
+            "@id": "dtmi:example:omicron_rho;1",
             "@type": "Interface"
           }
         }
@@ -73,14 +73,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_um;1",
+        "@id": "dtmi:example:omicron_phi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo;1",
           "@type": "Component",
-          "name": "epsilon_yuzz",
+          "name": "omicron_tau",
           "schema": {
-            "@id": "dtmi:example:epsilon_wum;1",
+            "@id": "dtmi:example:omicron_upsilon;1",
             "@type": "Interface"
           }
         }
@@ -95,14 +95,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_glikk;1",
+        "@id": "dtmi:example:omicron_omega;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar",
           "@type": "Component",
-          "name": "epsilon_humpf",
+          "name": "omicron_chi",
           "schema": {
-            "@id": "dtmi:example:epsilon_fuddle;1",
+            "@id": "dtmi:example:omicron_psi;1",
             "@type": "Interface"
           }
         }
@@ -117,14 +117,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_quan;1",
+        "@id": "dtmi:example:omicron_um;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.14",
           "@type": "Component",
-          "name": "epsilon_nuh",
+          "name": "omicron_yuzz",
           "schema": {
-            "@id": "dtmi:example:epsilon_snee;1",
+            "@id": "dtmi:example:omicron_wum;1",
             "@type": "Interface"
           }
         }
@@ -139,14 +139,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_floob;1",
+        "@id": "dtmi:example:omicron_glikk;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.141592",
           "@type": "Component",
-          "name": "epsilon_thnad",
+          "name": "omicron_humpf",
           "schema": {
-            "@id": "dtmi:example:epsilon_spazz;1",
+            "@id": "dtmi:example:omicron_fuddle;1",
             "@type": "Interface"
           }
         }
@@ -161,14 +161,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_flunn;1",
+        "@id": "dtmi:example:omicron_quan;1",
         "@type": "Interface",
         "contents": {
           "@id": null,
           "@type": "Component",
-          "name": "epsilon_zatz",
+          "name": "omicron_nuh",
           "schema": {
-            "@id": "dtmi:example:epsilon_jogg;1",
+            "@id": "dtmi:example:omicron_snee;1",
             "@type": "Interface"
           }
         }
@@ -183,15 +183,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_vroo;1",
+        "@id": "dtmi:example:omicron_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": null,
           "@type": "Component",
-          "name": "epsilon_itch",
+          "name": "omicron_thnad",
           "schema": {
-            "@id": "dtmi:example:epsilon_yekk;1",
+            "@id": "dtmi:example:omicron_spazz;1",
             "@type": "Interface"
           }
         }
@@ -206,14 +206,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_beta;1",
+        "@id": "dtmi:example:omicron_flunn;1",
         "@type": "Interface",
         "contents": {
           "@id": 626,
           "@type": "Component",
-          "name": "epsilon_hi",
+          "name": "omicron_zatz",
           "schema": {
-            "@id": "dtmi:example:zeta_alpha;1",
+            "@id": "dtmi:example:omicron_jogg;1",
             "@type": "Interface"
           }
         }
@@ -228,15 +228,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_epsilon;1",
+        "@id": "dtmi:example:omicron_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": 626,
           "@type": "Component",
-          "name": "zeta_gamma",
+          "name": "omicron_itch",
           "schema": {
-            "@id": "dtmi:example:zeta_delta;1",
+            "@id": "dtmi:example:omicron_yekk;1",
             "@type": "Interface"
           }
         }
@@ -251,14 +251,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_theta;1",
+        "@id": "dtmi:example:pi_beta;1",
         "@type": "Interface",
         "contents": {
           "@id": true,
           "@type": "Component",
-          "name": "zeta_zeta",
+          "name": "omicron_hi",
           "schema": {
-            "@id": "dtmi:example:zeta_eta;1",
+            "@id": "dtmi:example:pi_alpha;1",
             "@type": "Interface"
           }
         }
@@ -273,15 +273,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_lambda;1",
+        "@id": "dtmi:example:pi_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": true,
           "@type": "Component",
-          "name": "zeta_iota",
+          "name": "pi_gamma",
           "schema": {
-            "@id": "dtmi:example:zeta_kappa;1",
+            "@id": "dtmi:example:pi_delta;1",
             "@type": "Interface"
           }
         }
@@ -296,16 +296,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_xi;1",
+        "@id": "dtmi:example:pi_theta;1",
         "@type": "Interface",
         "contents": {
           "@id": {
             "@value": "dtmi:apparently:valid:identifier;3"
           },
           "@type": "Component",
-          "name": "zeta_mu",
+          "name": "pi_zeta",
           "schema": {
-            "@id": "dtmi:example:zeta_nu;1",
+            "@id": "dtmi:example:pi_eta;1",
             "@type": "Interface"
           }
         }
@@ -320,7 +320,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_rho;1",
+        "@id": "dtmi:example:pi_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -328,9 +328,9 @@
             "@value": "dtmi:apparently:valid:identifier;3"
           },
           "@type": "Component",
-          "name": "zeta_omicron",
+          "name": "pi_iota",
           "schema": {
-            "@id": "dtmi:example:zeta_pi;1",
+            "@id": "dtmi:example:pi_kappa;1",
             "@type": "Interface"
           }
         }
@@ -345,14 +345,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_upsilon;1",
+        "@id": "dtmi:example:pi_xi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0",
           "@type": "Component",
-          "name": "zeta_sigma",
+          "name": "pi_mu",
           "schema": {
-            "@id": "dtmi:example:zeta_tau;1",
+            "@id": "dtmi:example:pi_nu;1",
             "@type": "Interface"
           }
         }
@@ -367,15 +367,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_psi;1",
+        "@id": "dtmi:example:pi_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0",
           "@type": "Component",
-          "name": "zeta_phi",
+          "name": "pi_omicron",
           "schema": {
-            "@id": "dtmi:example:zeta_chi;1",
+            "@id": "dtmi:example:pi_pi;1",
             "@type": "Interface"
           }
         }
@@ -390,14 +390,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_wum;1",
+        "@id": "dtmi:example:pi_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Component",
-          "name": "zeta_omega",
+          "name": "pi_sigma",
           "schema": {
-            "@id": "dtmi:example:zeta_yuzz;1",
+            "@id": "dtmi:example:pi_tau;1",
             "@type": "Interface"
           }
         }
@@ -412,15 +412,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_fuddle;1",
+        "@id": "dtmi:example:pi_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Component",
-          "name": "zeta_um",
+          "name": "pi_phi",
           "schema": {
-            "@id": "dtmi:example:zeta_humpf;1",
+            "@id": "dtmi:example:pi_chi;1",
             "@type": "Interface"
           }
         }
@@ -435,14 +435,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_snee;1",
+        "@id": "dtmi:example:pi_wum;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Component",
-          "name": "zeta_glikk",
+          "name": "pi_omega",
           "schema": {
-            "@id": "dtmi:example:zeta_nuh;1",
+            "@id": "dtmi:example:pi_yuzz;1",
             "@type": "Interface"
           }
         }
@@ -457,15 +457,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_spazz;1",
+        "@id": "dtmi:example:pi_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Component",
-          "name": "zeta_quan",
+          "name": "pi_um",
           "schema": {
-            "@id": "dtmi:example:zeta_thnad;1",
+            "@id": "dtmi:example:pi_humpf;1",
             "@type": "Interface"
           }
         }
@@ -480,14 +480,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_jogg;1",
+        "@id": "dtmi:example:pi_snee;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;1a",
           "@type": "Component",
-          "name": "zeta_floob",
+          "name": "pi_glikk",
           "schema": {
-            "@id": "dtmi:example:zeta_zatz;1",
+            "@id": "dtmi:example:pi_nuh;1",
             "@type": "Interface"
           }
         }
@@ -502,15 +502,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_yekk;1",
+        "@id": "dtmi:example:pi_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1a",
           "@type": "Component",
-          "name": "zeta_flunn",
+          "name": "pi_quan",
           "schema": {
-            "@id": "dtmi:example:zeta_itch;1",
+            "@id": "dtmi:example:pi_thnad;1",
             "@type": "Interface"
           }
         }
@@ -525,14 +525,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_alpha;1",
+        "@id": "dtmi:example:pi_jogg;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Component",
-          "name": "zeta_vroo",
+          "name": "pi_floob",
           "schema": {
-            "@id": "dtmi:example:zeta_hi;1",
+            "@id": "dtmi:example:pi_zatz;1",
             "@type": "Interface"
           }
         }
@@ -547,15 +547,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_delta;1",
+        "@id": "dtmi:example:pi_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Component",
-          "name": "eta_beta",
+          "name": "pi_flunn",
           "schema": {
-            "@id": "dtmi:example:eta_gamma;1",
+            "@id": "dtmi:example:pi_itch;1",
             "@type": "Interface"
           }
         }
@@ -570,14 +570,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_eta;1",
+        "@id": "dtmi:example:rho_alpha;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Component",
-          "name": "eta_epsilon",
+          "name": "pi_vroo",
           "schema": {
-            "@id": "dtmi:example:eta_zeta;1",
+            "@id": "dtmi:example:pi_hi;1",
             "@type": "Interface"
           }
         }
@@ -592,15 +592,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_kappa;1",
+        "@id": "dtmi:example:rho_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Component",
-          "name": "eta_theta",
+          "name": "rho_beta",
           "schema": {
-            "@id": "dtmi:example:eta_iota;1",
+            "@id": "dtmi:example:rho_gamma;1",
             "@type": "Interface"
           }
         }
@@ -615,14 +615,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_nu;1",
+        "@id": "dtmi:example:rho_eta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Component",
-          "name": "eta_lambda",
+          "name": "rho_epsilon",
           "schema": {
-            "@id": "dtmi:example:eta_mu;1",
+            "@id": "dtmi:example:rho_zeta;1",
             "@type": "Interface"
           }
         }
@@ -637,15 +637,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_pi;1",
+        "@id": "dtmi:example:rho_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Component",
-          "name": "eta_xi",
+          "name": "rho_theta",
           "schema": {
-            "@id": "dtmi:example:eta_omicron;1",
+            "@id": "dtmi:example:rho_iota;1",
             "@type": "Interface"
           }
         }
@@ -660,14 +660,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_tau;1",
+        "@id": "dtmi:example:rho_nu;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Component",
-          "name": "eta_rho",
+          "name": "rho_lambda",
           "schema": {
-            "@id": "dtmi:example:eta_sigma;1",
+            "@id": "dtmi:example:rho_mu;1",
             "@type": "Interface"
           }
         }
@@ -682,15 +682,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_chi;1",
+        "@id": "dtmi:example:rho_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Component",
-          "name": "eta_upsilon",
+          "name": "rho_xi",
           "schema": {
-            "@id": "dtmi:example:eta_phi;1",
+            "@id": "dtmi:example:rho_omicron;1",
             "@type": "Interface"
           }
         }
@@ -705,14 +705,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_yuzz;1",
+        "@id": "dtmi:example:rho_tau;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;01",
           "@type": "Component",
-          "name": "eta_psi",
+          "name": "rho_rho",
           "schema": {
-            "@id": "dtmi:example:eta_omega;1",
+            "@id": "dtmi:example:rho_sigma;1",
             "@type": "Interface"
           }
         }
@@ -727,15 +727,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_humpf;1",
+        "@id": "dtmi:example:rho_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;01",
           "@type": "Component",
-          "name": "eta_wum",
+          "name": "rho_upsilon",
           "schema": {
-            "@id": "dtmi:example:eta_um;1",
+            "@id": "dtmi:example:rho_phi;1",
             "@type": "Interface"
           }
         }
@@ -750,14 +750,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_nuh;1",
+        "@id": "dtmi:example:rho_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;",
           "@type": "Component",
-          "name": "eta_fuddle",
+          "name": "rho_psi",
           "schema": {
-            "@id": "dtmi:example:eta_glikk;1",
+            "@id": "dtmi:example:rho_omega;1",
             "@type": "Interface"
           }
         }
@@ -772,15 +772,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_thnad;1",
+        "@id": "dtmi:example:rho_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;",
           "@type": "Component",
-          "name": "eta_snee",
+          "name": "rho_wum",
           "schema": {
-            "@id": "dtmi:example:eta_quan;1",
+            "@id": "dtmi:example:rho_um;1",
             "@type": "Interface"
           }
         }
@@ -795,14 +795,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_zatz;1",
+        "@id": "dtmi:example:rho_nuh;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Component",
-          "name": "eta_spazz",
+          "name": "rho_fuddle",
           "schema": {
-            "@id": "dtmi:example:eta_floob;1",
+            "@id": "dtmi:example:rho_glikk;1",
             "@type": "Interface"
           }
         }
@@ -817,15 +817,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_itch;1",
+        "@id": "dtmi:example:rho_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Component",
-          "name": "eta_jogg",
+          "name": "rho_snee",
           "schema": {
-            "@id": "dtmi:example:eta_flunn;1",
+            "@id": "dtmi:example:rho_quan;1",
             "@type": "Interface"
           }
         }
@@ -840,14 +840,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_hi;1",
+        "@id": "dtmi:example:rho_zatz;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Component",
-          "name": "eta_yekk",
+          "name": "rho_spazz",
           "schema": {
-            "@id": "dtmi:example:eta_vroo;1",
+            "@id": "dtmi:example:rho_floob;1",
             "@type": "Interface"
           }
         }
@@ -862,15 +862,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_gamma;1",
+        "@id": "dtmi:example:rho_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Component",
-          "name": "theta_alpha",
+          "name": "rho_jogg",
           "schema": {
-            "@id": "dtmi:example:theta_beta;1",
+            "@id": "dtmi:example:rho_flunn;1",
             "@type": "Interface"
           }
         }
@@ -885,14 +885,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_zeta;1",
+        "@id": "dtmi:example:rho_hi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:1seg;1",
           "@type": "Component",
-          "name": "theta_delta",
+          "name": "rho_yekk",
           "schema": {
-            "@id": "dtmi:example:theta_epsilon;1",
+            "@id": "dtmi:example:rho_vroo;1",
             "@type": "Interface"
           }
         }
@@ -907,15 +907,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_iota;1",
+        "@id": "dtmi:example:sigma_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:1seg;1",
           "@type": "Component",
-          "name": "theta_eta",
+          "name": "sigma_alpha",
           "schema": {
-            "@id": "dtmi:example:theta_theta;1",
+            "@id": "dtmi:example:sigma_beta;1",
             "@type": "Interface"
           }
         }
@@ -930,14 +930,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_mu;1",
+        "@id": "dtmi:example:sigma_zeta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Component",
-          "name": "theta_kappa",
+          "name": "sigma_delta",
           "schema": {
-            "@id": "dtmi:example:theta_lambda;1",
+            "@id": "dtmi:example:sigma_epsilon;1",
             "@type": "Interface"
           }
         }
@@ -952,15 +952,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_omicron;1",
+        "@id": "dtmi:example:sigma_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Component",
-          "name": "theta_nu",
+          "name": "sigma_eta",
           "schema": {
-            "@id": "dtmi:example:theta_xi;1",
+            "@id": "dtmi:example:sigma_theta;1",
             "@type": "Interface"
           }
         }
@@ -975,14 +975,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_sigma;1",
+        "@id": "dtmi:example:sigma_mu;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo::bar;1",
           "@type": "Component",
-          "name": "theta_pi",
+          "name": "sigma_kappa",
           "schema": {
-            "@id": "dtmi:example:theta_rho;1",
+            "@id": "dtmi:example:sigma_lambda;1",
             "@type": "Interface"
           }
         }
@@ -997,15 +997,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_phi;1",
+        "@id": "dtmi:example:sigma_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo::bar;1",
           "@type": "Component",
-          "name": "theta_tau",
+          "name": "sigma_nu",
           "schema": {
-            "@id": "dtmi:example:theta_upsilon;1",
+            "@id": "dtmi:example:sigma_xi;1",
             "@type": "Interface"
           }
         }
@@ -1020,14 +1020,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_omega;1",
+        "@id": "dtmi:example:sigma_sigma;1",
         "@type": "Interface",
         "contents": {
           "@id": "urn:foo:bar:1",
           "@type": "Component",
-          "name": "theta_chi",
+          "name": "sigma_pi",
           "schema": {
-            "@id": "dtmi:example:theta_psi;1",
+            "@id": "dtmi:example:sigma_rho;1",
             "@type": "Interface"
           }
         }
@@ -1042,15 +1042,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_um;1",
+        "@id": "dtmi:example:sigma_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "urn:foo:bar:1",
           "@type": "Component",
-          "name": "theta_yuzz",
+          "name": "sigma_tau",
           "schema": {
-            "@id": "dtmi:example:theta_wum;1",
+            "@id": "dtmi:example:sigma_upsilon;1",
             "@type": "Interface"
           }
         }
@@ -1065,14 +1065,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_glikk;1",
+        "@id": "dtmi:example:sigma_omega;1",
         "@type": "Interface",
         "contents": {
           "@id": "http://foo/bar/baz",
           "@type": "Component",
-          "name": "theta_humpf",
+          "name": "sigma_chi",
           "schema": {
-            "@id": "dtmi:example:theta_fuddle;1",
+            "@id": "dtmi:example:sigma_psi;1",
             "@type": "Interface"
           }
         }
@@ -1087,15 +1087,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_quan;1",
+        "@id": "dtmi:example:sigma_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "http://foo/bar/baz",
           "@type": "Component",
-          "name": "theta_nuh",
+          "name": "sigma_yuzz",
           "schema": {
-            "@id": "dtmi:example:theta_snee;1",
+            "@id": "dtmi:example:sigma_wum;1",
             "@type": "Interface"
           }
         }
@@ -1110,14 +1110,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_floob;1",
+        "@id": "dtmi:example:sigma_glikk;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:;1",
           "@type": "Component",
-          "name": "theta_thnad",
+          "name": "sigma_humpf",
           "schema": {
-            "@id": "dtmi:example:theta_spazz;1",
+            "@id": "dtmi:example:sigma_fuddle;1",
             "@type": "Interface"
           }
         }
@@ -1132,15 +1132,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_flunn;1",
+        "@id": "dtmi:example:sigma_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:;1",
           "@type": "Component",
-          "name": "theta_zatz",
+          "name": "sigma_nuh",
           "schema": {
-            "@id": "dtmi:example:theta_jogg;1",
+            "@id": "dtmi:example:sigma_snee;1",
             "@type": "Interface"
           }
         }
@@ -1155,14 +1155,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_vroo;1",
+        "@id": "dtmi:example:sigma_floob;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:dtdl:example;1",
           "@type": "Component",
-          "name": "theta_itch",
+          "name": "sigma_thnad",
           "schema": {
-            "@id": "dtmi:example:theta_yekk;1",
+            "@id": "dtmi:example:sigma_spazz;1",
             "@type": "Interface"
           }
         }
@@ -1177,15 +1177,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_beta;1",
+        "@id": "dtmi:example:sigma_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:dtdl:example;1",
           "@type": "Component",
-          "name": "theta_hi",
+          "name": "sigma_zatz",
           "schema": {
-            "@id": "dtmi:example:iota_alpha;1",
+            "@id": "dtmi:example:sigma_jogg;1",
             "@type": "Interface"
           }
         }
@@ -1200,14 +1200,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_epsilon;1",
+        "@id": "dtmi:example:sigma_vroo;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:standard:example;1",
           "@type": "Component",
-          "name": "iota_gamma",
+          "name": "sigma_itch",
           "schema": {
-            "@id": "dtmi:example:iota_delta;1",
+            "@id": "dtmi:example:sigma_yekk;1",
             "@type": "Interface"
           }
         }
@@ -1222,15 +1222,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_theta;1",
+        "@id": "dtmi:example:tau_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:standard:example;1",
           "@type": "Component",
-          "name": "iota_zeta",
+          "name": "sigma_hi",
           "schema": {
-            "@id": "dtmi:example:iota_eta;1",
+            "@id": "dtmi:example:tau_alpha;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassComponentIdNotArrayV3.json b/DTDL/v3/spec/Requirement-ClassComponentIdNotArrayV3.json
index c31ba970..138a952a 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentIdNotArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentIdNotArrayV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_lambda;1",
+        "@id": "dtmi:example:tau_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;7"
           ],
           "@type": "Component",
-          "name": "iota_iota",
+          "name": "tau_gamma",
           "schema": {
-            "@id": "dtmi:example:iota_kappa;1",
+            "@id": "dtmi:example:tau_delta;1",
             "@type": "Interface"
           }
         }
@@ -31,7 +31,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_xi;1",
+        "@id": "dtmi:example:tau_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -39,9 +39,9 @@
             "dtmi:foo:bar;7"
           ],
           "@type": "Component",
-          "name": "iota_mu",
+          "name": "tau_zeta",
           "schema": {
-            "@id": "dtmi:example:iota_nu;1",
+            "@id": "dtmi:example:tau_eta;1",
             "@type": "Interface"
           }
         }
@@ -56,16 +56,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_rho;1",
+        "@id": "dtmi:example:tau_lambda;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;108675309"
           ],
           "@type": "Component",
-          "name": "iota_omicron",
+          "name": "tau_iota",
           "schema": {
-            "@id": "dtmi:example:iota_pi;1",
+            "@id": "dtmi:example:tau_kappa;1",
             "@type": "Interface"
           }
         }
@@ -80,7 +80,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_upsilon;1",
+        "@id": "dtmi:example:tau_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -88,9 +88,9 @@
             "dtmi:foo:bar;108675309"
           ],
           "@type": "Component",
-          "name": "iota_sigma",
+          "name": "tau_mu",
           "schema": {
-            "@id": "dtmi:example:iota_tau;1",
+            "@id": "dtmi:example:tau_nu;1",
             "@type": "Interface"
           }
         }
@@ -105,16 +105,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_psi;1",
+        "@id": "dtmi:example:tau_rho;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;999999999"
           ],
           "@type": "Component",
-          "name": "iota_phi",
+          "name": "tau_omicron",
           "schema": {
-            "@id": "dtmi:example:iota_chi;1",
+            "@id": "dtmi:example:tau_pi;1",
             "@type": "Interface"
           }
         }
@@ -129,7 +129,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_wum;1",
+        "@id": "dtmi:example:tau_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -137,9 +137,9 @@
             "dtmi:foo:bar;999999999"
           ],
           "@type": "Component",
-          "name": "iota_omega",
+          "name": "tau_sigma",
           "schema": {
-            "@id": "dtmi:example:iota_yuzz;1",
+            "@id": "dtmi:example:tau_tau;1",
             "@type": "Interface"
           }
         }
@@ -154,16 +154,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_fuddle;1",
+        "@id": "dtmi:example:tau_psi;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo;1"
           ],
           "@type": "Component",
-          "name": "iota_um",
+          "name": "tau_phi",
           "schema": {
-            "@id": "dtmi:example:iota_humpf;1",
+            "@id": "dtmi:example:tau_chi;1",
             "@type": "Interface"
           }
         }
@@ -178,7 +178,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_snee;1",
+        "@id": "dtmi:example:tau_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -186,9 +186,9 @@
             "dtmi:foo;1"
           ],
           "@type": "Component",
-          "name": "iota_glikk",
+          "name": "tau_omega",
           "schema": {
-            "@id": "dtmi:example:iota_nuh;1",
+            "@id": "dtmi:example:tau_yuzz;1",
             "@type": "Interface"
           }
         }
@@ -203,16 +203,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_spazz;1",
+        "@id": "dtmi:example:tau_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar"
           ],
           "@type": "Component",
-          "name": "iota_quan",
+          "name": "tau_um",
           "schema": {
-            "@id": "dtmi:example:iota_thnad;1",
+            "@id": "dtmi:example:tau_humpf;1",
             "@type": "Interface"
           }
         }
@@ -227,7 +227,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_jogg;1",
+        "@id": "dtmi:example:tau_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -235,9 +235,9 @@
             "dtmi:foo:bar"
           ],
           "@type": "Component",
-          "name": "iota_floob",
+          "name": "tau_glikk",
           "schema": {
-            "@id": "dtmi:example:iota_zatz;1",
+            "@id": "dtmi:example:tau_nuh;1",
             "@type": "Interface"
           }
         }
@@ -252,16 +252,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_yekk;1",
+        "@id": "dtmi:example:tau_spazz;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;3.14"
           ],
           "@type": "Component",
-          "name": "iota_flunn",
+          "name": "tau_quan",
           "schema": {
-            "@id": "dtmi:example:iota_itch;1",
+            "@id": "dtmi:example:tau_thnad;1",
             "@type": "Interface"
           }
         }
@@ -276,7 +276,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_alpha;1",
+        "@id": "dtmi:example:tau_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -284,9 +284,9 @@
             "dtmi:foo:bar;3.14"
           ],
           "@type": "Component",
-          "name": "iota_vroo",
+          "name": "tau_floob",
           "schema": {
-            "@id": "dtmi:example:iota_hi;1",
+            "@id": "dtmi:example:tau_zatz;1",
             "@type": "Interface"
           }
         }
@@ -301,16 +301,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_delta;1",
+        "@id": "dtmi:example:tau_yekk;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;3.141592"
           ],
           "@type": "Component",
-          "name": "kappa_beta",
+          "name": "tau_flunn",
           "schema": {
-            "@id": "dtmi:example:kappa_gamma;1",
+            "@id": "dtmi:example:tau_itch;1",
             "@type": "Interface"
           }
         }
@@ -325,7 +325,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_eta;1",
+        "@id": "dtmi:example:upsilon_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -333,9 +333,9 @@
             "dtmi:foo:bar;3.141592"
           ],
           "@type": "Component",
-          "name": "kappa_epsilon",
+          "name": "tau_vroo",
           "schema": {
-            "@id": "dtmi:example:kappa_zeta;1",
+            "@id": "dtmi:example:tau_hi;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassComponentInvalidKeywordsV3.json b/DTDL/v3/spec/Requirement-ClassComponentInvalidKeywordsV3.json
index 9ae4bf1b..ebb739d8 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentInvalidKeywordsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentInvalidKeywordsV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_omicron;1",
+        "@id": "dtmi:example:um_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "rho_nu",
+          "name": "um_eta",
           "schema": {
-            "@id": "dtmi:example:rho_xi;1",
+            "@id": "dtmi:example:um_theta;1",
             "@type": "Interface"
           },
           "@graph": {}
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_sigma;1",
+        "@id": "dtmi:example:um_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "rho_pi",
+          "name": "um_kappa",
           "schema": {
-            "@id": "dtmi:example:rho_rho;1",
+            "@id": "dtmi:example:um_lambda;1",
             "@type": "Interface"
           },
           "@graph": {}
@@ -52,13 +52,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_phi;1",
+        "@id": "dtmi:example:um_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "rho_tau",
+          "name": "um_nu",
           "schema": {
-            "@id": "dtmi:example:rho_upsilon;1",
+            "@id": "dtmi:example:um_xi;1",
             "@type": "Interface"
           },
           "@value": 626
@@ -74,14 +74,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_omega;1",
+        "@id": "dtmi:example:um_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "rho_chi",
+          "name": "um_pi",
           "schema": {
-            "@id": "dtmi:example:rho_psi;1",
+            "@id": "dtmi:example:um_rho;1",
             "@type": "Interface"
           },
           "@value": 626
@@ -97,13 +97,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_um;1",
+        "@id": "dtmi:example:um_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "rho_yuzz",
+          "name": "um_tau",
           "schema": {
-            "@id": "dtmi:example:rho_wum;1",
+            "@id": "dtmi:example:um_upsilon;1",
             "@type": "Interface"
           },
           "@language": "en"
@@ -119,14 +119,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_glikk;1",
+        "@id": "dtmi:example:um_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "rho_humpf",
+          "name": "um_chi",
           "schema": {
-            "@id": "dtmi:example:rho_fuddle;1",
+            "@id": "dtmi:example:um_psi;1",
             "@type": "Interface"
           },
           "@language": "en"
@@ -142,13 +142,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_quan;1",
+        "@id": "dtmi:example:um_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "rho_nuh",
+          "name": "um_yuzz",
           "schema": {
-            "@id": "dtmi:example:rho_snee;1",
+            "@id": "dtmi:example:um_wum;1",
             "@type": "Interface"
           },
           "@foobar": true
@@ -164,14 +164,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_floob;1",
+        "@id": "dtmi:example:um_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "rho_thnad",
+          "name": "um_humpf",
           "schema": {
-            "@id": "dtmi:example:rho_spazz;1",
+            "@id": "dtmi:example:um_fuddle;1",
             "@type": "Interface"
           },
           "@foobar": true
diff --git a/DTDL/v3/spec/Requirement-ClassComponentPropertiesSchemaContentsExcludeComponentV3.json b/DTDL/v3/spec/Requirement-ClassComponentPropertiesSchemaContentsExcludeComponentV3.json
index c6f7b3e5..e282c6df 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentPropertiesSchemaContentsExcludeComponentV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentPropertiesSchemaContentsExcludeComponentV3.json
@@ -7,22 +7,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_omega;1",
+        "@id": "dtmi:example:gamma_pi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:snee_psi;1",
+          "@id": "dtmi:example:gamma_omicron;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "snee_chi",
+            "name": "gamma_xi",
             "schema": {
-              "@id": "dtmi:example:snee_phi;1",
+              "@id": "dtmi:example:gamma_nu;1",
               "@type": "Interface",
               "contents": {
                 "@type": "Component",
-                "name": "snee_tau",
+                "name": "gamma_lambda",
                 "schema": {
-                  "@id": "dtmi:example:snee_upsilon;1",
+                  "@id": "dtmi:example:gamma_mu;1",
                   "@type": "Interface"
                 }
               }
@@ -40,23 +40,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_glikk;1",
+        "@id": "dtmi:example:gamma_chi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:snee_fuddle;1",
+          "@id": "dtmi:example:gamma_phi;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Component",
-            "name": "snee_humpf",
+            "name": "gamma_upsilon",
             "schema": {
-              "@id": "dtmi:example:snee_um;1",
+              "@id": "dtmi:example:gamma_tau;1",
               "@type": "Interface",
               "contents": {
                 "@type": "Component",
-                "name": "snee_yuzz",
+                "name": "gamma_rho",
                 "schema": {
-                  "@id": "dtmi:example:snee_wum;1",
+                  "@id": "dtmi:example:gamma_sigma;1",
                   "@type": "Interface"
                 }
               }
diff --git a/DTDL/v3/spec/Requirement-ClassComponentPropertyCommentStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassComponentPropertyCommentStringLengthV3.json
index fb90b434..1a1ab998 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentPropertyCommentStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentPropertyCommentStringLengthV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_floob;1",
+        "@id": "dtmi:example:phi_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "lambda_thnad",
+          "name": "phi_humpf",
           "schema": {
-            "@id": "dtmi:example:lambda_spazz;1",
+            "@id": "dtmi:example:phi_fuddle;1",
             "@type": "Interface"
           },
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_flunn;1",
+        "@id": "dtmi:example:phi_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "lambda_zatz",
+          "name": "phi_nuh",
           "schema": {
-            "@id": "dtmi:example:lambda_jogg;1",
+            "@id": "dtmi:example:phi_snee;1",
             "@type": "Interface"
           },
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
@@ -51,14 +51,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_vroo;1",
+        "@id": "dtmi:example:phi_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "lambda_itch",
+          "name": "phi_thnad",
           "schema": {
-            "@id": "dtmi:example:lambda_yekk;1",
+            "@id": "dtmi:example:phi_spazz;1",
             "@type": "Interface"
           },
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
diff --git a/DTDL/v3/spec/Requirement-ClassComponentPropertyCommentStringV3.json b/DTDL/v3/spec/Requirement-ClassComponentPropertyCommentStringV3.json
index fa0c7ca3..10cc1d4d 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentPropertyCommentStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentPropertyCommentStringV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_pi;1",
+        "@id": "dtmi:example:upsilon_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "kappa_xi",
+          "name": "upsilon_theta",
           "schema": {
-            "@id": "dtmi:example:kappa_omicron;1",
+            "@id": "dtmi:example:upsilon_iota;1",
             "@type": "Interface"
           },
           "comment": "hello"
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_tau;1",
+        "@id": "dtmi:example:upsilon_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "kappa_rho",
+          "name": "upsilon_lambda",
           "schema": {
-            "@id": "dtmi:example:kappa_sigma;1",
+            "@id": "dtmi:example:upsilon_mu;1",
             "@type": "Interface"
           },
           "comment": [
@@ -53,13 +53,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_chi;1",
+        "@id": "dtmi:example:upsilon_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "kappa_upsilon",
+          "name": "upsilon_xi",
           "schema": {
-            "@id": "dtmi:example:kappa_phi;1",
+            "@id": "dtmi:example:upsilon_omicron;1",
             "@type": "Interface"
           },
           "comment": {
@@ -78,13 +78,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_yuzz;1",
+        "@id": "dtmi:example:upsilon_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "kappa_psi",
+          "name": "upsilon_rho",
           "schema": {
-            "@id": "dtmi:example:kappa_omega;1",
+            "@id": "dtmi:example:upsilon_sigma;1",
             "@type": "Interface"
           },
           "comment": [
@@ -105,13 +105,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_humpf;1",
+        "@id": "dtmi:example:upsilon_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "kappa_wum",
+          "name": "upsilon_upsilon",
           "schema": {
-            "@id": "dtmi:example:kappa_um;1",
+            "@id": "dtmi:example:upsilon_phi;1",
             "@type": "Interface"
           },
           "comment": []
@@ -127,13 +127,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_nuh;1",
+        "@id": "dtmi:example:upsilon_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "kappa_fuddle",
+          "name": "upsilon_psi",
           "schema": {
-            "@id": "dtmi:example:kappa_glikk;1",
+            "@id": "dtmi:example:upsilon_omega;1",
             "@type": "Interface"
           },
           "comment": null
@@ -149,14 +149,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_thnad;1",
+        "@id": "dtmi:example:upsilon_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "kappa_snee",
+          "name": "upsilon_wum",
           "schema": {
-            "@id": "dtmi:example:kappa_quan;1",
+            "@id": "dtmi:example:upsilon_um;1",
             "@type": "Interface"
           },
           "comment": null
@@ -172,13 +172,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_zatz;1",
+        "@id": "dtmi:example:upsilon_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "kappa_spazz",
+          "name": "upsilon_fuddle",
           "schema": {
-            "@id": "dtmi:example:kappa_floob;1",
+            "@id": "dtmi:example:upsilon_glikk;1",
             "@type": "Interface"
           },
           "comment": true
@@ -194,14 +194,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_itch;1",
+        "@id": "dtmi:example:upsilon_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "kappa_jogg",
+          "name": "upsilon_snee",
           "schema": {
-            "@id": "dtmi:example:kappa_flunn;1",
+            "@id": "dtmi:example:upsilon_quan;1",
             "@type": "Interface"
           },
           "comment": true
@@ -217,13 +217,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_hi;1",
+        "@id": "dtmi:example:upsilon_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "kappa_yekk",
+          "name": "upsilon_spazz",
           "schema": {
-            "@id": "dtmi:example:kappa_vroo;1",
+            "@id": "dtmi:example:upsilon_floob;1",
             "@type": "Interface"
           },
           "comment": 626
@@ -239,14 +239,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_gamma;1",
+        "@id": "dtmi:example:upsilon_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "lambda_alpha",
+          "name": "upsilon_jogg",
           "schema": {
-            "@id": "dtmi:example:lambda_beta;1",
+            "@id": "dtmi:example:upsilon_flunn;1",
             "@type": "Interface"
           },
           "comment": 626
@@ -262,13 +262,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_zeta;1",
+        "@id": "dtmi:example:upsilon_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "lambda_delta",
+          "name": "upsilon_yekk",
           "schema": {
-            "@id": "dtmi:example:lambda_epsilon;1",
+            "@id": "dtmi:example:upsilon_vroo;1",
             "@type": "Interface"
           },
           "comment": [
@@ -286,14 +286,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_iota;1",
+        "@id": "dtmi:example:phi_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "lambda_eta",
+          "name": "phi_alpha",
           "schema": {
-            "@id": "dtmi:example:lambda_theta;1",
+            "@id": "dtmi:example:phi_beta;1",
             "@type": "Interface"
           },
           "comment": [
@@ -311,13 +311,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_mu;1",
+        "@id": "dtmi:example:phi_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "lambda_kappa",
+          "name": "phi_delta",
           "schema": {
-            "@id": "dtmi:example:lambda_lambda;1",
+            "@id": "dtmi:example:phi_epsilon;1",
             "@type": "Interface"
           },
           "comment": [
@@ -335,14 +335,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_omicron;1",
+        "@id": "dtmi:example:phi_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "lambda_nu",
+          "name": "phi_eta",
           "schema": {
-            "@id": "dtmi:example:lambda_xi;1",
+            "@id": "dtmi:example:phi_theta;1",
             "@type": "Interface"
           },
           "comment": [
@@ -360,13 +360,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_sigma;1",
+        "@id": "dtmi:example:phi_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "lambda_pi",
+          "name": "phi_kappa",
           "schema": {
-            "@id": "dtmi:example:lambda_rho;1",
+            "@id": "dtmi:example:phi_lambda;1",
             "@type": "Interface"
           },
           "comment": [
@@ -384,14 +384,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_phi;1",
+        "@id": "dtmi:example:phi_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "lambda_tau",
+          "name": "phi_nu",
           "schema": {
-            "@id": "dtmi:example:lambda_upsilon;1",
+            "@id": "dtmi:example:phi_xi;1",
             "@type": "Interface"
           },
           "comment": [
@@ -409,13 +409,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_omega;1",
+        "@id": "dtmi:example:phi_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "lambda_chi",
+          "name": "phi_pi",
           "schema": {
-            "@id": "dtmi:example:lambda_psi;1",
+            "@id": "dtmi:example:phi_rho;1",
             "@type": "Interface"
           },
           "comment": {}
@@ -431,14 +431,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_um;1",
+        "@id": "dtmi:example:phi_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "lambda_yuzz",
+          "name": "phi_tau",
           "schema": {
-            "@id": "dtmi:example:lambda_wum;1",
+            "@id": "dtmi:example:phi_upsilon;1",
             "@type": "Interface"
           },
           "comment": {}
@@ -454,13 +454,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_glikk;1",
+        "@id": "dtmi:example:phi_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "lambda_humpf",
+          "name": "phi_chi",
           "schema": {
-            "@id": "dtmi:example:lambda_fuddle;1",
+            "@id": "dtmi:example:phi_psi;1",
             "@type": "Interface"
           },
           "comment": [
@@ -478,14 +478,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_quan;1",
+        "@id": "dtmi:example:phi_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "lambda_nuh",
+          "name": "phi_yuzz",
           "schema": {
-            "@id": "dtmi:example:lambda_snee;1",
+            "@id": "dtmi:example:phi_wum;1",
             "@type": "Interface"
           },
           "comment": [
diff --git a/DTDL/v3/spec/Requirement-ClassComponentPropertyCommentTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassComponentPropertyCommentTermAndDtmiV3.json
index 21a24f15..f875636a 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentPropertyCommentTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentPropertyCommentTermAndDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_pi;1",
+        "@id": "dtmi:example:chi_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "comment": "mu_mu",
-          "dtmi:dtdl:property:comment;3": "mu_nu",
-          "name": "mu_xi",
+          "comment": "chi_zeta",
+          "dtmi:dtdl:property:comment;3": "chi_eta",
+          "name": "chi_theta",
           "schema": {
-            "@id": "dtmi:example:mu_omicron;1",
+            "@id": "dtmi:example:chi_iota;1",
             "@type": "Interface"
           }
         }
@@ -30,16 +30,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_phi;1",
+        "@id": "dtmi:example:chi_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "comment": "mu_rho",
-          "dtmi:dtdl:property:comment;3": "mu_sigma",
-          "name": "mu_tau",
+          "comment": "chi_lambda",
+          "dtmi:dtdl:property:comment;3": "chi_mu",
+          "name": "chi_nu",
           "schema": {
-            "@id": "dtmi:example:mu_upsilon;1",
+            "@id": "dtmi:example:chi_xi;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassComponentPropertyDescriptionLangStringV3.json b/DTDL/v3/spec/Requirement-ClassComponentPropertyDescriptionLangStringV3.json
index 716e563f..93be31c2 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentPropertyDescriptionLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentPropertyDescriptionLangStringV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_omega;1",
+        "@id": "dtmi:example:chi_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "mu_chi",
+          "name": "chi_pi",
           "schema": {
-            "@id": "dtmi:example:mu_psi;1",
+            "@id": "dtmi:example:chi_rho;1",
             "@type": "Interface"
           },
           "description": "hello"
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_um;1",
+        "@id": "dtmi:example:chi_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "mu_yuzz",
+          "name": "chi_tau",
           "schema": {
-            "@id": "dtmi:example:mu_wum;1",
+            "@id": "dtmi:example:chi_upsilon;1",
             "@type": "Interface"
           },
           "description": [
@@ -53,13 +53,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_glikk;1",
+        "@id": "dtmi:example:chi_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "mu_humpf",
+          "name": "chi_chi",
           "schema": {
-            "@id": "dtmi:example:mu_fuddle;1",
+            "@id": "dtmi:example:chi_psi;1",
             "@type": "Interface"
           },
           "description": {
@@ -77,13 +77,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_quan;1",
+        "@id": "dtmi:example:chi_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "mu_nuh",
+          "name": "chi_yuzz",
           "schema": {
-            "@id": "dtmi:example:mu_snee;1",
+            "@id": "dtmi:example:chi_wum;1",
             "@type": "Interface"
           },
           "description": [
@@ -104,13 +104,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_floob;1",
+        "@id": "dtmi:example:chi_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "mu_thnad",
+          "name": "chi_humpf",
           "schema": {
-            "@id": "dtmi:example:mu_spazz;1",
+            "@id": "dtmi:example:chi_fuddle;1",
             "@type": "Interface"
           },
           "description": {}
@@ -126,13 +126,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_flunn;1",
+        "@id": "dtmi:example:chi_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "mu_zatz",
+          "name": "chi_nuh",
           "schema": {
-            "@id": "dtmi:example:mu_jogg;1",
+            "@id": "dtmi:example:chi_snee;1",
             "@type": "Interface"
           },
           "description": []
@@ -148,13 +148,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_vroo;1",
+        "@id": "dtmi:example:chi_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "mu_itch",
+          "name": "chi_thnad",
           "schema": {
-            "@id": "dtmi:example:mu_yekk;1",
+            "@id": "dtmi:example:chi_spazz;1",
             "@type": "Interface"
           },
           "description": null
@@ -170,14 +170,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_beta;1",
+        "@id": "dtmi:example:chi_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "mu_hi",
+          "name": "chi_zatz",
           "schema": {
-            "@id": "dtmi:example:nu_alpha;1",
+            "@id": "dtmi:example:chi_jogg;1",
             "@type": "Interface"
           },
           "description": null
@@ -193,13 +193,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_epsilon;1",
+        "@id": "dtmi:example:chi_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "nu_gamma",
+          "name": "chi_itch",
           "schema": {
-            "@id": "dtmi:example:nu_delta;1",
+            "@id": "dtmi:example:chi_yekk;1",
             "@type": "Interface"
           },
           "description": true
@@ -215,14 +215,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_theta;1",
+        "@id": "dtmi:example:psi_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "nu_zeta",
+          "name": "chi_hi",
           "schema": {
-            "@id": "dtmi:example:nu_eta;1",
+            "@id": "dtmi:example:psi_alpha;1",
             "@type": "Interface"
           },
           "description": true
@@ -238,13 +238,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_lambda;1",
+        "@id": "dtmi:example:psi_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "nu_iota",
+          "name": "psi_gamma",
           "schema": {
-            "@id": "dtmi:example:nu_kappa;1",
+            "@id": "dtmi:example:psi_delta;1",
             "@type": "Interface"
           },
           "description": 626
@@ -260,14 +260,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_xi;1",
+        "@id": "dtmi:example:psi_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "nu_mu",
+          "name": "psi_zeta",
           "schema": {
-            "@id": "dtmi:example:nu_nu;1",
+            "@id": "dtmi:example:psi_eta;1",
             "@type": "Interface"
           },
           "description": 626
@@ -283,13 +283,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_rho;1",
+        "@id": "dtmi:example:psi_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "nu_omicron",
+          "name": "psi_iota",
           "schema": {
-            "@id": "dtmi:example:nu_pi;1",
+            "@id": "dtmi:example:psi_kappa;1",
             "@type": "Interface"
           },
           "description": [
@@ -307,14 +307,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_upsilon;1",
+        "@id": "dtmi:example:psi_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "nu_sigma",
+          "name": "psi_mu",
           "schema": {
-            "@id": "dtmi:example:nu_tau;1",
+            "@id": "dtmi:example:psi_nu;1",
             "@type": "Interface"
           },
           "description": [
@@ -332,13 +332,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_psi;1",
+        "@id": "dtmi:example:psi_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "nu_phi",
+          "name": "psi_omicron",
           "schema": {
-            "@id": "dtmi:example:nu_chi;1",
+            "@id": "dtmi:example:psi_pi;1",
             "@type": "Interface"
           },
           "description": [
@@ -356,14 +356,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_wum;1",
+        "@id": "dtmi:example:psi_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "nu_omega",
+          "name": "psi_sigma",
           "schema": {
-            "@id": "dtmi:example:nu_yuzz;1",
+            "@id": "dtmi:example:psi_tau;1",
             "@type": "Interface"
           },
           "description": [
@@ -381,13 +381,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_fuddle;1",
+        "@id": "dtmi:example:psi_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "nu_um",
+          "name": "psi_phi",
           "schema": {
-            "@id": "dtmi:example:nu_humpf;1",
+            "@id": "dtmi:example:psi_chi;1",
             "@type": "Interface"
           },
           "description": [
@@ -405,14 +405,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_snee;1",
+        "@id": "dtmi:example:psi_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "nu_glikk",
+          "name": "psi_omega",
           "schema": {
-            "@id": "dtmi:example:nu_nuh;1",
+            "@id": "dtmi:example:psi_yuzz;1",
             "@type": "Interface"
           },
           "description": [
@@ -430,13 +430,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_spazz;1",
+        "@id": "dtmi:example:psi_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "nu_quan",
+          "name": "psi_um",
           "schema": {
-            "@id": "dtmi:example:nu_thnad;1",
+            "@id": "dtmi:example:psi_humpf;1",
             "@type": "Interface"
           },
           "description": [
@@ -454,14 +454,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_jogg;1",
+        "@id": "dtmi:example:psi_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "nu_floob",
+          "name": "psi_glikk",
           "schema": {
-            "@id": "dtmi:example:nu_zatz;1",
+            "@id": "dtmi:example:psi_nuh;1",
             "@type": "Interface"
           },
           "description": [
@@ -479,13 +479,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_yekk;1",
+        "@id": "dtmi:example:psi_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "nu_flunn",
+          "name": "psi_quan",
           "schema": {
-            "@id": "dtmi:example:nu_itch;1",
+            "@id": "dtmi:example:psi_thnad;1",
             "@type": "Interface"
           },
           "description": {
@@ -504,14 +504,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_alpha;1",
+        "@id": "dtmi:example:psi_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "nu_vroo",
+          "name": "psi_floob",
           "schema": {
-            "@id": "dtmi:example:nu_hi;1",
+            "@id": "dtmi:example:psi_zatz;1",
             "@type": "Interface"
           },
           "description": {
@@ -530,13 +530,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_delta;1",
+        "@id": "dtmi:example:psi_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "xi_beta",
+          "name": "psi_flunn",
           "schema": {
-            "@id": "dtmi:example:xi_gamma;1",
+            "@id": "dtmi:example:psi_itch;1",
             "@type": "Interface"
           },
           "description": [
@@ -556,14 +556,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_eta;1",
+        "@id": "dtmi:example:omega_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "xi_epsilon",
+          "name": "psi_vroo",
           "schema": {
-            "@id": "dtmi:example:xi_zeta;1",
+            "@id": "dtmi:example:psi_hi;1",
             "@type": "Interface"
           },
           "description": [
diff --git a/DTDL/v3/spec/Requirement-ClassComponentPropertyDescriptionStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassComponentPropertyDescriptionStringLengthV3.json
index 06ef9c1a..ec53d5c4 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentPropertyDescriptionStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentPropertyDescriptionStringLengthV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_kappa;1",
+        "@id": "dtmi:example:omega_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "xi_theta",
+          "name": "omega_beta",
           "schema": {
-            "@id": "dtmi:example:xi_iota;1",
+            "@id": "dtmi:example:omega_gamma;1",
             "@type": "Interface"
           },
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_nu;1",
+        "@id": "dtmi:example:omega_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "xi_lambda",
+          "name": "omega_epsilon",
           "schema": {
-            "@id": "dtmi:example:xi_mu;1",
+            "@id": "dtmi:example:omega_zeta;1",
             "@type": "Interface"
           },
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
@@ -51,14 +51,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_pi;1",
+        "@id": "dtmi:example:omega_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "xi_xi",
+          "name": "omega_theta",
           "schema": {
-            "@id": "dtmi:example:xi_omicron;1",
+            "@id": "dtmi:example:omega_iota;1",
             "@type": "Interface"
           },
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
diff --git a/DTDL/v3/spec/Requirement-ClassComponentPropertyDescriptionTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassComponentPropertyDescriptionTermAndDtmiV3.json
index 28a4796c..9c222f20 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentPropertyDescriptionTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentPropertyDescriptionTermAndDtmiV3.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_quan;1",
+        "@id": "dtmi:example:omega_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "description": [
-            "xi_fuddle"
+            "omega_psi"
           ],
           "dtmi:dtdl:property:description;3": [
-            "xi_glikk"
+            "omega_omega"
           ],
-          "name": "xi_nuh",
+          "name": "omega_yuzz",
           "schema": {
-            "@id": "dtmi:example:xi_snee;1",
+            "@id": "dtmi:example:omega_wum;1",
             "@type": "Interface"
           }
         }
@@ -34,20 +34,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_jogg;1",
+        "@id": "dtmi:example:omega_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "description": [
-            "xi_thnad"
+            "omega_humpf"
           ],
           "dtmi:dtdl:property:description;3": [
-            "xi_spazz"
+            "omega_fuddle"
           ],
-          "name": "xi_floob",
+          "name": "omega_glikk",
           "schema": {
-            "@id": "dtmi:example:xi_zatz;1",
+            "@id": "dtmi:example:omega_nuh;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassComponentPropertyDisplayNameLangStringV3.json b/DTDL/v3/spec/Requirement-ClassComponentPropertyDisplayNameLangStringV3.json
index 36bb6b48..0db8ffe4 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentPropertyDisplayNameLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentPropertyDisplayNameLangStringV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_yekk;1",
+        "@id": "dtmi:example:omega_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "xi_flunn",
+          "name": "omega_quan",
           "schema": {
-            "@id": "dtmi:example:xi_itch;1",
+            "@id": "dtmi:example:omega_thnad;1",
             "@type": "Interface"
           },
           "displayName": "hello"
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_alpha;1",
+        "@id": "dtmi:example:omega_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "xi_vroo",
+          "name": "omega_floob",
           "schema": {
-            "@id": "dtmi:example:xi_hi;1",
+            "@id": "dtmi:example:omega_zatz;1",
             "@type": "Interface"
           },
           "displayName": [
@@ -53,13 +53,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_delta;1",
+        "@id": "dtmi:example:omega_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "omicron_beta",
+          "name": "omega_flunn",
           "schema": {
-            "@id": "dtmi:example:omicron_gamma;1",
+            "@id": "dtmi:example:omega_itch;1",
             "@type": "Interface"
           },
           "displayName": {
@@ -77,13 +77,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_eta;1",
+        "@id": "dtmi:example:yuzz_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "omicron_epsilon",
+          "name": "omega_vroo",
           "schema": {
-            "@id": "dtmi:example:omicron_zeta;1",
+            "@id": "dtmi:example:omega_hi;1",
             "@type": "Interface"
           },
           "displayName": [
@@ -104,13 +104,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_kappa;1",
+        "@id": "dtmi:example:yuzz_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "omicron_theta",
+          "name": "yuzz_beta",
           "schema": {
-            "@id": "dtmi:example:omicron_iota;1",
+            "@id": "dtmi:example:yuzz_gamma;1",
             "@type": "Interface"
           },
           "displayName": {}
@@ -126,13 +126,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_nu;1",
+        "@id": "dtmi:example:yuzz_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "omicron_lambda",
+          "name": "yuzz_epsilon",
           "schema": {
-            "@id": "dtmi:example:omicron_mu;1",
+            "@id": "dtmi:example:yuzz_zeta;1",
             "@type": "Interface"
           },
           "displayName": []
@@ -148,13 +148,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_pi;1",
+        "@id": "dtmi:example:yuzz_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "omicron_xi",
+          "name": "yuzz_theta",
           "schema": {
-            "@id": "dtmi:example:omicron_omicron;1",
+            "@id": "dtmi:example:yuzz_iota;1",
             "@type": "Interface"
           },
           "displayName": null
@@ -170,14 +170,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_tau;1",
+        "@id": "dtmi:example:yuzz_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "omicron_rho",
+          "name": "yuzz_lambda",
           "schema": {
-            "@id": "dtmi:example:omicron_sigma;1",
+            "@id": "dtmi:example:yuzz_mu;1",
             "@type": "Interface"
           },
           "displayName": null
@@ -193,13 +193,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_chi;1",
+        "@id": "dtmi:example:yuzz_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "omicron_upsilon",
+          "name": "yuzz_xi",
           "schema": {
-            "@id": "dtmi:example:omicron_phi;1",
+            "@id": "dtmi:example:yuzz_omicron;1",
             "@type": "Interface"
           },
           "displayName": true
@@ -215,14 +215,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_yuzz;1",
+        "@id": "dtmi:example:yuzz_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "omicron_psi",
+          "name": "yuzz_rho",
           "schema": {
-            "@id": "dtmi:example:omicron_omega;1",
+            "@id": "dtmi:example:yuzz_sigma;1",
             "@type": "Interface"
           },
           "displayName": true
@@ -238,13 +238,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_humpf;1",
+        "@id": "dtmi:example:yuzz_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "omicron_wum",
+          "name": "yuzz_upsilon",
           "schema": {
-            "@id": "dtmi:example:omicron_um;1",
+            "@id": "dtmi:example:yuzz_phi;1",
             "@type": "Interface"
           },
           "displayName": 626
@@ -260,14 +260,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_nuh;1",
+        "@id": "dtmi:example:yuzz_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "omicron_fuddle",
+          "name": "yuzz_psi",
           "schema": {
-            "@id": "dtmi:example:omicron_glikk;1",
+            "@id": "dtmi:example:yuzz_omega;1",
             "@type": "Interface"
           },
           "displayName": 626
@@ -283,13 +283,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_thnad;1",
+        "@id": "dtmi:example:yuzz_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "omicron_snee",
+          "name": "yuzz_wum",
           "schema": {
-            "@id": "dtmi:example:omicron_quan;1",
+            "@id": "dtmi:example:yuzz_um;1",
             "@type": "Interface"
           },
           "displayName": [
@@ -307,14 +307,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_zatz;1",
+        "@id": "dtmi:example:yuzz_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "omicron_spazz",
+          "name": "yuzz_fuddle",
           "schema": {
-            "@id": "dtmi:example:omicron_floob;1",
+            "@id": "dtmi:example:yuzz_glikk;1",
             "@type": "Interface"
           },
           "displayName": [
@@ -332,13 +332,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_itch;1",
+        "@id": "dtmi:example:yuzz_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "omicron_jogg",
+          "name": "yuzz_snee",
           "schema": {
-            "@id": "dtmi:example:omicron_flunn;1",
+            "@id": "dtmi:example:yuzz_quan;1",
             "@type": "Interface"
           },
           "displayName": [
@@ -356,14 +356,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_hi;1",
+        "@id": "dtmi:example:yuzz_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "omicron_yekk",
+          "name": "yuzz_spazz",
           "schema": {
-            "@id": "dtmi:example:omicron_vroo;1",
+            "@id": "dtmi:example:yuzz_floob;1",
             "@type": "Interface"
           },
           "displayName": [
@@ -381,13 +381,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_gamma;1",
+        "@id": "dtmi:example:yuzz_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "pi_alpha",
+          "name": "yuzz_jogg",
           "schema": {
-            "@id": "dtmi:example:pi_beta;1",
+            "@id": "dtmi:example:yuzz_flunn;1",
             "@type": "Interface"
           },
           "displayName": [
@@ -405,14 +405,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_zeta;1",
+        "@id": "dtmi:example:yuzz_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "pi_delta",
+          "name": "yuzz_yekk",
           "schema": {
-            "@id": "dtmi:example:pi_epsilon;1",
+            "@id": "dtmi:example:yuzz_vroo;1",
             "@type": "Interface"
           },
           "displayName": [
@@ -430,13 +430,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_iota;1",
+        "@id": "dtmi:example:wum_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "pi_eta",
+          "name": "wum_alpha",
           "schema": {
-            "@id": "dtmi:example:pi_theta;1",
+            "@id": "dtmi:example:wum_beta;1",
             "@type": "Interface"
           },
           "displayName": [
@@ -454,14 +454,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_mu;1",
+        "@id": "dtmi:example:wum_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "pi_kappa",
+          "name": "wum_delta",
           "schema": {
-            "@id": "dtmi:example:pi_lambda;1",
+            "@id": "dtmi:example:wum_epsilon;1",
             "@type": "Interface"
           },
           "displayName": [
@@ -479,13 +479,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_omicron;1",
+        "@id": "dtmi:example:wum_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "pi_nu",
+          "name": "wum_eta",
           "schema": {
-            "@id": "dtmi:example:pi_xi;1",
+            "@id": "dtmi:example:wum_theta;1",
             "@type": "Interface"
           },
           "displayName": {
@@ -504,14 +504,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_sigma;1",
+        "@id": "dtmi:example:wum_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "pi_pi",
+          "name": "wum_kappa",
           "schema": {
-            "@id": "dtmi:example:pi_rho;1",
+            "@id": "dtmi:example:wum_lambda;1",
             "@type": "Interface"
           },
           "displayName": {
@@ -530,13 +530,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_phi;1",
+        "@id": "dtmi:example:wum_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "pi_tau",
+          "name": "wum_nu",
           "schema": {
-            "@id": "dtmi:example:pi_upsilon;1",
+            "@id": "dtmi:example:wum_xi;1",
             "@type": "Interface"
           },
           "displayName": [
@@ -556,14 +556,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_omega;1",
+        "@id": "dtmi:example:wum_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "pi_chi",
+          "name": "wum_pi",
           "schema": {
-            "@id": "dtmi:example:pi_psi;1",
+            "@id": "dtmi:example:wum_rho;1",
             "@type": "Interface"
           },
           "displayName": [
diff --git a/DTDL/v3/spec/Requirement-ClassComponentPropertyDisplayNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassComponentPropertyDisplayNameStringLengthV3.json
index 699a3787..75c8c239 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentPropertyDisplayNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentPropertyDisplayNameStringLengthV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_um;1",
+        "@id": "dtmi:example:wum_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "pi_yuzz",
+          "name": "wum_tau",
           "schema": {
-            "@id": "dtmi:example:pi_wum;1",
+            "@id": "dtmi:example:wum_upsilon;1",
             "@type": "Interface"
           },
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_glikk;1",
+        "@id": "dtmi:example:wum_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "pi_humpf",
+          "name": "wum_chi",
           "schema": {
-            "@id": "dtmi:example:pi_fuddle;1",
+            "@id": "dtmi:example:wum_psi;1",
             "@type": "Interface"
           },
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
@@ -51,14 +51,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_quan;1",
+        "@id": "dtmi:example:wum_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "pi_nuh",
+          "name": "wum_yuzz",
           "schema": {
-            "@id": "dtmi:example:pi_snee;1",
+            "@id": "dtmi:example:wum_wum;1",
             "@type": "Interface"
           },
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
diff --git a/DTDL/v3/spec/Requirement-ClassComponentPropertyDisplayNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassComponentPropertyDisplayNameTermAndDtmiV3.json
index dd67a643..8425af4f 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentPropertyDisplayNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentPropertyDisplayNameTermAndDtmiV3.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_eta;1",
+        "@id": "dtmi:example:um_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "displayName": [
-            "rho_gamma"
+            "wum_itch"
           ],
           "dtmi:dtdl:property:displayName;3": [
-            "rho_delta"
+            "wum_yekk"
           ],
-          "name": "rho_epsilon",
+          "name": "wum_vroo",
           "schema": {
-            "@id": "dtmi:example:rho_zeta;1",
+            "@id": "dtmi:example:wum_hi;1",
             "@type": "Interface"
           }
         }
@@ -34,20 +34,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_mu;1",
+        "@id": "dtmi:example:um_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "displayName": [
-            "rho_theta"
+            "um_beta"
           ],
           "dtmi:dtdl:property:displayName;3": [
-            "rho_iota"
+            "um_gamma"
           ],
-          "name": "rho_kappa",
+          "name": "um_delta",
           "schema": {
-            "@id": "dtmi:example:rho_lambda;1",
+            "@id": "dtmi:example:um_epsilon;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassComponentPropertyFormallyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Requirement-ClassComponentPropertyFormallyIrrelevantDtmiOrTermV3.json
index 7fb9ee47..70b83d99 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentPropertyFormallyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentPropertyFormallyIrrelevantDtmiOrTermV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_theta;1",
+        "@id": "dtmi:example:humpf_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "sigma_zeta",
+          "name": "um_hi",
           "schema": {
-            "@id": "dtmi:example:sigma_eta;1",
+            "@id": "dtmi:example:humpf_alpha;1",
             "@type": "Interface"
           },
           "dtmi:foo:bar;1": 626
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_lambda;1",
+        "@id": "dtmi:example:humpf_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "sigma_iota",
+          "name": "humpf_gamma",
           "schema": {
-            "@id": "dtmi:example:sigma_kappa;1",
+            "@id": "dtmi:example:humpf_delta;1",
             "@type": "Interface"
           },
           "dtmi:foo:bar;1": 626
@@ -52,13 +52,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_xi;1",
+        "@id": "dtmi:example:humpf_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "sigma_mu",
+          "name": "humpf_zeta",
           "schema": {
-            "@id": "dtmi:example:sigma_nu;1",
+            "@id": "dtmi:example:humpf_eta;1",
             "@type": "Interface"
           },
           "boolean": null
@@ -74,14 +74,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_rho;1",
+        "@id": "dtmi:example:humpf_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "sigma_omicron",
+          "name": "humpf_iota",
           "schema": {
-            "@id": "dtmi:example:sigma_pi;1",
+            "@id": "dtmi:example:humpf_kappa;1",
             "@type": "Interface"
           },
           "boolean": null
diff --git a/DTDL/v3/spec/Requirement-ClassComponentPropertyFormallyUndefinedTermV3.json b/DTDL/v3/spec/Requirement-ClassComponentPropertyFormallyUndefinedTermV3.json
index dc6d0af7..eea9e4d6 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentPropertyFormallyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentPropertyFormallyUndefinedTermV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_jogg;1",
+        "@id": "dtmi:example:humpf_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "sigma_floob",
+          "name": "humpf_glikk",
           "schema": {
-            "@id": "dtmi:example:sigma_zatz;1",
+            "@id": "dtmi:example:humpf_nuh;1",
             "@type": "Interface"
           },
           "foobar": {}
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_yekk;1",
+        "@id": "dtmi:example:humpf_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "sigma_flunn",
+          "name": "humpf_quan",
           "schema": {
-            "@id": "dtmi:example:sigma_itch;1",
+            "@id": "dtmi:example:humpf_thnad;1",
             "@type": "Interface"
           },
           "foobar": {}
diff --git a/DTDL/v3/spec/Requirement-ClassComponentPropertyInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassComponentPropertyInvalidDtmiV3.json
index bfcd7a6c..45b87b2a 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentPropertyInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentPropertyInvalidDtmiV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_upsilon;1",
+        "@id": "dtmi:example:humpf_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Component",
             "Foobar"
           ],
-          "name": "sigma_sigma",
+          "name": "humpf_mu",
           "schema": {
-            "@id": "dtmi:example:sigma_tau;1",
+            "@id": "dtmi:example:humpf_nu;1",
             "@type": "Interface"
           },
           "dtmi:foo//bar": 626
@@ -32,7 +32,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_psi;1",
+        "@id": "dtmi:example:humpf_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -40,9 +40,9 @@
             "Component",
             "Foobar"
           ],
-          "name": "sigma_phi",
+          "name": "humpf_omicron",
           "schema": {
-            "@id": "dtmi:example:sigma_chi;1",
+            "@id": "dtmi:example:humpf_pi;1",
             "@type": "Interface"
           },
           "dtmi:foo//bar": 626
diff --git a/DTDL/v3/spec/Requirement-ClassComponentPropertyNamePatternV3.json b/DTDL/v3/spec/Requirement-ClassComponentPropertyNamePatternV3.json
index e93ed875..b6430a46 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentPropertyNamePatternV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentPropertyNamePatternV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_thnad;1",
+        "@id": "dtmi:example:eta_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:itch_quan;1",
+            "@id": "dtmi:example:eta_lambda;1",
             "@type": "Interface"
           },
           "name": "EARTH"
@@ -28,12 +28,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_floob;1",
+        "@id": "dtmi:example:eta_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:itch_spazz;1",
+            "@id": "dtmi:example:eta_nu;1",
             "@type": "Interface"
           },
           "name": "Air"
@@ -49,12 +49,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_jogg;1",
+        "@id": "dtmi:example:eta_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:itch_zatz;1",
+            "@id": "dtmi:example:eta_omicron;1",
             "@type": "Interface"
           },
           "name": "fire"
@@ -70,12 +70,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_itch;1",
+        "@id": "dtmi:example:eta_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:itch_flunn;1",
+            "@id": "dtmi:example:eta_rho;1",
             "@type": "Interface"
           },
           "name": "hello_world"
@@ -91,12 +91,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_vroo;1",
+        "@id": "dtmi:example:eta_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:itch_yekk;1",
+            "@id": "dtmi:example:eta_tau;1",
             "@type": "Interface"
           },
           "name": "Anarchy99"
@@ -112,12 +112,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_alpha;1",
+        "@id": "dtmi:example:eta_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:itch_hi;1",
+            "@id": "dtmi:example:eta_phi;1",
             "@type": "Interface"
           },
           "name": "23skidoo"
@@ -133,13 +133,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_gamma;1",
+        "@id": "dtmi:example:eta_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:yekk_beta;1",
+            "@id": "dtmi:example:eta_psi;1",
             "@type": "Interface"
           },
           "name": "23skidoo"
@@ -155,12 +155,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_epsilon;1",
+        "@id": "dtmi:example:eta_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:yekk_delta;1",
+            "@id": "dtmi:example:eta_yuzz;1",
             "@type": "Interface"
           },
           "name": "626"
@@ -176,13 +176,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_eta;1",
+        "@id": "dtmi:example:eta_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:yekk_zeta;1",
+            "@id": "dtmi:example:eta_um;1",
             "@type": "Interface"
           },
           "name": "626"
@@ -198,12 +198,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_iota;1",
+        "@id": "dtmi:example:eta_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:yekk_theta;1",
+            "@id": "dtmi:example:eta_fuddle;1",
             "@type": "Interface"
           },
           "name": "goodbye-world"
@@ -219,13 +219,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_lambda;1",
+        "@id": "dtmi:example:eta_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:yekk_kappa;1",
+            "@id": "dtmi:example:eta_nuh;1",
             "@type": "Interface"
           },
           "name": "goodbye-world"
@@ -241,12 +241,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_nu;1",
+        "@id": "dtmi:example:eta_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:yekk_mu;1",
+            "@id": "dtmi:example:eta_quan;1",
             "@type": "Interface"
           },
           "name": "_haha"
@@ -262,13 +262,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_omicron;1",
+        "@id": "dtmi:example:eta_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:yekk_xi;1",
+            "@id": "dtmi:example:eta_spazz;1",
             "@type": "Interface"
           },
           "name": "_haha"
@@ -284,12 +284,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_rho;1",
+        "@id": "dtmi:example:eta_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:yekk_pi;1",
+            "@id": "dtmi:example:eta_zatz;1",
             "@type": "Interface"
           },
           "name": "toodaloo_"
@@ -305,13 +305,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_tau;1",
+        "@id": "dtmi:example:eta_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:yekk_sigma;1",
+            "@id": "dtmi:example:eta_flunn;1",
             "@type": "Interface"
           },
           "name": "toodaloo_"
@@ -327,12 +327,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_phi;1",
+        "@id": "dtmi:example:eta_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:yekk_upsilon;1",
+            "@id": "dtmi:example:eta_yekk;1",
             "@type": "Interface"
           },
           "name": "pro:con"
@@ -348,13 +348,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_psi;1",
+        "@id": "dtmi:example:theta_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:yekk_chi;1",
+            "@id": "dtmi:example:eta_hi;1",
             "@type": "Interface"
           },
           "name": "pro:con"
@@ -370,12 +370,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_yuzz;1",
+        "@id": "dtmi:example:theta_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:yekk_omega;1",
+            "@id": "dtmi:example:theta_beta;1",
             "@type": "Interface"
           },
           "name": "mish/mash"
@@ -391,13 +391,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_um;1",
+        "@id": "dtmi:example:theta_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:yekk_wum;1",
+            "@id": "dtmi:example:theta_delta;1",
             "@type": "Interface"
           },
           "name": "mish/mash"
@@ -413,12 +413,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_fuddle;1",
+        "@id": "dtmi:example:theta_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:yekk_humpf;1",
+            "@id": "dtmi:example:theta_zeta;1",
             "@type": "Interface"
           },
           "name": "#tag"
@@ -434,13 +434,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_nuh;1",
+        "@id": "dtmi:example:theta_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:yekk_glikk;1",
+            "@id": "dtmi:example:theta_theta;1",
             "@type": "Interface"
           },
           "name": "#tag"
@@ -456,12 +456,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_quan;1",
+        "@id": "dtmi:example:theta_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:yekk_snee;1",
+            "@id": "dtmi:example:theta_kappa;1",
             "@type": "Interface"
           },
           "name": "@tweet"
@@ -477,13 +477,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_spazz;1",
+        "@id": "dtmi:example:theta_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:yekk_thnad;1",
+            "@id": "dtmi:example:theta_mu;1",
             "@type": "Interface"
           },
           "name": "@tweet"
@@ -499,12 +499,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_zatz;1",
+        "@id": "dtmi:example:theta_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:yekk_floob;1",
+            "@id": "dtmi:example:theta_xi;1",
             "@type": "Interface"
           },
           "name": "$money"
@@ -520,13 +520,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_flunn;1",
+        "@id": "dtmi:example:theta_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:yekk_jogg;1",
+            "@id": "dtmi:example:theta_pi;1",
             "@type": "Interface"
           },
           "name": "$money"
diff --git a/DTDL/v3/spec/Requirement-ClassComponentPropertyNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassComponentPropertyNameStringLengthV3.json
index 39fdf226..097a74e4 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentPropertyNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentPropertyNameStringLengthV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_humpf;1",
+        "@id": "dtmi:example:eta_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:itch_um;1",
+            "@id": "dtmi:example:eta_epsilon;1",
             "@type": "Interface"
           },
           "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
@@ -28,12 +28,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_glikk;1",
+        "@id": "dtmi:example:eta_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:itch_fuddle;1",
+            "@id": "dtmi:example:eta_eta;1",
             "@type": "Interface"
           },
           "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
@@ -49,13 +49,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_snee;1",
+        "@id": "dtmi:example:eta_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:itch_nuh;1",
+            "@id": "dtmi:example:eta_iota;1",
             "@type": "Interface"
           },
           "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
diff --git a/DTDL/v3/spec/Requirement-ClassComponentPropertyNameStringV3.json b/DTDL/v3/spec/Requirement-ClassComponentPropertyNameStringV3.json
index a681cf5c..afaeaa19 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentPropertyNameStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentPropertyNameStringV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_um;1",
+        "@id": "dtmi:example:zeta_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:flunn_wum;1",
+            "@id": "dtmi:example:zeta_delta;1",
             "@type": "Interface"
           },
           "name": "hello"
@@ -28,12 +28,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_fuddle;1",
+        "@id": "dtmi:example:zeta_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:flunn_humpf;1",
+            "@id": "dtmi:example:zeta_zeta;1",
             "@type": "Interface"
           },
           "name": [
@@ -51,12 +51,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_nuh;1",
+        "@id": "dtmi:example:zeta_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:flunn_glikk;1",
+            "@id": "dtmi:example:zeta_theta;1",
             "@type": "Interface"
           },
           "name": {
@@ -75,12 +75,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_quan;1",
+        "@id": "dtmi:example:zeta_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:flunn_snee;1",
+            "@id": "dtmi:example:zeta_kappa;1",
             "@type": "Interface"
           },
           "name": [
@@ -101,12 +101,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_spazz;1",
+        "@id": "dtmi:example:zeta_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:flunn_thnad;1",
+            "@id": "dtmi:example:zeta_mu;1",
             "@type": "Interface"
           },
           "name": null
@@ -122,13 +122,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_zatz;1",
+        "@id": "dtmi:example:zeta_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:flunn_floob;1",
+            "@id": "dtmi:example:zeta_xi;1",
             "@type": "Interface"
           },
           "name": null
@@ -144,12 +144,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_flunn;1",
+        "@id": "dtmi:example:zeta_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:flunn_jogg;1",
+            "@id": "dtmi:example:zeta_pi;1",
             "@type": "Interface"
           },
           "name": true
@@ -165,13 +165,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_yekk;1",
+        "@id": "dtmi:example:zeta_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:flunn_itch;1",
+            "@id": "dtmi:example:zeta_sigma;1",
             "@type": "Interface"
           },
           "name": true
@@ -187,12 +187,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_hi;1",
+        "@id": "dtmi:example:zeta_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:flunn_vroo;1",
+            "@id": "dtmi:example:zeta_upsilon;1",
             "@type": "Interface"
           },
           "name": 626
@@ -208,13 +208,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_beta;1",
+        "@id": "dtmi:example:zeta_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:itch_alpha;1",
+            "@id": "dtmi:example:zeta_chi;1",
             "@type": "Interface"
           },
           "name": 626
@@ -230,12 +230,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_delta;1",
+        "@id": "dtmi:example:zeta_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:itch_gamma;1",
+            "@id": "dtmi:example:zeta_omega;1",
             "@type": "Interface"
           },
           "name": [
@@ -253,13 +253,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_zeta;1",
+        "@id": "dtmi:example:zeta_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:itch_epsilon;1",
+            "@id": "dtmi:example:zeta_wum;1",
             "@type": "Interface"
           },
           "name": [
@@ -277,12 +277,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_theta;1",
+        "@id": "dtmi:example:zeta_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:itch_eta;1",
+            "@id": "dtmi:example:zeta_humpf;1",
             "@type": "Interface"
           },
           "name": [
@@ -300,13 +300,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_kappa;1",
+        "@id": "dtmi:example:zeta_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:itch_iota;1",
+            "@id": "dtmi:example:zeta_glikk;1",
             "@type": "Interface"
           },
           "name": [
@@ -324,12 +324,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_mu;1",
+        "@id": "dtmi:example:zeta_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:itch_lambda;1",
+            "@id": "dtmi:example:zeta_snee;1",
             "@type": "Interface"
           },
           "name": [
@@ -347,13 +347,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_xi;1",
+        "@id": "dtmi:example:zeta_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:itch_nu;1",
+            "@id": "dtmi:example:zeta_thnad;1",
             "@type": "Interface"
           },
           "name": [
@@ -371,12 +371,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_pi;1",
+        "@id": "dtmi:example:zeta_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:itch_omicron;1",
+            "@id": "dtmi:example:zeta_floob;1",
             "@type": "Interface"
           },
           "name": {}
@@ -392,13 +392,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_sigma;1",
+        "@id": "dtmi:example:zeta_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:itch_rho;1",
+            "@id": "dtmi:example:zeta_jogg;1",
             "@type": "Interface"
           },
           "name": {}
@@ -414,12 +414,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_upsilon;1",
+        "@id": "dtmi:example:zeta_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:itch_tau;1",
+            "@id": "dtmi:example:zeta_itch;1",
             "@type": "Interface"
           },
           "name": [
@@ -437,13 +437,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_chi;1",
+        "@id": "dtmi:example:zeta_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:itch_phi;1",
+            "@id": "dtmi:example:zeta_vroo;1",
             "@type": "Interface"
           },
           "name": [
@@ -461,12 +461,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_omega;1",
+        "@id": "dtmi:example:eta_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:itch_psi;1",
+            "@id": "dtmi:example:eta_alpha;1",
             "@type": "Interface"
           },
           "name": []
@@ -482,13 +482,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_wum;1",
+        "@id": "dtmi:example:eta_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:itch_yuzz;1",
+            "@id": "dtmi:example:eta_gamma;1",
             "@type": "Interface"
           },
           "name": []
diff --git a/DTDL/v3/spec/Requirement-ClassComponentPropertyNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassComponentPropertyNameTermAndDtmiV3.json
index b3499f93..40d4cca9 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentPropertyNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentPropertyNameTermAndDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_sigma;1",
+        "@id": "dtmi:example:theta_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "vroo_omicron",
-          "dtmi:dtdl:property:name;3": "vroo_pi",
+          "name": "theta_floob",
+          "dtmi:dtdl:property:name;3": "theta_zatz",
           "schema": {
-            "@id": "dtmi:example:vroo_rho;1",
+            "@id": "dtmi:example:theta_jogg;1",
             "@type": "Interface"
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_chi;1",
+        "@id": "dtmi:example:theta_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "vroo_tau",
-          "dtmi:dtdl:property:name;3": "vroo_upsilon",
+          "name": "theta_itch",
+          "dtmi:dtdl:property:name;3": "theta_yekk",
           "schema": {
-            "@id": "dtmi:example:vroo_phi;1",
+            "@id": "dtmi:example:theta_vroo;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassComponentPropertyNameUniqueAmongInterfaceContentsV3.json b/DTDL/v3/spec/Requirement-ClassComponentPropertyNameUniqueAmongInterfaceContentsV3.json
index eade1642..0920da15 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentPropertyNameUniqueAmongInterfaceContentsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentPropertyNameUniqueAmongInterfaceContentsV3.json
@@ -7,24 +7,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_vroo;1",
+        "@id": "dtmi:example:theta_upsilon;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Component",
             "schema": {
-              "@id": "dtmi:example:yekk_itch;1",
+              "@id": "dtmi:example:theta_sigma;1",
               "@type": "Interface"
             },
-            "name": "beta_thnad"
+            "name": "beta_flunn"
           },
           {
             "@type": "Component",
             "schema": {
-              "@id": "dtmi:example:yekk_yekk;1",
+              "@id": "dtmi:example:theta_tau;1",
               "@type": "Interface"
             },
-            "name": "beta_spazz"
+            "name": "beta_itch"
           }
         ]
       }
@@ -38,24 +38,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_beta;1",
+        "@id": "dtmi:example:theta_psi;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Component",
             "schema": {
-              "@id": "dtmi:example:yekk_hi;1",
+              "@id": "dtmi:example:theta_phi;1",
               "@type": "Interface"
             },
-            "name": "beta_thnad"
+            "name": "beta_flunn"
           },
           {
             "@type": "Component",
             "schema": {
-              "@id": "dtmi:example:vroo_alpha;1",
+              "@id": "dtmi:example:theta_chi;1",
               "@type": "Interface"
             },
-            "name": "beta_thnad"
+            "name": "beta_flunn"
           }
         ]
       }
@@ -72,24 +72,24 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:vroo_epsilon;1",
+        "@id": "dtmi:example:theta_wum;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Component",
             "schema": {
-              "@id": "dtmi:example:vroo_gamma;1",
+              "@id": "dtmi:example:theta_omega;1",
               "@type": "Interface"
             },
-            "name": "beta_thnad"
+            "name": "beta_flunn"
           },
           {
             "@type": "Component",
             "schema": {
-              "@id": "dtmi:example:vroo_delta;1",
+              "@id": "dtmi:example:theta_yuzz;1",
               "@type": "Interface"
             },
-            "name": "beta_thnad"
+            "name": "beta_flunn"
           }
         ]
       }
diff --git a/DTDL/v3/spec/Requirement-ClassComponentPropertyNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassComponentPropertyNotDtmiNorTermV3.json
index 01560c50..41051199 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentPropertyNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentPropertyNotDtmiNorTermV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_wum;1",
+        "@id": "dtmi:example:humpf_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Component",
             "Foobar"
           ],
-          "name": "sigma_omega",
+          "name": "humpf_sigma",
           "schema": {
-            "@id": "dtmi:example:sigma_yuzz;1",
+            "@id": "dtmi:example:humpf_tau;1",
             "@type": "Interface"
           },
           "http://foo.com/bar": true
@@ -32,7 +32,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_fuddle;1",
+        "@id": "dtmi:example:humpf_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -40,9 +40,9 @@
             "Component",
             "Foobar"
           ],
-          "name": "sigma_um",
+          "name": "humpf_phi",
           "schema": {
-            "@id": "dtmi:example:sigma_humpf;1",
+            "@id": "dtmi:example:humpf_chi;1",
             "@type": "Interface"
           },
           "http://foo.com/bar": true
diff --git a/DTDL/v3/spec/Requirement-ClassComponentPropertySchemaElementV3.json b/DTDL/v3/spec/Requirement-ClassComponentPropertySchemaElementV3.json
index 8e2b89b0..408e6b56 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentPropertySchemaElementV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentPropertySchemaElementV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_wum;1",
+        "@id": "dtmi:example:iota_delta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:vroo_yuzz;1",
+          "@id": "dtmi:example:iota_gamma;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "vroo_omega",
+            "name": "iota_beta",
             "schema": {
-              "@id": "dtmi:example:vroo_psi;1",
+              "@id": "dtmi:example:iota_alpha;1",
               "@type": "Interface"
             }
           }
@@ -32,17 +32,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_glikk;1",
+        "@id": "dtmi:example:iota_theta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:vroo_fuddle;1",
+          "@id": "dtmi:example:iota_eta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "vroo_humpf",
+            "name": "iota_zeta",
             "schema": [
               {
-                "@id": "dtmi:example:vroo_um;1",
+                "@id": "dtmi:example:iota_epsilon;1",
                 "@type": "Interface"
               }
             ]
@@ -60,14 +60,14 @@
       [
         {
           "@context": "dtmi:dtdl:context;3",
-          "@id": "dtmi:example:vroo_quan;1",
+          "@id": "dtmi:example:iota_lambda;1",
           "@type": "Interface",
           "extends": {
-            "@id": "dtmi:example:vroo_snee;1",
+            "@id": "dtmi:example:iota_kappa;1",
             "@type": "Interface",
             "contents": {
               "@type": "Component",
-              "name": "vroo_nuh",
+              "name": "iota_iota",
               "schema": "dtmi:ex:dependentRef;1"
             }
           }
@@ -89,14 +89,14 @@
       [
         {
           "@context": "dtmi:dtdl:context;3",
-          "@id": "dtmi:example:vroo_floob;1",
+          "@id": "dtmi:example:iota_xi;1",
           "@type": "Interface",
           "extends": {
-            "@id": "dtmi:example:vroo_spazz;1",
+            "@id": "dtmi:example:iota_nu;1",
             "@type": "Interface",
             "contents": {
               "@type": "Component",
-              "name": "vroo_thnad",
+              "name": "iota_mu",
               "schema": [
                 "dtmi:ex:dependentRef;1"
               ]
@@ -119,16 +119,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_itch;1",
+        "@id": "dtmi:example:iota_sigma;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:vroo_flunn;1",
+          "@id": "dtmi:example:iota_rho;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "vroo_jogg",
+            "name": "iota_pi",
             "schema": {
-              "@id": "dtmi:example:vroo_zatz;1",
+              "@id": "dtmi:example:iota_omicron;1",
               "@type": "Interface",
               "@context": "dtmi:dtdl:context;2"
             }
@@ -145,14 +145,67 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_hi;1",
+        "@id": "dtmi:example:iota_chi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:vroo_vroo;1",
+          "@id": "dtmi:example:iota_phi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "vroo_yekk",
+            "name": "iota_upsilon",
+            "schema": {
+              "@id": "dtmi:example:iota_tau;1",
+              "@type": "Interface",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:iota_wum;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:iota_yuzz;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Component",
+            "name": "iota_omega",
+            "schema": {
+              "@id": "dtmi:example:iota_psi;1",
+              "@type": "Interface",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:iota_fuddle;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:iota_humpf;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "iota_um",
             "schema": []
           }
         }
@@ -167,15 +220,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_gamma;1",
+        "@id": "dtmi:example:iota_snee;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:hi_beta;1",
+          "@id": "dtmi:example:iota_nuh;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Component",
-            "name": "hi_alpha",
+            "name": "iota_glikk",
             "schema": []
           }
         }
@@ -190,21 +243,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_theta;1",
+        "@id": "dtmi:example:iota_zatz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:hi_eta;1",
+          "@id": "dtmi:example:iota_floob;1",
           "@type": "Interface",
           "contents": {
             "@type": "Component",
-            "name": "hi_zeta",
+            "name": "iota_spazz",
             "schema": [
               {
-                "@id": "dtmi:example:hi_delta;1",
+                "@id": "dtmi:example:iota_quan;1",
                 "@type": "Interface"
               },
               {
-                "@id": "dtmi:example:hi_epsilon;1",
+                "@id": "dtmi:example:iota_thnad;1",
                 "@type": "Interface"
               }
             ]
@@ -221,22 +274,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_nu;1",
+        "@id": "dtmi:example:iota_vroo;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:hi_mu;1",
+          "@id": "dtmi:example:iota_yekk;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Component",
-            "name": "hi_lambda",
+            "name": "iota_itch",
             "schema": [
               {
-                "@id": "dtmi:example:hi_iota;1",
+                "@id": "dtmi:example:iota_jogg;1",
                 "@type": "Interface"
               },
               {
-                "@id": "dtmi:example:hi_kappa;1",
+                "@id": "dtmi:example:iota_flunn;1",
                 "@type": "Interface"
               }
             ]
diff --git a/DTDL/v3/spec/Requirement-ClassComponentPropertySchemaTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassComponentPropertySchemaTermAndDtmiV3.json
index d4055b9d..187472bb 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentPropertySchemaTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentPropertySchemaTermAndDtmiV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_omega;1",
+        "@id": "dtmi:example:nu_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "gamma_phi",
+          "name": "nu_eta",
           "schema": {
-            "@id": "dtmi:example:gamma_chi;1",
+            "@id": "dtmi:example:nu_theta;1",
             "@type": "Interface"
           },
           "dtmi:dtdl:property:schema;3": {
-            "@id": "dtmi:example:gamma_psi;1",
+            "@id": "dtmi:example:nu_iota;1",
             "@type": "Interface"
           }
         }
@@ -32,18 +32,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_humpf;1",
+        "@id": "dtmi:example:nu_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "gamma_yuzz",
+          "name": "nu_lambda",
           "schema": {
-            "@id": "dtmi:example:gamma_wum;1",
+            "@id": "dtmi:example:nu_mu;1",
             "@type": "Interface"
           },
           "dtmi:dtdl:property:schema;3": {
-            "@id": "dtmi:example:gamma_um;1",
+            "@id": "dtmi:example:nu_nu;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassComponentPropertySchemaTypeConformanceV3.json b/DTDL/v3/spec/Requirement-ClassComponentPropertySchemaTypeConformanceV3.json
index d0936615..63d5bdb9 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentPropertySchemaTypeConformanceV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentPropertySchemaTypeConformanceV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_chi;1",
+        "@id": "dtmi:example:kappa_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "hi_phi",
+          "name": "kappa_eta",
           "schema": {
-            "@id": "dtmi:example:hi_upsilon;1",
-            "elementSchema": "boolean",
+            "@id": "dtmi:example:kappa_zeta;1",
+            "elementSchema": "duration",
             "@type": "Array"
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_yuzz;1",
+        "@id": "dtmi:example:kappa_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "hi_omega",
+          "name": "kappa_kappa",
           "schema": {
-            "@id": "dtmi:example:hi_psi;1",
-            "elementSchema": "date",
+            "@id": "dtmi:example:kappa_iota;1",
+            "elementSchema": "float",
             "@type": "Array"
           }
         }
@@ -52,14 +52,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_fuddle;1",
+        "@id": "dtmi:example:kappa_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "hi_humpf",
+          "name": "kappa_xi",
           "schema": {
-            "@id": "dtmi:example:hi_wum;1",
-            "name": "hi_um",
+            "@id": "dtmi:example:kappa_mu;1",
+            "name": "kappa_nu",
             "@type": "Command"
           }
         }
@@ -74,15 +74,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_quan;1",
+        "@id": "dtmi:example:kappa_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "hi_snee",
+          "name": "kappa_sigma",
           "schema": {
-            "@id": "dtmi:example:hi_glikk;1",
-            "name": "hi_nuh",
+            "@id": "dtmi:example:kappa_pi;1",
+            "name": "kappa_rho",
             "@type": "Command"
           }
         }
@@ -97,15 +97,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_zatz;1",
+        "@id": "dtmi:example:kappa_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "hi_floob",
+          "name": "kappa_chi",
           "schema": {
-            "@id": "dtmi:example:hi_thnad;1",
-            "name": "hi_spazz",
-            "schema": "dateTime",
+            "@id": "dtmi:example:kappa_upsilon;1",
+            "name": "kappa_phi",
+            "schema": "integer",
             "@type": "CommandRequest"
           }
         }
@@ -120,16 +120,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_yekk;1",
+        "@id": "dtmi:example:kappa_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "hi_itch",
+          "name": "kappa_wum",
           "schema": {
-            "@id": "dtmi:example:hi_jogg;1",
-            "name": "hi_flunn",
-            "schema": "double",
+            "@id": "dtmi:example:kappa_omega;1",
+            "name": "kappa_yuzz",
+            "schema": "long",
             "@type": "CommandRequest"
           }
         }
@@ -144,15 +144,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_beta;1",
+        "@id": "dtmi:example:kappa_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "alpha_alpha",
+          "name": "kappa_glikk",
           "schema": {
-            "@id": "dtmi:example:hi_vroo;1",
-            "name": "hi_hi",
-            "schema": "duration",
+            "@id": "dtmi:example:kappa_humpf;1",
+            "name": "kappa_fuddle",
+            "schema": "string",
             "@type": "CommandResponse"
           }
         }
@@ -167,16 +167,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_zeta;1",
+        "@id": "dtmi:example:kappa_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "alpha_epsilon",
+          "name": "kappa_thnad",
           "schema": {
-            "@id": "dtmi:example:alpha_gamma;1",
-            "name": "alpha_delta",
-            "schema": "float",
+            "@id": "dtmi:example:kappa_snee;1",
+            "name": "kappa_quan",
+            "schema": "time",
             "@type": "CommandResponse"
           }
         }
@@ -191,16 +191,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_lambda;1",
+        "@id": "dtmi:example:kappa_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "alpha_kappa",
+          "name": "kappa_flunn",
           "schema": {
-            "@id": "dtmi:example:alpha_eta;1",
-            "name": "alpha_theta",
+            "@id": "dtmi:example:kappa_floob;1",
+            "name": "kappa_zatz",
             "schema": {
-              "@id": "dtmi:example:alpha_iota;1",
+              "@id": "dtmi:example:kappa_jogg;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -217,17 +217,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_pi;1",
+        "@id": "dtmi:example:lambda_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "alpha_omicron",
+          "name": "lambda_alpha",
           "schema": {
-            "@id": "dtmi:example:alpha_mu;1",
-            "name": "alpha_nu",
+            "@id": "dtmi:example:kappa_yekk;1",
+            "name": "kappa_vroo",
             "schema": {
-              "@id": "dtmi:example:alpha_xi;1",
+              "@id": "dtmi:example:kappa_hi;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -244,13 +244,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_tau;1",
+        "@id": "dtmi:example:lambda_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "alpha_sigma",
+          "name": "lambda_delta",
           "schema": {
-            "@id": "dtmi:example:alpha_rho;1",
+            "@id": "dtmi:example:lambda_gamma;1",
             "valueSchema": "integer",
             "@type": "Enum"
           }
@@ -266,14 +266,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_chi;1",
+        "@id": "dtmi:example:lambda_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "alpha_phi",
+          "name": "lambda_eta",
           "schema": {
-            "@id": "dtmi:example:alpha_upsilon;1",
+            "@id": "dtmi:example:lambda_zeta;1",
             "valueSchema": "integer",
             "@type": "Enum"
           }
@@ -289,15 +289,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_wum;1",
+        "@id": "dtmi:example:lambda_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "alpha_yuzz",
+          "name": "lambda_lambda",
           "schema": {
-            "@id": "dtmi:example:alpha_psi;1",
-            "enumValue": 1117,
-            "name": "alpha_omega",
+            "@id": "dtmi:example:lambda_iota;1",
+            "enumValue": 1130,
+            "name": "lambda_kappa",
             "@type": "EnumValue"
           }
         }
@@ -312,16 +312,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_glikk;1",
+        "@id": "dtmi:example:lambda_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "alpha_fuddle",
+          "name": "lambda_omicron",
           "schema": {
-            "@id": "dtmi:example:alpha_um;1",
-            "enumValue": 1118,
-            "name": "alpha_humpf",
+            "@id": "dtmi:example:lambda_nu;1",
+            "enumValue": 1131,
+            "name": "lambda_xi",
             "@type": "EnumValue"
           }
         }
@@ -336,15 +336,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_thnad;1",
+        "@id": "dtmi:example:lambda_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "alpha_quan",
+          "name": "lambda_tau",
           "schema": {
-            "@id": "dtmi:example:alpha_nuh;1",
-            "name": "alpha_snee",
-            "schema": "integer",
+            "@id": "dtmi:example:lambda_rho;1",
+            "name": "lambda_sigma",
+            "schema": "boolean",
             "@type": "Field"
           }
         }
@@ -359,16 +359,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_jogg;1",
+        "@id": "dtmi:example:lambda_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "alpha_zatz",
+          "name": "lambda_psi",
           "schema": {
-            "@id": "dtmi:example:alpha_spazz;1",
-            "name": "alpha_floob",
-            "schema": "long",
+            "@id": "dtmi:example:lambda_phi;1",
+            "name": "lambda_chi",
+            "schema": "date",
             "@type": "Field"
           }
         }
@@ -383,13 +383,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_yekk;1",
+        "@id": "dtmi:example:lambda_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "alpha_itch",
+          "name": "lambda_wum",
           "schema": {
-            "@id": "dtmi:example:alpha_flunn;1",
+            "@id": "dtmi:example:lambda_yuzz;1",
             "@type": "Interface"
           }
         }
@@ -404,20 +404,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_gamma;1",
+        "@id": "dtmi:example:lambda_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "beta_beta",
+          "name": "lambda_nuh",
           "schema": {
-            "@id": "dtmi:example:alpha_vroo;1",
+            "@id": "dtmi:example:lambda_humpf;1",
             "mapKey": {
-              "name": "alpha_hi",
+              "name": "lambda_fuddle",
               "schema": "string"
             },
             "mapValue": {
-              "name": "beta_alpha",
-              "schema": "string"
+              "name": "lambda_glikk",
+              "schema": "dateTime"
             },
             "@type": "Map"
           }
@@ -433,21 +433,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_theta;1",
+        "@id": "dtmi:example:lambda_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "beta_eta",
+          "name": "lambda_floob",
           "schema": {
-            "@id": "dtmi:example:beta_delta;1",
+            "@id": "dtmi:example:lambda_quan;1",
             "mapKey": {
-              "name": "beta_epsilon",
+              "name": "lambda_thnad",
               "schema": "string"
             },
             "mapValue": {
-              "name": "beta_zeta",
-              "schema": "time"
+              "name": "lambda_spazz",
+              "schema": "double"
             },
             "@type": "Map"
           }
@@ -463,14 +463,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_mu;1",
+        "@id": "dtmi:example:lambda_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "beta_lambda",
+          "name": "lambda_itch",
           "schema": {
-            "@id": "dtmi:example:beta_iota;1",
-            "name": "beta_kappa",
+            "@id": "dtmi:example:lambda_jogg;1",
+            "name": "lambda_flunn",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -486,15 +486,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_pi;1",
+        "@id": "dtmi:example:mu_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "beta_omicron",
+          "name": "mu_alpha",
           "schema": {
-            "@id": "dtmi:example:beta_nu;1",
-            "name": "beta_xi",
+            "@id": "dtmi:example:lambda_vroo;1",
+            "name": "lambda_hi",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -510,15 +510,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_upsilon;1",
+        "@id": "dtmi:example:mu_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "beta_tau",
+          "name": "mu_epsilon",
           "schema": {
-            "@id": "dtmi:example:beta_rho;1",
-            "name": "beta_sigma",
-            "schema": "boolean",
+            "@id": "dtmi:example:mu_gamma;1",
+            "name": "mu_delta",
+            "schema": "duration",
             "@type": "MapValue"
           }
         }
@@ -533,16 +533,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_omega;1",
+        "@id": "dtmi:example:mu_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "beta_psi",
+          "name": "mu_iota",
           "schema": {
-            "@id": "dtmi:example:beta_phi;1",
-            "name": "beta_chi",
-            "schema": "date",
+            "@id": "dtmi:example:mu_eta;1",
+            "name": "mu_theta",
+            "schema": "float",
             "@type": "MapValue"
           }
         }
@@ -557,13 +557,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_um;1",
+        "@id": "dtmi:example:mu_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "beta_wum",
+          "name": "mu_mu",
           "schema": {
-            "@id": "dtmi:example:beta_yuzz;1",
+            "@id": "dtmi:example:mu_lambda;1",
             "@type": "Object"
           }
         }
@@ -578,14 +578,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_glikk;1",
+        "@id": "dtmi:example:mu_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "beta_fuddle",
+          "name": "mu_omicron",
           "schema": {
-            "@id": "dtmi:example:beta_humpf;1",
+            "@id": "dtmi:example:mu_xi;1",
             "@type": "Object"
           }
         }
@@ -600,15 +600,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_thnad;1",
+        "@id": "dtmi:example:mu_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "beta_quan",
+          "name": "mu_tau",
           "schema": {
-            "@id": "dtmi:example:beta_nuh;1",
-            "name": "beta_snee",
-            "schema": "dateTime",
+            "@id": "dtmi:example:mu_rho;1",
+            "name": "mu_sigma",
+            "schema": "integer",
             "@type": "Property"
           }
         }
@@ -623,16 +623,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_jogg;1",
+        "@id": "dtmi:example:mu_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "beta_zatz",
+          "name": "mu_psi",
           "schema": {
-            "@id": "dtmi:example:beta_spazz;1",
-            "name": "beta_floob",
-            "schema": "double",
+            "@id": "dtmi:example:mu_phi;1",
+            "name": "mu_chi",
+            "schema": "long",
             "@type": "Property"
           }
         }
@@ -647,14 +647,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_vroo;1",
+        "@id": "dtmi:example:mu_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "beta_yekk",
+          "name": "mu_um",
           "schema": {
-            "@id": "dtmi:example:beta_flunn;1",
-            "name": "beta_itch",
+            "@id": "dtmi:example:mu_yuzz;1",
+            "name": "mu_wum",
             "@type": "Relationship"
           }
         }
@@ -669,15 +669,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_gamma;1",
+        "@id": "dtmi:example:mu_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "gamma_beta",
+          "name": "mu_nuh",
           "schema": {
-            "@id": "dtmi:example:beta_hi;1",
-            "name": "gamma_alpha",
+            "@id": "dtmi:example:mu_fuddle;1",
+            "name": "mu_glikk",
             "@type": "Relationship"
           }
         }
@@ -692,15 +692,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_eta;1",
+        "@id": "dtmi:example:mu_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "gamma_zeta",
+          "name": "mu_spazz",
           "schema": {
-            "@id": "dtmi:example:gamma_delta;1",
-            "name": "gamma_epsilon",
-            "schema": "duration",
+            "@id": "dtmi:example:mu_quan;1",
+            "name": "mu_thnad",
+            "schema": "string",
             "@type": "Telemetry"
           }
         }
@@ -715,16 +715,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_lambda;1",
+        "@id": "dtmi:example:mu_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "gamma_kappa",
+          "name": "mu_flunn",
           "schema": {
-            "@id": "dtmi:example:gamma_theta;1",
-            "name": "gamma_iota",
-            "schema": "float",
+            "@id": "dtmi:example:mu_zatz;1",
+            "name": "mu_jogg",
+            "schema": "time",
             "@type": "Telemetry"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassComponentRequiredPropertiesV3.json b/DTDL/v3/spec/Requirement-ClassComponentRequiredPropertiesV3.json
index b7aed483..7fa88c39 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentRequiredPropertiesV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentRequiredPropertiesV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_wum;1",
+        "@id": "dtmi:example:gamma_delta;1",
         "@type": "Interface",
         "contents": {
-          "name": "floob_omega",
+          "name": "gamma_beta",
           "schema": {
-            "@id": "dtmi:example:floob_yuzz;1",
+            "@id": "dtmi:example:gamma_gamma;1",
             "@type": "Interface"
           }
         }
@@ -27,13 +27,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_fuddle;1",
+        "@id": "dtmi:example:gamma_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "floob_um",
+          "name": "gamma_epsilon",
           "schema": {
-            "@id": "dtmi:example:floob_humpf;1",
+            "@id": "dtmi:example:gamma_zeta;1",
             "@type": "Interface"
           }
         }
@@ -48,12 +48,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_nuh;1",
+        "@id": "dtmi:example:gamma_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:floob_glikk;1",
+            "@id": "dtmi:example:gamma_theta;1",
             "@type": "Interface"
           }
         }
@@ -68,13 +68,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_quan;1",
+        "@id": "dtmi:example:gamma_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
           "schema": {
-            "@id": "dtmi:example:floob_snee;1",
+            "@id": "dtmi:example:gamma_kappa;1",
             "@type": "Interface"
           }
         }
@@ -89,11 +89,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_spazz;1",
+        "@id": "dtmi:example:gamma_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Component",
-          "name": "floob_thnad"
+          "name": "gamma_mu"
         }
       }
     ]
@@ -106,12 +106,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_zatz;1",
+        "@id": "dtmi:example:gamma_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Component",
-          "name": "floob_floob"
+          "name": "gamma_xi"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassComponentTypeIncludesInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassComponentTypeIncludesInvalidDtmiV3.json
index 98ec047a..47734f0c 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentTypeIncludesInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentTypeIncludesInvalidDtmiV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_kappa;1",
+        "@id": "dtmi:example:epsilon_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Component",
             "dtmi:foo//bar"
           ],
-          "name": "flunn_theta",
+          "name": "epsilon_fuddle",
           "schema": {
-            "@id": "dtmi:example:flunn_iota;1",
+            "@id": "dtmi:example:epsilon_glikk;1",
             "@type": "Interface"
           }
         }
@@ -31,7 +31,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_nu;1",
+        "@id": "dtmi:example:epsilon_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -39,9 +39,9 @@
             "Component",
             "dtmi:foo//bar"
           ],
-          "name": "flunn_lambda",
+          "name": "epsilon_snee",
           "schema": {
-            "@id": "dtmi:example:flunn_mu;1",
+            "@id": "dtmi:example:epsilon_quan;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassComponentTypeIncludesMaterialV3.json b/DTDL/v3/spec/Requirement-ClassComponentTypeIncludesMaterialV3.json
index 39104117..480e3299 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentTypeIncludesMaterialV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentTypeIncludesMaterialV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_beta;1",
+        "@id": "dtmi:example:delta_psi;1",
         "@type": "Interface",
         "contents": {
-          "name": "zatz_hi",
+          "name": "delta_phi",
           "schema": {
-            "@id": "dtmi:example:jogg_alpha;1",
+            "@id": "dtmi:example:delta_chi;1",
             "@type": "Interface"
           },
           "@type": "Component"
@@ -28,12 +28,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_epsilon;1",
+        "@id": "dtmi:example:delta_wum;1",
         "@type": "Interface",
         "contents": {
-          "name": "jogg_gamma",
+          "name": "delta_omega",
           "schema": {
-            "@id": "dtmi:example:jogg_delta;1",
+            "@id": "dtmi:example:delta_yuzz;1",
             "@type": "Interface"
           },
           "@type": [
@@ -51,12 +51,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_theta;1",
+        "@id": "dtmi:example:delta_fuddle;1",
         "@type": "Interface",
         "contents": {
-          "name": "jogg_zeta",
+          "name": "delta_um",
           "schema": {
-            "@id": "dtmi:example:jogg_eta;1",
+            "@id": "dtmi:example:delta_humpf;1",
             "@type": "Interface"
           },
           "@type": "dtmi:dtdl:class:Component;3"
@@ -72,12 +72,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_lambda;1",
+        "@id": "dtmi:example:delta_snee;1",
         "@type": "Interface",
         "contents": {
-          "name": "jogg_iota",
+          "name": "delta_glikk",
           "schema": {
-            "@id": "dtmi:example:jogg_kappa;1",
+            "@id": "dtmi:example:delta_nuh;1",
             "@type": "Interface"
           },
           "@type": [
@@ -95,12 +95,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_xi;1",
+        "@id": "dtmi:example:delta_spazz;1",
         "@type": "Interface",
         "contents": {
-          "name": "jogg_mu",
+          "name": "delta_quan",
           "schema": {
-            "@id": "dtmi:example:jogg_nu;1",
+            "@id": "dtmi:example:delta_thnad;1",
             "@type": "Interface"
           },
           "@type": "Something"
@@ -116,13 +116,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_rho;1",
+        "@id": "dtmi:example:delta_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "jogg_omicron",
+          "name": "delta_floob",
           "schema": {
-            "@id": "dtmi:example:jogg_pi;1",
+            "@id": "dtmi:example:delta_zatz;1",
             "@type": "Interface"
           },
           "@type": "Something"
@@ -138,12 +138,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_upsilon;1",
+        "@id": "dtmi:example:delta_yekk;1",
         "@type": "Interface",
         "contents": {
-          "name": "jogg_sigma",
+          "name": "delta_flunn",
           "schema": {
-            "@id": "dtmi:example:jogg_tau;1",
+            "@id": "dtmi:example:delta_itch;1",
             "@type": "Interface"
           },
           "@type": [
@@ -161,13 +161,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_psi;1",
+        "@id": "dtmi:example:epsilon_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "jogg_phi",
+          "name": "delta_vroo",
           "schema": {
-            "@id": "dtmi:example:jogg_chi;1",
+            "@id": "dtmi:example:delta_hi;1",
             "@type": "Interface"
           },
           "@type": [
diff --git a/DTDL/v3/spec/Requirement-ClassComponentTypeIncludesNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassComponentTypeIncludesNotDtmiNorTermV3.json
index ec8ea9e9..f4ef15c4 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentTypeIncludesNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentTypeIncludesNotDtmiNorTermV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_pi;1",
+        "@id": "dtmi:example:epsilon_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Component",
             "http://foo.com/bar"
           ],
-          "name": "flunn_xi",
+          "name": "epsilon_spazz",
           "schema": {
-            "@id": "dtmi:example:flunn_omicron;1",
+            "@id": "dtmi:example:epsilon_floob;1",
             "@type": "Interface"
           }
         }
@@ -31,7 +31,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_tau;1",
+        "@id": "dtmi:example:epsilon_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -39,9 +39,9 @@
             "Component",
             "http://foo.com/bar"
           ],
-          "name": "flunn_rho",
+          "name": "epsilon_jogg",
           "schema": {
-            "@id": "dtmi:example:flunn_sigma;1",
+            "@id": "dtmi:example:epsilon_flunn;1",
             "@type": "Interface"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassComponentTypeStringOrArrayV3.json b/DTDL/v3/spec/Requirement-ClassComponentTypeStringOrArrayV3.json
index c12dfafb..57050de9 100644
--- a/DTDL/v3/spec/Requirement-ClassComponentTypeStringOrArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassComponentTypeStringOrArrayV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_itch;1",
+        "@id": "dtmi:example:gamma_sigma;1",
         "@type": "Interface",
         "contents": {
-          "name": "floob_jogg",
+          "name": "gamma_pi",
           "schema": {
-            "@id": "dtmi:example:floob_flunn;1",
+            "@id": "dtmi:example:gamma_rho;1",
             "@type": "Interface"
           },
           "@type": 626
@@ -28,13 +28,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_hi;1",
+        "@id": "dtmi:example:gamma_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "floob_yekk",
+          "name": "gamma_tau",
           "schema": {
-            "@id": "dtmi:example:floob_vroo;1",
+            "@id": "dtmi:example:gamma_upsilon;1",
             "@type": "Interface"
           },
           "@type": 626
@@ -50,12 +50,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_gamma;1",
+        "@id": "dtmi:example:gamma_omega;1",
         "@type": "Interface",
         "contents": {
-          "name": "zatz_alpha",
+          "name": "gamma_chi",
           "schema": {
-            "@id": "dtmi:example:zatz_beta;1",
+            "@id": "dtmi:example:gamma_psi;1",
             "@type": "Interface"
           },
           "@type": null
@@ -71,13 +71,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_zeta;1",
+        "@id": "dtmi:example:gamma_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "zatz_delta",
+          "name": "gamma_yuzz",
           "schema": {
-            "@id": "dtmi:example:zatz_epsilon;1",
+            "@id": "dtmi:example:gamma_wum;1",
             "@type": "Interface"
           },
           "@type": null
@@ -93,12 +93,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_iota;1",
+        "@id": "dtmi:example:gamma_glikk;1",
         "@type": "Interface",
         "contents": {
-          "name": "zatz_eta",
+          "name": "gamma_humpf",
           "schema": {
-            "@id": "dtmi:example:zatz_theta;1",
+            "@id": "dtmi:example:gamma_fuddle;1",
             "@type": "Interface"
           },
           "@type": true
@@ -114,13 +114,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_mu;1",
+        "@id": "dtmi:example:gamma_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "zatz_kappa",
+          "name": "gamma_nuh",
           "schema": {
-            "@id": "dtmi:example:zatz_lambda;1",
+            "@id": "dtmi:example:gamma_snee;1",
             "@type": "Interface"
           },
           "@type": true
@@ -136,12 +136,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_omicron;1",
+        "@id": "dtmi:example:gamma_floob;1",
         "@type": "Interface",
         "contents": {
-          "name": "zatz_nu",
+          "name": "gamma_thnad",
           "schema": {
-            "@id": "dtmi:example:zatz_xi;1",
+            "@id": "dtmi:example:gamma_spazz;1",
             "@type": "Interface"
           },
           "@type": {}
@@ -157,13 +157,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_sigma;1",
+        "@id": "dtmi:example:gamma_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "zatz_pi",
+          "name": "gamma_zatz",
           "schema": {
-            "@id": "dtmi:example:zatz_rho;1",
+            "@id": "dtmi:example:gamma_jogg;1",
             "@type": "Interface"
           },
           "@type": {}
@@ -179,12 +179,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_phi;1",
+        "@id": "dtmi:example:gamma_vroo;1",
         "@type": "Interface",
         "contents": {
-          "name": "zatz_tau",
+          "name": "gamma_itch",
           "schema": {
-            "@id": "dtmi:example:zatz_upsilon;1",
+            "@id": "dtmi:example:gamma_yekk;1",
             "@type": "Interface"
           },
           "@type": [
@@ -202,13 +202,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_omega;1",
+        "@id": "dtmi:example:delta_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "zatz_chi",
+          "name": "gamma_hi",
           "schema": {
-            "@id": "dtmi:example:zatz_psi;1",
+            "@id": "dtmi:example:delta_alpha;1",
             "@type": "Interface"
           },
           "@type": [
@@ -226,12 +226,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_um;1",
+        "@id": "dtmi:example:delta_epsilon;1",
         "@type": "Interface",
         "contents": {
-          "name": "zatz_yuzz",
+          "name": "delta_gamma",
           "schema": {
-            "@id": "dtmi:example:zatz_wum;1",
+            "@id": "dtmi:example:delta_delta;1",
             "@type": "Interface"
           },
           "@type": [
@@ -249,13 +249,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_glikk;1",
+        "@id": "dtmi:example:delta_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "zatz_humpf",
+          "name": "delta_zeta",
           "schema": {
-            "@id": "dtmi:example:zatz_fuddle;1",
+            "@id": "dtmi:example:delta_eta;1",
             "@type": "Interface"
           },
           "@type": [
@@ -273,12 +273,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_quan;1",
+        "@id": "dtmi:example:delta_lambda;1",
         "@type": "Interface",
         "contents": {
-          "name": "zatz_nuh",
+          "name": "delta_iota",
           "schema": {
-            "@id": "dtmi:example:zatz_snee;1",
+            "@id": "dtmi:example:delta_kappa;1",
             "@type": "Interface"
           },
           "@type": [
@@ -296,13 +296,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_floob;1",
+        "@id": "dtmi:example:delta_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "zatz_thnad",
+          "name": "delta_mu",
           "schema": {
-            "@id": "dtmi:example:zatz_spazz;1",
+            "@id": "dtmi:example:delta_nu;1",
             "@type": "Interface"
           },
           "@type": [
@@ -320,12 +320,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_flunn;1",
+        "@id": "dtmi:example:delta_rho;1",
         "@type": "Interface",
         "contents": {
-          "name": "zatz_zatz",
+          "name": "delta_omicron",
           "schema": {
-            "@id": "dtmi:example:zatz_jogg;1",
+            "@id": "dtmi:example:delta_pi;1",
             "@type": "Interface"
           },
           "@type": [
@@ -343,13 +343,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_vroo;1",
+        "@id": "dtmi:example:delta_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "zatz_itch",
+          "name": "delta_sigma",
           "schema": {
-            "@id": "dtmi:example:zatz_yekk;1",
+            "@id": "dtmi:example:delta_tau;1",
             "@type": "Interface"
           },
           "@type": [
diff --git a/DTDL/v3/spec/Requirement-ClassEnumContextConformsV3.json b/DTDL/v3/spec/Requirement-ClassEnumContextConformsV3.json
index 71046fa3..8faf9ccc 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumContextConformsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumContextConformsV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_tau;1",
+        "@id": "dtmi:example:floob_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_sigma",
+          "name": "floob_mu",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
@@ -29,11 +29,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_phi;1",
+        "@id": "dtmi:example:floob_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_upsilon",
+          "name": "floob_xi",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
@@ -51,11 +51,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_psi;1",
+        "@id": "dtmi:example:floob_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_chi",
+          "name": "floob_pi",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
@@ -75,11 +75,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_yuzz;1",
+        "@id": "dtmi:example:floob_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_omega",
+          "name": "floob_sigma",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
@@ -97,11 +97,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_um;1",
+        "@id": "dtmi:example:floob_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_wum",
+          "name": "floob_upsilon",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
@@ -119,11 +119,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_fuddle;1",
+        "@id": "dtmi:example:floob_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_humpf",
+          "name": "floob_chi",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
@@ -141,11 +141,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_nuh;1",
+        "@id": "dtmi:example:floob_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_glikk",
+          "name": "floob_omega",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
@@ -165,11 +165,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_quan;1",
+        "@id": "dtmi:example:floob_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_snee",
+          "name": "floob_wum",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
@@ -189,11 +189,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_spazz;1",
+        "@id": "dtmi:example:floob_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_thnad",
+          "name": "floob_humpf",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
@@ -213,15 +213,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_zatz;1",
+        "@id": "dtmi:example:floob_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_floob",
+          "name": "floob_glikk",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
-            "@context": {}
+            "@context": "dtmi:dtdl:extension:quantitativeTypes"
           }
         }
       }
@@ -235,17 +235,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_flunn;1",
+        "@id": "dtmi:example:floob_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_jogg",
+          "name": "floob_snee",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
-            "@context": [
-              {}
-            ]
+            "@context": "http://dtdl/extension/quantitativeTypes/1"
           }
         }
       }
@@ -259,15 +257,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_yekk;1",
+        "@id": "dtmi:example:floob_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_itch",
+          "name": "floob_thnad",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
-            "@context": "dtmi:dtdl:extension:quantitativeTypes"
+            "@context": "quantitativeTypes;1"
           }
         }
       }
@@ -281,15 +279,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_hi;1",
+        "@id": "dtmi:example:floob_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_vroo",
+          "name": "floob_floob",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
-            "@context": "http://dtdl/extension/quantitativeTypes/1"
+            "@context": {}
           }
         }
       }
@@ -303,15 +301,67 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_beta;1",
+        "@id": "dtmi:example:floob_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "um_alpha",
+          "name": "floob_jogg",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
-            "@context": "quantitativeTypes;1"
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:floob_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "floob_itch",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:floob_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "floob_vroo",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumIdDuplicateV3.json b/DTDL/v3/spec/Requirement-ClassEnumIdDuplicateV3.json
index ff3d91cf..2bd5be4e 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumIdDuplicateV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumIdDuplicateV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_spazz;1",
+        "@id": "dtmi:example:jogg_quan;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:humpf_spazz;1",
+          "@id": "dtmi:example:jogg_quan;1",
           "@type": "Property",
-          "name": "humpf_floob",
+          "name": "jogg_thnad",
           "schema": {
-            "@id": "dtmi:example:humpf_spazz;1",
+            "@id": "dtmi:example:jogg_quan;1",
             "@type": "Enum",
             "valueSchema": "integer"
           }
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_zatz;1",
+        "@id": "dtmi:example:jogg_spazz;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:humpf_zatz;1",
+          "@id": "dtmi:example:jogg_spazz;1",
           "@type": "Property",
-          "name": "humpf_jogg",
+          "name": "jogg_floob",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "@id": "dtmi:example:humpf_zatz;1",
+            "@id": "dtmi:example:jogg_spazz;1",
             "@type": "Enum",
             "valueSchema": "integer"
           }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumIdIsDtmiV3.json b/DTDL/v3/spec/Requirement-ClassEnumIdIsDtmiV3.json
index c54993ff..c29ab8c0 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumIdIsDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumIdIsDtmiV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_iota;1",
+        "@id": "dtmi:example:zatz_eta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;7",
@@ -25,7 +25,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_kappa;1",
+        "@id": "dtmi:example:zatz_theta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;108675309",
@@ -43,7 +43,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_lambda;1",
+        "@id": "dtmi:example:zatz_iota;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;999999999",
@@ -61,7 +61,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_mu;1",
+        "@id": "dtmi:example:zatz_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo;1",
@@ -79,7 +79,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_nu;1",
+        "@id": "dtmi:example:zatz_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar",
@@ -97,7 +97,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_xi;1",
+        "@id": "dtmi:example:zatz_mu;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.14",
@@ -115,7 +115,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_omicron;1",
+        "@id": "dtmi:example:zatz_nu;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.141592",
@@ -133,7 +133,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_pi;1",
+        "@id": "dtmi:example:zatz_xi;1",
         "@type": "Interface",
         "schemas": {
           "@id": null,
@@ -151,7 +151,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_rho;1",
+        "@id": "dtmi:example:zatz_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -170,7 +170,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_sigma;1",
+        "@id": "dtmi:example:zatz_pi;1",
         "@type": "Interface",
         "schemas": {
           "@id": 626,
@@ -188,7 +188,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_tau;1",
+        "@id": "dtmi:example:zatz_rho;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -207,7 +207,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_upsilon;1",
+        "@id": "dtmi:example:zatz_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@id": true,
@@ -225,7 +225,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_phi;1",
+        "@id": "dtmi:example:zatz_tau;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -244,7 +244,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_chi;1",
+        "@id": "dtmi:example:zatz_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@id": {
@@ -264,7 +264,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_psi;1",
+        "@id": "dtmi:example:zatz_phi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -285,7 +285,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_omega;1",
+        "@id": "dtmi:example:zatz_chi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;0",
@@ -303,7 +303,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_yuzz;1",
+        "@id": "dtmi:example:zatz_psi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -322,7 +322,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_wum;1",
+        "@id": "dtmi:example:zatz_omega;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;0.0",
@@ -340,7 +340,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_um;1",
+        "@id": "dtmi:example:zatz_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -359,7 +359,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_humpf;1",
+        "@id": "dtmi:example:zatz_wum;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;1234567890",
@@ -377,7 +377,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_fuddle;1",
+        "@id": "dtmi:example:zatz_um;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -396,7 +396,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_glikk;1",
+        "@id": "dtmi:example:zatz_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;1a",
@@ -414,7 +414,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_nuh;1",
+        "@id": "dtmi:example:zatz_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -433,7 +433,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_snee;1",
+        "@id": "dtmi:example:zatz_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.0",
@@ -451,7 +451,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_quan;1",
+        "@id": "dtmi:example:zatz_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -470,7 +470,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_thnad;1",
+        "@id": "dtmi:example:zatz_snee;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.1415926",
@@ -488,7 +488,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_spazz;1",
+        "@id": "dtmi:example:zatz_quan;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -507,7 +507,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_floob;1",
+        "@id": "dtmi:example:zatz_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;6.02",
@@ -525,7 +525,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_zatz;1",
+        "@id": "dtmi:example:zatz_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -544,7 +544,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_jogg;1",
+        "@id": "dtmi:example:zatz_floob;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;0.1",
@@ -562,7 +562,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_flunn;1",
+        "@id": "dtmi:example:zatz_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -581,7 +581,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_itch;1",
+        "@id": "dtmi:example:zatz_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;01",
@@ -599,7 +599,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_yekk;1",
+        "@id": "dtmi:example:zatz_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -618,7 +618,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_vroo;1",
+        "@id": "dtmi:example:zatz_itch;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;",
@@ -636,7 +636,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_hi;1",
+        "@id": "dtmi:example:zatz_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -655,7 +655,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_alpha;1",
+        "@id": "dtmi:example:zatz_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:test:invalidId_;1",
@@ -673,7 +673,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_beta;1",
+        "@id": "dtmi:example:zatz_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -692,7 +692,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_gamma;1",
+        "@id": "dtmi:example:jogg_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:test:_invalidUserId;1",
@@ -710,7 +710,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_delta;1",
+        "@id": "dtmi:example:jogg_beta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -729,7 +729,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_epsilon;1",
+        "@id": "dtmi:example:jogg_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:test:1seg;1",
@@ -747,7 +747,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_zeta;1",
+        "@id": "dtmi:example:jogg_delta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -766,7 +766,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_eta;1",
+        "@id": "dtmi:example:jogg_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar.baz;1",
@@ -784,7 +784,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_theta;1",
+        "@id": "dtmi:example:jogg_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -803,7 +803,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_iota;1",
+        "@id": "dtmi:example:jogg_eta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo::bar;1",
@@ -821,7 +821,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_kappa;1",
+        "@id": "dtmi:example:jogg_theta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -840,7 +840,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_lambda;1",
+        "@id": "dtmi:example:jogg_iota;1",
         "@type": "Interface",
         "schemas": {
           "@id": "urn:foo:bar:1",
@@ -858,7 +858,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_mu;1",
+        "@id": "dtmi:example:jogg_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -877,7 +877,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_nu;1",
+        "@id": "dtmi:example:jogg_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@id": "http://foo/bar/baz",
@@ -895,7 +895,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_xi;1",
+        "@id": "dtmi:example:jogg_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -914,7 +914,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_omicron;1",
+        "@id": "dtmi:example:jogg_nu;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:;1",
@@ -932,7 +932,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_pi;1",
+        "@id": "dtmi:example:jogg_xi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -951,7 +951,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_rho;1",
+        "@id": "dtmi:example:jogg_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:dtdl:example;1",
@@ -969,7 +969,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_sigma;1",
+        "@id": "dtmi:example:jogg_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -988,7 +988,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_tau;1",
+        "@id": "dtmi:example:jogg_rho;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:standard:example;1",
@@ -1006,7 +1006,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_upsilon;1",
+        "@id": "dtmi:example:jogg_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v3/spec/Requirement-ClassEnumIdNotArrayV3.json b/DTDL/v3/spec/Requirement-ClassEnumIdNotArrayV3.json
index ae3a9b8e..62f69e13 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumIdNotArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumIdNotArrayV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_phi;1",
+        "@id": "dtmi:example:jogg_tau;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -27,7 +27,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_chi;1",
+        "@id": "dtmi:example:jogg_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -48,7 +48,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_psi;1",
+        "@id": "dtmi:example:jogg_phi;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -68,7 +68,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_omega;1",
+        "@id": "dtmi:example:jogg_chi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -89,7 +89,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_yuzz;1",
+        "@id": "dtmi:example:jogg_psi;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -109,7 +109,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_wum;1",
+        "@id": "dtmi:example:jogg_omega;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -130,7 +130,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_um;1",
+        "@id": "dtmi:example:jogg_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -150,7 +150,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_humpf;1",
+        "@id": "dtmi:example:jogg_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -171,7 +171,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_fuddle;1",
+        "@id": "dtmi:example:jogg_um;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -191,7 +191,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_glikk;1",
+        "@id": "dtmi:example:jogg_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -212,7 +212,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_nuh;1",
+        "@id": "dtmi:example:jogg_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -232,7 +232,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_snee;1",
+        "@id": "dtmi:example:jogg_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -253,7 +253,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_quan;1",
+        "@id": "dtmi:example:jogg_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -273,7 +273,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_thnad;1",
+        "@id": "dtmi:example:jogg_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v3/spec/Requirement-ClassEnumIdRequiredV3.json b/DTDL/v3/spec/Requirement-ClassEnumIdRequiredV3.json
index eb5b3248..dbfd5f37 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumIdRequiredV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumIdRequiredV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_delta;1",
+        "@id": "dtmi:example:zatz_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "um_gamma",
+          "name": "zatz_alpha",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer"
@@ -28,10 +28,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_zeta;1",
+        "@id": "dtmi:example:zatz_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_epsilon;1",
+          "@id": "dtmi:example:zatz_gamma;1",
           "@type": "Enum",
           "valueSchema": "integer"
         }
@@ -46,7 +46,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_eta;1",
+        "@id": "dtmi:example:zatz_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@type": "Enum",
@@ -63,7 +63,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_theta;1",
+        "@id": "dtmi:example:zatz_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v3/spec/Requirement-ClassEnumInvalidKeywordsV3.json b/DTDL/v3/spec/Requirement-ClassEnumInvalidKeywordsV3.json
index b1fee6cd..02ef72bb 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumInvalidKeywordsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumInvalidKeywordsV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_quan;1",
+        "@id": "dtmi:example:delta_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_snee;1",
+          "@id": "dtmi:example:delta_jogg;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "@graph": {}
@@ -26,11 +26,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_spazz;1",
+        "@id": "dtmi:example:delta_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zatz_thnad;1",
+          "@id": "dtmi:example:delta_itch;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "@graph": {}
@@ -46,10 +46,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_zatz;1",
+        "@id": "dtmi:example:delta_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_floob;1",
+          "@id": "dtmi:example:delta_vroo;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "@value": 626
@@ -65,11 +65,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_flunn;1",
+        "@id": "dtmi:example:epsilon_beta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zatz_jogg;1",
+          "@id": "dtmi:example:epsilon_alpha;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "@value": 626
@@ -85,10 +85,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_yekk;1",
+        "@id": "dtmi:example:epsilon_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_itch;1",
+          "@id": "dtmi:example:epsilon_gamma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "@language": "en"
@@ -104,11 +104,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_hi;1",
+        "@id": "dtmi:example:epsilon_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zatz_vroo;1",
+          "@id": "dtmi:example:epsilon_epsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "@language": "en"
@@ -124,10 +124,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_beta;1",
+        "@id": "dtmi:example:epsilon_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_alpha;1",
+          "@id": "dtmi:example:epsilon_eta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "@foobar": true
@@ -143,11 +143,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_delta;1",
+        "@id": "dtmi:example:epsilon_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:jogg_gamma;1",
+          "@id": "dtmi:example:epsilon_iota;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "@foobar": true
diff --git a/DTDL/v3/spec/Requirement-ClassEnumPropertyCommentStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassEnumPropertyCommentStringLengthV3.json
index 33993172..3480d301 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumPropertyCommentStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumPropertyCommentStringLengthV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_flunn;1",
+        "@id": "dtmi:example:flunn_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_jogg;1",
+          "@id": "dtmi:example:flunn_floob;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
@@ -26,10 +26,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_yekk;1",
+        "@id": "dtmi:example:flunn_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_itch;1",
+          "@id": "dtmi:example:flunn_jogg;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_hi;1",
+        "@id": "dtmi:example:flunn_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_vroo;1",
+          "@id": "dtmi:example:flunn_itch;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
diff --git a/DTDL/v3/spec/Requirement-ClassEnumPropertyCommentStringV3.json b/DTDL/v3/spec/Requirement-ClassEnumPropertyCommentStringV3.json
index 336ffaad..0c46fbc7 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumPropertyCommentStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumPropertyCommentStringV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_itch;1",
+        "@id": "dtmi:example:jogg_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_flunn;1",
+          "@id": "dtmi:example:jogg_zatz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "comment": "hello"
@@ -26,10 +26,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_vroo;1",
+        "@id": "dtmi:example:jogg_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_yekk;1",
+          "@id": "dtmi:example:jogg_flunn;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "comment": [
@@ -47,10 +47,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_alpha;1",
+        "@id": "dtmi:example:jogg_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_hi;1",
+          "@id": "dtmi:example:jogg_yekk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "comment": {
@@ -69,10 +69,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_gamma;1",
+        "@id": "dtmi:example:flunn_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_beta;1",
+          "@id": "dtmi:example:jogg_hi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "comment": [
@@ -93,10 +93,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_epsilon;1",
+        "@id": "dtmi:example:flunn_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_delta;1",
+          "@id": "dtmi:example:flunn_beta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "comment": []
@@ -112,10 +112,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_eta;1",
+        "@id": "dtmi:example:flunn_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_zeta;1",
+          "@id": "dtmi:example:flunn_delta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "comment": null
@@ -131,11 +131,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_iota;1",
+        "@id": "dtmi:example:flunn_eta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_theta;1",
+          "@id": "dtmi:example:flunn_zeta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "comment": null
@@ -151,10 +151,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_lambda;1",
+        "@id": "dtmi:example:flunn_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_kappa;1",
+          "@id": "dtmi:example:flunn_theta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "comment": true
@@ -170,11 +170,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_nu;1",
+        "@id": "dtmi:example:flunn_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_mu;1",
+          "@id": "dtmi:example:flunn_kappa;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "comment": true
@@ -190,10 +190,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_omicron;1",
+        "@id": "dtmi:example:flunn_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_xi;1",
+          "@id": "dtmi:example:flunn_mu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "comment": 626
@@ -209,11 +209,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_rho;1",
+        "@id": "dtmi:example:flunn_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_pi;1",
+          "@id": "dtmi:example:flunn_xi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "comment": 626
@@ -229,10 +229,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_tau;1",
+        "@id": "dtmi:example:flunn_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_sigma;1",
+          "@id": "dtmi:example:flunn_pi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "comment": [
@@ -250,11 +250,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_phi;1",
+        "@id": "dtmi:example:flunn_tau;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_upsilon;1",
+          "@id": "dtmi:example:flunn_sigma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "comment": [
@@ -272,10 +272,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_psi;1",
+        "@id": "dtmi:example:flunn_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_chi;1",
+          "@id": "dtmi:example:flunn_upsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "comment": [
@@ -293,11 +293,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_yuzz;1",
+        "@id": "dtmi:example:flunn_psi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_omega;1",
+          "@id": "dtmi:example:flunn_chi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "comment": [
@@ -315,10 +315,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_um;1",
+        "@id": "dtmi:example:flunn_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_wum;1",
+          "@id": "dtmi:example:flunn_omega;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "comment": [
@@ -336,11 +336,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_fuddle;1",
+        "@id": "dtmi:example:flunn_um;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_humpf;1",
+          "@id": "dtmi:example:flunn_wum;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "comment": [
@@ -358,10 +358,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_nuh;1",
+        "@id": "dtmi:example:flunn_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_glikk;1",
+          "@id": "dtmi:example:flunn_humpf;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "comment": {}
@@ -377,11 +377,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_quan;1",
+        "@id": "dtmi:example:flunn_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_snee;1",
+          "@id": "dtmi:example:flunn_glikk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "comment": {}
@@ -397,10 +397,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_spazz;1",
+        "@id": "dtmi:example:flunn_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_thnad;1",
+          "@id": "dtmi:example:flunn_snee;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "comment": [
@@ -418,11 +418,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_zatz;1",
+        "@id": "dtmi:example:flunn_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_floob;1",
+          "@id": "dtmi:example:flunn_thnad;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "comment": [
diff --git a/DTDL/v3/spec/Requirement-ClassEnumPropertyCommentTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassEnumPropertyCommentTermAndDtmiV3.json
index efe5cc60..5c5729fe 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumPropertyCommentTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumPropertyCommentTermAndDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_nu;1",
+        "@id": "dtmi:example:itch_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_kappa;1",
+          "@id": "dtmi:example:itch_theta;1",
           "@type": "Enum",
-          "comment": "glikk_lambda",
-          "dtmi:dtdl:property:comment;3": "glikk_mu",
+          "comment": "itch_iota",
+          "dtmi:dtdl:property:comment;3": "itch_kappa",
           "valueSchema": "integer"
         }
       }
@@ -27,14 +27,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_rho;1",
+        "@id": "dtmi:example:itch_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_xi;1",
+          "@id": "dtmi:example:itch_mu;1",
           "@type": "Enum",
-          "comment": "glikk_omicron",
-          "dtmi:dtdl:property:comment;3": "glikk_pi",
+          "comment": "itch_nu",
+          "dtmi:dtdl:property:comment;3": "itch_xi",
           "valueSchema": "integer"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumPropertyDescriptionLangStringV3.json b/DTDL/v3/spec/Requirement-ClassEnumPropertyDescriptionLangStringV3.json
index 42b84863..5977c288 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumPropertyDescriptionLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumPropertyDescriptionLangStringV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_tau;1",
+        "@id": "dtmi:example:itch_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_sigma;1",
+          "@id": "dtmi:example:itch_pi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": "hello"
@@ -26,10 +26,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_phi;1",
+        "@id": "dtmi:example:itch_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_upsilon;1",
+          "@id": "dtmi:example:itch_sigma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": [
@@ -47,10 +47,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_psi;1",
+        "@id": "dtmi:example:itch_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_chi;1",
+          "@id": "dtmi:example:itch_upsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": {
@@ -68,10 +68,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_yuzz;1",
+        "@id": "dtmi:example:itch_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_omega;1",
+          "@id": "dtmi:example:itch_chi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": [
@@ -92,10 +92,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_um;1",
+        "@id": "dtmi:example:itch_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_wum;1",
+          "@id": "dtmi:example:itch_omega;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": {}
@@ -111,10 +111,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_fuddle;1",
+        "@id": "dtmi:example:itch_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_humpf;1",
+          "@id": "dtmi:example:itch_wum;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": []
@@ -130,10 +130,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_nuh;1",
+        "@id": "dtmi:example:itch_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_glikk;1",
+          "@id": "dtmi:example:itch_humpf;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": null
@@ -149,11 +149,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_quan;1",
+        "@id": "dtmi:example:itch_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_snee;1",
+          "@id": "dtmi:example:itch_glikk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": null
@@ -169,10 +169,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_spazz;1",
+        "@id": "dtmi:example:itch_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_thnad;1",
+          "@id": "dtmi:example:itch_snee;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": true
@@ -188,11 +188,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_zatz;1",
+        "@id": "dtmi:example:itch_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_floob;1",
+          "@id": "dtmi:example:itch_thnad;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": true
@@ -208,10 +208,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_flunn;1",
+        "@id": "dtmi:example:itch_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_jogg;1",
+          "@id": "dtmi:example:itch_floob;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": 626
@@ -227,11 +227,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_yekk;1",
+        "@id": "dtmi:example:itch_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_itch;1",
+          "@id": "dtmi:example:itch_jogg;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": 626
@@ -247,10 +247,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_hi;1",
+        "@id": "dtmi:example:itch_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_vroo;1",
+          "@id": "dtmi:example:itch_itch;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": [
@@ -268,11 +268,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_beta;1",
+        "@id": "dtmi:example:itch_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_alpha;1",
+          "@id": "dtmi:example:itch_vroo;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": [
@@ -290,10 +290,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_delta;1",
+        "@id": "dtmi:example:yekk_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_gamma;1",
+          "@id": "dtmi:example:yekk_alpha;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": [
@@ -311,11 +311,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_zeta;1",
+        "@id": "dtmi:example:yekk_delta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_epsilon;1",
+          "@id": "dtmi:example:yekk_gamma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": [
@@ -333,10 +333,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_theta;1",
+        "@id": "dtmi:example:yekk_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_eta;1",
+          "@id": "dtmi:example:yekk_epsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": [
@@ -354,11 +354,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_kappa;1",
+        "@id": "dtmi:example:yekk_theta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_iota;1",
+          "@id": "dtmi:example:yekk_eta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": [
@@ -376,10 +376,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_mu;1",
+        "@id": "dtmi:example:yekk_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_lambda;1",
+          "@id": "dtmi:example:yekk_iota;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": [
@@ -397,11 +397,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_xi;1",
+        "@id": "dtmi:example:yekk_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_nu;1",
+          "@id": "dtmi:example:yekk_lambda;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": [
@@ -419,10 +419,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_pi;1",
+        "@id": "dtmi:example:yekk_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_omicron;1",
+          "@id": "dtmi:example:yekk_nu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": {
@@ -441,11 +441,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_sigma;1",
+        "@id": "dtmi:example:yekk_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_rho;1",
+          "@id": "dtmi:example:yekk_omicron;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": {
@@ -464,10 +464,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_upsilon;1",
+        "@id": "dtmi:example:yekk_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_tau;1",
+          "@id": "dtmi:example:yekk_rho;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": [
@@ -487,11 +487,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_chi;1",
+        "@id": "dtmi:example:yekk_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_phi;1",
+          "@id": "dtmi:example:yekk_tau;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": [
diff --git a/DTDL/v3/spec/Requirement-ClassEnumPropertyDescriptionStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassEnumPropertyDescriptionStringLengthV3.json
index 8c16b2ee..367cf462 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumPropertyDescriptionStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumPropertyDescriptionStringLengthV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_omega;1",
+        "@id": "dtmi:example:yekk_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_psi;1",
+          "@id": "dtmi:example:yekk_phi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
@@ -26,10 +26,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_wum;1",
+        "@id": "dtmi:example:yekk_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_yuzz;1",
+          "@id": "dtmi:example:yekk_psi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_humpf;1",
+        "@id": "dtmi:example:yekk_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_um;1",
+          "@id": "dtmi:example:yekk_yuzz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
diff --git a/DTDL/v3/spec/Requirement-ClassEnumPropertyDescriptionTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassEnumPropertyDescriptionTermAndDtmiV3.json
index 0c26d9f2..e5f69131 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumPropertyDescriptionTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumPropertyDescriptionTermAndDtmiV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_yekk;1",
+        "@id": "dtmi:example:yekk_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_jogg;1",
+          "@id": "dtmi:example:yekk_floob;1",
           "@type": "Enum",
           "description": [
-            "nuh_flunn"
+            "yekk_zatz"
           ],
           "dtmi:dtdl:property:description;3": [
-            "nuh_itch"
+            "yekk_jogg"
           ],
           "valueSchema": "integer"
         }
@@ -31,17 +31,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_beta;1",
+        "@id": "dtmi:example:yekk_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_vroo;1",
+          "@id": "dtmi:example:yekk_itch;1",
           "@type": "Enum",
           "description": [
-            "nuh_hi"
+            "yekk_yekk"
           ],
           "dtmi:dtdl:property:description;3": [
-            "snee_alpha"
+            "yekk_vroo"
           ],
           "valueSchema": "integer"
         }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumPropertyDisplayNameLangStringV3.json b/DTDL/v3/spec/Requirement-ClassEnumPropertyDisplayNameLangStringV3.json
index a98b3225..001dc7eb 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumPropertyDisplayNameLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumPropertyDisplayNameLangStringV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_delta;1",
+        "@id": "dtmi:example:vroo_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_gamma;1",
+          "@id": "dtmi:example:vroo_alpha;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": "hello"
@@ -26,10 +26,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_zeta;1",
+        "@id": "dtmi:example:vroo_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_epsilon;1",
+          "@id": "dtmi:example:vroo_gamma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": [
@@ -47,10 +47,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_theta;1",
+        "@id": "dtmi:example:vroo_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_eta;1",
+          "@id": "dtmi:example:vroo_epsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": {
@@ -68,10 +68,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_kappa;1",
+        "@id": "dtmi:example:vroo_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_iota;1",
+          "@id": "dtmi:example:vroo_eta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": [
@@ -92,10 +92,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_mu;1",
+        "@id": "dtmi:example:vroo_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_lambda;1",
+          "@id": "dtmi:example:vroo_iota;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": {}
@@ -111,10 +111,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_xi;1",
+        "@id": "dtmi:example:vroo_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_nu;1",
+          "@id": "dtmi:example:vroo_lambda;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": []
@@ -130,10 +130,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_pi;1",
+        "@id": "dtmi:example:vroo_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_omicron;1",
+          "@id": "dtmi:example:vroo_nu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": null
@@ -149,11 +149,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_sigma;1",
+        "@id": "dtmi:example:vroo_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:snee_rho;1",
+          "@id": "dtmi:example:vroo_omicron;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": null
@@ -169,10 +169,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_upsilon;1",
+        "@id": "dtmi:example:vroo_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_tau;1",
+          "@id": "dtmi:example:vroo_rho;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": true
@@ -188,11 +188,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_chi;1",
+        "@id": "dtmi:example:vroo_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:snee_phi;1",
+          "@id": "dtmi:example:vroo_tau;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": true
@@ -208,10 +208,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_omega;1",
+        "@id": "dtmi:example:vroo_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_psi;1",
+          "@id": "dtmi:example:vroo_phi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": 626
@@ -227,11 +227,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_wum;1",
+        "@id": "dtmi:example:vroo_omega;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:snee_yuzz;1",
+          "@id": "dtmi:example:vroo_psi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": 626
@@ -247,10 +247,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_humpf;1",
+        "@id": "dtmi:example:vroo_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_um;1",
+          "@id": "dtmi:example:vroo_yuzz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": [
@@ -268,11 +268,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_glikk;1",
+        "@id": "dtmi:example:vroo_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:snee_fuddle;1",
+          "@id": "dtmi:example:vroo_um;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": [
@@ -290,10 +290,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_snee;1",
+        "@id": "dtmi:example:vroo_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_nuh;1",
+          "@id": "dtmi:example:vroo_fuddle;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": [
@@ -311,11 +311,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_thnad;1",
+        "@id": "dtmi:example:vroo_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:snee_quan;1",
+          "@id": "dtmi:example:vroo_nuh;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": [
@@ -333,10 +333,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_floob;1",
+        "@id": "dtmi:example:vroo_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_spazz;1",
+          "@id": "dtmi:example:vroo_quan;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": [
@@ -354,11 +354,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_jogg;1",
+        "@id": "dtmi:example:vroo_floob;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:snee_zatz;1",
+          "@id": "dtmi:example:vroo_spazz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": [
@@ -376,10 +376,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_itch;1",
+        "@id": "dtmi:example:vroo_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_flunn;1",
+          "@id": "dtmi:example:vroo_zatz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": [
@@ -397,11 +397,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_vroo;1",
+        "@id": "dtmi:example:vroo_itch;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:snee_yekk;1",
+          "@id": "dtmi:example:vroo_flunn;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": [
@@ -419,10 +419,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_alpha;1",
+        "@id": "dtmi:example:vroo_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_hi;1",
+          "@id": "dtmi:example:vroo_yekk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": {
@@ -441,11 +441,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_gamma;1",
+        "@id": "dtmi:example:hi_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:quan_beta;1",
+          "@id": "dtmi:example:vroo_hi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": {
@@ -464,10 +464,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_epsilon;1",
+        "@id": "dtmi:example:hi_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_delta;1",
+          "@id": "dtmi:example:hi_beta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": [
@@ -487,11 +487,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_eta;1",
+        "@id": "dtmi:example:hi_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:quan_zeta;1",
+          "@id": "dtmi:example:hi_delta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": [
diff --git a/DTDL/v3/spec/Requirement-ClassEnumPropertyDisplayNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassEnumPropertyDisplayNameStringLengthV3.json
index 9d280d8e..f5881d52 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumPropertyDisplayNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumPropertyDisplayNameStringLengthV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_iota;1",
+        "@id": "dtmi:example:hi_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_theta;1",
+          "@id": "dtmi:example:hi_zeta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
@@ -26,10 +26,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_lambda;1",
+        "@id": "dtmi:example:hi_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_kappa;1",
+          "@id": "dtmi:example:hi_theta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_nu;1",
+        "@id": "dtmi:example:hi_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:quan_mu;1",
+          "@id": "dtmi:example:hi_kappa;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
diff --git a/DTDL/v3/spec/Requirement-ClassEnumPropertyDisplayNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassEnumPropertyDisplayNameTermAndDtmiV3.json
index cfb4a790..159e0322 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumPropertyDisplayNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumPropertyDisplayNameTermAndDtmiV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_wum;1",
+        "@id": "dtmi:example:hi_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_psi;1",
+          "@id": "dtmi:example:hi_phi;1",
           "@type": "Enum",
           "displayName": [
-            "quan_omega"
+            "hi_chi"
           ],
           "dtmi:dtdl:property:displayName;3": [
-            "quan_yuzz"
+            "hi_psi"
           ],
           "valueSchema": "integer"
         }
@@ -31,17 +31,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_glikk;1",
+        "@id": "dtmi:example:hi_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:quan_um;1",
+          "@id": "dtmi:example:hi_yuzz;1",
           "@type": "Enum",
           "displayName": [
-            "quan_humpf"
+            "hi_wum"
           ],
           "dtmi:dtdl:property:displayName;3": [
-            "quan_fuddle"
+            "hi_um"
           ],
           "valueSchema": "integer"
         }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumPropertyEnumValuesElementV3.json b/DTDL/v3/spec/Requirement-ClassEnumPropertyEnumValuesElementV3.json
index 18b98720..68083841 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumPropertyEnumValuesElementV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumPropertyEnumValuesElementV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_thnad;1",
+        "@id": "dtmi:example:hi_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "quan_quan",
+          "name": "hi_nuh",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "@id": "dtmi:example:quan_nuh;1",
-              "enumValue": 1119,
-              "name": "quan_snee"
+              "@id": "dtmi:example:hi_fuddle;1",
+              "enumValue": 1132,
+              "name": "hi_glikk"
             }
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_jogg;1",
+        "@id": "dtmi:example:hi_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "quan_zatz",
+          "name": "hi_spazz",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": [
               {
-                "@id": "dtmi:example:quan_spazz;1",
-                "enumValue": 1120,
-                "name": "quan_floob"
+                "@id": "dtmi:example:hi_quan;1",
+                "enumValue": 1133,
+                "name": "hi_thnad"
               }
             ]
           }
@@ -61,21 +61,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_yekk;1",
+        "@id": "dtmi:example:hi_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_itch;1",
+          "@id": "dtmi:example:hi_jogg;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:ex:dependentRef;1",
-            "enumValue": 1121,
-            "name": "quan_flunn"
+            "enumValue": 1134,
+            "name": "hi_zatz"
           }
         },
         "contents": {
           "@type": "Property",
-          "name": "quan_vroo",
+          "name": "hi_itch",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
@@ -93,21 +93,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_beta;1",
+        "@id": "dtmi:example:hi_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_alpha;1",
+          "@id": "dtmi:example:hi_vroo;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:ex:dependentRef;1",
-            "enumValue": 1122,
-            "name": "quan_hi"
+            "enumValue": 1135,
+            "name": "hi_yekk"
           }
         },
         "contents": {
           "@type": "Property",
-          "name": "thnad_gamma",
+          "name": "alpha_alpha",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
@@ -127,18 +127,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_eta;1",
+        "@id": "dtmi:example:alpha_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_zeta",
+          "name": "alpha_delta",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "@id": "dtmi:example:thnad_delta;1",
-              "enumValue": 1123,
-              "name": "thnad_epsilon",
+              "@id": "dtmi:example:alpha_beta;1",
+              "enumValue": 1136,
+              "name": "alpha_gamma",
               "@context": "dtmi:dtdl:context;2"
             }
           }
@@ -154,19 +154,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_lambda;1",
+        "@id": "dtmi:example:alpha_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_kappa",
+          "name": "alpha_theta",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "@id": "dtmi:example:thnad_theta;1",
-              "enumValue": 1124,
-              "name": "thnad_iota",
+              "@id": "dtmi:example:alpha_zeta;1",
+              "enumValue": 1137,
+              "name": "alpha_eta",
               "@context": "dtmi:dtdl:context;2"
             }
           }
@@ -174,6 +174,61 @@
       }
     ]
   },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:alpha_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_mu",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "@id": "dtmi:example:alpha_kappa;1",
+              "enumValue": 1138,
+              "name": "alpha_lambda",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:alpha_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_pi",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "@id": "dtmi:example:alpha_xi;1",
+              "enumValue": 1139,
+              "name": "alpha_omicron",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
   {
     "valid": true,
     "options": [
@@ -182,11 +237,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_nu;1",
+        "@id": "dtmi:example:alpha_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_mu",
+          "name": "alpha_sigma",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
@@ -204,24 +259,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_tau;1",
+        "@id": "dtmi:example:alpha_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_sigma",
+          "name": "alpha_omega",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": [
               {
-                "@id": "dtmi:example:thnad_xi;1",
-                "enumValue": 1125,
-                "name": "thnad_omicron"
+                "@id": "dtmi:example:alpha_upsilon;1",
+                "enumValue": 1140,
+                "name": "alpha_phi"
               },
               {
-                "@id": "dtmi:example:thnad_pi;1",
-                "enumValue": 1126,
-                "name": "thnad_rho"
+                "@id": "dtmi:example:alpha_chi;1",
+                "enumValue": 1141,
+                "name": "alpha_psi"
               }
             ]
           }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumPropertyEnumValuesTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassEnumPropertyEnumValuesTermAndDtmiV3.json
index 20d3cbae..1fffb896 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumPropertyEnumValuesTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumPropertyEnumValuesTermAndDtmiV3.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_um;1",
+        "@id": "dtmi:example:delta_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_omega;1",
+          "@id": "dtmi:example:delta_glikk;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 1131,
-              "name": "zatz_yuzz"
+              "enumValue": 1146,
+              "name": "delta_nuh"
             }
           ],
           "dtmi:dtdl:property:enumValues;3": [
             {
-              "enumValue": 1132,
-              "name": "zatz_wum"
+              "enumValue": 1147,
+              "name": "delta_snee"
             }
           ],
           "valueSchema": "integer"
@@ -37,22 +37,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_nuh;1",
+        "@id": "dtmi:example:delta_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zatz_humpf;1",
+          "@id": "dtmi:example:delta_thnad;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "enumValue": 1133,
-              "name": "zatz_fuddle"
+              "enumValue": 1148,
+              "name": "delta_spazz"
             }
           ],
           "dtmi:dtdl:property:enumValues;3": [
             {
-              "enumValue": 1134,
-              "name": "zatz_glikk"
+              "enumValue": 1149,
+              "name": "delta_floob"
             }
           ],
           "valueSchema": "integer"
diff --git a/DTDL/v3/spec/Requirement-ClassEnumPropertyEnumValuesTypeConformanceV3.json b/DTDL/v3/spec/Requirement-ClassEnumPropertyEnumValuesTypeConformanceV3.json
index 81b63370..381e2dd4 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumPropertyEnumValuesTypeConformanceV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumPropertyEnumValuesTypeConformanceV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_wum;1",
+        "@id": "dtmi:example:alpha_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_yuzz;1",
+          "@id": "dtmi:example:alpha_nuh;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:thnad_omega;1",
-            "elementSchema": "integer",
+            "@id": "dtmi:example:alpha_glikk;1",
+            "elementSchema": "boolean",
             "@type": "Array"
           }
         }
@@ -30,16 +30,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_fuddle;1",
+        "@id": "dtmi:example:alpha_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:thnad_humpf;1",
+          "@id": "dtmi:example:alpha_thnad;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:thnad_um;1",
-            "elementSchema": "long",
+            "@id": "dtmi:example:alpha_quan;1",
+            "elementSchema": "date",
             "@type": "Array"
           }
         }
@@ -54,15 +54,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_quan;1",
+        "@id": "dtmi:example:alpha_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_snee;1",
+          "@id": "dtmi:example:alpha_jogg;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:thnad_glikk;1",
-            "name": "thnad_nuh",
+            "@id": "dtmi:example:alpha_floob;1",
+            "name": "alpha_zatz",
             "@type": "Command"
           }
         }
@@ -77,16 +77,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_zatz;1",
+        "@id": "dtmi:example:alpha_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:thnad_floob;1",
+          "@id": "dtmi:example:alpha_vroo;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:thnad_thnad;1",
-            "name": "thnad_spazz",
+            "@id": "dtmi:example:alpha_itch;1",
+            "name": "alpha_yekk",
             "@type": "Command"
           }
         }
@@ -101,16 +101,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_yekk;1",
+        "@id": "dtmi:example:beta_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_itch;1",
+          "@id": "dtmi:example:beta_gamma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:thnad_jogg;1",
-            "name": "thnad_flunn",
-            "schema": "string",
+            "@id": "dtmi:example:beta_alpha;1",
+            "name": "beta_beta",
+            "schema": "dateTime",
             "@type": "CommandRequest"
           }
         }
@@ -125,17 +125,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_beta;1",
+        "@id": "dtmi:example:beta_theta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:spazz_alpha;1",
+          "@id": "dtmi:example:beta_eta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:thnad_vroo;1",
-            "name": "thnad_hi",
-            "schema": "time",
+            "@id": "dtmi:example:beta_epsilon;1",
+            "name": "beta_zeta",
+            "schema": "double",
             "@type": "CommandRequest"
           }
         }
@@ -150,16 +150,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_zeta;1",
+        "@id": "dtmi:example:beta_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_epsilon;1",
+          "@id": "dtmi:example:beta_lambda;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:spazz_gamma;1",
-            "name": "spazz_delta",
-            "schema": "boolean",
+            "@id": "dtmi:example:beta_iota;1",
+            "name": "beta_kappa",
+            "schema": "duration",
             "@type": "CommandResponse"
           }
         }
@@ -174,17 +174,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_kappa;1",
+        "@id": "dtmi:example:beta_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:spazz_iota;1",
+          "@id": "dtmi:example:beta_omicron;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:spazz_eta;1",
-            "name": "spazz_theta",
-            "schema": "date",
+            "@id": "dtmi:example:beta_nu;1",
+            "name": "beta_xi",
+            "schema": "float",
             "@type": "CommandResponse"
           }
         }
@@ -199,17 +199,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_omicron;1",
+        "@id": "dtmi:example:beta_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_xi;1",
+          "@id": "dtmi:example:beta_upsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:spazz_lambda;1",
-            "name": "spazz_mu",
+            "@id": "dtmi:example:beta_rho;1",
+            "name": "beta_sigma",
             "schema": {
-              "@id": "dtmi:example:spazz_nu;1",
+              "@id": "dtmi:example:beta_tau;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -226,18 +226,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_upsilon;1",
+        "@id": "dtmi:example:beta_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:spazz_tau;1",
+          "@id": "dtmi:example:beta_yuzz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:spazz_pi;1",
-            "name": "spazz_rho",
+            "@id": "dtmi:example:beta_chi;1",
+            "name": "beta_psi",
             "schema": {
-              "@id": "dtmi:example:spazz_sigma;1",
+              "@id": "dtmi:example:beta_omega;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -254,14 +254,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_psi;1",
+        "@id": "dtmi:example:beta_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_chi;1",
+          "@id": "dtmi:example:beta_humpf;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:spazz_phi;1",
+            "@id": "dtmi:example:beta_um;1",
             "valueSchema": "integer",
             "@type": "Enum"
           }
@@ -277,15 +277,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_wum;1",
+        "@id": "dtmi:example:beta_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:spazz_yuzz;1",
+          "@id": "dtmi:example:beta_nuh;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:spazz_omega;1",
+            "@id": "dtmi:example:beta_glikk;1",
             "valueSchema": "integer",
             "@type": "Enum"
           }
@@ -301,16 +301,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_glikk;1",
+        "@id": "dtmi:example:beta_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_fuddle;1",
+          "@id": "dtmi:example:beta_spazz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:spazz_um;1",
-            "enumValue": 1127,
-            "name": "spazz_humpf",
+            "@id": "dtmi:example:beta_quan;1",
+            "enumValue": 1142,
+            "name": "beta_thnad",
             "@type": "EnumValue"
           }
         }
@@ -325,16 +325,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_thnad;1",
+        "@id": "dtmi:example:beta_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_quan;1",
+          "@id": "dtmi:example:beta_flunn;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:spazz_nuh;1",
-            "name": "spazz_snee",
-            "schema": "dateTime",
+            "@id": "dtmi:example:beta_zatz;1",
+            "name": "beta_jogg",
+            "schema": "integer",
             "@type": "Field"
           }
         }
@@ -349,17 +349,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_jogg;1",
+        "@id": "dtmi:example:gamma_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:spazz_zatz;1",
+          "@id": "dtmi:example:beta_hi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:spazz_spazz;1",
-            "name": "spazz_floob",
-            "schema": "double",
+            "@id": "dtmi:example:beta_yekk;1",
+            "name": "beta_vroo",
+            "schema": "long",
             "@type": "Field"
           }
         }
@@ -374,14 +374,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_yekk;1",
+        "@id": "dtmi:example:gamma_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_itch;1",
+          "@id": "dtmi:example:gamma_gamma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:spazz_flunn;1",
+            "@id": "dtmi:example:gamma_beta;1",
             "@type": "Interface"
           }
         }
@@ -396,15 +396,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_alpha;1",
+        "@id": "dtmi:example:gamma_eta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:spazz_hi;1",
+          "@id": "dtmi:example:gamma_zeta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:spazz_vroo;1",
+            "@id": "dtmi:example:gamma_epsilon;1",
             "@type": "Interface"
           }
         }
@@ -419,21 +419,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_zeta;1",
+        "@id": "dtmi:example:gamma_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_epsilon;1",
+          "@id": "dtmi:example:gamma_lambda;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:floob_beta;1",
+            "@id": "dtmi:example:gamma_theta;1",
             "mapKey": {
-              "name": "floob_gamma",
+              "name": "gamma_iota",
               "schema": "string"
             },
             "mapValue": {
-              "name": "floob_delta",
-              "schema": "duration"
+              "name": "gamma_kappa",
+              "schema": "string"
             },
             "@type": "Map"
           }
@@ -449,22 +449,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_lambda;1",
+        "@id": "dtmi:example:gamma_rho;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:floob_kappa;1",
+          "@id": "dtmi:example:gamma_pi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:floob_eta;1",
+            "@id": "dtmi:example:gamma_nu;1",
             "mapKey": {
-              "name": "floob_theta",
+              "name": "gamma_xi",
               "schema": "string"
             },
             "mapValue": {
-              "name": "floob_iota",
-              "schema": "float"
+              "name": "gamma_omicron",
+              "schema": "time"
             },
             "@type": "Map"
           }
@@ -480,15 +480,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_omicron;1",
+        "@id": "dtmi:example:gamma_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_xi;1",
+          "@id": "dtmi:example:gamma_upsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:floob_mu;1",
-            "name": "floob_nu",
+            "@id": "dtmi:example:gamma_sigma;1",
+            "name": "gamma_tau",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -504,16 +504,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_tau;1",
+        "@id": "dtmi:example:gamma_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:floob_sigma;1",
+          "@id": "dtmi:example:gamma_omega;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:floob_pi;1",
-            "name": "floob_rho",
+            "@id": "dtmi:example:gamma_chi;1",
+            "name": "gamma_psi",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -529,16 +529,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_psi;1",
+        "@id": "dtmi:example:gamma_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_chi;1",
+          "@id": "dtmi:example:gamma_humpf;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:floob_upsilon;1",
-            "name": "floob_phi",
-            "schema": "integer",
+            "@id": "dtmi:example:gamma_wum;1",
+            "name": "gamma_um",
+            "schema": "boolean",
             "@type": "MapValue"
           }
         }
@@ -553,17 +553,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_um;1",
+        "@id": "dtmi:example:gamma_quan;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:floob_wum;1",
+          "@id": "dtmi:example:gamma_snee;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:floob_omega;1",
-            "name": "floob_yuzz",
-            "schema": "long",
+            "@id": "dtmi:example:gamma_glikk;1",
+            "name": "gamma_nuh",
+            "schema": "date",
             "@type": "MapValue"
           }
         }
@@ -578,14 +578,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_glikk;1",
+        "@id": "dtmi:example:gamma_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_fuddle;1",
+          "@id": "dtmi:example:gamma_spazz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:floob_humpf;1",
+            "@id": "dtmi:example:gamma_thnad;1",
             "@type": "Object"
           }
         }
@@ -600,15 +600,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_quan;1",
+        "@id": "dtmi:example:gamma_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:floob_snee;1",
+          "@id": "dtmi:example:gamma_jogg;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:floob_nuh;1",
+            "@id": "dtmi:example:gamma_zatz;1",
             "@type": "Object"
           }
         }
@@ -623,16 +623,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_zatz;1",
+        "@id": "dtmi:example:gamma_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_floob;1",
+          "@id": "dtmi:example:gamma_vroo;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:floob_thnad;1",
-            "name": "floob_spazz",
-            "schema": "string",
+            "@id": "dtmi:example:gamma_itch;1",
+            "name": "gamma_yekk",
+            "schema": "dateTime",
             "@type": "Property"
           }
         }
@@ -647,17 +647,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_yekk;1",
+        "@id": "dtmi:example:delta_delta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:floob_itch;1",
+          "@id": "dtmi:example:delta_gamma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:floob_jogg;1",
-            "name": "floob_flunn",
-            "schema": "time",
+            "@id": "dtmi:example:delta_alpha;1",
+            "name": "delta_beta",
+            "schema": "double",
             "@type": "Property"
           }
         }
@@ -672,15 +672,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_beta;1",
+        "@id": "dtmi:example:delta_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_alpha;1",
+          "@id": "dtmi:example:delta_eta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:floob_vroo;1",
-            "name": "floob_hi",
+            "@id": "dtmi:example:delta_epsilon;1",
+            "name": "delta_zeta",
             "@type": "Relationship"
           }
         }
@@ -695,16 +695,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_zeta;1",
+        "@id": "dtmi:example:delta_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zatz_epsilon;1",
+          "@id": "dtmi:example:delta_lambda;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:zatz_gamma;1",
-            "name": "zatz_delta",
+            "@id": "dtmi:example:delta_iota;1",
+            "name": "delta_kappa",
             "@type": "Relationship"
           }
         }
@@ -719,16 +719,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_kappa;1",
+        "@id": "dtmi:example:delta_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_iota;1",
+          "@id": "dtmi:example:delta_omicron;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:zatz_eta;1",
-            "name": "zatz_theta",
-            "schema": "boolean",
+            "@id": "dtmi:example:delta_nu;1",
+            "name": "delta_xi",
+            "schema": "duration",
             "@type": "Telemetry"
           }
         }
@@ -743,17 +743,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_xi;1",
+        "@id": "dtmi:example:delta_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zatz_nu;1",
+          "@id": "dtmi:example:delta_tau;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "@id": "dtmi:example:zatz_lambda;1",
-            "name": "zatz_mu",
-            "schema": "date",
+            "@id": "dtmi:example:delta_rho;1",
+            "name": "delta_sigma",
+            "schema": "float",
             "@type": "Telemetry"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumPropertyFormallyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Requirement-ClassEnumPropertyFormallyIrrelevantDtmiOrTermV3.json
index 3414b368..f6f91e72 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumPropertyFormallyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumPropertyFormallyIrrelevantDtmiOrTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_xi;1",
+        "@id": "dtmi:example:epsilon_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_nu;1",
+          "@id": "dtmi:example:epsilon_tau;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "dtmi:foo:bar;1": 626
@@ -26,11 +26,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_pi;1",
+        "@id": "dtmi:example:epsilon_chi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:jogg_omicron;1",
+          "@id": "dtmi:example:epsilon_phi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "dtmi:foo:bar;1": 626
@@ -46,10 +46,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_sigma;1",
+        "@id": "dtmi:example:epsilon_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_rho;1",
+          "@id": "dtmi:example:epsilon_psi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "boolean": null
@@ -65,11 +65,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_upsilon;1",
+        "@id": "dtmi:example:epsilon_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:jogg_tau;1",
+          "@id": "dtmi:example:epsilon_yuzz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "boolean": null
diff --git a/DTDL/v3/spec/Requirement-ClassEnumPropertyFormallyUndefinedTermV3.json b/DTDL/v3/spec/Requirement-ClassEnumPropertyFormallyUndefinedTermV3.json
index e0e4f7aa..c14f5550 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumPropertyFormallyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumPropertyFormallyUndefinedTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_thnad;1",
+        "@id": "dtmi:example:epsilon_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_quan;1",
+          "@id": "dtmi:example:epsilon_flunn;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "foobar": {}
@@ -26,11 +26,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_floob;1",
+        "@id": "dtmi:example:epsilon_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:jogg_spazz;1",
+          "@id": "dtmi:example:epsilon_yekk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "foobar": {}
diff --git a/DTDL/v3/spec/Requirement-ClassEnumPropertyInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassEnumPropertyInvalidDtmiV3.json
index 5f6f6363..b8c4c2d5 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumPropertyInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumPropertyInvalidDtmiV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_chi;1",
+        "@id": "dtmi:example:epsilon_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_phi;1",
+          "@id": "dtmi:example:epsilon_um;1",
           "@type": [
             "Enum",
             "Foobar"
@@ -29,11 +29,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_omega;1",
+        "@id": "dtmi:example:epsilon_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:jogg_psi;1",
+          "@id": "dtmi:example:epsilon_fuddle;1",
           "@type": [
             "Enum",
             "Foobar"
diff --git a/DTDL/v3/spec/Requirement-ClassEnumPropertyNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassEnumPropertyNotDtmiNorTermV3.json
index ccf9ba9b..c6eb5838 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumPropertyNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumPropertyNotDtmiNorTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_wum;1",
+        "@id": "dtmi:example:epsilon_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_yuzz;1",
+          "@id": "dtmi:example:epsilon_nuh;1",
           "@type": [
             "Enum",
             "Foobar"
@@ -29,11 +29,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_humpf;1",
+        "@id": "dtmi:example:epsilon_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:jogg_um;1",
+          "@id": "dtmi:example:epsilon_quan;1",
           "@type": [
             "Enum",
             "Foobar"
diff --git a/DTDL/v3/spec/Requirement-ClassEnumPropertyValueSchemaSpecificValuesV3.json b/DTDL/v3/spec/Requirement-ClassEnumPropertyValueSchemaSpecificValuesV3.json
index bd7b1911..627660b6 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumPropertyValueSchemaSpecificValuesV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumPropertyValueSchemaSpecificValuesV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_alpha;1",
+        "@id": "dtmi:example:glikk_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_hi;1",
+          "@id": "dtmi:example:glikk_zatz;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "upsilon_vroo",
+            "name": "glikk_floob",
             "enumValue": 10
           },
           "valueSchema": "integer"
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_delta;1",
+        "@id": "dtmi:example:glikk_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_gamma;1",
+          "@id": "dtmi:example:glikk_itch;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "phi_beta",
+            "name": "glikk_flunn",
             "enumValue": 10
           },
           "valueSchema": [
@@ -53,13 +53,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_eta;1",
+        "@id": "dtmi:example:nuh_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_zeta;1",
+          "@id": "dtmi:example:glikk_hi;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "phi_epsilon",
+            "name": "glikk_vroo",
             "enumValue": 10
           },
           "valueSchema": "dtmi:dtdl:instance:Schema:integer;3"
@@ -75,13 +75,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_kappa;1",
+        "@id": "dtmi:example:nuh_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_iota;1",
+          "@id": "dtmi:example:nuh_gamma;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "phi_theta",
+            "name": "nuh_beta",
             "enumValue": 10
           },
           "valueSchema": [
@@ -99,13 +99,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_nu;1",
+        "@id": "dtmi:example:nuh_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_mu;1",
+          "@id": "dtmi:example:nuh_zeta;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "phi_lambda",
+            "name": "nuh_epsilon",
             "enumValue": 10
           },
           "valueSchema": [
@@ -124,14 +124,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_pi;1",
+        "@id": "dtmi:example:nuh_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_omicron;1",
+          "@id": "dtmi:example:nuh_iota;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "phi_xi",
+            "name": "nuh_theta",
             "enumValue": 10
           },
           "valueSchema": [
@@ -150,14 +150,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_tau;1",
+        "@id": "dtmi:example:nuh_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_sigma;1",
+          "@id": "dtmi:example:nuh_mu;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "phi_rho",
-            "enumValue": "beta_jogg"
+            "name": "nuh_lambda",
+            "enumValue": "beta_hi"
           },
           "valueSchema": "string"
         }
@@ -172,14 +172,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_chi;1",
+        "@id": "dtmi:example:nuh_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_phi;1",
+          "@id": "dtmi:example:nuh_omicron;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "phi_upsilon",
-            "enumValue": "beta_jogg"
+            "name": "nuh_xi",
+            "enumValue": "beta_hi"
           },
           "valueSchema": [
             "string"
@@ -196,14 +196,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_yuzz;1",
+        "@id": "dtmi:example:nuh_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_omega;1",
+          "@id": "dtmi:example:nuh_sigma;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "phi_psi",
-            "enumValue": "beta_jogg"
+            "name": "nuh_rho",
+            "enumValue": "beta_hi"
           },
           "valueSchema": "dtmi:dtdl:instance:Schema:string;3"
         }
@@ -218,14 +218,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_humpf;1",
+        "@id": "dtmi:example:nuh_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_um;1",
+          "@id": "dtmi:example:nuh_phi;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "phi_wum",
-            "enumValue": "beta_jogg"
+            "name": "nuh_upsilon",
+            "enumValue": "beta_hi"
           },
           "valueSchema": [
             "dtmi:dtdl:instance:Schema:string;3"
@@ -242,14 +242,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_nuh;1",
+        "@id": "dtmi:example:nuh_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_glikk;1",
+          "@id": "dtmi:example:nuh_omega;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "phi_fuddle",
-            "enumValue": "beta_jogg"
+            "name": "nuh_psi",
+            "enumValue": "beta_hi"
           },
           "valueSchema": [
             "string",
@@ -267,15 +267,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_thnad;1",
+        "@id": "dtmi:example:nuh_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_quan;1",
+          "@id": "dtmi:example:nuh_um;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "phi_snee",
-            "enumValue": "beta_jogg"
+            "name": "nuh_wum",
+            "enumValue": "beta_hi"
           },
           "valueSchema": [
             "string",
@@ -293,10 +293,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_floob;1",
+        "@id": "dtmi:example:nuh_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_spazz;1",
+          "@id": "dtmi:example:nuh_fuddle;1",
           "@type": "Enum",
           "valueSchema": []
         }
@@ -311,11 +311,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_jogg;1",
+        "@id": "dtmi:example:nuh_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:phi_zatz;1",
+          "@id": "dtmi:example:nuh_nuh;1",
           "@type": "Enum",
           "valueSchema": []
         }
@@ -330,10 +330,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_itch;1",
+        "@id": "dtmi:example:nuh_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_flunn;1",
+          "@id": "dtmi:example:nuh_quan;1",
           "@type": "Enum",
           "valueSchema": null
         }
@@ -348,11 +348,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_vroo;1",
+        "@id": "dtmi:example:nuh_floob;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:phi_yekk;1",
+          "@id": "dtmi:example:nuh_spazz;1",
           "@type": "Enum",
           "valueSchema": null
         }
@@ -367,10 +367,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_alpha;1",
+        "@id": "dtmi:example:nuh_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_hi;1",
+          "@id": "dtmi:example:nuh_zatz;1",
           "@type": "Enum",
           "valueSchema": true
         }
@@ -385,11 +385,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_gamma;1",
+        "@id": "dtmi:example:nuh_itch;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:chi_beta;1",
+          "@id": "dtmi:example:nuh_flunn;1",
           "@type": "Enum",
           "valueSchema": true
         }
@@ -404,10 +404,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_epsilon;1",
+        "@id": "dtmi:example:nuh_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_delta;1",
+          "@id": "dtmi:example:nuh_yekk;1",
           "@type": "Enum",
           "valueSchema": 626
         }
@@ -422,11 +422,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_eta;1",
+        "@id": "dtmi:example:snee_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:chi_zeta;1",
+          "@id": "dtmi:example:nuh_hi;1",
           "@type": "Enum",
           "valueSchema": 626
         }
@@ -441,10 +441,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_iota;1",
+        "@id": "dtmi:example:snee_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_theta;1",
+          "@id": "dtmi:example:snee_beta;1",
           "@type": "Enum",
           "valueSchema": [
             null
@@ -461,11 +461,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_lambda;1",
+        "@id": "dtmi:example:snee_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:chi_kappa;1",
+          "@id": "dtmi:example:snee_delta;1",
           "@type": "Enum",
           "valueSchema": [
             null
@@ -482,10 +482,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_nu;1",
+        "@id": "dtmi:example:snee_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_mu;1",
+          "@id": "dtmi:example:snee_zeta;1",
           "@type": "Enum",
           "valueSchema": [
             true
@@ -502,11 +502,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_omicron;1",
+        "@id": "dtmi:example:snee_iota;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:chi_xi;1",
+          "@id": "dtmi:example:snee_theta;1",
           "@type": "Enum",
           "valueSchema": [
             true
@@ -523,10 +523,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_rho;1",
+        "@id": "dtmi:example:snee_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_pi;1",
+          "@id": "dtmi:example:snee_kappa;1",
           "@type": "Enum",
           "valueSchema": [
             626
@@ -543,11 +543,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_tau;1",
+        "@id": "dtmi:example:snee_nu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:chi_sigma;1",
+          "@id": "dtmi:example:snee_mu;1",
           "@type": "Enum",
           "valueSchema": [
             626
@@ -564,10 +564,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_phi;1",
+        "@id": "dtmi:example:snee_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_upsilon;1",
+          "@id": "dtmi:example:snee_xi;1",
           "@type": "Enum",
           "valueSchema": {}
         }
@@ -582,11 +582,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_psi;1",
+        "@id": "dtmi:example:snee_rho;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:chi_chi;1",
+          "@id": "dtmi:example:snee_pi;1",
           "@type": "Enum",
           "valueSchema": {}
         }
@@ -601,10 +601,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_yuzz;1",
+        "@id": "dtmi:example:snee_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_omega;1",
+          "@id": "dtmi:example:snee_sigma;1",
           "@type": "Enum",
           "valueSchema": [
             {}
@@ -621,11 +621,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_um;1",
+        "@id": "dtmi:example:snee_phi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:chi_wum;1",
+          "@id": "dtmi:example:snee_upsilon;1",
           "@type": "Enum",
           "valueSchema": [
             {}
@@ -642,10 +642,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_fuddle;1",
+        "@id": "dtmi:example:snee_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_humpf;1",
+          "@id": "dtmi:example:snee_chi;1",
           "@type": "Enum",
           "valueSchema": "asynchronous"
         }
@@ -660,11 +660,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_nuh;1",
+        "@id": "dtmi:example:snee_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:chi_glikk;1",
+          "@id": "dtmi:example:snee_omega;1",
           "@type": "Enum",
           "valueSchema": "asynchronous"
         }
@@ -679,10 +679,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_quan;1",
+        "@id": "dtmi:example:snee_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_snee;1",
+          "@id": "dtmi:example:snee_wum;1",
           "@type": "Enum",
           "valueSchema": "dtmi:dtdl:instance:CommandType:asynchronous;3"
         }
@@ -697,11 +697,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_spazz;1",
+        "@id": "dtmi:example:snee_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:chi_thnad;1",
+          "@id": "dtmi:example:snee_humpf;1",
           "@type": "Enum",
           "valueSchema": "dtmi:dtdl:instance:CommandType:asynchronous;3"
         }
@@ -716,10 +716,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_zatz;1",
+        "@id": "dtmi:example:snee_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_floob;1",
+          "@id": "dtmi:example:snee_glikk;1",
           "@type": "Enum",
           "valueSchema": "synchronous"
         }
@@ -734,11 +734,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_flunn;1",
+        "@id": "dtmi:example:snee_quan;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:chi_jogg;1",
+          "@id": "dtmi:example:snee_snee;1",
           "@type": "Enum",
           "valueSchema": "synchronous"
         }
@@ -753,10 +753,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_yekk;1",
+        "@id": "dtmi:example:snee_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_itch;1",
+          "@id": "dtmi:example:snee_thnad;1",
           "@type": "Enum",
           "valueSchema": "dtmi:dtdl:instance:CommandType:synchronous;3"
         }
@@ -771,11 +771,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_hi;1",
+        "@id": "dtmi:example:snee_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:chi_vroo;1",
+          "@id": "dtmi:example:snee_floob;1",
           "@type": "Enum",
           "valueSchema": "dtmi:dtdl:instance:CommandType:synchronous;3"
         }
@@ -790,10 +790,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_beta;1",
+        "@id": "dtmi:example:snee_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_alpha;1",
+          "@id": "dtmi:example:snee_jogg;1",
           "@type": "Enum",
           "valueSchema": "boolean"
         }
@@ -808,11 +808,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_delta;1",
+        "@id": "dtmi:example:snee_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:psi_gamma;1",
+          "@id": "dtmi:example:snee_itch;1",
           "@type": "Enum",
           "valueSchema": "boolean"
         }
@@ -827,10 +827,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_zeta;1",
+        "@id": "dtmi:example:snee_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_epsilon;1",
+          "@id": "dtmi:example:snee_vroo;1",
           "@type": "Enum",
           "valueSchema": "dtmi:dtdl:instance:Schema:boolean;3"
         }
@@ -845,11 +845,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_theta;1",
+        "@id": "dtmi:example:quan_beta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:psi_eta;1",
+          "@id": "dtmi:example:quan_alpha;1",
           "@type": "Enum",
           "valueSchema": "dtmi:dtdl:instance:Schema:boolean;3"
         }
@@ -864,10 +864,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_kappa;1",
+        "@id": "dtmi:example:quan_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_iota;1",
+          "@id": "dtmi:example:quan_gamma;1",
           "@type": "Enum",
           "valueSchema": "date"
         }
@@ -882,11 +882,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_mu;1",
+        "@id": "dtmi:example:quan_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:psi_lambda;1",
+          "@id": "dtmi:example:quan_epsilon;1",
           "@type": "Enum",
           "valueSchema": "date"
         }
@@ -901,10 +901,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_xi;1",
+        "@id": "dtmi:example:quan_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_nu;1",
+          "@id": "dtmi:example:quan_eta;1",
           "@type": "Enum",
           "valueSchema": "dtmi:dtdl:instance:Schema:date;3"
         }
@@ -919,11 +919,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_pi;1",
+        "@id": "dtmi:example:quan_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:psi_omicron;1",
+          "@id": "dtmi:example:quan_iota;1",
           "@type": "Enum",
           "valueSchema": "dtmi:dtdl:instance:Schema:date;3"
         }
@@ -938,10 +938,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_sigma;1",
+        "@id": "dtmi:example:quan_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_rho;1",
+          "@id": "dtmi:example:quan_lambda;1",
           "@type": "Enum",
           "valueSchema": "dateTime"
         }
@@ -956,11 +956,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_upsilon;1",
+        "@id": "dtmi:example:quan_xi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:psi_tau;1",
+          "@id": "dtmi:example:quan_nu;1",
           "@type": "Enum",
           "valueSchema": "dateTime"
         }
@@ -975,10 +975,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_chi;1",
+        "@id": "dtmi:example:quan_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_phi;1",
+          "@id": "dtmi:example:quan_omicron;1",
           "@type": "Enum",
           "valueSchema": "dtmi:dtdl:instance:Schema:dateTime;3"
         }
@@ -993,11 +993,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_omega;1",
+        "@id": "dtmi:example:quan_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:psi_psi;1",
+          "@id": "dtmi:example:quan_rho;1",
           "@type": "Enum",
           "valueSchema": "dtmi:dtdl:instance:Schema:dateTime;3"
         }
@@ -1012,10 +1012,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_wum;1",
+        "@id": "dtmi:example:quan_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_yuzz;1",
+          "@id": "dtmi:example:quan_tau;1",
           "@type": "Enum",
           "valueSchema": "double"
         }
@@ -1030,11 +1030,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_humpf;1",
+        "@id": "dtmi:example:quan_chi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:psi_um;1",
+          "@id": "dtmi:example:quan_phi;1",
           "@type": "Enum",
           "valueSchema": "double"
         }
@@ -1049,10 +1049,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_glikk;1",
+        "@id": "dtmi:example:quan_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_fuddle;1",
+          "@id": "dtmi:example:quan_psi;1",
           "@type": "Enum",
           "valueSchema": "dtmi:dtdl:instance:Schema:double;3"
         }
@@ -1067,11 +1067,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_snee;1",
+        "@id": "dtmi:example:quan_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:psi_nuh;1",
+          "@id": "dtmi:example:quan_yuzz;1",
           "@type": "Enum",
           "valueSchema": "dtmi:dtdl:instance:Schema:double;3"
         }
@@ -1086,10 +1086,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_thnad;1",
+        "@id": "dtmi:example:quan_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_quan;1",
+          "@id": "dtmi:example:quan_um;1",
           "@type": "Enum",
           "valueSchema": "duration"
         }
@@ -1104,11 +1104,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_floob;1",
+        "@id": "dtmi:example:quan_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:psi_spazz;1",
+          "@id": "dtmi:example:quan_fuddle;1",
           "@type": "Enum",
           "valueSchema": "duration"
         }
@@ -1123,10 +1123,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_jogg;1",
+        "@id": "dtmi:example:quan_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_zatz;1",
+          "@id": "dtmi:example:quan_nuh;1",
           "@type": "Enum",
           "valueSchema": "dtmi:dtdl:instance:Schema:duration;3"
         }
@@ -1141,11 +1141,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_itch;1",
+        "@id": "dtmi:example:quan_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:psi_flunn;1",
+          "@id": "dtmi:example:quan_quan;1",
           "@type": "Enum",
           "valueSchema": "dtmi:dtdl:instance:Schema:duration;3"
         }
@@ -1160,10 +1160,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_vroo;1",
+        "@id": "dtmi:example:quan_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_yekk;1",
+          "@id": "dtmi:example:quan_spazz;1",
           "@type": "Enum",
           "valueSchema": "float"
         }
@@ -1178,11 +1178,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_alpha;1",
+        "@id": "dtmi:example:quan_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:psi_hi;1",
+          "@id": "dtmi:example:quan_zatz;1",
           "@type": "Enum",
           "valueSchema": "float"
         }
@@ -1197,10 +1197,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_gamma;1",
+        "@id": "dtmi:example:quan_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_beta;1",
+          "@id": "dtmi:example:quan_flunn;1",
           "@type": "Enum",
           "valueSchema": "dtmi:dtdl:instance:Schema:float;3"
         }
@@ -1215,11 +1215,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_epsilon;1",
+        "@id": "dtmi:example:quan_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omega_delta;1",
+          "@id": "dtmi:example:quan_yekk;1",
           "@type": "Enum",
           "valueSchema": "dtmi:dtdl:instance:Schema:float;3"
         }
@@ -1234,10 +1234,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_eta;1",
+        "@id": "dtmi:example:thnad_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_zeta;1",
+          "@id": "dtmi:example:quan_hi;1",
           "@type": "Enum",
           "valueSchema": "long"
         }
@@ -1252,11 +1252,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_iota;1",
+        "@id": "dtmi:example:thnad_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omega_theta;1",
+          "@id": "dtmi:example:thnad_beta;1",
           "@type": "Enum",
           "valueSchema": "long"
         }
@@ -1271,10 +1271,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_lambda;1",
+        "@id": "dtmi:example:thnad_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_kappa;1",
+          "@id": "dtmi:example:thnad_delta;1",
           "@type": "Enum",
           "valueSchema": "dtmi:dtdl:instance:Schema:long;3"
         }
@@ -1289,11 +1289,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_nu;1",
+        "@id": "dtmi:example:thnad_eta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omega_mu;1",
+          "@id": "dtmi:example:thnad_zeta;1",
           "@type": "Enum",
           "valueSchema": "dtmi:dtdl:instance:Schema:long;3"
         }
@@ -1308,10 +1308,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_omicron;1",
+        "@id": "dtmi:example:thnad_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_xi;1",
+          "@id": "dtmi:example:thnad_theta;1",
           "@type": "Enum",
           "valueSchema": "time"
         }
@@ -1326,11 +1326,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_rho;1",
+        "@id": "dtmi:example:thnad_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omega_pi;1",
+          "@id": "dtmi:example:thnad_kappa;1",
           "@type": "Enum",
           "valueSchema": "time"
         }
@@ -1345,10 +1345,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_tau;1",
+        "@id": "dtmi:example:thnad_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_sigma;1",
+          "@id": "dtmi:example:thnad_mu;1",
           "@type": "Enum",
           "valueSchema": "dtmi:dtdl:instance:Schema:time;3"
         }
@@ -1363,11 +1363,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_phi;1",
+        "@id": "dtmi:example:thnad_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omega_upsilon;1",
+          "@id": "dtmi:example:thnad_xi;1",
           "@type": "Enum",
           "valueSchema": "dtmi:dtdl:instance:Schema:time;3"
         }
@@ -1382,10 +1382,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_psi;1",
+        "@id": "dtmi:example:thnad_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_chi;1",
+          "@id": "dtmi:example:thnad_pi;1",
           "@type": "Enum",
           "valueSchema": "lineString"
         }
@@ -1400,11 +1400,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_yuzz;1",
+        "@id": "dtmi:example:thnad_tau;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omega_omega;1",
+          "@id": "dtmi:example:thnad_sigma;1",
           "@type": "Enum",
           "valueSchema": "lineString"
         }
@@ -1419,10 +1419,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_um;1",
+        "@id": "dtmi:example:thnad_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_wum;1",
+          "@id": "dtmi:example:thnad_upsilon;1",
           "@type": "Enum",
           "valueSchema": "dtmi:standard:schema:geospatial:lineString;3"
         }
@@ -1437,11 +1437,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_fuddle;1",
+        "@id": "dtmi:example:thnad_psi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omega_humpf;1",
+          "@id": "dtmi:example:thnad_chi;1",
           "@type": "Enum",
           "valueSchema": "dtmi:standard:schema:geospatial:lineString;3"
         }
@@ -1456,10 +1456,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_nuh;1",
+        "@id": "dtmi:example:thnad_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_glikk;1",
+          "@id": "dtmi:example:thnad_omega;1",
           "@type": "Enum",
           "valueSchema": "multiLineString"
         }
@@ -1474,11 +1474,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_quan;1",
+        "@id": "dtmi:example:thnad_um;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omega_snee;1",
+          "@id": "dtmi:example:thnad_wum;1",
           "@type": "Enum",
           "valueSchema": "multiLineString"
         }
@@ -1493,10 +1493,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_spazz;1",
+        "@id": "dtmi:example:thnad_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_thnad;1",
+          "@id": "dtmi:example:thnad_humpf;1",
           "@type": "Enum",
           "valueSchema": "dtmi:standard:schema:geospatial:multiLineString;3"
         }
@@ -1511,11 +1511,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_zatz;1",
+        "@id": "dtmi:example:thnad_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omega_floob;1",
+          "@id": "dtmi:example:thnad_glikk;1",
           "@type": "Enum",
           "valueSchema": "dtmi:standard:schema:geospatial:multiLineString;3"
         }
@@ -1530,10 +1530,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_flunn;1",
+        "@id": "dtmi:example:thnad_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_jogg;1",
+          "@id": "dtmi:example:thnad_snee;1",
           "@type": "Enum",
           "valueSchema": "multiPoint"
         }
@@ -1548,11 +1548,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_yekk;1",
+        "@id": "dtmi:example:thnad_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omega_itch;1",
+          "@id": "dtmi:example:thnad_thnad;1",
           "@type": "Enum",
           "valueSchema": "multiPoint"
         }
@@ -1567,10 +1567,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_hi;1",
+        "@id": "dtmi:example:thnad_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_vroo;1",
+          "@id": "dtmi:example:thnad_floob;1",
           "@type": "Enum",
           "valueSchema": "dtmi:standard:schema:geospatial:multiPoint;3"
         }
@@ -1585,11 +1585,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_beta;1",
+        "@id": "dtmi:example:thnad_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yuzz_alpha;1",
+          "@id": "dtmi:example:thnad_jogg;1",
           "@type": "Enum",
           "valueSchema": "dtmi:standard:schema:geospatial:multiPoint;3"
         }
@@ -1604,10 +1604,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_delta;1",
+        "@id": "dtmi:example:thnad_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_gamma;1",
+          "@id": "dtmi:example:thnad_itch;1",
           "@type": "Enum",
           "valueSchema": "multiPolygon"
         }
@@ -1622,11 +1622,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_zeta;1",
+        "@id": "dtmi:example:thnad_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yuzz_epsilon;1",
+          "@id": "dtmi:example:thnad_vroo;1",
           "@type": "Enum",
           "valueSchema": "multiPolygon"
         }
@@ -1641,10 +1641,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_theta;1",
+        "@id": "dtmi:example:spazz_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_eta;1",
+          "@id": "dtmi:example:spazz_alpha;1",
           "@type": "Enum",
           "valueSchema": "dtmi:standard:schema:geospatial:multiPolygon;3"
         }
@@ -1659,11 +1659,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_kappa;1",
+        "@id": "dtmi:example:spazz_delta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yuzz_iota;1",
+          "@id": "dtmi:example:spazz_gamma;1",
           "@type": "Enum",
           "valueSchema": "dtmi:standard:schema:geospatial:multiPolygon;3"
         }
@@ -1678,10 +1678,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_mu;1",
+        "@id": "dtmi:example:spazz_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_lambda;1",
+          "@id": "dtmi:example:spazz_epsilon;1",
           "@type": "Enum",
           "valueSchema": "point"
         }
@@ -1696,11 +1696,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_xi;1",
+        "@id": "dtmi:example:spazz_theta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yuzz_nu;1",
+          "@id": "dtmi:example:spazz_eta;1",
           "@type": "Enum",
           "valueSchema": "point"
         }
@@ -1715,10 +1715,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_pi;1",
+        "@id": "dtmi:example:spazz_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_omicron;1",
+          "@id": "dtmi:example:spazz_iota;1",
           "@type": "Enum",
           "valueSchema": "dtmi:standard:schema:geospatial:point;3"
         }
@@ -1733,11 +1733,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_sigma;1",
+        "@id": "dtmi:example:spazz_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yuzz_rho;1",
+          "@id": "dtmi:example:spazz_lambda;1",
           "@type": "Enum",
           "valueSchema": "dtmi:standard:schema:geospatial:point;3"
         }
@@ -1752,10 +1752,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_upsilon;1",
+        "@id": "dtmi:example:spazz_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_tau;1",
+          "@id": "dtmi:example:spazz_nu;1",
           "@type": "Enum",
           "valueSchema": "polygon"
         }
@@ -1770,11 +1770,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_chi;1",
+        "@id": "dtmi:example:spazz_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yuzz_phi;1",
+          "@id": "dtmi:example:spazz_omicron;1",
           "@type": "Enum",
           "valueSchema": "polygon"
         }
@@ -1789,10 +1789,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_omega;1",
+        "@id": "dtmi:example:spazz_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_psi;1",
+          "@id": "dtmi:example:spazz_rho;1",
           "@type": "Enum",
           "valueSchema": "dtmi:standard:schema:geospatial:polygon;3"
         }
@@ -1807,11 +1807,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_wum;1",
+        "@id": "dtmi:example:spazz_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yuzz_yuzz;1",
+          "@id": "dtmi:example:spazz_tau;1",
           "@type": "Enum",
           "valueSchema": "dtmi:standard:schema:geospatial:polygon;3"
         }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumPropertyValueSchemaTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassEnumPropertyValueSchemaTermAndDtmiV3.json
index 51b15a8d..b86ac634 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumPropertyValueSchemaTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumPropertyValueSchemaTermAndDtmiV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_gamma;1",
+        "@id": "dtmi:example:spazz_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_beta;1",
+          "@id": "dtmi:example:spazz_flunn;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "dtmi:dtdl:property:valueSchema;3": "integer"
@@ -26,11 +26,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_epsilon;1",
+        "@id": "dtmi:example:spazz_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:wum_delta;1",
+          "@id": "dtmi:example:spazz_yekk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "dtmi:dtdl:property:valueSchema;3": "integer"
diff --git a/DTDL/v3/spec/Requirement-ClassEnumRequiredPropertiesV3.json b/DTDL/v3/spec/Requirement-ClassEnumRequiredPropertiesV3.json
index 50048c1f..cc9a5f80 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumRequiredPropertiesV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumRequiredPropertiesV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_hi;1",
+        "@id": "dtmi:example:humpf_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_vroo;1",
+          "@id": "dtmi:example:humpf_floob;1",
           "valueSchema": "integer"
         }
       }
@@ -24,11 +24,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_beta;1",
+        "@id": "dtmi:example:humpf_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:tau_alpha;1",
+          "@id": "dtmi:example:humpf_jogg;1",
           "valueSchema": "integer"
         }
       }
@@ -42,10 +42,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_delta;1",
+        "@id": "dtmi:example:humpf_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_gamma;1",
+          "@id": "dtmi:example:humpf_itch;1",
           "@type": "Enum"
         }
       }
@@ -59,11 +59,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_zeta;1",
+        "@id": "dtmi:example:humpf_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:tau_epsilon;1",
+          "@id": "dtmi:example:humpf_vroo;1",
           "@type": "Enum"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumTypeIncludesInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassEnumTypeIncludesInvalidDtmiV3.json
index 64e5c393..cc231f3f 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumTypeIncludesInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumTypeIncludesInvalidDtmiV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_nuh;1",
+        "@id": "dtmi:example:glikk_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_glikk;1",
+          "@id": "dtmi:example:glikk_omega;1",
           "@type": [
             "Enum",
             "dtmi:foo//bar"
@@ -28,11 +28,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_quan;1",
+        "@id": "dtmi:example:glikk_um;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:upsilon_snee;1",
+          "@id": "dtmi:example:glikk_wum;1",
           "@type": [
             "Enum",
             "dtmi:foo//bar"
diff --git a/DTDL/v3/spec/Requirement-ClassEnumTypeIncludesMaterialV3.json b/DTDL/v3/spec/Requirement-ClassEnumTypeIncludesMaterialV3.json
index 0e14ac48..a21d25db 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumTypeIncludesMaterialV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumTypeIncludesMaterialV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_itch;1",
+        "@id": "dtmi:example:fuddle_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_flunn;1",
+          "@id": "dtmi:example:fuddle_quan;1",
           "valueSchema": "integer",
           "@type": "Enum"
         }
@@ -25,10 +25,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_vroo;1",
+        "@id": "dtmi:example:fuddle_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_yekk;1",
+          "@id": "dtmi:example:fuddle_spazz;1",
           "valueSchema": "integer",
           "@type": [
             "Enum"
@@ -45,10 +45,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_alpha;1",
+        "@id": "dtmi:example:fuddle_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_hi;1",
+          "@id": "dtmi:example:fuddle_zatz;1",
           "valueSchema": "integer",
           "@type": "dtmi:dtdl:class:Enum;3"
         }
@@ -63,10 +63,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_gamma;1",
+        "@id": "dtmi:example:fuddle_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_beta;1",
+          "@id": "dtmi:example:fuddle_flunn;1",
           "valueSchema": "integer",
           "@type": [
             "dtmi:dtdl:class:Enum;3"
@@ -83,10 +83,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_epsilon;1",
+        "@id": "dtmi:example:fuddle_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_delta;1",
+          "@id": "dtmi:example:fuddle_yekk;1",
           "valueSchema": "integer",
           "@type": "Something"
         }
@@ -101,11 +101,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_eta;1",
+        "@id": "dtmi:example:glikk_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:upsilon_zeta;1",
+          "@id": "dtmi:example:fuddle_hi;1",
           "valueSchema": "integer",
           "@type": "Something"
         }
@@ -120,10 +120,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_iota;1",
+        "@id": "dtmi:example:glikk_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_theta;1",
+          "@id": "dtmi:example:glikk_beta;1",
           "valueSchema": "integer",
           "@type": [
             "Something"
@@ -140,11 +140,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_lambda;1",
+        "@id": "dtmi:example:glikk_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:upsilon_kappa;1",
+          "@id": "dtmi:example:glikk_delta;1",
           "valueSchema": "integer",
           "@type": [
             "Something"
diff --git a/DTDL/v3/spec/Requirement-ClassEnumTypeIncludesNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassEnumTypeIncludesNotDtmiNorTermV3.json
index bbfd95f5..302fcdef 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumTypeIncludesNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumTypeIncludesNotDtmiNorTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_spazz;1",
+        "@id": "dtmi:example:glikk_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_thnad;1",
+          "@id": "dtmi:example:glikk_humpf;1",
           "@type": [
             "Enum",
             "http://foo.com/bar"
@@ -28,11 +28,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_zatz;1",
+        "@id": "dtmi:example:glikk_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:upsilon_floob;1",
+          "@id": "dtmi:example:glikk_glikk;1",
           "@type": [
             "Enum",
             "http://foo.com/bar"
diff --git a/DTDL/v3/spec/Requirement-ClassEnumTypeStringOrArrayV3.json b/DTDL/v3/spec/Requirement-ClassEnumTypeStringOrArrayV3.json
index f8a526bc..ea7b6b8e 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumTypeStringOrArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumTypeStringOrArrayV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_theta;1",
+        "@id": "dtmi:example:fuddle_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_eta;1",
+          "@id": "dtmi:example:fuddle_alpha;1",
           "valueSchema": "integer",
           "@type": 626
         }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_kappa;1",
+        "@id": "dtmi:example:fuddle_delta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:tau_iota;1",
+          "@id": "dtmi:example:fuddle_gamma;1",
           "valueSchema": "integer",
           "@type": 626
         }
@@ -44,10 +44,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_mu;1",
+        "@id": "dtmi:example:fuddle_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_lambda;1",
+          "@id": "dtmi:example:fuddle_epsilon;1",
           "valueSchema": "integer",
           "@type": null
         }
@@ -62,11 +62,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_xi;1",
+        "@id": "dtmi:example:fuddle_theta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:tau_nu;1",
+          "@id": "dtmi:example:fuddle_eta;1",
           "valueSchema": "integer",
           "@type": null
         }
@@ -81,10 +81,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_pi;1",
+        "@id": "dtmi:example:fuddle_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_omicron;1",
+          "@id": "dtmi:example:fuddle_iota;1",
           "valueSchema": "integer",
           "@type": true
         }
@@ -99,11 +99,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_sigma;1",
+        "@id": "dtmi:example:fuddle_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:tau_rho;1",
+          "@id": "dtmi:example:fuddle_lambda;1",
           "valueSchema": "integer",
           "@type": true
         }
@@ -118,10 +118,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_upsilon;1",
+        "@id": "dtmi:example:fuddle_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_tau;1",
+          "@id": "dtmi:example:fuddle_nu;1",
           "valueSchema": "integer",
           "@type": {}
         }
@@ -136,11 +136,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_chi;1",
+        "@id": "dtmi:example:fuddle_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:tau_phi;1",
+          "@id": "dtmi:example:fuddle_omicron;1",
           "valueSchema": "integer",
           "@type": {}
         }
@@ -155,10 +155,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_omega;1",
+        "@id": "dtmi:example:fuddle_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_psi;1",
+          "@id": "dtmi:example:fuddle_rho;1",
           "valueSchema": "integer",
           "@type": [
             626
@@ -175,11 +175,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_wum;1",
+        "@id": "dtmi:example:fuddle_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:tau_yuzz;1",
+          "@id": "dtmi:example:fuddle_tau;1",
           "valueSchema": "integer",
           "@type": [
             626
@@ -196,10 +196,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_humpf;1",
+        "@id": "dtmi:example:fuddle_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_um;1",
+          "@id": "dtmi:example:fuddle_phi;1",
           "valueSchema": "integer",
           "@type": [
             null
@@ -216,11 +216,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_glikk;1",
+        "@id": "dtmi:example:fuddle_omega;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:tau_fuddle;1",
+          "@id": "dtmi:example:fuddle_psi;1",
           "valueSchema": "integer",
           "@type": [
             null
@@ -237,10 +237,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_snee;1",
+        "@id": "dtmi:example:fuddle_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_nuh;1",
+          "@id": "dtmi:example:fuddle_yuzz;1",
           "valueSchema": "integer",
           "@type": [
             true
@@ -257,11 +257,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_thnad;1",
+        "@id": "dtmi:example:fuddle_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:tau_quan;1",
+          "@id": "dtmi:example:fuddle_um;1",
           "valueSchema": "integer",
           "@type": [
             true
@@ -278,10 +278,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_floob;1",
+        "@id": "dtmi:example:fuddle_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_spazz;1",
+          "@id": "dtmi:example:fuddle_fuddle;1",
           "valueSchema": "integer",
           "@type": [
             {}
@@ -298,11 +298,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_jogg;1",
+        "@id": "dtmi:example:fuddle_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:tau_zatz;1",
+          "@id": "dtmi:example:fuddle_nuh;1",
           "valueSchema": "integer",
           "@type": [
             {}
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValueContextConformsV3.json b/DTDL/v3/spec/Requirement-ClassEnumValueContextConformsV3.json
index 3537aa7d..0ec249bd 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValueContextConformsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValueContextConformsV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_rho;1",
+        "@id": "dtmi:example:nu_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "gamma_pi",
+          "name": "nu_chi",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 1211,
-              "name": "gamma_omicron",
+              "enumValue": 1226,
+              "name": "nu_phi",
               "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
             }
           }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_upsilon;1",
+        "@id": "dtmi:example:nu_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "gamma_tau",
+          "name": "nu_yuzz",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 1212,
-              "name": "gamma_sigma",
+              "enumValue": 1227,
+              "name": "nu_omega",
               "@context": []
             }
           }
@@ -59,17 +59,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_psi;1",
+        "@id": "dtmi:example:nu_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "gamma_chi",
+          "name": "nu_humpf",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 1213,
-              "name": "gamma_phi",
+              "enumValue": 1228,
+              "name": "nu_um",
               "@context": [
                 "dtmi:dtdl:extension:quantitativeTypes;1"
               ]
@@ -87,17 +87,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_wum;1",
+        "@id": "dtmi:example:nu_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "gamma_yuzz",
+          "name": "nu_nuh",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 1214,
-              "name": "gamma_omega",
+              "enumValue": 1229,
+              "name": "nu_glikk",
               "@context": null
             }
           }
@@ -113,17 +113,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_fuddle;1",
+        "@id": "dtmi:example:nu_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "gamma_humpf",
+          "name": "nu_thnad",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 1215,
-              "name": "gamma_um",
+              "enumValue": 1230,
+              "name": "nu_quan",
               "@context": 626
             }
           }
@@ -139,17 +139,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_snee;1",
+        "@id": "dtmi:example:nu_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "gamma_nuh",
+          "name": "nu_zatz",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 1216,
-              "name": "gamma_glikk",
+              "enumValue": 1231,
+              "name": "nu_floob",
               "@context": true
             }
           }
@@ -165,17 +165,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_spazz;1",
+        "@id": "dtmi:example:nu_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "gamma_thnad",
+          "name": "nu_itch",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 1217,
-              "name": "gamma_quan",
+              "enumValue": 1232,
+              "name": "nu_flunn",
               "@context": [
                 null
               ]
@@ -193,17 +193,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_jogg;1",
+        "@id": "dtmi:example:xi_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "gamma_zatz",
+          "name": "nu_hi",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 1218,
-              "name": "gamma_floob",
+              "enumValue": 1233,
+              "name": "nu_vroo",
               "@context": [
                 626
               ]
@@ -221,17 +221,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_yekk;1",
+        "@id": "dtmi:example:xi_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "gamma_itch",
+          "name": "xi_gamma",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 1219,
-              "name": "gamma_flunn",
+              "enumValue": 1234,
+              "name": "xi_beta",
               "@context": [
                 true
               ]
@@ -249,18 +249,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_alpha;1",
+        "@id": "dtmi:example:xi_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "gamma_hi",
+          "name": "xi_zeta",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 1220,
-              "name": "gamma_vroo",
-              "@context": {}
+              "enumValue": 1235,
+              "name": "xi_epsilon",
+              "@context": "dtmi:dtdl:extension:quantitativeTypes"
             }
           }
         }
@@ -275,20 +275,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_delta;1",
+        "@id": "dtmi:example:xi_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "delta_gamma",
+          "name": "xi_iota",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 1221,
-              "name": "delta_beta",
-              "@context": [
-                {}
-              ]
+              "enumValue": 1236,
+              "name": "xi_theta",
+              "@context": "http://dtdl/extension/quantitativeTypes/1"
             }
           }
         }
@@ -303,18 +301,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_eta;1",
+        "@id": "dtmi:example:xi_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "delta_zeta",
+          "name": "xi_mu",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 1222,
-              "name": "delta_epsilon",
-              "@context": "dtmi:dtdl:extension:quantitativeTypes"
+              "enumValue": 1237,
+              "name": "xi_lambda",
+              "@context": "quantitativeTypes;1"
             }
           }
         }
@@ -329,18 +327,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_kappa;1",
+        "@id": "dtmi:example:xi_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "delta_iota",
+          "name": "xi_omicron",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 1223,
-              "name": "delta_theta",
-              "@context": "http://dtdl/extension/quantitativeTypes/1"
+              "enumValue": 1238,
+              "name": "xi_xi",
+              "@context": {}
             }
           }
         }
@@ -355,18 +353,78 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_nu;1",
+        "@id": "dtmi:example:xi_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "delta_mu",
+          "name": "xi_sigma",
           "schema": {
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "enumValue": 1224,
-              "name": "delta_lambda",
-              "@context": "quantitativeTypes;1"
+              "enumValue": 1239,
+              "name": "xi_rho",
+              "@context": {
+                "foo": "dtmi:foo:bar;1"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:xi_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "xi_phi",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "enumValue": 1240,
+              "name": "xi_upsilon",
+              "@context": [
+                {}
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:xi_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "xi_omega",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "enumValue": 1241,
+              "name": "xi_psi",
+              "@context": [
+                {
+                  "foo": "dtmi:foo:bar;1"
+                }
+              ]
             }
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValueIdDuplicateV3.json b/DTDL/v3/spec/Requirement-ClassEnumValueIdDuplicateV3.json
index 20aba829..738021e7 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValueIdDuplicateV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValueIdDuplicateV3.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_zatz;1",
+        "@id": "dtmi:example:chi_zeta;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:lambda_zatz;1",
+          "@id": "dtmi:example:chi_zeta;1",
           "@type": "Property",
-          "name": "lambda_flunn",
+          "name": "chi_theta",
           "schema": {
-            "@id": "dtmi:example:lambda_zatz;1",
+            "@id": "dtmi:example:chi_zeta;1",
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
-              "@id": "dtmi:example:lambda_zatz;1",
-              "enumValue": 1333,
-              "name": "lambda_jogg"
+              "@id": "dtmi:example:chi_zeta;1",
+              "enumValue": 1350,
+              "name": "chi_eta"
             }
           }
         }
@@ -35,21 +35,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_itch;1",
+        "@id": "dtmi:example:chi_iota;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:lambda_itch;1",
+          "@id": "dtmi:example:chi_iota;1",
           "@type": "Property",
-          "name": "lambda_vroo",
+          "name": "chi_lambda",
           "schema": {
-            "@id": "dtmi:example:lambda_itch;1",
+            "@id": "dtmi:example:chi_iota;1",
             "@type": "Enum",
             "valueSchema": "integer",
             "enumValues": {
               "@context": "dtmi:undefinedExtension:context;1",
-              "@id": "dtmi:example:lambda_itch;1",
-              "enumValue": 1334,
-              "name": "lambda_yekk"
+              "@id": "dtmi:example:chi_iota;1",
+              "enumValue": 1351,
+              "name": "chi_kappa"
             }
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValueIdIsDtmiV3.json b/DTDL/v3/spec/Requirement-ClassEnumValueIdIsDtmiV3.json
index 982e4498..67a4ffee 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValueIdIsDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValueIdIsDtmiV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_delta;1",
+        "@id": "dtmi:example:rho_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_gamma;1",
+          "@id": "dtmi:example:rho_omicron;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;7",
-            "enumValue": 1264,
-            "name": "eta_beta"
+            "enumValue": 1281,
+            "name": "rho_xi"
           }
         }
       }
@@ -30,16 +30,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_eta;1",
+        "@id": "dtmi:example:rho_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_zeta;1",
+          "@id": "dtmi:example:rho_sigma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;108675309",
-            "enumValue": 1265,
-            "name": "eta_epsilon"
+            "enumValue": 1282,
+            "name": "rho_rho"
           }
         }
       }
@@ -53,16 +53,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_kappa;1",
+        "@id": "dtmi:example:rho_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_iota;1",
+          "@id": "dtmi:example:rho_phi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;999999999",
-            "enumValue": 1266,
-            "name": "eta_theta"
+            "enumValue": 1283,
+            "name": "rho_upsilon"
           }
         }
       }
@@ -76,16 +76,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_nu;1",
+        "@id": "dtmi:example:rho_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_mu;1",
+          "@id": "dtmi:example:rho_omega;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo;1",
-            "enumValue": 1267,
-            "name": "eta_lambda"
+            "enumValue": 1284,
+            "name": "rho_psi"
           }
         }
       }
@@ -99,16 +99,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_pi;1",
+        "@id": "dtmi:example:rho_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_omicron;1",
+          "@id": "dtmi:example:rho_um;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar",
-            "enumValue": 1268,
-            "name": "eta_xi"
+            "enumValue": 1285,
+            "name": "rho_wum"
           }
         }
       }
@@ -122,16 +122,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_tau;1",
+        "@id": "dtmi:example:rho_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_sigma;1",
+          "@id": "dtmi:example:rho_glikk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;3.14",
-            "enumValue": 1269,
-            "name": "eta_rho"
+            "enumValue": 1286,
+            "name": "rho_fuddle"
           }
         }
       }
@@ -145,16 +145,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_chi;1",
+        "@id": "dtmi:example:rho_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_phi;1",
+          "@id": "dtmi:example:rho_quan;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;3.141592",
-            "enumValue": 1270,
-            "name": "eta_upsilon"
+            "enumValue": 1287,
+            "name": "rho_snee"
           }
         }
       }
@@ -168,16 +168,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_yuzz;1",
+        "@id": "dtmi:example:rho_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_omega;1",
+          "@id": "dtmi:example:rho_floob;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": null,
-            "enumValue": 1271,
-            "name": "eta_psi"
+            "enumValue": 1288,
+            "name": "rho_spazz"
           }
         }
       }
@@ -191,17 +191,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_humpf;1",
+        "@id": "dtmi:example:rho_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_um;1",
+          "@id": "dtmi:example:rho_flunn;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": null,
-            "enumValue": 1272,
-            "name": "eta_wum"
+            "enumValue": 1289,
+            "name": "rho_jogg"
           }
         }
       }
@@ -215,16 +215,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_nuh;1",
+        "@id": "dtmi:example:rho_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_glikk;1",
+          "@id": "dtmi:example:rho_vroo;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": 626,
-            "enumValue": 1273,
-            "name": "eta_fuddle"
+            "enumValue": 1290,
+            "name": "rho_yekk"
           }
         }
       }
@@ -238,17 +238,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_thnad;1",
+        "@id": "dtmi:example:sigma_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_quan;1",
+          "@id": "dtmi:example:sigma_beta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": 626,
-            "enumValue": 1274,
-            "name": "eta_snee"
+            "enumValue": 1291,
+            "name": "sigma_alpha"
           }
         }
       }
@@ -262,16 +262,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_zatz;1",
+        "@id": "dtmi:example:sigma_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_floob;1",
+          "@id": "dtmi:example:sigma_epsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": true,
-            "enumValue": 1275,
-            "name": "eta_spazz"
+            "enumValue": 1292,
+            "name": "sigma_delta"
           }
         }
       }
@@ -285,17 +285,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_itch;1",
+        "@id": "dtmi:example:sigma_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_flunn;1",
+          "@id": "dtmi:example:sigma_theta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": true,
-            "enumValue": 1276,
-            "name": "eta_jogg"
+            "enumValue": 1293,
+            "name": "sigma_eta"
           }
         }
       }
@@ -309,18 +309,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_hi;1",
+        "@id": "dtmi:example:sigma_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_vroo;1",
+          "@id": "dtmi:example:sigma_lambda;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": {
               "@value": "dtmi:apparently:valid:identifier;3"
             },
-            "enumValue": 1277,
-            "name": "eta_yekk"
+            "enumValue": 1294,
+            "name": "sigma_kappa"
           }
         }
       }
@@ -334,10 +334,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_gamma;1",
+        "@id": "dtmi:example:sigma_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_beta;1",
+          "@id": "dtmi:example:sigma_xi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -345,8 +345,8 @@
             "@id": {
               "@value": "dtmi:apparently:valid:identifier;3"
             },
-            "enumValue": 1278,
-            "name": "theta_alpha"
+            "enumValue": 1295,
+            "name": "sigma_nu"
           }
         }
       }
@@ -360,16 +360,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_zeta;1",
+        "@id": "dtmi:example:sigma_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_epsilon;1",
+          "@id": "dtmi:example:sigma_rho;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;0",
-            "enumValue": 1279,
-            "name": "theta_delta"
+            "enumValue": 1296,
+            "name": "sigma_pi"
           }
         }
       }
@@ -383,17 +383,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_iota;1",
+        "@id": "dtmi:example:sigma_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_theta;1",
+          "@id": "dtmi:example:sigma_upsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0",
-            "enumValue": 1280,
-            "name": "theta_eta"
+            "enumValue": 1297,
+            "name": "sigma_tau"
           }
         }
       }
@@ -407,16 +407,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_mu;1",
+        "@id": "dtmi:example:sigma_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_lambda;1",
+          "@id": "dtmi:example:sigma_psi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;0.0",
-            "enumValue": 1281,
-            "name": "theta_kappa"
+            "enumValue": 1298,
+            "name": "sigma_chi"
           }
         }
       }
@@ -430,17 +430,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_omicron;1",
+        "@id": "dtmi:example:sigma_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_xi;1",
+          "@id": "dtmi:example:sigma_wum;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0.0",
-            "enumValue": 1282,
-            "name": "theta_nu"
+            "enumValue": 1299,
+            "name": "sigma_yuzz"
           }
         }
       }
@@ -454,16 +454,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_sigma;1",
+        "@id": "dtmi:example:sigma_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_rho;1",
+          "@id": "dtmi:example:sigma_fuddle;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;1234567890",
-            "enumValue": 1283,
-            "name": "theta_pi"
+            "enumValue": 1300,
+            "name": "sigma_humpf"
           }
         }
       }
@@ -477,17 +477,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_phi;1",
+        "@id": "dtmi:example:sigma_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_upsilon;1",
+          "@id": "dtmi:example:sigma_snee;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;1234567890",
-            "enumValue": 1284,
-            "name": "theta_tau"
+            "enumValue": 1301,
+            "name": "sigma_nuh"
           }
         }
       }
@@ -501,16 +501,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_omega;1",
+        "@id": "dtmi:example:sigma_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_psi;1",
+          "@id": "dtmi:example:sigma_spazz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;1a",
-            "enumValue": 1285,
-            "name": "theta_chi"
+            "enumValue": 1302,
+            "name": "sigma_thnad"
           }
         }
       }
@@ -524,17 +524,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_um;1",
+        "@id": "dtmi:example:sigma_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_wum;1",
+          "@id": "dtmi:example:sigma_jogg;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;1a",
-            "enumValue": 1286,
-            "name": "theta_yuzz"
+            "enumValue": 1303,
+            "name": "sigma_zatz"
           }
         }
       }
@@ -548,16 +548,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_glikk;1",
+        "@id": "dtmi:example:sigma_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_fuddle;1",
+          "@id": "dtmi:example:sigma_yekk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;3.0",
-            "enumValue": 1287,
-            "name": "theta_humpf"
+            "enumValue": 1304,
+            "name": "sigma_itch"
           }
         }
       }
@@ -571,17 +571,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_quan;1",
+        "@id": "dtmi:example:tau_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_snee;1",
+          "@id": "dtmi:example:tau_alpha;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.0",
-            "enumValue": 1288,
-            "name": "theta_nuh"
+            "enumValue": 1305,
+            "name": "sigma_hi"
           }
         }
       }
@@ -595,16 +595,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_floob;1",
+        "@id": "dtmi:example:tau_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_spazz;1",
+          "@id": "dtmi:example:tau_delta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;3.1415926",
-            "enumValue": 1289,
-            "name": "theta_thnad"
+            "enumValue": 1306,
+            "name": "tau_gamma"
           }
         }
       }
@@ -618,17 +618,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_flunn;1",
+        "@id": "dtmi:example:tau_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_jogg;1",
+          "@id": "dtmi:example:tau_eta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.1415926",
-            "enumValue": 1290,
-            "name": "theta_zatz"
+            "enumValue": 1307,
+            "name": "tau_zeta"
           }
         }
       }
@@ -642,16 +642,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_vroo;1",
+        "@id": "dtmi:example:tau_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_yekk;1",
+          "@id": "dtmi:example:tau_kappa;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;6.02",
-            "enumValue": 1291,
-            "name": "theta_itch"
+            "enumValue": 1308,
+            "name": "tau_iota"
           }
         }
       }
@@ -665,17 +665,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_beta;1",
+        "@id": "dtmi:example:tau_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_alpha;1",
+          "@id": "dtmi:example:tau_nu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;6.02",
-            "enumValue": 1292,
-            "name": "theta_hi"
+            "enumValue": 1309,
+            "name": "tau_mu"
           }
         }
       }
@@ -689,16 +689,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_epsilon;1",
+        "@id": "dtmi:example:tau_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_delta;1",
+          "@id": "dtmi:example:tau_pi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;0.1",
-            "enumValue": 1293,
-            "name": "iota_gamma"
+            "enumValue": 1310,
+            "name": "tau_omicron"
           }
         }
       }
@@ -712,17 +712,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_theta;1",
+        "@id": "dtmi:example:tau_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_eta;1",
+          "@id": "dtmi:example:tau_tau;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0.1",
-            "enumValue": 1294,
-            "name": "iota_zeta"
+            "enumValue": 1311,
+            "name": "tau_sigma"
           }
         }
       }
@@ -736,16 +736,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_lambda;1",
+        "@id": "dtmi:example:tau_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_kappa;1",
+          "@id": "dtmi:example:tau_chi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;01",
-            "enumValue": 1295,
-            "name": "iota_iota"
+            "enumValue": 1312,
+            "name": "tau_phi"
           }
         }
       }
@@ -759,17 +759,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_xi;1",
+        "@id": "dtmi:example:tau_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_nu;1",
+          "@id": "dtmi:example:tau_yuzz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;01",
-            "enumValue": 1296,
-            "name": "iota_mu"
+            "enumValue": 1313,
+            "name": "tau_omega"
           }
         }
       }
@@ -783,16 +783,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_rho;1",
+        "@id": "dtmi:example:tau_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_pi;1",
+          "@id": "dtmi:example:tau_humpf;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar;",
-            "enumValue": 1297,
-            "name": "iota_omicron"
+            "enumValue": 1314,
+            "name": "tau_um"
           }
         }
       }
@@ -806,17 +806,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_upsilon;1",
+        "@id": "dtmi:example:tau_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_tau;1",
+          "@id": "dtmi:example:tau_nuh;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;",
-            "enumValue": 1298,
-            "name": "iota_sigma"
+            "enumValue": 1315,
+            "name": "tau_glikk"
           }
         }
       }
@@ -830,16 +830,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_psi;1",
+        "@id": "dtmi:example:tau_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_chi;1",
+          "@id": "dtmi:example:tau_thnad;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:test:invalidId_;1",
-            "enumValue": 1299,
-            "name": "iota_phi"
+            "enumValue": 1316,
+            "name": "tau_quan"
           }
         }
       }
@@ -853,17 +853,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_wum;1",
+        "@id": "dtmi:example:tau_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_yuzz;1",
+          "@id": "dtmi:example:tau_zatz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:invalidId_;1",
-            "enumValue": 1300,
-            "name": "iota_omega"
+            "enumValue": 1317,
+            "name": "tau_floob"
           }
         }
       }
@@ -877,16 +877,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_fuddle;1",
+        "@id": "dtmi:example:tau_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_humpf;1",
+          "@id": "dtmi:example:tau_itch;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:test:_invalidUserId;1",
-            "enumValue": 1301,
-            "name": "iota_um"
+            "enumValue": 1318,
+            "name": "tau_flunn"
           }
         }
       }
@@ -900,17 +900,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_snee;1",
+        "@id": "dtmi:example:upsilon_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_nuh;1",
+          "@id": "dtmi:example:tau_hi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:_invalidUserId;1",
-            "enumValue": 1302,
-            "name": "iota_glikk"
+            "enumValue": 1319,
+            "name": "tau_vroo"
           }
         }
       }
@@ -924,16 +924,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_spazz;1",
+        "@id": "dtmi:example:upsilon_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_thnad;1",
+          "@id": "dtmi:example:upsilon_gamma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:test:1seg;1",
-            "enumValue": 1303,
-            "name": "iota_quan"
+            "enumValue": 1320,
+            "name": "upsilon_beta"
           }
         }
       }
@@ -947,17 +947,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_jogg;1",
+        "@id": "dtmi:example:upsilon_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_zatz;1",
+          "@id": "dtmi:example:upsilon_zeta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:1seg;1",
-            "enumValue": 1304,
-            "name": "iota_floob"
+            "enumValue": 1321,
+            "name": "upsilon_epsilon"
           }
         }
       }
@@ -971,16 +971,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_yekk;1",
+        "@id": "dtmi:example:upsilon_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_itch;1",
+          "@id": "dtmi:example:upsilon_iota;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo:bar.baz;1",
-            "enumValue": 1305,
-            "name": "iota_flunn"
+            "enumValue": 1322,
+            "name": "upsilon_theta"
           }
         }
       }
@@ -994,17 +994,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_alpha;1",
+        "@id": "dtmi:example:upsilon_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_hi;1",
+          "@id": "dtmi:example:upsilon_mu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar.baz;1",
-            "enumValue": 1306,
-            "name": "iota_vroo"
+            "enumValue": 1323,
+            "name": "upsilon_lambda"
           }
         }
       }
@@ -1018,16 +1018,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_delta;1",
+        "@id": "dtmi:example:upsilon_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_gamma;1",
+          "@id": "dtmi:example:upsilon_omicron;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:foo::bar;1",
-            "enumValue": 1307,
-            "name": "kappa_beta"
+            "enumValue": 1324,
+            "name": "upsilon_xi"
           }
         }
       }
@@ -1041,17 +1041,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_eta;1",
+        "@id": "dtmi:example:upsilon_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_zeta;1",
+          "@id": "dtmi:example:upsilon_sigma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo::bar;1",
-            "enumValue": 1308,
-            "name": "kappa_epsilon"
+            "enumValue": 1325,
+            "name": "upsilon_rho"
           }
         }
       }
@@ -1065,16 +1065,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_kappa;1",
+        "@id": "dtmi:example:upsilon_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_iota;1",
+          "@id": "dtmi:example:upsilon_phi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "urn:foo:bar:1",
-            "enumValue": 1309,
-            "name": "kappa_theta"
+            "enumValue": 1326,
+            "name": "upsilon_upsilon"
           }
         }
       }
@@ -1088,17 +1088,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_nu;1",
+        "@id": "dtmi:example:upsilon_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_mu;1",
+          "@id": "dtmi:example:upsilon_omega;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "urn:foo:bar:1",
-            "enumValue": 1310,
-            "name": "kappa_lambda"
+            "enumValue": 1327,
+            "name": "upsilon_psi"
           }
         }
       }
@@ -1112,16 +1112,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_pi;1",
+        "@id": "dtmi:example:upsilon_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_omicron;1",
+          "@id": "dtmi:example:upsilon_um;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "http://foo/bar/baz",
-            "enumValue": 1311,
-            "name": "kappa_xi"
+            "enumValue": 1328,
+            "name": "upsilon_wum"
           }
         }
       }
@@ -1135,17 +1135,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_tau;1",
+        "@id": "dtmi:example:upsilon_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_sigma;1",
+          "@id": "dtmi:example:upsilon_glikk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "http://foo/bar/baz",
-            "enumValue": 1312,
-            "name": "kappa_rho"
+            "enumValue": 1329,
+            "name": "upsilon_fuddle"
           }
         }
       }
@@ -1159,16 +1159,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_chi;1",
+        "@id": "dtmi:example:upsilon_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_phi;1",
+          "@id": "dtmi:example:upsilon_quan;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:;1",
-            "enumValue": 1313,
-            "name": "kappa_upsilon"
+            "enumValue": 1330,
+            "name": "upsilon_snee"
           }
         }
       }
@@ -1182,17 +1182,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_yuzz;1",
+        "@id": "dtmi:example:upsilon_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_omega;1",
+          "@id": "dtmi:example:upsilon_floob;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:;1",
-            "enumValue": 1314,
-            "name": "kappa_psi"
+            "enumValue": 1331,
+            "name": "upsilon_spazz"
           }
         }
       }
@@ -1206,16 +1206,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_humpf;1",
+        "@id": "dtmi:example:upsilon_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_um;1",
+          "@id": "dtmi:example:upsilon_flunn;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:dtdl:example;1",
-            "enumValue": 1315,
-            "name": "kappa_wum"
+            "enumValue": 1332,
+            "name": "upsilon_jogg"
           }
         }
       }
@@ -1229,17 +1229,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_nuh;1",
+        "@id": "dtmi:example:upsilon_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_glikk;1",
+          "@id": "dtmi:example:upsilon_vroo;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:dtdl:example;1",
-            "enumValue": 1316,
-            "name": "kappa_fuddle"
+            "enumValue": 1333,
+            "name": "upsilon_yekk"
           }
         }
       }
@@ -1253,16 +1253,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_thnad;1",
+        "@id": "dtmi:example:phi_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_quan;1",
+          "@id": "dtmi:example:phi_beta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": "dtmi:standard:example;1",
-            "enumValue": 1317,
-            "name": "kappa_snee"
+            "enumValue": 1334,
+            "name": "phi_alpha"
           }
         }
       }
@@ -1276,17 +1276,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_zatz;1",
+        "@id": "dtmi:example:phi_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_floob;1",
+          "@id": "dtmi:example:phi_epsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:standard:example;1",
-            "enumValue": 1318,
-            "name": "kappa_spazz"
+            "enumValue": 1335,
+            "name": "phi_delta"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValueIdNotArrayV3.json b/DTDL/v3/spec/Requirement-ClassEnumValueIdNotArrayV3.json
index e74eea29..1c21514d 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValueIdNotArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValueIdNotArrayV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_itch;1",
+        "@id": "dtmi:example:phi_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_flunn;1",
+          "@id": "dtmi:example:phi_theta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": [
               "dtmi:foo:bar;7"
             ],
-            "enumValue": 1319,
-            "name": "kappa_jogg"
+            "enumValue": 1336,
+            "name": "phi_eta"
           }
         }
       }
@@ -32,10 +32,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_hi;1",
+        "@id": "dtmi:example:phi_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_vroo;1",
+          "@id": "dtmi:example:phi_lambda;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -43,8 +43,8 @@
             "@id": [
               "dtmi:foo:bar;7"
             ],
-            "enumValue": 1320,
-            "name": "kappa_yekk"
+            "enumValue": 1337,
+            "name": "phi_kappa"
           }
         }
       }
@@ -58,18 +58,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_gamma;1",
+        "@id": "dtmi:example:phi_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_beta;1",
+          "@id": "dtmi:example:phi_xi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": [
               "dtmi:foo:bar;108675309"
             ],
-            "enumValue": 1321,
-            "name": "lambda_alpha"
+            "enumValue": 1338,
+            "name": "phi_nu"
           }
         }
       }
@@ -83,10 +83,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_zeta;1",
+        "@id": "dtmi:example:phi_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_epsilon;1",
+          "@id": "dtmi:example:phi_rho;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -94,8 +94,8 @@
             "@id": [
               "dtmi:foo:bar;108675309"
             ],
-            "enumValue": 1322,
-            "name": "lambda_delta"
+            "enumValue": 1339,
+            "name": "phi_pi"
           }
         }
       }
@@ -109,18 +109,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_iota;1",
+        "@id": "dtmi:example:phi_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_theta;1",
+          "@id": "dtmi:example:phi_upsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": [
               "dtmi:foo:bar;999999999"
             ],
-            "enumValue": 1323,
-            "name": "lambda_eta"
+            "enumValue": 1340,
+            "name": "phi_tau"
           }
         }
       }
@@ -134,10 +134,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_mu;1",
+        "@id": "dtmi:example:phi_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_lambda;1",
+          "@id": "dtmi:example:phi_psi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -145,8 +145,8 @@
             "@id": [
               "dtmi:foo:bar;999999999"
             ],
-            "enumValue": 1324,
-            "name": "lambda_kappa"
+            "enumValue": 1341,
+            "name": "phi_chi"
           }
         }
       }
@@ -160,18 +160,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_omicron;1",
+        "@id": "dtmi:example:phi_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_xi;1",
+          "@id": "dtmi:example:phi_wum;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": [
               "dtmi:foo;1"
             ],
-            "enumValue": 1325,
-            "name": "lambda_nu"
+            "enumValue": 1342,
+            "name": "phi_yuzz"
           }
         }
       }
@@ -185,10 +185,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_sigma;1",
+        "@id": "dtmi:example:phi_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_rho;1",
+          "@id": "dtmi:example:phi_fuddle;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -196,8 +196,8 @@
             "@id": [
               "dtmi:foo;1"
             ],
-            "enumValue": 1326,
-            "name": "lambda_pi"
+            "enumValue": 1343,
+            "name": "phi_humpf"
           }
         }
       }
@@ -211,18 +211,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_phi;1",
+        "@id": "dtmi:example:phi_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_upsilon;1",
+          "@id": "dtmi:example:phi_snee;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": [
               "dtmi:foo:bar"
             ],
-            "enumValue": 1327,
-            "name": "lambda_tau"
+            "enumValue": 1344,
+            "name": "phi_nuh"
           }
         }
       }
@@ -236,10 +236,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_omega;1",
+        "@id": "dtmi:example:phi_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_psi;1",
+          "@id": "dtmi:example:phi_spazz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -247,8 +247,8 @@
             "@id": [
               "dtmi:foo:bar"
             ],
-            "enumValue": 1328,
-            "name": "lambda_chi"
+            "enumValue": 1345,
+            "name": "phi_thnad"
           }
         }
       }
@@ -262,18 +262,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_um;1",
+        "@id": "dtmi:example:phi_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_wum;1",
+          "@id": "dtmi:example:phi_jogg;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": [
               "dtmi:foo:bar;3.14"
             ],
-            "enumValue": 1329,
-            "name": "lambda_yuzz"
+            "enumValue": 1346,
+            "name": "phi_zatz"
           }
         }
       }
@@ -287,10 +287,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_glikk;1",
+        "@id": "dtmi:example:phi_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_fuddle;1",
+          "@id": "dtmi:example:phi_yekk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -298,8 +298,8 @@
             "@id": [
               "dtmi:foo:bar;3.14"
             ],
-            "enumValue": 1330,
-            "name": "lambda_humpf"
+            "enumValue": 1347,
+            "name": "phi_itch"
           }
         }
       }
@@ -313,18 +313,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_quan;1",
+        "@id": "dtmi:example:chi_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_snee;1",
+          "@id": "dtmi:example:chi_alpha;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@id": [
               "dtmi:foo:bar;3.141592"
             ],
-            "enumValue": 1331,
-            "name": "lambda_nuh"
+            "enumValue": 1348,
+            "name": "phi_hi"
           }
         }
       }
@@ -338,10 +338,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_floob;1",
+        "@id": "dtmi:example:chi_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_spazz;1",
+          "@id": "dtmi:example:chi_delta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -349,8 +349,8 @@
             "@id": [
               "dtmi:foo:bar;3.141592"
             ],
-            "enumValue": 1332,
-            "name": "lambda_thnad"
+            "enumValue": 1349,
+            "name": "chi_gamma"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValueInvalidKeywordsV3.json b/DTDL/v3/spec/Requirement-ClassEnumValueInvalidKeywordsV3.json
index e3e325d0..38f4a892 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValueInvalidKeywordsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValueInvalidKeywordsV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_alpha;1",
+        "@id": "dtmi:example:fuddle_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_hi;1",
+          "@id": "dtmi:example:fuddle_mu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1428,
-            "name": "sigma_vroo",
+            "enumValue": 1445,
+            "name": "fuddle_lambda",
             "@graph": {}
           }
         }
@@ -30,16 +30,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_delta;1",
+        "@id": "dtmi:example:fuddle_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_gamma;1",
+          "@id": "dtmi:example:fuddle_omicron;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1429,
-            "name": "tau_beta",
+            "enumValue": 1446,
+            "name": "fuddle_xi",
             "@graph": {}
           }
         }
@@ -54,15 +54,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_eta;1",
+        "@id": "dtmi:example:fuddle_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_zeta;1",
+          "@id": "dtmi:example:fuddle_sigma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1430,
-            "name": "tau_epsilon",
+            "enumValue": 1447,
+            "name": "fuddle_rho",
             "@value": 626
           }
         }
@@ -77,16 +77,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_kappa;1",
+        "@id": "dtmi:example:fuddle_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_iota;1",
+          "@id": "dtmi:example:fuddle_phi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1431,
-            "name": "tau_theta",
+            "enumValue": 1448,
+            "name": "fuddle_upsilon",
             "@value": 626
           }
         }
@@ -101,15 +101,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_nu;1",
+        "@id": "dtmi:example:fuddle_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_mu;1",
+          "@id": "dtmi:example:fuddle_omega;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1432,
-            "name": "tau_lambda",
+            "enumValue": 1449,
+            "name": "fuddle_psi",
             "@language": "en"
           }
         }
@@ -124,16 +124,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_pi;1",
+        "@id": "dtmi:example:fuddle_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_omicron;1",
+          "@id": "dtmi:example:fuddle_um;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1433,
-            "name": "tau_xi",
+            "enumValue": 1450,
+            "name": "fuddle_wum",
             "@language": "en"
           }
         }
@@ -148,15 +148,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_tau;1",
+        "@id": "dtmi:example:fuddle_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_sigma;1",
+          "@id": "dtmi:example:fuddle_glikk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1434,
-            "name": "tau_rho",
+            "enumValue": 1451,
+            "name": "fuddle_fuddle",
             "@foobar": true
           }
         }
@@ -171,16 +171,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_chi;1",
+        "@id": "dtmi:example:fuddle_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_phi;1",
+          "@id": "dtmi:example:fuddle_quan;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1435,
-            "name": "tau_upsilon",
+            "enumValue": 1452,
+            "name": "fuddle_snee",
             "@foobar": true
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyCommentStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyCommentStringLengthV3.json
index 3abd698d..2d451d15 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyCommentStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyCommentStringLengthV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_chi;1",
+        "@id": "dtmi:example:psi_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_phi;1",
+          "@id": "dtmi:example:psi_quan;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1356,
-            "name": "nu_upsilon",
+            "enumValue": 1373,
+            "name": "psi_snee",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
         }
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_yuzz;1",
+        "@id": "dtmi:example:psi_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_omega;1",
+          "@id": "dtmi:example:psi_floob;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1357,
-            "name": "nu_psi",
+            "enumValue": 1374,
+            "name": "psi_spazz",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
@@ -53,16 +53,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_humpf;1",
+        "@id": "dtmi:example:psi_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_um;1",
+          "@id": "dtmi:example:psi_flunn;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1358,
-            "name": "nu_wum",
+            "enumValue": 1375,
+            "name": "psi_jogg",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyCommentStringV3.json b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyCommentStringV3.json
index 0e0741e0..ae0b241e 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyCommentStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyCommentStringV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_beta;1",
+        "@id": "dtmi:example:chi_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_alpha;1",
+          "@id": "dtmi:example:chi_nu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1335,
-            "name": "lambda_hi",
+            "enumValue": 1352,
+            "name": "chi_mu",
             "comment": "hello"
           }
         }
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_epsilon;1",
+        "@id": "dtmi:example:chi_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_delta;1",
+          "@id": "dtmi:example:chi_pi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1336,
-            "name": "mu_gamma",
+            "enumValue": 1353,
+            "name": "chi_omicron",
             "comment": [
               "hello"
             ]
@@ -55,15 +55,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_theta;1",
+        "@id": "dtmi:example:chi_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_eta;1",
+          "@id": "dtmi:example:chi_tau;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1337,
-            "name": "mu_zeta",
+            "enumValue": 1354,
+            "name": "chi_sigma",
             "comment": {
               "@value": "hello",
               "@type": "xsd:string"
@@ -81,15 +81,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_lambda;1",
+        "@id": "dtmi:example:chi_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_kappa;1",
+          "@id": "dtmi:example:chi_chi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1338,
-            "name": "mu_iota",
+            "enumValue": 1355,
+            "name": "chi_phi",
             "comment": [
               {
                 "@value": "hello",
@@ -109,15 +109,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_xi;1",
+        "@id": "dtmi:example:chi_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_nu;1",
+          "@id": "dtmi:example:chi_yuzz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1339,
-            "name": "mu_mu",
+            "enumValue": 1356,
+            "name": "chi_omega",
             "comment": []
           }
         }
@@ -132,15 +132,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_rho;1",
+        "@id": "dtmi:example:chi_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_pi;1",
+          "@id": "dtmi:example:chi_humpf;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1340,
-            "name": "mu_omicron",
+            "enumValue": 1357,
+            "name": "chi_um",
             "comment": null
           }
         }
@@ -155,16 +155,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_upsilon;1",
+        "@id": "dtmi:example:chi_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_tau;1",
+          "@id": "dtmi:example:chi_nuh;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1341,
-            "name": "mu_sigma",
+            "enumValue": 1358,
+            "name": "chi_glikk",
             "comment": null
           }
         }
@@ -179,15 +179,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_psi;1",
+        "@id": "dtmi:example:chi_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_chi;1",
+          "@id": "dtmi:example:chi_thnad;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1342,
-            "name": "mu_phi",
+            "enumValue": 1359,
+            "name": "chi_quan",
             "comment": true
           }
         }
@@ -202,16 +202,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_wum;1",
+        "@id": "dtmi:example:chi_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_yuzz;1",
+          "@id": "dtmi:example:chi_zatz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1343,
-            "name": "mu_omega",
+            "enumValue": 1360,
+            "name": "chi_floob",
             "comment": true
           }
         }
@@ -226,15 +226,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_fuddle;1",
+        "@id": "dtmi:example:chi_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_humpf;1",
+          "@id": "dtmi:example:chi_itch;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1344,
-            "name": "mu_um",
+            "enumValue": 1361,
+            "name": "chi_flunn",
             "comment": 626
           }
         }
@@ -249,16 +249,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_snee;1",
+        "@id": "dtmi:example:psi_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_nuh;1",
+          "@id": "dtmi:example:chi_hi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1345,
-            "name": "mu_glikk",
+            "enumValue": 1362,
+            "name": "chi_vroo",
             "comment": 626
           }
         }
@@ -273,15 +273,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_spazz;1",
+        "@id": "dtmi:example:psi_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_thnad;1",
+          "@id": "dtmi:example:psi_gamma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1346,
-            "name": "mu_quan",
+            "enumValue": 1363,
+            "name": "psi_beta",
             "comment": [
               null
             ]
@@ -298,16 +298,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_jogg;1",
+        "@id": "dtmi:example:psi_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_zatz;1",
+          "@id": "dtmi:example:psi_zeta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1347,
-            "name": "mu_floob",
+            "enumValue": 1364,
+            "name": "psi_epsilon",
             "comment": [
               null
             ]
@@ -324,15 +324,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_yekk;1",
+        "@id": "dtmi:example:psi_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_itch;1",
+          "@id": "dtmi:example:psi_iota;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1348,
-            "name": "mu_flunn",
+            "enumValue": 1365,
+            "name": "psi_theta",
             "comment": [
               true
             ]
@@ -349,16 +349,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_alpha;1",
+        "@id": "dtmi:example:psi_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_hi;1",
+          "@id": "dtmi:example:psi_mu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1349,
-            "name": "mu_vroo",
+            "enumValue": 1366,
+            "name": "psi_lambda",
             "comment": [
               true
             ]
@@ -375,15 +375,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_delta;1",
+        "@id": "dtmi:example:psi_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_gamma;1",
+          "@id": "dtmi:example:psi_omicron;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1350,
-            "name": "nu_beta",
+            "enumValue": 1367,
+            "name": "psi_xi",
             "comment": [
               626
             ]
@@ -400,16 +400,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_eta;1",
+        "@id": "dtmi:example:psi_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_zeta;1",
+          "@id": "dtmi:example:psi_sigma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1351,
-            "name": "nu_epsilon",
+            "enumValue": 1368,
+            "name": "psi_rho",
             "comment": [
               626
             ]
@@ -426,15 +426,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_kappa;1",
+        "@id": "dtmi:example:psi_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_iota;1",
+          "@id": "dtmi:example:psi_phi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1352,
-            "name": "nu_theta",
+            "enumValue": 1369,
+            "name": "psi_upsilon",
             "comment": {}
           }
         }
@@ -449,16 +449,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_nu;1",
+        "@id": "dtmi:example:psi_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_mu;1",
+          "@id": "dtmi:example:psi_omega;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1353,
-            "name": "nu_lambda",
+            "enumValue": 1370,
+            "name": "psi_psi",
             "comment": {}
           }
         }
@@ -473,15 +473,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_pi;1",
+        "@id": "dtmi:example:psi_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_omicron;1",
+          "@id": "dtmi:example:psi_um;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1354,
-            "name": "nu_xi",
+            "enumValue": 1371,
+            "name": "psi_wum",
             "comment": [
               {}
             ]
@@ -498,16 +498,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_tau;1",
+        "@id": "dtmi:example:psi_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_sigma;1",
+          "@id": "dtmi:example:psi_glikk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1355,
-            "name": "nu_rho",
+            "enumValue": 1372,
+            "name": "psi_fuddle",
             "comment": [
               {}
             ]
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyCommentTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyCommentTermAndDtmiV3.json
index b44ae3dd..50532e99 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyCommentTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyCommentTermAndDtmiV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_beta;1",
+        "@id": "dtmi:example:omega_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_alpha;1",
+          "@id": "dtmi:example:omega_nu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "comment": "nu_yekk",
-            "dtmi:dtdl:property:comment;3": "nu_vroo",
-            "enumValue": 1362,
-            "name": "nu_hi"
+            "comment": "omega_kappa",
+            "dtmi:dtdl:property:comment;3": "omega_lambda",
+            "enumValue": 1379,
+            "name": "omega_mu"
           }
         }
       }
@@ -31,18 +31,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_eta;1",
+        "@id": "dtmi:example:omega_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_zeta;1",
+          "@id": "dtmi:example:omega_sigma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "comment": "xi_gamma",
-            "dtmi:dtdl:property:comment;3": "xi_delta",
-            "enumValue": 1363,
-            "name": "xi_epsilon"
+            "comment": "omega_omicron",
+            "dtmi:dtdl:property:comment;3": "omega_pi",
+            "enumValue": 1380,
+            "name": "omega_rho"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyDescriptionLangStringV3.json b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyDescriptionLangStringV3.json
index 3b78491c..271de328 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyDescriptionLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyDescriptionLangStringV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_kappa;1",
+        "@id": "dtmi:example:omega_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_iota;1",
+          "@id": "dtmi:example:omega_phi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1364,
-            "name": "xi_theta",
+            "enumValue": 1381,
+            "name": "omega_upsilon",
             "description": "hello"
           }
         }
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_nu;1",
+        "@id": "dtmi:example:omega_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_mu;1",
+          "@id": "dtmi:example:omega_omega;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1365,
-            "name": "xi_lambda",
+            "enumValue": 1382,
+            "name": "omega_psi",
             "description": [
               "hello"
             ]
@@ -55,15 +55,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_pi;1",
+        "@id": "dtmi:example:omega_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_omicron;1",
+          "@id": "dtmi:example:omega_um;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1366,
-            "name": "xi_xi",
+            "enumValue": 1383,
+            "name": "omega_wum",
             "description": {
               "en": "hello"
             }
@@ -80,15 +80,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_tau;1",
+        "@id": "dtmi:example:omega_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_sigma;1",
+          "@id": "dtmi:example:omega_glikk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1367,
-            "name": "xi_rho",
+            "enumValue": 1384,
+            "name": "omega_fuddle",
             "description": [
               {
                 "@value": "hello",
@@ -108,15 +108,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_chi;1",
+        "@id": "dtmi:example:omega_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_phi;1",
+          "@id": "dtmi:example:omega_quan;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1368,
-            "name": "xi_upsilon",
+            "enumValue": 1385,
+            "name": "omega_snee",
             "description": {}
           }
         }
@@ -131,15 +131,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_yuzz;1",
+        "@id": "dtmi:example:omega_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_omega;1",
+          "@id": "dtmi:example:omega_floob;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1369,
-            "name": "xi_psi",
+            "enumValue": 1386,
+            "name": "omega_spazz",
             "description": []
           }
         }
@@ -154,15 +154,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_humpf;1",
+        "@id": "dtmi:example:omega_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_um;1",
+          "@id": "dtmi:example:omega_flunn;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1370,
-            "name": "xi_wum",
+            "enumValue": 1387,
+            "name": "omega_jogg",
             "description": null
           }
         }
@@ -177,16 +177,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_nuh;1",
+        "@id": "dtmi:example:omega_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_glikk;1",
+          "@id": "dtmi:example:omega_vroo;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1371,
-            "name": "xi_fuddle",
+            "enumValue": 1388,
+            "name": "omega_yekk",
             "description": null
           }
         }
@@ -201,15 +201,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_thnad;1",
+        "@id": "dtmi:example:yuzz_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_quan;1",
+          "@id": "dtmi:example:yuzz_beta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1372,
-            "name": "xi_snee",
+            "enumValue": 1389,
+            "name": "yuzz_alpha",
             "description": true
           }
         }
@@ -224,16 +224,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_zatz;1",
+        "@id": "dtmi:example:yuzz_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_floob;1",
+          "@id": "dtmi:example:yuzz_epsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1373,
-            "name": "xi_spazz",
+            "enumValue": 1390,
+            "name": "yuzz_delta",
             "description": true
           }
         }
@@ -248,15 +248,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_itch;1",
+        "@id": "dtmi:example:yuzz_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_flunn;1",
+          "@id": "dtmi:example:yuzz_theta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1374,
-            "name": "xi_jogg",
+            "enumValue": 1391,
+            "name": "yuzz_eta",
             "description": 626
           }
         }
@@ -271,16 +271,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_hi;1",
+        "@id": "dtmi:example:yuzz_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_vroo;1",
+          "@id": "dtmi:example:yuzz_lambda;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1375,
-            "name": "xi_yekk",
+            "enumValue": 1392,
+            "name": "yuzz_kappa",
             "description": 626
           }
         }
@@ -295,15 +295,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_gamma;1",
+        "@id": "dtmi:example:yuzz_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_beta;1",
+          "@id": "dtmi:example:yuzz_xi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1376,
-            "name": "omicron_alpha",
+            "enumValue": 1393,
+            "name": "yuzz_nu",
             "description": [
               null
             ]
@@ -320,16 +320,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_zeta;1",
+        "@id": "dtmi:example:yuzz_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_epsilon;1",
+          "@id": "dtmi:example:yuzz_rho;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1377,
-            "name": "omicron_delta",
+            "enumValue": 1394,
+            "name": "yuzz_pi",
             "description": [
               null
             ]
@@ -346,15 +346,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_iota;1",
+        "@id": "dtmi:example:yuzz_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_theta;1",
+          "@id": "dtmi:example:yuzz_upsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1378,
-            "name": "omicron_eta",
+            "enumValue": 1395,
+            "name": "yuzz_tau",
             "description": [
               true
             ]
@@ -371,16 +371,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_mu;1",
+        "@id": "dtmi:example:yuzz_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_lambda;1",
+          "@id": "dtmi:example:yuzz_psi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1379,
-            "name": "omicron_kappa",
+            "enumValue": 1396,
+            "name": "yuzz_chi",
             "description": [
               true
             ]
@@ -397,15 +397,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_omicron;1",
+        "@id": "dtmi:example:yuzz_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_xi;1",
+          "@id": "dtmi:example:yuzz_wum;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1380,
-            "name": "omicron_nu",
+            "enumValue": 1397,
+            "name": "yuzz_yuzz",
             "description": [
               626
             ]
@@ -422,16 +422,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_sigma;1",
+        "@id": "dtmi:example:yuzz_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_rho;1",
+          "@id": "dtmi:example:yuzz_fuddle;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1381,
-            "name": "omicron_pi",
+            "enumValue": 1398,
+            "name": "yuzz_humpf",
             "description": [
               626
             ]
@@ -448,15 +448,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_phi;1",
+        "@id": "dtmi:example:yuzz_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_upsilon;1",
+          "@id": "dtmi:example:yuzz_snee;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1382,
-            "name": "omicron_tau",
+            "enumValue": 1399,
+            "name": "yuzz_nuh",
             "description": [
               {}
             ]
@@ -473,16 +473,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_omega;1",
+        "@id": "dtmi:example:yuzz_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_psi;1",
+          "@id": "dtmi:example:yuzz_spazz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1383,
-            "name": "omicron_chi",
+            "enumValue": 1400,
+            "name": "yuzz_thnad",
             "description": [
               {}
             ]
@@ -499,15 +499,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_um;1",
+        "@id": "dtmi:example:yuzz_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_wum;1",
+          "@id": "dtmi:example:yuzz_jogg;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1384,
-            "name": "omicron_yuzz",
+            "enumValue": 1401,
+            "name": "yuzz_zatz",
             "description": {
               "@value": "hello",
               "@language": "en"
@@ -525,16 +525,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_glikk;1",
+        "@id": "dtmi:example:yuzz_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_fuddle;1",
+          "@id": "dtmi:example:yuzz_yekk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1385,
-            "name": "omicron_humpf",
+            "enumValue": 1402,
+            "name": "yuzz_itch",
             "description": {
               "@value": "hello",
               "@language": "en"
@@ -552,15 +552,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_quan;1",
+        "@id": "dtmi:example:wum_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_snee;1",
+          "@id": "dtmi:example:wum_alpha;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1386,
-            "name": "omicron_nuh",
+            "enumValue": 1403,
+            "name": "yuzz_hi",
             "description": [
               {
                 "en": "hello"
@@ -579,16 +579,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_floob;1",
+        "@id": "dtmi:example:wum_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_spazz;1",
+          "@id": "dtmi:example:wum_delta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1387,
-            "name": "omicron_thnad",
+            "enumValue": 1404,
+            "name": "wum_gamma",
             "description": [
               {
                 "en": "hello"
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyDescriptionStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyDescriptionStringLengthV3.json
index 5accaa1b..7748fe7e 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyDescriptionStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyDescriptionStringLengthV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_flunn;1",
+        "@id": "dtmi:example:wum_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_jogg;1",
+          "@id": "dtmi:example:wum_eta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1388,
-            "name": "omicron_zatz",
+            "enumValue": 1405,
+            "name": "wum_zeta",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
         }
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_vroo;1",
+        "@id": "dtmi:example:wum_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_yekk;1",
+          "@id": "dtmi:example:wum_kappa;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1389,
-            "name": "omicron_itch",
+            "enumValue": 1406,
+            "name": "wum_iota",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
@@ -53,16 +53,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_beta;1",
+        "@id": "dtmi:example:wum_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_alpha;1",
+          "@id": "dtmi:example:wum_nu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1390,
-            "name": "omicron_hi",
+            "enumValue": 1407,
+            "name": "wum_mu",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyDescriptionTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyDescriptionTermAndDtmiV3.json
index fda8802c..76c090be 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyDescriptionTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyDescriptionTermAndDtmiV3.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_tau;1",
+        "@id": "dtmi:example:wum_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_sigma;1",
+          "@id": "dtmi:example:wum_glikk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "description": [
-              "pi_omicron"
+              "wum_um"
             ],
             "dtmi:dtdl:property:description;3": [
-              "pi_pi"
+              "wum_humpf"
             ],
-            "enumValue": 1394,
-            "name": "pi_rho"
+            "enumValue": 1411,
+            "name": "wum_fuddle"
           }
         }
       }
@@ -35,22 +35,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_omega;1",
+        "@id": "dtmi:example:wum_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_psi;1",
+          "@id": "dtmi:example:wum_spazz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "description": [
-              "pi_upsilon"
+              "wum_snee"
             ],
             "dtmi:dtdl:property:description;3": [
-              "pi_phi"
+              "wum_quan"
             ],
-            "enumValue": 1395,
-            "name": "pi_chi"
+            "enumValue": 1412,
+            "name": "wum_thnad"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyDisplayNameLangStringV3.json b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyDisplayNameLangStringV3.json
index dc022279..13aec221 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyDisplayNameLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyDisplayNameLangStringV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_um;1",
+        "@id": "dtmi:example:wum_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_wum;1",
+          "@id": "dtmi:example:wum_jogg;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1396,
-            "name": "pi_yuzz",
+            "enumValue": 1413,
+            "name": "wum_zatz",
             "displayName": "hello"
           }
         }
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_glikk;1",
+        "@id": "dtmi:example:wum_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_fuddle;1",
+          "@id": "dtmi:example:wum_yekk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1397,
-            "name": "pi_humpf",
+            "enumValue": 1414,
+            "name": "wum_itch",
             "displayName": [
               "hello"
             ]
@@ -55,15 +55,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_quan;1",
+        "@id": "dtmi:example:um_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_snee;1",
+          "@id": "dtmi:example:um_alpha;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1398,
-            "name": "pi_nuh",
+            "enumValue": 1415,
+            "name": "wum_hi",
             "displayName": {
               "en": "hello"
             }
@@ -80,15 +80,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_floob;1",
+        "@id": "dtmi:example:um_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_spazz;1",
+          "@id": "dtmi:example:um_delta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1399,
-            "name": "pi_thnad",
+            "enumValue": 1416,
+            "name": "um_gamma",
             "displayName": [
               {
                 "@value": "hello",
@@ -108,15 +108,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_flunn;1",
+        "@id": "dtmi:example:um_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_jogg;1",
+          "@id": "dtmi:example:um_eta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1400,
-            "name": "pi_zatz",
+            "enumValue": 1417,
+            "name": "um_zeta",
             "displayName": {}
           }
         }
@@ -131,15 +131,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_vroo;1",
+        "@id": "dtmi:example:um_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_yekk;1",
+          "@id": "dtmi:example:um_kappa;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1401,
-            "name": "pi_itch",
+            "enumValue": 1418,
+            "name": "um_iota",
             "displayName": []
           }
         }
@@ -154,15 +154,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_beta;1",
+        "@id": "dtmi:example:um_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_alpha;1",
+          "@id": "dtmi:example:um_nu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1402,
-            "name": "pi_hi",
+            "enumValue": 1419,
+            "name": "um_mu",
             "displayName": null
           }
         }
@@ -177,16 +177,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_epsilon;1",
+        "@id": "dtmi:example:um_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_delta;1",
+          "@id": "dtmi:example:um_pi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1403,
-            "name": "rho_gamma",
+            "enumValue": 1420,
+            "name": "um_omicron",
             "displayName": null
           }
         }
@@ -201,15 +201,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_theta;1",
+        "@id": "dtmi:example:um_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_eta;1",
+          "@id": "dtmi:example:um_tau;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1404,
-            "name": "rho_zeta",
+            "enumValue": 1421,
+            "name": "um_sigma",
             "displayName": true
           }
         }
@@ -224,16 +224,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_lambda;1",
+        "@id": "dtmi:example:um_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_kappa;1",
+          "@id": "dtmi:example:um_chi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1405,
-            "name": "rho_iota",
+            "enumValue": 1422,
+            "name": "um_phi",
             "displayName": true
           }
         }
@@ -248,15 +248,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_xi;1",
+        "@id": "dtmi:example:um_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_nu;1",
+          "@id": "dtmi:example:um_yuzz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1406,
-            "name": "rho_mu",
+            "enumValue": 1423,
+            "name": "um_omega",
             "displayName": 626
           }
         }
@@ -271,16 +271,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_rho;1",
+        "@id": "dtmi:example:um_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_pi;1",
+          "@id": "dtmi:example:um_humpf;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1407,
-            "name": "rho_omicron",
+            "enumValue": 1424,
+            "name": "um_um",
             "displayName": 626
           }
         }
@@ -295,15 +295,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_upsilon;1",
+        "@id": "dtmi:example:um_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_tau;1",
+          "@id": "dtmi:example:um_nuh;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1408,
-            "name": "rho_sigma",
+            "enumValue": 1425,
+            "name": "um_glikk",
             "displayName": [
               null
             ]
@@ -320,16 +320,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_psi;1",
+        "@id": "dtmi:example:um_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_chi;1",
+          "@id": "dtmi:example:um_thnad;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1409,
-            "name": "rho_phi",
+            "enumValue": 1426,
+            "name": "um_quan",
             "displayName": [
               null
             ]
@@ -346,15 +346,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_wum;1",
+        "@id": "dtmi:example:um_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_yuzz;1",
+          "@id": "dtmi:example:um_zatz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1410,
-            "name": "rho_omega",
+            "enumValue": 1427,
+            "name": "um_floob",
             "displayName": [
               true
             ]
@@ -371,16 +371,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_fuddle;1",
+        "@id": "dtmi:example:um_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_humpf;1",
+          "@id": "dtmi:example:um_itch;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1411,
-            "name": "rho_um",
+            "enumValue": 1428,
+            "name": "um_flunn",
             "displayName": [
               true
             ]
@@ -397,15 +397,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_snee;1",
+        "@id": "dtmi:example:humpf_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_nuh;1",
+          "@id": "dtmi:example:um_hi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1412,
-            "name": "rho_glikk",
+            "enumValue": 1429,
+            "name": "um_vroo",
             "displayName": [
               626
             ]
@@ -422,16 +422,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_spazz;1",
+        "@id": "dtmi:example:humpf_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_thnad;1",
+          "@id": "dtmi:example:humpf_gamma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1413,
-            "name": "rho_quan",
+            "enumValue": 1430,
+            "name": "humpf_beta",
             "displayName": [
               626
             ]
@@ -448,15 +448,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_jogg;1",
+        "@id": "dtmi:example:humpf_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_zatz;1",
+          "@id": "dtmi:example:humpf_zeta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1414,
-            "name": "rho_floob",
+            "enumValue": 1431,
+            "name": "humpf_epsilon",
             "displayName": [
               {}
             ]
@@ -473,16 +473,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_yekk;1",
+        "@id": "dtmi:example:humpf_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_itch;1",
+          "@id": "dtmi:example:humpf_iota;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1415,
-            "name": "rho_flunn",
+            "enumValue": 1432,
+            "name": "humpf_theta",
             "displayName": [
               {}
             ]
@@ -499,15 +499,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_alpha;1",
+        "@id": "dtmi:example:humpf_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_hi;1",
+          "@id": "dtmi:example:humpf_mu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1416,
-            "name": "rho_vroo",
+            "enumValue": 1433,
+            "name": "humpf_lambda",
             "displayName": {
               "@value": "hello",
               "@language": "en"
@@ -525,16 +525,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_delta;1",
+        "@id": "dtmi:example:humpf_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_gamma;1",
+          "@id": "dtmi:example:humpf_omicron;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1417,
-            "name": "sigma_beta",
+            "enumValue": 1434,
+            "name": "humpf_xi",
             "displayName": {
               "@value": "hello",
               "@language": "en"
@@ -552,15 +552,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_eta;1",
+        "@id": "dtmi:example:humpf_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_zeta;1",
+          "@id": "dtmi:example:humpf_sigma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1418,
-            "name": "sigma_epsilon",
+            "enumValue": 1435,
+            "name": "humpf_rho",
             "displayName": [
               {
                 "en": "hello"
@@ -579,16 +579,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_kappa;1",
+        "@id": "dtmi:example:humpf_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_iota;1",
+          "@id": "dtmi:example:humpf_phi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1419,
-            "name": "sigma_theta",
+            "enumValue": 1436,
+            "name": "humpf_upsilon",
             "displayName": [
               {
                 "en": "hello"
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyDisplayNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyDisplayNameStringLengthV3.json
index 36077730..13e64b3f 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyDisplayNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyDisplayNameStringLengthV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_nu;1",
+        "@id": "dtmi:example:humpf_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_mu;1",
+          "@id": "dtmi:example:humpf_omega;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1420,
-            "name": "sigma_lambda",
+            "enumValue": 1437,
+            "name": "humpf_psi",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
         }
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_pi;1",
+        "@id": "dtmi:example:humpf_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_omicron;1",
+          "@id": "dtmi:example:humpf_um;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1421,
-            "name": "sigma_xi",
+            "enumValue": 1438,
+            "name": "humpf_wum",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
@@ -53,16 +53,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_tau;1",
+        "@id": "dtmi:example:humpf_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_sigma;1",
+          "@id": "dtmi:example:humpf_glikk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1422,
-            "name": "sigma_rho",
+            "enumValue": 1439,
+            "name": "humpf_fuddle",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyDisplayNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyDisplayNameTermAndDtmiV3.json
index e7ba03c6..368f884a 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyDisplayNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyDisplayNameTermAndDtmiV3.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_floob;1",
+        "@id": "dtmi:example:fuddle_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_spazz;1",
+          "@id": "dtmi:example:fuddle_delta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "displayName": [
-              "sigma_snee"
+              "fuddle_alpha"
             ],
             "dtmi:dtdl:property:displayName;3": [
-              "sigma_quan"
+              "fuddle_beta"
             ],
-            "enumValue": 1426,
-            "name": "sigma_thnad"
+            "enumValue": 1443,
+            "name": "fuddle_gamma"
           }
         }
       }
@@ -35,22 +35,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_yekk;1",
+        "@id": "dtmi:example:fuddle_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_itch;1",
+          "@id": "dtmi:example:fuddle_iota;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
             "displayName": [
-              "sigma_zatz"
+              "fuddle_zeta"
             ],
             "dtmi:dtdl:property:displayName;3": [
-              "sigma_jogg"
+              "fuddle_eta"
             ],
-            "enumValue": 1427,
-            "name": "sigma_flunn"
+            "enumValue": 1444,
+            "name": "fuddle_theta"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyEnumValueIntegerV3.json b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyEnumValueIntegerV3.json
index 4df5b2ca..48a768df 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyEnumValueIntegerV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyEnumValueIntegerV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_zeta;1",
+        "@id": "dtmi:example:zeta_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_epsilon;1",
+          "@id": "dtmi:example:zeta_lambda;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "flunn_delta",
+            "name": "zeta_kappa",
             "enumValue": 12
           },
           "valueSchema": "integer"
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_iota;1",
+        "@id": "dtmi:example:zeta_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_theta;1",
+          "@id": "dtmi:example:zeta_xi;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "flunn_eta",
+            "name": "zeta_nu",
             "enumValue": [
               12
             ]
@@ -53,13 +53,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_mu;1",
+        "@id": "dtmi:example:zeta_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_lambda;1",
+          "@id": "dtmi:example:zeta_rho;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "flunn_kappa",
+            "name": "zeta_pi",
             "enumValue": {
               "@value": 12,
               "@type": "xsd:integer"
@@ -78,13 +78,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_omicron;1",
+        "@id": "dtmi:example:zeta_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_xi;1",
+          "@id": "dtmi:example:zeta_upsilon;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "flunn_nu",
+            "name": "zeta_tau",
             "enumValue": [
               {
                 "@value": 12,
@@ -105,13 +105,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_sigma;1",
+        "@id": "dtmi:example:zeta_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_rho;1",
+          "@id": "dtmi:example:zeta_psi;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "flunn_pi",
+            "name": "zeta_chi",
             "enumValue": null
           },
           "valueSchema": "integer"
@@ -127,14 +127,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_phi;1",
+        "@id": "dtmi:example:zeta_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_upsilon;1",
+          "@id": "dtmi:example:zeta_wum;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "flunn_tau",
+            "name": "zeta_yuzz",
             "enumValue": null
           },
           "valueSchema": "integer"
@@ -150,13 +150,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_omega;1",
+        "@id": "dtmi:example:zeta_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_psi;1",
+          "@id": "dtmi:example:zeta_fuddle;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "flunn_chi",
+            "name": "zeta_humpf",
             "enumValue": true
           },
           "valueSchema": "integer"
@@ -172,14 +172,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_um;1",
+        "@id": "dtmi:example:zeta_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_wum;1",
+          "@id": "dtmi:example:zeta_snee;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "flunn_yuzz",
+            "name": "zeta_nuh",
             "enumValue": true
           },
           "valueSchema": "integer"
@@ -195,13 +195,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_glikk;1",
+        "@id": "dtmi:example:zeta_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_fuddle;1",
+          "@id": "dtmi:example:zeta_spazz;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "flunn_humpf",
+            "name": "zeta_thnad",
             "enumValue": "hello"
           },
           "valueSchema": "integer"
@@ -217,14 +217,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_quan;1",
+        "@id": "dtmi:example:zeta_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_snee;1",
+          "@id": "dtmi:example:zeta_jogg;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "flunn_nuh",
+            "name": "zeta_zatz",
             "enumValue": "hello"
           },
           "valueSchema": "integer"
@@ -240,13 +240,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_floob;1",
+        "@id": "dtmi:example:zeta_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_spazz;1",
+          "@id": "dtmi:example:zeta_yekk;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "flunn_thnad",
+            "name": "zeta_itch",
             "enumValue": [
               null
             ]
@@ -264,14 +264,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_flunn;1",
+        "@id": "dtmi:example:eta_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_jogg;1",
+          "@id": "dtmi:example:eta_alpha;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "flunn_zatz",
+            "name": "zeta_hi",
             "enumValue": [
               null
             ]
@@ -289,13 +289,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_vroo;1",
+        "@id": "dtmi:example:eta_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_yekk;1",
+          "@id": "dtmi:example:eta_delta;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "flunn_itch",
+            "name": "eta_gamma",
             "enumValue": [
               true
             ]
@@ -313,14 +313,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_beta;1",
+        "@id": "dtmi:example:eta_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_alpha;1",
+          "@id": "dtmi:example:eta_eta;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "flunn_hi",
+            "name": "eta_zeta",
             "enumValue": [
               true
             ]
@@ -338,13 +338,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_epsilon;1",
+        "@id": "dtmi:example:eta_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_delta;1",
+          "@id": "dtmi:example:eta_kappa;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "itch_gamma",
+            "name": "eta_iota",
             "enumValue": [
               "hello"
             ]
@@ -362,14 +362,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_theta;1",
+        "@id": "dtmi:example:eta_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_eta;1",
+          "@id": "dtmi:example:eta_nu;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "itch_zeta",
+            "name": "eta_mu",
             "enumValue": [
               "hello"
             ]
@@ -387,13 +387,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_lambda;1",
+        "@id": "dtmi:example:eta_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_kappa;1",
+          "@id": "dtmi:example:eta_pi;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "itch_iota",
+            "name": "eta_omicron",
             "enumValue": {}
           },
           "valueSchema": "integer"
@@ -409,14 +409,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_xi;1",
+        "@id": "dtmi:example:eta_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_nu;1",
+          "@id": "dtmi:example:eta_tau;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "itch_mu",
+            "name": "eta_sigma",
             "enumValue": {}
           },
           "valueSchema": "integer"
@@ -432,13 +432,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_rho;1",
+        "@id": "dtmi:example:eta_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_pi;1",
+          "@id": "dtmi:example:eta_chi;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "itch_omicron",
+            "name": "eta_phi",
             "enumValue": [
               {}
             ]
@@ -456,14 +456,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_upsilon;1",
+        "@id": "dtmi:example:eta_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_tau;1",
+          "@id": "dtmi:example:eta_yuzz;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "itch_sigma",
+            "name": "eta_omega",
             "enumValue": [
               {}
             ]
@@ -481,13 +481,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_psi;1",
+        "@id": "dtmi:example:eta_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_chi;1",
+          "@id": "dtmi:example:eta_humpf;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "itch_phi",
+            "name": "eta_um",
             "enumValue": []
           },
           "valueSchema": "integer"
@@ -503,14 +503,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_wum;1",
+        "@id": "dtmi:example:eta_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_yuzz;1",
+          "@id": "dtmi:example:eta_nuh;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "itch_omega",
+            "name": "eta_glikk",
             "enumValue": []
           },
           "valueSchema": "integer"
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyEnumValueStringV3.json b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyEnumValueStringV3.json
index eb9817cc..51507c31 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyEnumValueStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyEnumValueStringV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_fuddle;1",
+        "@id": "dtmi:example:eta_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_humpf;1",
+          "@id": "dtmi:example:eta_thnad;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "itch_um",
+            "name": "eta_quan",
             "enumValue": "hello"
           },
           "valueSchema": "string"
@@ -29,13 +29,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_snee;1",
+        "@id": "dtmi:example:eta_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_nuh;1",
+          "@id": "dtmi:example:eta_zatz;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "itch_glikk",
+            "name": "eta_floob",
             "enumValue": [
               "hello"
             ]
@@ -53,13 +53,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_spazz;1",
+        "@id": "dtmi:example:eta_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_thnad;1",
+          "@id": "dtmi:example:eta_itch;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "itch_quan",
+            "name": "eta_flunn",
             "enumValue": {
               "@value": "hello",
               "@type": "xsd:string"
@@ -78,13 +78,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_jogg;1",
+        "@id": "dtmi:example:theta_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_zatz;1",
+          "@id": "dtmi:example:eta_hi;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "itch_floob",
+            "name": "eta_vroo",
             "enumValue": [
               {
                 "@value": "hello",
@@ -105,13 +105,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_yekk;1",
+        "@id": "dtmi:example:theta_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_itch;1",
+          "@id": "dtmi:example:theta_gamma;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "itch_flunn",
+            "name": "theta_beta",
             "enumValue": null
           },
           "valueSchema": "string"
@@ -127,14 +127,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_alpha;1",
+        "@id": "dtmi:example:theta_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_hi;1",
+          "@id": "dtmi:example:theta_zeta;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "itch_vroo",
+            "name": "theta_epsilon",
             "enumValue": null
           },
           "valueSchema": "string"
@@ -150,13 +150,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_delta;1",
+        "@id": "dtmi:example:theta_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_gamma;1",
+          "@id": "dtmi:example:theta_iota;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "yekk_beta",
+            "name": "theta_theta",
             "enumValue": true
           },
           "valueSchema": "string"
@@ -172,14 +172,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_eta;1",
+        "@id": "dtmi:example:theta_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_zeta;1",
+          "@id": "dtmi:example:theta_mu;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yekk_epsilon",
+            "name": "theta_lambda",
             "enumValue": true
           },
           "valueSchema": "string"
@@ -195,13 +195,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_kappa;1",
+        "@id": "dtmi:example:theta_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_iota;1",
+          "@id": "dtmi:example:theta_omicron;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "yekk_theta",
+            "name": "theta_xi",
             "enumValue": 626
           },
           "valueSchema": "string"
@@ -217,14 +217,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_nu;1",
+        "@id": "dtmi:example:theta_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_mu;1",
+          "@id": "dtmi:example:theta_sigma;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yekk_lambda",
+            "name": "theta_rho",
             "enumValue": 626
           },
           "valueSchema": "string"
@@ -240,13 +240,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_pi;1",
+        "@id": "dtmi:example:theta_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_omicron;1",
+          "@id": "dtmi:example:theta_phi;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "yekk_xi",
+            "name": "theta_upsilon",
             "enumValue": [
               null
             ]
@@ -264,14 +264,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_tau;1",
+        "@id": "dtmi:example:theta_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_sigma;1",
+          "@id": "dtmi:example:theta_omega;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yekk_rho",
+            "name": "theta_psi",
             "enumValue": [
               null
             ]
@@ -289,13 +289,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_chi;1",
+        "@id": "dtmi:example:theta_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_phi;1",
+          "@id": "dtmi:example:theta_um;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "yekk_upsilon",
+            "name": "theta_wum",
             "enumValue": [
               true
             ]
@@ -313,14 +313,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_yuzz;1",
+        "@id": "dtmi:example:theta_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_omega;1",
+          "@id": "dtmi:example:theta_glikk;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yekk_psi",
+            "name": "theta_fuddle",
             "enumValue": [
               true
             ]
@@ -338,13 +338,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_humpf;1",
+        "@id": "dtmi:example:theta_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_um;1",
+          "@id": "dtmi:example:theta_quan;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "yekk_wum",
+            "name": "theta_snee",
             "enumValue": [
               626
             ]
@@ -362,14 +362,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_nuh;1",
+        "@id": "dtmi:example:theta_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_glikk;1",
+          "@id": "dtmi:example:theta_floob;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yekk_fuddle",
+            "name": "theta_spazz",
             "enumValue": [
               626
             ]
@@ -387,13 +387,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_thnad;1",
+        "@id": "dtmi:example:theta_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_quan;1",
+          "@id": "dtmi:example:theta_flunn;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "yekk_snee",
+            "name": "theta_jogg",
             "enumValue": {}
           },
           "valueSchema": "string"
@@ -409,14 +409,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_zatz;1",
+        "@id": "dtmi:example:theta_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_floob;1",
+          "@id": "dtmi:example:theta_vroo;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yekk_spazz",
+            "name": "theta_yekk",
             "enumValue": {}
           },
           "valueSchema": "string"
@@ -432,13 +432,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_itch;1",
+        "@id": "dtmi:example:iota_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_flunn;1",
+          "@id": "dtmi:example:iota_beta;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "yekk_jogg",
+            "name": "iota_alpha",
             "enumValue": [
               {}
             ]
@@ -456,14 +456,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_hi;1",
+        "@id": "dtmi:example:iota_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_vroo;1",
+          "@id": "dtmi:example:iota_epsilon;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yekk_yekk",
+            "name": "iota_delta",
             "enumValue": [
               {}
             ]
@@ -481,13 +481,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_gamma;1",
+        "@id": "dtmi:example:iota_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_beta;1",
+          "@id": "dtmi:example:iota_theta;1",
           "@type": "Enum",
           "enumValues": {
-            "name": "vroo_alpha",
+            "name": "iota_eta",
             "enumValue": []
           },
           "valueSchema": "string"
@@ -503,14 +503,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_zeta;1",
+        "@id": "dtmi:example:iota_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_epsilon;1",
+          "@id": "dtmi:example:iota_lambda;1",
           "@type": "Enum",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "vroo_delta",
+            "name": "iota_kappa",
             "enumValue": []
           },
           "valueSchema": "string"
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyEnumValueTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyEnumValueTermAndDtmiV3.json
index ff5cce38..6f578c33 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyEnumValueTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyEnumValueTermAndDtmiV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_vroo;1",
+        "@id": "dtmi:example:kappa_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_yekk;1",
+          "@id": "dtmi:example:kappa_delta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1140,
-            "dtmi:dtdl:property:enumValue;3": 1141,
-            "name": "vroo_itch"
+            "enumValue": 1155,
+            "dtmi:dtdl:property:enumValue;3": 1156,
+            "name": "kappa_gamma"
           }
         }
       }
@@ -30,17 +30,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_beta;1",
+        "@id": "dtmi:example:kappa_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_alpha;1",
+          "@id": "dtmi:example:kappa_eta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1142,
-            "dtmi:dtdl:property:enumValue;3": 1143,
-            "name": "vroo_hi"
+            "enumValue": 1157,
+            "dtmi:dtdl:property:enumValue;3": 1158,
+            "name": "kappa_zeta"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyEnumValueUniqueAmongEnumEnumValuesV3.json b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyEnumValueUniqueAmongEnumEnumValuesV3.json
index 9e3abd09..3861dfe5 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyEnumValueUniqueAmongEnumEnumValuesV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyEnumValueUniqueAmongEnumEnumValuesV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_kappa;1",
+        "@id": "dtmi:example:iota_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_iota;1",
+          "@id": "dtmi:example:iota_omicron;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "name": "vroo_eta",
+              "name": "iota_nu",
               "enumValue": 13
             },
             {
-              "name": "vroo_theta",
+              "name": "iota_xi",
               "enumValue": 14
             }
           ],
@@ -35,18 +35,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_xi;1",
+        "@id": "dtmi:example:iota_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_nu;1",
+          "@id": "dtmi:example:iota_tau;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "name": "vroo_lambda",
+              "name": "iota_rho",
               "enumValue": 13
             },
             {
-              "name": "vroo_mu",
+              "name": "iota_sigma",
               "enumValue": 13
             }
           ],
@@ -63,19 +63,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_sigma;1",
+        "@id": "dtmi:example:iota_omega;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:vroo_rho;1",
+          "@id": "dtmi:example:iota_psi;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "name": "vroo_omicron",
+              "name": "iota_phi",
               "enumValue": 13
             },
             {
-              "name": "vroo_pi",
+              "name": "iota_chi",
               "enumValue": 13
             }
           ],
@@ -92,19 +92,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_chi;1",
+        "@id": "dtmi:example:iota_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_phi;1",
+          "@id": "dtmi:example:iota_um;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "name": "vroo_tau",
-              "enumValue": "beta_vroo"
+              "name": "iota_yuzz",
+              "enumValue": "gamma_delta"
             },
             {
-              "name": "vroo_upsilon",
-              "enumValue": "beta_hi"
+              "name": "iota_wum",
+              "enumValue": "gamma_epsilon"
             }
           ],
           "valueSchema": "string"
@@ -120,19 +120,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_wum;1",
+        "@id": "dtmi:example:iota_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_yuzz;1",
+          "@id": "dtmi:example:iota_nuh;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "name": "vroo_psi",
-              "enumValue": "beta_vroo"
+              "name": "iota_fuddle",
+              "enumValue": "gamma_delta"
             },
             {
-              "name": "vroo_omega",
-              "enumValue": "beta_vroo"
+              "name": "iota_glikk",
+              "enumValue": "gamma_delta"
             }
           ],
           "valueSchema": "string"
@@ -148,20 +148,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_glikk;1",
+        "@id": "dtmi:example:iota_floob;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:vroo_fuddle;1",
+          "@id": "dtmi:example:iota_spazz;1",
           "@type": "Enum",
           "enumValues": [
             {
-              "name": "vroo_um",
-              "enumValue": "beta_vroo"
+              "name": "iota_quan",
+              "enumValue": "gamma_delta"
             },
             {
-              "name": "vroo_humpf",
-              "enumValue": "beta_vroo"
+              "name": "iota_thnad",
+              "enumValue": "gamma_delta"
             }
           ],
           "valueSchema": "string"
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyFormallyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyFormallyIrrelevantDtmiOrTermV3.json
index 22099609..73425d82 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyFormallyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyFormallyIrrelevantDtmiOrTermV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_zatz;1",
+        "@id": "dtmi:example:glikk_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_floob;1",
+          "@id": "dtmi:example:glikk_epsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1440,
-            "name": "tau_spazz",
+            "enumValue": 1457,
+            "name": "glikk_delta",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -30,16 +30,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_itch;1",
+        "@id": "dtmi:example:glikk_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_flunn;1",
+          "@id": "dtmi:example:glikk_theta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1441,
-            "name": "tau_jogg",
+            "enumValue": 1458,
+            "name": "glikk_eta",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -54,15 +54,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_hi;1",
+        "@id": "dtmi:example:glikk_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_vroo;1",
+          "@id": "dtmi:example:glikk_lambda;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1442,
-            "name": "tau_yekk",
+            "enumValue": 1459,
+            "name": "glikk_kappa",
             "boolean": null
           }
         }
@@ -77,16 +77,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_gamma;1",
+        "@id": "dtmi:example:glikk_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_beta;1",
+          "@id": "dtmi:example:glikk_xi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1443,
-            "name": "upsilon_alpha",
+            "enumValue": 1460,
+            "name": "glikk_nu",
             "boolean": null
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyFormallyUndefinedTermV3.json b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyFormallyUndefinedTermV3.json
index 1c009073..f3d38e7e 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyFormallyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyFormallyUndefinedTermV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_omega;1",
+        "@id": "dtmi:example:glikk_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_psi;1",
+          "@id": "dtmi:example:glikk_spazz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1450,
-            "name": "upsilon_chi",
+            "enumValue": 1467,
+            "name": "glikk_thnad",
             "foobar": {}
           }
         }
@@ -30,16 +30,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_um;1",
+        "@id": "dtmi:example:glikk_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_wum;1",
+          "@id": "dtmi:example:glikk_jogg;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1451,
-            "name": "upsilon_yuzz",
+            "enumValue": 1468,
+            "name": "glikk_zatz",
             "foobar": {}
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyInvalidDtmiV3.json
index fedb4508..acaf0c4f 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyInvalidDtmiV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_zeta;1",
+        "@id": "dtmi:example:glikk_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_epsilon;1",
+          "@id": "dtmi:example:glikk_rho;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -18,8 +18,8 @@
               "EnumValue",
               "Foobar"
             ],
-            "enumValue": 1444,
-            "name": "upsilon_delta",
+            "enumValue": 1461,
+            "name": "glikk_pi",
             "dtmi:foo//bar": 626
           }
         }
@@ -34,10 +34,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_iota;1",
+        "@id": "dtmi:example:glikk_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_theta;1",
+          "@id": "dtmi:example:glikk_upsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -46,8 +46,8 @@
               "EnumValue",
               "Foobar"
             ],
-            "enumValue": 1445,
-            "name": "upsilon_eta",
+            "enumValue": 1462,
+            "name": "glikk_tau",
             "dtmi:foo//bar": 626
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyNamePatternV3.json b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyNamePatternV3.json
index db1a7031..698375a3 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyNamePatternV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyNamePatternV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_lambda;1",
+        "@id": "dtmi:example:lambda_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_kappa;1",
+          "@id": "dtmi:example:lambda_pi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1169,
+            "enumValue": 1184,
             "name": "EARTH"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_nu;1",
+        "@id": "dtmi:example:lambda_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_mu;1",
+          "@id": "dtmi:example:lambda_sigma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1170,
+            "enumValue": 1185,
             "name": "Air"
           }
         }
@@ -51,14 +51,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_omicron;1",
+        "@id": "dtmi:example:lambda_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_xi;1",
+          "@id": "dtmi:example:lambda_upsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1171,
+            "enumValue": 1186,
             "name": "fire"
           }
         }
@@ -73,14 +73,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_rho;1",
+        "@id": "dtmi:example:lambda_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_pi;1",
+          "@id": "dtmi:example:lambda_chi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1172,
+            "enumValue": 1187,
             "name": "hello_world"
           }
         }
@@ -95,14 +95,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_tau;1",
+        "@id": "dtmi:example:lambda_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_sigma;1",
+          "@id": "dtmi:example:lambda_omega;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1173,
+            "enumValue": 1188,
             "name": "Anarchy99"
           }
         }
@@ -117,14 +117,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_phi;1",
+        "@id": "dtmi:example:lambda_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_upsilon;1",
+          "@id": "dtmi:example:lambda_wum;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1174,
+            "enumValue": 1189,
             "name": "23skidoo"
           }
         }
@@ -139,15 +139,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_psi;1",
+        "@id": "dtmi:example:lambda_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_chi;1",
+          "@id": "dtmi:example:lambda_humpf;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1175,
+            "enumValue": 1190,
             "name": "23skidoo"
           }
         }
@@ -162,14 +162,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_yuzz;1",
+        "@id": "dtmi:example:lambda_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_omega;1",
+          "@id": "dtmi:example:lambda_glikk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1176,
+            "enumValue": 1191,
             "name": "626"
           }
         }
@@ -184,15 +184,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_um;1",
+        "@id": "dtmi:example:lambda_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_wum;1",
+          "@id": "dtmi:example:lambda_snee;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1177,
+            "enumValue": 1192,
             "name": "626"
           }
         }
@@ -207,14 +207,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_fuddle;1",
+        "@id": "dtmi:example:lambda_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_humpf;1",
+          "@id": "dtmi:example:lambda_thnad;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1178,
+            "enumValue": 1193,
             "name": "goodbye-world"
           }
         }
@@ -229,15 +229,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_nuh;1",
+        "@id": "dtmi:example:lambda_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_glikk;1",
+          "@id": "dtmi:example:lambda_floob;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1179,
+            "enumValue": 1194,
             "name": "goodbye-world"
           }
         }
@@ -252,14 +252,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_quan;1",
+        "@id": "dtmi:example:lambda_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_snee;1",
+          "@id": "dtmi:example:lambda_jogg;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1180,
+            "enumValue": 1195,
             "name": "_haha"
           }
         }
@@ -274,15 +274,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_spazz;1",
+        "@id": "dtmi:example:lambda_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_thnad;1",
+          "@id": "dtmi:example:lambda_itch;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1181,
+            "enumValue": 1196,
             "name": "_haha"
           }
         }
@@ -297,14 +297,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_zatz;1",
+        "@id": "dtmi:example:lambda_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_floob;1",
+          "@id": "dtmi:example:lambda_vroo;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1182,
+            "enumValue": 1197,
             "name": "toodaloo_"
           }
         }
@@ -319,15 +319,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_flunn;1",
+        "@id": "dtmi:example:mu_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_jogg;1",
+          "@id": "dtmi:example:mu_alpha;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1183,
+            "enumValue": 1198,
             "name": "toodaloo_"
           }
         }
@@ -342,14 +342,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_yekk;1",
+        "@id": "dtmi:example:mu_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_itch;1",
+          "@id": "dtmi:example:mu_gamma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1184,
+            "enumValue": 1199,
             "name": "pro:con"
           }
         }
@@ -364,15 +364,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_hi;1",
+        "@id": "dtmi:example:mu_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_vroo;1",
+          "@id": "dtmi:example:mu_epsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1185,
+            "enumValue": 1200,
             "name": "pro:con"
           }
         }
@@ -387,14 +387,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_beta;1",
+        "@id": "dtmi:example:mu_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_alpha;1",
+          "@id": "dtmi:example:mu_eta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1186,
+            "enumValue": 1201,
             "name": "mish/mash"
           }
         }
@@ -409,15 +409,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_delta;1",
+        "@id": "dtmi:example:mu_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_gamma;1",
+          "@id": "dtmi:example:mu_iota;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1187,
+            "enumValue": 1202,
             "name": "mish/mash"
           }
         }
@@ -432,14 +432,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_zeta;1",
+        "@id": "dtmi:example:mu_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_epsilon;1",
+          "@id": "dtmi:example:mu_lambda;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1188,
+            "enumValue": 1203,
             "name": "#tag"
           }
         }
@@ -454,15 +454,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_theta;1",
+        "@id": "dtmi:example:mu_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_eta;1",
+          "@id": "dtmi:example:mu_nu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1189,
+            "enumValue": 1204,
             "name": "#tag"
           }
         }
@@ -477,14 +477,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_kappa;1",
+        "@id": "dtmi:example:mu_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_iota;1",
+          "@id": "dtmi:example:mu_omicron;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1190,
+            "enumValue": 1205,
             "name": "@tweet"
           }
         }
@@ -499,15 +499,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_mu;1",
+        "@id": "dtmi:example:mu_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_lambda;1",
+          "@id": "dtmi:example:mu_rho;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1191,
+            "enumValue": 1206,
             "name": "@tweet"
           }
         }
@@ -522,14 +522,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_xi;1",
+        "@id": "dtmi:example:mu_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_nu;1",
+          "@id": "dtmi:example:mu_tau;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1192,
+            "enumValue": 1207,
             "name": "$money"
           }
         }
@@ -544,15 +544,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_pi;1",
+        "@id": "dtmi:example:mu_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_omicron;1",
+          "@id": "dtmi:example:mu_phi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1193,
+            "enumValue": 1208,
             "name": "$money"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyNameStringLengthV3.json
index 08b6d398..2e5d6690 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyNameStringLengthV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_epsilon;1",
+        "@id": "dtmi:example:lambda_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_delta;1",
+          "@id": "dtmi:example:lambda_kappa;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1166,
+            "enumValue": 1181,
             "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_eta;1",
+        "@id": "dtmi:example:lambda_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_zeta;1",
+          "@id": "dtmi:example:lambda_mu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1167,
+            "enumValue": 1182,
             "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
@@ -51,15 +51,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_iota;1",
+        "@id": "dtmi:example:lambda_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_theta;1",
+          "@id": "dtmi:example:lambda_xi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1168,
+            "enumValue": 1183,
             "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyNameStringV3.json b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyNameStringV3.json
index e7305e34..0111c809 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyNameStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyNameStringV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_delta;1",
+        "@id": "dtmi:example:kappa_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_gamma;1",
+          "@id": "dtmi:example:kappa_iota;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1144,
+            "enumValue": 1159,
             "name": "hello"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_zeta;1",
+        "@id": "dtmi:example:kappa_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_epsilon;1",
+          "@id": "dtmi:example:kappa_lambda;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1145,
+            "enumValue": 1160,
             "name": [
               "hello"
             ]
@@ -53,14 +53,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_theta;1",
+        "@id": "dtmi:example:kappa_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_eta;1",
+          "@id": "dtmi:example:kappa_nu;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1146,
+            "enumValue": 1161,
             "name": {
               "@value": "hello",
               "@type": "xsd:string"
@@ -78,14 +78,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_kappa;1",
+        "@id": "dtmi:example:kappa_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_iota;1",
+          "@id": "dtmi:example:kappa_omicron;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1147,
+            "enumValue": 1162,
             "name": [
               {
                 "@value": "hello",
@@ -105,14 +105,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_mu;1",
+        "@id": "dtmi:example:kappa_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_lambda;1",
+          "@id": "dtmi:example:kappa_rho;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1148,
+            "enumValue": 1163,
             "name": null
           }
         }
@@ -127,15 +127,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_xi;1",
+        "@id": "dtmi:example:kappa_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_nu;1",
+          "@id": "dtmi:example:kappa_tau;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1149,
+            "enumValue": 1164,
             "name": null
           }
         }
@@ -150,14 +150,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_pi;1",
+        "@id": "dtmi:example:kappa_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_omicron;1",
+          "@id": "dtmi:example:kappa_phi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1150,
+            "enumValue": 1165,
             "name": true
           }
         }
@@ -172,15 +172,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_sigma;1",
+        "@id": "dtmi:example:kappa_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_rho;1",
+          "@id": "dtmi:example:kappa_psi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1151,
+            "enumValue": 1166,
             "name": true
           }
         }
@@ -195,14 +195,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_upsilon;1",
+        "@id": "dtmi:example:kappa_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_tau;1",
+          "@id": "dtmi:example:kappa_yuzz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1152,
+            "enumValue": 1167,
             "name": 626
           }
         }
@@ -217,15 +217,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_chi;1",
+        "@id": "dtmi:example:kappa_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_phi;1",
+          "@id": "dtmi:example:kappa_um;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1153,
+            "enumValue": 1168,
             "name": 626
           }
         }
@@ -240,14 +240,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_omega;1",
+        "@id": "dtmi:example:kappa_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_psi;1",
+          "@id": "dtmi:example:kappa_fuddle;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1154,
+            "enumValue": 1169,
             "name": [
               null
             ]
@@ -264,15 +264,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_wum;1",
+        "@id": "dtmi:example:kappa_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_yuzz;1",
+          "@id": "dtmi:example:kappa_nuh;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1155,
+            "enumValue": 1170,
             "name": [
               null
             ]
@@ -289,14 +289,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_humpf;1",
+        "@id": "dtmi:example:kappa_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_um;1",
+          "@id": "dtmi:example:kappa_quan;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1156,
+            "enumValue": 1171,
             "name": [
               true
             ]
@@ -313,15 +313,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_glikk;1",
+        "@id": "dtmi:example:kappa_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_fuddle;1",
+          "@id": "dtmi:example:kappa_spazz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1157,
+            "enumValue": 1172,
             "name": [
               true
             ]
@@ -338,14 +338,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_snee;1",
+        "@id": "dtmi:example:kappa_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_nuh;1",
+          "@id": "dtmi:example:kappa_zatz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1158,
+            "enumValue": 1173,
             "name": [
               626
             ]
@@ -362,15 +362,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_thnad;1",
+        "@id": "dtmi:example:kappa_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_quan;1",
+          "@id": "dtmi:example:kappa_flunn;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1159,
+            "enumValue": 1174,
             "name": [
               626
             ]
@@ -387,14 +387,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_floob;1",
+        "@id": "dtmi:example:kappa_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_spazz;1",
+          "@id": "dtmi:example:kappa_yekk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1160,
+            "enumValue": 1175,
             "name": {}
           }
         }
@@ -409,15 +409,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_jogg;1",
+        "@id": "dtmi:example:lambda_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_zatz;1",
+          "@id": "dtmi:example:kappa_hi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1161,
+            "enumValue": 1176,
             "name": {}
           }
         }
@@ -432,14 +432,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_itch;1",
+        "@id": "dtmi:example:lambda_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_flunn;1",
+          "@id": "dtmi:example:lambda_beta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1162,
+            "enumValue": 1177,
             "name": [
               {}
             ]
@@ -456,15 +456,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_vroo;1",
+        "@id": "dtmi:example:lambda_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_yekk;1",
+          "@id": "dtmi:example:lambda_delta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1163,
+            "enumValue": 1178,
             "name": [
               {}
             ]
@@ -481,14 +481,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_alpha;1",
+        "@id": "dtmi:example:lambda_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_hi;1",
+          "@id": "dtmi:example:lambda_zeta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1164,
+            "enumValue": 1179,
             "name": []
           }
         }
@@ -503,15 +503,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_gamma;1",
+        "@id": "dtmi:example:lambda_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_beta;1",
+          "@id": "dtmi:example:lambda_theta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1165,
+            "enumValue": 1180,
             "name": []
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyNameTermAndDtmiV3.json
index 85de4e37..c4f95a46 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyNameTermAndDtmiV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_spazz;1",
+        "@id": "dtmi:example:mu_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_thnad;1",
+          "@id": "dtmi:example:mu_itch;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1203,
-            "name": "beta_snee",
-            "dtmi:dtdl:property:name;3": "beta_quan"
+            "enumValue": 1218,
+            "name": "mu_jogg",
+            "dtmi:dtdl:property:name;3": "mu_flunn"
           }
         }
       }
@@ -30,17 +30,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_flunn;1",
+        "@id": "dtmi:example:nu_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_jogg;1",
+          "@id": "dtmi:example:nu_alpha;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1204,
-            "name": "beta_floob",
-            "dtmi:dtdl:property:name;3": "beta_zatz"
+            "enumValue": 1219,
+            "name": "mu_vroo",
+            "dtmi:dtdl:property:name;3": "mu_hi"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyNameUniqueAmongEnumEnumValuesV3.json b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyNameUniqueAmongEnumEnumValuesV3.json
index 5f3a1ddd..0733305b 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyNameUniqueAmongEnumEnumValuesV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyNameUniqueAmongEnumEnumValuesV3.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_sigma;1",
+        "@id": "dtmi:example:mu_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_rho;1",
+          "@id": "dtmi:example:mu_psi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": [
             {
-              "enumValue": 1194,
-              "name": "gamma_alpha"
+              "enumValue": 1209,
+              "name": "gamma_zeta"
             },
             {
-              "enumValue": 1195,
-              "name": "gamma_beta"
+              "enumValue": 1210,
+              "name": "gamma_eta"
             }
           ]
         }
@@ -35,20 +35,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_upsilon;1",
+        "@id": "dtmi:example:mu_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_tau;1",
+          "@id": "dtmi:example:mu_yuzz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": [
             {
-              "enumValue": 1196,
-              "name": "gamma_alpha"
+              "enumValue": 1211,
+              "name": "gamma_zeta"
             },
             {
-              "enumValue": 1197,
-              "name": "gamma_alpha"
+              "enumValue": 1212,
+              "name": "gamma_zeta"
             }
           ]
         }
@@ -63,21 +63,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_chi;1",
+        "@id": "dtmi:example:mu_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:beta_phi;1",
+          "@id": "dtmi:example:mu_um;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": [
             {
-              "enumValue": 1198,
-              "name": "gamma_alpha"
+              "enumValue": 1213,
+              "name": "gamma_zeta"
             },
             {
-              "enumValue": 1199,
-              "name": "gamma_alpha"
+              "enumValue": 1214,
+              "name": "gamma_zeta"
             }
           ]
         }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyNotDtmiNorTermV3.json
index 32c9702b..772029fb 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValuePropertyNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValuePropertyNotDtmiNorTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_mu;1",
+        "@id": "dtmi:example:glikk_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_lambda;1",
+          "@id": "dtmi:example:glikk_psi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -18,8 +18,8 @@
               "EnumValue",
               "Foobar"
             ],
-            "enumValue": 1446,
-            "name": "upsilon_kappa",
+            "enumValue": 1463,
+            "name": "glikk_chi",
             "http://foo.com/bar": true
           }
         }
@@ -34,10 +34,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_omicron;1",
+        "@id": "dtmi:example:glikk_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_xi;1",
+          "@id": "dtmi:example:glikk_wum;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -46,8 +46,8 @@
               "EnumValue",
               "Foobar"
             ],
-            "enumValue": 1447,
-            "name": "upsilon_nu",
+            "enumValue": 1464,
+            "name": "glikk_yuzz",
             "http://foo.com/bar": true
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValueRequiredPropertiesV3.json b/DTDL/v3/spec/Requirement-ClassEnumValueRequiredPropertiesV3.json
index 34ed2770..650b776e 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValueRequiredPropertiesV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValueRequiredPropertiesV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_flunn;1",
+        "@id": "dtmi:example:zeta_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_jogg;1",
+          "@id": "dtmi:example:zeta_alpha;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "name": "jogg_zatz"
+            "name": "epsilon_hi"
           }
         }
       }
@@ -28,15 +28,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_vroo;1",
+        "@id": "dtmi:example:zeta_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_yekk;1",
+          "@id": "dtmi:example:zeta_delta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "jogg_itch"
+            "name": "zeta_gamma"
           }
         }
       }
@@ -50,14 +50,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_alpha;1",
+        "@id": "dtmi:example:zeta_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_hi;1",
+          "@id": "dtmi:example:zeta_zeta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1135
+            "enumValue": 1150
           }
         }
       }
@@ -71,15 +71,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_gamma;1",
+        "@id": "dtmi:example:zeta_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_beta;1",
+          "@id": "dtmi:example:zeta_theta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1136
+            "enumValue": 1151
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValueTypeIncludesInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassEnumValueTypeIncludesInvalidDtmiV3.json
index 08610577..4eead189 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValueTypeIncludesInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValueTypeIncludesInvalidDtmiV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_fuddle;1",
+        "@id": "dtmi:example:pi_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_humpf;1",
+          "@id": "dtmi:example:pi_itch;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -18,8 +18,8 @@
               "EnumValue",
               "dtmi:foo//bar"
             ],
-            "enumValue": 1258,
-            "name": "zeta_um"
+            "enumValue": 1275,
+            "name": "pi_flunn"
           }
         }
       }
@@ -33,10 +33,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_snee;1",
+        "@id": "dtmi:example:rho_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_nuh;1",
+          "@id": "dtmi:example:pi_hi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -45,8 +45,8 @@
               "EnumValue",
               "dtmi:foo//bar"
             ],
-            "enumValue": 1259,
-            "name": "zeta_glikk"
+            "enumValue": 1276,
+            "name": "pi_vroo"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValueTypeIncludesMaterialV3.json b/DTDL/v3/spec/Requirement-ClassEnumValueTypeIncludesMaterialV3.json
index 71545e44..4e2e8829 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValueTypeIncludesMaterialV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValueTypeIncludesMaterialV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_phi;1",
+        "@id": "dtmi:example:omicron_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_upsilon;1",
+          "@id": "dtmi:example:omicron_snee;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1241,
-            "name": "epsilon_tau",
+            "enumValue": 1258,
+            "name": "omicron_nuh",
             "@type": "EnumValue"
           }
         }
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_omega;1",
+        "@id": "dtmi:example:omicron_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_psi;1",
+          "@id": "dtmi:example:omicron_spazz;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1242,
-            "name": "epsilon_chi",
+            "enumValue": 1259,
+            "name": "omicron_thnad",
             "@type": [
               "EnumValue"
             ]
@@ -55,15 +55,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_um;1",
+        "@id": "dtmi:example:omicron_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_wum;1",
+          "@id": "dtmi:example:omicron_jogg;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1243,
-            "name": "epsilon_yuzz",
+            "enumValue": 1260,
+            "name": "omicron_zatz",
             "@type": "dtmi:dtdl:class:EnumValue;3"
           }
         }
@@ -78,15 +78,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_glikk;1",
+        "@id": "dtmi:example:omicron_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_fuddle;1",
+          "@id": "dtmi:example:omicron_yekk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1244,
-            "name": "epsilon_humpf",
+            "enumValue": 1261,
+            "name": "omicron_itch",
             "@type": [
               "dtmi:dtdl:class:EnumValue;3"
             ]
@@ -103,15 +103,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_quan;1",
+        "@id": "dtmi:example:pi_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_snee;1",
+          "@id": "dtmi:example:pi_alpha;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1245,
-            "name": "epsilon_nuh",
+            "enumValue": 1262,
+            "name": "omicron_hi",
             "@type": "Something"
           }
         }
@@ -126,16 +126,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_floob;1",
+        "@id": "dtmi:example:pi_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_spazz;1",
+          "@id": "dtmi:example:pi_delta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1246,
-            "name": "epsilon_thnad",
+            "enumValue": 1263,
+            "name": "pi_gamma",
             "@type": "Something"
           }
         }
@@ -150,15 +150,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_flunn;1",
+        "@id": "dtmi:example:pi_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_jogg;1",
+          "@id": "dtmi:example:pi_eta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1247,
-            "name": "epsilon_zatz",
+            "enumValue": 1264,
+            "name": "pi_zeta",
             "@type": [
               "Something"
             ]
@@ -175,16 +175,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_vroo;1",
+        "@id": "dtmi:example:pi_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_yekk;1",
+          "@id": "dtmi:example:pi_kappa;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1248,
-            "name": "epsilon_itch",
+            "enumValue": 1265,
+            "name": "pi_iota",
             "@type": [
               "Something"
             ]
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValueTypeIncludesNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassEnumValueTypeIncludesNotDtmiNorTermV3.json
index f6d2a67b..4c566023 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValueTypeIncludesNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValueTypeIncludesNotDtmiNorTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_spazz;1",
+        "@id": "dtmi:example:rho_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_thnad;1",
+          "@id": "dtmi:example:rho_gamma;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -18,8 +18,8 @@
               "EnumValue",
               "http://foo.com/bar"
             ],
-            "enumValue": 1260,
-            "name": "zeta_quan"
+            "enumValue": 1277,
+            "name": "rho_beta"
           }
         }
       }
@@ -33,10 +33,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_jogg;1",
+        "@id": "dtmi:example:rho_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_zatz;1",
+          "@id": "dtmi:example:rho_zeta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
@@ -45,8 +45,8 @@
               "EnumValue",
               "http://foo.com/bar"
             ],
-            "enumValue": 1261,
-            "name": "zeta_floob"
+            "enumValue": 1278,
+            "name": "rho_epsilon"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassEnumValueTypeStringOrArrayV3.json b/DTDL/v3/spec/Requirement-ClassEnumValueTypeStringOrArrayV3.json
index b9bfbb84..eeb5dc4f 100644
--- a/DTDL/v3/spec/Requirement-ClassEnumValueTypeStringOrArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassEnumValueTypeStringOrArrayV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_pi;1",
+        "@id": "dtmi:example:xi_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_omicron;1",
+          "@id": "dtmi:example:xi_um;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1225,
-            "name": "delta_xi",
+            "enumValue": 1242,
+            "name": "xi_wum",
             "@type": 626
           }
         }
@@ -30,16 +30,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_tau;1",
+        "@id": "dtmi:example:xi_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_sigma;1",
+          "@id": "dtmi:example:xi_glikk;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1226,
-            "name": "delta_rho",
+            "enumValue": 1243,
+            "name": "xi_fuddle",
             "@type": 626
           }
         }
@@ -54,15 +54,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_chi;1",
+        "@id": "dtmi:example:xi_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_phi;1",
+          "@id": "dtmi:example:xi_quan;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1227,
-            "name": "delta_upsilon",
+            "enumValue": 1244,
+            "name": "xi_snee",
             "@type": null
           }
         }
@@ -77,16 +77,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_yuzz;1",
+        "@id": "dtmi:example:xi_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_omega;1",
+          "@id": "dtmi:example:xi_floob;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1228,
-            "name": "delta_psi",
+            "enumValue": 1245,
+            "name": "xi_spazz",
             "@type": null
           }
         }
@@ -101,15 +101,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_humpf;1",
+        "@id": "dtmi:example:xi_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_um;1",
+          "@id": "dtmi:example:xi_flunn;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1229,
-            "name": "delta_wum",
+            "enumValue": 1246,
+            "name": "xi_jogg",
             "@type": true
           }
         }
@@ -124,16 +124,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_nuh;1",
+        "@id": "dtmi:example:xi_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_glikk;1",
+          "@id": "dtmi:example:xi_vroo;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1230,
-            "name": "delta_fuddle",
+            "enumValue": 1247,
+            "name": "xi_yekk",
             "@type": true
           }
         }
@@ -148,15 +148,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_thnad;1",
+        "@id": "dtmi:example:omicron_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_quan;1",
+          "@id": "dtmi:example:omicron_beta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1231,
-            "name": "delta_snee",
+            "enumValue": 1248,
+            "name": "omicron_alpha",
             "@type": {}
           }
         }
@@ -171,16 +171,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_zatz;1",
+        "@id": "dtmi:example:omicron_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_floob;1",
+          "@id": "dtmi:example:omicron_epsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1232,
-            "name": "delta_spazz",
+            "enumValue": 1249,
+            "name": "omicron_delta",
             "@type": {}
           }
         }
@@ -195,15 +195,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_itch;1",
+        "@id": "dtmi:example:omicron_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_flunn;1",
+          "@id": "dtmi:example:omicron_theta;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1233,
-            "name": "delta_jogg",
+            "enumValue": 1250,
+            "name": "omicron_eta",
             "@type": [
               626
             ]
@@ -220,16 +220,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_hi;1",
+        "@id": "dtmi:example:omicron_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_vroo;1",
+          "@id": "dtmi:example:omicron_lambda;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1234,
-            "name": "delta_yekk",
+            "enumValue": 1251,
+            "name": "omicron_kappa",
             "@type": [
               626
             ]
@@ -246,15 +246,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_gamma;1",
+        "@id": "dtmi:example:omicron_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_beta;1",
+          "@id": "dtmi:example:omicron_xi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1235,
-            "name": "epsilon_alpha",
+            "enumValue": 1252,
+            "name": "omicron_nu",
             "@type": [
               null
             ]
@@ -271,16 +271,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_zeta;1",
+        "@id": "dtmi:example:omicron_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_epsilon;1",
+          "@id": "dtmi:example:omicron_rho;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1236,
-            "name": "epsilon_delta",
+            "enumValue": 1253,
+            "name": "omicron_pi",
             "@type": [
               null
             ]
@@ -297,15 +297,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_iota;1",
+        "@id": "dtmi:example:omicron_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_theta;1",
+          "@id": "dtmi:example:omicron_upsilon;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1237,
-            "name": "epsilon_eta",
+            "enumValue": 1254,
+            "name": "omicron_tau",
             "@type": [
               true
             ]
@@ -322,16 +322,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_mu;1",
+        "@id": "dtmi:example:omicron_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_lambda;1",
+          "@id": "dtmi:example:omicron_psi;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1238,
-            "name": "epsilon_kappa",
+            "enumValue": 1255,
+            "name": "omicron_chi",
             "@type": [
               true
             ]
@@ -348,15 +348,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_omicron;1",
+        "@id": "dtmi:example:omicron_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_xi;1",
+          "@id": "dtmi:example:omicron_wum;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
-            "enumValue": 1239,
-            "name": "epsilon_nu",
+            "enumValue": 1256,
+            "name": "omicron_yuzz",
             "@type": [
               {}
             ]
@@ -373,16 +373,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_sigma;1",
+        "@id": "dtmi:example:omicron_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_rho;1",
+          "@id": "dtmi:example:omicron_fuddle;1",
           "@type": "Enum",
           "valueSchema": "integer",
           "enumValues": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "enumValue": 1240,
-            "name": "epsilon_pi",
+            "enumValue": 1257,
+            "name": "omicron_humpf",
             "@type": [
               {}
             ]
diff --git a/DTDL/v3/spec/Requirement-ClassFieldContextConformsV3.json b/DTDL/v3/spec/Requirement-ClassFieldContextConformsV3.json
index 462568fe..ae016976 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldContextConformsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldContextConformsV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_humpf;1",
+        "@id": "dtmi:example:yekk_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "glikk_um",
+          "name": "yekk_delta",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "glikk_wum",
-              "schema": "date",
+              "name": "yekk_gamma",
+              "schema": "long",
               "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
             }
           }
@@ -32,16 +32,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_nuh;1",
+        "@id": "dtmi:example:yekk_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "glikk_glikk",
+          "name": "yekk_eta",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "glikk_fuddle",
-              "schema": "dateTime",
+              "name": "yekk_zeta",
+              "schema": "string",
               "@context": []
             }
           }
@@ -57,16 +57,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_thnad;1",
+        "@id": "dtmi:example:yekk_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "glikk_quan",
+          "name": "yekk_kappa",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "glikk_snee",
-              "schema": "double",
+              "name": "yekk_iota",
+              "schema": "time",
               "@context": [
                 "dtmi:dtdl:extension:quantitativeTypes;1"
               ]
@@ -84,16 +84,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_zatz;1",
+        "@id": "dtmi:example:yekk_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "glikk_floob",
+          "name": "yekk_nu",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "glikk_spazz",
-              "schema": "duration",
+              "name": "yekk_mu",
+              "schema": "boolean",
               "@context": null
             }
           }
@@ -109,16 +109,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_itch;1",
+        "@id": "dtmi:example:yekk_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "glikk_flunn",
+          "name": "yekk_pi",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "glikk_jogg",
-              "schema": "float",
+              "name": "yekk_omicron",
+              "schema": "date",
               "@context": 626
             }
           }
@@ -134,16 +134,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_hi;1",
+        "@id": "dtmi:example:yekk_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "glikk_vroo",
+          "name": "yekk_tau",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "glikk_yekk",
-              "schema": "integer",
+              "name": "yekk_sigma",
+              "schema": "dateTime",
               "@context": true
             }
           }
@@ -159,16 +159,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_gamma;1",
+        "@id": "dtmi:example:yekk_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nuh_beta",
+          "name": "yekk_chi",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "nuh_alpha",
-              "schema": "long",
+              "name": "yekk_phi",
+              "schema": "double",
               "@context": [
                 null
               ]
@@ -186,16 +186,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_zeta;1",
+        "@id": "dtmi:example:yekk_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nuh_epsilon",
+          "name": "yekk_yuzz",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "nuh_delta",
-              "schema": "string",
+              "name": "yekk_omega",
+              "schema": "duration",
               "@context": [
                 626
               ]
@@ -213,16 +213,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_iota;1",
+        "@id": "dtmi:example:yekk_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nuh_theta",
+          "name": "yekk_humpf",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "nuh_eta",
-              "schema": "time",
+              "name": "yekk_um",
+              "schema": "float",
               "@context": [
                 true
               ]
@@ -240,17 +240,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_mu;1",
+        "@id": "dtmi:example:yekk_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nuh_lambda",
+          "name": "yekk_nuh",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "nuh_kappa",
-              "schema": "boolean",
-              "@context": {}
+              "name": "yekk_glikk",
+              "schema": "integer",
+              "@context": "dtmi:dtdl:extension:quantitativeTypes"
             }
           }
         }
@@ -265,19 +265,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_omicron;1",
+        "@id": "dtmi:example:yekk_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nuh_xi",
+          "name": "yekk_thnad",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "nuh_nu",
-              "schema": "date",
-              "@context": [
-                {}
-              ]
+              "name": "yekk_quan",
+              "schema": "long",
+              "@context": "http://dtdl/extension/quantitativeTypes/1"
             }
           }
         }
@@ -292,17 +290,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_sigma;1",
+        "@id": "dtmi:example:yekk_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nuh_rho",
+          "name": "yekk_zatz",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "nuh_pi",
-              "schema": "dateTime",
-              "@context": "dtmi:dtdl:extension:quantitativeTypes"
+              "name": "yekk_floob",
+              "schema": "string",
+              "@context": "quantitativeTypes;1"
             }
           }
         }
@@ -317,17 +315,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_phi;1",
+        "@id": "dtmi:example:yekk_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nuh_upsilon",
+          "name": "yekk_itch",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "nuh_tau",
-              "schema": "double",
-              "@context": "http://dtdl/extension/quantitativeTypes/1"
+              "name": "yekk_flunn",
+              "schema": "time",
+              "@context": {}
             }
           }
         }
@@ -342,17 +340,75 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_omega;1",
+        "@id": "dtmi:example:vroo_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nuh_psi",
+          "name": "yekk_hi",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "nuh_chi",
-              "schema": "duration",
-              "@context": "quantitativeTypes;1"
+              "name": "yekk_vroo",
+              "schema": "boolean",
+              "@context": {
+                "foo": "dtmi:foo:bar;1"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:vroo_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_gamma",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "vroo_beta",
+              "schema": "date",
+              "@context": [
+                {}
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:vroo_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_zeta",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "vroo_epsilon",
+              "schema": "dateTime",
+              "@context": [
+                {
+                  "foo": "dtmi:foo:bar;1"
+                }
+              ]
             }
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldIdDuplicateV3.json b/DTDL/v3/spec/Requirement-ClassFieldIdDuplicateV3.json
index 679555b4..d0011b7e 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldIdDuplicateV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldIdDuplicateV3.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_epsilon;1",
+        "@id": "dtmi:example:zeta_nuh;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:flunn_epsilon;1",
+          "@id": "dtmi:example:zeta_nuh;1",
           "@type": "Property",
-          "name": "flunn_eta",
+          "name": "zeta_quan",
           "schema": {
-            "@id": "dtmi:example:flunn_epsilon;1",
+            "@id": "dtmi:example:zeta_nuh;1",
             "@type": "Object",
             "fields": {
-              "@id": "dtmi:example:flunn_epsilon;1",
-              "name": "flunn_zeta",
-              "schema": "double"
+              "@id": "dtmi:example:zeta_nuh;1",
+              "name": "zeta_snee",
+              "schema": "date"
             }
           }
         }
@@ -34,20 +34,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_theta;1",
+        "@id": "dtmi:example:zeta_thnad;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:flunn_theta;1",
+          "@id": "dtmi:example:zeta_thnad;1",
           "@type": "Property",
-          "name": "flunn_kappa",
+          "name": "zeta_floob",
           "schema": {
-            "@id": "dtmi:example:flunn_theta;1",
+            "@id": "dtmi:example:zeta_thnad;1",
             "@type": "Object",
             "fields": {
               "@context": "dtmi:undefinedExtension:context;1",
-              "@id": "dtmi:example:flunn_theta;1",
-              "name": "flunn_iota",
-              "schema": "duration"
+              "@id": "dtmi:example:zeta_thnad;1",
+              "name": "zeta_spazz",
+              "schema": "dateTime"
             }
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldIdIsDtmiV3.json b/DTDL/v3/spec/Requirement-ClassFieldIdIsDtmiV3.json
index c649223b..060fcd18 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldIdIsDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldIdIsDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_omicron;1",
+        "@id": "dtmi:example:alpha_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_xi;1",
+          "@id": "dtmi:example:alpha_itch;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;7",
-            "name": "thnad_nu",
-            "schema": "duration"
+            "name": "alpha_flunn",
+            "schema": "dateTime"
           }
         }
       }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_sigma;1",
+        "@id": "dtmi:example:beta_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_rho;1",
+          "@id": "dtmi:example:alpha_hi;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;108675309",
-            "name": "thnad_pi",
-            "schema": "float"
+            "name": "alpha_vroo",
+            "schema": "double"
           }
         }
       }
@@ -51,15 +51,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_phi;1",
+        "@id": "dtmi:example:beta_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_upsilon;1",
+          "@id": "dtmi:example:beta_gamma;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;999999999",
-            "name": "thnad_tau",
-            "schema": "integer"
+            "name": "beta_beta",
+            "schema": "duration"
           }
         }
       }
@@ -73,15 +73,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_omega;1",
+        "@id": "dtmi:example:beta_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_psi;1",
+          "@id": "dtmi:example:beta_zeta;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo;1",
-            "name": "thnad_chi",
-            "schema": "long"
+            "name": "beta_epsilon",
+            "schema": "float"
           }
         }
       }
@@ -95,15 +95,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_um;1",
+        "@id": "dtmi:example:beta_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_wum;1",
+          "@id": "dtmi:example:beta_iota;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar",
-            "name": "thnad_yuzz",
-            "schema": "string"
+            "name": "beta_theta",
+            "schema": "integer"
           }
         }
       }
@@ -117,15 +117,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_glikk;1",
+        "@id": "dtmi:example:beta_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_fuddle;1",
+          "@id": "dtmi:example:beta_mu;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;3.14",
-            "name": "thnad_humpf",
-            "schema": "time"
+            "name": "beta_lambda",
+            "schema": "long"
           }
         }
       }
@@ -139,15 +139,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_quan;1",
+        "@id": "dtmi:example:beta_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_snee;1",
+          "@id": "dtmi:example:beta_omicron;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;3.141592",
-            "name": "thnad_nuh",
-            "schema": "boolean"
+            "name": "beta_xi",
+            "schema": "string"
           }
         }
       }
@@ -161,15 +161,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_floob;1",
+        "@id": "dtmi:example:beta_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_spazz;1",
+          "@id": "dtmi:example:beta_sigma;1",
           "@type": "Object",
           "fields": {
             "@id": null,
-            "name": "thnad_thnad",
-            "schema": "date"
+            "name": "beta_rho",
+            "schema": "time"
           }
         }
       }
@@ -183,16 +183,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_flunn;1",
+        "@id": "dtmi:example:beta_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_jogg;1",
+          "@id": "dtmi:example:beta_phi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": null,
-            "name": "thnad_zatz",
-            "schema": "dateTime"
+            "name": "beta_upsilon",
+            "schema": "boolean"
           }
         }
       }
@@ -206,15 +206,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_vroo;1",
+        "@id": "dtmi:example:beta_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_yekk;1",
+          "@id": "dtmi:example:beta_omega;1",
           "@type": "Object",
           "fields": {
             "@id": 626,
-            "name": "thnad_itch",
-            "schema": "double"
+            "name": "beta_psi",
+            "schema": "date"
           }
         }
       }
@@ -228,16 +228,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_beta;1",
+        "@id": "dtmi:example:beta_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_alpha;1",
+          "@id": "dtmi:example:beta_um;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": 626,
-            "name": "thnad_hi",
-            "schema": "duration"
+            "name": "beta_wum",
+            "schema": "dateTime"
           }
         }
       }
@@ -251,15 +251,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_epsilon;1",
+        "@id": "dtmi:example:beta_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_delta;1",
+          "@id": "dtmi:example:beta_glikk;1",
           "@type": "Object",
           "fields": {
             "@id": true,
-            "name": "spazz_gamma",
-            "schema": "float"
+            "name": "beta_fuddle",
+            "schema": "double"
           }
         }
       }
@@ -273,16 +273,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_theta;1",
+        "@id": "dtmi:example:beta_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_eta;1",
+          "@id": "dtmi:example:beta_quan;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": true,
-            "name": "spazz_zeta",
-            "schema": "integer"
+            "name": "beta_snee",
+            "schema": "duration"
           }
         }
       }
@@ -296,17 +296,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_lambda;1",
+        "@id": "dtmi:example:beta_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_kappa;1",
+          "@id": "dtmi:example:beta_floob;1",
           "@type": "Object",
           "fields": {
             "@id": {
               "@value": "dtmi:apparently:valid:identifier;3"
             },
-            "name": "spazz_iota",
-            "schema": "long"
+            "name": "beta_spazz",
+            "schema": "float"
           }
         }
       }
@@ -320,18 +320,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_xi;1",
+        "@id": "dtmi:example:beta_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_nu;1",
+          "@id": "dtmi:example:beta_flunn;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": {
               "@value": "dtmi:apparently:valid:identifier;3"
             },
-            "name": "spazz_mu",
-            "schema": "string"
+            "name": "beta_jogg",
+            "schema": "integer"
           }
         }
       }
@@ -345,15 +345,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_rho;1",
+        "@id": "dtmi:example:beta_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_pi;1",
+          "@id": "dtmi:example:beta_vroo;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;0",
-            "name": "spazz_omicron",
-            "schema": "time"
+            "name": "beta_yekk",
+            "schema": "long"
           }
         }
       }
@@ -367,16 +367,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_upsilon;1",
+        "@id": "dtmi:example:gamma_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_tau;1",
+          "@id": "dtmi:example:gamma_beta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0",
-            "name": "spazz_sigma",
-            "schema": "boolean"
+            "name": "gamma_alpha",
+            "schema": "string"
           }
         }
       }
@@ -390,15 +390,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_psi;1",
+        "@id": "dtmi:example:gamma_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_chi;1",
+          "@id": "dtmi:example:gamma_epsilon;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;0.0",
-            "name": "spazz_phi",
-            "schema": "date"
+            "name": "gamma_delta",
+            "schema": "time"
           }
         }
       }
@@ -412,16 +412,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_wum;1",
+        "@id": "dtmi:example:gamma_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_yuzz;1",
+          "@id": "dtmi:example:gamma_theta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0.0",
-            "name": "spazz_omega",
-            "schema": "dateTime"
+            "name": "gamma_eta",
+            "schema": "boolean"
           }
         }
       }
@@ -435,15 +435,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_fuddle;1",
+        "@id": "dtmi:example:gamma_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_humpf;1",
+          "@id": "dtmi:example:gamma_lambda;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;1234567890",
-            "name": "spazz_um",
-            "schema": "double"
+            "name": "gamma_kappa",
+            "schema": "date"
           }
         }
       }
@@ -457,16 +457,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_snee;1",
+        "@id": "dtmi:example:gamma_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_nuh;1",
+          "@id": "dtmi:example:gamma_xi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;1234567890",
-            "name": "spazz_glikk",
-            "schema": "duration"
+            "name": "gamma_nu",
+            "schema": "dateTime"
           }
         }
       }
@@ -480,15 +480,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_spazz;1",
+        "@id": "dtmi:example:gamma_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_thnad;1",
+          "@id": "dtmi:example:gamma_rho;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;1a",
-            "name": "spazz_quan",
-            "schema": "float"
+            "name": "gamma_pi",
+            "schema": "double"
           }
         }
       }
@@ -502,16 +502,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_jogg;1",
+        "@id": "dtmi:example:gamma_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_zatz;1",
+          "@id": "dtmi:example:gamma_upsilon;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;1a",
-            "name": "spazz_floob",
-            "schema": "integer"
+            "name": "gamma_tau",
+            "schema": "duration"
           }
         }
       }
@@ -525,15 +525,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_yekk;1",
+        "@id": "dtmi:example:gamma_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_itch;1",
+          "@id": "dtmi:example:gamma_psi;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;3.0",
-            "name": "spazz_flunn",
-            "schema": "long"
+            "name": "gamma_chi",
+            "schema": "float"
           }
         }
       }
@@ -547,16 +547,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_alpha;1",
+        "@id": "dtmi:example:gamma_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_hi;1",
+          "@id": "dtmi:example:gamma_wum;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.0",
-            "name": "spazz_vroo",
-            "schema": "string"
+            "name": "gamma_yuzz",
+            "schema": "integer"
           }
         }
       }
@@ -570,15 +570,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_delta;1",
+        "@id": "dtmi:example:gamma_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_gamma;1",
+          "@id": "dtmi:example:gamma_fuddle;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;3.1415926",
-            "name": "floob_beta",
-            "schema": "time"
+            "name": "gamma_humpf",
+            "schema": "long"
           }
         }
       }
@@ -592,16 +592,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_eta;1",
+        "@id": "dtmi:example:gamma_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_zeta;1",
+          "@id": "dtmi:example:gamma_snee;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.1415926",
-            "name": "floob_epsilon",
-            "schema": "boolean"
+            "name": "gamma_nuh",
+            "schema": "string"
           }
         }
       }
@@ -615,15 +615,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_kappa;1",
+        "@id": "dtmi:example:gamma_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_iota;1",
+          "@id": "dtmi:example:gamma_spazz;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;6.02",
-            "name": "floob_theta",
-            "schema": "date"
+            "name": "gamma_thnad",
+            "schema": "time"
           }
         }
       }
@@ -637,16 +637,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_nu;1",
+        "@id": "dtmi:example:gamma_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_mu;1",
+          "@id": "dtmi:example:gamma_jogg;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;6.02",
-            "name": "floob_lambda",
-            "schema": "dateTime"
+            "name": "gamma_zatz",
+            "schema": "boolean"
           }
         }
       }
@@ -660,15 +660,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_pi;1",
+        "@id": "dtmi:example:gamma_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_omicron;1",
+          "@id": "dtmi:example:gamma_yekk;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;0.1",
-            "name": "floob_xi",
-            "schema": "double"
+            "name": "gamma_itch",
+            "schema": "date"
           }
         }
       }
@@ -682,16 +682,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_tau;1",
+        "@id": "dtmi:example:delta_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_sigma;1",
+          "@id": "dtmi:example:delta_alpha;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0.1",
-            "name": "floob_rho",
-            "schema": "duration"
+            "name": "gamma_hi",
+            "schema": "dateTime"
           }
         }
       }
@@ -705,15 +705,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_chi;1",
+        "@id": "dtmi:example:delta_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_phi;1",
+          "@id": "dtmi:example:delta_delta;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;01",
-            "name": "floob_upsilon",
-            "schema": "float"
+            "name": "delta_gamma",
+            "schema": "double"
           }
         }
       }
@@ -727,16 +727,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_yuzz;1",
+        "@id": "dtmi:example:delta_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_omega;1",
+          "@id": "dtmi:example:delta_eta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;01",
-            "name": "floob_psi",
-            "schema": "integer"
+            "name": "delta_zeta",
+            "schema": "duration"
           }
         }
       }
@@ -750,15 +750,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_humpf;1",
+        "@id": "dtmi:example:delta_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_um;1",
+          "@id": "dtmi:example:delta_kappa;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar;",
-            "name": "floob_wum",
-            "schema": "long"
+            "name": "delta_iota",
+            "schema": "float"
           }
         }
       }
@@ -772,16 +772,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_nuh;1",
+        "@id": "dtmi:example:delta_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_glikk;1",
+          "@id": "dtmi:example:delta_nu;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;",
-            "name": "floob_fuddle",
-            "schema": "string"
+            "name": "delta_mu",
+            "schema": "integer"
           }
         }
       }
@@ -795,15 +795,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_thnad;1",
+        "@id": "dtmi:example:delta_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_quan;1",
+          "@id": "dtmi:example:delta_pi;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:test:invalidId_;1",
-            "name": "floob_snee",
-            "schema": "time"
+            "name": "delta_omicron",
+            "schema": "long"
           }
         }
       }
@@ -817,16 +817,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_zatz;1",
+        "@id": "dtmi:example:delta_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_floob;1",
+          "@id": "dtmi:example:delta_tau;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:invalidId_;1",
-            "name": "floob_spazz",
-            "schema": "boolean"
+            "name": "delta_sigma",
+            "schema": "string"
           }
         }
       }
@@ -840,15 +840,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_itch;1",
+        "@id": "dtmi:example:delta_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_flunn;1",
+          "@id": "dtmi:example:delta_chi;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:test:_invalidUserId;1",
-            "name": "floob_jogg",
-            "schema": "date"
+            "name": "delta_phi",
+            "schema": "time"
           }
         }
       }
@@ -862,16 +862,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_hi;1",
+        "@id": "dtmi:example:delta_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_vroo;1",
+          "@id": "dtmi:example:delta_yuzz;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:_invalidUserId;1",
-            "name": "floob_yekk",
-            "schema": "dateTime"
+            "name": "delta_omega",
+            "schema": "boolean"
           }
         }
       }
@@ -885,15 +885,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_gamma;1",
+        "@id": "dtmi:example:delta_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_beta;1",
+          "@id": "dtmi:example:delta_humpf;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:test:1seg;1",
-            "name": "zatz_alpha",
-            "schema": "double"
+            "name": "delta_um",
+            "schema": "date"
           }
         }
       }
@@ -907,16 +907,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_zeta;1",
+        "@id": "dtmi:example:delta_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_epsilon;1",
+          "@id": "dtmi:example:delta_nuh;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:1seg;1",
-            "name": "zatz_delta",
-            "schema": "duration"
+            "name": "delta_glikk",
+            "schema": "dateTime"
           }
         }
       }
@@ -930,15 +930,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_iota;1",
+        "@id": "dtmi:example:delta_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_theta;1",
+          "@id": "dtmi:example:delta_thnad;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo:bar.baz;1",
-            "name": "zatz_eta",
-            "schema": "float"
+            "name": "delta_quan",
+            "schema": "double"
           }
         }
       }
@@ -952,16 +952,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_mu;1",
+        "@id": "dtmi:example:delta_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_lambda;1",
+          "@id": "dtmi:example:delta_zatz;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar.baz;1",
-            "name": "zatz_kappa",
-            "schema": "integer"
+            "name": "delta_floob",
+            "schema": "duration"
           }
         }
       }
@@ -975,15 +975,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_omicron;1",
+        "@id": "dtmi:example:delta_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_xi;1",
+          "@id": "dtmi:example:delta_itch;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:foo::bar;1",
-            "name": "zatz_nu",
-            "schema": "long"
+            "name": "delta_flunn",
+            "schema": "float"
           }
         }
       }
@@ -997,16 +997,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_sigma;1",
+        "@id": "dtmi:example:epsilon_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_rho;1",
+          "@id": "dtmi:example:delta_hi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo::bar;1",
-            "name": "zatz_pi",
-            "schema": "string"
+            "name": "delta_vroo",
+            "schema": "integer"
           }
         }
       }
@@ -1020,15 +1020,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_phi;1",
+        "@id": "dtmi:example:epsilon_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_upsilon;1",
+          "@id": "dtmi:example:epsilon_gamma;1",
           "@type": "Object",
           "fields": {
             "@id": "urn:foo:bar:1",
-            "name": "zatz_tau",
-            "schema": "time"
+            "name": "epsilon_beta",
+            "schema": "long"
           }
         }
       }
@@ -1042,16 +1042,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_omega;1",
+        "@id": "dtmi:example:epsilon_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_psi;1",
+          "@id": "dtmi:example:epsilon_zeta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "urn:foo:bar:1",
-            "name": "zatz_chi",
-            "schema": "boolean"
+            "name": "epsilon_epsilon",
+            "schema": "string"
           }
         }
       }
@@ -1065,15 +1065,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_um;1",
+        "@id": "dtmi:example:epsilon_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_wum;1",
+          "@id": "dtmi:example:epsilon_iota;1",
           "@type": "Object",
           "fields": {
             "@id": "http://foo/bar/baz",
-            "name": "zatz_yuzz",
-            "schema": "date"
+            "name": "epsilon_theta",
+            "schema": "time"
           }
         }
       }
@@ -1087,16 +1087,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_glikk;1",
+        "@id": "dtmi:example:epsilon_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_fuddle;1",
+          "@id": "dtmi:example:epsilon_mu;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "http://foo/bar/baz",
-            "name": "zatz_humpf",
-            "schema": "dateTime"
+            "name": "epsilon_lambda",
+            "schema": "boolean"
           }
         }
       }
@@ -1110,15 +1110,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_quan;1",
+        "@id": "dtmi:example:epsilon_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_snee;1",
+          "@id": "dtmi:example:epsilon_omicron;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:;1",
-            "name": "zatz_nuh",
-            "schema": "double"
+            "name": "epsilon_xi",
+            "schema": "date"
           }
         }
       }
@@ -1132,16 +1132,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_floob;1",
+        "@id": "dtmi:example:epsilon_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_spazz;1",
+          "@id": "dtmi:example:epsilon_sigma;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:;1",
-            "name": "zatz_thnad",
-            "schema": "duration"
+            "name": "epsilon_rho",
+            "schema": "dateTime"
           }
         }
       }
@@ -1155,15 +1155,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_flunn;1",
+        "@id": "dtmi:example:epsilon_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_jogg;1",
+          "@id": "dtmi:example:epsilon_phi;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:dtdl:example;1",
-            "name": "zatz_zatz",
-            "schema": "float"
+            "name": "epsilon_upsilon",
+            "schema": "double"
           }
         }
       }
@@ -1177,16 +1177,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_vroo;1",
+        "@id": "dtmi:example:epsilon_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_yekk;1",
+          "@id": "dtmi:example:epsilon_omega;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:dtdl:example;1",
-            "name": "zatz_itch",
-            "schema": "integer"
+            "name": "epsilon_psi",
+            "schema": "duration"
           }
         }
       }
@@ -1200,15 +1200,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_beta;1",
+        "@id": "dtmi:example:epsilon_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_alpha;1",
+          "@id": "dtmi:example:epsilon_um;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:standard:example;1",
-            "name": "zatz_hi",
-            "schema": "long"
+            "name": "epsilon_wum",
+            "schema": "float"
           }
         }
       }
@@ -1222,16 +1222,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_epsilon;1",
+        "@id": "dtmi:example:epsilon_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_delta;1",
+          "@id": "dtmi:example:epsilon_glikk;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:standard:example;1",
-            "name": "jogg_gamma",
-            "schema": "string"
+            "name": "epsilon_fuddle",
+            "schema": "integer"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldIdNotArrayV3.json b/DTDL/v3/spec/Requirement-ClassFieldIdNotArrayV3.json
index f7ef348d..ebdcf25c 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldIdNotArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldIdNotArrayV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_theta;1",
+        "@id": "dtmi:example:epsilon_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_eta;1",
+          "@id": "dtmi:example:epsilon_quan;1",
           "@type": "Object",
           "fields": {
             "@id": [
               "dtmi:foo:bar;7"
             ],
-            "name": "jogg_zeta",
-            "schema": "time"
+            "name": "epsilon_snee",
+            "schema": "long"
           }
         }
       }
@@ -31,18 +31,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_lambda;1",
+        "@id": "dtmi:example:epsilon_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_kappa;1",
+          "@id": "dtmi:example:epsilon_floob;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;7"
             ],
-            "name": "jogg_iota",
-            "schema": "boolean"
+            "name": "epsilon_spazz",
+            "schema": "string"
           }
         }
       }
@@ -56,17 +56,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_xi;1",
+        "@id": "dtmi:example:epsilon_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_nu;1",
+          "@id": "dtmi:example:epsilon_flunn;1",
           "@type": "Object",
           "fields": {
             "@id": [
               "dtmi:foo:bar;108675309"
             ],
-            "name": "jogg_mu",
-            "schema": "date"
+            "name": "epsilon_jogg",
+            "schema": "time"
           }
         }
       }
@@ -80,18 +80,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_rho;1",
+        "@id": "dtmi:example:epsilon_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_pi;1",
+          "@id": "dtmi:example:epsilon_vroo;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;108675309"
             ],
-            "name": "jogg_omicron",
-            "schema": "dateTime"
+            "name": "epsilon_yekk",
+            "schema": "boolean"
           }
         }
       }
@@ -105,17 +105,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_upsilon;1",
+        "@id": "dtmi:example:zeta_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_tau;1",
+          "@id": "dtmi:example:zeta_beta;1",
           "@type": "Object",
           "fields": {
             "@id": [
               "dtmi:foo:bar;999999999"
             ],
-            "name": "jogg_sigma",
-            "schema": "double"
+            "name": "zeta_alpha",
+            "schema": "date"
           }
         }
       }
@@ -129,18 +129,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_psi;1",
+        "@id": "dtmi:example:zeta_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_chi;1",
+          "@id": "dtmi:example:zeta_epsilon;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;999999999"
             ],
-            "name": "jogg_phi",
-            "schema": "duration"
+            "name": "zeta_delta",
+            "schema": "dateTime"
           }
         }
       }
@@ -154,17 +154,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_wum;1",
+        "@id": "dtmi:example:zeta_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_yuzz;1",
+          "@id": "dtmi:example:zeta_theta;1",
           "@type": "Object",
           "fields": {
             "@id": [
               "dtmi:foo;1"
             ],
-            "name": "jogg_omega",
-            "schema": "float"
+            "name": "zeta_eta",
+            "schema": "double"
           }
         }
       }
@@ -178,18 +178,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_fuddle;1",
+        "@id": "dtmi:example:zeta_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_humpf;1",
+          "@id": "dtmi:example:zeta_lambda;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo;1"
             ],
-            "name": "jogg_um",
-            "schema": "integer"
+            "name": "zeta_kappa",
+            "schema": "duration"
           }
         }
       }
@@ -203,17 +203,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_snee;1",
+        "@id": "dtmi:example:zeta_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_nuh;1",
+          "@id": "dtmi:example:zeta_xi;1",
           "@type": "Object",
           "fields": {
             "@id": [
               "dtmi:foo:bar"
             ],
-            "name": "jogg_glikk",
-            "schema": "long"
+            "name": "zeta_nu",
+            "schema": "float"
           }
         }
       }
@@ -227,18 +227,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_spazz;1",
+        "@id": "dtmi:example:zeta_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_thnad;1",
+          "@id": "dtmi:example:zeta_rho;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar"
             ],
-            "name": "jogg_quan",
-            "schema": "string"
+            "name": "zeta_pi",
+            "schema": "integer"
           }
         }
       }
@@ -252,17 +252,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_jogg;1",
+        "@id": "dtmi:example:zeta_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_zatz;1",
+          "@id": "dtmi:example:zeta_upsilon;1",
           "@type": "Object",
           "fields": {
             "@id": [
               "dtmi:foo:bar;3.14"
             ],
-            "name": "jogg_floob",
-            "schema": "time"
+            "name": "zeta_tau",
+            "schema": "long"
           }
         }
       }
@@ -276,18 +276,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_yekk;1",
+        "@id": "dtmi:example:zeta_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_itch;1",
+          "@id": "dtmi:example:zeta_psi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;3.14"
             ],
-            "name": "jogg_flunn",
-            "schema": "boolean"
+            "name": "zeta_chi",
+            "schema": "string"
           }
         }
       }
@@ -301,17 +301,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_alpha;1",
+        "@id": "dtmi:example:zeta_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_hi;1",
+          "@id": "dtmi:example:zeta_wum;1",
           "@type": "Object",
           "fields": {
             "@id": [
               "dtmi:foo:bar;3.141592"
             ],
-            "name": "jogg_vroo",
-            "schema": "date"
+            "name": "zeta_yuzz",
+            "schema": "time"
           }
         }
       }
@@ -325,18 +325,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_delta;1",
+        "@id": "dtmi:example:zeta_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_gamma;1",
+          "@id": "dtmi:example:zeta_fuddle;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;3.141592"
             ],
-            "name": "flunn_beta",
-            "schema": "dateTime"
+            "name": "zeta_humpf",
+            "schema": "boolean"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldInvalidKeywordsV3.json b/DTDL/v3/spec/Requirement-ClassFieldInvalidKeywordsV3.json
index f29fac12..ac11e3a8 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldInvalidKeywordsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldInvalidKeywordsV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_mu;1",
+        "@id": "dtmi:example:nu_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_lambda;1",
+          "@id": "dtmi:example:nu_zatz;1",
           "@type": "Object",
           "fields": {
-            "name": "gamma_kappa",
-            "schema": "string",
+            "name": "nu_floob",
+            "schema": "integer",
             "@graph": {}
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_omicron;1",
+        "@id": "dtmi:example:nu_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_xi;1",
+          "@id": "dtmi:example:nu_itch;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "gamma_nu",
-            "schema": "time",
+            "name": "nu_flunn",
+            "schema": "long",
             "@graph": {}
           }
         }
@@ -52,14 +52,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_sigma;1",
+        "@id": "dtmi:example:xi_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_rho;1",
+          "@id": "dtmi:example:nu_hi;1",
           "@type": "Object",
           "fields": {
-            "name": "gamma_pi",
-            "schema": "boolean",
+            "name": "nu_vroo",
+            "schema": "string",
             "@value": 626
           }
         }
@@ -74,15 +74,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_phi;1",
+        "@id": "dtmi:example:xi_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_upsilon;1",
+          "@id": "dtmi:example:xi_gamma;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "gamma_tau",
-            "schema": "date",
+            "name": "xi_beta",
+            "schema": "time",
             "@value": 626
           }
         }
@@ -97,14 +97,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_omega;1",
+        "@id": "dtmi:example:xi_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_psi;1",
+          "@id": "dtmi:example:xi_zeta;1",
           "@type": "Object",
           "fields": {
-            "name": "gamma_chi",
-            "schema": "dateTime",
+            "name": "xi_epsilon",
+            "schema": "boolean",
             "@language": "en"
           }
         }
@@ -119,15 +119,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_um;1",
+        "@id": "dtmi:example:xi_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_wum;1",
+          "@id": "dtmi:example:xi_iota;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "gamma_yuzz",
-            "schema": "double",
+            "name": "xi_theta",
+            "schema": "date",
             "@language": "en"
           }
         }
@@ -142,14 +142,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_glikk;1",
+        "@id": "dtmi:example:xi_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_fuddle;1",
+          "@id": "dtmi:example:xi_mu;1",
           "@type": "Object",
           "fields": {
-            "name": "gamma_humpf",
-            "schema": "duration",
+            "name": "xi_lambda",
+            "schema": "dateTime",
             "@foobar": true
           }
         }
@@ -164,15 +164,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_quan;1",
+        "@id": "dtmi:example:xi_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_snee;1",
+          "@id": "dtmi:example:xi_omicron;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "gamma_nuh",
-            "schema": "float",
+            "name": "xi_xi",
+            "schema": "double",
             "@foobar": true
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldPropertyCommentStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassFieldPropertyCommentStringLengthV3.json
index 31a55da5..4d2cda89 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldPropertyCommentStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldPropertyCommentStringLengthV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_quan;1",
+        "@id": "dtmi:example:theta_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_snee;1",
+          "@id": "dtmi:example:theta_omicron;1",
           "@type": "Object",
           "fields": {
-            "name": "itch_nuh",
-            "schema": "integer",
+            "name": "theta_xi",
+            "schema": "duration",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_floob;1",
+        "@id": "dtmi:example:theta_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_spazz;1",
+          "@id": "dtmi:example:theta_sigma;1",
           "@type": "Object",
           "fields": {
-            "name": "itch_thnad",
-            "schema": "long",
+            "name": "theta_rho",
+            "schema": "float",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
@@ -51,15 +51,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_flunn;1",
+        "@id": "dtmi:example:theta_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_jogg;1",
+          "@id": "dtmi:example:theta_phi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "itch_zatz",
-            "schema": "string",
+            "name": "theta_upsilon",
+            "schema": "integer",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldPropertyCommentStringV3.json b/DTDL/v3/spec/Requirement-ClassFieldPropertyCommentStringV3.json
index b2b09c36..0ff77365 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldPropertyCommentStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldPropertyCommentStringV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_nu;1",
+        "@id": "dtmi:example:zeta_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_mu;1",
+          "@id": "dtmi:example:zeta_jogg;1",
           "@type": "Object",
           "fields": {
-            "name": "flunn_lambda",
-            "schema": "float",
+            "name": "zeta_zatz",
+            "schema": "double",
             "comment": "hello"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_pi;1",
+        "@id": "dtmi:example:zeta_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_omicron;1",
+          "@id": "dtmi:example:zeta_yekk;1",
           "@type": "Object",
           "fields": {
-            "name": "flunn_xi",
-            "schema": "integer",
+            "name": "zeta_itch",
+            "schema": "duration",
             "comment": [
               "hello"
             ]
@@ -53,14 +53,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_tau;1",
+        "@id": "dtmi:example:eta_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_sigma;1",
+          "@id": "dtmi:example:eta_alpha;1",
           "@type": "Object",
           "fields": {
-            "name": "flunn_rho",
-            "schema": "long",
+            "name": "zeta_hi",
+            "schema": "float",
             "comment": {
               "@value": "hello",
               "@type": "xsd:string"
@@ -78,14 +78,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_chi;1",
+        "@id": "dtmi:example:eta_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_phi;1",
+          "@id": "dtmi:example:eta_delta;1",
           "@type": "Object",
           "fields": {
-            "name": "flunn_upsilon",
-            "schema": "string",
+            "name": "eta_gamma",
+            "schema": "integer",
             "comment": [
               {
                 "@value": "hello",
@@ -105,14 +105,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_yuzz;1",
+        "@id": "dtmi:example:eta_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_omega;1",
+          "@id": "dtmi:example:eta_eta;1",
           "@type": "Object",
           "fields": {
-            "name": "flunn_psi",
-            "schema": "time",
+            "name": "eta_zeta",
+            "schema": "long",
             "comment": []
           }
         }
@@ -127,14 +127,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_humpf;1",
+        "@id": "dtmi:example:eta_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_um;1",
+          "@id": "dtmi:example:eta_kappa;1",
           "@type": "Object",
           "fields": {
-            "name": "flunn_wum",
-            "schema": "boolean",
+            "name": "eta_iota",
+            "schema": "string",
             "comment": null
           }
         }
@@ -149,15 +149,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_nuh;1",
+        "@id": "dtmi:example:eta_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_glikk;1",
+          "@id": "dtmi:example:eta_nu;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "flunn_fuddle",
-            "schema": "date",
+            "name": "eta_mu",
+            "schema": "time",
             "comment": null
           }
         }
@@ -172,14 +172,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_thnad;1",
+        "@id": "dtmi:example:eta_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_quan;1",
+          "@id": "dtmi:example:eta_pi;1",
           "@type": "Object",
           "fields": {
-            "name": "flunn_snee",
-            "schema": "dateTime",
+            "name": "eta_omicron",
+            "schema": "boolean",
             "comment": true
           }
         }
@@ -194,15 +194,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_zatz;1",
+        "@id": "dtmi:example:eta_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_floob;1",
+          "@id": "dtmi:example:eta_tau;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "flunn_spazz",
-            "schema": "double",
+            "name": "eta_sigma",
+            "schema": "date",
             "comment": true
           }
         }
@@ -217,14 +217,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_itch;1",
+        "@id": "dtmi:example:eta_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_flunn;1",
+          "@id": "dtmi:example:eta_chi;1",
           "@type": "Object",
           "fields": {
-            "name": "flunn_jogg",
-            "schema": "duration",
+            "name": "eta_phi",
+            "schema": "dateTime",
             "comment": 626
           }
         }
@@ -239,15 +239,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_hi;1",
+        "@id": "dtmi:example:eta_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_vroo;1",
+          "@id": "dtmi:example:eta_yuzz;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "flunn_yekk",
-            "schema": "float",
+            "name": "eta_omega",
+            "schema": "double",
             "comment": 626
           }
         }
@@ -262,14 +262,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_gamma;1",
+        "@id": "dtmi:example:eta_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_beta;1",
+          "@id": "dtmi:example:eta_humpf;1",
           "@type": "Object",
           "fields": {
-            "name": "itch_alpha",
-            "schema": "integer",
+            "name": "eta_um",
+            "schema": "duration",
             "comment": [
               null
             ]
@@ -286,15 +286,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_zeta;1",
+        "@id": "dtmi:example:eta_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_epsilon;1",
+          "@id": "dtmi:example:eta_nuh;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "itch_delta",
-            "schema": "long",
+            "name": "eta_glikk",
+            "schema": "float",
             "comment": [
               null
             ]
@@ -311,14 +311,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_iota;1",
+        "@id": "dtmi:example:eta_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_theta;1",
+          "@id": "dtmi:example:eta_thnad;1",
           "@type": "Object",
           "fields": {
-            "name": "itch_eta",
-            "schema": "string",
+            "name": "eta_quan",
+            "schema": "integer",
             "comment": [
               true
             ]
@@ -335,15 +335,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_mu;1",
+        "@id": "dtmi:example:eta_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_lambda;1",
+          "@id": "dtmi:example:eta_zatz;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "itch_kappa",
-            "schema": "time",
+            "name": "eta_floob",
+            "schema": "long",
             "comment": [
               true
             ]
@@ -360,14 +360,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_omicron;1",
+        "@id": "dtmi:example:eta_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_xi;1",
+          "@id": "dtmi:example:eta_itch;1",
           "@type": "Object",
           "fields": {
-            "name": "itch_nu",
-            "schema": "boolean",
+            "name": "eta_flunn",
+            "schema": "string",
             "comment": [
               626
             ]
@@ -384,15 +384,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_sigma;1",
+        "@id": "dtmi:example:theta_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_rho;1",
+          "@id": "dtmi:example:eta_hi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "itch_pi",
-            "schema": "date",
+            "name": "eta_vroo",
+            "schema": "time",
             "comment": [
               626
             ]
@@ -409,14 +409,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_phi;1",
+        "@id": "dtmi:example:theta_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_upsilon;1",
+          "@id": "dtmi:example:theta_gamma;1",
           "@type": "Object",
           "fields": {
-            "name": "itch_tau",
-            "schema": "dateTime",
+            "name": "theta_beta",
+            "schema": "boolean",
             "comment": {}
           }
         }
@@ -431,15 +431,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_omega;1",
+        "@id": "dtmi:example:theta_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_psi;1",
+          "@id": "dtmi:example:theta_zeta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "itch_chi",
-            "schema": "double",
+            "name": "theta_epsilon",
+            "schema": "date",
             "comment": {}
           }
         }
@@ -454,14 +454,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_um;1",
+        "@id": "dtmi:example:theta_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_wum;1",
+          "@id": "dtmi:example:theta_iota;1",
           "@type": "Object",
           "fields": {
-            "name": "itch_yuzz",
-            "schema": "duration",
+            "name": "theta_theta",
+            "schema": "dateTime",
             "comment": [
               {}
             ]
@@ -478,15 +478,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_glikk;1",
+        "@id": "dtmi:example:theta_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_fuddle;1",
+          "@id": "dtmi:example:theta_mu;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "itch_humpf",
-            "schema": "float",
+            "name": "theta_lambda",
+            "schema": "double",
             "comment": [
               {}
             ]
diff --git a/DTDL/v3/spec/Requirement-ClassFieldPropertyCommentTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassFieldPropertyCommentTermAndDtmiV3.json
index 3be294b0..dbb8e1cb 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldPropertyCommentTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldPropertyCommentTermAndDtmiV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_nu;1",
+        "@id": "dtmi:example:theta_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_mu;1",
+          "@id": "dtmi:example:theta_jogg;1",
           "@type": "Object",
           "fields": {
-            "comment": "yekk_iota",
-            "dtmi:dtdl:property:comment;3": "yekk_kappa",
-            "name": "yekk_lambda",
-            "schema": "dateTime"
+            "comment": "theta_spazz",
+            "dtmi:dtdl:property:comment;3": "theta_floob",
+            "name": "theta_zatz",
+            "schema": "boolean"
           }
         }
       }
@@ -30,17 +30,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_sigma;1",
+        "@id": "dtmi:example:iota_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_rho;1",
+          "@id": "dtmi:example:theta_hi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "comment": "yekk_xi",
-            "dtmi:dtdl:property:comment;3": "yekk_omicron",
-            "name": "yekk_pi",
-            "schema": "double"
+            "comment": "theta_itch",
+            "dtmi:dtdl:property:comment;3": "theta_yekk",
+            "name": "theta_vroo",
+            "schema": "date"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldPropertyDescriptionLangStringV3.json b/DTDL/v3/spec/Requirement-ClassFieldPropertyDescriptionLangStringV3.json
index 0654f9da..70165a74 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldPropertyDescriptionLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldPropertyDescriptionLangStringV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_phi;1",
+        "@id": "dtmi:example:iota_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_upsilon;1",
+          "@id": "dtmi:example:iota_gamma;1",
           "@type": "Object",
           "fields": {
-            "name": "yekk_tau",
-            "schema": "duration",
+            "name": "iota_beta",
+            "schema": "dateTime",
             "description": "hello"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_omega;1",
+        "@id": "dtmi:example:iota_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_psi;1",
+          "@id": "dtmi:example:iota_zeta;1",
           "@type": "Object",
           "fields": {
-            "name": "yekk_chi",
-            "schema": "float",
+            "name": "iota_epsilon",
+            "schema": "double",
             "description": [
               "hello"
             ]
@@ -53,14 +53,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_um;1",
+        "@id": "dtmi:example:iota_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_wum;1",
+          "@id": "dtmi:example:iota_iota;1",
           "@type": "Object",
           "fields": {
-            "name": "yekk_yuzz",
-            "schema": "integer",
+            "name": "iota_theta",
+            "schema": "duration",
             "description": {
               "en": "hello"
             }
@@ -77,14 +77,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_glikk;1",
+        "@id": "dtmi:example:iota_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_fuddle;1",
+          "@id": "dtmi:example:iota_mu;1",
           "@type": "Object",
           "fields": {
-            "name": "yekk_humpf",
-            "schema": "long",
+            "name": "iota_lambda",
+            "schema": "float",
             "description": [
               {
                 "@value": "hello",
@@ -104,14 +104,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_quan;1",
+        "@id": "dtmi:example:iota_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_snee;1",
+          "@id": "dtmi:example:iota_omicron;1",
           "@type": "Object",
           "fields": {
-            "name": "yekk_nuh",
-            "schema": "string",
+            "name": "iota_xi",
+            "schema": "integer",
             "description": {}
           }
         }
@@ -126,14 +126,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_floob;1",
+        "@id": "dtmi:example:iota_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_spazz;1",
+          "@id": "dtmi:example:iota_sigma;1",
           "@type": "Object",
           "fields": {
-            "name": "yekk_thnad",
-            "schema": "time",
+            "name": "iota_rho",
+            "schema": "long",
             "description": []
           }
         }
@@ -148,14 +148,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_flunn;1",
+        "@id": "dtmi:example:iota_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_jogg;1",
+          "@id": "dtmi:example:iota_phi;1",
           "@type": "Object",
           "fields": {
-            "name": "yekk_zatz",
-            "schema": "boolean",
+            "name": "iota_upsilon",
+            "schema": "string",
             "description": null
           }
         }
@@ -170,15 +170,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_vroo;1",
+        "@id": "dtmi:example:iota_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_yekk;1",
+          "@id": "dtmi:example:iota_omega;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yekk_itch",
-            "schema": "date",
+            "name": "iota_psi",
+            "schema": "time",
             "description": null
           }
         }
@@ -193,14 +193,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_beta;1",
+        "@id": "dtmi:example:iota_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_alpha;1",
+          "@id": "dtmi:example:iota_um;1",
           "@type": "Object",
           "fields": {
-            "name": "yekk_hi",
-            "schema": "dateTime",
+            "name": "iota_wum",
+            "schema": "boolean",
             "description": true
           }
         }
@@ -215,15 +215,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_epsilon;1",
+        "@id": "dtmi:example:iota_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_delta;1",
+          "@id": "dtmi:example:iota_glikk;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "vroo_gamma",
-            "schema": "double",
+            "name": "iota_fuddle",
+            "schema": "date",
             "description": true
           }
         }
@@ -238,14 +238,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_theta;1",
+        "@id": "dtmi:example:iota_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_eta;1",
+          "@id": "dtmi:example:iota_quan;1",
           "@type": "Object",
           "fields": {
-            "name": "vroo_zeta",
-            "schema": "duration",
+            "name": "iota_snee",
+            "schema": "dateTime",
             "description": 626
           }
         }
@@ -260,15 +260,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_lambda;1",
+        "@id": "dtmi:example:iota_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_kappa;1",
+          "@id": "dtmi:example:iota_floob;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "vroo_iota",
-            "schema": "float",
+            "name": "iota_spazz",
+            "schema": "double",
             "description": 626
           }
         }
@@ -283,14 +283,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_xi;1",
+        "@id": "dtmi:example:iota_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_nu;1",
+          "@id": "dtmi:example:iota_flunn;1",
           "@type": "Object",
           "fields": {
-            "name": "vroo_mu",
-            "schema": "integer",
+            "name": "iota_jogg",
+            "schema": "duration",
             "description": [
               null
             ]
@@ -307,15 +307,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_rho;1",
+        "@id": "dtmi:example:iota_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_pi;1",
+          "@id": "dtmi:example:iota_vroo;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "vroo_omicron",
-            "schema": "long",
+            "name": "iota_yekk",
+            "schema": "float",
             "description": [
               null
             ]
@@ -332,14 +332,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_upsilon;1",
+        "@id": "dtmi:example:kappa_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_tau;1",
+          "@id": "dtmi:example:kappa_beta;1",
           "@type": "Object",
           "fields": {
-            "name": "vroo_sigma",
-            "schema": "string",
+            "name": "kappa_alpha",
+            "schema": "integer",
             "description": [
               true
             ]
@@ -356,15 +356,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_psi;1",
+        "@id": "dtmi:example:kappa_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_chi;1",
+          "@id": "dtmi:example:kappa_epsilon;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "vroo_phi",
-            "schema": "time",
+            "name": "kappa_delta",
+            "schema": "long",
             "description": [
               true
             ]
@@ -381,14 +381,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_wum;1",
+        "@id": "dtmi:example:kappa_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_yuzz;1",
+          "@id": "dtmi:example:kappa_theta;1",
           "@type": "Object",
           "fields": {
-            "name": "vroo_omega",
-            "schema": "boolean",
+            "name": "kappa_eta",
+            "schema": "string",
             "description": [
               626
             ]
@@ -405,15 +405,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_fuddle;1",
+        "@id": "dtmi:example:kappa_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_humpf;1",
+          "@id": "dtmi:example:kappa_lambda;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "vroo_um",
-            "schema": "date",
+            "name": "kappa_kappa",
+            "schema": "time",
             "description": [
               626
             ]
@@ -430,14 +430,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_snee;1",
+        "@id": "dtmi:example:kappa_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_nuh;1",
+          "@id": "dtmi:example:kappa_xi;1",
           "@type": "Object",
           "fields": {
-            "name": "vroo_glikk",
-            "schema": "dateTime",
+            "name": "kappa_nu",
+            "schema": "boolean",
             "description": [
               {}
             ]
@@ -454,15 +454,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_spazz;1",
+        "@id": "dtmi:example:kappa_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_thnad;1",
+          "@id": "dtmi:example:kappa_rho;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "vroo_quan",
-            "schema": "double",
+            "name": "kappa_pi",
+            "schema": "date",
             "description": [
               {}
             ]
@@ -479,14 +479,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_jogg;1",
+        "@id": "dtmi:example:kappa_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_zatz;1",
+          "@id": "dtmi:example:kappa_upsilon;1",
           "@type": "Object",
           "fields": {
-            "name": "vroo_floob",
-            "schema": "duration",
+            "name": "kappa_tau",
+            "schema": "dateTime",
             "description": {
               "@value": "hello",
               "@language": "en"
@@ -504,15 +504,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_yekk;1",
+        "@id": "dtmi:example:kappa_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_itch;1",
+          "@id": "dtmi:example:kappa_psi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "vroo_flunn",
-            "schema": "float",
+            "name": "kappa_chi",
+            "schema": "double",
             "description": {
               "@value": "hello",
               "@language": "en"
@@ -530,14 +530,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_alpha;1",
+        "@id": "dtmi:example:kappa_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_hi;1",
+          "@id": "dtmi:example:kappa_wum;1",
           "@type": "Object",
           "fields": {
-            "name": "vroo_vroo",
-            "schema": "integer",
+            "name": "kappa_yuzz",
+            "schema": "duration",
             "description": [
               {
                 "en": "hello"
@@ -556,15 +556,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_delta;1",
+        "@id": "dtmi:example:kappa_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_gamma;1",
+          "@id": "dtmi:example:kappa_fuddle;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "hi_beta",
-            "schema": "long",
+            "name": "kappa_humpf",
+            "schema": "float",
             "description": [
               {
                 "en": "hello"
diff --git a/DTDL/v3/spec/Requirement-ClassFieldPropertyDescriptionStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassFieldPropertyDescriptionStringLengthV3.json
index 1fe4c47a..c44a75fb 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldPropertyDescriptionStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldPropertyDescriptionStringLengthV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_eta;1",
+        "@id": "dtmi:example:kappa_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_zeta;1",
+          "@id": "dtmi:example:kappa_snee;1",
           "@type": "Object",
           "fields": {
-            "name": "hi_epsilon",
-            "schema": "string",
+            "name": "kappa_nuh",
+            "schema": "integer",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_kappa;1",
+        "@id": "dtmi:example:kappa_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_iota;1",
+          "@id": "dtmi:example:kappa_spazz;1",
           "@type": "Object",
           "fields": {
-            "name": "hi_theta",
-            "schema": "time",
+            "name": "kappa_thnad",
+            "schema": "long",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
@@ -51,15 +51,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_nu;1",
+        "@id": "dtmi:example:kappa_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_mu;1",
+          "@id": "dtmi:example:kappa_jogg;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "hi_lambda",
-            "schema": "boolean",
+            "name": "kappa_zatz",
+            "schema": "string",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldPropertyDescriptionTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassFieldPropertyDescriptionTermAndDtmiV3.json
index 00c4621f..158fe2ed 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldPropertyDescriptionTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldPropertyDescriptionTermAndDtmiV3.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_glikk;1",
+        "@id": "dtmi:example:lambda_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_fuddle;1",
+          "@id": "dtmi:example:lambda_mu;1",
           "@type": "Object",
           "fields": {
             "description": [
-              "hi_wum"
+              "lambda_iota"
             ],
             "dtmi:dtdl:property:description;3": [
-              "hi_um"
+              "lambda_kappa"
             ],
-            "name": "hi_humpf",
-            "schema": "duration"
+            "name": "lambda_lambda",
+            "schema": "dateTime"
           }
         }
       }
@@ -34,21 +34,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_spazz;1",
+        "@id": "dtmi:example:lambda_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_thnad;1",
+          "@id": "dtmi:example:lambda_rho;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "description": [
-              "hi_nuh"
+              "lambda_xi"
             ],
             "dtmi:dtdl:property:description;3": [
-              "hi_snee"
+              "lambda_omicron"
             ],
-            "name": "hi_quan",
-            "schema": "float"
+            "name": "lambda_pi",
+            "schema": "double"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldPropertyDisplayNameLangStringV3.json b/DTDL/v3/spec/Requirement-ClassFieldPropertyDisplayNameLangStringV3.json
index ffbb17c6..6841d00b 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldPropertyDisplayNameLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldPropertyDisplayNameLangStringV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_jogg;1",
+        "@id": "dtmi:example:lambda_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_zatz;1",
+          "@id": "dtmi:example:lambda_upsilon;1",
           "@type": "Object",
           "fields": {
-            "name": "hi_floob",
-            "schema": "integer",
+            "name": "lambda_tau",
+            "schema": "duration",
             "displayName": "hello"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_yekk;1",
+        "@id": "dtmi:example:lambda_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_itch;1",
+          "@id": "dtmi:example:lambda_psi;1",
           "@type": "Object",
           "fields": {
-            "name": "hi_flunn",
-            "schema": "long",
+            "name": "lambda_chi",
+            "schema": "float",
             "displayName": [
               "hello"
             ]
@@ -53,14 +53,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_alpha;1",
+        "@id": "dtmi:example:lambda_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_hi;1",
+          "@id": "dtmi:example:lambda_wum;1",
           "@type": "Object",
           "fields": {
-            "name": "hi_vroo",
-            "schema": "string",
+            "name": "lambda_yuzz",
+            "schema": "integer",
             "displayName": {
               "en": "hello"
             }
@@ -77,14 +77,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_delta;1",
+        "@id": "dtmi:example:lambda_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_gamma;1",
+          "@id": "dtmi:example:lambda_fuddle;1",
           "@type": "Object",
           "fields": {
-            "name": "alpha_beta",
-            "schema": "time",
+            "name": "lambda_humpf",
+            "schema": "long",
             "displayName": [
               {
                 "@value": "hello",
@@ -104,14 +104,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_eta;1",
+        "@id": "dtmi:example:lambda_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_zeta;1",
+          "@id": "dtmi:example:lambda_snee;1",
           "@type": "Object",
           "fields": {
-            "name": "alpha_epsilon",
-            "schema": "boolean",
+            "name": "lambda_nuh",
+            "schema": "string",
             "displayName": {}
           }
         }
@@ -126,14 +126,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_kappa;1",
+        "@id": "dtmi:example:lambda_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_iota;1",
+          "@id": "dtmi:example:lambda_spazz;1",
           "@type": "Object",
           "fields": {
-            "name": "alpha_theta",
-            "schema": "date",
+            "name": "lambda_thnad",
+            "schema": "time",
             "displayName": []
           }
         }
@@ -148,14 +148,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_nu;1",
+        "@id": "dtmi:example:lambda_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_mu;1",
+          "@id": "dtmi:example:lambda_jogg;1",
           "@type": "Object",
           "fields": {
-            "name": "alpha_lambda",
-            "schema": "dateTime",
+            "name": "lambda_zatz",
+            "schema": "boolean",
             "displayName": null
           }
         }
@@ -170,15 +170,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_pi;1",
+        "@id": "dtmi:example:lambda_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_omicron;1",
+          "@id": "dtmi:example:lambda_yekk;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "alpha_xi",
-            "schema": "double",
+            "name": "lambda_itch",
+            "schema": "date",
             "displayName": null
           }
         }
@@ -193,14 +193,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_tau;1",
+        "@id": "dtmi:example:mu_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_sigma;1",
+          "@id": "dtmi:example:mu_alpha;1",
           "@type": "Object",
           "fields": {
-            "name": "alpha_rho",
-            "schema": "duration",
+            "name": "lambda_hi",
+            "schema": "dateTime",
             "displayName": true
           }
         }
@@ -215,15 +215,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_chi;1",
+        "@id": "dtmi:example:mu_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_phi;1",
+          "@id": "dtmi:example:mu_delta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "alpha_upsilon",
-            "schema": "float",
+            "name": "mu_gamma",
+            "schema": "double",
             "displayName": true
           }
         }
@@ -238,14 +238,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_yuzz;1",
+        "@id": "dtmi:example:mu_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_omega;1",
+          "@id": "dtmi:example:mu_eta;1",
           "@type": "Object",
           "fields": {
-            "name": "alpha_psi",
-            "schema": "integer",
+            "name": "mu_zeta",
+            "schema": "duration",
             "displayName": 626
           }
         }
@@ -260,15 +260,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_humpf;1",
+        "@id": "dtmi:example:mu_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_um;1",
+          "@id": "dtmi:example:mu_kappa;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "alpha_wum",
-            "schema": "long",
+            "name": "mu_iota",
+            "schema": "float",
             "displayName": 626
           }
         }
@@ -283,14 +283,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_nuh;1",
+        "@id": "dtmi:example:mu_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_glikk;1",
+          "@id": "dtmi:example:mu_nu;1",
           "@type": "Object",
           "fields": {
-            "name": "alpha_fuddle",
-            "schema": "string",
+            "name": "mu_mu",
+            "schema": "integer",
             "displayName": [
               null
             ]
@@ -307,15 +307,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_thnad;1",
+        "@id": "dtmi:example:mu_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_quan;1",
+          "@id": "dtmi:example:mu_pi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "alpha_snee",
-            "schema": "time",
+            "name": "mu_omicron",
+            "schema": "long",
             "displayName": [
               null
             ]
@@ -332,14 +332,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_zatz;1",
+        "@id": "dtmi:example:mu_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_floob;1",
+          "@id": "dtmi:example:mu_tau;1",
           "@type": "Object",
           "fields": {
-            "name": "alpha_spazz",
-            "schema": "boolean",
+            "name": "mu_sigma",
+            "schema": "string",
             "displayName": [
               true
             ]
@@ -356,15 +356,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_itch;1",
+        "@id": "dtmi:example:mu_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_flunn;1",
+          "@id": "dtmi:example:mu_chi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "alpha_jogg",
-            "schema": "date",
+            "name": "mu_phi",
+            "schema": "time",
             "displayName": [
               true
             ]
@@ -381,14 +381,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_hi;1",
+        "@id": "dtmi:example:mu_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_vroo;1",
+          "@id": "dtmi:example:mu_yuzz;1",
           "@type": "Object",
           "fields": {
-            "name": "alpha_yekk",
-            "schema": "dateTime",
+            "name": "mu_omega",
+            "schema": "boolean",
             "displayName": [
               626
             ]
@@ -405,15 +405,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_gamma;1",
+        "@id": "dtmi:example:mu_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_beta;1",
+          "@id": "dtmi:example:mu_humpf;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "beta_alpha",
-            "schema": "double",
+            "name": "mu_um",
+            "schema": "date",
             "displayName": [
               626
             ]
@@ -430,14 +430,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_zeta;1",
+        "@id": "dtmi:example:mu_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_epsilon;1",
+          "@id": "dtmi:example:mu_nuh;1",
           "@type": "Object",
           "fields": {
-            "name": "beta_delta",
-            "schema": "duration",
+            "name": "mu_glikk",
+            "schema": "dateTime",
             "displayName": [
               {}
             ]
@@ -454,15 +454,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_iota;1",
+        "@id": "dtmi:example:mu_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_theta;1",
+          "@id": "dtmi:example:mu_thnad;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "beta_eta",
-            "schema": "float",
+            "name": "mu_quan",
+            "schema": "double",
             "displayName": [
               {}
             ]
@@ -479,14 +479,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_mu;1",
+        "@id": "dtmi:example:mu_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_lambda;1",
+          "@id": "dtmi:example:mu_zatz;1",
           "@type": "Object",
           "fields": {
-            "name": "beta_kappa",
-            "schema": "integer",
+            "name": "mu_floob",
+            "schema": "duration",
             "displayName": {
               "@value": "hello",
               "@language": "en"
@@ -504,15 +504,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_omicron;1",
+        "@id": "dtmi:example:mu_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_xi;1",
+          "@id": "dtmi:example:mu_itch;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "beta_nu",
-            "schema": "long",
+            "name": "mu_flunn",
+            "schema": "float",
             "displayName": {
               "@value": "hello",
               "@language": "en"
@@ -530,14 +530,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_sigma;1",
+        "@id": "dtmi:example:nu_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_rho;1",
+          "@id": "dtmi:example:mu_hi;1",
           "@type": "Object",
           "fields": {
-            "name": "beta_pi",
-            "schema": "string",
+            "name": "mu_vroo",
+            "schema": "integer",
             "displayName": [
               {
                 "en": "hello"
@@ -556,15 +556,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_phi;1",
+        "@id": "dtmi:example:nu_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_upsilon;1",
+          "@id": "dtmi:example:nu_gamma;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "beta_tau",
-            "schema": "time",
+            "name": "nu_beta",
+            "schema": "long",
             "displayName": [
               {
                 "en": "hello"
diff --git a/DTDL/v3/spec/Requirement-ClassFieldPropertyDisplayNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassFieldPropertyDisplayNameStringLengthV3.json
index a0816fd8..ae752a2a 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldPropertyDisplayNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldPropertyDisplayNameStringLengthV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_omega;1",
+        "@id": "dtmi:example:nu_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_psi;1",
+          "@id": "dtmi:example:nu_zeta;1",
           "@type": "Object",
           "fields": {
-            "name": "beta_chi",
-            "schema": "boolean",
+            "name": "nu_epsilon",
+            "schema": "string",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_um;1",
+        "@id": "dtmi:example:nu_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_wum;1",
+          "@id": "dtmi:example:nu_iota;1",
           "@type": "Object",
           "fields": {
-            "name": "beta_yuzz",
-            "schema": "date",
+            "name": "nu_theta",
+            "schema": "time",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
@@ -51,15 +51,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_glikk;1",
+        "@id": "dtmi:example:nu_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_fuddle;1",
+          "@id": "dtmi:example:nu_mu;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "beta_humpf",
-            "schema": "dateTime",
+            "name": "nu_lambda",
+            "schema": "boolean",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldPropertyDisplayNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassFieldPropertyDisplayNameTermAndDtmiV3.json
index a7088b0c..b9cab490 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldPropertyDisplayNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldPropertyDisplayNameTermAndDtmiV3.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_delta;1",
+        "@id": "dtmi:example:nu_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_gamma;1",
+          "@id": "dtmi:example:nu_fuddle;1",
           "@type": "Object",
           "fields": {
             "displayName": [
-              "beta_hi"
+              "nu_wum"
             ],
             "dtmi:dtdl:property:displayName;3": [
-              "gamma_alpha"
+              "nu_um"
             ],
-            "name": "gamma_beta",
-            "schema": "integer"
+            "name": "nu_humpf",
+            "schema": "duration"
           }
         }
       }
@@ -34,21 +34,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_iota;1",
+        "@id": "dtmi:example:nu_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_theta;1",
+          "@id": "dtmi:example:nu_thnad;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
             "displayName": [
-              "gamma_epsilon"
+              "nu_nuh"
             ],
             "dtmi:dtdl:property:displayName;3": [
-              "gamma_zeta"
+              "nu_snee"
             ],
-            "name": "gamma_eta",
-            "schema": "long"
+            "name": "nu_quan",
+            "schema": "float"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldPropertyFormallyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Requirement-ClassFieldPropertyFormallyIrrelevantDtmiOrTermV3.json
index 95688838..8f6592b9 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldPropertyFormallyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldPropertyFormallyIrrelevantDtmiOrTermV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_epsilon;1",
+        "@id": "dtmi:example:xi_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_delta;1",
+          "@id": "dtmi:example:xi_glikk;1",
           "@type": "Object",
           "fields": {
-            "name": "delta_gamma",
-            "schema": "boolean",
+            "name": "xi_fuddle",
+            "schema": "string",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_theta;1",
+        "@id": "dtmi:example:xi_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_eta;1",
+          "@id": "dtmi:example:xi_quan;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "delta_zeta",
-            "schema": "date",
+            "name": "xi_snee",
+            "schema": "time",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -52,14 +52,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_lambda;1",
+        "@id": "dtmi:example:xi_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_kappa;1",
+          "@id": "dtmi:example:xi_floob;1",
           "@type": "Object",
           "fields": {
-            "name": "delta_iota",
-            "schema": "dateTime",
+            "name": "xi_spazz",
+            "schema": "boolean",
             "boolean": null
           }
         }
@@ -74,15 +74,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_xi;1",
+        "@id": "dtmi:example:xi_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_nu;1",
+          "@id": "dtmi:example:xi_flunn;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "delta_mu",
-            "schema": "double",
+            "name": "xi_jogg",
+            "schema": "date",
             "boolean": null
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldPropertyFormallyUndefinedTermV3.json b/DTDL/v3/spec/Requirement-ClassFieldPropertyFormallyUndefinedTermV3.json
index 368f6cc4..f4f9a163 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldPropertyFormallyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldPropertyFormallyUndefinedTermV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_spazz;1",
+        "@id": "dtmi:example:omicron_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_thnad;1",
+          "@id": "dtmi:example:omicron_rho;1",
           "@type": "Object",
           "fields": {
-            "name": "delta_quan",
-            "schema": "boolean",
+            "name": "omicron_pi",
+            "schema": "string",
             "foobar": {}
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_jogg;1",
+        "@id": "dtmi:example:omicron_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_zatz;1",
+          "@id": "dtmi:example:omicron_upsilon;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "delta_floob",
-            "schema": "date",
+            "name": "omicron_tau",
+            "schema": "time",
             "foobar": {}
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldPropertyInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassFieldPropertyInvalidDtmiV3.json
index 1ba538af..936a3819 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldPropertyInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldPropertyInvalidDtmiV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_rho;1",
+        "@id": "dtmi:example:xi_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_pi;1",
+          "@id": "dtmi:example:xi_vroo;1",
           "@type": "Object",
           "fields": {
             "@type": [
               "Field",
               "Foobar"
             ],
-            "name": "delta_omicron",
-            "schema": "duration",
+            "name": "xi_yekk",
+            "schema": "dateTime",
             "dtmi:foo//bar": 626
           }
         }
@@ -33,10 +33,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_upsilon;1",
+        "@id": "dtmi:example:omicron_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_tau;1",
+          "@id": "dtmi:example:omicron_beta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -44,8 +44,8 @@
               "Field",
               "Foobar"
             ],
-            "name": "delta_sigma",
-            "schema": "float",
+            "name": "omicron_alpha",
+            "schema": "double",
             "dtmi:foo//bar": 626
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldPropertyNamePatternV3.json b/DTDL/v3/spec/Requirement-ClassFieldPropertyNamePatternV3.json
index 55421f47..c00c0dd3 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldPropertyNamePatternV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldPropertyNamePatternV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_gamma;1",
+        "@id": "dtmi:example:snee_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_beta;1",
+          "@id": "dtmi:example:snee_xi;1",
           "@type": "Object",
           "fields": {
-            "schema": "time",
+            "schema": "double",
             "name": "EARTH"
           }
         }
@@ -28,13 +28,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_epsilon;1",
+        "@id": "dtmi:example:snee_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_delta;1",
+          "@id": "dtmi:example:snee_pi;1",
           "@type": "Object",
           "fields": {
-            "schema": "boolean",
+            "schema": "duration",
             "name": "Air"
           }
         }
@@ -49,13 +49,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_eta;1",
+        "@id": "dtmi:example:snee_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_zeta;1",
+          "@id": "dtmi:example:snee_sigma;1",
           "@type": "Object",
           "fields": {
-            "schema": "date",
+            "schema": "float",
             "name": "fire"
           }
         }
@@ -70,13 +70,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_iota;1",
+        "@id": "dtmi:example:snee_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_theta;1",
+          "@id": "dtmi:example:snee_upsilon;1",
           "@type": "Object",
           "fields": {
-            "schema": "dateTime",
+            "schema": "integer",
             "name": "hello_world"
           }
         }
@@ -91,13 +91,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_lambda;1",
+        "@id": "dtmi:example:snee_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_kappa;1",
+          "@id": "dtmi:example:snee_chi;1",
           "@type": "Object",
           "fields": {
-            "schema": "double",
+            "schema": "long",
             "name": "Anarchy99"
           }
         }
@@ -112,13 +112,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_nu;1",
+        "@id": "dtmi:example:snee_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_mu;1",
+          "@id": "dtmi:example:snee_omega;1",
           "@type": "Object",
           "fields": {
-            "schema": "duration",
+            "schema": "string",
             "name": "23skidoo"
           }
         }
@@ -133,14 +133,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_omicron;1",
+        "@id": "dtmi:example:snee_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_xi;1",
+          "@id": "dtmi:example:snee_wum;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "float",
+            "schema": "time",
             "name": "23skidoo"
           }
         }
@@ -155,13 +155,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_rho;1",
+        "@id": "dtmi:example:snee_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_pi;1",
+          "@id": "dtmi:example:snee_humpf;1",
           "@type": "Object",
           "fields": {
-            "schema": "integer",
+            "schema": "boolean",
             "name": "626"
           }
         }
@@ -176,14 +176,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_tau;1",
+        "@id": "dtmi:example:snee_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_sigma;1",
+          "@id": "dtmi:example:snee_glikk;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "long",
+            "schema": "date",
             "name": "626"
           }
         }
@@ -198,13 +198,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_phi;1",
+        "@id": "dtmi:example:snee_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_upsilon;1",
+          "@id": "dtmi:example:snee_snee;1",
           "@type": "Object",
           "fields": {
-            "schema": "string",
+            "schema": "dateTime",
             "name": "goodbye-world"
           }
         }
@@ -219,14 +219,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_psi;1",
+        "@id": "dtmi:example:snee_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_chi;1",
+          "@id": "dtmi:example:snee_thnad;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "time",
+            "schema": "double",
             "name": "goodbye-world"
           }
         }
@@ -241,13 +241,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_yuzz;1",
+        "@id": "dtmi:example:snee_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_omega;1",
+          "@id": "dtmi:example:snee_floob;1",
           "@type": "Object",
           "fields": {
-            "schema": "boolean",
+            "schema": "duration",
             "name": "_haha"
           }
         }
@@ -262,14 +262,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_um;1",
+        "@id": "dtmi:example:snee_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_wum;1",
+          "@id": "dtmi:example:snee_jogg;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "date",
+            "schema": "float",
             "name": "_haha"
           }
         }
@@ -284,13 +284,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_fuddle;1",
+        "@id": "dtmi:example:snee_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_humpf;1",
+          "@id": "dtmi:example:snee_itch;1",
           "@type": "Object",
           "fields": {
-            "schema": "dateTime",
+            "schema": "integer",
             "name": "toodaloo_"
           }
         }
@@ -305,14 +305,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_nuh;1",
+        "@id": "dtmi:example:snee_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_glikk;1",
+          "@id": "dtmi:example:snee_vroo;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "double",
+            "schema": "long",
             "name": "toodaloo_"
           }
         }
@@ -327,13 +327,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_quan;1",
+        "@id": "dtmi:example:quan_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_snee;1",
+          "@id": "dtmi:example:quan_alpha;1",
           "@type": "Object",
           "fields": {
-            "schema": "duration",
+            "schema": "string",
             "name": "pro:con"
           }
         }
@@ -348,14 +348,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_spazz;1",
+        "@id": "dtmi:example:quan_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_thnad;1",
+          "@id": "dtmi:example:quan_gamma;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "float",
+            "schema": "time",
             "name": "pro:con"
           }
         }
@@ -370,13 +370,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_zatz;1",
+        "@id": "dtmi:example:quan_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_floob;1",
+          "@id": "dtmi:example:quan_epsilon;1",
           "@type": "Object",
           "fields": {
-            "schema": "integer",
+            "schema": "boolean",
             "name": "mish/mash"
           }
         }
@@ -391,14 +391,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_flunn;1",
+        "@id": "dtmi:example:quan_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_jogg;1",
+          "@id": "dtmi:example:quan_eta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "long",
+            "schema": "date",
             "name": "mish/mash"
           }
         }
@@ -413,13 +413,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_yekk;1",
+        "@id": "dtmi:example:quan_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_itch;1",
+          "@id": "dtmi:example:quan_iota;1",
           "@type": "Object",
           "fields": {
-            "schema": "string",
+            "schema": "dateTime",
             "name": "#tag"
           }
         }
@@ -434,14 +434,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_hi;1",
+        "@id": "dtmi:example:quan_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_vroo;1",
+          "@id": "dtmi:example:quan_lambda;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "time",
+            "schema": "double",
             "name": "#tag"
           }
         }
@@ -456,13 +456,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_beta;1",
+        "@id": "dtmi:example:quan_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_alpha;1",
+          "@id": "dtmi:example:quan_nu;1",
           "@type": "Object",
           "fields": {
-            "schema": "boolean",
+            "schema": "duration",
             "name": "@tweet"
           }
         }
@@ -477,14 +477,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_delta;1",
+        "@id": "dtmi:example:quan_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_gamma;1",
+          "@id": "dtmi:example:quan_omicron;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "date",
+            "schema": "float",
             "name": "@tweet"
           }
         }
@@ -499,13 +499,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_zeta;1",
+        "@id": "dtmi:example:quan_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_epsilon;1",
+          "@id": "dtmi:example:quan_rho;1",
           "@type": "Object",
           "fields": {
-            "schema": "dateTime",
+            "schema": "integer",
             "name": "$money"
           }
         }
@@ -520,14 +520,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_theta;1",
+        "@id": "dtmi:example:quan_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_eta;1",
+          "@id": "dtmi:example:quan_tau;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "double",
+            "schema": "long",
             "name": "$money"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldPropertyNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassFieldPropertyNameStringLengthV3.json
index 216d4b06..03dcfde6 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldPropertyNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldPropertyNameStringLengthV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_itch;1",
+        "@id": "dtmi:example:snee_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_flunn;1",
+          "@id": "dtmi:example:snee_theta;1",
           "@type": "Object",
           "fields": {
-            "schema": "integer",
+            "schema": "boolean",
             "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
         }
@@ -28,13 +28,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_vroo;1",
+        "@id": "dtmi:example:snee_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_yekk;1",
+          "@id": "dtmi:example:snee_kappa;1",
           "@type": "Object",
           "fields": {
-            "schema": "long",
+            "schema": "date",
             "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
@@ -49,14 +49,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_alpha;1",
+        "@id": "dtmi:example:snee_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_hi;1",
+          "@id": "dtmi:example:snee_mu;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "string",
+            "schema": "dateTime",
             "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldPropertyNameStringV3.json b/DTDL/v3/spec/Requirement-ClassFieldPropertyNameStringV3.json
index 0bdee4c3..3ae09449 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldPropertyNameStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldPropertyNameStringV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_flunn;1",
+        "@id": "dtmi:example:nuh_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_jogg;1",
+          "@id": "dtmi:example:nuh_eta;1",
           "@type": "Object",
           "fields": {
-            "schema": "duration",
+            "schema": "string",
             "name": "hello"
           }
         }
@@ -28,13 +28,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_yekk;1",
+        "@id": "dtmi:example:nuh_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_itch;1",
+          "@id": "dtmi:example:nuh_iota;1",
           "@type": "Object",
           "fields": {
-            "schema": "float",
+            "schema": "time",
             "name": [
               "hello"
             ]
@@ -51,13 +51,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_hi;1",
+        "@id": "dtmi:example:nuh_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_vroo;1",
+          "@id": "dtmi:example:nuh_lambda;1",
           "@type": "Object",
           "fields": {
-            "schema": "integer",
+            "schema": "boolean",
             "name": {
               "@value": "hello",
               "@type": "xsd:string"
@@ -75,13 +75,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_beta;1",
+        "@id": "dtmi:example:nuh_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_alpha;1",
+          "@id": "dtmi:example:nuh_nu;1",
           "@type": "Object",
           "fields": {
-            "schema": "long",
+            "schema": "date",
             "name": [
               {
                 "@value": "hello",
@@ -101,13 +101,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_delta;1",
+        "@id": "dtmi:example:nuh_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_gamma;1",
+          "@id": "dtmi:example:nuh_omicron;1",
           "@type": "Object",
           "fields": {
-            "schema": "string",
+            "schema": "dateTime",
             "name": null
           }
         }
@@ -122,14 +122,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_zeta;1",
+        "@id": "dtmi:example:nuh_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_epsilon;1",
+          "@id": "dtmi:example:nuh_rho;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "time",
+            "schema": "double",
             "name": null
           }
         }
@@ -144,13 +144,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_theta;1",
+        "@id": "dtmi:example:nuh_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_eta;1",
+          "@id": "dtmi:example:nuh_tau;1",
           "@type": "Object",
           "fields": {
-            "schema": "boolean",
+            "schema": "duration",
             "name": true
           }
         }
@@ -165,14 +165,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_kappa;1",
+        "@id": "dtmi:example:nuh_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_iota;1",
+          "@id": "dtmi:example:nuh_phi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "date",
+            "schema": "float",
             "name": true
           }
         }
@@ -187,13 +187,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_mu;1",
+        "@id": "dtmi:example:nuh_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_lambda;1",
+          "@id": "dtmi:example:nuh_psi;1",
           "@type": "Object",
           "fields": {
-            "schema": "dateTime",
+            "schema": "integer",
             "name": 626
           }
         }
@@ -208,14 +208,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_xi;1",
+        "@id": "dtmi:example:nuh_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_nu;1",
+          "@id": "dtmi:example:nuh_yuzz;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "double",
+            "schema": "long",
             "name": 626
           }
         }
@@ -230,13 +230,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_pi;1",
+        "@id": "dtmi:example:nuh_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_omicron;1",
+          "@id": "dtmi:example:nuh_um;1",
           "@type": "Object",
           "fields": {
-            "schema": "duration",
+            "schema": "string",
             "name": [
               null
             ]
@@ -253,14 +253,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_sigma;1",
+        "@id": "dtmi:example:nuh_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_rho;1",
+          "@id": "dtmi:example:nuh_fuddle;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "float",
+            "schema": "time",
             "name": [
               null
             ]
@@ -277,13 +277,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_upsilon;1",
+        "@id": "dtmi:example:nuh_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_tau;1",
+          "@id": "dtmi:example:nuh_nuh;1",
           "@type": "Object",
           "fields": {
-            "schema": "integer",
+            "schema": "boolean",
             "name": [
               true
             ]
@@ -300,14 +300,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_chi;1",
+        "@id": "dtmi:example:nuh_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_phi;1",
+          "@id": "dtmi:example:nuh_quan;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "long",
+            "schema": "date",
             "name": [
               true
             ]
@@ -324,13 +324,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_omega;1",
+        "@id": "dtmi:example:nuh_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_psi;1",
+          "@id": "dtmi:example:nuh_spazz;1",
           "@type": "Object",
           "fields": {
-            "schema": "string",
+            "schema": "dateTime",
             "name": [
               626
             ]
@@ -347,14 +347,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_wum;1",
+        "@id": "dtmi:example:nuh_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_yuzz;1",
+          "@id": "dtmi:example:nuh_zatz;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "time",
+            "schema": "double",
             "name": [
               626
             ]
@@ -371,13 +371,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_humpf;1",
+        "@id": "dtmi:example:nuh_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_um;1",
+          "@id": "dtmi:example:nuh_flunn;1",
           "@type": "Object",
           "fields": {
-            "schema": "boolean",
+            "schema": "duration",
             "name": {}
           }
         }
@@ -392,14 +392,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_glikk;1",
+        "@id": "dtmi:example:nuh_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_fuddle;1",
+          "@id": "dtmi:example:nuh_yekk;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "date",
+            "schema": "float",
             "name": {}
           }
         }
@@ -414,13 +414,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_snee;1",
+        "@id": "dtmi:example:snee_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_nuh;1",
+          "@id": "dtmi:example:nuh_hi;1",
           "@type": "Object",
           "fields": {
-            "schema": "dateTime",
+            "schema": "integer",
             "name": [
               {}
             ]
@@ -437,14 +437,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_thnad;1",
+        "@id": "dtmi:example:snee_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_quan;1",
+          "@id": "dtmi:example:snee_beta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "double",
+            "schema": "long",
             "name": [
               {}
             ]
@@ -461,13 +461,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_floob;1",
+        "@id": "dtmi:example:snee_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_spazz;1",
+          "@id": "dtmi:example:snee_delta;1",
           "@type": "Object",
           "fields": {
-            "schema": "duration",
+            "schema": "string",
             "name": []
           }
         }
@@ -482,14 +482,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_jogg;1",
+        "@id": "dtmi:example:snee_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_zatz;1",
+          "@id": "dtmi:example:snee_zeta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "float",
+            "schema": "time",
             "name": []
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldPropertyNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassFieldPropertyNameTermAndDtmiV3.json
index f5a33a9e..70cdce8d 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldPropertyNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldPropertyNameTermAndDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_um;1",
+        "@id": "dtmi:example:quan_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_wum;1",
+          "@id": "dtmi:example:quan_jogg;1",
           "@type": "Object",
           "fields": {
-            "name": "psi_omega",
-            "dtmi:dtdl:property:name;3": "psi_yuzz",
-            "schema": "double"
+            "name": "quan_floob",
+            "dtmi:dtdl:property:name;3": "quan_zatz",
+            "schema": "long"
           }
         }
       }
@@ -29,16 +29,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_nuh;1",
+        "@id": "dtmi:example:quan_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_glikk;1",
+          "@id": "dtmi:example:quan_vroo;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "psi_humpf",
-            "dtmi:dtdl:property:name;3": "psi_fuddle",
-            "schema": "duration"
+            "name": "quan_itch",
+            "dtmi:dtdl:property:name;3": "quan_yekk",
+            "schema": "string"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldPropertyNameUniqueAmongObjectFieldsV3.json b/DTDL/v3/spec/Requirement-ClassFieldPropertyNameUniqueAmongObjectFieldsV3.json
index 253d02a1..3e7d73f4 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldPropertyNameUniqueAmongObjectFieldsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldPropertyNameUniqueAmongObjectFieldsV3.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_kappa;1",
+        "@id": "dtmi:example:quan_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_iota;1",
+          "@id": "dtmi:example:quan_phi;1",
           "@type": "Object",
           "fields": [
             {
-              "schema": "duration",
-              "name": "gamma_zeta"
+              "schema": "string",
+              "name": "gamma_lambda"
             },
             {
-              "schema": "float",
-              "name": "gamma_eta"
+              "schema": "time",
+              "name": "gamma_mu"
             }
           ]
         }
@@ -34,19 +34,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_mu;1",
+        "@id": "dtmi:example:quan_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_lambda;1",
+          "@id": "dtmi:example:quan_psi;1",
           "@type": "Object",
           "fields": [
             {
-              "schema": "integer",
-              "name": "gamma_zeta"
+              "schema": "boolean",
+              "name": "gamma_lambda"
             },
             {
-              "schema": "long",
-              "name": "gamma_zeta"
+              "schema": "date",
+              "name": "gamma_lambda"
             }
           ]
         }
@@ -61,20 +61,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_xi;1",
+        "@id": "dtmi:example:quan_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:psi_nu;1",
+          "@id": "dtmi:example:quan_yuzz;1",
           "@type": "Object",
           "fields": [
             {
-              "schema": "string",
-              "name": "gamma_zeta"
+              "schema": "dateTime",
+              "name": "gamma_lambda"
             },
             {
-              "schema": "time",
-              "name": "gamma_zeta"
+              "schema": "double",
+              "name": "gamma_lambda"
             }
           ]
         }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldPropertyNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassFieldPropertyNotDtmiNorTermV3.json
index 241db770..92a4c0a9 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldPropertyNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldPropertyNotDtmiNorTermV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_psi;1",
+        "@id": "dtmi:example:omicron_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_chi;1",
+          "@id": "dtmi:example:omicron_epsilon;1",
           "@type": "Object",
           "fields": {
             "@type": [
               "Field",
               "Foobar"
             ],
-            "name": "delta_phi",
-            "schema": "integer",
+            "name": "omicron_delta",
+            "schema": "duration",
             "http://foo.com/bar": true
           }
         }
@@ -33,10 +33,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_wum;1",
+        "@id": "dtmi:example:omicron_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_yuzz;1",
+          "@id": "dtmi:example:omicron_theta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -44,8 +44,8 @@
               "Field",
               "Foobar"
             ],
-            "name": "delta_omega",
-            "schema": "long",
+            "name": "omicron_eta",
+            "schema": "float",
             "http://foo.com/bar": true
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldPropertySchemaElementV3.json b/DTDL/v3/spec/Requirement-ClassFieldPropertySchemaElementV3.json
index 0bcb3e00..87433022 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldPropertySchemaElementV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldPropertySchemaElementV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_thnad;1",
+        "@id": "dtmi:example:thnad_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_quan",
+          "name": "thnad_beta",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "psi_snee",
+              "name": "thnad_alpha",
               "schema": {
                 "@type": "Array",
-                "elementSchema": "float"
+                "elementSchema": "time"
               }
             }
           }
@@ -34,19 +34,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_zatz;1",
+        "@id": "dtmi:example:thnad_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_floob",
+          "name": "thnad_epsilon",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "psi_spazz",
+              "name": "thnad_delta",
               "schema": [
                 {
                   "@type": "Array",
-                  "elementSchema": "integer"
+                  "elementSchema": "boolean"
                 }
               ]
             }
@@ -63,20 +63,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_jogg;1",
+        "@id": "dtmi:example:thnad_eta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Array",
-          "elementSchema": "long"
+          "elementSchema": "date"
         },
         "contents": {
           "@type": "Property",
-          "name": "psi_itch",
+          "name": "thnad_iota",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "psi_flunn",
+              "name": "thnad_theta",
               "schema": "dtmi:ex:dependentRef;1"
             }
           }
@@ -92,20 +92,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_yekk;1",
+        "@id": "dtmi:example:thnad_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Array",
-          "elementSchema": "string"
+          "elementSchema": "dateTime"
         },
         "contents": {
           "@type": "Property",
-          "name": "psi_hi",
+          "name": "thnad_mu",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "psi_vroo",
+              "name": "thnad_lambda",
               "schema": [
                 "dtmi:ex:dependentRef;1"
               ]
@@ -123,19 +123,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_delta;1",
+        "@id": "dtmi:example:thnad_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_gamma",
+          "name": "thnad_omicron",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "omega_beta",
+              "name": "thnad_xi",
               "schema": {
-                "@id": "dtmi:example:omega_alpha;1",
+                "@id": "dtmi:example:thnad_nu;1",
                 "@type": "Array",
-                "elementSchema": "time",
+                "elementSchema": "double",
                 "@context": "dtmi:dtdl:context;2"
               }
             }
@@ -152,24 +152,83 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_epsilon;1",
+        "@id": "dtmi:example:thnad_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "thnad_tau",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "thnad_sigma",
+              "schema": {
+                "@id": "dtmi:example:thnad_rho;1",
+                "@type": "Array",
+                "elementSchema": "date",
+                "@context": "dtmi:dtdl:context;4"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:thnad_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "thnad_psi",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "@context": "dtmi:undefinedExtension:context;1",
+              "name": "thnad_chi",
+              "schema": {
+                "@id": "dtmi:example:thnad_phi;1",
+                "@type": "Array",
+                "elementSchema": "dateTime",
+                "@context": "dtmi:dtdl:context;4"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:thnad_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Array",
-          "elementSchema": "date"
+          "elementSchema": "long"
         },
         "contents": {
           "@type": "Property",
-          "name": "omega_eta",
+          "name": "thnad_um",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "omega_zeta",
+              "name": "thnad_wum",
               "schema": [
                 {
                   "@type": "Array",
-                  "elementSchema": "boolean"
+                  "elementSchema": "integer"
                 },
                 "dtmi:ex:dependentRef;1"
               ]
@@ -187,25 +246,25 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_theta;1",
+        "@id": "dtmi:example:thnad_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Array",
-          "elementSchema": "double"
+          "elementSchema": "time"
         },
         "contents": {
           "@type": "Property",
-          "name": "omega_kappa",
+          "name": "thnad_glikk",
           "schema": {
             "@type": "Object",
             "fields": {
               "@context": "dtmi:undefinedExtension:context;1",
-              "name": "omega_iota",
+              "name": "thnad_fuddle",
               "schema": [
                 {
                   "@type": "Array",
-                  "elementSchema": "dateTime"
+                  "elementSchema": "string"
                 },
                 "dtmi:ex:dependentRef;1"
               ]
@@ -223,13 +282,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_nu;1",
+        "@id": "dtmi:example:thnad_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_mu;1",
+          "@id": "dtmi:example:thnad_snee;1",
           "@type": "Object",
           "fields": {
-            "name": "omega_lambda",
+            "name": "thnad_nuh",
             "schema": "integer"
           }
         }
@@ -244,13 +303,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_pi;1",
+        "@id": "dtmi:example:thnad_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_omicron;1",
+          "@id": "dtmi:example:thnad_spazz;1",
           "@type": "Object",
           "fields": {
-            "name": "omega_xi",
+            "name": "thnad_thnad",
             "schema": [
               "integer"
             ]
@@ -267,13 +326,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_tau;1",
+        "@id": "dtmi:example:thnad_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_sigma;1",
+          "@id": "dtmi:example:thnad_jogg;1",
           "@type": "Object",
           "fields": {
-            "name": "omega_rho",
+            "name": "thnad_zatz",
             "schema": "dtmi:dtdl:instance:Schema:integer;3"
           }
         }
@@ -288,13 +347,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_chi;1",
+        "@id": "dtmi:example:thnad_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_phi;1",
+          "@id": "dtmi:example:thnad_yekk;1",
           "@type": "Object",
           "fields": {
-            "name": "omega_upsilon",
+            "name": "thnad_itch",
             "schema": [
               "dtmi:dtdl:instance:Schema:integer;3"
             ]
@@ -311,13 +370,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_yuzz;1",
+        "@id": "dtmi:example:spazz_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_omega;1",
+          "@id": "dtmi:example:spazz_alpha;1",
           "@type": "Object",
           "fields": {
-            "name": "omega_psi",
+            "name": "thnad_hi",
             "schema": "point"
           }
         }
@@ -332,13 +391,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_humpf;1",
+        "@id": "dtmi:example:spazz_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_um;1",
+          "@id": "dtmi:example:spazz_delta;1",
           "@type": "Object",
           "fields": {
-            "name": "omega_wum",
+            "name": "spazz_gamma",
             "schema": [
               "point"
             ]
@@ -355,13 +414,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_nuh;1",
+        "@id": "dtmi:example:spazz_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_glikk;1",
+          "@id": "dtmi:example:spazz_eta;1",
           "@type": "Object",
           "fields": {
-            "name": "omega_fuddle",
+            "name": "spazz_zeta",
             "schema": "dtmi:standard:schema:geospatial:point;3"
           }
         }
@@ -376,13 +435,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_thnad;1",
+        "@id": "dtmi:example:spazz_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_quan;1",
+          "@id": "dtmi:example:spazz_kappa;1",
           "@type": "Object",
           "fields": {
-            "name": "omega_snee",
+            "name": "spazz_iota",
             "schema": [
               "dtmi:standard:schema:geospatial:point;3"
             ]
@@ -399,13 +458,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_zatz;1",
+        "@id": "dtmi:example:spazz_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_floob;1",
+          "@id": "dtmi:example:spazz_nu;1",
           "@type": "Object",
           "fields": {
-            "name": "omega_spazz",
+            "name": "spazz_mu",
             "schema": "Foobar"
           }
         }
@@ -420,14 +479,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_itch;1",
+        "@id": "dtmi:example:spazz_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_flunn;1",
+          "@id": "dtmi:example:spazz_pi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omega_jogg",
+            "name": "spazz_omicron",
             "schema": "Foobar"
           }
         }
@@ -442,13 +501,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_hi;1",
+        "@id": "dtmi:example:spazz_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_vroo;1",
+          "@id": "dtmi:example:spazz_tau;1",
           "@type": "Object",
           "fields": {
-            "name": "omega_yekk",
+            "name": "spazz_sigma",
             "schema": null
           }
         }
@@ -463,14 +522,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_gamma;1",
+        "@id": "dtmi:example:spazz_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_beta;1",
+          "@id": "dtmi:example:spazz_chi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yuzz_alpha",
+            "name": "spazz_phi",
             "schema": null
           }
         }
@@ -485,13 +544,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_zeta;1",
+        "@id": "dtmi:example:spazz_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_epsilon;1",
+          "@id": "dtmi:example:spazz_yuzz;1",
           "@type": "Object",
           "fields": {
-            "name": "yuzz_delta",
+            "name": "spazz_omega",
             "schema": true
           }
         }
@@ -506,14 +565,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_iota;1",
+        "@id": "dtmi:example:spazz_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_theta;1",
+          "@id": "dtmi:example:spazz_humpf;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yuzz_eta",
+            "name": "spazz_um",
             "schema": true
           }
         }
@@ -528,13 +587,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_mu;1",
+        "@id": "dtmi:example:spazz_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_lambda;1",
+          "@id": "dtmi:example:spazz_nuh;1",
           "@type": "Object",
           "fields": {
-            "name": "yuzz_kappa",
+            "name": "spazz_glikk",
             "schema": 626
           }
         }
@@ -549,14 +608,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_omicron;1",
+        "@id": "dtmi:example:spazz_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_xi;1",
+          "@id": "dtmi:example:spazz_thnad;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yuzz_nu",
+            "name": "spazz_quan",
             "schema": 626
           }
         }
@@ -571,13 +630,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_sigma;1",
+        "@id": "dtmi:example:spazz_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_rho;1",
+          "@id": "dtmi:example:spazz_zatz;1",
           "@type": "Object",
           "fields": {
-            "name": "yuzz_pi",
+            "name": "spazz_floob",
             "schema": [
               null
             ]
@@ -594,14 +653,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_phi;1",
+        "@id": "dtmi:example:spazz_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_upsilon;1",
+          "@id": "dtmi:example:spazz_itch;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yuzz_tau",
+            "name": "spazz_flunn",
             "schema": [
               null
             ]
@@ -618,13 +677,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_omega;1",
+        "@id": "dtmi:example:floob_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_psi;1",
+          "@id": "dtmi:example:spazz_hi;1",
           "@type": "Object",
           "fields": {
-            "name": "yuzz_chi",
+            "name": "spazz_vroo",
             "schema": [
               true
             ]
@@ -641,14 +700,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_um;1",
+        "@id": "dtmi:example:floob_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_wum;1",
+          "@id": "dtmi:example:floob_gamma;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yuzz_yuzz",
+            "name": "floob_beta",
             "schema": [
               true
             ]
@@ -665,13 +724,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_glikk;1",
+        "@id": "dtmi:example:floob_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_fuddle;1",
+          "@id": "dtmi:example:floob_zeta;1",
           "@type": "Object",
           "fields": {
-            "name": "yuzz_humpf",
+            "name": "floob_epsilon",
             "schema": [
               626
             ]
@@ -688,14 +747,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_quan;1",
+        "@id": "dtmi:example:floob_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_snee;1",
+          "@id": "dtmi:example:floob_iota;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yuzz_nuh",
+            "name": "floob_theta",
             "schema": [
               626
             ]
@@ -712,13 +771,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_floob;1",
+        "@id": "dtmi:example:floob_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_spazz;1",
+          "@id": "dtmi:example:floob_mu;1",
           "@type": "Object",
           "fields": {
-            "name": "yuzz_thnad",
+            "name": "floob_lambda",
             "schema": {}
           }
         }
@@ -733,14 +792,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_flunn;1",
+        "@id": "dtmi:example:floob_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_jogg;1",
+          "@id": "dtmi:example:floob_omicron;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yuzz_zatz",
+            "name": "floob_xi",
             "schema": {}
           }
         }
@@ -755,13 +814,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_vroo;1",
+        "@id": "dtmi:example:floob_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_yekk;1",
+          "@id": "dtmi:example:floob_sigma;1",
           "@type": "Object",
           "fields": {
-            "name": "yuzz_itch",
+            "name": "floob_rho",
             "schema": [
               {}
             ]
@@ -778,14 +837,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_beta;1",
+        "@id": "dtmi:example:floob_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_alpha;1",
+          "@id": "dtmi:example:floob_phi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yuzz_hi",
+            "name": "floob_upsilon",
             "schema": [
               {}
             ]
@@ -802,13 +861,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_epsilon;1",
+        "@id": "dtmi:example:floob_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_delta;1",
+          "@id": "dtmi:example:floob_omega;1",
           "@type": "Object",
           "fields": {
-            "name": "wum_gamma",
+            "name": "floob_psi",
             "schema": []
           }
         }
@@ -823,14 +882,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_theta;1",
+        "@id": "dtmi:example:floob_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_eta;1",
+          "@id": "dtmi:example:floob_um;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "wum_zeta",
+            "name": "floob_wum",
             "schema": []
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldPropertySchemaTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassFieldPropertySchemaTermAndDtmiV3.json
index 35a7dff6..712e6ced 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldPropertySchemaTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldPropertySchemaTermAndDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_delta;1",
+        "@id": "dtmi:example:itch_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_gamma;1",
+          "@id": "dtmi:example:itch_psi;1",
           "@type": "Object",
           "fields": {
-            "name": "glikk_beta",
-            "schema": "date",
-            "dtmi:dtdl:property:schema;3": "dateTime"
+            "name": "itch_chi",
+            "schema": "long",
+            "dtmi:dtdl:property:schema;3": "string"
           }
         }
       }
@@ -29,16 +29,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_eta;1",
+        "@id": "dtmi:example:itch_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_zeta;1",
+          "@id": "dtmi:example:itch_wum;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "glikk_epsilon",
-            "schema": "double",
-            "dtmi:dtdl:property:schema;3": "duration"
+            "name": "itch_yuzz",
+            "schema": "time",
+            "dtmi:dtdl:property:schema;3": "boolean"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldPropertySchemaTypeConformanceV3.json b/DTDL/v3/spec/Requirement-ClassFieldPropertySchemaTypeConformanceV3.json
index c2e18720..96283fc0 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldPropertySchemaTypeConformanceV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldPropertySchemaTypeConformanceV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_sigma;1",
+        "@id": "dtmi:example:floob_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_rho;1",
+          "@id": "dtmi:example:floob_zatz;1",
           "@type": "Object",
           "fields": {
-            "name": "wum_pi",
+            "name": "floob_floob",
             "schema": {
-              "@id": "dtmi:example:wum_omicron;1",
-              "elementSchema": "duration",
+              "@id": "dtmi:example:floob_spazz;1",
+              "elementSchema": "boolean",
               "@type": "Array"
             }
           }
@@ -32,16 +32,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_psi;1",
+        "@id": "dtmi:example:floob_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_chi;1",
+          "@id": "dtmi:example:floob_vroo;1",
           "@type": "Object",
           "fields": {
-            "name": "wum_phi",
+            "name": "floob_yekk",
             "schema": {
-              "@id": "dtmi:example:wum_tau;1",
-              "name": "wum_upsilon",
+              "@id": "dtmi:example:floob_flunn;1",
+              "name": "floob_itch",
               "@type": "Command"
             }
           }
@@ -57,17 +57,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_humpf;1",
+        "@id": "dtmi:example:zatz_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_um;1",
+          "@id": "dtmi:example:zatz_delta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "wum_wum",
+            "name": "zatz_gamma",
             "schema": {
-              "@id": "dtmi:example:wum_omega;1",
-              "name": "wum_yuzz",
+              "@id": "dtmi:example:zatz_alpha;1",
+              "name": "zatz_beta",
               "@type": "Command"
             }
           }
@@ -83,17 +83,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_quan;1",
+        "@id": "dtmi:example:zatz_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_snee;1",
+          "@id": "dtmi:example:zatz_iota;1",
           "@type": "Object",
           "fields": {
-            "name": "wum_nuh",
+            "name": "zatz_theta",
             "schema": {
-              "@id": "dtmi:example:wum_fuddle;1",
-              "name": "wum_glikk",
-              "schema": "float",
+              "@id": "dtmi:example:zatz_zeta;1",
+              "name": "zatz_eta",
+              "schema": "date",
               "@type": "CommandRequest"
             }
           }
@@ -109,18 +109,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_jogg;1",
+        "@id": "dtmi:example:zatz_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_zatz;1",
+          "@id": "dtmi:example:zatz_xi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "wum_floob",
+            "name": "zatz_nu",
             "schema": {
-              "@id": "dtmi:example:wum_thnad;1",
-              "name": "wum_spazz",
-              "schema": "integer",
+              "@id": "dtmi:example:zatz_lambda;1",
+              "name": "zatz_mu",
+              "schema": "dateTime",
               "@type": "CommandRequest"
             }
           }
@@ -136,17 +136,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_hi;1",
+        "@id": "dtmi:example:zatz_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_vroo;1",
+          "@id": "dtmi:example:zatz_tau;1",
           "@type": "Object",
           "fields": {
-            "name": "wum_yekk",
+            "name": "zatz_sigma",
             "schema": {
-              "@id": "dtmi:example:wum_flunn;1",
-              "name": "wum_itch",
-              "schema": "long",
+              "@id": "dtmi:example:zatz_pi;1",
+              "name": "zatz_rho",
+              "schema": "double",
               "@type": "CommandResponse"
             }
           }
@@ -162,18 +162,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_epsilon;1",
+        "@id": "dtmi:example:zatz_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_delta;1",
+          "@id": "dtmi:example:zatz_omega;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "um_gamma",
+            "name": "zatz_psi",
             "schema": {
-              "@id": "dtmi:example:um_alpha;1",
-              "name": "um_beta",
-              "schema": "string",
+              "@id": "dtmi:example:zatz_phi;1",
+              "name": "zatz_chi",
+              "schema": "duration",
               "@type": "CommandResponse"
             }
           }
@@ -189,18 +189,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_lambda;1",
+        "@id": "dtmi:example:zatz_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_kappa;1",
+          "@id": "dtmi:example:zatz_glikk;1",
           "@type": "Object",
           "fields": {
-            "name": "um_iota",
+            "name": "zatz_fuddle",
             "schema": {
-              "@id": "dtmi:example:um_zeta;1",
-              "name": "um_eta",
+              "@id": "dtmi:example:zatz_wum;1",
+              "name": "zatz_um",
               "schema": {
-                "@id": "dtmi:example:um_theta;1",
+                "@id": "dtmi:example:zatz_humpf;1",
                 "@type": "Interface"
               },
               "@type": "Component"
@@ -218,19 +218,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_rho;1",
+        "@id": "dtmi:example:zatz_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_pi;1",
+          "@id": "dtmi:example:zatz_floob;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "um_omicron",
+            "name": "zatz_spazz",
             "schema": {
-              "@id": "dtmi:example:um_mu;1",
-              "name": "um_nu",
+              "@id": "dtmi:example:zatz_snee;1",
+              "name": "zatz_quan",
               "schema": {
-                "@id": "dtmi:example:um_xi;1",
+                "@id": "dtmi:example:zatz_thnad;1",
                 "@type": "Interface"
               },
               "@type": "Component"
@@ -248,15 +248,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_phi;1",
+        "@id": "dtmi:example:zatz_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_upsilon;1",
+          "@id": "dtmi:example:zatz_itch;1",
           "@type": "Object",
           "fields": {
-            "name": "um_tau",
+            "name": "zatz_flunn",
             "schema": {
-              "@id": "dtmi:example:um_sigma;1",
+              "@id": "dtmi:example:zatz_jogg;1",
               "valueSchema": "integer",
               "@type": "Enum"
             }
@@ -273,17 +273,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_wum;1",
+        "@id": "dtmi:example:jogg_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_yuzz;1",
+          "@id": "dtmi:example:jogg_beta;1",
           "@type": "Object",
           "fields": {
-            "name": "um_omega",
+            "name": "jogg_alpha",
             "schema": {
-              "@id": "dtmi:example:um_chi;1",
-              "enumValue": 1452,
-              "name": "um_psi",
+              "@id": "dtmi:example:zatz_vroo;1",
+              "enumValue": 1469,
+              "name": "zatz_hi",
               "@type": "EnumValue"
             }
           }
@@ -299,18 +299,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_nuh;1",
+        "@id": "dtmi:example:jogg_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_glikk;1",
+          "@id": "dtmi:example:jogg_eta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "um_fuddle",
+            "name": "jogg_zeta",
             "schema": {
-              "@id": "dtmi:example:um_um;1",
-              "enumValue": 1453,
-              "name": "um_humpf",
+              "@id": "dtmi:example:jogg_delta;1",
+              "enumValue": 1470,
+              "name": "jogg_epsilon",
               "@type": "EnumValue"
             }
           }
@@ -326,17 +326,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_floob;1",
+        "@id": "dtmi:example:jogg_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_spazz;1",
+          "@id": "dtmi:example:jogg_mu;1",
           "@type": "Object",
           "fields": {
-            "name": "um_thnad",
+            "name": "jogg_lambda",
             "schema": {
-              "@id": "dtmi:example:um_snee;1",
-              "name": "um_quan",
-              "schema": "time",
+              "@id": "dtmi:example:jogg_iota;1",
+              "name": "jogg_kappa",
+              "schema": "float",
               "@type": "Field"
             }
           }
@@ -352,18 +352,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_yekk;1",
+        "@id": "dtmi:example:jogg_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_itch;1",
+          "@id": "dtmi:example:jogg_rho;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "um_flunn",
+            "name": "jogg_pi",
             "schema": {
-              "@id": "dtmi:example:um_zatz;1",
-              "name": "um_jogg",
-              "schema": "boolean",
+              "@id": "dtmi:example:jogg_xi;1",
+              "name": "jogg_omicron",
+              "schema": "integer",
               "@type": "Field"
             }
           }
@@ -379,15 +379,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_beta;1",
+        "@id": "dtmi:example:jogg_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_alpha;1",
+          "@id": "dtmi:example:jogg_phi;1",
           "@type": "Object",
           "fields": {
-            "name": "um_hi",
+            "name": "jogg_upsilon",
             "schema": {
-              "@id": "dtmi:example:um_vroo;1",
+              "@id": "dtmi:example:jogg_tau;1",
               "@type": "Interface"
             }
           }
@@ -403,16 +403,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_zeta;1",
+        "@id": "dtmi:example:jogg_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_epsilon;1",
+          "@id": "dtmi:example:jogg_yuzz;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "humpf_delta",
+            "name": "jogg_omega",
             "schema": {
-              "@id": "dtmi:example:humpf_gamma;1",
+              "@id": "dtmi:example:jogg_psi;1",
               "@type": "Interface"
             }
           }
@@ -428,22 +428,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_mu;1",
+        "@id": "dtmi:example:jogg_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_lambda;1",
+          "@id": "dtmi:example:jogg_nuh;1",
           "@type": "Object",
           "fields": {
-            "name": "humpf_kappa",
+            "name": "jogg_glikk",
             "schema": {
-              "@id": "dtmi:example:humpf_eta;1",
+              "@id": "dtmi:example:jogg_um;1",
               "mapKey": {
-                "name": "humpf_theta",
+                "name": "jogg_humpf",
                 "schema": "string"
               },
               "mapValue": {
-                "name": "humpf_iota",
-                "schema": "date"
+                "name": "jogg_fuddle",
+                "schema": "long"
               },
               "@type": "Map"
             }
@@ -460,16 +460,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_rho;1",
+        "@id": "dtmi:example:jogg_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_pi;1",
+          "@id": "dtmi:example:jogg_floob;1",
           "@type": "Object",
           "fields": {
-            "name": "humpf_omicron",
+            "name": "jogg_spazz",
             "schema": {
-              "@id": "dtmi:example:humpf_nu;1",
-              "name": "humpf_xi",
+              "@id": "dtmi:example:jogg_quan;1",
+              "name": "jogg_thnad",
               "schema": "string",
               "@type": "MapKey"
             }
@@ -486,17 +486,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_chi;1",
+        "@id": "dtmi:example:jogg_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_phi;1",
+          "@id": "dtmi:example:jogg_yekk;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "humpf_upsilon",
+            "name": "jogg_itch",
             "schema": {
-              "@id": "dtmi:example:humpf_sigma;1",
-              "name": "humpf_tau",
+              "@id": "dtmi:example:jogg_jogg;1",
+              "name": "jogg_flunn",
               "schema": "string",
               "@type": "MapKey"
             }
@@ -513,17 +513,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_um;1",
+        "@id": "dtmi:example:flunn_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_wum;1",
+          "@id": "dtmi:example:flunn_gamma;1",
           "@type": "Object",
           "fields": {
-            "name": "humpf_yuzz",
+            "name": "flunn_beta",
             "schema": {
-              "@id": "dtmi:example:humpf_psi;1",
-              "name": "humpf_omega",
-              "schema": "dateTime",
+              "@id": "dtmi:example:jogg_hi;1",
+              "name": "flunn_alpha",
+              "schema": "string",
               "@type": "MapValue"
             }
           }
@@ -539,18 +539,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_snee;1",
+        "@id": "dtmi:example:flunn_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_nuh;1",
+          "@id": "dtmi:example:flunn_theta;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "humpf_glikk",
+            "name": "flunn_eta",
             "schema": {
-              "@id": "dtmi:example:humpf_humpf;1",
-              "name": "humpf_fuddle",
-              "schema": "double",
+              "@id": "dtmi:example:flunn_epsilon;1",
+              "name": "flunn_zeta",
+              "schema": "time",
               "@type": "MapValue"
             }
           }
@@ -566,15 +566,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_floob;1",
+        "@id": "dtmi:example:flunn_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_spazz;1",
+          "@id": "dtmi:example:flunn_mu;1",
           "@type": "Object",
           "fields": {
-            "name": "humpf_thnad",
+            "name": "flunn_lambda",
             "schema": {
-              "@id": "dtmi:example:humpf_quan;1",
+              "@id": "dtmi:example:flunn_kappa;1",
               "@type": "Object"
             }
           }
@@ -590,17 +590,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_yekk;1",
+        "@id": "dtmi:example:flunn_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_itch;1",
+          "@id": "dtmi:example:flunn_rho;1",
           "@type": "Object",
           "fields": {
-            "name": "humpf_flunn",
+            "name": "flunn_pi",
             "schema": {
-              "@id": "dtmi:example:humpf_zatz;1",
-              "name": "humpf_jogg",
-              "schema": "duration",
+              "@id": "dtmi:example:flunn_xi;1",
+              "name": "flunn_omicron",
+              "schema": "boolean",
               "@type": "Property"
             }
           }
@@ -616,18 +616,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_gamma;1",
+        "@id": "dtmi:example:flunn_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_beta;1",
+          "@id": "dtmi:example:flunn_chi;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "fuddle_alpha",
+            "name": "flunn_phi",
             "schema": {
-              "@id": "dtmi:example:humpf_vroo;1",
-              "name": "humpf_hi",
-              "schema": "float",
+              "@id": "dtmi:example:flunn_tau;1",
+              "name": "flunn_upsilon",
+              "schema": "date",
               "@type": "Property"
             }
           }
@@ -643,16 +643,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_theta;1",
+        "@id": "dtmi:example:flunn_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_eta;1",
+          "@id": "dtmi:example:flunn_um;1",
           "@type": "Object",
           "fields": {
-            "name": "fuddle_zeta",
+            "name": "flunn_wum",
             "schema": {
-              "@id": "dtmi:example:fuddle_delta;1",
-              "name": "fuddle_epsilon",
+              "@id": "dtmi:example:flunn_omega;1",
+              "name": "flunn_yuzz",
               "@type": "Relationship"
             }
           }
@@ -668,17 +668,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_nu;1",
+        "@id": "dtmi:example:flunn_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_mu;1",
+          "@id": "dtmi:example:flunn_snee;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "fuddle_lambda",
+            "name": "flunn_nuh",
             "schema": {
-              "@id": "dtmi:example:fuddle_iota;1",
-              "name": "fuddle_kappa",
+              "@id": "dtmi:example:flunn_fuddle;1",
+              "name": "flunn_glikk",
               "@type": "Relationship"
             }
           }
@@ -694,17 +694,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_sigma;1",
+        "@id": "dtmi:example:flunn_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_rho;1",
+          "@id": "dtmi:example:flunn_zatz;1",
           "@type": "Object",
           "fields": {
-            "name": "fuddle_pi",
+            "name": "flunn_floob",
             "schema": {
-              "@id": "dtmi:example:fuddle_xi;1",
-              "name": "fuddle_omicron",
-              "schema": "integer",
+              "@id": "dtmi:example:flunn_thnad;1",
+              "name": "flunn_spazz",
+              "schema": "dateTime",
               "@type": "Telemetry"
             }
           }
@@ -720,18 +720,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_psi;1",
+        "@id": "dtmi:example:flunn_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_chi;1",
+          "@id": "dtmi:example:flunn_vroo;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "fuddle_phi",
+            "name": "flunn_yekk",
             "schema": {
-              "@id": "dtmi:example:fuddle_tau;1",
-              "name": "fuddle_upsilon",
-              "schema": "long",
+              "@id": "dtmi:example:flunn_flunn;1",
+              "name": "flunn_itch",
+              "schema": "double",
               "@type": "Telemetry"
             }
           }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldRequiredPropertiesV3.json b/DTDL/v3/spec/Requirement-ClassFieldRequiredPropertiesV3.json
index 3cca5123..b0dcdec0 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldRequiredPropertiesV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldRequiredPropertiesV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_fuddle;1",
+        "@id": "dtmi:example:glikk_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_humpf;1",
+          "@id": "dtmi:example:glikk_itch;1",
           "@type": "Object",
           "fields": {
-            "schema": "dateTime"
+            "schema": "integer"
           }
         }
       }
@@ -27,14 +27,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_nuh;1",
+        "@id": "dtmi:example:glikk_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_glikk;1",
+          "@id": "dtmi:example:glikk_vroo;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "double"
+            "schema": "long"
           }
         }
       }
@@ -48,13 +48,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_thnad;1",
+        "@id": "dtmi:example:nuh_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_quan;1",
+          "@id": "dtmi:example:nuh_beta;1",
           "@type": "Object",
           "fields": {
-            "name": "upsilon_snee"
+            "name": "nuh_alpha"
           }
         }
       }
@@ -68,14 +68,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_zatz;1",
+        "@id": "dtmi:example:nuh_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_floob;1",
+          "@id": "dtmi:example:nuh_epsilon;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "upsilon_spazz"
+            "name": "nuh_delta"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldTypeIncludesInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassFieldTypeIncludesInvalidDtmiV3.json
index 6868c073..5fdd0a19 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldTypeIncludesInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldTypeIncludesInvalidDtmiV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_itch;1",
+        "@id": "dtmi:example:alpha_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_flunn;1",
+          "@id": "dtmi:example:alpha_chi;1",
           "@type": "Object",
           "fields": {
             "@type": [
               "Field",
               "dtmi:foo//bar"
             ],
-            "name": "quan_jogg",
-            "schema": "string"
+            "name": "alpha_phi",
+            "schema": "integer"
           }
         }
       }
@@ -32,10 +32,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_hi;1",
+        "@id": "dtmi:example:alpha_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_vroo;1",
+          "@id": "dtmi:example:alpha_yuzz;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -43,8 +43,8 @@
               "Field",
               "dtmi:foo//bar"
             ],
-            "name": "quan_yekk",
-            "schema": "time"
+            "name": "alpha_omega",
+            "schema": "long"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldTypeIncludesMaterialV3.json b/DTDL/v3/spec/Requirement-ClassFieldTypeIncludesMaterialV3.json
index c61f2383..09468bc0 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldTypeIncludesMaterialV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldTypeIncludesMaterialV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_snee;1",
+        "@id": "dtmi:example:hi_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_nuh;1",
+          "@id": "dtmi:example:hi_xi;1",
           "@type": "Object",
           "fields": {
-            "name": "snee_glikk",
-            "schema": "date",
+            "name": "hi_nu",
+            "schema": "time",
             "@type": "Field"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_spazz;1",
+        "@id": "dtmi:example:hi_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_thnad;1",
+          "@id": "dtmi:example:hi_rho;1",
           "@type": "Object",
           "fields": {
-            "name": "snee_quan",
-            "schema": "dateTime",
+            "name": "hi_pi",
+            "schema": "boolean",
             "@type": [
               "Field"
             ]
@@ -53,14 +53,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_jogg;1",
+        "@id": "dtmi:example:hi_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_zatz;1",
+          "@id": "dtmi:example:hi_upsilon;1",
           "@type": "Object",
           "fields": {
-            "name": "snee_floob",
-            "schema": "double",
+            "name": "hi_tau",
+            "schema": "date",
             "@type": "dtmi:dtdl:class:Field;3"
           }
         }
@@ -75,14 +75,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_yekk;1",
+        "@id": "dtmi:example:hi_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_itch;1",
+          "@id": "dtmi:example:hi_psi;1",
           "@type": "Object",
           "fields": {
-            "name": "snee_flunn",
-            "schema": "duration",
+            "name": "hi_chi",
+            "schema": "dateTime",
             "@type": [
               "dtmi:dtdl:class:Field;3"
             ]
@@ -99,14 +99,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_alpha;1",
+        "@id": "dtmi:example:hi_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_hi;1",
+          "@id": "dtmi:example:hi_wum;1",
           "@type": "Object",
           "fields": {
-            "name": "snee_vroo",
-            "schema": "float",
+            "name": "hi_yuzz",
+            "schema": "double",
             "@type": "Something"
           }
         }
@@ -121,15 +121,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_delta;1",
+        "@id": "dtmi:example:hi_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_gamma;1",
+          "@id": "dtmi:example:hi_fuddle;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "quan_beta",
-            "schema": "integer",
+            "name": "hi_humpf",
+            "schema": "duration",
             "@type": "Something"
           }
         }
@@ -144,14 +144,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_eta;1",
+        "@id": "dtmi:example:hi_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_zeta;1",
+          "@id": "dtmi:example:hi_snee;1",
           "@type": "Object",
           "fields": {
-            "name": "quan_epsilon",
-            "schema": "long",
+            "name": "hi_nuh",
+            "schema": "float",
             "@type": [
               "Something"
             ]
@@ -168,15 +168,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_kappa;1",
+        "@id": "dtmi:example:hi_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_iota;1",
+          "@id": "dtmi:example:hi_spazz;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "quan_theta",
-            "schema": "string",
+            "name": "hi_thnad",
+            "schema": "integer",
             "@type": [
               "Something"
             ]
diff --git a/DTDL/v3/spec/Requirement-ClassFieldTypeIncludesNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassFieldTypeIncludesNotDtmiNorTermV3.json
index bf00a15a..a5470010 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldTypeIncludesNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldTypeIncludesNotDtmiNorTermV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_gamma;1",
+        "@id": "dtmi:example:alpha_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_beta;1",
+          "@id": "dtmi:example:alpha_humpf;1",
           "@type": "Object",
           "fields": {
             "@type": [
               "Field",
               "http://foo.com/bar"
             ],
-            "name": "thnad_alpha",
-            "schema": "boolean"
+            "name": "alpha_um",
+            "schema": "string"
           }
         }
       }
@@ -32,10 +32,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_zeta;1",
+        "@id": "dtmi:example:alpha_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_epsilon;1",
+          "@id": "dtmi:example:alpha_nuh;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -43,8 +43,8 @@
               "Field",
               "http://foo.com/bar"
             ],
-            "name": "thnad_delta",
-            "schema": "date"
+            "name": "alpha_glikk",
+            "schema": "time"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassFieldTypeStringOrArrayV3.json b/DTDL/v3/spec/Requirement-ClassFieldTypeStringOrArrayV3.json
index 270ec324..f8b94612 100644
--- a/DTDL/v3/spec/Requirement-ClassFieldTypeStringOrArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassFieldTypeStringOrArrayV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_um;1",
+        "@id": "dtmi:example:vroo_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_wum;1",
+          "@id": "dtmi:example:vroo_iota;1",
           "@type": "Object",
           "fields": {
-            "name": "nuh_yuzz",
-            "schema": "float",
+            "name": "vroo_theta",
+            "schema": "double",
             "@type": 626
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_glikk;1",
+        "@id": "dtmi:example:vroo_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_fuddle;1",
+          "@id": "dtmi:example:vroo_mu;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nuh_humpf",
-            "schema": "integer",
+            "name": "vroo_lambda",
+            "schema": "duration",
             "@type": 626
           }
         }
@@ -52,14 +52,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_quan;1",
+        "@id": "dtmi:example:vroo_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_snee;1",
+          "@id": "dtmi:example:vroo_omicron;1",
           "@type": "Object",
           "fields": {
-            "name": "nuh_nuh",
-            "schema": "long",
+            "name": "vroo_xi",
+            "schema": "float",
             "@type": null
           }
         }
@@ -74,15 +74,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_floob;1",
+        "@id": "dtmi:example:vroo_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_spazz;1",
+          "@id": "dtmi:example:vroo_sigma;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nuh_thnad",
-            "schema": "string",
+            "name": "vroo_rho",
+            "schema": "integer",
             "@type": null
           }
         }
@@ -97,14 +97,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_flunn;1",
+        "@id": "dtmi:example:vroo_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_jogg;1",
+          "@id": "dtmi:example:vroo_phi;1",
           "@type": "Object",
           "fields": {
-            "name": "nuh_zatz",
-            "schema": "time",
+            "name": "vroo_upsilon",
+            "schema": "long",
             "@type": true
           }
         }
@@ -119,15 +119,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_vroo;1",
+        "@id": "dtmi:example:vroo_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_yekk;1",
+          "@id": "dtmi:example:vroo_omega;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nuh_itch",
-            "schema": "boolean",
+            "name": "vroo_psi",
+            "schema": "string",
             "@type": true
           }
         }
@@ -142,14 +142,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_beta;1",
+        "@id": "dtmi:example:vroo_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_alpha;1",
+          "@id": "dtmi:example:vroo_um;1",
           "@type": "Object",
           "fields": {
-            "name": "nuh_hi",
-            "schema": "date",
+            "name": "vroo_wum",
+            "schema": "time",
             "@type": {}
           }
         }
@@ -164,15 +164,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_epsilon;1",
+        "@id": "dtmi:example:vroo_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_delta;1",
+          "@id": "dtmi:example:vroo_glikk;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "snee_gamma",
-            "schema": "dateTime",
+            "name": "vroo_fuddle",
+            "schema": "boolean",
             "@type": {}
           }
         }
@@ -187,14 +187,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_theta;1",
+        "@id": "dtmi:example:vroo_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_eta;1",
+          "@id": "dtmi:example:vroo_quan;1",
           "@type": "Object",
           "fields": {
-            "name": "snee_zeta",
-            "schema": "double",
+            "name": "vroo_snee",
+            "schema": "date",
             "@type": [
               626
             ]
@@ -211,15 +211,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_lambda;1",
+        "@id": "dtmi:example:vroo_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_kappa;1",
+          "@id": "dtmi:example:vroo_floob;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "snee_iota",
-            "schema": "duration",
+            "name": "vroo_spazz",
+            "schema": "dateTime",
             "@type": [
               626
             ]
@@ -236,14 +236,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_xi;1",
+        "@id": "dtmi:example:vroo_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_nu;1",
+          "@id": "dtmi:example:vroo_flunn;1",
           "@type": "Object",
           "fields": {
-            "name": "snee_mu",
-            "schema": "float",
+            "name": "vroo_jogg",
+            "schema": "double",
             "@type": [
               null
             ]
@@ -260,15 +260,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_rho;1",
+        "@id": "dtmi:example:vroo_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_pi;1",
+          "@id": "dtmi:example:vroo_vroo;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "snee_omicron",
-            "schema": "integer",
+            "name": "vroo_yekk",
+            "schema": "duration",
             "@type": [
               null
             ]
@@ -285,14 +285,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_upsilon;1",
+        "@id": "dtmi:example:hi_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_tau;1",
+          "@id": "dtmi:example:hi_beta;1",
           "@type": "Object",
           "fields": {
-            "name": "snee_sigma",
-            "schema": "long",
+            "name": "hi_alpha",
+            "schema": "float",
             "@type": [
               true
             ]
@@ -309,15 +309,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_psi;1",
+        "@id": "dtmi:example:hi_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_chi;1",
+          "@id": "dtmi:example:hi_epsilon;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "snee_phi",
-            "schema": "string",
+            "name": "hi_delta",
+            "schema": "integer",
             "@type": [
               true
             ]
@@ -334,14 +334,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_wum;1",
+        "@id": "dtmi:example:hi_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_yuzz;1",
+          "@id": "dtmi:example:hi_theta;1",
           "@type": "Object",
           "fields": {
-            "name": "snee_omega",
-            "schema": "time",
+            "name": "hi_eta",
+            "schema": "long",
             "@type": [
               {}
             ]
@@ -358,15 +358,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_fuddle;1",
+        "@id": "dtmi:example:hi_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_humpf;1",
+          "@id": "dtmi:example:hi_lambda;1",
           "@type": "Object",
           "fields": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "snee_um",
-            "schema": "boolean",
+            "name": "hi_kappa",
+            "schema": "string",
             "@type": [
               {}
             ]
diff --git a/DTDL/v3/spec/Requirement-ClassInterfaceContextAtTopLevelV3.json b/DTDL/v3/spec/Requirement-ClassInterfaceContextAtTopLevelV3.json
index 06ccc794..804216d7 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfaceContextAtTopLevelV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfaceContextAtTopLevelV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_eta;1",
+        "@id": "dtmi:example:pi_quan;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zeta_zeta;1",
+          "@id": "dtmi:example:pi_snee;1",
           "@type": "Interface"
         }
       }
@@ -23,7 +23,7 @@
     ],
     "input": [
       {
-        "@id": "dtmi:example:zeta_theta;1",
+        "@id": "dtmi:example:pi_thnad;1",
         "@type": "Interface"
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassInterfaceContextConformsV3.json b/DTDL/v3/spec/Requirement-ClassInterfaceContextConformsV3.json
index cbed9175..c463143a 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfaceContextConformsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfaceContextConformsV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_omicron;1",
+        "@id": "dtmi:example:pi_yekk;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zeta_xi;1",
+          "@id": "dtmi:example:pi_itch;1",
           "@type": "Interface",
           "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
         }
@@ -25,10 +25,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_rho;1",
+        "@id": "dtmi:example:pi_hi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zeta_pi;1",
+          "@id": "dtmi:example:pi_vroo;1",
           "@type": "Interface",
           "@context": []
         }
@@ -43,10 +43,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_tau;1",
+        "@id": "dtmi:example:rho_beta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zeta_sigma;1",
+          "@id": "dtmi:example:rho_alpha;1",
           "@type": "Interface",
           "@context": [
             "dtmi:dtdl:extension:quantitativeTypes;1"
@@ -63,10 +63,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_phi;1",
+        "@id": "dtmi:example:rho_delta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zeta_upsilon;1",
+          "@id": "dtmi:example:rho_gamma;1",
           "@type": "Interface",
           "@context": null
         }
@@ -81,10 +81,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_psi;1",
+        "@id": "dtmi:example:rho_zeta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zeta_chi;1",
+          "@id": "dtmi:example:rho_epsilon;1",
           "@type": "Interface",
           "@context": 626
         }
@@ -99,10 +99,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_yuzz;1",
+        "@id": "dtmi:example:rho_theta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zeta_omega;1",
+          "@id": "dtmi:example:rho_eta;1",
           "@type": "Interface",
           "@context": true
         }
@@ -117,10 +117,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_um;1",
+        "@id": "dtmi:example:rho_kappa;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zeta_wum;1",
+          "@id": "dtmi:example:rho_iota;1",
           "@type": "Interface",
           "@context": [
             null
@@ -137,10 +137,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_fuddle;1",
+        "@id": "dtmi:example:rho_mu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zeta_humpf;1",
+          "@id": "dtmi:example:rho_lambda;1",
           "@type": "Interface",
           "@context": [
             626
@@ -157,10 +157,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_nuh;1",
+        "@id": "dtmi:example:rho_xi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zeta_glikk;1",
+          "@id": "dtmi:example:rho_nu;1",
           "@type": "Interface",
           "@context": [
             true
@@ -177,12 +177,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_quan;1",
+        "@id": "dtmi:example:rho_pi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zeta_snee;1",
+          "@id": "dtmi:example:rho_omicron;1",
           "@type": "Interface",
-          "@context": {}
+          "@context": "dtmi:dtdl:extension:quantitativeTypes"
         }
       }
     ]
@@ -195,14 +195,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_spazz;1",
+        "@id": "dtmi:example:rho_sigma;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zeta_thnad;1",
+          "@id": "dtmi:example:rho_rho;1",
           "@type": "Interface",
-          "@context": [
-            {}
-          ]
+          "@context": "http://dtdl/extension/quantitativeTypes/1"
         }
       }
     ]
@@ -215,12 +213,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_zatz;1",
+        "@id": "dtmi:example:rho_upsilon;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zeta_floob;1",
+          "@id": "dtmi:example:rho_tau;1",
           "@type": "Interface",
-          "@context": "dtmi:dtdl:extension:quantitativeTypes"
+          "@context": "quantitativeTypes;1"
         }
       }
     ]
@@ -233,12 +231,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_flunn;1",
+        "@id": "dtmi:example:rho_chi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zeta_jogg;1",
+          "@id": "dtmi:example:rho_phi;1",
           "@type": "Interface",
-          "@context": "http://dtdl/extension/quantitativeTypes/1"
+          "@context": {}
         }
       }
     ]
@@ -251,12 +249,56 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_yekk;1",
+        "@id": "dtmi:example:rho_omega;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zeta_itch;1",
+          "@id": "dtmi:example:rho_psi;1",
           "@type": "Interface",
-          "@context": "quantitativeTypes;1"
+          "@context": {
+            "foo": "dtmi:foo:bar;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:rho_wum;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:rho_yuzz;1",
+          "@type": "Interface",
+          "@context": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:rho_humpf;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:rho_um;1",
+          "@type": "Interface",
+          "@context": [
+            {
+              "foo": "dtmi:foo:bar;1"
+            }
+          ]
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassInterfaceContextDtdlTopLevelV3.json b/DTDL/v3/spec/Requirement-ClassInterfaceContextDtdlTopLevelV3.json
index 56172b91..651122a0 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfaceContextDtdlTopLevelV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfaceContextDtdlTopLevelV3.json
@@ -6,7 +6,7 @@
     ],
     "input": [
       {
-        "@id": "dtmi:example:zeta_iota;1",
+        "@id": "dtmi:example:pi_spazz;1",
         "@type": "Interface",
         "@context": []
       }
@@ -19,7 +19,7 @@
     ],
     "input": [
       {
-        "@id": "dtmi:example:zeta_kappa;1",
+        "@id": "dtmi:example:pi_floob;1",
         "@type": "Interface",
         "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
       }
@@ -33,10 +33,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_mu;1",
+        "@id": "dtmi:example:pi_jogg;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:zeta_lambda;1",
+          "@id": "dtmi:example:pi_zatz;1",
           "@type": "Interface",
           "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
         }
@@ -50,7 +50,7 @@
     ],
     "input": [
       {
-        "@id": "dtmi:example:zeta_nu;1",
+        "@id": "dtmi:example:pi_flunn;1",
         "@type": "Interface",
         "@context": [
           "dtmi:dtdl:context;3",
diff --git a/DTDL/v3/spec/Requirement-ClassInterfaceIdDuplicateV3.json b/DTDL/v3/spec/Requirement-ClassInterfaceIdDuplicateV3.json
index 1ac40c32..f7c31c12 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfaceIdDuplicateV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfaceIdDuplicateV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_flunn;1",
+        "@id": "dtmi:example:pi_chi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:epsilon_flunn;1",
+          "@id": "dtmi:example:pi_chi;1",
           "@type": "Interface"
         }
       }
@@ -24,11 +24,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_itch;1",
+        "@id": "dtmi:example:pi_psi;1",
         "@type": "Interface",
         "extends": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:epsilon_itch;1",
+          "@id": "dtmi:example:pi_psi;1",
           "@type": "Interface"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassInterfaceInvalidKeywordsV3.json b/DTDL/v3/spec/Requirement-ClassInterfaceInvalidKeywordsV3.json
index 43f60280..848bd58f 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfaceInvalidKeywordsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfaceInvalidKeywordsV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_zatz;1",
+        "@id": "dtmi:example:fuddle_alpha;1",
         "@type": "Interface",
         "@graph": {}
       }
@@ -24,7 +24,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:rho_jogg;1",
+        "@id": "dtmi:example:fuddle_beta;1",
         "@type": "Interface",
         "@graph": {}
       }
@@ -38,7 +38,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_flunn;1",
+        "@id": "dtmi:example:fuddle_gamma;1",
         "@type": "Interface",
         "@value": 626
       }
@@ -55,7 +55,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:rho_itch;1",
+        "@id": "dtmi:example:fuddle_delta;1",
         "@type": "Interface",
         "@value": 626
       }
@@ -69,7 +69,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_yekk;1",
+        "@id": "dtmi:example:fuddle_epsilon;1",
         "@type": "Interface",
         "@language": "en"
       }
@@ -86,7 +86,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:rho_vroo;1",
+        "@id": "dtmi:example:fuddle_zeta;1",
         "@type": "Interface",
         "@language": "en"
       }
@@ -100,7 +100,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_hi;1",
+        "@id": "dtmi:example:fuddle_eta;1",
         "@type": "Interface",
         "@foobar": true
       }
@@ -117,7 +117,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:sigma_alpha;1",
+        "@id": "dtmi:example:fuddle_theta;1",
         "@type": "Interface",
         "@foobar": true
       }
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertiesExtendsMaxCountV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertiesExtendsMaxCountV3.json
index 84cb28c2..3927b2a0 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfacePropertiesExtendsMaxCountV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertiesExtendsMaxCountV3.json
@@ -7,4103 +7,4103 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_psi;1",
+        "@id": "dtmi:example:um_omicron;1",
         "@type": "Interface",
         "extends": [
           {
-            "@id": "dtmi:example:snee_nuh;1",
+            "@id": "dtmi:example:gamma_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_snee;1",
+            "@id": "dtmi:example:gamma_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_quan;1",
+            "@id": "dtmi:example:gamma_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_thnad;1",
+            "@id": "dtmi:example:gamma_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_spazz;1",
+            "@id": "dtmi:example:gamma_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_floob;1",
+            "@id": "dtmi:example:gamma_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_zatz;1",
+            "@id": "dtmi:example:gamma_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_jogg;1",
+            "@id": "dtmi:example:gamma_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_flunn;1",
+            "@id": "dtmi:example:gamma_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_itch;1",
+            "@id": "dtmi:example:gamma_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_yekk;1",
+            "@id": "dtmi:example:gamma_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_vroo;1",
+            "@id": "dtmi:example:gamma_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_hi;1",
+            "@id": "dtmi:example:gamma_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_alpha;1",
+            "@id": "dtmi:example:gamma_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_beta;1",
+            "@id": "dtmi:example:gamma_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_gamma;1",
+            "@id": "dtmi:example:gamma_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_delta;1",
+            "@id": "dtmi:example:gamma_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_epsilon;1",
+            "@id": "dtmi:example:gamma_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_zeta;1",
+            "@id": "dtmi:example:gamma_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_eta;1",
+            "@id": "dtmi:example:gamma_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_theta;1",
+            "@id": "dtmi:example:gamma_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_iota;1",
+            "@id": "dtmi:example:delta_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_kappa;1",
+            "@id": "dtmi:example:delta_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_lambda;1",
+            "@id": "dtmi:example:delta_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_mu;1",
+            "@id": "dtmi:example:delta_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_nu;1",
+            "@id": "dtmi:example:delta_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_xi;1",
+            "@id": "dtmi:example:delta_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_omicron;1",
+            "@id": "dtmi:example:delta_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_pi;1",
+            "@id": "dtmi:example:delta_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_rho;1",
+            "@id": "dtmi:example:delta_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_sigma;1",
+            "@id": "dtmi:example:delta_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_tau;1",
+            "@id": "dtmi:example:delta_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_upsilon;1",
+            "@id": "dtmi:example:delta_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_phi;1",
+            "@id": "dtmi:example:delta_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_chi;1",
+            "@id": "dtmi:example:delta_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_psi;1",
+            "@id": "dtmi:example:delta_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_omega;1",
+            "@id": "dtmi:example:delta_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_yuzz;1",
+            "@id": "dtmi:example:delta_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_wum;1",
+            "@id": "dtmi:example:delta_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_um;1",
+            "@id": "dtmi:example:delta_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_humpf;1",
+            "@id": "dtmi:example:delta_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_fuddle;1",
+            "@id": "dtmi:example:delta_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_glikk;1",
+            "@id": "dtmi:example:delta_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_nuh;1",
+            "@id": "dtmi:example:delta_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_snee;1",
+            "@id": "dtmi:example:delta_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_quan;1",
+            "@id": "dtmi:example:delta_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_thnad;1",
+            "@id": "dtmi:example:delta_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_spazz;1",
+            "@id": "dtmi:example:delta_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_floob;1",
+            "@id": "dtmi:example:delta_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_zatz;1",
+            "@id": "dtmi:example:delta_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_jogg;1",
+            "@id": "dtmi:example:delta_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_flunn;1",
+            "@id": "dtmi:example:delta_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_itch;1",
+            "@id": "dtmi:example:delta_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_yekk;1",
+            "@id": "dtmi:example:delta_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_vroo;1",
+            "@id": "dtmi:example:delta_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_hi;1",
+            "@id": "dtmi:example:delta_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_alpha;1",
+            "@id": "dtmi:example:delta_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_beta;1",
+            "@id": "dtmi:example:delta_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_gamma;1",
+            "@id": "dtmi:example:delta_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_delta;1",
+            "@id": "dtmi:example:delta_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_epsilon;1",
+            "@id": "dtmi:example:delta_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_zeta;1",
+            "@id": "dtmi:example:delta_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_eta;1",
+            "@id": "dtmi:example:delta_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_theta;1",
+            "@id": "dtmi:example:delta_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_iota;1",
+            "@id": "dtmi:example:epsilon_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_kappa;1",
+            "@id": "dtmi:example:epsilon_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_lambda;1",
+            "@id": "dtmi:example:epsilon_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_mu;1",
+            "@id": "dtmi:example:epsilon_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_nu;1",
+            "@id": "dtmi:example:epsilon_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_xi;1",
+            "@id": "dtmi:example:epsilon_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_omicron;1",
+            "@id": "dtmi:example:epsilon_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_pi;1",
+            "@id": "dtmi:example:epsilon_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_rho;1",
+            "@id": "dtmi:example:epsilon_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_sigma;1",
+            "@id": "dtmi:example:epsilon_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_tau;1",
+            "@id": "dtmi:example:epsilon_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_upsilon;1",
+            "@id": "dtmi:example:epsilon_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_phi;1",
+            "@id": "dtmi:example:epsilon_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_chi;1",
+            "@id": "dtmi:example:epsilon_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_psi;1",
+            "@id": "dtmi:example:epsilon_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_omega;1",
+            "@id": "dtmi:example:epsilon_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_yuzz;1",
+            "@id": "dtmi:example:epsilon_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_wum;1",
+            "@id": "dtmi:example:epsilon_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_um;1",
+            "@id": "dtmi:example:epsilon_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_humpf;1",
+            "@id": "dtmi:example:epsilon_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_fuddle;1",
+            "@id": "dtmi:example:epsilon_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_glikk;1",
+            "@id": "dtmi:example:epsilon_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_nuh;1",
+            "@id": "dtmi:example:epsilon_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_snee;1",
+            "@id": "dtmi:example:epsilon_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_quan;1",
+            "@id": "dtmi:example:epsilon_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_thnad;1",
+            "@id": "dtmi:example:epsilon_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_spazz;1",
+            "@id": "dtmi:example:epsilon_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_floob;1",
+            "@id": "dtmi:example:epsilon_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_zatz;1",
+            "@id": "dtmi:example:epsilon_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_jogg;1",
+            "@id": "dtmi:example:epsilon_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_flunn;1",
+            "@id": "dtmi:example:epsilon_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_itch;1",
+            "@id": "dtmi:example:epsilon_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_yekk;1",
+            "@id": "dtmi:example:epsilon_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_vroo;1",
+            "@id": "dtmi:example:epsilon_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_hi;1",
+            "@id": "dtmi:example:epsilon_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_alpha;1",
+            "@id": "dtmi:example:epsilon_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_beta;1",
+            "@id": "dtmi:example:epsilon_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_gamma;1",
+            "@id": "dtmi:example:epsilon_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_delta;1",
+            "@id": "dtmi:example:epsilon_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_epsilon;1",
+            "@id": "dtmi:example:epsilon_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_zeta;1",
+            "@id": "dtmi:example:epsilon_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_eta;1",
+            "@id": "dtmi:example:epsilon_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_theta;1",
+            "@id": "dtmi:example:epsilon_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_iota;1",
+            "@id": "dtmi:example:zeta_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_kappa;1",
+            "@id": "dtmi:example:zeta_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_lambda;1",
+            "@id": "dtmi:example:zeta_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_mu;1",
+            "@id": "dtmi:example:zeta_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_nu;1",
+            "@id": "dtmi:example:zeta_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_xi;1",
+            "@id": "dtmi:example:zeta_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_omicron;1",
+            "@id": "dtmi:example:zeta_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_pi;1",
+            "@id": "dtmi:example:zeta_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_rho;1",
+            "@id": "dtmi:example:zeta_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_sigma;1",
+            "@id": "dtmi:example:zeta_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_tau;1",
+            "@id": "dtmi:example:zeta_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_upsilon;1",
+            "@id": "dtmi:example:zeta_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_phi;1",
+            "@id": "dtmi:example:zeta_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_chi;1",
+            "@id": "dtmi:example:zeta_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_psi;1",
+            "@id": "dtmi:example:zeta_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_omega;1",
+            "@id": "dtmi:example:zeta_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_yuzz;1",
+            "@id": "dtmi:example:zeta_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_wum;1",
+            "@id": "dtmi:example:zeta_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_um;1",
+            "@id": "dtmi:example:zeta_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_humpf;1",
+            "@id": "dtmi:example:zeta_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_fuddle;1",
+            "@id": "dtmi:example:zeta_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_glikk;1",
+            "@id": "dtmi:example:zeta_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_nuh;1",
+            "@id": "dtmi:example:zeta_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_snee;1",
+            "@id": "dtmi:example:zeta_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_quan;1",
+            "@id": "dtmi:example:zeta_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_thnad;1",
+            "@id": "dtmi:example:zeta_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_spazz;1",
+            "@id": "dtmi:example:zeta_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_floob;1",
+            "@id": "dtmi:example:zeta_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_zatz;1",
+            "@id": "dtmi:example:zeta_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_jogg;1",
+            "@id": "dtmi:example:zeta_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_flunn;1",
+            "@id": "dtmi:example:zeta_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_itch;1",
+            "@id": "dtmi:example:zeta_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_yekk;1",
+            "@id": "dtmi:example:zeta_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_vroo;1",
+            "@id": "dtmi:example:zeta_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_hi;1",
+            "@id": "dtmi:example:zeta_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_alpha;1",
+            "@id": "dtmi:example:zeta_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_beta;1",
+            "@id": "dtmi:example:zeta_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_gamma;1",
+            "@id": "dtmi:example:zeta_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_delta;1",
+            "@id": "dtmi:example:zeta_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_epsilon;1",
+            "@id": "dtmi:example:zeta_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_zeta;1",
+            "@id": "dtmi:example:zeta_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_eta;1",
+            "@id": "dtmi:example:zeta_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_theta;1",
+            "@id": "dtmi:example:zeta_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_iota;1",
+            "@id": "dtmi:example:eta_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_kappa;1",
+            "@id": "dtmi:example:eta_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_lambda;1",
+            "@id": "dtmi:example:eta_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_mu;1",
+            "@id": "dtmi:example:eta_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_nu;1",
+            "@id": "dtmi:example:eta_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_xi;1",
+            "@id": "dtmi:example:eta_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_omicron;1",
+            "@id": "dtmi:example:eta_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_pi;1",
+            "@id": "dtmi:example:eta_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_rho;1",
+            "@id": "dtmi:example:eta_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_sigma;1",
+            "@id": "dtmi:example:eta_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_tau;1",
+            "@id": "dtmi:example:eta_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_upsilon;1",
+            "@id": "dtmi:example:eta_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_phi;1",
+            "@id": "dtmi:example:eta_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_chi;1",
+            "@id": "dtmi:example:eta_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_psi;1",
+            "@id": "dtmi:example:eta_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_omega;1",
+            "@id": "dtmi:example:eta_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_yuzz;1",
+            "@id": "dtmi:example:eta_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_wum;1",
+            "@id": "dtmi:example:eta_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_um;1",
+            "@id": "dtmi:example:eta_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_humpf;1",
+            "@id": "dtmi:example:eta_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_fuddle;1",
+            "@id": "dtmi:example:eta_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_glikk;1",
+            "@id": "dtmi:example:eta_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_nuh;1",
+            "@id": "dtmi:example:eta_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_snee;1",
+            "@id": "dtmi:example:eta_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_quan;1",
+            "@id": "dtmi:example:eta_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_thnad;1",
+            "@id": "dtmi:example:eta_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_spazz;1",
+            "@id": "dtmi:example:eta_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_floob;1",
+            "@id": "dtmi:example:eta_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_zatz;1",
+            "@id": "dtmi:example:eta_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_jogg;1",
+            "@id": "dtmi:example:eta_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_flunn;1",
+            "@id": "dtmi:example:eta_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_itch;1",
+            "@id": "dtmi:example:eta_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_yekk;1",
+            "@id": "dtmi:example:eta_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_vroo;1",
+            "@id": "dtmi:example:eta_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_hi;1",
+            "@id": "dtmi:example:eta_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_alpha;1",
+            "@id": "dtmi:example:eta_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_beta;1",
+            "@id": "dtmi:example:eta_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_gamma;1",
+            "@id": "dtmi:example:eta_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_delta;1",
+            "@id": "dtmi:example:eta_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_epsilon;1",
+            "@id": "dtmi:example:eta_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_zeta;1",
+            "@id": "dtmi:example:eta_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_eta;1",
+            "@id": "dtmi:example:eta_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_theta;1",
+            "@id": "dtmi:example:eta_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_iota;1",
+            "@id": "dtmi:example:theta_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_kappa;1",
+            "@id": "dtmi:example:theta_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_lambda;1",
+            "@id": "dtmi:example:theta_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_mu;1",
+            "@id": "dtmi:example:theta_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_nu;1",
+            "@id": "dtmi:example:theta_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_xi;1",
+            "@id": "dtmi:example:theta_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_omicron;1",
+            "@id": "dtmi:example:theta_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_pi;1",
+            "@id": "dtmi:example:theta_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_rho;1",
+            "@id": "dtmi:example:theta_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_sigma;1",
+            "@id": "dtmi:example:theta_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_tau;1",
+            "@id": "dtmi:example:theta_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_upsilon;1",
+            "@id": "dtmi:example:theta_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_phi;1",
+            "@id": "dtmi:example:theta_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_chi;1",
+            "@id": "dtmi:example:theta_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_psi;1",
+            "@id": "dtmi:example:theta_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_omega;1",
+            "@id": "dtmi:example:theta_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_yuzz;1",
+            "@id": "dtmi:example:theta_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_wum;1",
+            "@id": "dtmi:example:theta_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_um;1",
+            "@id": "dtmi:example:theta_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_humpf;1",
+            "@id": "dtmi:example:theta_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_fuddle;1",
+            "@id": "dtmi:example:theta_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_glikk;1",
+            "@id": "dtmi:example:theta_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_nuh;1",
+            "@id": "dtmi:example:theta_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_snee;1",
+            "@id": "dtmi:example:theta_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_quan;1",
+            "@id": "dtmi:example:theta_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_thnad;1",
+            "@id": "dtmi:example:theta_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_spazz;1",
+            "@id": "dtmi:example:theta_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_floob;1",
+            "@id": "dtmi:example:theta_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_zatz;1",
+            "@id": "dtmi:example:theta_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_jogg;1",
+            "@id": "dtmi:example:theta_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_flunn;1",
+            "@id": "dtmi:example:theta_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_itch;1",
+            "@id": "dtmi:example:theta_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_yekk;1",
+            "@id": "dtmi:example:theta_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_vroo;1",
+            "@id": "dtmi:example:theta_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_hi;1",
+            "@id": "dtmi:example:theta_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_alpha;1",
+            "@id": "dtmi:example:theta_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_beta;1",
+            "@id": "dtmi:example:theta_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_gamma;1",
+            "@id": "dtmi:example:theta_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_delta;1",
+            "@id": "dtmi:example:theta_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_epsilon;1",
+            "@id": "dtmi:example:theta_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_zeta;1",
+            "@id": "dtmi:example:theta_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_eta;1",
+            "@id": "dtmi:example:theta_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_theta;1",
+            "@id": "dtmi:example:theta_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_iota;1",
+            "@id": "dtmi:example:iota_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_kappa;1",
+            "@id": "dtmi:example:iota_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_lambda;1",
+            "@id": "dtmi:example:iota_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_mu;1",
+            "@id": "dtmi:example:iota_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_nu;1",
+            "@id": "dtmi:example:iota_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_xi;1",
+            "@id": "dtmi:example:iota_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_omicron;1",
+            "@id": "dtmi:example:iota_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_pi;1",
+            "@id": "dtmi:example:iota_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_rho;1",
+            "@id": "dtmi:example:iota_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_sigma;1",
+            "@id": "dtmi:example:iota_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_tau;1",
+            "@id": "dtmi:example:iota_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_upsilon;1",
+            "@id": "dtmi:example:iota_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_phi;1",
+            "@id": "dtmi:example:iota_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_chi;1",
+            "@id": "dtmi:example:iota_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_psi;1",
+            "@id": "dtmi:example:iota_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_omega;1",
+            "@id": "dtmi:example:iota_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_yuzz;1",
+            "@id": "dtmi:example:iota_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_wum;1",
+            "@id": "dtmi:example:iota_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_um;1",
+            "@id": "dtmi:example:iota_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_humpf;1",
+            "@id": "dtmi:example:iota_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_fuddle;1",
+            "@id": "dtmi:example:iota_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_glikk;1",
+            "@id": "dtmi:example:iota_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_nuh;1",
+            "@id": "dtmi:example:iota_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_snee;1",
+            "@id": "dtmi:example:iota_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_quan;1",
+            "@id": "dtmi:example:iota_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_thnad;1",
+            "@id": "dtmi:example:iota_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_spazz;1",
+            "@id": "dtmi:example:iota_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_floob;1",
+            "@id": "dtmi:example:iota_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_zatz;1",
+            "@id": "dtmi:example:iota_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_jogg;1",
+            "@id": "dtmi:example:iota_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_flunn;1",
+            "@id": "dtmi:example:iota_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_itch;1",
+            "@id": "dtmi:example:iota_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_yekk;1",
+            "@id": "dtmi:example:iota_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_vroo;1",
+            "@id": "dtmi:example:iota_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_hi;1",
+            "@id": "dtmi:example:iota_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_alpha;1",
+            "@id": "dtmi:example:iota_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_beta;1",
+            "@id": "dtmi:example:iota_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_gamma;1",
+            "@id": "dtmi:example:iota_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_delta;1",
+            "@id": "dtmi:example:iota_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_epsilon;1",
+            "@id": "dtmi:example:iota_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_zeta;1",
+            "@id": "dtmi:example:iota_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_eta;1",
+            "@id": "dtmi:example:iota_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_theta;1",
+            "@id": "dtmi:example:iota_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_iota;1",
+            "@id": "dtmi:example:kappa_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_kappa;1",
+            "@id": "dtmi:example:kappa_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_lambda;1",
+            "@id": "dtmi:example:kappa_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_mu;1",
+            "@id": "dtmi:example:kappa_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_nu;1",
+            "@id": "dtmi:example:kappa_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_xi;1",
+            "@id": "dtmi:example:kappa_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_omicron;1",
+            "@id": "dtmi:example:kappa_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_pi;1",
+            "@id": "dtmi:example:kappa_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_rho;1",
+            "@id": "dtmi:example:kappa_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_sigma;1",
+            "@id": "dtmi:example:kappa_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_tau;1",
+            "@id": "dtmi:example:kappa_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_upsilon;1",
+            "@id": "dtmi:example:kappa_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_phi;1",
+            "@id": "dtmi:example:kappa_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_chi;1",
+            "@id": "dtmi:example:kappa_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_psi;1",
+            "@id": "dtmi:example:kappa_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_omega;1",
+            "@id": "dtmi:example:kappa_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_yuzz;1",
+            "@id": "dtmi:example:kappa_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_wum;1",
+            "@id": "dtmi:example:kappa_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_um;1",
+            "@id": "dtmi:example:kappa_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_humpf;1",
+            "@id": "dtmi:example:kappa_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_fuddle;1",
+            "@id": "dtmi:example:kappa_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_glikk;1",
+            "@id": "dtmi:example:kappa_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_nuh;1",
+            "@id": "dtmi:example:kappa_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_snee;1",
+            "@id": "dtmi:example:kappa_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_quan;1",
+            "@id": "dtmi:example:kappa_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_thnad;1",
+            "@id": "dtmi:example:kappa_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_spazz;1",
+            "@id": "dtmi:example:kappa_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_floob;1",
+            "@id": "dtmi:example:kappa_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_zatz;1",
+            "@id": "dtmi:example:kappa_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_jogg;1",
+            "@id": "dtmi:example:kappa_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_flunn;1",
+            "@id": "dtmi:example:kappa_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_itch;1",
+            "@id": "dtmi:example:kappa_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_yekk;1",
+            "@id": "dtmi:example:kappa_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_vroo;1",
+            "@id": "dtmi:example:kappa_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_hi;1",
+            "@id": "dtmi:example:kappa_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_alpha;1",
+            "@id": "dtmi:example:kappa_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_beta;1",
+            "@id": "dtmi:example:kappa_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_gamma;1",
+            "@id": "dtmi:example:kappa_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_delta;1",
+            "@id": "dtmi:example:kappa_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_epsilon;1",
+            "@id": "dtmi:example:kappa_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_zeta;1",
+            "@id": "dtmi:example:kappa_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_eta;1",
+            "@id": "dtmi:example:kappa_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_theta;1",
+            "@id": "dtmi:example:kappa_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_iota;1",
+            "@id": "dtmi:example:lambda_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_kappa;1",
+            "@id": "dtmi:example:lambda_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_lambda;1",
+            "@id": "dtmi:example:lambda_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_mu;1",
+            "@id": "dtmi:example:lambda_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_nu;1",
+            "@id": "dtmi:example:lambda_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_xi;1",
+            "@id": "dtmi:example:lambda_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_omicron;1",
+            "@id": "dtmi:example:lambda_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_pi;1",
+            "@id": "dtmi:example:lambda_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_rho;1",
+            "@id": "dtmi:example:lambda_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_sigma;1",
+            "@id": "dtmi:example:lambda_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_tau;1",
+            "@id": "dtmi:example:lambda_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_upsilon;1",
+            "@id": "dtmi:example:lambda_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_phi;1",
+            "@id": "dtmi:example:lambda_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_chi;1",
+            "@id": "dtmi:example:lambda_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_psi;1",
+            "@id": "dtmi:example:lambda_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_omega;1",
+            "@id": "dtmi:example:lambda_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_yuzz;1",
+            "@id": "dtmi:example:lambda_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_wum;1",
+            "@id": "dtmi:example:lambda_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_um;1",
+            "@id": "dtmi:example:lambda_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_humpf;1",
+            "@id": "dtmi:example:lambda_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_fuddle;1",
+            "@id": "dtmi:example:lambda_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_glikk;1",
+            "@id": "dtmi:example:lambda_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_nuh;1",
+            "@id": "dtmi:example:lambda_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_snee;1",
+            "@id": "dtmi:example:lambda_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_quan;1",
+            "@id": "dtmi:example:lambda_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_thnad;1",
+            "@id": "dtmi:example:lambda_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_spazz;1",
+            "@id": "dtmi:example:lambda_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_floob;1",
+            "@id": "dtmi:example:lambda_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_zatz;1",
+            "@id": "dtmi:example:lambda_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_jogg;1",
+            "@id": "dtmi:example:lambda_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_flunn;1",
+            "@id": "dtmi:example:lambda_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_itch;1",
+            "@id": "dtmi:example:lambda_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_yekk;1",
+            "@id": "dtmi:example:lambda_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_vroo;1",
+            "@id": "dtmi:example:lambda_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_hi;1",
+            "@id": "dtmi:example:lambda_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_alpha;1",
+            "@id": "dtmi:example:lambda_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_beta;1",
+            "@id": "dtmi:example:lambda_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_gamma;1",
+            "@id": "dtmi:example:lambda_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_delta;1",
+            "@id": "dtmi:example:lambda_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_epsilon;1",
+            "@id": "dtmi:example:lambda_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_zeta;1",
+            "@id": "dtmi:example:lambda_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_eta;1",
+            "@id": "dtmi:example:lambda_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_theta;1",
+            "@id": "dtmi:example:lambda_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_iota;1",
+            "@id": "dtmi:example:mu_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_kappa;1",
+            "@id": "dtmi:example:mu_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_lambda;1",
+            "@id": "dtmi:example:mu_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_mu;1",
+            "@id": "dtmi:example:mu_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_nu;1",
+            "@id": "dtmi:example:mu_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_xi;1",
+            "@id": "dtmi:example:mu_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_omicron;1",
+            "@id": "dtmi:example:mu_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_pi;1",
+            "@id": "dtmi:example:mu_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_rho;1",
+            "@id": "dtmi:example:mu_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_sigma;1",
+            "@id": "dtmi:example:mu_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_tau;1",
+            "@id": "dtmi:example:mu_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_upsilon;1",
+            "@id": "dtmi:example:mu_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_phi;1",
+            "@id": "dtmi:example:mu_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_chi;1",
+            "@id": "dtmi:example:mu_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_psi;1",
+            "@id": "dtmi:example:mu_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_omega;1",
+            "@id": "dtmi:example:mu_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_yuzz;1",
+            "@id": "dtmi:example:mu_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_wum;1",
+            "@id": "dtmi:example:mu_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_um;1",
+            "@id": "dtmi:example:mu_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_humpf;1",
+            "@id": "dtmi:example:mu_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_fuddle;1",
+            "@id": "dtmi:example:mu_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_glikk;1",
+            "@id": "dtmi:example:mu_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_nuh;1",
+            "@id": "dtmi:example:mu_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_snee;1",
+            "@id": "dtmi:example:mu_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_quan;1",
+            "@id": "dtmi:example:mu_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_thnad;1",
+            "@id": "dtmi:example:mu_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_spazz;1",
+            "@id": "dtmi:example:mu_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_floob;1",
+            "@id": "dtmi:example:mu_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_zatz;1",
+            "@id": "dtmi:example:mu_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_jogg;1",
+            "@id": "dtmi:example:mu_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_flunn;1",
+            "@id": "dtmi:example:mu_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_itch;1",
+            "@id": "dtmi:example:mu_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_yekk;1",
+            "@id": "dtmi:example:mu_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_vroo;1",
+            "@id": "dtmi:example:mu_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_hi;1",
+            "@id": "dtmi:example:mu_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_alpha;1",
+            "@id": "dtmi:example:mu_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_beta;1",
+            "@id": "dtmi:example:mu_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_gamma;1",
+            "@id": "dtmi:example:mu_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_delta;1",
+            "@id": "dtmi:example:mu_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_epsilon;1",
+            "@id": "dtmi:example:mu_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_zeta;1",
+            "@id": "dtmi:example:mu_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_eta;1",
+            "@id": "dtmi:example:mu_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_theta;1",
+            "@id": "dtmi:example:mu_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_iota;1",
+            "@id": "dtmi:example:nu_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_kappa;1",
+            "@id": "dtmi:example:nu_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_lambda;1",
+            "@id": "dtmi:example:nu_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_mu;1",
+            "@id": "dtmi:example:nu_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_nu;1",
+            "@id": "dtmi:example:nu_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_xi;1",
+            "@id": "dtmi:example:nu_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_omicron;1",
+            "@id": "dtmi:example:nu_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_pi;1",
+            "@id": "dtmi:example:nu_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_rho;1",
+            "@id": "dtmi:example:nu_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_sigma;1",
+            "@id": "dtmi:example:nu_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_tau;1",
+            "@id": "dtmi:example:nu_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_upsilon;1",
+            "@id": "dtmi:example:nu_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_phi;1",
+            "@id": "dtmi:example:nu_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_chi;1",
+            "@id": "dtmi:example:nu_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_psi;1",
+            "@id": "dtmi:example:nu_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_omega;1",
+            "@id": "dtmi:example:nu_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_yuzz;1",
+            "@id": "dtmi:example:nu_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_wum;1",
+            "@id": "dtmi:example:nu_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_um;1",
+            "@id": "dtmi:example:nu_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_humpf;1",
+            "@id": "dtmi:example:nu_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_fuddle;1",
+            "@id": "dtmi:example:nu_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_glikk;1",
+            "@id": "dtmi:example:nu_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_nuh;1",
+            "@id": "dtmi:example:nu_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_snee;1",
+            "@id": "dtmi:example:nu_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_quan;1",
+            "@id": "dtmi:example:nu_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_thnad;1",
+            "@id": "dtmi:example:nu_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_spazz;1",
+            "@id": "dtmi:example:nu_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_floob;1",
+            "@id": "dtmi:example:nu_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_zatz;1",
+            "@id": "dtmi:example:nu_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_jogg;1",
+            "@id": "dtmi:example:nu_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_flunn;1",
+            "@id": "dtmi:example:nu_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_itch;1",
+            "@id": "dtmi:example:nu_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_yekk;1",
+            "@id": "dtmi:example:nu_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_vroo;1",
+            "@id": "dtmi:example:nu_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_hi;1",
+            "@id": "dtmi:example:nu_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_alpha;1",
+            "@id": "dtmi:example:nu_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_beta;1",
+            "@id": "dtmi:example:nu_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_gamma;1",
+            "@id": "dtmi:example:nu_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_delta;1",
+            "@id": "dtmi:example:nu_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_epsilon;1",
+            "@id": "dtmi:example:nu_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_zeta;1",
+            "@id": "dtmi:example:nu_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_eta;1",
+            "@id": "dtmi:example:nu_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_theta;1",
+            "@id": "dtmi:example:nu_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_iota;1",
+            "@id": "dtmi:example:xi_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_kappa;1",
+            "@id": "dtmi:example:xi_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_lambda;1",
+            "@id": "dtmi:example:xi_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_mu;1",
+            "@id": "dtmi:example:xi_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_nu;1",
+            "@id": "dtmi:example:xi_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_xi;1",
+            "@id": "dtmi:example:xi_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_omicron;1",
+            "@id": "dtmi:example:xi_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_pi;1",
+            "@id": "dtmi:example:xi_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_rho;1",
+            "@id": "dtmi:example:xi_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_sigma;1",
+            "@id": "dtmi:example:xi_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_tau;1",
+            "@id": "dtmi:example:xi_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_upsilon;1",
+            "@id": "dtmi:example:xi_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_phi;1",
+            "@id": "dtmi:example:xi_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_chi;1",
+            "@id": "dtmi:example:xi_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_psi;1",
+            "@id": "dtmi:example:xi_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_omega;1",
+            "@id": "dtmi:example:xi_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_yuzz;1",
+            "@id": "dtmi:example:xi_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_wum;1",
+            "@id": "dtmi:example:xi_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_um;1",
+            "@id": "dtmi:example:xi_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_humpf;1",
+            "@id": "dtmi:example:xi_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_fuddle;1",
+            "@id": "dtmi:example:xi_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_glikk;1",
+            "@id": "dtmi:example:xi_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_nuh;1",
+            "@id": "dtmi:example:xi_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_snee;1",
+            "@id": "dtmi:example:xi_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_quan;1",
+            "@id": "dtmi:example:xi_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_thnad;1",
+            "@id": "dtmi:example:xi_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_spazz;1",
+            "@id": "dtmi:example:xi_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_floob;1",
+            "@id": "dtmi:example:xi_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_zatz;1",
+            "@id": "dtmi:example:xi_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_jogg;1",
+            "@id": "dtmi:example:xi_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_flunn;1",
+            "@id": "dtmi:example:xi_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_itch;1",
+            "@id": "dtmi:example:xi_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_yekk;1",
+            "@id": "dtmi:example:xi_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_vroo;1",
+            "@id": "dtmi:example:xi_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_hi;1",
+            "@id": "dtmi:example:xi_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_alpha;1",
+            "@id": "dtmi:example:xi_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_beta;1",
+            "@id": "dtmi:example:xi_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_gamma;1",
+            "@id": "dtmi:example:xi_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_delta;1",
+            "@id": "dtmi:example:xi_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_epsilon;1",
+            "@id": "dtmi:example:xi_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_zeta;1",
+            "@id": "dtmi:example:xi_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_eta;1",
+            "@id": "dtmi:example:xi_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_theta;1",
+            "@id": "dtmi:example:xi_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_iota;1",
+            "@id": "dtmi:example:omicron_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_kappa;1",
+            "@id": "dtmi:example:omicron_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_lambda;1",
+            "@id": "dtmi:example:omicron_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_mu;1",
+            "@id": "dtmi:example:omicron_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_nu;1",
+            "@id": "dtmi:example:omicron_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_xi;1",
+            "@id": "dtmi:example:omicron_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_omicron;1",
+            "@id": "dtmi:example:omicron_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_pi;1",
+            "@id": "dtmi:example:omicron_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_rho;1",
+            "@id": "dtmi:example:omicron_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_sigma;1",
+            "@id": "dtmi:example:omicron_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_tau;1",
+            "@id": "dtmi:example:omicron_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_upsilon;1",
+            "@id": "dtmi:example:omicron_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_phi;1",
+            "@id": "dtmi:example:omicron_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_chi;1",
+            "@id": "dtmi:example:omicron_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_psi;1",
+            "@id": "dtmi:example:omicron_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_omega;1",
+            "@id": "dtmi:example:omicron_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_yuzz;1",
+            "@id": "dtmi:example:omicron_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_wum;1",
+            "@id": "dtmi:example:omicron_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_um;1",
+            "@id": "dtmi:example:omicron_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_humpf;1",
+            "@id": "dtmi:example:omicron_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_fuddle;1",
+            "@id": "dtmi:example:omicron_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_glikk;1",
+            "@id": "dtmi:example:omicron_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_nuh;1",
+            "@id": "dtmi:example:omicron_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_snee;1",
+            "@id": "dtmi:example:omicron_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_quan;1",
+            "@id": "dtmi:example:omicron_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_thnad;1",
+            "@id": "dtmi:example:omicron_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_spazz;1",
+            "@id": "dtmi:example:omicron_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_floob;1",
+            "@id": "dtmi:example:omicron_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_zatz;1",
+            "@id": "dtmi:example:omicron_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_jogg;1",
+            "@id": "dtmi:example:omicron_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_flunn;1",
+            "@id": "dtmi:example:omicron_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_itch;1",
+            "@id": "dtmi:example:omicron_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_yekk;1",
+            "@id": "dtmi:example:omicron_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_vroo;1",
+            "@id": "dtmi:example:omicron_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_hi;1",
+            "@id": "dtmi:example:omicron_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_alpha;1",
+            "@id": "dtmi:example:omicron_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_beta;1",
+            "@id": "dtmi:example:omicron_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_gamma;1",
+            "@id": "dtmi:example:omicron_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_delta;1",
+            "@id": "dtmi:example:omicron_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_epsilon;1",
+            "@id": "dtmi:example:omicron_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_zeta;1",
+            "@id": "dtmi:example:omicron_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_eta;1",
+            "@id": "dtmi:example:omicron_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_theta;1",
+            "@id": "dtmi:example:omicron_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_iota;1",
+            "@id": "dtmi:example:pi_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_kappa;1",
+            "@id": "dtmi:example:pi_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_lambda;1",
+            "@id": "dtmi:example:pi_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_mu;1",
+            "@id": "dtmi:example:pi_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_nu;1",
+            "@id": "dtmi:example:pi_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_xi;1",
+            "@id": "dtmi:example:pi_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_omicron;1",
+            "@id": "dtmi:example:pi_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_pi;1",
+            "@id": "dtmi:example:pi_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_rho;1",
+            "@id": "dtmi:example:pi_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_sigma;1",
+            "@id": "dtmi:example:pi_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_tau;1",
+            "@id": "dtmi:example:pi_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_upsilon;1",
+            "@id": "dtmi:example:pi_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_phi;1",
+            "@id": "dtmi:example:pi_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_chi;1",
+            "@id": "dtmi:example:pi_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_psi;1",
+            "@id": "dtmi:example:pi_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_omega;1",
+            "@id": "dtmi:example:pi_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_yuzz;1",
+            "@id": "dtmi:example:pi_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_wum;1",
+            "@id": "dtmi:example:pi_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_um;1",
+            "@id": "dtmi:example:pi_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_humpf;1",
+            "@id": "dtmi:example:pi_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_fuddle;1",
+            "@id": "dtmi:example:pi_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_glikk;1",
+            "@id": "dtmi:example:pi_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_nuh;1",
+            "@id": "dtmi:example:pi_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_snee;1",
+            "@id": "dtmi:example:pi_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_quan;1",
+            "@id": "dtmi:example:pi_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_thnad;1",
+            "@id": "dtmi:example:pi_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_spazz;1",
+            "@id": "dtmi:example:pi_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_floob;1",
+            "@id": "dtmi:example:pi_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_zatz;1",
+            "@id": "dtmi:example:pi_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_jogg;1",
+            "@id": "dtmi:example:pi_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_flunn;1",
+            "@id": "dtmi:example:pi_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_itch;1",
+            "@id": "dtmi:example:pi_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_yekk;1",
+            "@id": "dtmi:example:pi_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_vroo;1",
+            "@id": "dtmi:example:pi_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_hi;1",
+            "@id": "dtmi:example:pi_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_alpha;1",
+            "@id": "dtmi:example:pi_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_beta;1",
+            "@id": "dtmi:example:pi_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_gamma;1",
+            "@id": "dtmi:example:pi_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_delta;1",
+            "@id": "dtmi:example:pi_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_epsilon;1",
+            "@id": "dtmi:example:pi_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_zeta;1",
+            "@id": "dtmi:example:pi_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_eta;1",
+            "@id": "dtmi:example:pi_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_theta;1",
+            "@id": "dtmi:example:pi_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_iota;1",
+            "@id": "dtmi:example:rho_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_kappa;1",
+            "@id": "dtmi:example:rho_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_lambda;1",
+            "@id": "dtmi:example:rho_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_mu;1",
+            "@id": "dtmi:example:rho_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_nu;1",
+            "@id": "dtmi:example:rho_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_xi;1",
+            "@id": "dtmi:example:rho_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_omicron;1",
+            "@id": "dtmi:example:rho_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_pi;1",
+            "@id": "dtmi:example:rho_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_rho;1",
+            "@id": "dtmi:example:rho_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_sigma;1",
+            "@id": "dtmi:example:rho_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_tau;1",
+            "@id": "dtmi:example:rho_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_upsilon;1",
+            "@id": "dtmi:example:rho_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_phi;1",
+            "@id": "dtmi:example:rho_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_chi;1",
+            "@id": "dtmi:example:rho_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_psi;1",
+            "@id": "dtmi:example:rho_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_omega;1",
+            "@id": "dtmi:example:rho_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_yuzz;1",
+            "@id": "dtmi:example:rho_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_wum;1",
+            "@id": "dtmi:example:rho_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_um;1",
+            "@id": "dtmi:example:rho_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_humpf;1",
+            "@id": "dtmi:example:rho_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_fuddle;1",
+            "@id": "dtmi:example:rho_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_glikk;1",
+            "@id": "dtmi:example:rho_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_nuh;1",
+            "@id": "dtmi:example:rho_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_snee;1",
+            "@id": "dtmi:example:rho_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_quan;1",
+            "@id": "dtmi:example:rho_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_thnad;1",
+            "@id": "dtmi:example:rho_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_spazz;1",
+            "@id": "dtmi:example:rho_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_floob;1",
+            "@id": "dtmi:example:rho_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_zatz;1",
+            "@id": "dtmi:example:rho_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_jogg;1",
+            "@id": "dtmi:example:rho_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_flunn;1",
+            "@id": "dtmi:example:rho_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_itch;1",
+            "@id": "dtmi:example:rho_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_yekk;1",
+            "@id": "dtmi:example:rho_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_vroo;1",
+            "@id": "dtmi:example:rho_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_hi;1",
+            "@id": "dtmi:example:rho_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_alpha;1",
+            "@id": "dtmi:example:rho_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_beta;1",
+            "@id": "dtmi:example:rho_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_gamma;1",
+            "@id": "dtmi:example:rho_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_delta;1",
+            "@id": "dtmi:example:rho_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_epsilon;1",
+            "@id": "dtmi:example:rho_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_zeta;1",
+            "@id": "dtmi:example:rho_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_eta;1",
+            "@id": "dtmi:example:rho_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_theta;1",
+            "@id": "dtmi:example:rho_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_iota;1",
+            "@id": "dtmi:example:sigma_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_kappa;1",
+            "@id": "dtmi:example:sigma_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_lambda;1",
+            "@id": "dtmi:example:sigma_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_mu;1",
+            "@id": "dtmi:example:sigma_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_nu;1",
+            "@id": "dtmi:example:sigma_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_xi;1",
+            "@id": "dtmi:example:sigma_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_omicron;1",
+            "@id": "dtmi:example:sigma_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_pi;1",
+            "@id": "dtmi:example:sigma_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_rho;1",
+            "@id": "dtmi:example:sigma_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_sigma;1",
+            "@id": "dtmi:example:sigma_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_tau;1",
+            "@id": "dtmi:example:sigma_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_upsilon;1",
+            "@id": "dtmi:example:sigma_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_phi;1",
+            "@id": "dtmi:example:sigma_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_chi;1",
+            "@id": "dtmi:example:sigma_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_psi;1",
+            "@id": "dtmi:example:sigma_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_omega;1",
+            "@id": "dtmi:example:sigma_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_yuzz;1",
+            "@id": "dtmi:example:sigma_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_wum;1",
+            "@id": "dtmi:example:sigma_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_um;1",
+            "@id": "dtmi:example:sigma_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_humpf;1",
+            "@id": "dtmi:example:sigma_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_fuddle;1",
+            "@id": "dtmi:example:sigma_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_glikk;1",
+            "@id": "dtmi:example:sigma_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_nuh;1",
+            "@id": "dtmi:example:sigma_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_snee;1",
+            "@id": "dtmi:example:sigma_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_quan;1",
+            "@id": "dtmi:example:sigma_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_thnad;1",
+            "@id": "dtmi:example:sigma_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_spazz;1",
+            "@id": "dtmi:example:sigma_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_floob;1",
+            "@id": "dtmi:example:sigma_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_zatz;1",
+            "@id": "dtmi:example:sigma_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_jogg;1",
+            "@id": "dtmi:example:sigma_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_flunn;1",
+            "@id": "dtmi:example:sigma_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_itch;1",
+            "@id": "dtmi:example:sigma_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_yekk;1",
+            "@id": "dtmi:example:sigma_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_vroo;1",
+            "@id": "dtmi:example:sigma_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_hi;1",
+            "@id": "dtmi:example:sigma_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_alpha;1",
+            "@id": "dtmi:example:sigma_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_beta;1",
+            "@id": "dtmi:example:sigma_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_gamma;1",
+            "@id": "dtmi:example:sigma_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_delta;1",
+            "@id": "dtmi:example:sigma_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_epsilon;1",
+            "@id": "dtmi:example:sigma_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_zeta;1",
+            "@id": "dtmi:example:sigma_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_eta;1",
+            "@id": "dtmi:example:sigma_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_theta;1",
+            "@id": "dtmi:example:sigma_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_iota;1",
+            "@id": "dtmi:example:tau_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_kappa;1",
+            "@id": "dtmi:example:tau_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_lambda;1",
+            "@id": "dtmi:example:tau_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_mu;1",
+            "@id": "dtmi:example:tau_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_nu;1",
+            "@id": "dtmi:example:tau_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_xi;1",
+            "@id": "dtmi:example:tau_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_omicron;1",
+            "@id": "dtmi:example:tau_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_pi;1",
+            "@id": "dtmi:example:tau_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_rho;1",
+            "@id": "dtmi:example:tau_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_sigma;1",
+            "@id": "dtmi:example:tau_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_tau;1",
+            "@id": "dtmi:example:tau_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_upsilon;1",
+            "@id": "dtmi:example:tau_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_phi;1",
+            "@id": "dtmi:example:tau_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_chi;1",
+            "@id": "dtmi:example:tau_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_psi;1",
+            "@id": "dtmi:example:tau_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_omega;1",
+            "@id": "dtmi:example:tau_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_yuzz;1",
+            "@id": "dtmi:example:tau_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_wum;1",
+            "@id": "dtmi:example:tau_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_um;1",
+            "@id": "dtmi:example:tau_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_humpf;1",
+            "@id": "dtmi:example:tau_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_fuddle;1",
+            "@id": "dtmi:example:tau_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_glikk;1",
+            "@id": "dtmi:example:tau_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_nuh;1",
+            "@id": "dtmi:example:tau_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_snee;1",
+            "@id": "dtmi:example:tau_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_quan;1",
+            "@id": "dtmi:example:tau_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_thnad;1",
+            "@id": "dtmi:example:tau_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_spazz;1",
+            "@id": "dtmi:example:tau_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_floob;1",
+            "@id": "dtmi:example:tau_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_zatz;1",
+            "@id": "dtmi:example:tau_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_jogg;1",
+            "@id": "dtmi:example:tau_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_flunn;1",
+            "@id": "dtmi:example:tau_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_itch;1",
+            "@id": "dtmi:example:tau_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_yekk;1",
+            "@id": "dtmi:example:tau_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_vroo;1",
+            "@id": "dtmi:example:tau_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_hi;1",
+            "@id": "dtmi:example:tau_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_alpha;1",
+            "@id": "dtmi:example:tau_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_beta;1",
+            "@id": "dtmi:example:tau_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_gamma;1",
+            "@id": "dtmi:example:tau_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_delta;1",
+            "@id": "dtmi:example:tau_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_epsilon;1",
+            "@id": "dtmi:example:tau_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_zeta;1",
+            "@id": "dtmi:example:tau_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_eta;1",
+            "@id": "dtmi:example:tau_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_theta;1",
+            "@id": "dtmi:example:tau_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_iota;1",
+            "@id": "dtmi:example:upsilon_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_kappa;1",
+            "@id": "dtmi:example:upsilon_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_lambda;1",
+            "@id": "dtmi:example:upsilon_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_mu;1",
+            "@id": "dtmi:example:upsilon_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_nu;1",
+            "@id": "dtmi:example:upsilon_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_xi;1",
+            "@id": "dtmi:example:upsilon_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_omicron;1",
+            "@id": "dtmi:example:upsilon_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_pi;1",
+            "@id": "dtmi:example:upsilon_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_rho;1",
+            "@id": "dtmi:example:upsilon_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_sigma;1",
+            "@id": "dtmi:example:upsilon_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_tau;1",
+            "@id": "dtmi:example:upsilon_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_upsilon;1",
+            "@id": "dtmi:example:upsilon_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_phi;1",
+            "@id": "dtmi:example:upsilon_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_chi;1",
+            "@id": "dtmi:example:upsilon_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_psi;1",
+            "@id": "dtmi:example:upsilon_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_omega;1",
+            "@id": "dtmi:example:upsilon_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_yuzz;1",
+            "@id": "dtmi:example:upsilon_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_wum;1",
+            "@id": "dtmi:example:upsilon_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_um;1",
+            "@id": "dtmi:example:upsilon_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_humpf;1",
+            "@id": "dtmi:example:upsilon_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_fuddle;1",
+            "@id": "dtmi:example:upsilon_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_glikk;1",
+            "@id": "dtmi:example:upsilon_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_nuh;1",
+            "@id": "dtmi:example:upsilon_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_snee;1",
+            "@id": "dtmi:example:upsilon_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_quan;1",
+            "@id": "dtmi:example:upsilon_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_thnad;1",
+            "@id": "dtmi:example:upsilon_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_spazz;1",
+            "@id": "dtmi:example:upsilon_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_floob;1",
+            "@id": "dtmi:example:upsilon_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_zatz;1",
+            "@id": "dtmi:example:upsilon_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_jogg;1",
+            "@id": "dtmi:example:upsilon_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_flunn;1",
+            "@id": "dtmi:example:upsilon_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_itch;1",
+            "@id": "dtmi:example:upsilon_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_yekk;1",
+            "@id": "dtmi:example:upsilon_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_vroo;1",
+            "@id": "dtmi:example:upsilon_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_hi;1",
+            "@id": "dtmi:example:upsilon_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_alpha;1",
+            "@id": "dtmi:example:upsilon_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_beta;1",
+            "@id": "dtmi:example:upsilon_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_gamma;1",
+            "@id": "dtmi:example:upsilon_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_delta;1",
+            "@id": "dtmi:example:upsilon_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_epsilon;1",
+            "@id": "dtmi:example:upsilon_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_zeta;1",
+            "@id": "dtmi:example:upsilon_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_eta;1",
+            "@id": "dtmi:example:upsilon_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_theta;1",
+            "@id": "dtmi:example:upsilon_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_iota;1",
+            "@id": "dtmi:example:phi_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_kappa;1",
+            "@id": "dtmi:example:phi_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_lambda;1",
+            "@id": "dtmi:example:phi_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_mu;1",
+            "@id": "dtmi:example:phi_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_nu;1",
+            "@id": "dtmi:example:phi_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_xi;1",
+            "@id": "dtmi:example:phi_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_omicron;1",
+            "@id": "dtmi:example:phi_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_pi;1",
+            "@id": "dtmi:example:phi_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_rho;1",
+            "@id": "dtmi:example:phi_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_sigma;1",
+            "@id": "dtmi:example:phi_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_tau;1",
+            "@id": "dtmi:example:phi_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_upsilon;1",
+            "@id": "dtmi:example:phi_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_phi;1",
+            "@id": "dtmi:example:phi_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_chi;1",
+            "@id": "dtmi:example:phi_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_psi;1",
+            "@id": "dtmi:example:phi_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_omega;1",
+            "@id": "dtmi:example:phi_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_yuzz;1",
+            "@id": "dtmi:example:phi_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_wum;1",
+            "@id": "dtmi:example:phi_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_um;1",
+            "@id": "dtmi:example:phi_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_humpf;1",
+            "@id": "dtmi:example:phi_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_fuddle;1",
+            "@id": "dtmi:example:phi_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_glikk;1",
+            "@id": "dtmi:example:phi_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_nuh;1",
+            "@id": "dtmi:example:phi_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_snee;1",
+            "@id": "dtmi:example:phi_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_quan;1",
+            "@id": "dtmi:example:phi_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_thnad;1",
+            "@id": "dtmi:example:phi_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_spazz;1",
+            "@id": "dtmi:example:phi_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_floob;1",
+            "@id": "dtmi:example:phi_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_zatz;1",
+            "@id": "dtmi:example:phi_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_jogg;1",
+            "@id": "dtmi:example:phi_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_flunn;1",
+            "@id": "dtmi:example:phi_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_itch;1",
+            "@id": "dtmi:example:phi_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_yekk;1",
+            "@id": "dtmi:example:phi_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_vroo;1",
+            "@id": "dtmi:example:phi_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_hi;1",
+            "@id": "dtmi:example:phi_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_alpha;1",
+            "@id": "dtmi:example:phi_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_beta;1",
+            "@id": "dtmi:example:phi_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_gamma;1",
+            "@id": "dtmi:example:phi_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_delta;1",
+            "@id": "dtmi:example:phi_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_epsilon;1",
+            "@id": "dtmi:example:phi_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_zeta;1",
+            "@id": "dtmi:example:phi_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_eta;1",
+            "@id": "dtmi:example:phi_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_theta;1",
+            "@id": "dtmi:example:phi_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_iota;1",
+            "@id": "dtmi:example:chi_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_kappa;1",
+            "@id": "dtmi:example:chi_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_lambda;1",
+            "@id": "dtmi:example:chi_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_mu;1",
+            "@id": "dtmi:example:chi_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_nu;1",
+            "@id": "dtmi:example:chi_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_xi;1",
+            "@id": "dtmi:example:chi_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_omicron;1",
+            "@id": "dtmi:example:chi_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_pi;1",
+            "@id": "dtmi:example:chi_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_rho;1",
+            "@id": "dtmi:example:chi_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_sigma;1",
+            "@id": "dtmi:example:chi_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_tau;1",
+            "@id": "dtmi:example:chi_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_upsilon;1",
+            "@id": "dtmi:example:chi_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_phi;1",
+            "@id": "dtmi:example:chi_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_chi;1",
+            "@id": "dtmi:example:chi_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_psi;1",
+            "@id": "dtmi:example:chi_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_omega;1",
+            "@id": "dtmi:example:chi_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_yuzz;1",
+            "@id": "dtmi:example:chi_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_wum;1",
+            "@id": "dtmi:example:chi_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_um;1",
+            "@id": "dtmi:example:chi_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_humpf;1",
+            "@id": "dtmi:example:chi_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_fuddle;1",
+            "@id": "dtmi:example:chi_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_glikk;1",
+            "@id": "dtmi:example:chi_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_nuh;1",
+            "@id": "dtmi:example:chi_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_snee;1",
+            "@id": "dtmi:example:chi_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_quan;1",
+            "@id": "dtmi:example:chi_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_thnad;1",
+            "@id": "dtmi:example:chi_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_spazz;1",
+            "@id": "dtmi:example:chi_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_floob;1",
+            "@id": "dtmi:example:chi_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_zatz;1",
+            "@id": "dtmi:example:chi_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_jogg;1",
+            "@id": "dtmi:example:chi_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_flunn;1",
+            "@id": "dtmi:example:chi_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_itch;1",
+            "@id": "dtmi:example:chi_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_yekk;1",
+            "@id": "dtmi:example:chi_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_vroo;1",
+            "@id": "dtmi:example:chi_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_hi;1",
+            "@id": "dtmi:example:chi_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_alpha;1",
+            "@id": "dtmi:example:chi_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_beta;1",
+            "@id": "dtmi:example:chi_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_gamma;1",
+            "@id": "dtmi:example:chi_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_delta;1",
+            "@id": "dtmi:example:chi_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_epsilon;1",
+            "@id": "dtmi:example:chi_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_zeta;1",
+            "@id": "dtmi:example:chi_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_eta;1",
+            "@id": "dtmi:example:chi_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_theta;1",
+            "@id": "dtmi:example:chi_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_iota;1",
+            "@id": "dtmi:example:psi_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_kappa;1",
+            "@id": "dtmi:example:psi_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_lambda;1",
+            "@id": "dtmi:example:psi_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_mu;1",
+            "@id": "dtmi:example:psi_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_nu;1",
+            "@id": "dtmi:example:psi_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_xi;1",
+            "@id": "dtmi:example:psi_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_omicron;1",
+            "@id": "dtmi:example:psi_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_pi;1",
+            "@id": "dtmi:example:psi_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_rho;1",
+            "@id": "dtmi:example:psi_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_sigma;1",
+            "@id": "dtmi:example:psi_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_tau;1",
+            "@id": "dtmi:example:psi_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_upsilon;1",
+            "@id": "dtmi:example:psi_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_phi;1",
+            "@id": "dtmi:example:psi_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_chi;1",
+            "@id": "dtmi:example:psi_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_psi;1",
+            "@id": "dtmi:example:psi_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_omega;1",
+            "@id": "dtmi:example:psi_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_yuzz;1",
+            "@id": "dtmi:example:psi_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_wum;1",
+            "@id": "dtmi:example:psi_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_um;1",
+            "@id": "dtmi:example:psi_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_humpf;1",
+            "@id": "dtmi:example:psi_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_fuddle;1",
+            "@id": "dtmi:example:psi_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_glikk;1",
+            "@id": "dtmi:example:psi_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_nuh;1",
+            "@id": "dtmi:example:psi_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_snee;1",
+            "@id": "dtmi:example:psi_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_quan;1",
+            "@id": "dtmi:example:psi_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_thnad;1",
+            "@id": "dtmi:example:psi_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_spazz;1",
+            "@id": "dtmi:example:psi_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_floob;1",
+            "@id": "dtmi:example:psi_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_zatz;1",
+            "@id": "dtmi:example:psi_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_jogg;1",
+            "@id": "dtmi:example:psi_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_flunn;1",
+            "@id": "dtmi:example:psi_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_itch;1",
+            "@id": "dtmi:example:psi_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_yekk;1",
+            "@id": "dtmi:example:psi_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_vroo;1",
+            "@id": "dtmi:example:psi_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_hi;1",
+            "@id": "dtmi:example:psi_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_alpha;1",
+            "@id": "dtmi:example:psi_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_beta;1",
+            "@id": "dtmi:example:psi_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_gamma;1",
+            "@id": "dtmi:example:psi_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_delta;1",
+            "@id": "dtmi:example:psi_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_epsilon;1",
+            "@id": "dtmi:example:psi_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_zeta;1",
+            "@id": "dtmi:example:psi_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_eta;1",
+            "@id": "dtmi:example:psi_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_theta;1",
+            "@id": "dtmi:example:psi_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_iota;1",
+            "@id": "dtmi:example:omega_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_kappa;1",
+            "@id": "dtmi:example:omega_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_lambda;1",
+            "@id": "dtmi:example:omega_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_mu;1",
+            "@id": "dtmi:example:omega_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_nu;1",
+            "@id": "dtmi:example:omega_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_xi;1",
+            "@id": "dtmi:example:omega_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_omicron;1",
+            "@id": "dtmi:example:omega_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_pi;1",
+            "@id": "dtmi:example:omega_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_rho;1",
+            "@id": "dtmi:example:omega_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_sigma;1",
+            "@id": "dtmi:example:omega_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_tau;1",
+            "@id": "dtmi:example:omega_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_upsilon;1",
+            "@id": "dtmi:example:omega_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_phi;1",
+            "@id": "dtmi:example:omega_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_chi;1",
+            "@id": "dtmi:example:omega_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_psi;1",
+            "@id": "dtmi:example:omega_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_omega;1",
+            "@id": "dtmi:example:omega_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_yuzz;1",
+            "@id": "dtmi:example:omega_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_wum;1",
+            "@id": "dtmi:example:omega_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_um;1",
+            "@id": "dtmi:example:omega_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_humpf;1",
+            "@id": "dtmi:example:omega_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_fuddle;1",
+            "@id": "dtmi:example:omega_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_glikk;1",
+            "@id": "dtmi:example:omega_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_nuh;1",
+            "@id": "dtmi:example:omega_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_snee;1",
+            "@id": "dtmi:example:omega_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_quan;1",
+            "@id": "dtmi:example:omega_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_thnad;1",
+            "@id": "dtmi:example:omega_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_spazz;1",
+            "@id": "dtmi:example:omega_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_floob;1",
+            "@id": "dtmi:example:omega_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_zatz;1",
+            "@id": "dtmi:example:omega_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_jogg;1",
+            "@id": "dtmi:example:omega_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_flunn;1",
+            "@id": "dtmi:example:omega_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_itch;1",
+            "@id": "dtmi:example:omega_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_yekk;1",
+            "@id": "dtmi:example:omega_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_vroo;1",
+            "@id": "dtmi:example:omega_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_hi;1",
+            "@id": "dtmi:example:omega_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_alpha;1",
+            "@id": "dtmi:example:omega_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_beta;1",
+            "@id": "dtmi:example:omega_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_gamma;1",
+            "@id": "dtmi:example:omega_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_delta;1",
+            "@id": "dtmi:example:omega_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_epsilon;1",
+            "@id": "dtmi:example:omega_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_zeta;1",
+            "@id": "dtmi:example:omega_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_eta;1",
+            "@id": "dtmi:example:omega_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_theta;1",
+            "@id": "dtmi:example:omega_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_iota;1",
+            "@id": "dtmi:example:yuzz_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_kappa;1",
+            "@id": "dtmi:example:yuzz_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_lambda;1",
+            "@id": "dtmi:example:yuzz_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_mu;1",
+            "@id": "dtmi:example:yuzz_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_nu;1",
+            "@id": "dtmi:example:yuzz_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_xi;1",
+            "@id": "dtmi:example:yuzz_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_omicron;1",
+            "@id": "dtmi:example:yuzz_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_pi;1",
+            "@id": "dtmi:example:yuzz_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_rho;1",
+            "@id": "dtmi:example:yuzz_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_sigma;1",
+            "@id": "dtmi:example:yuzz_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_tau;1",
+            "@id": "dtmi:example:yuzz_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_upsilon;1",
+            "@id": "dtmi:example:yuzz_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_phi;1",
+            "@id": "dtmi:example:yuzz_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_chi;1",
+            "@id": "dtmi:example:yuzz_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_psi;1",
+            "@id": "dtmi:example:yuzz_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_omega;1",
+            "@id": "dtmi:example:yuzz_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_yuzz;1",
+            "@id": "dtmi:example:yuzz_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_wum;1",
+            "@id": "dtmi:example:yuzz_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_um;1",
+            "@id": "dtmi:example:yuzz_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_humpf;1",
+            "@id": "dtmi:example:yuzz_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_fuddle;1",
+            "@id": "dtmi:example:yuzz_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_glikk;1",
+            "@id": "dtmi:example:yuzz_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_nuh;1",
+            "@id": "dtmi:example:yuzz_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_snee;1",
+            "@id": "dtmi:example:yuzz_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_quan;1",
+            "@id": "dtmi:example:yuzz_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_thnad;1",
+            "@id": "dtmi:example:yuzz_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_spazz;1",
+            "@id": "dtmi:example:yuzz_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_floob;1",
+            "@id": "dtmi:example:yuzz_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_zatz;1",
+            "@id": "dtmi:example:yuzz_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_jogg;1",
+            "@id": "dtmi:example:yuzz_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_flunn;1",
+            "@id": "dtmi:example:yuzz_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_itch;1",
+            "@id": "dtmi:example:yuzz_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_yekk;1",
+            "@id": "dtmi:example:yuzz_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_vroo;1",
+            "@id": "dtmi:example:yuzz_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_hi;1",
+            "@id": "dtmi:example:yuzz_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_alpha;1",
+            "@id": "dtmi:example:yuzz_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_beta;1",
+            "@id": "dtmi:example:yuzz_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_gamma;1",
+            "@id": "dtmi:example:yuzz_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_delta;1",
+            "@id": "dtmi:example:yuzz_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_epsilon;1",
+            "@id": "dtmi:example:yuzz_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_zeta;1",
+            "@id": "dtmi:example:yuzz_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_eta;1",
+            "@id": "dtmi:example:yuzz_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_theta;1",
+            "@id": "dtmi:example:yuzz_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_iota;1",
+            "@id": "dtmi:example:wum_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_kappa;1",
+            "@id": "dtmi:example:wum_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_lambda;1",
+            "@id": "dtmi:example:wum_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_mu;1",
+            "@id": "dtmi:example:wum_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_nu;1",
+            "@id": "dtmi:example:wum_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_xi;1",
+            "@id": "dtmi:example:wum_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_omicron;1",
+            "@id": "dtmi:example:wum_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_pi;1",
+            "@id": "dtmi:example:wum_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_rho;1",
+            "@id": "dtmi:example:wum_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_sigma;1",
+            "@id": "dtmi:example:wum_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_tau;1",
+            "@id": "dtmi:example:wum_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_upsilon;1",
+            "@id": "dtmi:example:wum_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_phi;1",
+            "@id": "dtmi:example:wum_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_chi;1",
+            "@id": "dtmi:example:wum_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_psi;1",
+            "@id": "dtmi:example:wum_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_omega;1",
+            "@id": "dtmi:example:wum_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_yuzz;1",
+            "@id": "dtmi:example:wum_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_wum;1",
+            "@id": "dtmi:example:wum_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_um;1",
+            "@id": "dtmi:example:wum_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_humpf;1",
+            "@id": "dtmi:example:wum_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_fuddle;1",
+            "@id": "dtmi:example:wum_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_glikk;1",
+            "@id": "dtmi:example:wum_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_nuh;1",
+            "@id": "dtmi:example:wum_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_snee;1",
+            "@id": "dtmi:example:wum_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_quan;1",
+            "@id": "dtmi:example:wum_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_thnad;1",
+            "@id": "dtmi:example:wum_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_spazz;1",
+            "@id": "dtmi:example:wum_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_floob;1",
+            "@id": "dtmi:example:wum_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_zatz;1",
+            "@id": "dtmi:example:wum_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_jogg;1",
+            "@id": "dtmi:example:wum_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_flunn;1",
+            "@id": "dtmi:example:wum_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_itch;1",
+            "@id": "dtmi:example:wum_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_yekk;1",
+            "@id": "dtmi:example:wum_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_vroo;1",
+            "@id": "dtmi:example:wum_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_hi;1",
+            "@id": "dtmi:example:wum_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_alpha;1",
+            "@id": "dtmi:example:wum_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_beta;1",
+            "@id": "dtmi:example:wum_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_gamma;1",
+            "@id": "dtmi:example:wum_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_delta;1",
+            "@id": "dtmi:example:wum_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_epsilon;1",
+            "@id": "dtmi:example:wum_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_zeta;1",
+            "@id": "dtmi:example:wum_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_eta;1",
+            "@id": "dtmi:example:wum_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_theta;1",
+            "@id": "dtmi:example:wum_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_iota;1",
+            "@id": "dtmi:example:um_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_kappa;1",
+            "@id": "dtmi:example:um_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_lambda;1",
+            "@id": "dtmi:example:um_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_mu;1",
+            "@id": "dtmi:example:um_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_nu;1",
+            "@id": "dtmi:example:um_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_xi;1",
+            "@id": "dtmi:example:um_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_omicron;1",
+            "@id": "dtmi:example:um_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_pi;1",
+            "@id": "dtmi:example:um_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_rho;1",
+            "@id": "dtmi:example:um_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_sigma;1",
+            "@id": "dtmi:example:um_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_tau;1",
+            "@id": "dtmi:example:um_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_upsilon;1",
+            "@id": "dtmi:example:um_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_phi;1",
+            "@id": "dtmi:example:um_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_chi;1",
+            "@id": "dtmi:example:um_xi;1",
             "@type": "Interface"
           }
         ]
@@ -4118,4107 +4118,4107 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_rho;1",
+        "@id": "dtmi:example:theta_iota;1",
         "@type": "Interface",
         "extends": [
           {
-            "@id": "dtmi:example:nu_omega;1",
+            "@id": "dtmi:example:um_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_yuzz;1",
+            "@id": "dtmi:example:um_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_wum;1",
+            "@id": "dtmi:example:um_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_um;1",
+            "@id": "dtmi:example:um_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_humpf;1",
+            "@id": "dtmi:example:um_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_fuddle;1",
+            "@id": "dtmi:example:um_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_glikk;1",
+            "@id": "dtmi:example:um_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_nuh;1",
+            "@id": "dtmi:example:um_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_snee;1",
+            "@id": "dtmi:example:um_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_quan;1",
+            "@id": "dtmi:example:um_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_thnad;1",
+            "@id": "dtmi:example:um_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_spazz;1",
+            "@id": "dtmi:example:um_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_floob;1",
+            "@id": "dtmi:example:um_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_zatz;1",
+            "@id": "dtmi:example:um_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_jogg;1",
+            "@id": "dtmi:example:um_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_flunn;1",
+            "@id": "dtmi:example:um_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_itch;1",
+            "@id": "dtmi:example:um_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_yekk;1",
+            "@id": "dtmi:example:um_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_vroo;1",
+            "@id": "dtmi:example:um_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_hi;1",
+            "@id": "dtmi:example:um_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_alpha;1",
+            "@id": "dtmi:example:um_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_beta;1",
+            "@id": "dtmi:example:um_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_gamma;1",
+            "@id": "dtmi:example:um_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_delta;1",
+            "@id": "dtmi:example:um_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_epsilon;1",
+            "@id": "dtmi:example:um_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_zeta;1",
+            "@id": "dtmi:example:um_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_eta;1",
+            "@id": "dtmi:example:um_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_theta;1",
+            "@id": "dtmi:example:um_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_iota;1",
+            "@id": "dtmi:example:humpf_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_kappa;1",
+            "@id": "dtmi:example:humpf_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_lambda;1",
+            "@id": "dtmi:example:humpf_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_mu;1",
+            "@id": "dtmi:example:humpf_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_nu;1",
+            "@id": "dtmi:example:humpf_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_xi;1",
+            "@id": "dtmi:example:humpf_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_omicron;1",
+            "@id": "dtmi:example:humpf_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_pi;1",
+            "@id": "dtmi:example:humpf_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_rho;1",
+            "@id": "dtmi:example:humpf_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_sigma;1",
+            "@id": "dtmi:example:humpf_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_tau;1",
+            "@id": "dtmi:example:humpf_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_upsilon;1",
+            "@id": "dtmi:example:humpf_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_phi;1",
+            "@id": "dtmi:example:humpf_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_chi;1",
+            "@id": "dtmi:example:humpf_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_psi;1",
+            "@id": "dtmi:example:humpf_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_omega;1",
+            "@id": "dtmi:example:humpf_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_yuzz;1",
+            "@id": "dtmi:example:humpf_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_wum;1",
+            "@id": "dtmi:example:humpf_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_um;1",
+            "@id": "dtmi:example:humpf_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_humpf;1",
+            "@id": "dtmi:example:humpf_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_fuddle;1",
+            "@id": "dtmi:example:humpf_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_glikk;1",
+            "@id": "dtmi:example:humpf_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_nuh;1",
+            "@id": "dtmi:example:humpf_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_snee;1",
+            "@id": "dtmi:example:humpf_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_quan;1",
+            "@id": "dtmi:example:humpf_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_thnad;1",
+            "@id": "dtmi:example:humpf_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_spazz;1",
+            "@id": "dtmi:example:humpf_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_floob;1",
+            "@id": "dtmi:example:humpf_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_zatz;1",
+            "@id": "dtmi:example:humpf_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_jogg;1",
+            "@id": "dtmi:example:humpf_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_flunn;1",
+            "@id": "dtmi:example:humpf_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_itch;1",
+            "@id": "dtmi:example:humpf_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_yekk;1",
+            "@id": "dtmi:example:humpf_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_vroo;1",
+            "@id": "dtmi:example:humpf_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_hi;1",
+            "@id": "dtmi:example:humpf_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_alpha;1",
+            "@id": "dtmi:example:humpf_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_beta;1",
+            "@id": "dtmi:example:humpf_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_gamma;1",
+            "@id": "dtmi:example:humpf_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_delta;1",
+            "@id": "dtmi:example:humpf_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_epsilon;1",
+            "@id": "dtmi:example:humpf_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_zeta;1",
+            "@id": "dtmi:example:humpf_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_eta;1",
+            "@id": "dtmi:example:humpf_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_theta;1",
+            "@id": "dtmi:example:humpf_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_iota;1",
+            "@id": "dtmi:example:fuddle_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_kappa;1",
+            "@id": "dtmi:example:fuddle_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_lambda;1",
+            "@id": "dtmi:example:fuddle_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_mu;1",
+            "@id": "dtmi:example:fuddle_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_nu;1",
+            "@id": "dtmi:example:fuddle_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_xi;1",
+            "@id": "dtmi:example:fuddle_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_omicron;1",
+            "@id": "dtmi:example:fuddle_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_pi;1",
+            "@id": "dtmi:example:fuddle_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_rho;1",
+            "@id": "dtmi:example:fuddle_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_sigma;1",
+            "@id": "dtmi:example:fuddle_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_tau;1",
+            "@id": "dtmi:example:fuddle_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_upsilon;1",
+            "@id": "dtmi:example:fuddle_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_phi;1",
+            "@id": "dtmi:example:fuddle_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_chi;1",
+            "@id": "dtmi:example:fuddle_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_psi;1",
+            "@id": "dtmi:example:fuddle_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_omega;1",
+            "@id": "dtmi:example:fuddle_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_yuzz;1",
+            "@id": "dtmi:example:fuddle_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_wum;1",
+            "@id": "dtmi:example:fuddle_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_um;1",
+            "@id": "dtmi:example:fuddle_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_humpf;1",
+            "@id": "dtmi:example:fuddle_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_fuddle;1",
+            "@id": "dtmi:example:fuddle_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_glikk;1",
+            "@id": "dtmi:example:fuddle_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_nuh;1",
+            "@id": "dtmi:example:fuddle_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_snee;1",
+            "@id": "dtmi:example:fuddle_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_quan;1",
+            "@id": "dtmi:example:fuddle_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_thnad;1",
+            "@id": "dtmi:example:fuddle_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_spazz;1",
+            "@id": "dtmi:example:fuddle_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_floob;1",
+            "@id": "dtmi:example:fuddle_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_zatz;1",
+            "@id": "dtmi:example:fuddle_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_jogg;1",
+            "@id": "dtmi:example:fuddle_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_flunn;1",
+            "@id": "dtmi:example:fuddle_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_itch;1",
+            "@id": "dtmi:example:fuddle_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_yekk;1",
+            "@id": "dtmi:example:fuddle_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_vroo;1",
+            "@id": "dtmi:example:fuddle_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_hi;1",
+            "@id": "dtmi:example:fuddle_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_alpha;1",
+            "@id": "dtmi:example:fuddle_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_beta;1",
+            "@id": "dtmi:example:fuddle_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_gamma;1",
+            "@id": "dtmi:example:fuddle_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_delta;1",
+            "@id": "dtmi:example:fuddle_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_epsilon;1",
+            "@id": "dtmi:example:fuddle_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_zeta;1",
+            "@id": "dtmi:example:fuddle_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_eta;1",
+            "@id": "dtmi:example:fuddle_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_theta;1",
+            "@id": "dtmi:example:fuddle_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_iota;1",
+            "@id": "dtmi:example:glikk_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_kappa;1",
+            "@id": "dtmi:example:glikk_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_lambda;1",
+            "@id": "dtmi:example:glikk_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_mu;1",
+            "@id": "dtmi:example:glikk_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_nu;1",
+            "@id": "dtmi:example:glikk_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_xi;1",
+            "@id": "dtmi:example:glikk_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_omicron;1",
+            "@id": "dtmi:example:glikk_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_pi;1",
+            "@id": "dtmi:example:glikk_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_rho;1",
+            "@id": "dtmi:example:glikk_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_sigma;1",
+            "@id": "dtmi:example:glikk_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_tau;1",
+            "@id": "dtmi:example:glikk_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_upsilon;1",
+            "@id": "dtmi:example:glikk_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_phi;1",
+            "@id": "dtmi:example:glikk_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_chi;1",
+            "@id": "dtmi:example:glikk_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_psi;1",
+            "@id": "dtmi:example:glikk_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_omega;1",
+            "@id": "dtmi:example:glikk_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_yuzz;1",
+            "@id": "dtmi:example:glikk_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_wum;1",
+            "@id": "dtmi:example:glikk_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_um;1",
+            "@id": "dtmi:example:glikk_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_humpf;1",
+            "@id": "dtmi:example:glikk_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_fuddle;1",
+            "@id": "dtmi:example:glikk_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_glikk;1",
+            "@id": "dtmi:example:glikk_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_nuh;1",
+            "@id": "dtmi:example:glikk_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_snee;1",
+            "@id": "dtmi:example:glikk_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_quan;1",
+            "@id": "dtmi:example:glikk_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_thnad;1",
+            "@id": "dtmi:example:glikk_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_spazz;1",
+            "@id": "dtmi:example:glikk_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_floob;1",
+            "@id": "dtmi:example:glikk_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_zatz;1",
+            "@id": "dtmi:example:glikk_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_jogg;1",
+            "@id": "dtmi:example:glikk_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_flunn;1",
+            "@id": "dtmi:example:glikk_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_itch;1",
+            "@id": "dtmi:example:glikk_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_yekk;1",
+            "@id": "dtmi:example:glikk_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_vroo;1",
+            "@id": "dtmi:example:glikk_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_hi;1",
+            "@id": "dtmi:example:glikk_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_alpha;1",
+            "@id": "dtmi:example:glikk_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_beta;1",
+            "@id": "dtmi:example:glikk_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_gamma;1",
+            "@id": "dtmi:example:glikk_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_delta;1",
+            "@id": "dtmi:example:glikk_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_epsilon;1",
+            "@id": "dtmi:example:glikk_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_zeta;1",
+            "@id": "dtmi:example:glikk_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_eta;1",
+            "@id": "dtmi:example:glikk_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_theta;1",
+            "@id": "dtmi:example:glikk_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_iota;1",
+            "@id": "dtmi:example:nuh_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_kappa;1",
+            "@id": "dtmi:example:nuh_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_lambda;1",
+            "@id": "dtmi:example:nuh_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_mu;1",
+            "@id": "dtmi:example:nuh_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_nu;1",
+            "@id": "dtmi:example:nuh_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_xi;1",
+            "@id": "dtmi:example:nuh_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_omicron;1",
+            "@id": "dtmi:example:nuh_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_pi;1",
+            "@id": "dtmi:example:nuh_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_rho;1",
+            "@id": "dtmi:example:nuh_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_sigma;1",
+            "@id": "dtmi:example:nuh_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_tau;1",
+            "@id": "dtmi:example:nuh_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_upsilon;1",
+            "@id": "dtmi:example:nuh_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_phi;1",
+            "@id": "dtmi:example:nuh_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_chi;1",
+            "@id": "dtmi:example:nuh_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_psi;1",
+            "@id": "dtmi:example:nuh_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_omega;1",
+            "@id": "dtmi:example:nuh_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_yuzz;1",
+            "@id": "dtmi:example:nuh_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_wum;1",
+            "@id": "dtmi:example:nuh_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_um;1",
+            "@id": "dtmi:example:nuh_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_humpf;1",
+            "@id": "dtmi:example:nuh_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_fuddle;1",
+            "@id": "dtmi:example:nuh_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_glikk;1",
+            "@id": "dtmi:example:nuh_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_nuh;1",
+            "@id": "dtmi:example:nuh_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_snee;1",
+            "@id": "dtmi:example:nuh_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_quan;1",
+            "@id": "dtmi:example:nuh_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_thnad;1",
+            "@id": "dtmi:example:nuh_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_spazz;1",
+            "@id": "dtmi:example:nuh_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_floob;1",
+            "@id": "dtmi:example:nuh_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_zatz;1",
+            "@id": "dtmi:example:nuh_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_jogg;1",
+            "@id": "dtmi:example:nuh_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_flunn;1",
+            "@id": "dtmi:example:nuh_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_itch;1",
+            "@id": "dtmi:example:nuh_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_yekk;1",
+            "@id": "dtmi:example:nuh_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_vroo;1",
+            "@id": "dtmi:example:nuh_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_hi;1",
+            "@id": "dtmi:example:nuh_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_alpha;1",
+            "@id": "dtmi:example:nuh_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_beta;1",
+            "@id": "dtmi:example:nuh_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_gamma;1",
+            "@id": "dtmi:example:nuh_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_delta;1",
+            "@id": "dtmi:example:nuh_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_epsilon;1",
+            "@id": "dtmi:example:nuh_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_zeta;1",
+            "@id": "dtmi:example:nuh_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_eta;1",
+            "@id": "dtmi:example:nuh_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_theta;1",
+            "@id": "dtmi:example:nuh_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_iota;1",
+            "@id": "dtmi:example:snee_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_kappa;1",
+            "@id": "dtmi:example:snee_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_lambda;1",
+            "@id": "dtmi:example:snee_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_mu;1",
+            "@id": "dtmi:example:snee_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_nu;1",
+            "@id": "dtmi:example:snee_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_xi;1",
+            "@id": "dtmi:example:snee_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_omicron;1",
+            "@id": "dtmi:example:snee_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_pi;1",
+            "@id": "dtmi:example:snee_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_rho;1",
+            "@id": "dtmi:example:snee_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_sigma;1",
+            "@id": "dtmi:example:snee_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_tau;1",
+            "@id": "dtmi:example:snee_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_upsilon;1",
+            "@id": "dtmi:example:snee_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_phi;1",
+            "@id": "dtmi:example:snee_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_chi;1",
+            "@id": "dtmi:example:snee_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_psi;1",
+            "@id": "dtmi:example:snee_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_omega;1",
+            "@id": "dtmi:example:snee_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_yuzz;1",
+            "@id": "dtmi:example:snee_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_wum;1",
+            "@id": "dtmi:example:snee_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_um;1",
+            "@id": "dtmi:example:snee_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_humpf;1",
+            "@id": "dtmi:example:snee_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_fuddle;1",
+            "@id": "dtmi:example:snee_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_glikk;1",
+            "@id": "dtmi:example:snee_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_nuh;1",
+            "@id": "dtmi:example:snee_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_snee;1",
+            "@id": "dtmi:example:snee_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_quan;1",
+            "@id": "dtmi:example:snee_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_thnad;1",
+            "@id": "dtmi:example:snee_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_spazz;1",
+            "@id": "dtmi:example:snee_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_floob;1",
+            "@id": "dtmi:example:snee_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_zatz;1",
+            "@id": "dtmi:example:snee_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_jogg;1",
+            "@id": "dtmi:example:snee_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_flunn;1",
+            "@id": "dtmi:example:snee_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_itch;1",
+            "@id": "dtmi:example:snee_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_yekk;1",
+            "@id": "dtmi:example:snee_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_vroo;1",
+            "@id": "dtmi:example:snee_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_hi;1",
+            "@id": "dtmi:example:snee_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_alpha;1",
+            "@id": "dtmi:example:snee_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_beta;1",
+            "@id": "dtmi:example:snee_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_gamma;1",
+            "@id": "dtmi:example:snee_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_delta;1",
+            "@id": "dtmi:example:snee_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_epsilon;1",
+            "@id": "dtmi:example:snee_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_zeta;1",
+            "@id": "dtmi:example:snee_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_eta;1",
+            "@id": "dtmi:example:snee_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_theta;1",
+            "@id": "dtmi:example:snee_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_iota;1",
+            "@id": "dtmi:example:quan_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_kappa;1",
+            "@id": "dtmi:example:quan_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_lambda;1",
+            "@id": "dtmi:example:quan_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_mu;1",
+            "@id": "dtmi:example:quan_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_nu;1",
+            "@id": "dtmi:example:quan_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_xi;1",
+            "@id": "dtmi:example:quan_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_omicron;1",
+            "@id": "dtmi:example:quan_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_pi;1",
+            "@id": "dtmi:example:quan_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_rho;1",
+            "@id": "dtmi:example:quan_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_sigma;1",
+            "@id": "dtmi:example:quan_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_tau;1",
+            "@id": "dtmi:example:quan_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_upsilon;1",
+            "@id": "dtmi:example:quan_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_phi;1",
+            "@id": "dtmi:example:quan_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_chi;1",
+            "@id": "dtmi:example:quan_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_psi;1",
+            "@id": "dtmi:example:quan_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_omega;1",
+            "@id": "dtmi:example:quan_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_yuzz;1",
+            "@id": "dtmi:example:quan_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_wum;1",
+            "@id": "dtmi:example:quan_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_um;1",
+            "@id": "dtmi:example:quan_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_humpf;1",
+            "@id": "dtmi:example:quan_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_fuddle;1",
+            "@id": "dtmi:example:quan_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_glikk;1",
+            "@id": "dtmi:example:quan_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_nuh;1",
+            "@id": "dtmi:example:quan_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_snee;1",
+            "@id": "dtmi:example:quan_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_quan;1",
+            "@id": "dtmi:example:quan_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_thnad;1",
+            "@id": "dtmi:example:quan_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_spazz;1",
+            "@id": "dtmi:example:quan_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_floob;1",
+            "@id": "dtmi:example:quan_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_zatz;1",
+            "@id": "dtmi:example:quan_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_jogg;1",
+            "@id": "dtmi:example:quan_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_flunn;1",
+            "@id": "dtmi:example:quan_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_itch;1",
+            "@id": "dtmi:example:quan_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_yekk;1",
+            "@id": "dtmi:example:quan_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_vroo;1",
+            "@id": "dtmi:example:quan_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:tau_hi;1",
+            "@id": "dtmi:example:quan_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_alpha;1",
+            "@id": "dtmi:example:quan_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_beta;1",
+            "@id": "dtmi:example:quan_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_gamma;1",
+            "@id": "dtmi:example:quan_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_delta;1",
+            "@id": "dtmi:example:quan_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_epsilon;1",
+            "@id": "dtmi:example:quan_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_zeta;1",
+            "@id": "dtmi:example:quan_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_eta;1",
+            "@id": "dtmi:example:quan_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_theta;1",
+            "@id": "dtmi:example:quan_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_iota;1",
+            "@id": "dtmi:example:thnad_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_kappa;1",
+            "@id": "dtmi:example:thnad_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_lambda;1",
+            "@id": "dtmi:example:thnad_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_mu;1",
+            "@id": "dtmi:example:thnad_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_nu;1",
+            "@id": "dtmi:example:thnad_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_xi;1",
+            "@id": "dtmi:example:thnad_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_omicron;1",
+            "@id": "dtmi:example:thnad_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_pi;1",
+            "@id": "dtmi:example:thnad_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_rho;1",
+            "@id": "dtmi:example:thnad_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_sigma;1",
+            "@id": "dtmi:example:thnad_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_tau;1",
+            "@id": "dtmi:example:thnad_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_upsilon;1",
+            "@id": "dtmi:example:thnad_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_phi;1",
+            "@id": "dtmi:example:thnad_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_chi;1",
+            "@id": "dtmi:example:thnad_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_psi;1",
+            "@id": "dtmi:example:thnad_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_omega;1",
+            "@id": "dtmi:example:thnad_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_yuzz;1",
+            "@id": "dtmi:example:thnad_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_wum;1",
+            "@id": "dtmi:example:thnad_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_um;1",
+            "@id": "dtmi:example:thnad_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_humpf;1",
+            "@id": "dtmi:example:thnad_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_fuddle;1",
+            "@id": "dtmi:example:thnad_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_glikk;1",
+            "@id": "dtmi:example:thnad_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_nuh;1",
+            "@id": "dtmi:example:thnad_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_snee;1",
+            "@id": "dtmi:example:thnad_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_quan;1",
+            "@id": "dtmi:example:thnad_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_thnad;1",
+            "@id": "dtmi:example:thnad_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_spazz;1",
+            "@id": "dtmi:example:thnad_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_floob;1",
+            "@id": "dtmi:example:thnad_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_zatz;1",
+            "@id": "dtmi:example:thnad_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_jogg;1",
+            "@id": "dtmi:example:thnad_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_flunn;1",
+            "@id": "dtmi:example:thnad_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_itch;1",
+            "@id": "dtmi:example:thnad_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_yekk;1",
+            "@id": "dtmi:example:thnad_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_vroo;1",
+            "@id": "dtmi:example:thnad_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:upsilon_hi;1",
+            "@id": "dtmi:example:thnad_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_alpha;1",
+            "@id": "dtmi:example:thnad_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_beta;1",
+            "@id": "dtmi:example:thnad_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_gamma;1",
+            "@id": "dtmi:example:thnad_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_delta;1",
+            "@id": "dtmi:example:thnad_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_epsilon;1",
+            "@id": "dtmi:example:thnad_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_zeta;1",
+            "@id": "dtmi:example:thnad_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_eta;1",
+            "@id": "dtmi:example:thnad_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_theta;1",
+            "@id": "dtmi:example:thnad_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_iota;1",
+            "@id": "dtmi:example:spazz_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_kappa;1",
+            "@id": "dtmi:example:spazz_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_lambda;1",
+            "@id": "dtmi:example:spazz_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_mu;1",
+            "@id": "dtmi:example:spazz_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_nu;1",
+            "@id": "dtmi:example:spazz_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_xi;1",
+            "@id": "dtmi:example:spazz_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_omicron;1",
+            "@id": "dtmi:example:spazz_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_pi;1",
+            "@id": "dtmi:example:spazz_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_rho;1",
+            "@id": "dtmi:example:spazz_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_sigma;1",
+            "@id": "dtmi:example:spazz_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_tau;1",
+            "@id": "dtmi:example:spazz_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_upsilon;1",
+            "@id": "dtmi:example:spazz_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_phi;1",
+            "@id": "dtmi:example:spazz_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_chi;1",
+            "@id": "dtmi:example:spazz_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_psi;1",
+            "@id": "dtmi:example:spazz_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_omega;1",
+            "@id": "dtmi:example:spazz_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_yuzz;1",
+            "@id": "dtmi:example:spazz_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_wum;1",
+            "@id": "dtmi:example:spazz_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_um;1",
+            "@id": "dtmi:example:spazz_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_humpf;1",
+            "@id": "dtmi:example:spazz_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_fuddle;1",
+            "@id": "dtmi:example:spazz_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_glikk;1",
+            "@id": "dtmi:example:spazz_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_nuh;1",
+            "@id": "dtmi:example:spazz_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_snee;1",
+            "@id": "dtmi:example:spazz_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_quan;1",
+            "@id": "dtmi:example:spazz_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_thnad;1",
+            "@id": "dtmi:example:spazz_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_spazz;1",
+            "@id": "dtmi:example:spazz_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_floob;1",
+            "@id": "dtmi:example:spazz_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_zatz;1",
+            "@id": "dtmi:example:spazz_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_jogg;1",
+            "@id": "dtmi:example:spazz_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_flunn;1",
+            "@id": "dtmi:example:spazz_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_itch;1",
+            "@id": "dtmi:example:spazz_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_yekk;1",
+            "@id": "dtmi:example:spazz_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_vroo;1",
+            "@id": "dtmi:example:spazz_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:phi_hi;1",
+            "@id": "dtmi:example:spazz_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_alpha;1",
+            "@id": "dtmi:example:spazz_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_beta;1",
+            "@id": "dtmi:example:spazz_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_gamma;1",
+            "@id": "dtmi:example:spazz_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_delta;1",
+            "@id": "dtmi:example:spazz_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_epsilon;1",
+            "@id": "dtmi:example:spazz_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_zeta;1",
+            "@id": "dtmi:example:spazz_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_eta;1",
+            "@id": "dtmi:example:spazz_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_theta;1",
+            "@id": "dtmi:example:spazz_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_iota;1",
+            "@id": "dtmi:example:floob_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_kappa;1",
+            "@id": "dtmi:example:floob_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_lambda;1",
+            "@id": "dtmi:example:floob_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_mu;1",
+            "@id": "dtmi:example:floob_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_nu;1",
+            "@id": "dtmi:example:floob_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_xi;1",
+            "@id": "dtmi:example:floob_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_omicron;1",
+            "@id": "dtmi:example:floob_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_pi;1",
+            "@id": "dtmi:example:floob_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_rho;1",
+            "@id": "dtmi:example:floob_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_sigma;1",
+            "@id": "dtmi:example:floob_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_tau;1",
+            "@id": "dtmi:example:floob_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_upsilon;1",
+            "@id": "dtmi:example:floob_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_phi;1",
+            "@id": "dtmi:example:floob_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_chi;1",
+            "@id": "dtmi:example:floob_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_psi;1",
+            "@id": "dtmi:example:floob_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_omega;1",
+            "@id": "dtmi:example:floob_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_yuzz;1",
+            "@id": "dtmi:example:floob_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_wum;1",
+            "@id": "dtmi:example:floob_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_um;1",
+            "@id": "dtmi:example:floob_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_humpf;1",
+            "@id": "dtmi:example:floob_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_fuddle;1",
+            "@id": "dtmi:example:floob_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_glikk;1",
+            "@id": "dtmi:example:floob_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_nuh;1",
+            "@id": "dtmi:example:floob_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_snee;1",
+            "@id": "dtmi:example:floob_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_quan;1",
+            "@id": "dtmi:example:floob_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_thnad;1",
+            "@id": "dtmi:example:floob_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_spazz;1",
+            "@id": "dtmi:example:floob_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_floob;1",
+            "@id": "dtmi:example:floob_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_zatz;1",
+            "@id": "dtmi:example:floob_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_jogg;1",
+            "@id": "dtmi:example:floob_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_flunn;1",
+            "@id": "dtmi:example:floob_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_itch;1",
+            "@id": "dtmi:example:floob_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_yekk;1",
+            "@id": "dtmi:example:floob_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_vroo;1",
+            "@id": "dtmi:example:floob_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:chi_hi;1",
+            "@id": "dtmi:example:floob_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_alpha;1",
+            "@id": "dtmi:example:floob_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_beta;1",
+            "@id": "dtmi:example:floob_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_gamma;1",
+            "@id": "dtmi:example:floob_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_delta;1",
+            "@id": "dtmi:example:floob_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_epsilon;1",
+            "@id": "dtmi:example:floob_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_zeta;1",
+            "@id": "dtmi:example:floob_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_eta;1",
+            "@id": "dtmi:example:floob_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_theta;1",
+            "@id": "dtmi:example:floob_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_iota;1",
+            "@id": "dtmi:example:zatz_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_kappa;1",
+            "@id": "dtmi:example:zatz_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_lambda;1",
+            "@id": "dtmi:example:zatz_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_mu;1",
+            "@id": "dtmi:example:zatz_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_nu;1",
+            "@id": "dtmi:example:zatz_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_xi;1",
+            "@id": "dtmi:example:zatz_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_omicron;1",
+            "@id": "dtmi:example:zatz_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_pi;1",
+            "@id": "dtmi:example:zatz_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_rho;1",
+            "@id": "dtmi:example:zatz_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_sigma;1",
+            "@id": "dtmi:example:zatz_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_tau;1",
+            "@id": "dtmi:example:zatz_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_upsilon;1",
+            "@id": "dtmi:example:zatz_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_phi;1",
+            "@id": "dtmi:example:zatz_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_chi;1",
+            "@id": "dtmi:example:zatz_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_psi;1",
+            "@id": "dtmi:example:zatz_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_omega;1",
+            "@id": "dtmi:example:zatz_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_yuzz;1",
+            "@id": "dtmi:example:zatz_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_wum;1",
+            "@id": "dtmi:example:zatz_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_um;1",
+            "@id": "dtmi:example:zatz_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_humpf;1",
+            "@id": "dtmi:example:zatz_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_fuddle;1",
+            "@id": "dtmi:example:zatz_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_glikk;1",
+            "@id": "dtmi:example:zatz_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_nuh;1",
+            "@id": "dtmi:example:zatz_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_snee;1",
+            "@id": "dtmi:example:zatz_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_quan;1",
+            "@id": "dtmi:example:zatz_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_thnad;1",
+            "@id": "dtmi:example:zatz_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_spazz;1",
+            "@id": "dtmi:example:zatz_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_floob;1",
+            "@id": "dtmi:example:zatz_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_zatz;1",
+            "@id": "dtmi:example:zatz_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_jogg;1",
+            "@id": "dtmi:example:zatz_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_flunn;1",
+            "@id": "dtmi:example:zatz_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_itch;1",
+            "@id": "dtmi:example:zatz_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_yekk;1",
+            "@id": "dtmi:example:zatz_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_vroo;1",
+            "@id": "dtmi:example:zatz_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:psi_hi;1",
+            "@id": "dtmi:example:zatz_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_alpha;1",
+            "@id": "dtmi:example:zatz_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_beta;1",
+            "@id": "dtmi:example:zatz_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_gamma;1",
+            "@id": "dtmi:example:zatz_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_delta;1",
+            "@id": "dtmi:example:zatz_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_epsilon;1",
+            "@id": "dtmi:example:zatz_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_zeta;1",
+            "@id": "dtmi:example:zatz_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_eta;1",
+            "@id": "dtmi:example:zatz_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_theta;1",
+            "@id": "dtmi:example:zatz_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_iota;1",
+            "@id": "dtmi:example:jogg_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_kappa;1",
+            "@id": "dtmi:example:jogg_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_lambda;1",
+            "@id": "dtmi:example:jogg_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_mu;1",
+            "@id": "dtmi:example:jogg_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_nu;1",
+            "@id": "dtmi:example:jogg_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_xi;1",
+            "@id": "dtmi:example:jogg_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_omicron;1",
+            "@id": "dtmi:example:jogg_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_pi;1",
+            "@id": "dtmi:example:jogg_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_rho;1",
+            "@id": "dtmi:example:jogg_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_sigma;1",
+            "@id": "dtmi:example:jogg_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_tau;1",
+            "@id": "dtmi:example:jogg_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_upsilon;1",
+            "@id": "dtmi:example:jogg_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_phi;1",
+            "@id": "dtmi:example:jogg_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_chi;1",
+            "@id": "dtmi:example:jogg_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_psi;1",
+            "@id": "dtmi:example:jogg_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_omega;1",
+            "@id": "dtmi:example:jogg_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_yuzz;1",
+            "@id": "dtmi:example:jogg_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_wum;1",
+            "@id": "dtmi:example:jogg_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_um;1",
+            "@id": "dtmi:example:jogg_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_humpf;1",
+            "@id": "dtmi:example:jogg_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_fuddle;1",
+            "@id": "dtmi:example:jogg_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_glikk;1",
+            "@id": "dtmi:example:jogg_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_nuh;1",
+            "@id": "dtmi:example:jogg_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_snee;1",
+            "@id": "dtmi:example:jogg_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_quan;1",
+            "@id": "dtmi:example:jogg_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_thnad;1",
+            "@id": "dtmi:example:jogg_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_spazz;1",
+            "@id": "dtmi:example:jogg_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_floob;1",
+            "@id": "dtmi:example:jogg_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_zatz;1",
+            "@id": "dtmi:example:jogg_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_jogg;1",
+            "@id": "dtmi:example:jogg_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_flunn;1",
+            "@id": "dtmi:example:jogg_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_itch;1",
+            "@id": "dtmi:example:jogg_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_yekk;1",
+            "@id": "dtmi:example:jogg_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_vroo;1",
+            "@id": "dtmi:example:jogg_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omega_hi;1",
+            "@id": "dtmi:example:jogg_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_alpha;1",
+            "@id": "dtmi:example:jogg_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_beta;1",
+            "@id": "dtmi:example:jogg_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_gamma;1",
+            "@id": "dtmi:example:jogg_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_delta;1",
+            "@id": "dtmi:example:jogg_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_epsilon;1",
+            "@id": "dtmi:example:jogg_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_zeta;1",
+            "@id": "dtmi:example:jogg_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_eta;1",
+            "@id": "dtmi:example:jogg_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_theta;1",
+            "@id": "dtmi:example:jogg_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_iota;1",
+            "@id": "dtmi:example:flunn_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_kappa;1",
+            "@id": "dtmi:example:flunn_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_lambda;1",
+            "@id": "dtmi:example:flunn_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_mu;1",
+            "@id": "dtmi:example:flunn_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_nu;1",
+            "@id": "dtmi:example:flunn_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_xi;1",
+            "@id": "dtmi:example:flunn_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_omicron;1",
+            "@id": "dtmi:example:flunn_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_pi;1",
+            "@id": "dtmi:example:flunn_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_rho;1",
+            "@id": "dtmi:example:flunn_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_sigma;1",
+            "@id": "dtmi:example:flunn_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_tau;1",
+            "@id": "dtmi:example:flunn_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_upsilon;1",
+            "@id": "dtmi:example:flunn_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_phi;1",
+            "@id": "dtmi:example:flunn_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_chi;1",
+            "@id": "dtmi:example:flunn_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_psi;1",
+            "@id": "dtmi:example:flunn_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_omega;1",
+            "@id": "dtmi:example:flunn_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_yuzz;1",
+            "@id": "dtmi:example:flunn_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_wum;1",
+            "@id": "dtmi:example:flunn_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_um;1",
+            "@id": "dtmi:example:flunn_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_humpf;1",
+            "@id": "dtmi:example:flunn_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_fuddle;1",
+            "@id": "dtmi:example:flunn_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_glikk;1",
+            "@id": "dtmi:example:flunn_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_nuh;1",
+            "@id": "dtmi:example:flunn_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_snee;1",
+            "@id": "dtmi:example:flunn_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_quan;1",
+            "@id": "dtmi:example:flunn_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_thnad;1",
+            "@id": "dtmi:example:flunn_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_spazz;1",
+            "@id": "dtmi:example:flunn_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_floob;1",
+            "@id": "dtmi:example:flunn_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_zatz;1",
+            "@id": "dtmi:example:flunn_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_jogg;1",
+            "@id": "dtmi:example:flunn_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_flunn;1",
+            "@id": "dtmi:example:flunn_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_itch;1",
+            "@id": "dtmi:example:flunn_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_yekk;1",
+            "@id": "dtmi:example:flunn_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_vroo;1",
+            "@id": "dtmi:example:flunn_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yuzz_hi;1",
+            "@id": "dtmi:example:flunn_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_alpha;1",
+            "@id": "dtmi:example:flunn_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_beta;1",
+            "@id": "dtmi:example:flunn_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_gamma;1",
+            "@id": "dtmi:example:flunn_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_delta;1",
+            "@id": "dtmi:example:flunn_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_epsilon;1",
+            "@id": "dtmi:example:flunn_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_zeta;1",
+            "@id": "dtmi:example:flunn_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_eta;1",
+            "@id": "dtmi:example:flunn_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_theta;1",
+            "@id": "dtmi:example:flunn_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_iota;1",
+            "@id": "dtmi:example:itch_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_kappa;1",
+            "@id": "dtmi:example:itch_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_lambda;1",
+            "@id": "dtmi:example:itch_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_mu;1",
+            "@id": "dtmi:example:itch_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_nu;1",
+            "@id": "dtmi:example:itch_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_xi;1",
+            "@id": "dtmi:example:itch_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_omicron;1",
+            "@id": "dtmi:example:itch_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_pi;1",
+            "@id": "dtmi:example:itch_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_rho;1",
+            "@id": "dtmi:example:itch_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_sigma;1",
+            "@id": "dtmi:example:itch_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_tau;1",
+            "@id": "dtmi:example:itch_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_upsilon;1",
+            "@id": "dtmi:example:itch_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_phi;1",
+            "@id": "dtmi:example:itch_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_chi;1",
+            "@id": "dtmi:example:itch_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_psi;1",
+            "@id": "dtmi:example:itch_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_omega;1",
+            "@id": "dtmi:example:itch_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_yuzz;1",
+            "@id": "dtmi:example:itch_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_wum;1",
+            "@id": "dtmi:example:itch_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_um;1",
+            "@id": "dtmi:example:itch_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_humpf;1",
+            "@id": "dtmi:example:itch_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_fuddle;1",
+            "@id": "dtmi:example:itch_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_glikk;1",
+            "@id": "dtmi:example:itch_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_nuh;1",
+            "@id": "dtmi:example:itch_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_snee;1",
+            "@id": "dtmi:example:itch_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_quan;1",
+            "@id": "dtmi:example:itch_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_thnad;1",
+            "@id": "dtmi:example:itch_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_spazz;1",
+            "@id": "dtmi:example:itch_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_floob;1",
+            "@id": "dtmi:example:itch_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_zatz;1",
+            "@id": "dtmi:example:itch_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_jogg;1",
+            "@id": "dtmi:example:itch_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_flunn;1",
+            "@id": "dtmi:example:itch_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_itch;1",
+            "@id": "dtmi:example:itch_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_yekk;1",
+            "@id": "dtmi:example:itch_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_vroo;1",
+            "@id": "dtmi:example:itch_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:wum_hi;1",
+            "@id": "dtmi:example:itch_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_alpha;1",
+            "@id": "dtmi:example:itch_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_beta;1",
+            "@id": "dtmi:example:itch_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_gamma;1",
+            "@id": "dtmi:example:itch_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_delta;1",
+            "@id": "dtmi:example:itch_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_epsilon;1",
+            "@id": "dtmi:example:itch_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_zeta;1",
+            "@id": "dtmi:example:itch_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_eta;1",
+            "@id": "dtmi:example:itch_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_theta;1",
+            "@id": "dtmi:example:itch_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_iota;1",
+            "@id": "dtmi:example:yekk_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_kappa;1",
+            "@id": "dtmi:example:yekk_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_lambda;1",
+            "@id": "dtmi:example:yekk_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_mu;1",
+            "@id": "dtmi:example:yekk_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_nu;1",
+            "@id": "dtmi:example:yekk_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_xi;1",
+            "@id": "dtmi:example:yekk_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_omicron;1",
+            "@id": "dtmi:example:yekk_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_pi;1",
+            "@id": "dtmi:example:yekk_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_rho;1",
+            "@id": "dtmi:example:yekk_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_sigma;1",
+            "@id": "dtmi:example:yekk_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_tau;1",
+            "@id": "dtmi:example:yekk_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_upsilon;1",
+            "@id": "dtmi:example:yekk_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_phi;1",
+            "@id": "dtmi:example:yekk_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_chi;1",
+            "@id": "dtmi:example:yekk_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_psi;1",
+            "@id": "dtmi:example:yekk_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_omega;1",
+            "@id": "dtmi:example:yekk_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_yuzz;1",
+            "@id": "dtmi:example:yekk_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_wum;1",
+            "@id": "dtmi:example:yekk_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_um;1",
+            "@id": "dtmi:example:yekk_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_humpf;1",
+            "@id": "dtmi:example:yekk_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_fuddle;1",
+            "@id": "dtmi:example:yekk_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_glikk;1",
+            "@id": "dtmi:example:yekk_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_nuh;1",
+            "@id": "dtmi:example:yekk_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_snee;1",
+            "@id": "dtmi:example:yekk_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_quan;1",
+            "@id": "dtmi:example:yekk_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_thnad;1",
+            "@id": "dtmi:example:yekk_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_spazz;1",
+            "@id": "dtmi:example:yekk_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_floob;1",
+            "@id": "dtmi:example:yekk_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_zatz;1",
+            "@id": "dtmi:example:yekk_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_jogg;1",
+            "@id": "dtmi:example:yekk_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_flunn;1",
+            "@id": "dtmi:example:yekk_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_itch;1",
+            "@id": "dtmi:example:yekk_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_yekk;1",
+            "@id": "dtmi:example:yekk_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_vroo;1",
+            "@id": "dtmi:example:yekk_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:um_hi;1",
+            "@id": "dtmi:example:yekk_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_alpha;1",
+            "@id": "dtmi:example:yekk_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_beta;1",
+            "@id": "dtmi:example:yekk_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_gamma;1",
+            "@id": "dtmi:example:yekk_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_delta;1",
+            "@id": "dtmi:example:yekk_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_epsilon;1",
+            "@id": "dtmi:example:yekk_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_zeta;1",
+            "@id": "dtmi:example:yekk_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_eta;1",
+            "@id": "dtmi:example:yekk_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_theta;1",
+            "@id": "dtmi:example:yekk_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_iota;1",
+            "@id": "dtmi:example:vroo_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_kappa;1",
+            "@id": "dtmi:example:vroo_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_lambda;1",
+            "@id": "dtmi:example:vroo_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_mu;1",
+            "@id": "dtmi:example:vroo_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_nu;1",
+            "@id": "dtmi:example:vroo_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_xi;1",
+            "@id": "dtmi:example:vroo_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_omicron;1",
+            "@id": "dtmi:example:vroo_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_pi;1",
+            "@id": "dtmi:example:vroo_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_rho;1",
+            "@id": "dtmi:example:vroo_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_sigma;1",
+            "@id": "dtmi:example:vroo_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_tau;1",
+            "@id": "dtmi:example:vroo_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_upsilon;1",
+            "@id": "dtmi:example:vroo_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_phi;1",
+            "@id": "dtmi:example:vroo_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_chi;1",
+            "@id": "dtmi:example:vroo_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_psi;1",
+            "@id": "dtmi:example:vroo_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_omega;1",
+            "@id": "dtmi:example:vroo_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_yuzz;1",
+            "@id": "dtmi:example:vroo_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_wum;1",
+            "@id": "dtmi:example:vroo_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_um;1",
+            "@id": "dtmi:example:vroo_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_humpf;1",
+            "@id": "dtmi:example:vroo_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_fuddle;1",
+            "@id": "dtmi:example:vroo_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_glikk;1",
+            "@id": "dtmi:example:vroo_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_nuh;1",
+            "@id": "dtmi:example:vroo_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_snee;1",
+            "@id": "dtmi:example:vroo_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_quan;1",
+            "@id": "dtmi:example:vroo_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_thnad;1",
+            "@id": "dtmi:example:vroo_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_spazz;1",
+            "@id": "dtmi:example:vroo_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_floob;1",
+            "@id": "dtmi:example:vroo_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_zatz;1",
+            "@id": "dtmi:example:vroo_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_jogg;1",
+            "@id": "dtmi:example:vroo_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_flunn;1",
+            "@id": "dtmi:example:vroo_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_itch;1",
+            "@id": "dtmi:example:vroo_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_yekk;1",
+            "@id": "dtmi:example:vroo_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_vroo;1",
+            "@id": "dtmi:example:vroo_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:humpf_hi;1",
+            "@id": "dtmi:example:vroo_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_alpha;1",
+            "@id": "dtmi:example:vroo_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_beta;1",
+            "@id": "dtmi:example:vroo_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_gamma;1",
+            "@id": "dtmi:example:vroo_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_delta;1",
+            "@id": "dtmi:example:vroo_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_epsilon;1",
+            "@id": "dtmi:example:vroo_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_zeta;1",
+            "@id": "dtmi:example:vroo_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_eta;1",
+            "@id": "dtmi:example:vroo_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_theta;1",
+            "@id": "dtmi:example:vroo_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_iota;1",
+            "@id": "dtmi:example:hi_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_kappa;1",
+            "@id": "dtmi:example:hi_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_lambda;1",
+            "@id": "dtmi:example:hi_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_mu;1",
+            "@id": "dtmi:example:hi_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_nu;1",
+            "@id": "dtmi:example:hi_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_xi;1",
+            "@id": "dtmi:example:hi_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_omicron;1",
+            "@id": "dtmi:example:hi_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_pi;1",
+            "@id": "dtmi:example:hi_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_rho;1",
+            "@id": "dtmi:example:hi_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_sigma;1",
+            "@id": "dtmi:example:hi_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_tau;1",
+            "@id": "dtmi:example:hi_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_upsilon;1",
+            "@id": "dtmi:example:hi_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_phi;1",
+            "@id": "dtmi:example:hi_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_chi;1",
+            "@id": "dtmi:example:hi_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_psi;1",
+            "@id": "dtmi:example:hi_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_omega;1",
+            "@id": "dtmi:example:hi_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_yuzz;1",
+            "@id": "dtmi:example:hi_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_wum;1",
+            "@id": "dtmi:example:hi_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_um;1",
+            "@id": "dtmi:example:hi_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_humpf;1",
+            "@id": "dtmi:example:hi_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_fuddle;1",
+            "@id": "dtmi:example:hi_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_glikk;1",
+            "@id": "dtmi:example:hi_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_nuh;1",
+            "@id": "dtmi:example:hi_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_snee;1",
+            "@id": "dtmi:example:hi_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_quan;1",
+            "@id": "dtmi:example:hi_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_thnad;1",
+            "@id": "dtmi:example:hi_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_spazz;1",
+            "@id": "dtmi:example:hi_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_floob;1",
+            "@id": "dtmi:example:hi_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_zatz;1",
+            "@id": "dtmi:example:hi_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_jogg;1",
+            "@id": "dtmi:example:hi_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_flunn;1",
+            "@id": "dtmi:example:hi_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_itch;1",
+            "@id": "dtmi:example:hi_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_yekk;1",
+            "@id": "dtmi:example:hi_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_vroo;1",
+            "@id": "dtmi:example:hi_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:fuddle_hi;1",
+            "@id": "dtmi:example:hi_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_alpha;1",
+            "@id": "dtmi:example:hi_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_beta;1",
+            "@id": "dtmi:example:hi_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_gamma;1",
+            "@id": "dtmi:example:hi_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_delta;1",
+            "@id": "dtmi:example:hi_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_epsilon;1",
+            "@id": "dtmi:example:hi_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_zeta;1",
+            "@id": "dtmi:example:hi_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_eta;1",
+            "@id": "dtmi:example:hi_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_theta;1",
+            "@id": "dtmi:example:hi_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_iota;1",
+            "@id": "dtmi:example:alpha_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_kappa;1",
+            "@id": "dtmi:example:alpha_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_lambda;1",
+            "@id": "dtmi:example:alpha_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_mu;1",
+            "@id": "dtmi:example:alpha_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_nu;1",
+            "@id": "dtmi:example:alpha_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_xi;1",
+            "@id": "dtmi:example:alpha_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_omicron;1",
+            "@id": "dtmi:example:alpha_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_pi;1",
+            "@id": "dtmi:example:alpha_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_rho;1",
+            "@id": "dtmi:example:alpha_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_sigma;1",
+            "@id": "dtmi:example:alpha_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_tau;1",
+            "@id": "dtmi:example:alpha_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_upsilon;1",
+            "@id": "dtmi:example:alpha_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_phi;1",
+            "@id": "dtmi:example:alpha_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_chi;1",
+            "@id": "dtmi:example:alpha_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_psi;1",
+            "@id": "dtmi:example:alpha_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_omega;1",
+            "@id": "dtmi:example:alpha_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_yuzz;1",
+            "@id": "dtmi:example:alpha_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_wum;1",
+            "@id": "dtmi:example:alpha_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_um;1",
+            "@id": "dtmi:example:alpha_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_humpf;1",
+            "@id": "dtmi:example:alpha_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_fuddle;1",
+            "@id": "dtmi:example:alpha_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_glikk;1",
+            "@id": "dtmi:example:alpha_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_nuh;1",
+            "@id": "dtmi:example:alpha_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_snee;1",
+            "@id": "dtmi:example:alpha_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_quan;1",
+            "@id": "dtmi:example:alpha_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_thnad;1",
+            "@id": "dtmi:example:alpha_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_spazz;1",
+            "@id": "dtmi:example:alpha_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_floob;1",
+            "@id": "dtmi:example:alpha_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_zatz;1",
+            "@id": "dtmi:example:alpha_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_jogg;1",
+            "@id": "dtmi:example:alpha_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_flunn;1",
+            "@id": "dtmi:example:alpha_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_itch;1",
+            "@id": "dtmi:example:alpha_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_yekk;1",
+            "@id": "dtmi:example:alpha_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_vroo;1",
+            "@id": "dtmi:example:alpha_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:glikk_hi;1",
+            "@id": "dtmi:example:alpha_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_alpha;1",
+            "@id": "dtmi:example:alpha_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_beta;1",
+            "@id": "dtmi:example:alpha_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_gamma;1",
+            "@id": "dtmi:example:alpha_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_delta;1",
+            "@id": "dtmi:example:alpha_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_epsilon;1",
+            "@id": "dtmi:example:alpha_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_zeta;1",
+            "@id": "dtmi:example:alpha_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_eta;1",
+            "@id": "dtmi:example:alpha_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_theta;1",
+            "@id": "dtmi:example:alpha_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_iota;1",
+            "@id": "dtmi:example:beta_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_kappa;1",
+            "@id": "dtmi:example:beta_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_lambda;1",
+            "@id": "dtmi:example:beta_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_mu;1",
+            "@id": "dtmi:example:beta_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_nu;1",
+            "@id": "dtmi:example:beta_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_xi;1",
+            "@id": "dtmi:example:beta_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_omicron;1",
+            "@id": "dtmi:example:beta_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_pi;1",
+            "@id": "dtmi:example:beta_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_rho;1",
+            "@id": "dtmi:example:beta_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_sigma;1",
+            "@id": "dtmi:example:beta_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_tau;1",
+            "@id": "dtmi:example:beta_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_upsilon;1",
+            "@id": "dtmi:example:beta_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_phi;1",
+            "@id": "dtmi:example:beta_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_chi;1",
+            "@id": "dtmi:example:beta_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_psi;1",
+            "@id": "dtmi:example:beta_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_omega;1",
+            "@id": "dtmi:example:beta_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_yuzz;1",
+            "@id": "dtmi:example:beta_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_wum;1",
+            "@id": "dtmi:example:beta_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_um;1",
+            "@id": "dtmi:example:beta_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_humpf;1",
+            "@id": "dtmi:example:beta_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_fuddle;1",
+            "@id": "dtmi:example:beta_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_glikk;1",
+            "@id": "dtmi:example:beta_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_nuh;1",
+            "@id": "dtmi:example:beta_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_snee;1",
+            "@id": "dtmi:example:beta_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_quan;1",
+            "@id": "dtmi:example:beta_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_thnad;1",
+            "@id": "dtmi:example:beta_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_spazz;1",
+            "@id": "dtmi:example:beta_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_floob;1",
+            "@id": "dtmi:example:beta_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_zatz;1",
+            "@id": "dtmi:example:beta_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_jogg;1",
+            "@id": "dtmi:example:beta_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_flunn;1",
+            "@id": "dtmi:example:beta_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_itch;1",
+            "@id": "dtmi:example:beta_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_yekk;1",
+            "@id": "dtmi:example:beta_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_vroo;1",
+            "@id": "dtmi:example:beta_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nuh_hi;1",
+            "@id": "dtmi:example:beta_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_alpha;1",
+            "@id": "dtmi:example:beta_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_beta;1",
+            "@id": "dtmi:example:beta_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_gamma;1",
+            "@id": "dtmi:example:beta_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_delta;1",
+            "@id": "dtmi:example:beta_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_epsilon;1",
+            "@id": "dtmi:example:beta_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_zeta;1",
+            "@id": "dtmi:example:beta_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_eta;1",
+            "@id": "dtmi:example:beta_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_theta;1",
+            "@id": "dtmi:example:beta_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_iota;1",
+            "@id": "dtmi:example:gamma_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_kappa;1",
+            "@id": "dtmi:example:gamma_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_lambda;1",
+            "@id": "dtmi:example:gamma_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_mu;1",
+            "@id": "dtmi:example:gamma_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_nu;1",
+            "@id": "dtmi:example:gamma_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_xi;1",
+            "@id": "dtmi:example:gamma_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_omicron;1",
+            "@id": "dtmi:example:gamma_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_pi;1",
+            "@id": "dtmi:example:gamma_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_rho;1",
+            "@id": "dtmi:example:gamma_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_sigma;1",
+            "@id": "dtmi:example:gamma_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_tau;1",
+            "@id": "dtmi:example:gamma_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_upsilon;1",
+            "@id": "dtmi:example:gamma_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_phi;1",
+            "@id": "dtmi:example:gamma_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_chi;1",
+            "@id": "dtmi:example:gamma_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_psi;1",
+            "@id": "dtmi:example:gamma_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_omega;1",
+            "@id": "dtmi:example:gamma_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_yuzz;1",
+            "@id": "dtmi:example:gamma_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_wum;1",
+            "@id": "dtmi:example:gamma_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_um;1",
+            "@id": "dtmi:example:gamma_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_humpf;1",
+            "@id": "dtmi:example:gamma_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_fuddle;1",
+            "@id": "dtmi:example:gamma_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_glikk;1",
+            "@id": "dtmi:example:gamma_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_nuh;1",
+            "@id": "dtmi:example:gamma_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_snee;1",
+            "@id": "dtmi:example:gamma_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_quan;1",
+            "@id": "dtmi:example:gamma_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_thnad;1",
+            "@id": "dtmi:example:gamma_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_spazz;1",
+            "@id": "dtmi:example:gamma_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_floob;1",
+            "@id": "dtmi:example:gamma_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_zatz;1",
+            "@id": "dtmi:example:gamma_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_jogg;1",
+            "@id": "dtmi:example:gamma_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_flunn;1",
+            "@id": "dtmi:example:gamma_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_itch;1",
+            "@id": "dtmi:example:gamma_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_yekk;1",
+            "@id": "dtmi:example:gamma_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_vroo;1",
+            "@id": "dtmi:example:gamma_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:snee_hi;1",
+            "@id": "dtmi:example:gamma_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_alpha;1",
+            "@id": "dtmi:example:gamma_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_beta;1",
+            "@id": "dtmi:example:gamma_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_gamma;1",
+            "@id": "dtmi:example:gamma_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_delta;1",
+            "@id": "dtmi:example:gamma_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_epsilon;1",
+            "@id": "dtmi:example:gamma_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_zeta;1",
+            "@id": "dtmi:example:gamma_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_eta;1",
+            "@id": "dtmi:example:gamma_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_theta;1",
+            "@id": "dtmi:example:gamma_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_iota;1",
+            "@id": "dtmi:example:delta_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_kappa;1",
+            "@id": "dtmi:example:delta_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_lambda;1",
+            "@id": "dtmi:example:delta_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_mu;1",
+            "@id": "dtmi:example:delta_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_nu;1",
+            "@id": "dtmi:example:delta_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_xi;1",
+            "@id": "dtmi:example:delta_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_omicron;1",
+            "@id": "dtmi:example:delta_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_pi;1",
+            "@id": "dtmi:example:delta_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_rho;1",
+            "@id": "dtmi:example:delta_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_sigma;1",
+            "@id": "dtmi:example:delta_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_tau;1",
+            "@id": "dtmi:example:delta_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_upsilon;1",
+            "@id": "dtmi:example:delta_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_phi;1",
+            "@id": "dtmi:example:delta_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_chi;1",
+            "@id": "dtmi:example:delta_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_psi;1",
+            "@id": "dtmi:example:delta_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_omega;1",
+            "@id": "dtmi:example:delta_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_yuzz;1",
+            "@id": "dtmi:example:delta_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_wum;1",
+            "@id": "dtmi:example:delta_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_um;1",
+            "@id": "dtmi:example:delta_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_humpf;1",
+            "@id": "dtmi:example:delta_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_fuddle;1",
+            "@id": "dtmi:example:delta_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_glikk;1",
+            "@id": "dtmi:example:delta_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_nuh;1",
+            "@id": "dtmi:example:delta_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_snee;1",
+            "@id": "dtmi:example:delta_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_quan;1",
+            "@id": "dtmi:example:delta_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_thnad;1",
+            "@id": "dtmi:example:delta_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_spazz;1",
+            "@id": "dtmi:example:delta_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_floob;1",
+            "@id": "dtmi:example:delta_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_zatz;1",
+            "@id": "dtmi:example:delta_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_jogg;1",
+            "@id": "dtmi:example:delta_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_flunn;1",
+            "@id": "dtmi:example:delta_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_itch;1",
+            "@id": "dtmi:example:delta_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_yekk;1",
+            "@id": "dtmi:example:delta_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_vroo;1",
+            "@id": "dtmi:example:delta_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:quan_hi;1",
+            "@id": "dtmi:example:delta_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_alpha;1",
+            "@id": "dtmi:example:delta_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_beta;1",
+            "@id": "dtmi:example:delta_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_gamma;1",
+            "@id": "dtmi:example:delta_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_delta;1",
+            "@id": "dtmi:example:delta_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_epsilon;1",
+            "@id": "dtmi:example:delta_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_zeta;1",
+            "@id": "dtmi:example:delta_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_eta;1",
+            "@id": "dtmi:example:delta_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_theta;1",
+            "@id": "dtmi:example:delta_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_iota;1",
+            "@id": "dtmi:example:epsilon_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_kappa;1",
+            "@id": "dtmi:example:epsilon_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_lambda;1",
+            "@id": "dtmi:example:epsilon_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_mu;1",
+            "@id": "dtmi:example:epsilon_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_nu;1",
+            "@id": "dtmi:example:epsilon_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_xi;1",
+            "@id": "dtmi:example:epsilon_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_omicron;1",
+            "@id": "dtmi:example:epsilon_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_pi;1",
+            "@id": "dtmi:example:epsilon_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_rho;1",
+            "@id": "dtmi:example:epsilon_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_sigma;1",
+            "@id": "dtmi:example:epsilon_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_tau;1",
+            "@id": "dtmi:example:epsilon_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_upsilon;1",
+            "@id": "dtmi:example:epsilon_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_phi;1",
+            "@id": "dtmi:example:epsilon_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_chi;1",
+            "@id": "dtmi:example:epsilon_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_psi;1",
+            "@id": "dtmi:example:epsilon_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_omega;1",
+            "@id": "dtmi:example:epsilon_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_yuzz;1",
+            "@id": "dtmi:example:epsilon_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_wum;1",
+            "@id": "dtmi:example:epsilon_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_um;1",
+            "@id": "dtmi:example:epsilon_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_humpf;1",
+            "@id": "dtmi:example:epsilon_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_fuddle;1",
+            "@id": "dtmi:example:epsilon_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_glikk;1",
+            "@id": "dtmi:example:epsilon_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_nuh;1",
+            "@id": "dtmi:example:epsilon_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_snee;1",
+            "@id": "dtmi:example:epsilon_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_quan;1",
+            "@id": "dtmi:example:epsilon_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_thnad;1",
+            "@id": "dtmi:example:epsilon_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_spazz;1",
+            "@id": "dtmi:example:epsilon_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_floob;1",
+            "@id": "dtmi:example:epsilon_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_zatz;1",
+            "@id": "dtmi:example:epsilon_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_jogg;1",
+            "@id": "dtmi:example:epsilon_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_flunn;1",
+            "@id": "dtmi:example:epsilon_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_itch;1",
+            "@id": "dtmi:example:epsilon_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_yekk;1",
+            "@id": "dtmi:example:epsilon_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_vroo;1",
+            "@id": "dtmi:example:epsilon_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:thnad_hi;1",
+            "@id": "dtmi:example:epsilon_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_alpha;1",
+            "@id": "dtmi:example:epsilon_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_beta;1",
+            "@id": "dtmi:example:epsilon_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_gamma;1",
+            "@id": "dtmi:example:epsilon_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_delta;1",
+            "@id": "dtmi:example:epsilon_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_epsilon;1",
+            "@id": "dtmi:example:epsilon_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_zeta;1",
+            "@id": "dtmi:example:epsilon_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_eta;1",
+            "@id": "dtmi:example:epsilon_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_theta;1",
+            "@id": "dtmi:example:epsilon_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_iota;1",
+            "@id": "dtmi:example:zeta_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_kappa;1",
+            "@id": "dtmi:example:zeta_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_lambda;1",
+            "@id": "dtmi:example:zeta_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_mu;1",
+            "@id": "dtmi:example:zeta_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_nu;1",
+            "@id": "dtmi:example:zeta_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_xi;1",
+            "@id": "dtmi:example:zeta_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_omicron;1",
+            "@id": "dtmi:example:zeta_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_pi;1",
+            "@id": "dtmi:example:zeta_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_rho;1",
+            "@id": "dtmi:example:zeta_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_sigma;1",
+            "@id": "dtmi:example:zeta_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_tau;1",
+            "@id": "dtmi:example:zeta_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_upsilon;1",
+            "@id": "dtmi:example:zeta_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_phi;1",
+            "@id": "dtmi:example:zeta_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_chi;1",
+            "@id": "dtmi:example:zeta_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_psi;1",
+            "@id": "dtmi:example:zeta_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_omega;1",
+            "@id": "dtmi:example:zeta_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_yuzz;1",
+            "@id": "dtmi:example:zeta_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_wum;1",
+            "@id": "dtmi:example:zeta_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_um;1",
+            "@id": "dtmi:example:zeta_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_humpf;1",
+            "@id": "dtmi:example:zeta_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_fuddle;1",
+            "@id": "dtmi:example:zeta_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_glikk;1",
+            "@id": "dtmi:example:zeta_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_nuh;1",
+            "@id": "dtmi:example:zeta_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_snee;1",
+            "@id": "dtmi:example:zeta_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_quan;1",
+            "@id": "dtmi:example:zeta_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_thnad;1",
+            "@id": "dtmi:example:zeta_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_spazz;1",
+            "@id": "dtmi:example:zeta_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_floob;1",
+            "@id": "dtmi:example:zeta_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_zatz;1",
+            "@id": "dtmi:example:zeta_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_jogg;1",
+            "@id": "dtmi:example:zeta_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_flunn;1",
+            "@id": "dtmi:example:zeta_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_itch;1",
+            "@id": "dtmi:example:zeta_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_yekk;1",
+            "@id": "dtmi:example:zeta_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_vroo;1",
+            "@id": "dtmi:example:zeta_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:spazz_hi;1",
+            "@id": "dtmi:example:zeta_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_alpha;1",
+            "@id": "dtmi:example:zeta_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_beta;1",
+            "@id": "dtmi:example:zeta_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_gamma;1",
+            "@id": "dtmi:example:zeta_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_delta;1",
+            "@id": "dtmi:example:zeta_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_epsilon;1",
+            "@id": "dtmi:example:zeta_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_zeta;1",
+            "@id": "dtmi:example:zeta_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_eta;1",
+            "@id": "dtmi:example:zeta_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_theta;1",
+            "@id": "dtmi:example:zeta_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_iota;1",
+            "@id": "dtmi:example:eta_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_kappa;1",
+            "@id": "dtmi:example:eta_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_lambda;1",
+            "@id": "dtmi:example:eta_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_mu;1",
+            "@id": "dtmi:example:eta_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_nu;1",
+            "@id": "dtmi:example:eta_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_xi;1",
+            "@id": "dtmi:example:eta_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_omicron;1",
+            "@id": "dtmi:example:eta_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_pi;1",
+            "@id": "dtmi:example:eta_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_rho;1",
+            "@id": "dtmi:example:eta_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_sigma;1",
+            "@id": "dtmi:example:eta_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_tau;1",
+            "@id": "dtmi:example:eta_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_upsilon;1",
+            "@id": "dtmi:example:eta_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_phi;1",
+            "@id": "dtmi:example:eta_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_chi;1",
+            "@id": "dtmi:example:eta_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_psi;1",
+            "@id": "dtmi:example:eta_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_omega;1",
+            "@id": "dtmi:example:eta_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_yuzz;1",
+            "@id": "dtmi:example:eta_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_wum;1",
+            "@id": "dtmi:example:eta_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_um;1",
+            "@id": "dtmi:example:eta_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_humpf;1",
+            "@id": "dtmi:example:eta_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_fuddle;1",
+            "@id": "dtmi:example:eta_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_glikk;1",
+            "@id": "dtmi:example:eta_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_nuh;1",
+            "@id": "dtmi:example:eta_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_snee;1",
+            "@id": "dtmi:example:eta_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_quan;1",
+            "@id": "dtmi:example:eta_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_thnad;1",
+            "@id": "dtmi:example:eta_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_spazz;1",
+            "@id": "dtmi:example:eta_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_floob;1",
+            "@id": "dtmi:example:eta_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_zatz;1",
+            "@id": "dtmi:example:eta_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_jogg;1",
+            "@id": "dtmi:example:eta_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_flunn;1",
+            "@id": "dtmi:example:eta_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_itch;1",
+            "@id": "dtmi:example:eta_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_yekk;1",
+            "@id": "dtmi:example:eta_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_vroo;1",
+            "@id": "dtmi:example:eta_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:floob_hi;1",
+            "@id": "dtmi:example:eta_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_alpha;1",
+            "@id": "dtmi:example:eta_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_beta;1",
+            "@id": "dtmi:example:eta_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_gamma;1",
+            "@id": "dtmi:example:eta_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_delta;1",
+            "@id": "dtmi:example:eta_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_epsilon;1",
+            "@id": "dtmi:example:eta_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_zeta;1",
+            "@id": "dtmi:example:eta_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_eta;1",
+            "@id": "dtmi:example:eta_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_theta;1",
+            "@id": "dtmi:example:eta_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_iota;1",
+            "@id": "dtmi:example:theta_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_kappa;1",
+            "@id": "dtmi:example:theta_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_lambda;1",
+            "@id": "dtmi:example:theta_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_mu;1",
+            "@id": "dtmi:example:theta_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_nu;1",
+            "@id": "dtmi:example:theta_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_xi;1",
+            "@id": "dtmi:example:theta_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_omicron;1",
+            "@id": "dtmi:example:theta_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_pi;1",
+            "@id": "dtmi:example:theta_theta;1",
             "@type": "Interface"
           }
         ]
@@ -8236,4107 +8236,4107 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:sigma_lambda;1",
+        "@id": "dtmi:example:snee_gamma;1",
         "@type": "Interface",
         "extends": [
           {
-            "@id": "dtmi:example:zatz_sigma;1",
+            "@id": "dtmi:example:theta_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_tau;1",
+            "@id": "dtmi:example:theta_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_upsilon;1",
+            "@id": "dtmi:example:theta_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_phi;1",
+            "@id": "dtmi:example:theta_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_chi;1",
+            "@id": "dtmi:example:theta_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_psi;1",
+            "@id": "dtmi:example:theta_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_omega;1",
+            "@id": "dtmi:example:theta_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_yuzz;1",
+            "@id": "dtmi:example:theta_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_wum;1",
+            "@id": "dtmi:example:theta_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_um;1",
+            "@id": "dtmi:example:theta_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_humpf;1",
+            "@id": "dtmi:example:theta_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_fuddle;1",
+            "@id": "dtmi:example:theta_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_glikk;1",
+            "@id": "dtmi:example:theta_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_nuh;1",
+            "@id": "dtmi:example:theta_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_snee;1",
+            "@id": "dtmi:example:theta_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_quan;1",
+            "@id": "dtmi:example:theta_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_thnad;1",
+            "@id": "dtmi:example:theta_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_spazz;1",
+            "@id": "dtmi:example:theta_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_floob;1",
+            "@id": "dtmi:example:theta_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_zatz;1",
+            "@id": "dtmi:example:theta_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_jogg;1",
+            "@id": "dtmi:example:theta_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_flunn;1",
+            "@id": "dtmi:example:theta_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_itch;1",
+            "@id": "dtmi:example:theta_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_yekk;1",
+            "@id": "dtmi:example:theta_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_vroo;1",
+            "@id": "dtmi:example:theta_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zatz_hi;1",
+            "@id": "dtmi:example:theta_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_alpha;1",
+            "@id": "dtmi:example:theta_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_beta;1",
+            "@id": "dtmi:example:theta_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_gamma;1",
+            "@id": "dtmi:example:theta_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_delta;1",
+            "@id": "dtmi:example:theta_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_epsilon;1",
+            "@id": "dtmi:example:theta_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_zeta;1",
+            "@id": "dtmi:example:theta_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_eta;1",
+            "@id": "dtmi:example:theta_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_theta;1",
+            "@id": "dtmi:example:theta_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_iota;1",
+            "@id": "dtmi:example:iota_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_kappa;1",
+            "@id": "dtmi:example:iota_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_lambda;1",
+            "@id": "dtmi:example:iota_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_mu;1",
+            "@id": "dtmi:example:iota_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_nu;1",
+            "@id": "dtmi:example:iota_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_xi;1",
+            "@id": "dtmi:example:iota_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_omicron;1",
+            "@id": "dtmi:example:iota_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_pi;1",
+            "@id": "dtmi:example:iota_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_rho;1",
+            "@id": "dtmi:example:iota_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_sigma;1",
+            "@id": "dtmi:example:iota_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_tau;1",
+            "@id": "dtmi:example:iota_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_upsilon;1",
+            "@id": "dtmi:example:iota_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_phi;1",
+            "@id": "dtmi:example:iota_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_chi;1",
+            "@id": "dtmi:example:iota_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_psi;1",
+            "@id": "dtmi:example:iota_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_omega;1",
+            "@id": "dtmi:example:iota_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_yuzz;1",
+            "@id": "dtmi:example:iota_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_wum;1",
+            "@id": "dtmi:example:iota_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_um;1",
+            "@id": "dtmi:example:iota_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_humpf;1",
+            "@id": "dtmi:example:iota_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_fuddle;1",
+            "@id": "dtmi:example:iota_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_glikk;1",
+            "@id": "dtmi:example:iota_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_nuh;1",
+            "@id": "dtmi:example:iota_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_snee;1",
+            "@id": "dtmi:example:iota_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_quan;1",
+            "@id": "dtmi:example:iota_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_thnad;1",
+            "@id": "dtmi:example:iota_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_spazz;1",
+            "@id": "dtmi:example:iota_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_floob;1",
+            "@id": "dtmi:example:iota_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_zatz;1",
+            "@id": "dtmi:example:iota_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_jogg;1",
+            "@id": "dtmi:example:iota_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_flunn;1",
+            "@id": "dtmi:example:iota_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_itch;1",
+            "@id": "dtmi:example:iota_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_yekk;1",
+            "@id": "dtmi:example:iota_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_vroo;1",
+            "@id": "dtmi:example:iota_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:jogg_hi;1",
+            "@id": "dtmi:example:iota_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_alpha;1",
+            "@id": "dtmi:example:iota_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_beta;1",
+            "@id": "dtmi:example:iota_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_gamma;1",
+            "@id": "dtmi:example:iota_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_delta;1",
+            "@id": "dtmi:example:iota_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_epsilon;1",
+            "@id": "dtmi:example:iota_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_zeta;1",
+            "@id": "dtmi:example:iota_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_eta;1",
+            "@id": "dtmi:example:iota_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_theta;1",
+            "@id": "dtmi:example:iota_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_iota;1",
+            "@id": "dtmi:example:kappa_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_kappa;1",
+            "@id": "dtmi:example:kappa_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_lambda;1",
+            "@id": "dtmi:example:kappa_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_mu;1",
+            "@id": "dtmi:example:kappa_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_nu;1",
+            "@id": "dtmi:example:kappa_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_xi;1",
+            "@id": "dtmi:example:kappa_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_omicron;1",
+            "@id": "dtmi:example:kappa_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_pi;1",
+            "@id": "dtmi:example:kappa_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_rho;1",
+            "@id": "dtmi:example:kappa_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_sigma;1",
+            "@id": "dtmi:example:kappa_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_tau;1",
+            "@id": "dtmi:example:kappa_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_upsilon;1",
+            "@id": "dtmi:example:kappa_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_phi;1",
+            "@id": "dtmi:example:kappa_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_chi;1",
+            "@id": "dtmi:example:kappa_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_psi;1",
+            "@id": "dtmi:example:kappa_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_omega;1",
+            "@id": "dtmi:example:kappa_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_yuzz;1",
+            "@id": "dtmi:example:kappa_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_wum;1",
+            "@id": "dtmi:example:kappa_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_um;1",
+            "@id": "dtmi:example:kappa_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_humpf;1",
+            "@id": "dtmi:example:kappa_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_fuddle;1",
+            "@id": "dtmi:example:kappa_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_glikk;1",
+            "@id": "dtmi:example:kappa_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_nuh;1",
+            "@id": "dtmi:example:kappa_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_snee;1",
+            "@id": "dtmi:example:kappa_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_quan;1",
+            "@id": "dtmi:example:kappa_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_thnad;1",
+            "@id": "dtmi:example:kappa_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_spazz;1",
+            "@id": "dtmi:example:kappa_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_floob;1",
+            "@id": "dtmi:example:kappa_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_zatz;1",
+            "@id": "dtmi:example:kappa_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_jogg;1",
+            "@id": "dtmi:example:kappa_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_flunn;1",
+            "@id": "dtmi:example:kappa_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_itch;1",
+            "@id": "dtmi:example:kappa_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_yekk;1",
+            "@id": "dtmi:example:kappa_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_vroo;1",
+            "@id": "dtmi:example:kappa_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:flunn_hi;1",
+            "@id": "dtmi:example:kappa_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_alpha;1",
+            "@id": "dtmi:example:kappa_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_beta;1",
+            "@id": "dtmi:example:kappa_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_gamma;1",
+            "@id": "dtmi:example:kappa_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_delta;1",
+            "@id": "dtmi:example:kappa_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_epsilon;1",
+            "@id": "dtmi:example:kappa_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_zeta;1",
+            "@id": "dtmi:example:kappa_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_eta;1",
+            "@id": "dtmi:example:kappa_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_theta;1",
+            "@id": "dtmi:example:kappa_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_iota;1",
+            "@id": "dtmi:example:lambda_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_kappa;1",
+            "@id": "dtmi:example:lambda_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_lambda;1",
+            "@id": "dtmi:example:lambda_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_mu;1",
+            "@id": "dtmi:example:lambda_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_nu;1",
+            "@id": "dtmi:example:lambda_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_xi;1",
+            "@id": "dtmi:example:lambda_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_omicron;1",
+            "@id": "dtmi:example:lambda_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_pi;1",
+            "@id": "dtmi:example:lambda_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_rho;1",
+            "@id": "dtmi:example:lambda_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_sigma;1",
+            "@id": "dtmi:example:lambda_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_tau;1",
+            "@id": "dtmi:example:lambda_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_upsilon;1",
+            "@id": "dtmi:example:lambda_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_phi;1",
+            "@id": "dtmi:example:lambda_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_chi;1",
+            "@id": "dtmi:example:lambda_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_psi;1",
+            "@id": "dtmi:example:lambda_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_omega;1",
+            "@id": "dtmi:example:lambda_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_yuzz;1",
+            "@id": "dtmi:example:lambda_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_wum;1",
+            "@id": "dtmi:example:lambda_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_um;1",
+            "@id": "dtmi:example:lambda_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_humpf;1",
+            "@id": "dtmi:example:lambda_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_fuddle;1",
+            "@id": "dtmi:example:lambda_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_glikk;1",
+            "@id": "dtmi:example:lambda_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_nuh;1",
+            "@id": "dtmi:example:lambda_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_snee;1",
+            "@id": "dtmi:example:lambda_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_quan;1",
+            "@id": "dtmi:example:lambda_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_thnad;1",
+            "@id": "dtmi:example:lambda_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_spazz;1",
+            "@id": "dtmi:example:lambda_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_floob;1",
+            "@id": "dtmi:example:lambda_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_zatz;1",
+            "@id": "dtmi:example:lambda_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_jogg;1",
+            "@id": "dtmi:example:lambda_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_flunn;1",
+            "@id": "dtmi:example:lambda_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_itch;1",
+            "@id": "dtmi:example:lambda_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_yekk;1",
+            "@id": "dtmi:example:lambda_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_vroo;1",
+            "@id": "dtmi:example:lambda_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:itch_hi;1",
+            "@id": "dtmi:example:lambda_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_alpha;1",
+            "@id": "dtmi:example:lambda_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_beta;1",
+            "@id": "dtmi:example:lambda_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_gamma;1",
+            "@id": "dtmi:example:lambda_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_delta;1",
+            "@id": "dtmi:example:lambda_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_epsilon;1",
+            "@id": "dtmi:example:lambda_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_zeta;1",
+            "@id": "dtmi:example:lambda_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_eta;1",
+            "@id": "dtmi:example:lambda_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_theta;1",
+            "@id": "dtmi:example:lambda_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_iota;1",
+            "@id": "dtmi:example:mu_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_kappa;1",
+            "@id": "dtmi:example:mu_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_lambda;1",
+            "@id": "dtmi:example:mu_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_mu;1",
+            "@id": "dtmi:example:mu_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_nu;1",
+            "@id": "dtmi:example:mu_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_xi;1",
+            "@id": "dtmi:example:mu_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_omicron;1",
+            "@id": "dtmi:example:mu_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_pi;1",
+            "@id": "dtmi:example:mu_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_rho;1",
+            "@id": "dtmi:example:mu_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_sigma;1",
+            "@id": "dtmi:example:mu_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_tau;1",
+            "@id": "dtmi:example:mu_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_upsilon;1",
+            "@id": "dtmi:example:mu_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_phi;1",
+            "@id": "dtmi:example:mu_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_chi;1",
+            "@id": "dtmi:example:mu_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_psi;1",
+            "@id": "dtmi:example:mu_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_omega;1",
+            "@id": "dtmi:example:mu_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_yuzz;1",
+            "@id": "dtmi:example:mu_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_wum;1",
+            "@id": "dtmi:example:mu_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_um;1",
+            "@id": "dtmi:example:mu_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_humpf;1",
+            "@id": "dtmi:example:mu_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_fuddle;1",
+            "@id": "dtmi:example:mu_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_glikk;1",
+            "@id": "dtmi:example:mu_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_nuh;1",
+            "@id": "dtmi:example:mu_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_snee;1",
+            "@id": "dtmi:example:mu_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_quan;1",
+            "@id": "dtmi:example:mu_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_thnad;1",
+            "@id": "dtmi:example:mu_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_spazz;1",
+            "@id": "dtmi:example:mu_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_floob;1",
+            "@id": "dtmi:example:mu_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_zatz;1",
+            "@id": "dtmi:example:mu_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_jogg;1",
+            "@id": "dtmi:example:mu_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_flunn;1",
+            "@id": "dtmi:example:mu_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_itch;1",
+            "@id": "dtmi:example:mu_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_yekk;1",
+            "@id": "dtmi:example:mu_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_vroo;1",
+            "@id": "dtmi:example:mu_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:yekk_hi;1",
+            "@id": "dtmi:example:mu_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_alpha;1",
+            "@id": "dtmi:example:mu_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_beta;1",
+            "@id": "dtmi:example:mu_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_gamma;1",
+            "@id": "dtmi:example:mu_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_delta;1",
+            "@id": "dtmi:example:mu_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_epsilon;1",
+            "@id": "dtmi:example:mu_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_zeta;1",
+            "@id": "dtmi:example:mu_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_eta;1",
+            "@id": "dtmi:example:mu_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_theta;1",
+            "@id": "dtmi:example:mu_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_iota;1",
+            "@id": "dtmi:example:nu_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_kappa;1",
+            "@id": "dtmi:example:nu_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_lambda;1",
+            "@id": "dtmi:example:nu_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_mu;1",
+            "@id": "dtmi:example:nu_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_nu;1",
+            "@id": "dtmi:example:nu_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_xi;1",
+            "@id": "dtmi:example:nu_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_omicron;1",
+            "@id": "dtmi:example:nu_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_pi;1",
+            "@id": "dtmi:example:nu_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_rho;1",
+            "@id": "dtmi:example:nu_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_sigma;1",
+            "@id": "dtmi:example:nu_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_tau;1",
+            "@id": "dtmi:example:nu_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_upsilon;1",
+            "@id": "dtmi:example:nu_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_phi;1",
+            "@id": "dtmi:example:nu_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_chi;1",
+            "@id": "dtmi:example:nu_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_psi;1",
+            "@id": "dtmi:example:nu_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_omega;1",
+            "@id": "dtmi:example:nu_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_yuzz;1",
+            "@id": "dtmi:example:nu_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_wum;1",
+            "@id": "dtmi:example:nu_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_um;1",
+            "@id": "dtmi:example:nu_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_humpf;1",
+            "@id": "dtmi:example:nu_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_fuddle;1",
+            "@id": "dtmi:example:nu_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_glikk;1",
+            "@id": "dtmi:example:nu_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_nuh;1",
+            "@id": "dtmi:example:nu_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_snee;1",
+            "@id": "dtmi:example:nu_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_quan;1",
+            "@id": "dtmi:example:nu_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_thnad;1",
+            "@id": "dtmi:example:nu_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_spazz;1",
+            "@id": "dtmi:example:nu_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_floob;1",
+            "@id": "dtmi:example:nu_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_zatz;1",
+            "@id": "dtmi:example:nu_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_jogg;1",
+            "@id": "dtmi:example:nu_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_flunn;1",
+            "@id": "dtmi:example:nu_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_itch;1",
+            "@id": "dtmi:example:nu_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_yekk;1",
+            "@id": "dtmi:example:nu_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_vroo;1",
+            "@id": "dtmi:example:nu_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:vroo_hi;1",
+            "@id": "dtmi:example:nu_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_alpha;1",
+            "@id": "dtmi:example:nu_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_beta;1",
+            "@id": "dtmi:example:nu_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_gamma;1",
+            "@id": "dtmi:example:nu_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_delta;1",
+            "@id": "dtmi:example:nu_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_epsilon;1",
+            "@id": "dtmi:example:nu_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_zeta;1",
+            "@id": "dtmi:example:nu_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_eta;1",
+            "@id": "dtmi:example:nu_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_theta;1",
+            "@id": "dtmi:example:nu_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_iota;1",
+            "@id": "dtmi:example:xi_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_kappa;1",
+            "@id": "dtmi:example:xi_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_lambda;1",
+            "@id": "dtmi:example:xi_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_mu;1",
+            "@id": "dtmi:example:xi_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_nu;1",
+            "@id": "dtmi:example:xi_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_xi;1",
+            "@id": "dtmi:example:xi_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_omicron;1",
+            "@id": "dtmi:example:xi_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_pi;1",
+            "@id": "dtmi:example:xi_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_rho;1",
+            "@id": "dtmi:example:xi_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_sigma;1",
+            "@id": "dtmi:example:xi_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_tau;1",
+            "@id": "dtmi:example:xi_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_upsilon;1",
+            "@id": "dtmi:example:xi_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_phi;1",
+            "@id": "dtmi:example:xi_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_chi;1",
+            "@id": "dtmi:example:xi_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_psi;1",
+            "@id": "dtmi:example:xi_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_omega;1",
+            "@id": "dtmi:example:xi_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_yuzz;1",
+            "@id": "dtmi:example:xi_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_wum;1",
+            "@id": "dtmi:example:xi_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_um;1",
+            "@id": "dtmi:example:xi_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_humpf;1",
+            "@id": "dtmi:example:xi_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_fuddle;1",
+            "@id": "dtmi:example:xi_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_glikk;1",
+            "@id": "dtmi:example:xi_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_nuh;1",
+            "@id": "dtmi:example:xi_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_snee;1",
+            "@id": "dtmi:example:xi_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_quan;1",
+            "@id": "dtmi:example:xi_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_thnad;1",
+            "@id": "dtmi:example:xi_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_spazz;1",
+            "@id": "dtmi:example:xi_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_floob;1",
+            "@id": "dtmi:example:xi_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_zatz;1",
+            "@id": "dtmi:example:xi_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_jogg;1",
+            "@id": "dtmi:example:xi_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_flunn;1",
+            "@id": "dtmi:example:xi_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_itch;1",
+            "@id": "dtmi:example:xi_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_yekk;1",
+            "@id": "dtmi:example:xi_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_vroo;1",
+            "@id": "dtmi:example:xi_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:hi_hi;1",
+            "@id": "dtmi:example:xi_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_alpha;1",
+            "@id": "dtmi:example:xi_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_beta;1",
+            "@id": "dtmi:example:xi_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_gamma;1",
+            "@id": "dtmi:example:xi_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_delta;1",
+            "@id": "dtmi:example:xi_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_epsilon;1",
+            "@id": "dtmi:example:xi_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_zeta;1",
+            "@id": "dtmi:example:xi_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_eta;1",
+            "@id": "dtmi:example:xi_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_theta;1",
+            "@id": "dtmi:example:xi_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_iota;1",
+            "@id": "dtmi:example:omicron_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_kappa;1",
+            "@id": "dtmi:example:omicron_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_lambda;1",
+            "@id": "dtmi:example:omicron_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_mu;1",
+            "@id": "dtmi:example:omicron_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_nu;1",
+            "@id": "dtmi:example:omicron_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_xi;1",
+            "@id": "dtmi:example:omicron_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_omicron;1",
+            "@id": "dtmi:example:omicron_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_pi;1",
+            "@id": "dtmi:example:omicron_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_rho;1",
+            "@id": "dtmi:example:omicron_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_sigma;1",
+            "@id": "dtmi:example:omicron_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_tau;1",
+            "@id": "dtmi:example:omicron_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_upsilon;1",
+            "@id": "dtmi:example:omicron_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_phi;1",
+            "@id": "dtmi:example:omicron_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_chi;1",
+            "@id": "dtmi:example:omicron_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_psi;1",
+            "@id": "dtmi:example:omicron_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_omega;1",
+            "@id": "dtmi:example:omicron_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_yuzz;1",
+            "@id": "dtmi:example:omicron_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_wum;1",
+            "@id": "dtmi:example:omicron_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_um;1",
+            "@id": "dtmi:example:omicron_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_humpf;1",
+            "@id": "dtmi:example:omicron_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_fuddle;1",
+            "@id": "dtmi:example:omicron_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_glikk;1",
+            "@id": "dtmi:example:omicron_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_nuh;1",
+            "@id": "dtmi:example:omicron_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_snee;1",
+            "@id": "dtmi:example:omicron_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_quan;1",
+            "@id": "dtmi:example:omicron_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_thnad;1",
+            "@id": "dtmi:example:omicron_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_spazz;1",
+            "@id": "dtmi:example:omicron_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_floob;1",
+            "@id": "dtmi:example:omicron_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_zatz;1",
+            "@id": "dtmi:example:omicron_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_jogg;1",
+            "@id": "dtmi:example:omicron_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_flunn;1",
+            "@id": "dtmi:example:omicron_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_itch;1",
+            "@id": "dtmi:example:omicron_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_yekk;1",
+            "@id": "dtmi:example:omicron_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_vroo;1",
+            "@id": "dtmi:example:omicron_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:alpha_hi;1",
+            "@id": "dtmi:example:omicron_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_alpha;1",
+            "@id": "dtmi:example:omicron_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_beta;1",
+            "@id": "dtmi:example:omicron_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_gamma;1",
+            "@id": "dtmi:example:omicron_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_delta;1",
+            "@id": "dtmi:example:omicron_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_epsilon;1",
+            "@id": "dtmi:example:omicron_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_zeta;1",
+            "@id": "dtmi:example:omicron_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_eta;1",
+            "@id": "dtmi:example:omicron_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_theta;1",
+            "@id": "dtmi:example:omicron_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_iota;1",
+            "@id": "dtmi:example:pi_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_kappa;1",
+            "@id": "dtmi:example:pi_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_lambda;1",
+            "@id": "dtmi:example:pi_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_mu;1",
+            "@id": "dtmi:example:pi_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_nu;1",
+            "@id": "dtmi:example:pi_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_xi;1",
+            "@id": "dtmi:example:pi_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_omicron;1",
+            "@id": "dtmi:example:pi_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_pi;1",
+            "@id": "dtmi:example:pi_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_rho;1",
+            "@id": "dtmi:example:pi_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_sigma;1",
+            "@id": "dtmi:example:pi_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_tau;1",
+            "@id": "dtmi:example:pi_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_upsilon;1",
+            "@id": "dtmi:example:pi_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_phi;1",
+            "@id": "dtmi:example:pi_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_chi;1",
+            "@id": "dtmi:example:pi_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_psi;1",
+            "@id": "dtmi:example:pi_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_omega;1",
+            "@id": "dtmi:example:pi_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_yuzz;1",
+            "@id": "dtmi:example:pi_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_wum;1",
+            "@id": "dtmi:example:pi_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_um;1",
+            "@id": "dtmi:example:pi_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_humpf;1",
+            "@id": "dtmi:example:pi_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_fuddle;1",
+            "@id": "dtmi:example:pi_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_glikk;1",
+            "@id": "dtmi:example:pi_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_nuh;1",
+            "@id": "dtmi:example:pi_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_snee;1",
+            "@id": "dtmi:example:pi_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_quan;1",
+            "@id": "dtmi:example:pi_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_thnad;1",
+            "@id": "dtmi:example:pi_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_spazz;1",
+            "@id": "dtmi:example:pi_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_floob;1",
+            "@id": "dtmi:example:pi_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_zatz;1",
+            "@id": "dtmi:example:pi_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_jogg;1",
+            "@id": "dtmi:example:pi_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_flunn;1",
+            "@id": "dtmi:example:pi_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_itch;1",
+            "@id": "dtmi:example:pi_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_yekk;1",
+            "@id": "dtmi:example:pi_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_vroo;1",
+            "@id": "dtmi:example:pi_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:beta_hi;1",
+            "@id": "dtmi:example:pi_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_alpha;1",
+            "@id": "dtmi:example:pi_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_beta;1",
+            "@id": "dtmi:example:pi_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_gamma;1",
+            "@id": "dtmi:example:pi_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_delta;1",
+            "@id": "dtmi:example:pi_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_epsilon;1",
+            "@id": "dtmi:example:pi_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_zeta;1",
+            "@id": "dtmi:example:pi_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_eta;1",
+            "@id": "dtmi:example:pi_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_theta;1",
+            "@id": "dtmi:example:pi_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_iota;1",
+            "@id": "dtmi:example:rho_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_kappa;1",
+            "@id": "dtmi:example:rho_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_lambda;1",
+            "@id": "dtmi:example:rho_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_mu;1",
+            "@id": "dtmi:example:rho_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_nu;1",
+            "@id": "dtmi:example:rho_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_xi;1",
+            "@id": "dtmi:example:rho_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_omicron;1",
+            "@id": "dtmi:example:rho_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_pi;1",
+            "@id": "dtmi:example:rho_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_rho;1",
+            "@id": "dtmi:example:rho_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_sigma;1",
+            "@id": "dtmi:example:rho_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_tau;1",
+            "@id": "dtmi:example:rho_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_upsilon;1",
+            "@id": "dtmi:example:rho_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_phi;1",
+            "@id": "dtmi:example:rho_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_chi;1",
+            "@id": "dtmi:example:rho_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_psi;1",
+            "@id": "dtmi:example:rho_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_omega;1",
+            "@id": "dtmi:example:rho_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_yuzz;1",
+            "@id": "dtmi:example:rho_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_wum;1",
+            "@id": "dtmi:example:rho_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_um;1",
+            "@id": "dtmi:example:rho_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_humpf;1",
+            "@id": "dtmi:example:rho_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_fuddle;1",
+            "@id": "dtmi:example:rho_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_glikk;1",
+            "@id": "dtmi:example:rho_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_nuh;1",
+            "@id": "dtmi:example:rho_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_snee;1",
+            "@id": "dtmi:example:rho_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_quan;1",
+            "@id": "dtmi:example:rho_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_thnad;1",
+            "@id": "dtmi:example:rho_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_spazz;1",
+            "@id": "dtmi:example:rho_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_floob;1",
+            "@id": "dtmi:example:rho_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_zatz;1",
+            "@id": "dtmi:example:rho_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_jogg;1",
+            "@id": "dtmi:example:rho_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_flunn;1",
+            "@id": "dtmi:example:rho_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_itch;1",
+            "@id": "dtmi:example:rho_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_yekk;1",
+            "@id": "dtmi:example:rho_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_vroo;1",
+            "@id": "dtmi:example:rho_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:gamma_hi;1",
+            "@id": "dtmi:example:rho_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_alpha;1",
+            "@id": "dtmi:example:rho_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_beta;1",
+            "@id": "dtmi:example:rho_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_gamma;1",
+            "@id": "dtmi:example:rho_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_delta;1",
+            "@id": "dtmi:example:rho_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_epsilon;1",
+            "@id": "dtmi:example:rho_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_zeta;1",
+            "@id": "dtmi:example:rho_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_eta;1",
+            "@id": "dtmi:example:rho_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_theta;1",
+            "@id": "dtmi:example:rho_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_iota;1",
+            "@id": "dtmi:example:sigma_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_kappa;1",
+            "@id": "dtmi:example:sigma_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_lambda;1",
+            "@id": "dtmi:example:sigma_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_mu;1",
+            "@id": "dtmi:example:sigma_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_nu;1",
+            "@id": "dtmi:example:sigma_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_xi;1",
+            "@id": "dtmi:example:sigma_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_omicron;1",
+            "@id": "dtmi:example:sigma_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_pi;1",
+            "@id": "dtmi:example:sigma_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_rho;1",
+            "@id": "dtmi:example:sigma_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_sigma;1",
+            "@id": "dtmi:example:sigma_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_tau;1",
+            "@id": "dtmi:example:sigma_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_upsilon;1",
+            "@id": "dtmi:example:sigma_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_phi;1",
+            "@id": "dtmi:example:sigma_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_chi;1",
+            "@id": "dtmi:example:sigma_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_psi;1",
+            "@id": "dtmi:example:sigma_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_omega;1",
+            "@id": "dtmi:example:sigma_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_yuzz;1",
+            "@id": "dtmi:example:sigma_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_wum;1",
+            "@id": "dtmi:example:sigma_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_um;1",
+            "@id": "dtmi:example:sigma_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_humpf;1",
+            "@id": "dtmi:example:sigma_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_fuddle;1",
+            "@id": "dtmi:example:sigma_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_glikk;1",
+            "@id": "dtmi:example:sigma_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_nuh;1",
+            "@id": "dtmi:example:sigma_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_snee;1",
+            "@id": "dtmi:example:sigma_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_quan;1",
+            "@id": "dtmi:example:sigma_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_thnad;1",
+            "@id": "dtmi:example:sigma_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_spazz;1",
+            "@id": "dtmi:example:sigma_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_floob;1",
+            "@id": "dtmi:example:sigma_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_zatz;1",
+            "@id": "dtmi:example:sigma_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_jogg;1",
+            "@id": "dtmi:example:sigma_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_flunn;1",
+            "@id": "dtmi:example:sigma_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_itch;1",
+            "@id": "dtmi:example:sigma_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_yekk;1",
+            "@id": "dtmi:example:sigma_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_vroo;1",
+            "@id": "dtmi:example:sigma_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:delta_hi;1",
+            "@id": "dtmi:example:sigma_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_alpha;1",
+            "@id": "dtmi:example:sigma_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_beta;1",
+            "@id": "dtmi:example:sigma_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_gamma;1",
+            "@id": "dtmi:example:sigma_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_delta;1",
+            "@id": "dtmi:example:sigma_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_epsilon;1",
+            "@id": "dtmi:example:sigma_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_zeta;1",
+            "@id": "dtmi:example:sigma_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_eta;1",
+            "@id": "dtmi:example:sigma_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_theta;1",
+            "@id": "dtmi:example:sigma_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_iota;1",
+            "@id": "dtmi:example:tau_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_kappa;1",
+            "@id": "dtmi:example:tau_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_lambda;1",
+            "@id": "dtmi:example:tau_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_mu;1",
+            "@id": "dtmi:example:tau_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_nu;1",
+            "@id": "dtmi:example:tau_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_xi;1",
+            "@id": "dtmi:example:tau_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_omicron;1",
+            "@id": "dtmi:example:tau_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_pi;1",
+            "@id": "dtmi:example:tau_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_rho;1",
+            "@id": "dtmi:example:tau_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_sigma;1",
+            "@id": "dtmi:example:tau_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_tau;1",
+            "@id": "dtmi:example:tau_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_upsilon;1",
+            "@id": "dtmi:example:tau_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_phi;1",
+            "@id": "dtmi:example:tau_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_chi;1",
+            "@id": "dtmi:example:tau_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_psi;1",
+            "@id": "dtmi:example:tau_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_omega;1",
+            "@id": "dtmi:example:tau_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_yuzz;1",
+            "@id": "dtmi:example:tau_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_wum;1",
+            "@id": "dtmi:example:tau_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_um;1",
+            "@id": "dtmi:example:tau_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_humpf;1",
+            "@id": "dtmi:example:tau_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_fuddle;1",
+            "@id": "dtmi:example:tau_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_glikk;1",
+            "@id": "dtmi:example:tau_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_nuh;1",
+            "@id": "dtmi:example:tau_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_snee;1",
+            "@id": "dtmi:example:tau_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_quan;1",
+            "@id": "dtmi:example:tau_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_thnad;1",
+            "@id": "dtmi:example:tau_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_spazz;1",
+            "@id": "dtmi:example:tau_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_floob;1",
+            "@id": "dtmi:example:tau_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_zatz;1",
+            "@id": "dtmi:example:tau_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_jogg;1",
+            "@id": "dtmi:example:tau_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_flunn;1",
+            "@id": "dtmi:example:tau_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_itch;1",
+            "@id": "dtmi:example:tau_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_yekk;1",
+            "@id": "dtmi:example:tau_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_vroo;1",
+            "@id": "dtmi:example:tau_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:epsilon_hi;1",
+            "@id": "dtmi:example:tau_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_alpha;1",
+            "@id": "dtmi:example:tau_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_beta;1",
+            "@id": "dtmi:example:tau_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_gamma;1",
+            "@id": "dtmi:example:tau_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_delta;1",
+            "@id": "dtmi:example:tau_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_epsilon;1",
+            "@id": "dtmi:example:tau_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_zeta;1",
+            "@id": "dtmi:example:tau_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_eta;1",
+            "@id": "dtmi:example:tau_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_theta;1",
+            "@id": "dtmi:example:tau_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_iota;1",
+            "@id": "dtmi:example:upsilon_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_kappa;1",
+            "@id": "dtmi:example:upsilon_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_lambda;1",
+            "@id": "dtmi:example:upsilon_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_mu;1",
+            "@id": "dtmi:example:upsilon_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_nu;1",
+            "@id": "dtmi:example:upsilon_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_xi;1",
+            "@id": "dtmi:example:upsilon_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_omicron;1",
+            "@id": "dtmi:example:upsilon_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_pi;1",
+            "@id": "dtmi:example:upsilon_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_rho;1",
+            "@id": "dtmi:example:upsilon_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_sigma;1",
+            "@id": "dtmi:example:upsilon_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_tau;1",
+            "@id": "dtmi:example:upsilon_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_upsilon;1",
+            "@id": "dtmi:example:upsilon_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_phi;1",
+            "@id": "dtmi:example:upsilon_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_chi;1",
+            "@id": "dtmi:example:upsilon_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_psi;1",
+            "@id": "dtmi:example:upsilon_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_omega;1",
+            "@id": "dtmi:example:upsilon_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_yuzz;1",
+            "@id": "dtmi:example:upsilon_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_wum;1",
+            "@id": "dtmi:example:upsilon_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_um;1",
+            "@id": "dtmi:example:upsilon_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_humpf;1",
+            "@id": "dtmi:example:upsilon_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_fuddle;1",
+            "@id": "dtmi:example:upsilon_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_glikk;1",
+            "@id": "dtmi:example:upsilon_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_nuh;1",
+            "@id": "dtmi:example:upsilon_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_snee;1",
+            "@id": "dtmi:example:upsilon_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_quan;1",
+            "@id": "dtmi:example:upsilon_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_thnad;1",
+            "@id": "dtmi:example:upsilon_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_spazz;1",
+            "@id": "dtmi:example:upsilon_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_floob;1",
+            "@id": "dtmi:example:upsilon_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_zatz;1",
+            "@id": "dtmi:example:upsilon_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_jogg;1",
+            "@id": "dtmi:example:upsilon_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_flunn;1",
+            "@id": "dtmi:example:upsilon_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_itch;1",
+            "@id": "dtmi:example:upsilon_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_yekk;1",
+            "@id": "dtmi:example:upsilon_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_vroo;1",
+            "@id": "dtmi:example:upsilon_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:zeta_hi;1",
+            "@id": "dtmi:example:upsilon_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_alpha;1",
+            "@id": "dtmi:example:upsilon_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_beta;1",
+            "@id": "dtmi:example:upsilon_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_gamma;1",
+            "@id": "dtmi:example:upsilon_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_delta;1",
+            "@id": "dtmi:example:upsilon_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_epsilon;1",
+            "@id": "dtmi:example:upsilon_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_zeta;1",
+            "@id": "dtmi:example:upsilon_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_eta;1",
+            "@id": "dtmi:example:upsilon_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_theta;1",
+            "@id": "dtmi:example:upsilon_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_iota;1",
+            "@id": "dtmi:example:phi_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_kappa;1",
+            "@id": "dtmi:example:phi_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_lambda;1",
+            "@id": "dtmi:example:phi_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_mu;1",
+            "@id": "dtmi:example:phi_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_nu;1",
+            "@id": "dtmi:example:phi_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_xi;1",
+            "@id": "dtmi:example:phi_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_omicron;1",
+            "@id": "dtmi:example:phi_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_pi;1",
+            "@id": "dtmi:example:phi_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_rho;1",
+            "@id": "dtmi:example:phi_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_sigma;1",
+            "@id": "dtmi:example:phi_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_tau;1",
+            "@id": "dtmi:example:phi_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_upsilon;1",
+            "@id": "dtmi:example:phi_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_phi;1",
+            "@id": "dtmi:example:phi_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_chi;1",
+            "@id": "dtmi:example:phi_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_psi;1",
+            "@id": "dtmi:example:phi_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_omega;1",
+            "@id": "dtmi:example:phi_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_yuzz;1",
+            "@id": "dtmi:example:phi_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_wum;1",
+            "@id": "dtmi:example:phi_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_um;1",
+            "@id": "dtmi:example:phi_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_humpf;1",
+            "@id": "dtmi:example:phi_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_fuddle;1",
+            "@id": "dtmi:example:phi_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_glikk;1",
+            "@id": "dtmi:example:phi_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_nuh;1",
+            "@id": "dtmi:example:phi_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_snee;1",
+            "@id": "dtmi:example:phi_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_quan;1",
+            "@id": "dtmi:example:phi_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_thnad;1",
+            "@id": "dtmi:example:phi_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_spazz;1",
+            "@id": "dtmi:example:phi_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_floob;1",
+            "@id": "dtmi:example:phi_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_zatz;1",
+            "@id": "dtmi:example:phi_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_jogg;1",
+            "@id": "dtmi:example:phi_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_flunn;1",
+            "@id": "dtmi:example:phi_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_itch;1",
+            "@id": "dtmi:example:phi_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_yekk;1",
+            "@id": "dtmi:example:phi_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_vroo;1",
+            "@id": "dtmi:example:phi_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:eta_hi;1",
+            "@id": "dtmi:example:phi_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_alpha;1",
+            "@id": "dtmi:example:phi_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_beta;1",
+            "@id": "dtmi:example:phi_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_gamma;1",
+            "@id": "dtmi:example:phi_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_delta;1",
+            "@id": "dtmi:example:phi_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_epsilon;1",
+            "@id": "dtmi:example:phi_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_zeta;1",
+            "@id": "dtmi:example:phi_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_eta;1",
+            "@id": "dtmi:example:phi_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_theta;1",
+            "@id": "dtmi:example:phi_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_iota;1",
+            "@id": "dtmi:example:chi_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_kappa;1",
+            "@id": "dtmi:example:chi_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_lambda;1",
+            "@id": "dtmi:example:chi_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_mu;1",
+            "@id": "dtmi:example:chi_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_nu;1",
+            "@id": "dtmi:example:chi_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_xi;1",
+            "@id": "dtmi:example:chi_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_omicron;1",
+            "@id": "dtmi:example:chi_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_pi;1",
+            "@id": "dtmi:example:chi_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_rho;1",
+            "@id": "dtmi:example:chi_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_sigma;1",
+            "@id": "dtmi:example:chi_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_tau;1",
+            "@id": "dtmi:example:chi_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_upsilon;1",
+            "@id": "dtmi:example:chi_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_phi;1",
+            "@id": "dtmi:example:chi_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_chi;1",
+            "@id": "dtmi:example:chi_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_psi;1",
+            "@id": "dtmi:example:chi_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_omega;1",
+            "@id": "dtmi:example:chi_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_yuzz;1",
+            "@id": "dtmi:example:chi_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_wum;1",
+            "@id": "dtmi:example:chi_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_um;1",
+            "@id": "dtmi:example:chi_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_humpf;1",
+            "@id": "dtmi:example:chi_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_fuddle;1",
+            "@id": "dtmi:example:chi_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_glikk;1",
+            "@id": "dtmi:example:chi_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_nuh;1",
+            "@id": "dtmi:example:chi_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_snee;1",
+            "@id": "dtmi:example:chi_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_quan;1",
+            "@id": "dtmi:example:chi_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_thnad;1",
+            "@id": "dtmi:example:chi_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_spazz;1",
+            "@id": "dtmi:example:chi_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_floob;1",
+            "@id": "dtmi:example:chi_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_zatz;1",
+            "@id": "dtmi:example:chi_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_jogg;1",
+            "@id": "dtmi:example:chi_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_flunn;1",
+            "@id": "dtmi:example:chi_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_itch;1",
+            "@id": "dtmi:example:chi_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_yekk;1",
+            "@id": "dtmi:example:chi_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_vroo;1",
+            "@id": "dtmi:example:chi_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:theta_hi;1",
+            "@id": "dtmi:example:chi_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_alpha;1",
+            "@id": "dtmi:example:chi_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_beta;1",
+            "@id": "dtmi:example:chi_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_gamma;1",
+            "@id": "dtmi:example:chi_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_delta;1",
+            "@id": "dtmi:example:chi_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_epsilon;1",
+            "@id": "dtmi:example:chi_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_zeta;1",
+            "@id": "dtmi:example:chi_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_eta;1",
+            "@id": "dtmi:example:chi_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_theta;1",
+            "@id": "dtmi:example:chi_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_iota;1",
+            "@id": "dtmi:example:psi_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_kappa;1",
+            "@id": "dtmi:example:psi_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_lambda;1",
+            "@id": "dtmi:example:psi_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_mu;1",
+            "@id": "dtmi:example:psi_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_nu;1",
+            "@id": "dtmi:example:psi_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_xi;1",
+            "@id": "dtmi:example:psi_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_omicron;1",
+            "@id": "dtmi:example:psi_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_pi;1",
+            "@id": "dtmi:example:psi_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_rho;1",
+            "@id": "dtmi:example:psi_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_sigma;1",
+            "@id": "dtmi:example:psi_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_tau;1",
+            "@id": "dtmi:example:psi_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_upsilon;1",
+            "@id": "dtmi:example:psi_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_phi;1",
+            "@id": "dtmi:example:psi_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_chi;1",
+            "@id": "dtmi:example:psi_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_psi;1",
+            "@id": "dtmi:example:psi_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_omega;1",
+            "@id": "dtmi:example:psi_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_yuzz;1",
+            "@id": "dtmi:example:psi_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_wum;1",
+            "@id": "dtmi:example:psi_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_um;1",
+            "@id": "dtmi:example:psi_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_humpf;1",
+            "@id": "dtmi:example:psi_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_fuddle;1",
+            "@id": "dtmi:example:psi_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_glikk;1",
+            "@id": "dtmi:example:psi_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_nuh;1",
+            "@id": "dtmi:example:psi_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_snee;1",
+            "@id": "dtmi:example:psi_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_quan;1",
+            "@id": "dtmi:example:psi_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_thnad;1",
+            "@id": "dtmi:example:psi_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_spazz;1",
+            "@id": "dtmi:example:psi_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_floob;1",
+            "@id": "dtmi:example:psi_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_zatz;1",
+            "@id": "dtmi:example:psi_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_jogg;1",
+            "@id": "dtmi:example:psi_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_flunn;1",
+            "@id": "dtmi:example:psi_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_itch;1",
+            "@id": "dtmi:example:psi_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_yekk;1",
+            "@id": "dtmi:example:psi_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_vroo;1",
+            "@id": "dtmi:example:psi_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:iota_hi;1",
+            "@id": "dtmi:example:psi_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_alpha;1",
+            "@id": "dtmi:example:psi_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_beta;1",
+            "@id": "dtmi:example:psi_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_gamma;1",
+            "@id": "dtmi:example:psi_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_delta;1",
+            "@id": "dtmi:example:psi_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_epsilon;1",
+            "@id": "dtmi:example:psi_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_zeta;1",
+            "@id": "dtmi:example:psi_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_eta;1",
+            "@id": "dtmi:example:psi_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_theta;1",
+            "@id": "dtmi:example:psi_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_iota;1",
+            "@id": "dtmi:example:omega_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_kappa;1",
+            "@id": "dtmi:example:omega_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_lambda;1",
+            "@id": "dtmi:example:omega_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_mu;1",
+            "@id": "dtmi:example:omega_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_nu;1",
+            "@id": "dtmi:example:omega_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_xi;1",
+            "@id": "dtmi:example:omega_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_omicron;1",
+            "@id": "dtmi:example:omega_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_pi;1",
+            "@id": "dtmi:example:omega_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_rho;1",
+            "@id": "dtmi:example:omega_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_sigma;1",
+            "@id": "dtmi:example:omega_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_tau;1",
+            "@id": "dtmi:example:omega_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_upsilon;1",
+            "@id": "dtmi:example:omega_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_phi;1",
+            "@id": "dtmi:example:omega_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_chi;1",
+            "@id": "dtmi:example:omega_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_psi;1",
+            "@id": "dtmi:example:omega_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_omega;1",
+            "@id": "dtmi:example:omega_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_yuzz;1",
+            "@id": "dtmi:example:omega_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_wum;1",
+            "@id": "dtmi:example:omega_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_um;1",
+            "@id": "dtmi:example:omega_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_humpf;1",
+            "@id": "dtmi:example:omega_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_fuddle;1",
+            "@id": "dtmi:example:omega_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_glikk;1",
+            "@id": "dtmi:example:omega_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_nuh;1",
+            "@id": "dtmi:example:omega_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_snee;1",
+            "@id": "dtmi:example:omega_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_quan;1",
+            "@id": "dtmi:example:omega_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_thnad;1",
+            "@id": "dtmi:example:omega_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_spazz;1",
+            "@id": "dtmi:example:omega_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_floob;1",
+            "@id": "dtmi:example:omega_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_zatz;1",
+            "@id": "dtmi:example:omega_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_jogg;1",
+            "@id": "dtmi:example:omega_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_flunn;1",
+            "@id": "dtmi:example:omega_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_itch;1",
+            "@id": "dtmi:example:omega_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_yekk;1",
+            "@id": "dtmi:example:omega_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_vroo;1",
+            "@id": "dtmi:example:omega_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:kappa_hi;1",
+            "@id": "dtmi:example:omega_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_alpha;1",
+            "@id": "dtmi:example:omega_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_beta;1",
+            "@id": "dtmi:example:omega_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_gamma;1",
+            "@id": "dtmi:example:omega_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_delta;1",
+            "@id": "dtmi:example:omega_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_epsilon;1",
+            "@id": "dtmi:example:omega_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_zeta;1",
+            "@id": "dtmi:example:omega_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_eta;1",
+            "@id": "dtmi:example:omega_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_theta;1",
+            "@id": "dtmi:example:omega_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_iota;1",
+            "@id": "dtmi:example:yuzz_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_kappa;1",
+            "@id": "dtmi:example:yuzz_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_lambda;1",
+            "@id": "dtmi:example:yuzz_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_mu;1",
+            "@id": "dtmi:example:yuzz_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_nu;1",
+            "@id": "dtmi:example:yuzz_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_xi;1",
+            "@id": "dtmi:example:yuzz_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_omicron;1",
+            "@id": "dtmi:example:yuzz_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_pi;1",
+            "@id": "dtmi:example:yuzz_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_rho;1",
+            "@id": "dtmi:example:yuzz_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_sigma;1",
+            "@id": "dtmi:example:yuzz_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_tau;1",
+            "@id": "dtmi:example:yuzz_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_upsilon;1",
+            "@id": "dtmi:example:yuzz_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_phi;1",
+            "@id": "dtmi:example:yuzz_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_chi;1",
+            "@id": "dtmi:example:yuzz_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_psi;1",
+            "@id": "dtmi:example:yuzz_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_omega;1",
+            "@id": "dtmi:example:yuzz_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_yuzz;1",
+            "@id": "dtmi:example:yuzz_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_wum;1",
+            "@id": "dtmi:example:yuzz_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_um;1",
+            "@id": "dtmi:example:yuzz_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_humpf;1",
+            "@id": "dtmi:example:yuzz_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_fuddle;1",
+            "@id": "dtmi:example:yuzz_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_glikk;1",
+            "@id": "dtmi:example:yuzz_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_nuh;1",
+            "@id": "dtmi:example:yuzz_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_snee;1",
+            "@id": "dtmi:example:yuzz_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_quan;1",
+            "@id": "dtmi:example:yuzz_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_thnad;1",
+            "@id": "dtmi:example:yuzz_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_spazz;1",
+            "@id": "dtmi:example:yuzz_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_floob;1",
+            "@id": "dtmi:example:yuzz_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_zatz;1",
+            "@id": "dtmi:example:yuzz_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_jogg;1",
+            "@id": "dtmi:example:yuzz_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_flunn;1",
+            "@id": "dtmi:example:yuzz_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_itch;1",
+            "@id": "dtmi:example:yuzz_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_yekk;1",
+            "@id": "dtmi:example:yuzz_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_vroo;1",
+            "@id": "dtmi:example:yuzz_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:lambda_hi;1",
+            "@id": "dtmi:example:yuzz_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_alpha;1",
+            "@id": "dtmi:example:yuzz_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_beta;1",
+            "@id": "dtmi:example:yuzz_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_gamma;1",
+            "@id": "dtmi:example:yuzz_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_delta;1",
+            "@id": "dtmi:example:yuzz_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_epsilon;1",
+            "@id": "dtmi:example:yuzz_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_zeta;1",
+            "@id": "dtmi:example:yuzz_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_eta;1",
+            "@id": "dtmi:example:yuzz_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_theta;1",
+            "@id": "dtmi:example:yuzz_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_iota;1",
+            "@id": "dtmi:example:wum_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_kappa;1",
+            "@id": "dtmi:example:wum_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_lambda;1",
+            "@id": "dtmi:example:wum_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_mu;1",
+            "@id": "dtmi:example:wum_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_nu;1",
+            "@id": "dtmi:example:wum_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_xi;1",
+            "@id": "dtmi:example:wum_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_omicron;1",
+            "@id": "dtmi:example:wum_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_pi;1",
+            "@id": "dtmi:example:wum_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_rho;1",
+            "@id": "dtmi:example:wum_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_sigma;1",
+            "@id": "dtmi:example:wum_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_tau;1",
+            "@id": "dtmi:example:wum_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_upsilon;1",
+            "@id": "dtmi:example:wum_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_phi;1",
+            "@id": "dtmi:example:wum_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_chi;1",
+            "@id": "dtmi:example:wum_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_psi;1",
+            "@id": "dtmi:example:wum_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_omega;1",
+            "@id": "dtmi:example:wum_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_yuzz;1",
+            "@id": "dtmi:example:wum_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_wum;1",
+            "@id": "dtmi:example:wum_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_um;1",
+            "@id": "dtmi:example:wum_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_humpf;1",
+            "@id": "dtmi:example:wum_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_fuddle;1",
+            "@id": "dtmi:example:wum_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_glikk;1",
+            "@id": "dtmi:example:wum_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_nuh;1",
+            "@id": "dtmi:example:wum_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_snee;1",
+            "@id": "dtmi:example:wum_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_quan;1",
+            "@id": "dtmi:example:wum_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_thnad;1",
+            "@id": "dtmi:example:wum_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_spazz;1",
+            "@id": "dtmi:example:wum_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_floob;1",
+            "@id": "dtmi:example:wum_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_zatz;1",
+            "@id": "dtmi:example:wum_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_jogg;1",
+            "@id": "dtmi:example:wum_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_flunn;1",
+            "@id": "dtmi:example:wum_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_itch;1",
+            "@id": "dtmi:example:wum_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_yekk;1",
+            "@id": "dtmi:example:wum_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_vroo;1",
+            "@id": "dtmi:example:wum_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:mu_hi;1",
+            "@id": "dtmi:example:wum_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_alpha;1",
+            "@id": "dtmi:example:wum_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_beta;1",
+            "@id": "dtmi:example:wum_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_gamma;1",
+            "@id": "dtmi:example:wum_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_delta;1",
+            "@id": "dtmi:example:wum_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_epsilon;1",
+            "@id": "dtmi:example:wum_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_zeta;1",
+            "@id": "dtmi:example:wum_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_eta;1",
+            "@id": "dtmi:example:wum_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_theta;1",
+            "@id": "dtmi:example:wum_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_iota;1",
+            "@id": "dtmi:example:um_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_kappa;1",
+            "@id": "dtmi:example:um_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_lambda;1",
+            "@id": "dtmi:example:um_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_mu;1",
+            "@id": "dtmi:example:um_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_nu;1",
+            "@id": "dtmi:example:um_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_xi;1",
+            "@id": "dtmi:example:um_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_omicron;1",
+            "@id": "dtmi:example:um_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_pi;1",
+            "@id": "dtmi:example:um_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_rho;1",
+            "@id": "dtmi:example:um_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_sigma;1",
+            "@id": "dtmi:example:um_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_tau;1",
+            "@id": "dtmi:example:um_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_upsilon;1",
+            "@id": "dtmi:example:um_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_phi;1",
+            "@id": "dtmi:example:um_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_chi;1",
+            "@id": "dtmi:example:um_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_psi;1",
+            "@id": "dtmi:example:um_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_omega;1",
+            "@id": "dtmi:example:um_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_yuzz;1",
+            "@id": "dtmi:example:um_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_wum;1",
+            "@id": "dtmi:example:um_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_um;1",
+            "@id": "dtmi:example:um_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_humpf;1",
+            "@id": "dtmi:example:um_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_fuddle;1",
+            "@id": "dtmi:example:um_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_glikk;1",
+            "@id": "dtmi:example:um_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_nuh;1",
+            "@id": "dtmi:example:um_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_snee;1",
+            "@id": "dtmi:example:um_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_quan;1",
+            "@id": "dtmi:example:um_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_thnad;1",
+            "@id": "dtmi:example:um_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_spazz;1",
+            "@id": "dtmi:example:um_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_floob;1",
+            "@id": "dtmi:example:um_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_zatz;1",
+            "@id": "dtmi:example:um_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_jogg;1",
+            "@id": "dtmi:example:um_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_flunn;1",
+            "@id": "dtmi:example:um_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_itch;1",
+            "@id": "dtmi:example:um_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_yekk;1",
+            "@id": "dtmi:example:um_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_vroo;1",
+            "@id": "dtmi:example:um_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:nu_hi;1",
+            "@id": "dtmi:example:um_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_alpha;1",
+            "@id": "dtmi:example:um_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_beta;1",
+            "@id": "dtmi:example:um_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_gamma;1",
+            "@id": "dtmi:example:um_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_delta;1",
+            "@id": "dtmi:example:um_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_epsilon;1",
+            "@id": "dtmi:example:um_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_zeta;1",
+            "@id": "dtmi:example:um_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_eta;1",
+            "@id": "dtmi:example:um_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_theta;1",
+            "@id": "dtmi:example:um_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_iota;1",
+            "@id": "dtmi:example:humpf_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_kappa;1",
+            "@id": "dtmi:example:humpf_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_lambda;1",
+            "@id": "dtmi:example:humpf_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_mu;1",
+            "@id": "dtmi:example:humpf_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_nu;1",
+            "@id": "dtmi:example:humpf_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_xi;1",
+            "@id": "dtmi:example:humpf_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_omicron;1",
+            "@id": "dtmi:example:humpf_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_pi;1",
+            "@id": "dtmi:example:humpf_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_rho;1",
+            "@id": "dtmi:example:humpf_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_sigma;1",
+            "@id": "dtmi:example:humpf_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_tau;1",
+            "@id": "dtmi:example:humpf_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_upsilon;1",
+            "@id": "dtmi:example:humpf_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_phi;1",
+            "@id": "dtmi:example:humpf_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_chi;1",
+            "@id": "dtmi:example:humpf_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_psi;1",
+            "@id": "dtmi:example:humpf_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_omega;1",
+            "@id": "dtmi:example:humpf_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_yuzz;1",
+            "@id": "dtmi:example:humpf_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_wum;1",
+            "@id": "dtmi:example:humpf_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_um;1",
+            "@id": "dtmi:example:humpf_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_humpf;1",
+            "@id": "dtmi:example:humpf_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_fuddle;1",
+            "@id": "dtmi:example:humpf_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_glikk;1",
+            "@id": "dtmi:example:humpf_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_nuh;1",
+            "@id": "dtmi:example:humpf_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_snee;1",
+            "@id": "dtmi:example:humpf_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_quan;1",
+            "@id": "dtmi:example:humpf_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_thnad;1",
+            "@id": "dtmi:example:humpf_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_spazz;1",
+            "@id": "dtmi:example:humpf_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_floob;1",
+            "@id": "dtmi:example:humpf_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_zatz;1",
+            "@id": "dtmi:example:humpf_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_jogg;1",
+            "@id": "dtmi:example:humpf_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_flunn;1",
+            "@id": "dtmi:example:humpf_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_itch;1",
+            "@id": "dtmi:example:humpf_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_yekk;1",
+            "@id": "dtmi:example:humpf_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_vroo;1",
+            "@id": "dtmi:example:humpf_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:xi_hi;1",
+            "@id": "dtmi:example:humpf_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_alpha;1",
+            "@id": "dtmi:example:humpf_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_beta;1",
+            "@id": "dtmi:example:humpf_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_gamma;1",
+            "@id": "dtmi:example:humpf_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_delta;1",
+            "@id": "dtmi:example:humpf_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_epsilon;1",
+            "@id": "dtmi:example:humpf_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_zeta;1",
+            "@id": "dtmi:example:humpf_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_eta;1",
+            "@id": "dtmi:example:humpf_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_theta;1",
+            "@id": "dtmi:example:humpf_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_iota;1",
+            "@id": "dtmi:example:fuddle_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_kappa;1",
+            "@id": "dtmi:example:fuddle_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_lambda;1",
+            "@id": "dtmi:example:fuddle_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_mu;1",
+            "@id": "dtmi:example:fuddle_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_nu;1",
+            "@id": "dtmi:example:fuddle_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_xi;1",
+            "@id": "dtmi:example:fuddle_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_omicron;1",
+            "@id": "dtmi:example:fuddle_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_pi;1",
+            "@id": "dtmi:example:fuddle_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_rho;1",
+            "@id": "dtmi:example:fuddle_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_sigma;1",
+            "@id": "dtmi:example:fuddle_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_tau;1",
+            "@id": "dtmi:example:fuddle_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_upsilon;1",
+            "@id": "dtmi:example:fuddle_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_phi;1",
+            "@id": "dtmi:example:fuddle_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_chi;1",
+            "@id": "dtmi:example:fuddle_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_psi;1",
+            "@id": "dtmi:example:fuddle_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_omega;1",
+            "@id": "dtmi:example:fuddle_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_yuzz;1",
+            "@id": "dtmi:example:fuddle_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_wum;1",
+            "@id": "dtmi:example:fuddle_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_um;1",
+            "@id": "dtmi:example:fuddle_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_humpf;1",
+            "@id": "dtmi:example:fuddle_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_fuddle;1",
+            "@id": "dtmi:example:fuddle_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_glikk;1",
+            "@id": "dtmi:example:fuddle_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_nuh;1",
+            "@id": "dtmi:example:fuddle_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_snee;1",
+            "@id": "dtmi:example:fuddle_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_quan;1",
+            "@id": "dtmi:example:fuddle_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_thnad;1",
+            "@id": "dtmi:example:fuddle_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_spazz;1",
+            "@id": "dtmi:example:fuddle_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_floob;1",
+            "@id": "dtmi:example:fuddle_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_zatz;1",
+            "@id": "dtmi:example:fuddle_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_jogg;1",
+            "@id": "dtmi:example:fuddle_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_flunn;1",
+            "@id": "dtmi:example:fuddle_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_itch;1",
+            "@id": "dtmi:example:fuddle_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_yekk;1",
+            "@id": "dtmi:example:fuddle_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_vroo;1",
+            "@id": "dtmi:example:fuddle_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:omicron_hi;1",
+            "@id": "dtmi:example:fuddle_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_alpha;1",
+            "@id": "dtmi:example:fuddle_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_beta;1",
+            "@id": "dtmi:example:fuddle_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_gamma;1",
+            "@id": "dtmi:example:fuddle_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_delta;1",
+            "@id": "dtmi:example:fuddle_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_epsilon;1",
+            "@id": "dtmi:example:fuddle_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_zeta;1",
+            "@id": "dtmi:example:fuddle_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_eta;1",
+            "@id": "dtmi:example:fuddle_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_theta;1",
+            "@id": "dtmi:example:fuddle_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_iota;1",
+            "@id": "dtmi:example:glikk_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_kappa;1",
+            "@id": "dtmi:example:glikk_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_lambda;1",
+            "@id": "dtmi:example:glikk_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_mu;1",
+            "@id": "dtmi:example:glikk_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_nu;1",
+            "@id": "dtmi:example:glikk_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_xi;1",
+            "@id": "dtmi:example:glikk_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_omicron;1",
+            "@id": "dtmi:example:glikk_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_pi;1",
+            "@id": "dtmi:example:glikk_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_rho;1",
+            "@id": "dtmi:example:glikk_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_sigma;1",
+            "@id": "dtmi:example:glikk_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_tau;1",
+            "@id": "dtmi:example:glikk_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_upsilon;1",
+            "@id": "dtmi:example:glikk_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_phi;1",
+            "@id": "dtmi:example:glikk_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_chi;1",
+            "@id": "dtmi:example:glikk_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_psi;1",
+            "@id": "dtmi:example:glikk_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_omega;1",
+            "@id": "dtmi:example:glikk_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_yuzz;1",
+            "@id": "dtmi:example:glikk_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_wum;1",
+            "@id": "dtmi:example:glikk_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_um;1",
+            "@id": "dtmi:example:glikk_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_humpf;1",
+            "@id": "dtmi:example:glikk_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_fuddle;1",
+            "@id": "dtmi:example:glikk_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_glikk;1",
+            "@id": "dtmi:example:glikk_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_nuh;1",
+            "@id": "dtmi:example:glikk_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_snee;1",
+            "@id": "dtmi:example:glikk_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_quan;1",
+            "@id": "dtmi:example:glikk_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_thnad;1",
+            "@id": "dtmi:example:glikk_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_spazz;1",
+            "@id": "dtmi:example:glikk_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_floob;1",
+            "@id": "dtmi:example:glikk_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_zatz;1",
+            "@id": "dtmi:example:glikk_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_jogg;1",
+            "@id": "dtmi:example:glikk_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_flunn;1",
+            "@id": "dtmi:example:glikk_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_itch;1",
+            "@id": "dtmi:example:glikk_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_yekk;1",
+            "@id": "dtmi:example:glikk_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_vroo;1",
+            "@id": "dtmi:example:glikk_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:pi_hi;1",
+            "@id": "dtmi:example:glikk_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_alpha;1",
+            "@id": "dtmi:example:glikk_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_beta;1",
+            "@id": "dtmi:example:glikk_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_gamma;1",
+            "@id": "dtmi:example:glikk_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_delta;1",
+            "@id": "dtmi:example:glikk_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_epsilon;1",
+            "@id": "dtmi:example:glikk_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_zeta;1",
+            "@id": "dtmi:example:glikk_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_eta;1",
+            "@id": "dtmi:example:glikk_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_theta;1",
+            "@id": "dtmi:example:glikk_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_iota;1",
+            "@id": "dtmi:example:nuh_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_kappa;1",
+            "@id": "dtmi:example:nuh_beta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_lambda;1",
+            "@id": "dtmi:example:nuh_gamma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_mu;1",
+            "@id": "dtmi:example:nuh_delta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_nu;1",
+            "@id": "dtmi:example:nuh_epsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_xi;1",
+            "@id": "dtmi:example:nuh_zeta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_omicron;1",
+            "@id": "dtmi:example:nuh_eta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_pi;1",
+            "@id": "dtmi:example:nuh_theta;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_rho;1",
+            "@id": "dtmi:example:nuh_iota;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_sigma;1",
+            "@id": "dtmi:example:nuh_kappa;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_tau;1",
+            "@id": "dtmi:example:nuh_lambda;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_upsilon;1",
+            "@id": "dtmi:example:nuh_mu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_phi;1",
+            "@id": "dtmi:example:nuh_nu;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_chi;1",
+            "@id": "dtmi:example:nuh_xi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_psi;1",
+            "@id": "dtmi:example:nuh_omicron;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_omega;1",
+            "@id": "dtmi:example:nuh_pi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_yuzz;1",
+            "@id": "dtmi:example:nuh_rho;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_wum;1",
+            "@id": "dtmi:example:nuh_sigma;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_um;1",
+            "@id": "dtmi:example:nuh_tau;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_humpf;1",
+            "@id": "dtmi:example:nuh_upsilon;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_fuddle;1",
+            "@id": "dtmi:example:nuh_phi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_glikk;1",
+            "@id": "dtmi:example:nuh_chi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_nuh;1",
+            "@id": "dtmi:example:nuh_psi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_snee;1",
+            "@id": "dtmi:example:nuh_omega;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_quan;1",
+            "@id": "dtmi:example:nuh_yuzz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_thnad;1",
+            "@id": "dtmi:example:nuh_wum;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_spazz;1",
+            "@id": "dtmi:example:nuh_um;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_floob;1",
+            "@id": "dtmi:example:nuh_humpf;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_zatz;1",
+            "@id": "dtmi:example:nuh_fuddle;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_jogg;1",
+            "@id": "dtmi:example:nuh_glikk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_flunn;1",
+            "@id": "dtmi:example:nuh_nuh;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_itch;1",
+            "@id": "dtmi:example:nuh_snee;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_yekk;1",
+            "@id": "dtmi:example:nuh_quan;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_vroo;1",
+            "@id": "dtmi:example:nuh_thnad;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:rho_hi;1",
+            "@id": "dtmi:example:nuh_spazz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_alpha;1",
+            "@id": "dtmi:example:nuh_floob;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_beta;1",
+            "@id": "dtmi:example:nuh_zatz;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_gamma;1",
+            "@id": "dtmi:example:nuh_jogg;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_delta;1",
+            "@id": "dtmi:example:nuh_flunn;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_epsilon;1",
+            "@id": "dtmi:example:nuh_itch;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_zeta;1",
+            "@id": "dtmi:example:nuh_yekk;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_eta;1",
+            "@id": "dtmi:example:nuh_vroo;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_theta;1",
+            "@id": "dtmi:example:nuh_hi;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_iota;1",
+            "@id": "dtmi:example:snee_alpha;1",
             "@type": "Interface"
           },
           {
-            "@id": "dtmi:example:sigma_kappa;1",
+            "@id": "dtmi:example:snee_beta;1",
             "@type": "Interface"
           }
         ]
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertiesExtendsMaxDepthV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertiesExtendsMaxDepthV3.json
index 9e9a2ce3..14d4ec5c 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfacePropertiesExtendsMaxDepthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertiesExtendsMaxDepthV3.json
@@ -7,37 +7,37 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_chi;1",
+        "@id": "dtmi:example:snee_xi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:sigma_phi;1",
+          "@id": "dtmi:example:snee_nu;1",
           "@type": "Interface",
           "extends": {
-            "@id": "dtmi:example:sigma_upsilon;1",
+            "@id": "dtmi:example:snee_mu;1",
             "@type": "Interface",
             "extends": {
-              "@id": "dtmi:example:sigma_tau;1",
+              "@id": "dtmi:example:snee_lambda;1",
               "@type": "Interface",
               "extends": {
-                "@id": "dtmi:example:sigma_sigma;1",
+                "@id": "dtmi:example:snee_kappa;1",
                 "@type": "Interface",
                 "extends": {
-                  "@id": "dtmi:example:sigma_rho;1",
+                  "@id": "dtmi:example:snee_iota;1",
                   "@type": "Interface",
                   "extends": {
-                    "@id": "dtmi:example:sigma_pi;1",
+                    "@id": "dtmi:example:snee_theta;1",
                     "@type": "Interface",
                     "extends": {
-                      "@id": "dtmi:example:sigma_omicron;1",
+                      "@id": "dtmi:example:snee_eta;1",
                       "@type": "Interface",
                       "extends": {
-                        "@id": "dtmi:example:sigma_xi;1",
+                        "@id": "dtmi:example:snee_zeta;1",
                         "@type": "Interface",
                         "extends": {
-                          "@id": "dtmi:example:sigma_nu;1",
+                          "@id": "dtmi:example:snee_epsilon;1",
                           "@type": "Interface",
                           "extends": {
-                            "@id": "dtmi:example:sigma_mu;1",
+                            "@id": "dtmi:example:snee_delta;1",
                             "@type": "Interface"
                           }
                         }
@@ -60,40 +60,40 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_thnad;1",
+        "@id": "dtmi:example:snee_wum;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:sigma_quan;1",
+          "@id": "dtmi:example:snee_yuzz;1",
           "@type": "Interface",
           "extends": {
-            "@id": "dtmi:example:sigma_snee;1",
+            "@id": "dtmi:example:snee_omega;1",
             "@type": "Interface",
             "extends": {
-              "@id": "dtmi:example:sigma_nuh;1",
+              "@id": "dtmi:example:snee_psi;1",
               "@type": "Interface",
               "extends": {
-                "@id": "dtmi:example:sigma_glikk;1",
+                "@id": "dtmi:example:snee_chi;1",
                 "@type": "Interface",
                 "extends": {
-                  "@id": "dtmi:example:sigma_fuddle;1",
+                  "@id": "dtmi:example:snee_phi;1",
                   "@type": "Interface",
                   "extends": {
-                    "@id": "dtmi:example:sigma_humpf;1",
+                    "@id": "dtmi:example:snee_upsilon;1",
                     "@type": "Interface",
                     "extends": {
-                      "@id": "dtmi:example:sigma_um;1",
+                      "@id": "dtmi:example:snee_tau;1",
                       "@type": "Interface",
                       "extends": {
-                        "@id": "dtmi:example:sigma_wum;1",
+                        "@id": "dtmi:example:snee_sigma;1",
                         "@type": "Interface",
                         "extends": {
-                          "@id": "dtmi:example:sigma_yuzz;1",
+                          "@id": "dtmi:example:snee_rho;1",
                           "@type": "Interface",
                           "extends": {
-                            "@id": "dtmi:example:sigma_omega;1",
+                            "@id": "dtmi:example:snee_pi;1",
                             "@type": "Interface",
                             "extends": {
-                              "@id": "dtmi:example:sigma_psi;1",
+                              "@id": "dtmi:example:snee_omicron;1",
                               "@type": "Interface"
                             }
                           }
@@ -117,41 +117,41 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_gamma;1",
+        "@id": "dtmi:example:snee_jogg;1",
         "@type": "Interface",
         "extends": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:tau_beta;1",
+          "@id": "dtmi:example:snee_zatz;1",
           "@type": "Interface",
           "extends": {
-            "@id": "dtmi:example:tau_alpha;1",
+            "@id": "dtmi:example:snee_floob;1",
             "@type": "Interface",
             "extends": {
-              "@id": "dtmi:example:sigma_hi;1",
+              "@id": "dtmi:example:snee_spazz;1",
               "@type": "Interface",
               "extends": {
-                "@id": "dtmi:example:sigma_vroo;1",
+                "@id": "dtmi:example:snee_thnad;1",
                 "@type": "Interface",
                 "extends": {
-                  "@id": "dtmi:example:sigma_yekk;1",
+                  "@id": "dtmi:example:snee_quan;1",
                   "@type": "Interface",
                   "extends": {
-                    "@id": "dtmi:example:sigma_itch;1",
+                    "@id": "dtmi:example:snee_snee;1",
                     "@type": "Interface",
                     "extends": {
-                      "@id": "dtmi:example:sigma_flunn;1",
+                      "@id": "dtmi:example:snee_nuh;1",
                       "@type": "Interface",
                       "extends": {
-                        "@id": "dtmi:example:sigma_jogg;1",
+                        "@id": "dtmi:example:snee_glikk;1",
                         "@type": "Interface",
                         "extends": {
-                          "@id": "dtmi:example:sigma_zatz;1",
+                          "@id": "dtmi:example:snee_fuddle;1",
                           "@type": "Interface",
                           "extends": {
-                            "@id": "dtmi:example:sigma_floob;1",
+                            "@id": "dtmi:example:snee_humpf;1",
                             "@type": "Interface",
                             "extends": {
-                              "@id": "dtmi:example:sigma_spazz;1",
+                              "@id": "dtmi:example:snee_um;1",
                               "@type": "Interface"
                             }
                           }
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertiesExtendsSelfReferenceV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertiesExtendsSelfReferenceV3.json
new file mode 100644
index 00000000..94da9d07
--- /dev/null
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertiesExtendsSelfReferenceV3.json
@@ -0,0 +1,39 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:snee_flunn;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:foo:delta_alpha;1",
+          "@type": "Interface",
+          "extends": "dtmi:foo:delta_alpha;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:snee_itch;1",
+        "@type": "Interface",
+        "extends": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:delta_alpha;1",
+          "@type": "Interface",
+          "extends": "dtmi:foo:delta_alpha;1"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertyCommentStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertyCommentStringLengthV3.json
index 4b26e563..9078053a 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfacePropertyCommentStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertyCommentStringLengthV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_upsilon;1",
+        "@id": "dtmi:example:sigma_eta;1",
         "@type": "Interface",
         "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
       }
@@ -21,7 +21,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_phi;1",
+        "@id": "dtmi:example:sigma_theta;1",
         "@type": "Interface",
         "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
       }
@@ -38,7 +38,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:eta_chi;1",
+        "@id": "dtmi:example:sigma_iota;1",
         "@type": "Interface",
         "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
       }
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertyCommentStringV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertyCommentStringV3.json
index c88374c3..9bfa2728 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfacePropertyCommentStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertyCommentStringV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_vroo;1",
+        "@id": "dtmi:example:rho_fuddle;1",
         "@type": "Interface",
         "comment": "hello"
       }
@@ -21,7 +21,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_hi;1",
+        "@id": "dtmi:example:rho_glikk;1",
         "@type": "Interface",
         "comment": [
           "hello"
@@ -37,7 +37,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_alpha;1",
+        "@id": "dtmi:example:rho_nuh;1",
         "@type": "Interface",
         "comment": {
           "@value": "hello",
@@ -54,7 +54,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_beta;1",
+        "@id": "dtmi:example:rho_snee;1",
         "@type": "Interface",
         "comment": [
           {
@@ -73,7 +73,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_gamma;1",
+        "@id": "dtmi:example:rho_quan;1",
         "@type": "Interface",
         "comment": []
       }
@@ -87,7 +87,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_delta;1",
+        "@id": "dtmi:example:rho_thnad;1",
         "@type": "Interface",
         "comment": null
       }
@@ -104,7 +104,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:eta_epsilon;1",
+        "@id": "dtmi:example:rho_spazz;1",
         "@type": "Interface",
         "comment": null
       }
@@ -118,7 +118,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_zeta;1",
+        "@id": "dtmi:example:rho_floob;1",
         "@type": "Interface",
         "comment": true
       }
@@ -135,7 +135,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:eta_eta;1",
+        "@id": "dtmi:example:rho_zatz;1",
         "@type": "Interface",
         "comment": true
       }
@@ -149,7 +149,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_theta;1",
+        "@id": "dtmi:example:rho_jogg;1",
         "@type": "Interface",
         "comment": 626
       }
@@ -166,7 +166,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:eta_iota;1",
+        "@id": "dtmi:example:rho_flunn;1",
         "@type": "Interface",
         "comment": 626
       }
@@ -180,7 +180,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_kappa;1",
+        "@id": "dtmi:example:rho_itch;1",
         "@type": "Interface",
         "comment": [
           null
@@ -199,7 +199,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:eta_lambda;1",
+        "@id": "dtmi:example:rho_yekk;1",
         "@type": "Interface",
         "comment": [
           null
@@ -215,7 +215,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_mu;1",
+        "@id": "dtmi:example:rho_vroo;1",
         "@type": "Interface",
         "comment": [
           true
@@ -234,7 +234,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:eta_nu;1",
+        "@id": "dtmi:example:rho_hi;1",
         "@type": "Interface",
         "comment": [
           true
@@ -250,7 +250,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_xi;1",
+        "@id": "dtmi:example:sigma_alpha;1",
         "@type": "Interface",
         "comment": [
           626
@@ -269,7 +269,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:eta_omicron;1",
+        "@id": "dtmi:example:sigma_beta;1",
         "@type": "Interface",
         "comment": [
           626
@@ -285,7 +285,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_pi;1",
+        "@id": "dtmi:example:sigma_gamma;1",
         "@type": "Interface",
         "comment": {}
       }
@@ -302,7 +302,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:eta_rho;1",
+        "@id": "dtmi:example:sigma_delta;1",
         "@type": "Interface",
         "comment": {}
       }
@@ -316,7 +316,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_sigma;1",
+        "@id": "dtmi:example:sigma_epsilon;1",
         "@type": "Interface",
         "comment": [
           {}
@@ -335,7 +335,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:eta_tau;1",
+        "@id": "dtmi:example:sigma_zeta;1",
         "@type": "Interface",
         "comment": [
           {}
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertyCommentTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertyCommentTermAndDtmiV3.json
index 1734703f..5a44b89c 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfacePropertyCommentTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertyCommentTermAndDtmiV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_fuddle;1",
+        "@id": "dtmi:example:sigma_pi;1",
         "@type": "Interface",
-        "comment": "eta_glikk",
-        "dtmi:dtdl:property:comment;3": "eta_nuh"
+        "comment": "sigma_rho",
+        "dtmi:dtdl:property:comment;3": "sigma_sigma"
       }
     ]
   },
@@ -25,10 +25,10 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:eta_snee;1",
+        "@id": "dtmi:example:sigma_tau;1",
         "@type": "Interface",
-        "comment": "eta_quan",
-        "dtmi:dtdl:property:comment;3": "eta_thnad"
+        "comment": "sigma_upsilon",
+        "dtmi:dtdl:property:comment;3": "sigma_phi"
       }
     ]
   }
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertyContentsElementV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertyContentsElementV3.json
index 5e9db30a..7cfec716 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfacePropertyContentsElementV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertyContentsElementV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_jogg;1",
+        "@id": "dtmi:example:sigma_yuzz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:eta_zatz;1",
+          "@id": "dtmi:example:sigma_omega;1",
           "@type": "Interface",
           "contents": {
-            "@id": "dtmi:example:eta_spazz;1",
+            "@id": "dtmi:example:sigma_chi;1",
             "@type": "Command",
-            "name": "eta_floob"
+            "name": "sigma_psi"
           }
         }
       }
@@ -29,16 +29,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_vroo;1",
+        "@id": "dtmi:example:sigma_fuddle;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:eta_yekk;1",
+          "@id": "dtmi:example:sigma_humpf;1",
           "@type": "Interface",
           "contents": [
             {
-              "@id": "dtmi:example:eta_flunn;1",
+              "@id": "dtmi:example:sigma_wum;1",
               "@type": "Command",
-              "name": "eta_itch"
+              "name": "sigma_um"
             }
           ]
         }
@@ -53,21 +53,68 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_gamma;1",
+        "@id": "dtmi:example:sigma_quan;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:theta_beta;1",
+          "@id": "dtmi:example:sigma_snee;1",
           "@type": "Interface",
           "contents": {
-            "@id": "dtmi:example:eta_hi;1",
+            "@id": "dtmi:example:sigma_glikk;1",
             "@type": "Command",
-            "name": "theta_alpha",
+            "name": "sigma_nuh",
             "@context": "dtmi:dtdl:context;2"
           }
         }
       }
     ]
   },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:sigma_zatz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:sigma_floob;1",
+          "@type": "Interface",
+          "contents": {
+            "@id": "dtmi:example:sigma_thnad;1",
+            "@type": "Command",
+            "name": "sigma_spazz",
+            "@context": "dtmi:dtdl:context;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:sigma_yekk;1",
+        "@type": "Interface",
+        "extends": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:sigma_itch;1",
+          "@type": "Interface",
+          "contents": {
+            "@id": "dtmi:example:sigma_jogg;1",
+            "@type": "Command",
+            "name": "sigma_flunn",
+            "@context": "dtmi:dtdl:context;4"
+          }
+        }
+      }
+    ]
+  },
   {
     "valid": true,
     "options": [
@@ -76,10 +123,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_epsilon;1",
+        "@id": "dtmi:example:sigma_hi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:theta_delta;1",
+          "@id": "dtmi:example:sigma_vroo;1",
           "@type": "Interface",
           "contents": []
         }
@@ -94,23 +141,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_mu;1",
+        "@id": "dtmi:example:tau_eta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:theta_lambda;1",
+          "@id": "dtmi:example:tau_zeta;1",
           "@type": "Interface",
           "contents": [
             {
-              "@id": "dtmi:example:theta_zeta;1",
+              "@id": "dtmi:example:tau_alpha;1",
               "@type": "Command",
-              "name": "theta_eta"
+              "name": "tau_beta"
             },
             {
-              "@id": "dtmi:example:theta_theta;1",
+              "@id": "dtmi:example:tau_gamma;1",
               "@type": "Component",
-              "name": "theta_iota",
+              "name": "tau_delta",
               "schema": {
-                "@id": "dtmi:example:theta_kappa;1",
+                "@id": "dtmi:example:tau_epsilon;1",
                 "@type": "Interface"
               }
             }
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertyContentsTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertyContentsTermAndDtmiV3.json
index 29880dfa..971f33f8 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfacePropertyContentsTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertyContentsTermAndDtmiV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_nu;1",
+        "@id": "dtmi:example:phi_theta;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Command",
-            "name": "kappa_xi"
+            "name": "phi_iota"
           }
         ],
         "dtmi:dtdl:property:contents;3": [
           {
             "@type": "Command",
-            "name": "kappa_omicron"
+            "name": "phi_kappa"
           }
         ]
       }
@@ -35,18 +35,18 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:kappa_pi;1",
+        "@id": "dtmi:example:phi_lambda;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Command",
-            "name": "kappa_rho"
+            "name": "phi_mu"
           }
         ],
         "dtmi:dtdl:property:contents;3": [
           {
             "@type": "Command",
-            "name": "kappa_sigma"
+            "name": "phi_nu"
           }
         ]
       }
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertyContentsTypeConformanceV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertyContentsTypeConformanceV3.json
index 5f5c71b2..3c375ec4 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfacePropertyContentsTypeConformanceV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertyContentsTypeConformanceV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_sigma;1",
+        "@id": "dtmi:example:tau_nu;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:theta_rho;1",
-          "elementSchema": "dateTime",
+          "@id": "dtmi:example:tau_mu;1",
+          "elementSchema": "boolean",
           "@type": "Array"
         }
       }
@@ -28,11 +28,11 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:theta_upsilon;1",
+        "@id": "dtmi:example:tau_omicron;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:theta_tau;1",
-          "elementSchema": "double",
+          "@id": "dtmi:example:tau_xi;1",
+          "elementSchema": "date",
           "@type": "Array"
         }
       }
@@ -46,11 +46,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_psi;1",
+        "@id": "dtmi:example:tau_sigma;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:theta_phi;1",
-          "name": "theta_chi",
+          "@id": "dtmi:example:tau_pi;1",
+          "name": "tau_rho",
           "@type": "Command"
         }
       }
@@ -64,12 +64,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_wum;1",
+        "@id": "dtmi:example:tau_phi;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:theta_omega;1",
-          "name": "theta_yuzz",
-          "schema": "duration",
+          "@id": "dtmi:example:tau_tau;1",
+          "name": "tau_upsilon",
+          "schema": "dateTime",
           "@type": "CommandRequest"
         }
       }
@@ -86,12 +86,12 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:theta_fuddle;1",
+        "@id": "dtmi:example:tau_omega;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:theta_um;1",
-          "name": "theta_humpf",
-          "schema": "float",
+          "@id": "dtmi:example:tau_chi;1",
+          "name": "tau_psi",
+          "schema": "double",
           "@type": "CommandRequest"
         }
       }
@@ -105,12 +105,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_snee;1",
+        "@id": "dtmi:example:tau_um;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:theta_glikk;1",
-          "name": "theta_nuh",
-          "schema": "integer",
+          "@id": "dtmi:example:tau_yuzz;1",
+          "name": "tau_wum",
+          "schema": "duration",
           "@type": "CommandResponse"
         }
       }
@@ -127,12 +127,12 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:theta_spazz;1",
+        "@id": "dtmi:example:tau_glikk;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:theta_quan;1",
-          "name": "theta_thnad",
-          "schema": "long",
+          "@id": "dtmi:example:tau_humpf;1",
+          "name": "tau_fuddle",
+          "schema": "float",
           "@type": "CommandResponse"
         }
       }
@@ -146,13 +146,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_flunn;1",
+        "@id": "dtmi:example:tau_thnad;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:theta_floob;1",
-          "name": "theta_zatz",
+          "@id": "dtmi:example:tau_nuh;1",
+          "name": "tau_snee",
           "schema": {
-            "@id": "dtmi:example:theta_jogg;1",
+            "@id": "dtmi:example:tau_quan;1",
             "@type": "Interface"
           },
           "@type": "Component"
@@ -168,10 +168,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_yekk;1",
+        "@id": "dtmi:example:tau_floob;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:theta_itch;1",
+          "@id": "dtmi:example:tau_spazz;1",
           "valueSchema": "integer",
           "@type": "Enum"
         }
@@ -189,10 +189,10 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:theta_hi;1",
+        "@id": "dtmi:example:tau_jogg;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:theta_vroo;1",
+          "@id": "dtmi:example:tau_zatz;1",
           "valueSchema": "integer",
           "@type": "Enum"
         }
@@ -207,12 +207,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_gamma;1",
+        "@id": "dtmi:example:tau_yekk;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:iota_alpha;1",
-          "enumValue": 1454,
-          "name": "iota_beta",
+          "@id": "dtmi:example:tau_flunn;1",
+          "enumValue": 1471,
+          "name": "tau_itch",
           "@type": "EnumValue"
         }
       }
@@ -229,12 +229,12 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:iota_zeta;1",
+        "@id": "dtmi:example:upsilon_alpha;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:iota_delta;1",
-          "enumValue": 1455,
-          "name": "iota_epsilon",
+          "@id": "dtmi:example:tau_vroo;1",
+          "enumValue": 1472,
+          "name": "tau_hi",
           "@type": "EnumValue"
         }
       }
@@ -248,12 +248,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_iota;1",
+        "@id": "dtmi:example:upsilon_delta;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:iota_eta;1",
-          "name": "iota_theta",
-          "schema": "string",
+          "@id": "dtmi:example:upsilon_beta;1",
+          "name": "upsilon_gamma",
+          "schema": "integer",
           "@type": "Field"
         }
       }
@@ -270,12 +270,12 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:iota_mu;1",
+        "@id": "dtmi:example:upsilon_eta;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:iota_kappa;1",
-          "name": "iota_lambda",
-          "schema": "time",
+          "@id": "dtmi:example:upsilon_epsilon;1",
+          "name": "upsilon_zeta",
+          "schema": "long",
           "@type": "Field"
         }
       }
@@ -289,10 +289,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_xi;1",
+        "@id": "dtmi:example:upsilon_iota;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:iota_nu;1",
+          "@id": "dtmi:example:upsilon_theta;1",
           "@type": "Interface"
         }
       }
@@ -309,10 +309,10 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:iota_pi;1",
+        "@id": "dtmi:example:upsilon_lambda;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:iota_omicron;1",
+          "@id": "dtmi:example:upsilon_kappa;1",
           "@type": "Interface"
         }
       }
@@ -326,17 +326,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_upsilon;1",
+        "@id": "dtmi:example:upsilon_omicron;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:iota_rho;1",
+          "@id": "dtmi:example:upsilon_mu;1",
           "mapKey": {
-            "name": "iota_sigma",
+            "name": "upsilon_nu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "iota_tau",
-            "schema": "boolean"
+            "name": "upsilon_xi",
+            "schema": "string"
           },
           "@type": "Map"
         }
@@ -354,17 +354,17 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:iota_omega;1",
+        "@id": "dtmi:example:upsilon_tau;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:iota_phi;1",
+          "@id": "dtmi:example:upsilon_pi;1",
           "mapKey": {
-            "name": "iota_chi",
+            "name": "upsilon_rho",
             "schema": "string"
           },
           "mapValue": {
-            "name": "iota_psi",
-            "schema": "date"
+            "name": "upsilon_sigma",
+            "schema": "time"
           },
           "@type": "Map"
         }
@@ -379,11 +379,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_um;1",
+        "@id": "dtmi:example:upsilon_chi;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:iota_yuzz;1",
-          "name": "iota_wum",
+          "@id": "dtmi:example:upsilon_upsilon;1",
+          "name": "upsilon_phi",
           "schema": "string",
           "@type": "MapKey"
         }
@@ -401,11 +401,11 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:iota_glikk;1",
+        "@id": "dtmi:example:upsilon_yuzz;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:iota_humpf;1",
-          "name": "iota_fuddle",
+          "@id": "dtmi:example:upsilon_psi;1",
+          "name": "upsilon_omega",
           "schema": "string",
           "@type": "MapKey"
         }
@@ -420,12 +420,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_quan;1",
+        "@id": "dtmi:example:upsilon_humpf;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:iota_nuh;1",
-          "name": "iota_snee",
-          "schema": "dateTime",
+          "@id": "dtmi:example:upsilon_wum;1",
+          "name": "upsilon_um",
+          "schema": "boolean",
           "@type": "MapValue"
         }
       }
@@ -442,12 +442,12 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:iota_floob;1",
+        "@id": "dtmi:example:upsilon_nuh;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:iota_thnad;1",
-          "name": "iota_spazz",
-          "schema": "double",
+          "@id": "dtmi:example:upsilon_fuddle;1",
+          "name": "upsilon_glikk",
+          "schema": "date",
           "@type": "MapValue"
         }
       }
@@ -461,10 +461,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_jogg;1",
+        "@id": "dtmi:example:upsilon_quan;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:iota_zatz;1",
+          "@id": "dtmi:example:upsilon_snee;1",
           "@type": "Object"
         }
       }
@@ -481,10 +481,10 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:iota_itch;1",
+        "@id": "dtmi:example:upsilon_spazz;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:iota_flunn;1",
+          "@id": "dtmi:example:upsilon_thnad;1",
           "@type": "Object"
         }
       }
@@ -498,12 +498,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_hi;1",
+        "@id": "dtmi:example:upsilon_jogg;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:iota_yekk;1",
-          "name": "iota_vroo",
-          "schema": "duration",
+          "@id": "dtmi:example:upsilon_floob;1",
+          "name": "upsilon_zatz",
+          "schema": "dateTime",
           "@type": "Property"
         }
       }
@@ -517,11 +517,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_gamma;1",
+        "@id": "dtmi:example:upsilon_yekk;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:kappa_alpha;1",
-          "name": "kappa_beta",
+          "@id": "dtmi:example:upsilon_flunn;1",
+          "name": "upsilon_itch",
           "@type": "Relationship"
         }
       }
@@ -535,12 +535,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_zeta;1",
+        "@id": "dtmi:example:phi_alpha;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:kappa_delta;1",
-          "name": "kappa_epsilon",
-          "schema": "float",
+          "@id": "dtmi:example:upsilon_vroo;1",
+          "name": "upsilon_hi",
+          "schema": "double",
           "@type": "Telemetry"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertyDescriptionLangStringV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertyDescriptionLangStringV3.json
index bb879748..fca92e2d 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfacePropertyDescriptionLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertyDescriptionLangStringV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_tau;1",
+        "@id": "dtmi:example:phi_xi;1",
         "@type": "Interface",
         "description": "hello"
       }
@@ -21,7 +21,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_upsilon;1",
+        "@id": "dtmi:example:phi_omicron;1",
         "@type": "Interface",
         "description": [
           "hello"
@@ -37,7 +37,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_phi;1",
+        "@id": "dtmi:example:phi_pi;1",
         "@type": "Interface",
         "description": {
           "en": "hello"
@@ -53,7 +53,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_chi;1",
+        "@id": "dtmi:example:phi_rho;1",
         "@type": "Interface",
         "description": [
           {
@@ -72,7 +72,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_psi;1",
+        "@id": "dtmi:example:phi_sigma;1",
         "@type": "Interface",
         "description": {}
       }
@@ -86,7 +86,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_omega;1",
+        "@id": "dtmi:example:phi_tau;1",
         "@type": "Interface",
         "description": []
       }
@@ -100,7 +100,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_yuzz;1",
+        "@id": "dtmi:example:phi_upsilon;1",
         "@type": "Interface",
         "description": null
       }
@@ -117,7 +117,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:kappa_wum;1",
+        "@id": "dtmi:example:phi_phi;1",
         "@type": "Interface",
         "description": null
       }
@@ -131,7 +131,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_um;1",
+        "@id": "dtmi:example:phi_chi;1",
         "@type": "Interface",
         "description": true
       }
@@ -148,7 +148,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:kappa_humpf;1",
+        "@id": "dtmi:example:phi_psi;1",
         "@type": "Interface",
         "description": true
       }
@@ -162,7 +162,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_fuddle;1",
+        "@id": "dtmi:example:phi_omega;1",
         "@type": "Interface",
         "description": 626
       }
@@ -179,7 +179,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:kappa_glikk;1",
+        "@id": "dtmi:example:phi_yuzz;1",
         "@type": "Interface",
         "description": 626
       }
@@ -193,7 +193,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_nuh;1",
+        "@id": "dtmi:example:phi_wum;1",
         "@type": "Interface",
         "description": [
           null
@@ -212,7 +212,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:kappa_snee;1",
+        "@id": "dtmi:example:phi_um;1",
         "@type": "Interface",
         "description": [
           null
@@ -228,7 +228,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_quan;1",
+        "@id": "dtmi:example:phi_humpf;1",
         "@type": "Interface",
         "description": [
           true
@@ -247,7 +247,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:kappa_thnad;1",
+        "@id": "dtmi:example:phi_fuddle;1",
         "@type": "Interface",
         "description": [
           true
@@ -263,7 +263,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_spazz;1",
+        "@id": "dtmi:example:phi_glikk;1",
         "@type": "Interface",
         "description": [
           626
@@ -282,7 +282,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:kappa_floob;1",
+        "@id": "dtmi:example:phi_nuh;1",
         "@type": "Interface",
         "description": [
           626
@@ -298,7 +298,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_zatz;1",
+        "@id": "dtmi:example:phi_snee;1",
         "@type": "Interface",
         "description": [
           {}
@@ -317,7 +317,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:kappa_jogg;1",
+        "@id": "dtmi:example:phi_quan;1",
         "@type": "Interface",
         "description": [
           {}
@@ -333,7 +333,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_flunn;1",
+        "@id": "dtmi:example:phi_thnad;1",
         "@type": "Interface",
         "description": {
           "@value": "hello",
@@ -353,7 +353,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:kappa_itch;1",
+        "@id": "dtmi:example:phi_spazz;1",
         "@type": "Interface",
         "description": {
           "@value": "hello",
@@ -370,7 +370,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_yekk;1",
+        "@id": "dtmi:example:phi_floob;1",
         "@type": "Interface",
         "description": [
           {
@@ -391,7 +391,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:kappa_vroo;1",
+        "@id": "dtmi:example:phi_zatz;1",
         "@type": "Interface",
         "description": [
           {
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertyDescriptionStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertyDescriptionStringLengthV3.json
index 88ed1df0..5b01ad54 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfacePropertyDescriptionStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertyDescriptionStringLengthV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_hi;1",
+        "@id": "dtmi:example:phi_jogg;1",
         "@type": "Interface",
         "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
       }
@@ -21,7 +21,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_alpha;1",
+        "@id": "dtmi:example:phi_flunn;1",
         "@type": "Interface",
         "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
       }
@@ -38,7 +38,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:lambda_beta;1",
+        "@id": "dtmi:example:phi_itch;1",
         "@type": "Interface",
         "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
       }
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertyDescriptionTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertyDescriptionTermAndDtmiV3.json
index ae0cd55a..0bc381e2 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfacePropertyDescriptionTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertyDescriptionTermAndDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_iota;1",
+        "@id": "dtmi:example:chi_delta;1",
         "@type": "Interface",
         "description": [
-          "lambda_kappa"
+          "chi_epsilon"
         ],
         "dtmi:dtdl:property:description;3": [
-          "lambda_lambda"
+          "chi_zeta"
         ]
       }
     ]
@@ -29,13 +29,13 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:lambda_mu;1",
+        "@id": "dtmi:example:chi_eta;1",
         "@type": "Interface",
         "description": [
-          "lambda_nu"
+          "chi_theta"
         ],
         "dtmi:dtdl:property:description;3": [
-          "lambda_xi"
+          "chi_iota"
         ]
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertyDisplayNameLangStringV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertyDisplayNameLangStringV3.json
index f695e11f..521c675c 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfacePropertyDisplayNameLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertyDisplayNameLangStringV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_omicron;1",
+        "@id": "dtmi:example:chi_kappa;1",
         "@type": "Interface",
         "displayName": "hello"
       }
@@ -21,7 +21,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_pi;1",
+        "@id": "dtmi:example:chi_lambda;1",
         "@type": "Interface",
         "displayName": [
           "hello"
@@ -37,7 +37,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_rho;1",
+        "@id": "dtmi:example:chi_mu;1",
         "@type": "Interface",
         "displayName": {
           "en": "hello"
@@ -53,7 +53,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_sigma;1",
+        "@id": "dtmi:example:chi_nu;1",
         "@type": "Interface",
         "displayName": [
           {
@@ -72,7 +72,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_tau;1",
+        "@id": "dtmi:example:chi_xi;1",
         "@type": "Interface",
         "displayName": {}
       }
@@ -86,7 +86,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_upsilon;1",
+        "@id": "dtmi:example:chi_omicron;1",
         "@type": "Interface",
         "displayName": []
       }
@@ -100,7 +100,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_phi;1",
+        "@id": "dtmi:example:chi_pi;1",
         "@type": "Interface",
         "displayName": null
       }
@@ -117,7 +117,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:lambda_chi;1",
+        "@id": "dtmi:example:chi_rho;1",
         "@type": "Interface",
         "displayName": null
       }
@@ -131,7 +131,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_psi;1",
+        "@id": "dtmi:example:chi_sigma;1",
         "@type": "Interface",
         "displayName": true
       }
@@ -148,7 +148,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:lambda_omega;1",
+        "@id": "dtmi:example:chi_tau;1",
         "@type": "Interface",
         "displayName": true
       }
@@ -162,7 +162,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_yuzz;1",
+        "@id": "dtmi:example:chi_upsilon;1",
         "@type": "Interface",
         "displayName": 626
       }
@@ -179,7 +179,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:lambda_wum;1",
+        "@id": "dtmi:example:chi_phi;1",
         "@type": "Interface",
         "displayName": 626
       }
@@ -193,7 +193,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_um;1",
+        "@id": "dtmi:example:chi_chi;1",
         "@type": "Interface",
         "displayName": [
           null
@@ -212,7 +212,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:lambda_humpf;1",
+        "@id": "dtmi:example:chi_psi;1",
         "@type": "Interface",
         "displayName": [
           null
@@ -228,7 +228,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_fuddle;1",
+        "@id": "dtmi:example:chi_omega;1",
         "@type": "Interface",
         "displayName": [
           true
@@ -247,7 +247,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:lambda_glikk;1",
+        "@id": "dtmi:example:chi_yuzz;1",
         "@type": "Interface",
         "displayName": [
           true
@@ -263,7 +263,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_nuh;1",
+        "@id": "dtmi:example:chi_wum;1",
         "@type": "Interface",
         "displayName": [
           626
@@ -282,7 +282,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:lambda_snee;1",
+        "@id": "dtmi:example:chi_um;1",
         "@type": "Interface",
         "displayName": [
           626
@@ -298,7 +298,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_quan;1",
+        "@id": "dtmi:example:chi_humpf;1",
         "@type": "Interface",
         "displayName": [
           {}
@@ -317,7 +317,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:lambda_thnad;1",
+        "@id": "dtmi:example:chi_fuddle;1",
         "@type": "Interface",
         "displayName": [
           {}
@@ -333,7 +333,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_spazz;1",
+        "@id": "dtmi:example:chi_glikk;1",
         "@type": "Interface",
         "displayName": {
           "@value": "hello",
@@ -353,7 +353,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:lambda_floob;1",
+        "@id": "dtmi:example:chi_nuh;1",
         "@type": "Interface",
         "displayName": {
           "@value": "hello",
@@ -370,7 +370,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_zatz;1",
+        "@id": "dtmi:example:chi_snee;1",
         "@type": "Interface",
         "displayName": [
           {
@@ -391,7 +391,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:lambda_jogg;1",
+        "@id": "dtmi:example:chi_quan;1",
         "@type": "Interface",
         "displayName": [
           {
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertyDisplayNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertyDisplayNameStringLengthV3.json
index c5fcc02b..af36456e 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfacePropertyDisplayNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertyDisplayNameStringLengthV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_flunn;1",
+        "@id": "dtmi:example:chi_thnad;1",
         "@type": "Interface",
         "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
       }
@@ -21,7 +21,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_itch;1",
+        "@id": "dtmi:example:chi_spazz;1",
         "@type": "Interface",
         "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
       }
@@ -38,7 +38,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:lambda_yekk;1",
+        "@id": "dtmi:example:chi_floob;1",
         "@type": "Interface",
         "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
       }
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertyDisplayNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertyDisplayNameTermAndDtmiV3.json
index 96f6c799..af53b35a 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfacePropertyDisplayNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertyDisplayNameTermAndDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_epsilon;1",
+        "@id": "dtmi:example:chi_hi;1",
         "@type": "Interface",
         "displayName": [
-          "mu_zeta"
+          "psi_alpha"
         ],
         "dtmi:dtdl:property:displayName;3": [
-          "mu_eta"
+          "psi_beta"
         ]
       }
     ]
@@ -29,13 +29,13 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:mu_theta;1",
+        "@id": "dtmi:example:psi_gamma;1",
         "@type": "Interface",
         "displayName": [
-          "mu_iota"
+          "psi_delta"
         ],
         "dtmi:dtdl:property:displayName;3": [
-          "mu_kappa"
+          "psi_epsilon"
         ]
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertyExtendsElementV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertyExtendsElementV3.json
index 2cf8acf5..2ada6269 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfacePropertyExtendsElementV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertyExtendsElementV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_nu;1",
+        "@id": "dtmi:example:psi_theta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:mu_mu;1",
+          "@id": "dtmi:example:psi_eta;1",
           "@type": "Interface",
           "extends": {
-            "@id": "dtmi:example:mu_lambda;1",
+            "@id": "dtmi:example:psi_zeta;1",
             "@type": "Interface"
           }
         }
@@ -28,14 +28,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_pi;1",
+        "@id": "dtmi:example:psi_lambda;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:mu_omicron;1",
+          "@id": "dtmi:example:psi_kappa;1",
           "@type": "Interface",
           "extends": [
             {
-              "@id": "dtmi:example:mu_xi;1",
+              "@id": "dtmi:example:psi_iota;1",
               "@type": "Interface"
             }
           ]
@@ -52,10 +52,10 @@
       [
         {
           "@context": "dtmi:dtdl:context;3",
-          "@id": "dtmi:example:mu_sigma;1",
+          "@id": "dtmi:example:psi_nu;1",
           "@type": "Interface",
           "extends": {
-            "@id": "dtmi:example:mu_rho;1",
+            "@id": "dtmi:example:psi_mu;1",
             "@type": "Interface",
             "extends": "dtmi:ex:dependentRef;1"
           }
@@ -77,10 +77,10 @@
       [
         {
           "@context": "dtmi:dtdl:context;3",
-          "@id": "dtmi:example:mu_upsilon;1",
+          "@id": "dtmi:example:psi_omicron;1",
           "@type": "Interface",
           "extends": {
-            "@id": "dtmi:example:mu_tau;1",
+            "@id": "dtmi:example:psi_xi;1",
             "@type": "Interface",
             "extends": [
               "dtmi:ex:dependentRef;1"
@@ -103,13 +103,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_psi;1",
+        "@id": "dtmi:example:psi_sigma;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:mu_chi;1",
+          "@id": "dtmi:example:psi_rho;1",
           "@type": "Interface",
           "extends": {
-            "@id": "dtmi:example:mu_phi;1",
+            "@id": "dtmi:example:psi_pi;1",
             "@type": "Interface",
             "@context": "dtmi:dtdl:context;2"
           }
@@ -117,6 +117,51 @@
       }
     ]
   },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:psi_phi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:psi_upsilon;1",
+          "@type": "Interface",
+          "extends": {
+            "@id": "dtmi:example:psi_tau;1",
+            "@type": "Interface",
+            "@context": "dtmi:dtdl:context;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:psi_omega;1",
+        "@type": "Interface",
+        "extends": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:psi_psi;1",
+          "@type": "Interface",
+          "extends": {
+            "@id": "dtmi:example:psi_chi;1",
+            "@type": "Interface",
+            "@context": "dtmi:dtdl:context;4"
+          }
+        }
+      }
+    ]
+  },
   {
     "valid": true,
     "options": [
@@ -125,10 +170,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_yuzz;1",
+        "@id": "dtmi:example:psi_wum;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:mu_omega;1",
+          "@id": "dtmi:example:psi_yuzz;1",
           "@type": "Interface",
           "extends": []
         }
@@ -143,18 +188,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_fuddle;1",
+        "@id": "dtmi:example:psi_glikk;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:mu_humpf;1",
+          "@id": "dtmi:example:psi_fuddle;1",
           "@type": "Interface",
           "extends": [
             {
-              "@id": "dtmi:example:mu_wum;1",
+              "@id": "dtmi:example:psi_um;1",
               "@type": "Interface"
             },
             {
-              "@id": "dtmi:example:mu_um;1",
+              "@id": "dtmi:example:psi_humpf;1",
               "@type": "Interface"
             }
           ]
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertyExtendsTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertyExtendsTermAndDtmiV3.json
index 4a21596d..065b73ad 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfacePropertyExtendsTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertyExtendsTermAndDtmiV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_alpha;1",
+        "@id": "dtmi:example:wum_beta;1",
         "@type": "Interface",
         "extends": [
           {
-            "@id": "dtmi:example:omicron_beta;1",
+            "@id": "dtmi:example:wum_gamma;1",
             "@type": "Interface"
           }
         ],
         "dtmi:dtdl:property:extends;3": [
           {
-            "@id": "dtmi:example:omicron_gamma;1",
+            "@id": "dtmi:example:wum_delta;1",
             "@type": "Interface"
           }
         ]
@@ -35,17 +35,17 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:omicron_delta;1",
+        "@id": "dtmi:example:wum_epsilon;1",
         "@type": "Interface",
         "extends": [
           {
-            "@id": "dtmi:example:omicron_epsilon;1",
+            "@id": "dtmi:example:wum_zeta;1",
             "@type": "Interface"
           }
         ],
         "dtmi:dtdl:property:extends;3": [
           {
-            "@id": "dtmi:example:omicron_zeta;1",
+            "@id": "dtmi:example:wum_eta;1",
             "@type": "Interface"
           }
         ]
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertyExtendsTypeConformanceV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertyExtendsTypeConformanceV3.json
index 2822739d..4a475152 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfacePropertyExtendsTypeConformanceV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertyExtendsTypeConformanceV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_spazz;1",
+        "@id": "dtmi:example:psi_floob;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:mu_thnad;1",
-          "elementSchema": "integer",
+          "@id": "dtmi:example:psi_spazz;1",
+          "elementSchema": "duration",
           "@type": "Array"
         }
       }
@@ -28,11 +28,11 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:mu_zatz;1",
+        "@id": "dtmi:example:psi_jogg;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:mu_floob;1",
-          "elementSchema": "long",
+          "@id": "dtmi:example:psi_zatz;1",
+          "elementSchema": "float",
           "@type": "Array"
         }
       }
@@ -46,11 +46,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_itch;1",
+        "@id": "dtmi:example:psi_yekk;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:mu_jogg;1",
-          "name": "mu_flunn",
+          "@id": "dtmi:example:psi_flunn;1",
+          "name": "psi_itch",
           "@type": "Command"
         }
       }
@@ -67,11 +67,11 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:mu_hi;1",
+        "@id": "dtmi:example:omega_alpha;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:mu_yekk;1",
-          "name": "mu_vroo",
+          "@id": "dtmi:example:psi_vroo;1",
+          "name": "psi_hi",
           "@type": "Command"
         }
       }
@@ -85,12 +85,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_gamma;1",
+        "@id": "dtmi:example:omega_delta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_alpha;1",
-          "name": "nu_beta",
-          "schema": "string",
+          "@id": "dtmi:example:omega_beta;1",
+          "name": "omega_gamma",
+          "schema": "integer",
           "@type": "CommandRequest"
         }
       }
@@ -107,12 +107,12 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:nu_zeta;1",
+        "@id": "dtmi:example:omega_eta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_delta;1",
-          "name": "nu_epsilon",
-          "schema": "time",
+          "@id": "dtmi:example:omega_epsilon;1",
+          "name": "omega_zeta",
+          "schema": "long",
           "@type": "CommandRequest"
         }
       }
@@ -126,12 +126,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_iota;1",
+        "@id": "dtmi:example:omega_kappa;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_eta;1",
-          "name": "nu_theta",
-          "schema": "boolean",
+          "@id": "dtmi:example:omega_theta;1",
+          "name": "omega_iota",
+          "schema": "string",
           "@type": "CommandResponse"
         }
       }
@@ -148,12 +148,12 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:nu_mu;1",
+        "@id": "dtmi:example:omega_nu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_kappa;1",
-          "name": "nu_lambda",
-          "schema": "date",
+          "@id": "dtmi:example:omega_lambda;1",
+          "name": "omega_mu",
+          "schema": "time",
           "@type": "CommandResponse"
         }
       }
@@ -167,13 +167,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_pi;1",
+        "@id": "dtmi:example:omega_rho;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_nu;1",
-          "name": "nu_xi",
+          "@id": "dtmi:example:omega_xi;1",
+          "name": "omega_omicron",
           "schema": {
-            "@id": "dtmi:example:nu_omicron;1",
+            "@id": "dtmi:example:omega_pi;1",
             "@type": "Interface"
           },
           "@type": "Component"
@@ -192,13 +192,13 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:nu_upsilon;1",
+        "@id": "dtmi:example:omega_phi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_rho;1",
-          "name": "nu_sigma",
+          "@id": "dtmi:example:omega_sigma;1",
+          "name": "omega_tau",
           "schema": {
-            "@id": "dtmi:example:nu_tau;1",
+            "@id": "dtmi:example:omega_upsilon;1",
             "@type": "Interface"
           },
           "@type": "Component"
@@ -214,10 +214,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_chi;1",
+        "@id": "dtmi:example:omega_psi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_phi;1",
+          "@id": "dtmi:example:omega_chi;1",
           "valueSchema": "integer",
           "@type": "Enum"
         }
@@ -235,10 +235,10 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:nu_omega;1",
+        "@id": "dtmi:example:omega_yuzz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_psi;1",
+          "@id": "dtmi:example:omega_omega;1",
           "valueSchema": "integer",
           "@type": "Enum"
         }
@@ -253,12 +253,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_um;1",
+        "@id": "dtmi:example:omega_humpf;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_yuzz;1",
-          "enumValue": 1456,
-          "name": "nu_wum",
+          "@id": "dtmi:example:omega_wum;1",
+          "enumValue": 1473,
+          "name": "omega_um",
           "@type": "EnumValue"
         }
       }
@@ -275,12 +275,12 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:nu_glikk;1",
+        "@id": "dtmi:example:omega_nuh;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_humpf;1",
-          "enumValue": 1457,
-          "name": "nu_fuddle",
+          "@id": "dtmi:example:omega_fuddle;1",
+          "enumValue": 1474,
+          "name": "omega_glikk",
           "@type": "EnumValue"
         }
       }
@@ -294,12 +294,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_quan;1",
+        "@id": "dtmi:example:omega_thnad;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_nuh;1",
-          "name": "nu_snee",
-          "schema": "dateTime",
+          "@id": "dtmi:example:omega_snee;1",
+          "name": "omega_quan",
+          "schema": "boolean",
           "@type": "Field"
         }
       }
@@ -316,12 +316,12 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:nu_floob;1",
+        "@id": "dtmi:example:omega_zatz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_thnad;1",
-          "name": "nu_spazz",
-          "schema": "double",
+          "@id": "dtmi:example:omega_spazz;1",
+          "name": "omega_floob",
+          "schema": "date",
           "@type": "Field"
         }
       }
@@ -335,10 +335,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_jogg;1",
+        "@id": "dtmi:example:omega_flunn;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_zatz;1",
+          "@id": "dtmi:example:omega_jogg;1",
           "@type": "Interface"
         }
       }
@@ -352,17 +352,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_vroo;1",
+        "@id": "dtmi:example:omega_hi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_flunn;1",
+          "@id": "dtmi:example:omega_itch;1",
           "mapKey": {
-            "name": "nu_itch",
+            "name": "omega_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "nu_yekk",
-            "schema": "duration"
+            "name": "omega_vroo",
+            "schema": "dateTime"
           },
           "@type": "Map"
         }
@@ -380,17 +380,17 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:xi_gamma;1",
+        "@id": "dtmi:example:yuzz_delta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:nu_hi;1",
+          "@id": "dtmi:example:yuzz_alpha;1",
           "mapKey": {
-            "name": "xi_alpha",
+            "name": "yuzz_beta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "xi_beta",
-            "schema": "float"
+            "name": "yuzz_gamma",
+            "schema": "double"
           },
           "@type": "Map"
         }
@@ -405,11 +405,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_zeta;1",
+        "@id": "dtmi:example:yuzz_eta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_delta;1",
-          "name": "xi_epsilon",
+          "@id": "dtmi:example:yuzz_epsilon;1",
+          "name": "yuzz_zeta",
           "schema": "string",
           "@type": "MapKey"
         }
@@ -427,11 +427,11 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:xi_iota;1",
+        "@id": "dtmi:example:yuzz_kappa;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_eta;1",
-          "name": "xi_theta",
+          "@id": "dtmi:example:yuzz_theta;1",
+          "name": "yuzz_iota",
           "schema": "string",
           "@type": "MapKey"
         }
@@ -446,12 +446,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_mu;1",
+        "@id": "dtmi:example:yuzz_nu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_kappa;1",
-          "name": "xi_lambda",
-          "schema": "integer",
+          "@id": "dtmi:example:yuzz_lambda;1",
+          "name": "yuzz_mu",
+          "schema": "duration",
           "@type": "MapValue"
         }
       }
@@ -468,12 +468,12 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:xi_omicron;1",
+        "@id": "dtmi:example:yuzz_pi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_nu;1",
-          "name": "xi_xi",
-          "schema": "long",
+          "@id": "dtmi:example:yuzz_xi;1",
+          "name": "yuzz_omicron",
+          "schema": "float",
           "@type": "MapValue"
         }
       }
@@ -487,10 +487,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_rho;1",
+        "@id": "dtmi:example:yuzz_sigma;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_pi;1",
+          "@id": "dtmi:example:yuzz_rho;1",
           "@type": "Object"
         }
       }
@@ -507,10 +507,10 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:xi_tau;1",
+        "@id": "dtmi:example:yuzz_upsilon;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_sigma;1",
+          "@id": "dtmi:example:yuzz_tau;1",
           "@type": "Object"
         }
       }
@@ -524,12 +524,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_chi;1",
+        "@id": "dtmi:example:yuzz_psi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_upsilon;1",
-          "name": "xi_phi",
-          "schema": "string",
+          "@id": "dtmi:example:yuzz_phi;1",
+          "name": "yuzz_chi",
+          "schema": "integer",
           "@type": "Property"
         }
       }
@@ -546,12 +546,12 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:xi_yuzz;1",
+        "@id": "dtmi:example:yuzz_wum;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_psi;1",
-          "name": "xi_omega",
-          "schema": "time",
+          "@id": "dtmi:example:yuzz_omega;1",
+          "name": "yuzz_yuzz",
+          "schema": "long",
           "@type": "Property"
         }
       }
@@ -565,11 +565,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_humpf;1",
+        "@id": "dtmi:example:yuzz_fuddle;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_wum;1",
-          "name": "xi_um",
+          "@id": "dtmi:example:yuzz_um;1",
+          "name": "yuzz_humpf",
           "@type": "Relationship"
         }
       }
@@ -586,11 +586,11 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:xi_nuh;1",
+        "@id": "dtmi:example:yuzz_snee;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_fuddle;1",
-          "name": "xi_glikk",
+          "@id": "dtmi:example:yuzz_glikk;1",
+          "name": "yuzz_nuh",
           "@type": "Relationship"
         }
       }
@@ -604,12 +604,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_thnad;1",
+        "@id": "dtmi:example:yuzz_spazz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_snee;1",
-          "name": "xi_quan",
-          "schema": "boolean",
+          "@id": "dtmi:example:yuzz_quan;1",
+          "name": "yuzz_thnad",
+          "schema": "string",
           "@type": "Telemetry"
         }
       }
@@ -626,12 +626,12 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:xi_zatz;1",
+        "@id": "dtmi:example:yuzz_jogg;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_spazz;1",
-          "name": "xi_floob",
-          "schema": "date",
+          "@id": "dtmi:example:yuzz_floob;1",
+          "name": "yuzz_zatz",
+          "schema": "time",
           "@type": "Telemetry"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertyFormallyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertyFormallyIrrelevantDtmiOrTermV3.json
index 1e61a41c..8721956a 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfacePropertyFormallyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertyFormallyIrrelevantDtmiOrTermV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_zeta;1",
+        "@id": "dtmi:example:fuddle_nu;1",
         "@type": "Interface",
         "dtmi:foo:bar;1": 626
       }
@@ -24,7 +24,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:sigma_eta;1",
+        "@id": "dtmi:example:fuddle_xi;1",
         "@type": "Interface",
         "dtmi:foo:bar;1": 626
       }
@@ -38,7 +38,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_theta;1",
+        "@id": "dtmi:example:fuddle_omicron;1",
         "@type": "Interface",
         "boolean": null
       }
@@ -55,7 +55,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:sigma_iota;1",
+        "@id": "dtmi:example:fuddle_pi;1",
         "@type": "Interface",
         "boolean": null
       }
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertyFormallyUndefinedTermV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertyFormallyUndefinedTermV3.json
index 82ea7f65..5929eb25 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfacePropertyFormallyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertyFormallyUndefinedTermV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_pi;1",
+        "@id": "dtmi:example:fuddle_psi;1",
         "@type": "Interface",
         "foobar": {}
       }
@@ -24,7 +24,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:sigma_rho;1",
+        "@id": "dtmi:example:fuddle_omega;1",
         "@type": "Interface",
         "foobar": {}
       }
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertyInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertyInvalidDtmiV3.json
index 2afc665e..18d3dad5 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfacePropertyInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertyInvalidDtmiV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_kappa;1",
+        "@id": "dtmi:example:fuddle_rho;1",
         "@type": [
           "Interface",
           "Foobar"
@@ -27,7 +27,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:sigma_lambda;1",
+        "@id": "dtmi:example:fuddle_sigma;1",
         "@type": [
           "Interface",
           "Foobar"
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertyNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertyNotDtmiNorTermV3.json
index ccde0d9e..217c3fc8 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfacePropertyNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertyNotDtmiNorTermV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_mu;1",
+        "@id": "dtmi:example:fuddle_tau;1",
         "@type": [
           "Interface",
           "Foobar"
@@ -27,7 +27,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:sigma_nu;1",
+        "@id": "dtmi:example:fuddle_upsilon;1",
         "@type": [
           "Interface",
           "Foobar"
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertySchemasElementV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertySchemasElementV3.json
index 80baa97f..226cf41f 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfacePropertySchemasElementV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertySchemasElementV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_iota;1",
+        "@id": "dtmi:example:wum_kappa;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omicron_theta;1",
+          "@id": "dtmi:example:wum_iota;1",
           "@type": "Interface",
           "schemas": {
-            "@id": "dtmi:example:omicron_eta;1",
+            "@id": "dtmi:example:wum_theta;1",
             "@type": "Array",
-            "elementSchema": "dateTime"
+            "elementSchema": "boolean"
           }
         }
       }
@@ -29,16 +29,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_mu;1",
+        "@id": "dtmi:example:wum_nu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omicron_lambda;1",
+          "@id": "dtmi:example:wum_mu;1",
           "@type": "Interface",
           "schemas": [
             {
-              "@id": "dtmi:example:omicron_kappa;1",
+              "@id": "dtmi:example:wum_lambda;1",
               "@type": "Array",
-              "elementSchema": "double"
+              "elementSchema": "date"
             }
           ]
         }
@@ -53,15 +53,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_omicron;1",
+        "@id": "dtmi:example:wum_pi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omicron_xi;1",
+          "@id": "dtmi:example:wum_omicron;1",
           "@type": "Interface",
           "schemas": {
-            "@id": "dtmi:example:omicron_nu;1",
+            "@id": "dtmi:example:wum_xi;1",
             "@type": "Array",
-            "elementSchema": "duration",
+            "elementSchema": "dateTime",
             "@context": "dtmi:dtdl:context;2"
           }
         }
@@ -76,22 +76,69 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_sigma;1",
+        "@id": "dtmi:example:wum_tau;1",
         "@type": "Interface",
         "extends": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omicron_rho;1",
+          "@id": "dtmi:example:wum_sigma;1",
           "@type": "Interface",
           "schemas": {
-            "@id": "dtmi:example:omicron_pi;1",
+            "@id": "dtmi:example:wum_rho;1",
             "@type": "Array",
-            "elementSchema": "float",
+            "elementSchema": "double",
             "@context": "dtmi:dtdl:context;2"
           }
         }
       }
     ]
   },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:wum_chi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:wum_phi;1",
+          "@type": "Interface",
+          "schemas": {
+            "@id": "dtmi:example:wum_upsilon;1",
+            "@type": "Array",
+            "elementSchema": "integer",
+            "@context": "dtmi:dtdl:context;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:wum_yuzz;1",
+        "@type": "Interface",
+        "extends": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:wum_omega;1",
+          "@type": "Interface",
+          "schemas": {
+            "@id": "dtmi:example:wum_psi;1",
+            "@type": "Array",
+            "elementSchema": "long",
+            "@context": "dtmi:dtdl:context;4"
+          }
+        }
+      }
+    ]
+  },
   {
     "valid": true,
     "options": [
@@ -100,10 +147,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_upsilon;1",
+        "@id": "dtmi:example:wum_um;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omicron_tau;1",
+          "@id": "dtmi:example:wum_wum;1",
           "@type": "Interface",
           "schemas": []
         }
@@ -118,19 +165,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_omega;1",
+        "@id": "dtmi:example:wum_nuh;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:omicron_psi;1",
+          "@id": "dtmi:example:wum_glikk;1",
           "@type": "Interface",
           "schemas": [
             {
-              "@id": "dtmi:example:omicron_phi;1",
+              "@id": "dtmi:example:wum_humpf;1",
               "@type": "Array",
               "elementSchema": "integer"
             },
             {
-              "@id": "dtmi:example:omicron_chi;1",
+              "@id": "dtmi:example:wum_fuddle;1",
               "@type": "Enum",
               "valueSchema": "integer"
             }
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertySchemasTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertySchemasTermAndDtmiV3.json
index 216f69ef..9c934212 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfacePropertySchemasTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertySchemasTermAndDtmiV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_nuh;1",
+        "@id": "dtmi:example:humpf_jogg;1",
         "@type": "Interface",
         "schemas": [
           {
-            "@id": "dtmi:example:rho_snee;1",
+            "@id": "dtmi:example:humpf_flunn;1",
             "@type": "Array",
             "elementSchema": "duration"
           }
         ],
         "dtmi:dtdl:property:schemas;3": [
           {
-            "@id": "dtmi:example:rho_quan;1",
+            "@id": "dtmi:example:humpf_itch;1",
             "@type": "Array",
             "elementSchema": "float"
           }
@@ -37,18 +37,18 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:rho_thnad;1",
+        "@id": "dtmi:example:humpf_yekk;1",
         "@type": "Interface",
         "schemas": [
           {
-            "@id": "dtmi:example:rho_spazz;1",
+            "@id": "dtmi:example:humpf_vroo;1",
             "@type": "Array",
             "elementSchema": "integer"
           }
         ],
         "dtmi:dtdl:property:schemas;3": [
           {
-            "@id": "dtmi:example:rho_floob;1",
+            "@id": "dtmi:example:humpf_hi;1",
             "@type": "Array",
             "elementSchema": "long"
           }
diff --git a/DTDL/v3/spec/Requirement-ClassInterfacePropertySchemasTypeConformanceV3.json b/DTDL/v3/spec/Requirement-ClassInterfacePropertySchemasTypeConformanceV3.json
index d418600d..90c1070a 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfacePropertySchemasTypeConformanceV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfacePropertySchemasTypeConformanceV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_glikk;1",
+        "@id": "dtmi:example:wum_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_fuddle;1",
+          "@id": "dtmi:example:wum_floob;1",
           "elementSchema": "long",
           "@type": "Array"
         }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_quan;1",
+        "@id": "dtmi:example:wum_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_nuh;1",
-          "name": "omicron_snee",
+          "@id": "dtmi:example:wum_jogg;1",
+          "name": "wum_flunn",
           "@type": "Command"
         }
       }
@@ -46,11 +46,11 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:omicron_floob;1",
+        "@id": "dtmi:example:wum_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_thnad;1",
-          "name": "omicron_spazz",
+          "@id": "dtmi:example:wum_yekk;1",
+          "name": "wum_vroo",
           "@type": "Command"
         }
       }
@@ -64,11 +64,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_flunn;1",
+        "@id": "dtmi:example:um_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_zatz;1",
-          "name": "omicron_jogg",
+          "@id": "dtmi:example:um_alpha;1",
+          "name": "um_beta",
           "schema": "string",
           "@type": "CommandRequest"
         }
@@ -86,11 +86,11 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:omicron_vroo;1",
+        "@id": "dtmi:example:um_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_itch;1",
-          "name": "omicron_yekk",
+          "@id": "dtmi:example:um_delta;1",
+          "name": "um_epsilon",
           "schema": "time",
           "@type": "CommandRequest"
         }
@@ -105,11 +105,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_beta;1",
+        "@id": "dtmi:example:um_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_hi;1",
-          "name": "pi_alpha",
+          "@id": "dtmi:example:um_eta;1",
+          "name": "um_theta",
           "schema": "boolean",
           "@type": "CommandResponse"
         }
@@ -127,11 +127,11 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:pi_epsilon;1",
+        "@id": "dtmi:example:um_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_gamma;1",
-          "name": "pi_delta",
+          "@id": "dtmi:example:um_kappa;1",
+          "name": "um_lambda",
           "schema": "date",
           "@type": "CommandResponse"
         }
@@ -146,13 +146,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_iota;1",
+        "@id": "dtmi:example:um_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_zeta;1",
-          "name": "pi_eta",
+          "@id": "dtmi:example:um_nu;1",
+          "name": "um_xi",
           "schema": {
-            "@id": "dtmi:example:pi_theta;1",
+            "@id": "dtmi:example:um_omicron;1",
             "@type": "Interface"
           },
           "@type": "Component"
@@ -171,13 +171,13 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:pi_nu;1",
+        "@id": "dtmi:example:um_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_kappa;1",
-          "name": "pi_lambda",
+          "@id": "dtmi:example:um_rho;1",
+          "name": "um_sigma",
           "schema": {
-            "@id": "dtmi:example:pi_mu;1",
+            "@id": "dtmi:example:um_tau;1",
             "@type": "Interface"
           },
           "@type": "Component"
@@ -193,10 +193,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_omicron;1",
+        "@id": "dtmi:example:um_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_xi;1",
+          "@id": "dtmi:example:um_phi;1",
           "valueSchema": "integer",
           "@type": "Enum"
         }
@@ -211,12 +211,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_sigma;1",
+        "@id": "dtmi:example:um_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_pi;1",
-          "enumValue": 1458,
-          "name": "pi_rho",
+          "@id": "dtmi:example:um_psi;1",
+          "enumValue": 1475,
+          "name": "um_omega",
           "@type": "EnumValue"
         }
       }
@@ -233,12 +233,12 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:pi_phi;1",
+        "@id": "dtmi:example:um_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_tau;1",
-          "enumValue": 1459,
-          "name": "pi_upsilon",
+          "@id": "dtmi:example:um_wum;1",
+          "enumValue": 1476,
+          "name": "um_um",
           "@type": "EnumValue"
         }
       }
@@ -252,11 +252,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_omega;1",
+        "@id": "dtmi:example:um_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_chi;1",
-          "name": "pi_psi",
+          "@id": "dtmi:example:um_fuddle;1",
+          "name": "um_glikk",
           "schema": "dateTime",
           "@type": "Field"
         }
@@ -274,11 +274,11 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:pi_um;1",
+        "@id": "dtmi:example:um_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_yuzz;1",
-          "name": "pi_wum",
+          "@id": "dtmi:example:um_snee;1",
+          "name": "um_quan",
           "schema": "double",
           "@type": "Field"
         }
@@ -293,10 +293,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_fuddle;1",
+        "@id": "dtmi:example:um_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_humpf;1",
+          "@id": "dtmi:example:um_spazz;1",
           "@type": "Interface"
         }
       }
@@ -313,10 +313,10 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:pi_nuh;1",
+        "@id": "dtmi:example:um_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_glikk;1",
+          "@id": "dtmi:example:um_zatz;1",
           "@type": "Interface"
         }
       }
@@ -330,16 +330,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_spazz;1",
+        "@id": "dtmi:example:um_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_snee;1",
+          "@id": "dtmi:example:um_flunn;1",
           "mapKey": {
-            "name": "pi_quan",
+            "name": "um_itch",
             "schema": "string"
           },
           "mapValue": {
-            "name": "pi_thnad",
+            "name": "um_yekk",
             "schema": "duration"
           },
           "@type": "Map"
@@ -355,11 +355,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_jogg;1",
+        "@id": "dtmi:example:humpf_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_floob;1",
-          "name": "pi_zatz",
+          "@id": "dtmi:example:um_hi;1",
+          "name": "humpf_alpha",
           "schema": "string",
           "@type": "MapKey"
         }
@@ -377,11 +377,11 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:pi_yekk;1",
+        "@id": "dtmi:example:humpf_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_flunn;1",
-          "name": "pi_itch",
+          "@id": "dtmi:example:humpf_gamma;1",
+          "name": "humpf_delta",
           "schema": "string",
           "@type": "MapKey"
         }
@@ -396,11 +396,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_alpha;1",
+        "@id": "dtmi:example:humpf_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_vroo;1",
-          "name": "pi_hi",
+          "@id": "dtmi:example:humpf_zeta;1",
+          "name": "humpf_eta",
           "schema": "float",
           "@type": "MapValue"
         }
@@ -418,11 +418,11 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:rho_delta;1",
+        "@id": "dtmi:example:humpf_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_beta;1",
-          "name": "rho_gamma",
+          "@id": "dtmi:example:humpf_iota;1",
+          "name": "humpf_kappa",
           "schema": "integer",
           "@type": "MapValue"
         }
@@ -437,10 +437,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_zeta;1",
+        "@id": "dtmi:example:humpf_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_epsilon;1",
+          "@id": "dtmi:example:humpf_mu;1",
           "@type": "Object"
         }
       }
@@ -454,11 +454,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_iota;1",
+        "@id": "dtmi:example:humpf_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_eta;1",
-          "name": "rho_theta",
+          "@id": "dtmi:example:humpf_xi;1",
+          "name": "humpf_omicron",
           "schema": "long",
           "@type": "Property"
         }
@@ -476,11 +476,11 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:rho_mu;1",
+        "@id": "dtmi:example:humpf_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_kappa;1",
-          "name": "rho_lambda",
+          "@id": "dtmi:example:humpf_rho;1",
+          "name": "humpf_sigma",
           "schema": "string",
           "@type": "Property"
         }
@@ -495,11 +495,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_omicron;1",
+        "@id": "dtmi:example:humpf_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_nu;1",
-          "name": "rho_xi",
+          "@id": "dtmi:example:humpf_upsilon;1",
+          "name": "humpf_phi",
           "@type": "Relationship"
         }
       }
@@ -516,11 +516,11 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:rho_sigma;1",
+        "@id": "dtmi:example:humpf_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_pi;1",
-          "name": "rho_rho",
+          "@id": "dtmi:example:humpf_psi;1",
+          "name": "humpf_omega",
           "@type": "Relationship"
         }
       }
@@ -534,11 +534,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_phi;1",
+        "@id": "dtmi:example:humpf_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_tau;1",
-          "name": "rho_upsilon",
+          "@id": "dtmi:example:humpf_wum;1",
+          "name": "humpf_um",
           "schema": "time",
           "@type": "Telemetry"
         }
@@ -556,11 +556,11 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:rho_omega;1",
+        "@id": "dtmi:example:humpf_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_chi;1",
-          "name": "rho_psi",
+          "@id": "dtmi:example:humpf_fuddle;1",
+          "name": "humpf_glikk",
           "schema": "boolean",
           "@type": "Telemetry"
         }
diff --git a/DTDL/v3/spec/Requirement-ClassInterfaceRequiredPropertiesV3.json b/DTDL/v3/spec/Requirement-ClassInterfaceRequiredPropertiesV3.json
index 5f9be582..09a3f053 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfaceRequiredPropertiesV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfaceRequiredPropertiesV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_flunn;1"
+        "@id": "dtmi:example:omicron_chi;1"
       }
     ]
   },
@@ -22,7 +22,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:delta_itch;1"
+        "@id": "dtmi:example:omicron_psi;1"
       }
     ]
   },
@@ -34,7 +34,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_yekk;1",
+        "@id": "dtmi:example:omicron_omega;1",
         "@type": "Interface",
         "extends": {
           "@type": "Interface"
@@ -50,7 +50,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_vroo;1",
+        "@id": "dtmi:example:omicron_yuzz;1",
         "@type": "Interface",
         "extends": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v3/spec/Requirement-ClassInterfaceTypeIncludesInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassInterfaceTypeIncludesInvalidDtmiV3.json
index 14aca8a5..074fdcad 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfaceTypeIncludesInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfaceTypeIncludesInvalidDtmiV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_quan;1",
+        "@id": "dtmi:example:pi_pi;1",
         "@type": [
           "Interface",
           "dtmi:foo//bar"
@@ -26,7 +26,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:epsilon_thnad;1",
+        "@id": "dtmi:example:pi_rho;1",
         "@type": [
           "Interface",
           "dtmi:foo//bar"
diff --git a/DTDL/v3/spec/Requirement-ClassInterfaceTypeIncludesMaterialV3.json b/DTDL/v3/spec/Requirement-ClassInterfaceTypeIncludesMaterialV3.json
index f350c076..a8bdd75b 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfaceTypeIncludesMaterialV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfaceTypeIncludesMaterialV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_pi;1",
+        "@id": "dtmi:example:omicron_vroo;1",
         "@type": "Interface"
       }
     ]
@@ -20,7 +20,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_rho;1",
+        "@id": "dtmi:example:omicron_hi;1",
         "@type": [
           "Interface"
         ]
@@ -35,7 +35,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_sigma;1",
+        "@id": "dtmi:example:pi_alpha;1",
         "@type": "dtmi:dtdl:class:Interface;3"
       }
     ]
@@ -48,7 +48,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_tau;1",
+        "@id": "dtmi:example:pi_beta;1",
         "@type": [
           "dtmi:dtdl:class:Interface;3"
         ]
@@ -63,7 +63,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_upsilon;1",
+        "@id": "dtmi:example:pi_gamma;1",
         "@type": "Something"
       }
     ]
@@ -79,7 +79,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:epsilon_phi;1",
+        "@id": "dtmi:example:pi_delta;1",
         "@type": "Something"
       }
     ]
@@ -92,7 +92,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_chi;1",
+        "@id": "dtmi:example:pi_epsilon;1",
         "@type": [
           "Something"
         ]
@@ -110,7 +110,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:epsilon_psi;1",
+        "@id": "dtmi:example:pi_zeta;1",
         "@type": [
           "Something"
         ]
diff --git a/DTDL/v3/spec/Requirement-ClassInterfaceTypeIncludesNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassInterfaceTypeIncludesNotDtmiNorTermV3.json
index ddad5e89..b8201aa2 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfaceTypeIncludesNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfaceTypeIncludesNotDtmiNorTermV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_spazz;1",
+        "@id": "dtmi:example:pi_sigma;1",
         "@type": [
           "Interface",
           "http://foo.com/bar"
@@ -26,7 +26,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:epsilon_floob;1",
+        "@id": "dtmi:example:pi_tau;1",
         "@type": [
           "Interface",
           "http://foo.com/bar"
diff --git a/DTDL/v3/spec/Requirement-ClassInterfaceTypeStringOrArrayV3.json b/DTDL/v3/spec/Requirement-ClassInterfaceTypeStringOrArrayV3.json
index aadb4d19..b37d0654 100644
--- a/DTDL/v3/spec/Requirement-ClassInterfaceTypeStringOrArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassInterfaceTypeStringOrArrayV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_hi;1",
+        "@id": "dtmi:example:omicron_wum;1",
         "@type": 626
       }
     ]
@@ -23,7 +23,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:epsilon_alpha;1",
+        "@id": "dtmi:example:omicron_um;1",
         "@type": 626
       }
     ]
@@ -36,7 +36,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_beta;1",
+        "@id": "dtmi:example:omicron_humpf;1",
         "@type": null
       }
     ]
@@ -52,7 +52,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:epsilon_gamma;1",
+        "@id": "dtmi:example:omicron_fuddle;1",
         "@type": null
       }
     ]
@@ -65,7 +65,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_delta;1",
+        "@id": "dtmi:example:omicron_glikk;1",
         "@type": true
       }
     ]
@@ -81,7 +81,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:epsilon_epsilon;1",
+        "@id": "dtmi:example:omicron_nuh;1",
         "@type": true
       }
     ]
@@ -94,7 +94,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_zeta;1",
+        "@id": "dtmi:example:omicron_snee;1",
         "@type": {}
       }
     ]
@@ -110,7 +110,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:epsilon_eta;1",
+        "@id": "dtmi:example:omicron_quan;1",
         "@type": {}
       }
     ]
@@ -123,7 +123,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_theta;1",
+        "@id": "dtmi:example:omicron_thnad;1",
         "@type": [
           626
         ]
@@ -141,7 +141,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:epsilon_iota;1",
+        "@id": "dtmi:example:omicron_spazz;1",
         "@type": [
           626
         ]
@@ -156,7 +156,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_kappa;1",
+        "@id": "dtmi:example:omicron_floob;1",
         "@type": [
           null
         ]
@@ -174,7 +174,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:epsilon_lambda;1",
+        "@id": "dtmi:example:omicron_zatz;1",
         "@type": [
           null
         ]
@@ -189,7 +189,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_mu;1",
+        "@id": "dtmi:example:omicron_jogg;1",
         "@type": [
           true
         ]
@@ -207,7 +207,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:epsilon_nu;1",
+        "@id": "dtmi:example:omicron_flunn;1",
         "@type": [
           true
         ]
@@ -222,7 +222,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_xi;1",
+        "@id": "dtmi:example:omicron_itch;1",
         "@type": [
           {}
         ]
@@ -240,7 +240,7 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:epsilon_omicron;1",
+        "@id": "dtmi:example:omicron_yekk;1",
         "@type": [
           {}
         ]
diff --git a/DTDL/v3/spec/Requirement-ClassMapContextConformsV3.json b/DTDL/v3/spec/Requirement-ClassMapContextConformsV3.json
index b1b74885..8d684367 100644
--- a/DTDL/v3/spec/Requirement-ClassMapContextConformsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapContextConformsV3.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_thnad;1",
+        "@id": "dtmi:example:beta_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "quan_quan",
+          "name": "beta_rho",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "quan_nuh",
+              "name": "beta_omicron",
               "schema": "string"
             },
             "mapValue": {
-              "name": "quan_snee",
-              "schema": "duration"
+              "name": "beta_pi",
+              "schema": "string"
             },
             "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
           }
@@ -36,20 +36,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_jogg;1",
+        "@id": "dtmi:example:beta_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "quan_zatz",
+          "name": "beta_phi",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "quan_spazz",
+              "name": "beta_tau",
               "schema": "string"
             },
             "mapValue": {
-              "name": "quan_floob",
-              "schema": "float"
+              "name": "beta_upsilon",
+              "schema": "time"
             },
             "@context": []
           }
@@ -65,20 +65,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_vroo;1",
+        "@id": "dtmi:example:beta_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "quan_yekk",
+          "name": "beta_yuzz",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "quan_flunn",
+              "name": "beta_psi",
               "schema": "string"
             },
             "mapValue": {
-              "name": "quan_itch",
-              "schema": "integer"
+              "name": "beta_omega",
+              "schema": "boolean"
             },
             "@context": [
               "dtmi:dtdl:extension:quantitativeTypes;1"
@@ -96,20 +96,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_gamma;1",
+        "@id": "dtmi:example:beta_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_beta",
+          "name": "beta_fuddle",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "quan_hi",
+              "name": "beta_um",
               "schema": "string"
             },
             "mapValue": {
-              "name": "thnad_alpha",
-              "schema": "long"
+              "name": "beta_humpf",
+              "schema": "date"
             },
             "@context": null
           }
@@ -125,20 +125,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_eta;1",
+        "@id": "dtmi:example:beta_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_zeta",
+          "name": "beta_quan",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "thnad_delta",
+              "name": "beta_nuh",
               "schema": "string"
             },
             "mapValue": {
-              "name": "thnad_epsilon",
-              "schema": "string"
+              "name": "beta_snee",
+              "schema": "dateTime"
             },
             "@context": 626
           }
@@ -154,20 +154,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_lambda;1",
+        "@id": "dtmi:example:beta_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_kappa",
+          "name": "beta_zatz",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "thnad_theta",
+              "name": "beta_spazz",
               "schema": "string"
             },
             "mapValue": {
-              "name": "thnad_iota",
-              "schema": "time"
+              "name": "beta_floob",
+              "schema": "double"
             },
             "@context": true
           }
@@ -183,20 +183,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_omicron;1",
+        "@id": "dtmi:example:beta_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_xi",
+          "name": "beta_yekk",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "thnad_mu",
+              "name": "beta_flunn",
               "schema": "string"
             },
             "mapValue": {
-              "name": "thnad_nu",
-              "schema": "boolean"
+              "name": "beta_itch",
+              "schema": "duration"
             },
             "@context": [
               null
@@ -214,20 +214,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_tau;1",
+        "@id": "dtmi:example:gamma_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_sigma",
+          "name": "gamma_beta",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "thnad_pi",
+              "name": "beta_hi",
               "schema": "string"
             },
             "mapValue": {
-              "name": "thnad_rho",
-              "schema": "date"
+              "name": "gamma_alpha",
+              "schema": "float"
             },
             "@context": [
               626
@@ -245,20 +245,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_psi;1",
+        "@id": "dtmi:example:gamma_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_chi",
+          "name": "gamma_zeta",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "thnad_upsilon",
+              "name": "gamma_delta",
               "schema": "string"
             },
             "mapValue": {
-              "name": "thnad_phi",
-              "schema": "dateTime"
+              "name": "gamma_epsilon",
+              "schema": "integer"
             },
             "@context": [
               true
@@ -276,22 +276,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_um;1",
+        "@id": "dtmi:example:gamma_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_wum",
+          "name": "gamma_kappa",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "thnad_omega",
+              "name": "gamma_theta",
               "schema": "string"
             },
             "mapValue": {
-              "name": "thnad_yuzz",
-              "schema": "double"
+              "name": "gamma_iota",
+              "schema": "long"
             },
-            "@context": {}
+            "@context": "dtmi:dtdl:extension:quantitativeTypes"
           }
         }
       }
@@ -305,24 +305,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_nuh;1",
+        "@id": "dtmi:example:gamma_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_glikk",
+          "name": "gamma_xi",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "thnad_humpf",
+              "name": "gamma_mu",
               "schema": "string"
             },
             "mapValue": {
-              "name": "thnad_fuddle",
-              "schema": "duration"
+              "name": "gamma_nu",
+              "schema": "string"
             },
-            "@context": [
-              {}
-            ]
+            "@context": "http://dtdl/extension/quantitativeTypes/1"
           }
         }
       }
@@ -336,22 +334,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_spazz;1",
+        "@id": "dtmi:example:gamma_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_thnad",
+          "name": "gamma_sigma",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "thnad_snee",
+              "name": "gamma_pi",
               "schema": "string"
             },
             "mapValue": {
-              "name": "thnad_quan",
-              "schema": "float"
+              "name": "gamma_rho",
+              "schema": "time"
             },
-            "@context": "dtmi:dtdl:extension:quantitativeTypes"
+            "@context": "quantitativeTypes;1"
           }
         }
       }
@@ -365,22 +363,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_flunn;1",
+        "@id": "dtmi:example:gamma_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_jogg",
+          "name": "gamma_chi",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "thnad_floob",
+              "name": "gamma_upsilon",
               "schema": "string"
             },
             "mapValue": {
-              "name": "thnad_zatz",
-              "schema": "integer"
+              "name": "gamma_phi",
+              "schema": "boolean"
             },
-            "@context": "http://dtdl/extension/quantitativeTypes/1"
+            "@context": {}
           }
         }
       }
@@ -394,22 +392,88 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_hi;1",
+        "@id": "dtmi:example:gamma_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "thnad_vroo",
+          "name": "gamma_wum",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "thnad_itch",
+              "name": "gamma_omega",
               "schema": "string"
             },
             "mapValue": {
-              "name": "thnad_yekk",
-              "schema": "long"
+              "name": "gamma_yuzz",
+              "schema": "date"
             },
-            "@context": "quantitativeTypes;1"
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:gamma_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_glikk",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "gamma_humpf",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "gamma_fuddle",
+              "schema": "dateTime"
+            },
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:gamma_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_thnad",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "gamma_snee",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "gamma_quan",
+              "schema": "double"
+            },
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassMapIdDuplicateV3.json b/DTDL/v3/spec/Requirement-ClassMapIdDuplicateV3.json
index f845ac4d..97dec291 100644
--- a/DTDL/v3/spec/Requirement-ClassMapIdDuplicateV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapIdDuplicateV3.json
@@ -7,22 +7,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_eta;1",
+        "@id": "dtmi:example:theta_vroo;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:itch_eta;1",
+          "@id": "dtmi:example:theta_vroo;1",
           "@type": "Property",
-          "name": "itch_kappa",
+          "name": "iota_beta",
           "schema": {
-            "@id": "dtmi:example:itch_eta;1",
+            "@id": "dtmi:example:theta_vroo;1",
             "@type": "Map",
             "mapKey": {
-              "name": "itch_theta",
+              "name": "theta_hi",
               "schema": "string"
             },
             "mapValue": {
-              "name": "itch_iota",
-              "schema": "date"
+              "name": "iota_alpha",
+              "schema": "long"
             }
           }
         }
@@ -37,23 +37,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_lambda;1",
+        "@id": "dtmi:example:iota_gamma;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:itch_lambda;1",
+          "@id": "dtmi:example:iota_gamma;1",
           "@type": "Property",
-          "name": "itch_xi",
+          "name": "iota_zeta",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "@id": "dtmi:example:itch_lambda;1",
+            "@id": "dtmi:example:iota_gamma;1",
             "@type": "Map",
             "mapKey": {
-              "name": "itch_mu",
+              "name": "iota_delta",
               "schema": "string"
             },
             "mapValue": {
-              "name": "itch_nu",
-              "schema": "dateTime"
+              "name": "iota_epsilon",
+              "schema": "string"
             }
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapIdIsDtmiV3.json b/DTDL/v3/spec/Requirement-ClassMapIdIsDtmiV3.json
index b5fdcf2a..07de0a7a 100644
--- a/DTDL/v3/spec/Requirement-ClassMapIdIsDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapIdIsDtmiV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_rho;1",
+        "@id": "dtmi:example:delta_iota;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;7",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_omicron",
+            "name": "delta_eta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_pi",
-            "schema": "dateTime"
+            "name": "delta_theta",
+            "schema": "string"
           }
         }
       }
@@ -32,18 +32,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_upsilon;1",
+        "@id": "dtmi:example:delta_mu;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;108675309",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_sigma",
+            "name": "delta_kappa",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_tau",
-            "schema": "double"
+            "name": "delta_lambda",
+            "schema": "time"
           }
         }
       }
@@ -57,18 +57,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_psi;1",
+        "@id": "dtmi:example:delta_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;999999999",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_phi",
+            "name": "delta_nu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_chi",
-            "schema": "duration"
+            "name": "delta_xi",
+            "schema": "boolean"
           }
         }
       }
@@ -82,18 +82,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_wum;1",
+        "@id": "dtmi:example:delta_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_omega",
+            "name": "delta_pi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_yuzz",
-            "schema": "float"
+            "name": "delta_rho",
+            "schema": "date"
           }
         }
       }
@@ -107,18 +107,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_fuddle;1",
+        "@id": "dtmi:example:delta_phi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_um",
+            "name": "delta_tau",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_humpf",
-            "schema": "integer"
+            "name": "delta_upsilon",
+            "schema": "dateTime"
           }
         }
       }
@@ -132,18 +132,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_snee;1",
+        "@id": "dtmi:example:delta_omega;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.14",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_glikk",
+            "name": "delta_chi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_nuh",
-            "schema": "long"
+            "name": "delta_psi",
+            "schema": "double"
           }
         }
       }
@@ -157,18 +157,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_spazz;1",
+        "@id": "dtmi:example:delta_um;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.141592",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_quan",
+            "name": "delta_yuzz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_thnad",
-            "schema": "string"
+            "name": "delta_wum",
+            "schema": "duration"
           }
         }
       }
@@ -182,18 +182,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_jogg;1",
+        "@id": "dtmi:example:delta_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@id": null,
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_floob",
+            "name": "delta_humpf",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_zatz",
-            "schema": "time"
+            "name": "delta_fuddle",
+            "schema": "float"
           }
         }
       }
@@ -207,19 +207,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_yekk;1",
+        "@id": "dtmi:example:delta_quan;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": null,
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_flunn",
+            "name": "delta_nuh",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_itch",
-            "schema": "boolean"
+            "name": "delta_snee",
+            "schema": "integer"
           }
         }
       }
@@ -233,18 +233,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_alpha;1",
+        "@id": "dtmi:example:delta_floob;1",
         "@type": "Interface",
         "schemas": {
           "@id": 626,
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_vroo",
+            "name": "delta_thnad",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_hi",
-            "schema": "date"
+            "name": "delta_spazz",
+            "schema": "long"
           }
         }
       }
@@ -258,19 +258,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_delta;1",
+        "@id": "dtmi:example:delta_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": 626,
           "@type": "Map",
           "mapKey": {
-            "name": "floob_beta",
+            "name": "delta_zatz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_gamma",
-            "schema": "dateTime"
+            "name": "delta_jogg",
+            "schema": "string"
           }
         }
       }
@@ -284,18 +284,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_eta;1",
+        "@id": "dtmi:example:delta_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@id": true,
           "@type": "Map",
           "mapKey": {
-            "name": "floob_epsilon",
+            "name": "delta_itch",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_zeta",
-            "schema": "double"
+            "name": "delta_yekk",
+            "schema": "time"
           }
         }
       }
@@ -309,19 +309,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_kappa;1",
+        "@id": "dtmi:example:epsilon_beta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": true,
           "@type": "Map",
           "mapKey": {
-            "name": "floob_theta",
+            "name": "delta_hi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_iota",
-            "schema": "duration"
+            "name": "epsilon_alpha",
+            "schema": "boolean"
           }
         }
       }
@@ -335,7 +335,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_nu;1",
+        "@id": "dtmi:example:epsilon_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@id": {
@@ -343,12 +343,12 @@
           },
           "@type": "Map",
           "mapKey": {
-            "name": "floob_lambda",
+            "name": "epsilon_gamma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_mu",
-            "schema": "float"
+            "name": "epsilon_delta",
+            "schema": "date"
           }
         }
       }
@@ -362,7 +362,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_pi;1",
+        "@id": "dtmi:example:epsilon_theta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -371,12 +371,12 @@
           },
           "@type": "Map",
           "mapKey": {
-            "name": "floob_xi",
+            "name": "epsilon_zeta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_omicron",
-            "schema": "integer"
+            "name": "epsilon_eta",
+            "schema": "dateTime"
           }
         }
       }
@@ -390,18 +390,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_tau;1",
+        "@id": "dtmi:example:epsilon_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;0",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_rho",
+            "name": "epsilon_iota",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_sigma",
-            "schema": "long"
+            "name": "epsilon_kappa",
+            "schema": "double"
           }
         }
       }
@@ -415,19 +415,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_chi;1",
+        "@id": "dtmi:example:epsilon_xi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_upsilon",
+            "name": "epsilon_mu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_phi",
-            "schema": "string"
+            "name": "epsilon_nu",
+            "schema": "duration"
           }
         }
       }
@@ -441,18 +441,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_yuzz;1",
+        "@id": "dtmi:example:epsilon_rho;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_psi",
+            "name": "epsilon_omicron",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_omega",
-            "schema": "time"
+            "name": "epsilon_pi",
+            "schema": "float"
           }
         }
       }
@@ -466,19 +466,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_humpf;1",
+        "@id": "dtmi:example:epsilon_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_wum",
+            "name": "epsilon_sigma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_um",
-            "schema": "boolean"
+            "name": "epsilon_tau",
+            "schema": "integer"
           }
         }
       }
@@ -492,18 +492,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_nuh;1",
+        "@id": "dtmi:example:epsilon_psi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_fuddle",
+            "name": "epsilon_phi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_glikk",
-            "schema": "date"
+            "name": "epsilon_chi",
+            "schema": "long"
           }
         }
       }
@@ -517,19 +517,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_thnad;1",
+        "@id": "dtmi:example:epsilon_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_snee",
+            "name": "epsilon_omega",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_quan",
-            "schema": "dateTime"
+            "name": "epsilon_yuzz",
+            "schema": "string"
           }
         }
       }
@@ -543,18 +543,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_zatz;1",
+        "@id": "dtmi:example:epsilon_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;1a",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_spazz",
+            "name": "epsilon_um",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_floob",
-            "schema": "double"
+            "name": "epsilon_humpf",
+            "schema": "time"
           }
         }
       }
@@ -568,19 +568,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_itch;1",
+        "@id": "dtmi:example:epsilon_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1a",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_jogg",
+            "name": "epsilon_glikk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_flunn",
-            "schema": "duration"
+            "name": "epsilon_nuh",
+            "schema": "boolean"
           }
         }
       }
@@ -594,18 +594,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_hi;1",
+        "@id": "dtmi:example:epsilon_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_yekk",
+            "name": "epsilon_quan",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_vroo",
-            "schema": "float"
+            "name": "epsilon_thnad",
+            "schema": "date"
           }
         }
       }
@@ -619,19 +619,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_gamma;1",
+        "@id": "dtmi:example:epsilon_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_alpha",
+            "name": "epsilon_floob",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_beta",
-            "schema": "integer"
+            "name": "epsilon_zatz",
+            "schema": "dateTime"
           }
         }
       }
@@ -645,18 +645,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_zeta;1",
+        "@id": "dtmi:example:epsilon_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_delta",
+            "name": "epsilon_flunn",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_epsilon",
-            "schema": "long"
+            "name": "epsilon_itch",
+            "schema": "double"
           }
         }
       }
@@ -670,19 +670,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_iota;1",
+        "@id": "dtmi:example:zeta_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_eta",
+            "name": "epsilon_vroo",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_theta",
-            "schema": "string"
+            "name": "epsilon_hi",
+            "schema": "duration"
           }
         }
       }
@@ -696,18 +696,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_mu;1",
+        "@id": "dtmi:example:zeta_delta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_kappa",
+            "name": "zeta_beta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_lambda",
-            "schema": "time"
+            "name": "zeta_gamma",
+            "schema": "float"
           }
         }
       }
@@ -721,19 +721,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_omicron;1",
+        "@id": "dtmi:example:zeta_eta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_nu",
+            "name": "zeta_epsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_xi",
-            "schema": "boolean"
+            "name": "zeta_zeta",
+            "schema": "integer"
           }
         }
       }
@@ -747,18 +747,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_sigma;1",
+        "@id": "dtmi:example:zeta_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_pi",
+            "name": "zeta_theta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_rho",
-            "schema": "date"
+            "name": "zeta_iota",
+            "schema": "long"
           }
         }
       }
@@ -772,19 +772,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_phi;1",
+        "@id": "dtmi:example:zeta_nu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_tau",
+            "name": "zeta_lambda",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_upsilon",
-            "schema": "dateTime"
+            "name": "zeta_mu",
+            "schema": "string"
           }
         }
       }
@@ -798,18 +798,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_omega;1",
+        "@id": "dtmi:example:zeta_pi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;01",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_chi",
+            "name": "zeta_xi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_psi",
-            "schema": "double"
+            "name": "zeta_omicron",
+            "schema": "time"
           }
         }
       }
@@ -823,19 +823,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_um;1",
+        "@id": "dtmi:example:zeta_tau;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;01",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_yuzz",
+            "name": "zeta_rho",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_wum",
-            "schema": "duration"
+            "name": "zeta_sigma",
+            "schema": "boolean"
           }
         }
       }
@@ -849,18 +849,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_glikk;1",
+        "@id": "dtmi:example:zeta_chi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_humpf",
+            "name": "zeta_upsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_fuddle",
-            "schema": "float"
+            "name": "zeta_phi",
+            "schema": "date"
           }
         }
       }
@@ -874,19 +874,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_quan;1",
+        "@id": "dtmi:example:zeta_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_nuh",
+            "name": "zeta_psi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_snee",
-            "schema": "integer"
+            "name": "zeta_omega",
+            "schema": "dateTime"
           }
         }
       }
@@ -900,18 +900,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_floob;1",
+        "@id": "dtmi:example:zeta_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_thnad",
+            "name": "zeta_wum",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_spazz",
-            "schema": "long"
+            "name": "zeta_um",
+            "schema": "double"
           }
         }
       }
@@ -925,19 +925,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_flunn;1",
+        "@id": "dtmi:example:zeta_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_zatz",
+            "name": "zeta_fuddle",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_jogg",
-            "schema": "string"
+            "name": "zeta_glikk",
+            "schema": "duration"
           }
         }
       }
@@ -951,18 +951,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_vroo;1",
+        "@id": "dtmi:example:zeta_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_itch",
+            "name": "zeta_snee",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_yekk",
-            "schema": "time"
+            "name": "zeta_quan",
+            "schema": "float"
           }
         }
       }
@@ -976,19 +976,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_beta;1",
+        "@id": "dtmi:example:zeta_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_hi",
+            "name": "zeta_spazz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_alpha",
-            "schema": "boolean"
+            "name": "zeta_floob",
+            "schema": "integer"
           }
         }
       }
@@ -1002,18 +1002,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_epsilon;1",
+        "@id": "dtmi:example:zeta_itch;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:test:1seg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_gamma",
+            "name": "zeta_jogg",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_delta",
-            "schema": "date"
+            "name": "zeta_flunn",
+            "schema": "long"
           }
         }
       }
@@ -1027,19 +1027,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_theta;1",
+        "@id": "dtmi:example:zeta_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:1seg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_zeta",
+            "name": "zeta_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_eta",
-            "schema": "dateTime"
+            "name": "zeta_vroo",
+            "schema": "string"
           }
         }
       }
@@ -1053,18 +1053,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_lambda;1",
+        "@id": "dtmi:example:eta_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_iota",
+            "name": "eta_alpha",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_kappa",
-            "schema": "double"
+            "name": "eta_beta",
+            "schema": "time"
           }
         }
       }
@@ -1078,19 +1078,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_xi;1",
+        "@id": "dtmi:example:eta_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_mu",
+            "name": "eta_delta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_nu",
-            "schema": "duration"
+            "name": "eta_epsilon",
+            "schema": "boolean"
           }
         }
       }
@@ -1104,18 +1104,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_rho;1",
+        "@id": "dtmi:example:eta_iota;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo::bar;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_omicron",
+            "name": "eta_eta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_pi",
-            "schema": "float"
+            "name": "eta_theta",
+            "schema": "date"
           }
         }
       }
@@ -1129,19 +1129,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_upsilon;1",
+        "@id": "dtmi:example:eta_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo::bar;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_sigma",
+            "name": "eta_kappa",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_tau",
-            "schema": "integer"
+            "name": "eta_lambda",
+            "schema": "dateTime"
           }
         }
       }
@@ -1155,18 +1155,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_psi;1",
+        "@id": "dtmi:example:eta_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@id": "urn:foo:bar:1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_phi",
+            "name": "eta_nu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_chi",
-            "schema": "long"
+            "name": "eta_xi",
+            "schema": "double"
           }
         }
       }
@@ -1180,19 +1180,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_wum;1",
+        "@id": "dtmi:example:eta_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "urn:foo:bar:1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_omega",
+            "name": "eta_pi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_yuzz",
-            "schema": "string"
+            "name": "eta_rho",
+            "schema": "duration"
           }
         }
       }
@@ -1206,18 +1206,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_fuddle;1",
+        "@id": "dtmi:example:eta_phi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "http://foo/bar/baz",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_um",
+            "name": "eta_tau",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_humpf",
-            "schema": "time"
+            "name": "eta_upsilon",
+            "schema": "float"
           }
         }
       }
@@ -1231,19 +1231,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_snee;1",
+        "@id": "dtmi:example:eta_omega;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "http://foo/bar/baz",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_glikk",
+            "name": "eta_chi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_nuh",
-            "schema": "boolean"
+            "name": "eta_psi",
+            "schema": "integer"
           }
         }
       }
@@ -1257,18 +1257,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_spazz;1",
+        "@id": "dtmi:example:eta_um;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_quan",
+            "name": "eta_yuzz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_thnad",
-            "schema": "date"
+            "name": "eta_wum",
+            "schema": "long"
           }
         }
       }
@@ -1282,19 +1282,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_jogg;1",
+        "@id": "dtmi:example:eta_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_floob",
+            "name": "eta_humpf",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_zatz",
-            "schema": "dateTime"
+            "name": "eta_fuddle",
+            "schema": "string"
           }
         }
       }
@@ -1308,18 +1308,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_yekk;1",
+        "@id": "dtmi:example:eta_quan;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:dtdl:example;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_flunn",
+            "name": "eta_nuh",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_itch",
-            "schema": "double"
+            "name": "eta_snee",
+            "schema": "time"
           }
         }
       }
@@ -1333,19 +1333,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_alpha;1",
+        "@id": "dtmi:example:eta_floob;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:dtdl:example;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_vroo",
+            "name": "eta_thnad",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_hi",
-            "schema": "duration"
+            "name": "eta_spazz",
+            "schema": "boolean"
           }
         }
       }
@@ -1359,18 +1359,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_delta;1",
+        "@id": "dtmi:example:eta_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:standard:example;1",
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_beta",
+            "name": "eta_zatz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_gamma",
-            "schema": "float"
+            "name": "eta_jogg",
+            "schema": "date"
           }
         }
       }
@@ -1384,19 +1384,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_eta;1",
+        "@id": "dtmi:example:eta_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:standard:example;1",
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_epsilon",
+            "name": "eta_itch",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_zeta",
-            "schema": "integer"
+            "name": "eta_yekk",
+            "schema": "dateTime"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassMapIdNotArrayV3.json b/DTDL/v3/spec/Requirement-ClassMapIdNotArrayV3.json
index 219a7aa5..960f70e4 100644
--- a/DTDL/v3/spec/Requirement-ClassMapIdNotArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapIdNotArrayV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_kappa;1",
+        "@id": "dtmi:example:theta_beta;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -15,12 +15,12 @@
           ],
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_theta",
+            "name": "eta_hi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_iota",
-            "schema": "long"
+            "name": "theta_alpha",
+            "schema": "double"
           }
         }
       }
@@ -34,7 +34,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_nu;1",
+        "@id": "dtmi:example:theta_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -43,12 +43,12 @@
           ],
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_lambda",
+            "name": "theta_gamma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_mu",
-            "schema": "string"
+            "name": "theta_delta",
+            "schema": "duration"
           }
         }
       }
@@ -62,7 +62,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_pi;1",
+        "@id": "dtmi:example:theta_theta;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -70,12 +70,12 @@
           ],
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_xi",
+            "name": "theta_zeta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_omicron",
-            "schema": "time"
+            "name": "theta_eta",
+            "schema": "float"
           }
         }
       }
@@ -89,7 +89,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_tau;1",
+        "@id": "dtmi:example:theta_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -98,12 +98,12 @@
           ],
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_rho",
+            "name": "theta_iota",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_sigma",
-            "schema": "boolean"
+            "name": "theta_kappa",
+            "schema": "integer"
           }
         }
       }
@@ -117,7 +117,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_chi;1",
+        "@id": "dtmi:example:theta_xi;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -125,12 +125,12 @@
           ],
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_upsilon",
+            "name": "theta_mu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_phi",
-            "schema": "date"
+            "name": "theta_nu",
+            "schema": "long"
           }
         }
       }
@@ -144,7 +144,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_yuzz;1",
+        "@id": "dtmi:example:theta_rho;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -153,12 +153,12 @@
           ],
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_psi",
+            "name": "theta_omicron",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_omega",
-            "schema": "dateTime"
+            "name": "theta_pi",
+            "schema": "string"
           }
         }
       }
@@ -172,7 +172,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_humpf;1",
+        "@id": "dtmi:example:theta_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -180,12 +180,12 @@
           ],
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_wum",
+            "name": "theta_sigma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_um",
-            "schema": "double"
+            "name": "theta_tau",
+            "schema": "time"
           }
         }
       }
@@ -199,7 +199,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_nuh;1",
+        "@id": "dtmi:example:theta_psi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -208,12 +208,12 @@
           ],
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_fuddle",
+            "name": "theta_phi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_glikk",
-            "schema": "duration"
+            "name": "theta_chi",
+            "schema": "boolean"
           }
         }
       }
@@ -227,7 +227,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_thnad;1",
+        "@id": "dtmi:example:theta_wum;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -235,12 +235,12 @@
           ],
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_snee",
+            "name": "theta_omega",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_quan",
-            "schema": "float"
+            "name": "theta_yuzz",
+            "schema": "date"
           }
         }
       }
@@ -254,7 +254,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_zatz;1",
+        "@id": "dtmi:example:theta_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -263,12 +263,12 @@
           ],
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_spazz",
+            "name": "theta_um",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_floob",
-            "schema": "integer"
+            "name": "theta_humpf",
+            "schema": "dateTime"
           }
         }
       }
@@ -282,7 +282,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_itch;1",
+        "@id": "dtmi:example:theta_snee;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -290,12 +290,12 @@
           ],
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_jogg",
+            "name": "theta_glikk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_flunn",
-            "schema": "long"
+            "name": "theta_nuh",
+            "schema": "double"
           }
         }
       }
@@ -309,7 +309,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_hi;1",
+        "@id": "dtmi:example:theta_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -318,12 +318,12 @@
           ],
           "@type": "Map",
           "mapKey": {
-            "name": "flunn_yekk",
+            "name": "theta_quan",
             "schema": "string"
           },
           "mapValue": {
-            "name": "flunn_vroo",
-            "schema": "string"
+            "name": "theta_thnad",
+            "schema": "duration"
           }
         }
       }
@@ -337,7 +337,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_gamma;1",
+        "@id": "dtmi:example:theta_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -345,12 +345,12 @@
           ],
           "@type": "Map",
           "mapKey": {
-            "name": "itch_alpha",
+            "name": "theta_floob",
             "schema": "string"
           },
           "mapValue": {
-            "name": "itch_beta",
-            "schema": "time"
+            "name": "theta_zatz",
+            "schema": "float"
           }
         }
       }
@@ -364,7 +364,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_zeta;1",
+        "@id": "dtmi:example:theta_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -373,12 +373,12 @@
           ],
           "@type": "Map",
           "mapKey": {
-            "name": "itch_delta",
+            "name": "theta_flunn",
             "schema": "string"
           },
           "mapValue": {
-            "name": "itch_epsilon",
-            "schema": "boolean"
+            "name": "theta_itch",
+            "schema": "integer"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassMapIdRequiredV3.json b/DTDL/v3/spec/Requirement-ClassMapIdRequiredV3.json
index c389ec15..8f22129e 100644
--- a/DTDL/v3/spec/Requirement-ClassMapIdRequiredV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapIdRequiredV3.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_delta;1",
+        "@id": "dtmi:example:gamma_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "spazz_gamma",
+          "name": "gamma_jogg",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "spazz_alpha",
+              "name": "gamma_floob",
               "schema": "string"
             },
             "mapValue": {
-              "name": "spazz_beta",
-              "schema": "string"
+              "name": "gamma_zatz",
+              "schema": "duration"
             }
           }
         }
@@ -35,18 +35,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_theta;1",
+        "@id": "dtmi:example:gamma_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_epsilon;1",
+          "@id": "dtmi:example:gamma_itch;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_zeta",
+            "name": "gamma_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_eta",
-            "schema": "time"
+            "name": "gamma_vroo",
+            "schema": "float"
           }
         }
       }
@@ -60,17 +60,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_lambda;1",
+        "@id": "dtmi:example:delta_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_iota",
+            "name": "delta_alpha",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_kappa",
-            "schema": "boolean"
+            "name": "delta_beta",
+            "schema": "integer"
           }
         }
       }
@@ -84,18 +84,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_xi;1",
+        "@id": "dtmi:example:delta_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_mu",
+            "name": "delta_delta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_nu",
-            "schema": "date"
+            "name": "delta_epsilon",
+            "schema": "long"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassMapInvalidKeywordsV3.json b/DTDL/v3/spec/Requirement-ClassMapInvalidKeywordsV3.json
index e658a4ba..a56f22dc 100644
--- a/DTDL/v3/spec/Requirement-ClassMapInvalidKeywordsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapInvalidKeywordsV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_omega;1",
+        "@id": "dtmi:example:sigma_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_phi;1",
+          "@id": "dtmi:example:sigma_nu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_chi",
+            "name": "sigma_xi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zeta_psi",
-            "schema": "integer"
+            "name": "sigma_omicron",
+            "schema": "dateTime"
           },
           "@graph": {}
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_humpf;1",
+        "@id": "dtmi:example:sigma_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zeta_yuzz;1",
+          "@id": "dtmi:example:sigma_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_wum",
+            "name": "sigma_sigma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zeta_um",
-            "schema": "long"
+            "name": "sigma_tau",
+            "schema": "double"
           },
           "@graph": {}
         }
@@ -60,18 +60,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_snee;1",
+        "@id": "dtmi:example:sigma_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_fuddle;1",
+          "@id": "dtmi:example:sigma_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_glikk",
+            "name": "sigma_chi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zeta_nuh",
-            "schema": "string"
+            "name": "sigma_psi",
+            "schema": "duration"
           },
           "@value": 626
         }
@@ -86,19 +86,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_floob;1",
+        "@id": "dtmi:example:sigma_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zeta_quan;1",
+          "@id": "dtmi:example:sigma_yuzz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_thnad",
+            "name": "sigma_wum",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zeta_spazz",
-            "schema": "time"
+            "name": "sigma_um",
+            "schema": "float"
           },
           "@value": 626
         }
@@ -113,18 +113,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_itch;1",
+        "@id": "dtmi:example:sigma_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_zatz;1",
+          "@id": "dtmi:example:sigma_fuddle;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_jogg",
+            "name": "sigma_glikk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zeta_flunn",
-            "schema": "boolean"
+            "name": "sigma_nuh",
+            "schema": "integer"
           },
           "@language": "en"
         }
@@ -139,19 +139,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_alpha;1",
+        "@id": "dtmi:example:sigma_floob;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zeta_yekk;1",
+          "@id": "dtmi:example:sigma_quan;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_vroo",
+            "name": "sigma_thnad",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zeta_hi",
-            "schema": "date"
+            "name": "sigma_spazz",
+            "schema": "long"
           },
           "@language": "en"
         }
@@ -166,18 +166,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_epsilon;1",
+        "@id": "dtmi:example:sigma_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_beta;1",
+          "@id": "dtmi:example:sigma_zatz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "eta_gamma",
+            "name": "sigma_jogg",
             "schema": "string"
           },
           "mapValue": {
-            "name": "eta_delta",
-            "schema": "dateTime"
+            "name": "sigma_flunn",
+            "schema": "string"
           },
           "@foobar": true
         }
@@ -192,19 +192,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_iota;1",
+        "@id": "dtmi:example:tau_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:eta_zeta;1",
+          "@id": "dtmi:example:sigma_yekk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "eta_eta",
+            "name": "sigma_vroo",
             "schema": "string"
           },
           "mapValue": {
-            "name": "eta_theta",
-            "schema": "double"
+            "name": "sigma_hi",
+            "schema": "time"
           },
           "@foobar": true
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyContextConformsV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyContextConformsV3.json
index 66f52a3e..10b8f7cf 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyContextConformsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyContextConformsV3.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_jogg;1",
+        "@id": "dtmi:example:thnad_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "chi_zatz",
+          "name": "thnad_fuddle",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "chi_floob",
-              "schema": "duration"
+              "name": "thnad_humpf",
+              "schema": "boolean"
             },
             "mapKey": {
-              "name": "chi_spazz",
+              "name": "thnad_um",
               "schema": "string",
               "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
             }
@@ -36,19 +36,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_vroo;1",
+        "@id": "dtmi:example:thnad_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "chi_yekk",
+          "name": "thnad_quan",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "chi_itch",
-              "schema": "float"
+              "name": "thnad_snee",
+              "schema": "date"
             },
             "mapKey": {
-              "name": "chi_flunn",
+              "name": "thnad_nuh",
               "schema": "string",
               "@context": []
             }
@@ -65,19 +65,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_gamma;1",
+        "@id": "dtmi:example:thnad_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_beta",
+          "name": "thnad_zatz",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "psi_alpha",
-              "schema": "integer"
+              "name": "thnad_floob",
+              "schema": "dateTime"
             },
             "mapKey": {
-              "name": "chi_hi",
+              "name": "thnad_spazz",
               "schema": "string",
               "@context": [
                 "dtmi:dtdl:extension:quantitativeTypes;1"
@@ -96,19 +96,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_eta;1",
+        "@id": "dtmi:example:thnad_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_zeta",
+          "name": "thnad_yekk",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "psi_epsilon",
-              "schema": "long"
+              "name": "thnad_itch",
+              "schema": "double"
             },
             "mapKey": {
-              "name": "psi_delta",
+              "name": "thnad_flunn",
               "schema": "string",
               "@context": null
             }
@@ -125,19 +125,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_lambda;1",
+        "@id": "dtmi:example:spazz_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_kappa",
+          "name": "spazz_beta",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "psi_iota",
-              "schema": "string"
+              "name": "spazz_alpha",
+              "schema": "duration"
             },
             "mapKey": {
-              "name": "psi_theta",
+              "name": "thnad_hi",
               "schema": "string",
               "@context": 626
             }
@@ -154,19 +154,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_omicron;1",
+        "@id": "dtmi:example:spazz_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_xi",
+          "name": "spazz_zeta",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "psi_nu",
-              "schema": "time"
+              "name": "spazz_epsilon",
+              "schema": "float"
             },
             "mapKey": {
-              "name": "psi_mu",
+              "name": "spazz_delta",
               "schema": "string",
               "@context": true
             }
@@ -183,19 +183,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_tau;1",
+        "@id": "dtmi:example:spazz_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_sigma",
+          "name": "spazz_kappa",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "psi_rho",
-              "schema": "boolean"
+              "name": "spazz_iota",
+              "schema": "integer"
             },
             "mapKey": {
-              "name": "psi_pi",
+              "name": "spazz_theta",
               "schema": "string",
               "@context": [
                 null
@@ -214,19 +214,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_psi;1",
+        "@id": "dtmi:example:spazz_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_chi",
+          "name": "spazz_xi",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "psi_phi",
-              "schema": "date"
+              "name": "spazz_nu",
+              "schema": "long"
             },
             "mapKey": {
-              "name": "psi_upsilon",
+              "name": "spazz_mu",
               "schema": "string",
               "@context": [
                 626
@@ -245,19 +245,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_um;1",
+        "@id": "dtmi:example:spazz_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_wum",
+          "name": "spazz_sigma",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "psi_yuzz",
-              "schema": "dateTime"
+              "name": "spazz_rho",
+              "schema": "string"
             },
             "mapKey": {
-              "name": "psi_omega",
+              "name": "spazz_pi",
               "schema": "string",
               "@context": [
                 true
@@ -276,21 +276,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_nuh;1",
+        "@id": "dtmi:example:spazz_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_glikk",
+          "name": "spazz_chi",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "psi_fuddle",
-              "schema": "double"
+              "name": "spazz_phi",
+              "schema": "time"
             },
             "mapKey": {
-              "name": "psi_humpf",
+              "name": "spazz_upsilon",
               "schema": "string",
-              "@context": {}
+              "@context": "dtmi:dtdl:extension:quantitativeTypes"
             }
           }
         }
@@ -305,23 +305,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_spazz;1",
+        "@id": "dtmi:example:spazz_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_thnad",
+          "name": "spazz_wum",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "psi_quan",
-              "schema": "duration"
+              "name": "spazz_yuzz",
+              "schema": "boolean"
             },
             "mapKey": {
-              "name": "psi_snee",
+              "name": "spazz_omega",
               "schema": "string",
-              "@context": [
-                {}
-              ]
+              "@context": "http://dtdl/extension/quantitativeTypes/1"
             }
           }
         }
@@ -336,21 +334,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_flunn;1",
+        "@id": "dtmi:example:spazz_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_jogg",
+          "name": "spazz_glikk",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "psi_zatz",
-              "schema": "float"
+              "name": "spazz_fuddle",
+              "schema": "date"
             },
             "mapKey": {
-              "name": "psi_floob",
+              "name": "spazz_humpf",
               "schema": "string",
-              "@context": "dtmi:dtdl:extension:quantitativeTypes"
+              "@context": "quantitativeTypes;1"
             }
           }
         }
@@ -365,21 +363,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_hi;1",
+        "@id": "dtmi:example:spazz_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_vroo",
+          "name": "spazz_thnad",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "psi_yekk",
-              "schema": "integer"
+              "name": "spazz_quan",
+              "schema": "dateTime"
             },
             "mapKey": {
-              "name": "psi_itch",
+              "name": "spazz_snee",
               "schema": "string",
-              "@context": "http://dtdl/extension/quantitativeTypes/1"
+              "@context": {}
             }
           }
         }
@@ -394,21 +392,87 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_delta;1",
+        "@id": "dtmi:example:spazz_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_gamma",
+          "name": "spazz_jogg",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "omega_beta",
-              "schema": "long"
+              "name": "spazz_zatz",
+              "schema": "double"
             },
             "mapKey": {
-              "name": "omega_alpha",
+              "name": "spazz_floob",
               "schema": "string",
-              "@context": "quantitativeTypes;1"
+              "@context": {
+                "foo": "dtmi:foo:bar;1"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:spazz_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "spazz_vroo",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "spazz_yekk",
+              "schema": "duration"
+            },
+            "mapKey": {
+              "name": "spazz_itch",
+              "schema": "string",
+              "@context": [
+                {}
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:floob_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "floob_gamma",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "floob_beta",
+              "schema": "float"
+            },
+            "mapKey": {
+              "name": "floob_alpha",
+              "schema": "string",
+              "@context": [
+                {
+                  "foo": "dtmi:foo:bar;1"
+                }
+              ]
             }
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyIdDuplicateV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyIdDuplicateV3.json
index 5222a329..9f4096e9 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyIdDuplicateV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyIdDuplicateV3.json
@@ -7,22 +7,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_eta;1",
+        "@id": "dtmi:example:gamma_eta;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:thnad_eta;1",
+          "@id": "dtmi:example:gamma_eta;1",
           "@type": "Property",
-          "name": "thnad_kappa",
+          "name": "gamma_kappa",
           "schema": {
-            "@id": "dtmi:example:thnad_eta;1",
+            "@id": "dtmi:example:gamma_eta;1",
             "@type": "Map",
             "mapValue": {
-              "name": "thnad_iota",
-              "schema": "integer"
+              "name": "gamma_iota",
+              "schema": "duration"
             },
             "mapKey": {
-              "@id": "dtmi:example:thnad_eta;1",
-              "name": "thnad_theta",
+              "@id": "dtmi:example:gamma_eta;1",
+              "name": "gamma_theta",
               "schema": "string"
             }
           }
@@ -38,23 +38,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_lambda;1",
+        "@id": "dtmi:example:gamma_lambda;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:thnad_lambda;1",
+          "@id": "dtmi:example:gamma_lambda;1",
           "@type": "Property",
-          "name": "thnad_xi",
+          "name": "gamma_xi",
           "schema": {
-            "@id": "dtmi:example:thnad_lambda;1",
+            "@id": "dtmi:example:gamma_lambda;1",
             "@type": "Map",
             "mapValue": {
-              "name": "thnad_nu",
-              "schema": "long"
+              "name": "gamma_nu",
+              "schema": "float"
             },
             "mapKey": {
               "@context": "dtmi:undefinedExtension:context;1",
-              "@id": "dtmi:example:thnad_lambda;1",
-              "name": "thnad_mu",
+              "@id": "dtmi:example:gamma_lambda;1",
+              "name": "gamma_mu",
               "schema": "string"
             }
           }
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyIdIsDtmiV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyIdIsDtmiV3.json
index ce72d47b..6e463c93 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyIdIsDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyIdIsDtmiV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_spazz;1",
+        "@id": "dtmi:example:flunn_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_quan;1",
+          "@id": "dtmi:example:flunn_quan;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_thnad",
-            "schema": "long"
+            "name": "flunn_thnad",
+            "schema": "float"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;7",
-            "name": "um_snee",
+            "name": "flunn_snee",
             "schema": "string"
           }
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_flunn;1",
+        "@id": "dtmi:example:flunn_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_zatz;1",
+          "@id": "dtmi:example:flunn_zatz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_jogg",
-            "schema": "string"
+            "name": "flunn_jogg",
+            "schema": "integer"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;108675309",
-            "name": "um_floob",
+            "name": "flunn_floob",
             "schema": "string"
           }
         }
@@ -59,18 +59,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_hi;1",
+        "@id": "dtmi:example:flunn_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_yekk;1",
+          "@id": "dtmi:example:flunn_yekk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_vroo",
-            "schema": "time"
+            "name": "flunn_vroo",
+            "schema": "long"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;999999999",
-            "name": "um_itch",
+            "name": "flunn_itch",
             "schema": "string"
           }
         }
@@ -85,18 +85,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_delta;1",
+        "@id": "dtmi:example:itch_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_beta;1",
+          "@id": "dtmi:example:itch_beta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "humpf_gamma",
-            "schema": "boolean"
+            "name": "itch_gamma",
+            "schema": "string"
           },
           "mapKey": {
             "@id": "dtmi:foo;1",
-            "name": "humpf_alpha",
+            "name": "itch_alpha",
             "schema": "string"
           }
         }
@@ -111,18 +111,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_theta;1",
+        "@id": "dtmi:example:itch_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_zeta;1",
+          "@id": "dtmi:example:itch_zeta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "humpf_eta",
-            "schema": "date"
+            "name": "itch_eta",
+            "schema": "time"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar",
-            "name": "humpf_epsilon",
+            "name": "itch_epsilon",
             "schema": "string"
           }
         }
@@ -137,18 +137,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_mu;1",
+        "@id": "dtmi:example:itch_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_kappa;1",
+          "@id": "dtmi:example:itch_kappa;1",
           "@type": "Map",
           "mapValue": {
-            "name": "humpf_lambda",
-            "schema": "dateTime"
+            "name": "itch_lambda",
+            "schema": "boolean"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;3.14",
-            "name": "humpf_iota",
+            "name": "itch_iota",
             "schema": "string"
           }
         }
@@ -163,18 +163,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_pi;1",
+        "@id": "dtmi:example:itch_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_xi;1",
+          "@id": "dtmi:example:itch_xi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "humpf_omicron",
-            "schema": "double"
+            "name": "itch_omicron",
+            "schema": "date"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;3.141592",
-            "name": "humpf_nu",
+            "name": "itch_nu",
             "schema": "string"
           }
         }
@@ -189,18 +189,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_upsilon;1",
+        "@id": "dtmi:example:itch_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_sigma;1",
+          "@id": "dtmi:example:itch_sigma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "humpf_tau",
-            "schema": "duration"
+            "name": "itch_tau",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@id": null,
-            "name": "humpf_rho",
+            "name": "itch_rho",
             "schema": "string"
           }
         }
@@ -215,19 +215,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_omega;1",
+        "@id": "dtmi:example:itch_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_chi;1",
+          "@id": "dtmi:example:itch_chi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "humpf_psi",
-            "schema": "float"
+            "name": "itch_psi",
+            "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": null,
-            "name": "humpf_phi",
+            "name": "itch_phi",
             "schema": "string"
           }
         }
@@ -242,18 +242,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_humpf;1",
+        "@id": "dtmi:example:itch_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_wum;1",
+          "@id": "dtmi:example:itch_wum;1",
           "@type": "Map",
           "mapValue": {
-            "name": "humpf_um",
-            "schema": "integer"
+            "name": "itch_um",
+            "schema": "duration"
           },
           "mapKey": {
             "@id": 626,
-            "name": "humpf_yuzz",
+            "name": "itch_yuzz",
             "schema": "string"
           }
         }
@@ -268,19 +268,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_snee;1",
+        "@id": "dtmi:example:itch_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_glikk;1",
+          "@id": "dtmi:example:itch_glikk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "humpf_nuh",
-            "schema": "long"
+            "name": "itch_nuh",
+            "schema": "float"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": 626,
-            "name": "humpf_fuddle",
+            "name": "itch_fuddle",
             "schema": "string"
           }
         }
@@ -295,18 +295,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_floob;1",
+        "@id": "dtmi:example:itch_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_thnad;1",
+          "@id": "dtmi:example:itch_thnad;1",
           "@type": "Map",
           "mapValue": {
-            "name": "humpf_spazz",
-            "schema": "string"
+            "name": "itch_spazz",
+            "schema": "integer"
           },
           "mapKey": {
             "@id": true,
-            "name": "humpf_quan",
+            "name": "itch_quan",
             "schema": "string"
           }
         }
@@ -321,19 +321,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_itch;1",
+        "@id": "dtmi:example:itch_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_jogg;1",
+          "@id": "dtmi:example:itch_jogg;1",
           "@type": "Map",
           "mapValue": {
-            "name": "humpf_flunn",
-            "schema": "time"
+            "name": "itch_flunn",
+            "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": true,
-            "name": "humpf_zatz",
+            "name": "itch_zatz",
             "schema": "string"
           }
         }
@@ -348,20 +348,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_alpha;1",
+        "@id": "dtmi:example:yekk_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_vroo;1",
+          "@id": "dtmi:example:itch_vroo;1",
           "@type": "Map",
           "mapValue": {
-            "name": "humpf_hi",
-            "schema": "boolean"
+            "name": "itch_hi",
+            "schema": "string"
           },
           "mapKey": {
             "@id": {
               "@value": "dtmi:apparently:valid:identifier;3"
             },
-            "name": "humpf_yekk",
+            "name": "itch_yekk",
             "schema": "string"
           }
         }
@@ -376,21 +376,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_epsilon;1",
+        "@id": "dtmi:example:yekk_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_gamma;1",
+          "@id": "dtmi:example:yekk_gamma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "fuddle_delta",
-            "schema": "date"
+            "name": "yekk_delta",
+            "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": {
               "@value": "dtmi:apparently:valid:identifier;3"
             },
-            "name": "fuddle_beta",
+            "name": "yekk_beta",
             "schema": "string"
           }
         }
@@ -405,18 +405,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_iota;1",
+        "@id": "dtmi:example:yekk_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_eta;1",
+          "@id": "dtmi:example:yekk_eta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "fuddle_theta",
-            "schema": "dateTime"
+            "name": "yekk_theta",
+            "schema": "boolean"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;0",
-            "name": "fuddle_zeta",
+            "name": "yekk_zeta",
             "schema": "string"
           }
         }
@@ -431,19 +431,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_nu;1",
+        "@id": "dtmi:example:yekk_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_lambda;1",
+          "@id": "dtmi:example:yekk_lambda;1",
           "@type": "Map",
           "mapValue": {
-            "name": "fuddle_mu",
-            "schema": "double"
+            "name": "yekk_mu",
+            "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0",
-            "name": "fuddle_kappa",
+            "name": "yekk_kappa",
             "schema": "string"
           }
         }
@@ -458,18 +458,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_rho;1",
+        "@id": "dtmi:example:yekk_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_omicron;1",
+          "@id": "dtmi:example:yekk_omicron;1",
           "@type": "Map",
           "mapValue": {
-            "name": "fuddle_pi",
-            "schema": "duration"
+            "name": "yekk_pi",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;0.0",
-            "name": "fuddle_xi",
+            "name": "yekk_xi",
             "schema": "string"
           }
         }
@@ -484,19 +484,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_phi;1",
+        "@id": "dtmi:example:yekk_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_tau;1",
+          "@id": "dtmi:example:yekk_tau;1",
           "@type": "Map",
           "mapValue": {
-            "name": "fuddle_upsilon",
-            "schema": "float"
+            "name": "yekk_upsilon",
+            "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0.0",
-            "name": "fuddle_sigma",
+            "name": "yekk_sigma",
             "schema": "string"
           }
         }
@@ -511,18 +511,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_yuzz;1",
+        "@id": "dtmi:example:yekk_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_psi;1",
+          "@id": "dtmi:example:yekk_psi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "fuddle_omega",
-            "schema": "integer"
+            "name": "yekk_omega",
+            "schema": "duration"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;1234567890",
-            "name": "fuddle_chi",
+            "name": "yekk_chi",
             "schema": "string"
           }
         }
@@ -537,19 +537,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_fuddle;1",
+        "@id": "dtmi:example:yekk_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_um;1",
+          "@id": "dtmi:example:yekk_um;1",
           "@type": "Map",
           "mapValue": {
-            "name": "fuddle_humpf",
-            "schema": "long"
+            "name": "yekk_humpf",
+            "schema": "float"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;1234567890",
-            "name": "fuddle_wum",
+            "name": "yekk_wum",
             "schema": "string"
           }
         }
@@ -564,18 +564,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_quan;1",
+        "@id": "dtmi:example:yekk_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_nuh;1",
+          "@id": "dtmi:example:yekk_nuh;1",
           "@type": "Map",
           "mapValue": {
-            "name": "fuddle_snee",
-            "schema": "string"
+            "name": "yekk_snee",
+            "schema": "integer"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;1a",
-            "name": "fuddle_glikk",
+            "name": "yekk_glikk",
             "schema": "string"
           }
         }
@@ -590,19 +590,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_zatz;1",
+        "@id": "dtmi:example:yekk_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_spazz;1",
+          "@id": "dtmi:example:yekk_spazz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "fuddle_floob",
-            "schema": "time"
+            "name": "yekk_floob",
+            "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;1a",
-            "name": "fuddle_thnad",
+            "name": "yekk_thnad",
             "schema": "string"
           }
         }
@@ -617,18 +617,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_yekk;1",
+        "@id": "dtmi:example:yekk_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_flunn;1",
+          "@id": "dtmi:example:yekk_flunn;1",
           "@type": "Map",
           "mapValue": {
-            "name": "fuddle_itch",
-            "schema": "boolean"
+            "name": "yekk_itch",
+            "schema": "string"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;3.0",
-            "name": "fuddle_jogg",
+            "name": "yekk_jogg",
             "schema": "string"
           }
         }
@@ -643,19 +643,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_beta;1",
+        "@id": "dtmi:example:vroo_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_hi;1",
+          "@id": "dtmi:example:yekk_hi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "glikk_alpha",
-            "schema": "date"
+            "name": "vroo_alpha",
+            "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.0",
-            "name": "fuddle_vroo",
+            "name": "yekk_vroo",
             "schema": "string"
           }
         }
@@ -670,18 +670,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_zeta;1",
+        "@id": "dtmi:example:vroo_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_delta;1",
+          "@id": "dtmi:example:vroo_delta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "glikk_epsilon",
-            "schema": "dateTime"
+            "name": "vroo_epsilon",
+            "schema": "boolean"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;3.1415926",
-            "name": "glikk_gamma",
+            "name": "vroo_gamma",
             "schema": "string"
           }
         }
@@ -696,19 +696,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_kappa;1",
+        "@id": "dtmi:example:vroo_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_theta;1",
+          "@id": "dtmi:example:vroo_theta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "glikk_iota",
-            "schema": "double"
+            "name": "vroo_iota",
+            "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.1415926",
-            "name": "glikk_eta",
+            "name": "vroo_eta",
             "schema": "string"
           }
         }
@@ -723,18 +723,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_xi;1",
+        "@id": "dtmi:example:vroo_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_mu;1",
+          "@id": "dtmi:example:vroo_mu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "glikk_nu",
-            "schema": "duration"
+            "name": "vroo_nu",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;6.02",
-            "name": "glikk_lambda",
+            "name": "vroo_lambda",
             "schema": "string"
           }
         }
@@ -749,19 +749,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_sigma;1",
+        "@id": "dtmi:example:vroo_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_pi;1",
+          "@id": "dtmi:example:vroo_pi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "glikk_rho",
-            "schema": "float"
+            "name": "vroo_rho",
+            "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;6.02",
-            "name": "glikk_omicron",
+            "name": "vroo_omicron",
             "schema": "string"
           }
         }
@@ -776,18 +776,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_chi;1",
+        "@id": "dtmi:example:vroo_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_upsilon;1",
+          "@id": "dtmi:example:vroo_upsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "glikk_phi",
-            "schema": "integer"
+            "name": "vroo_phi",
+            "schema": "duration"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;0.1",
-            "name": "glikk_tau",
+            "name": "vroo_tau",
             "schema": "string"
           }
         }
@@ -802,19 +802,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_wum;1",
+        "@id": "dtmi:example:vroo_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_omega;1",
+          "@id": "dtmi:example:vroo_omega;1",
           "@type": "Map",
           "mapValue": {
-            "name": "glikk_yuzz",
-            "schema": "long"
+            "name": "vroo_yuzz",
+            "schema": "float"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0.1",
-            "name": "glikk_psi",
+            "name": "vroo_psi",
             "schema": "string"
           }
         }
@@ -829,18 +829,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_glikk;1",
+        "@id": "dtmi:example:vroo_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_humpf;1",
+          "@id": "dtmi:example:vroo_humpf;1",
           "@type": "Map",
           "mapValue": {
-            "name": "glikk_fuddle",
-            "schema": "string"
+            "name": "vroo_fuddle",
+            "schema": "integer"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;01",
-            "name": "glikk_um",
+            "name": "vroo_um",
             "schema": "string"
           }
         }
@@ -855,19 +855,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_thnad;1",
+        "@id": "dtmi:example:vroo_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_snee;1",
+          "@id": "dtmi:example:vroo_snee;1",
           "@type": "Map",
           "mapValue": {
-            "name": "glikk_quan",
-            "schema": "time"
+            "name": "vroo_quan",
+            "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;01",
-            "name": "glikk_nuh",
+            "name": "vroo_nuh",
             "schema": "string"
           }
         }
@@ -882,18 +882,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_jogg;1",
+        "@id": "dtmi:example:vroo_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_floob;1",
+          "@id": "dtmi:example:vroo_floob;1",
           "@type": "Map",
           "mapValue": {
-            "name": "glikk_zatz",
-            "schema": "boolean"
+            "name": "vroo_zatz",
+            "schema": "string"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar;",
-            "name": "glikk_spazz",
+            "name": "vroo_spazz",
             "schema": "string"
           }
         }
@@ -908,19 +908,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_vroo;1",
+        "@id": "dtmi:example:vroo_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_itch;1",
+          "@id": "dtmi:example:vroo_itch;1",
           "@type": "Map",
           "mapValue": {
-            "name": "glikk_yekk",
-            "schema": "date"
+            "name": "vroo_yekk",
+            "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;",
-            "name": "glikk_flunn",
+            "name": "vroo_flunn",
             "schema": "string"
           }
         }
@@ -935,18 +935,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_gamma;1",
+        "@id": "dtmi:example:hi_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_alpha;1",
+          "@id": "dtmi:example:hi_alpha;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nuh_beta",
-            "schema": "dateTime"
+            "name": "hi_beta",
+            "schema": "boolean"
           },
           "mapKey": {
             "@id": "dtmi:test:invalidId_;1",
-            "name": "glikk_hi",
+            "name": "vroo_hi",
             "schema": "string"
           }
         }
@@ -961,19 +961,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_eta;1",
+        "@id": "dtmi:example:hi_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_epsilon;1",
+          "@id": "dtmi:example:hi_epsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nuh_zeta",
-            "schema": "double"
+            "name": "hi_zeta",
+            "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:invalidId_;1",
-            "name": "nuh_delta",
+            "name": "hi_delta",
             "schema": "string"
           }
         }
@@ -988,18 +988,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_lambda;1",
+        "@id": "dtmi:example:hi_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_iota;1",
+          "@id": "dtmi:example:hi_iota;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nuh_kappa",
-            "schema": "duration"
+            "name": "hi_kappa",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@id": "dtmi:test:_invalidUserId;1",
-            "name": "nuh_theta",
+            "name": "hi_theta",
             "schema": "string"
           }
         }
@@ -1014,19 +1014,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_omicron;1",
+        "@id": "dtmi:example:hi_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_nu;1",
+          "@id": "dtmi:example:hi_nu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nuh_xi",
-            "schema": "float"
+            "name": "hi_xi",
+            "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:_invalidUserId;1",
-            "name": "nuh_mu",
+            "name": "hi_mu",
             "schema": "string"
           }
         }
@@ -1041,18 +1041,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_tau;1",
+        "@id": "dtmi:example:hi_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_rho;1",
+          "@id": "dtmi:example:hi_rho;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nuh_sigma",
-            "schema": "integer"
+            "name": "hi_sigma",
+            "schema": "duration"
           },
           "mapKey": {
             "@id": "dtmi:test:1seg;1",
-            "name": "nuh_pi",
+            "name": "hi_pi",
             "schema": "string"
           }
         }
@@ -1067,19 +1067,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_psi;1",
+        "@id": "dtmi:example:hi_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_phi;1",
+          "@id": "dtmi:example:hi_phi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nuh_chi",
-            "schema": "long"
+            "name": "hi_chi",
+            "schema": "float"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:1seg;1",
-            "name": "nuh_upsilon",
+            "name": "hi_upsilon",
             "schema": "string"
           }
         }
@@ -1094,18 +1094,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_um;1",
+        "@id": "dtmi:example:hi_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_yuzz;1",
+          "@id": "dtmi:example:hi_yuzz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nuh_wum",
-            "schema": "string"
+            "name": "hi_wum",
+            "schema": "integer"
           },
           "mapKey": {
             "@id": "dtmi:foo:bar.baz;1",
-            "name": "nuh_omega",
+            "name": "hi_omega",
             "schema": "string"
           }
         }
@@ -1120,19 +1120,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_nuh;1",
+        "@id": "dtmi:example:hi_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_fuddle;1",
+          "@id": "dtmi:example:hi_fuddle;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nuh_glikk",
-            "schema": "time"
+            "name": "hi_glikk",
+            "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar.baz;1",
-            "name": "nuh_humpf",
+            "name": "hi_humpf",
             "schema": "string"
           }
         }
@@ -1147,18 +1147,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_spazz;1",
+        "@id": "dtmi:example:hi_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_quan;1",
+          "@id": "dtmi:example:hi_quan;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nuh_thnad",
-            "schema": "boolean"
+            "name": "hi_thnad",
+            "schema": "string"
           },
           "mapKey": {
             "@id": "dtmi:foo::bar;1",
-            "name": "nuh_snee",
+            "name": "hi_snee",
             "schema": "string"
           }
         }
@@ -1173,19 +1173,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_flunn;1",
+        "@id": "dtmi:example:hi_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_zatz;1",
+          "@id": "dtmi:example:hi_zatz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nuh_jogg",
-            "schema": "date"
+            "name": "hi_jogg",
+            "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo::bar;1",
-            "name": "nuh_floob",
+            "name": "hi_floob",
             "schema": "string"
           }
         }
@@ -1200,18 +1200,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_hi;1",
+        "@id": "dtmi:example:hi_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_yekk;1",
+          "@id": "dtmi:example:hi_yekk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nuh_vroo",
-            "schema": "dateTime"
+            "name": "hi_vroo",
+            "schema": "boolean"
           },
           "mapKey": {
             "@id": "urn:foo:bar:1",
-            "name": "nuh_itch",
+            "name": "hi_itch",
             "schema": "string"
           }
         }
@@ -1226,19 +1226,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_delta;1",
+        "@id": "dtmi:example:alpha_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_beta;1",
+          "@id": "dtmi:example:alpha_beta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "snee_gamma",
-            "schema": "double"
+            "name": "alpha_gamma",
+            "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "urn:foo:bar:1",
-            "name": "snee_alpha",
+            "name": "alpha_alpha",
             "schema": "string"
           }
         }
@@ -1253,18 +1253,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_theta;1",
+        "@id": "dtmi:example:alpha_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_zeta;1",
+          "@id": "dtmi:example:alpha_zeta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "snee_eta",
-            "schema": "duration"
+            "name": "alpha_eta",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@id": "http://foo/bar/baz",
-            "name": "snee_epsilon",
+            "name": "alpha_epsilon",
             "schema": "string"
           }
         }
@@ -1279,19 +1279,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_mu;1",
+        "@id": "dtmi:example:alpha_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_kappa;1",
+          "@id": "dtmi:example:alpha_kappa;1",
           "@type": "Map",
           "mapValue": {
-            "name": "snee_lambda",
-            "schema": "float"
+            "name": "alpha_lambda",
+            "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "http://foo/bar/baz",
-            "name": "snee_iota",
+            "name": "alpha_iota",
             "schema": "string"
           }
         }
@@ -1306,18 +1306,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_pi;1",
+        "@id": "dtmi:example:alpha_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_xi;1",
+          "@id": "dtmi:example:alpha_xi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "snee_omicron",
-            "schema": "integer"
+            "name": "alpha_omicron",
+            "schema": "duration"
           },
           "mapKey": {
             "@id": "dtmi:;1",
-            "name": "snee_nu",
+            "name": "alpha_nu",
             "schema": "string"
           }
         }
@@ -1332,19 +1332,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_upsilon;1",
+        "@id": "dtmi:example:alpha_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_sigma;1",
+          "@id": "dtmi:example:alpha_sigma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "snee_tau",
-            "schema": "long"
+            "name": "alpha_tau",
+            "schema": "float"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:;1",
-            "name": "snee_rho",
+            "name": "alpha_rho",
             "schema": "string"
           }
         }
@@ -1359,18 +1359,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_omega;1",
+        "@id": "dtmi:example:alpha_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_chi;1",
+          "@id": "dtmi:example:alpha_chi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "snee_psi",
-            "schema": "string"
+            "name": "alpha_psi",
+            "schema": "integer"
           },
           "mapKey": {
             "@id": "dtmi:dtdl:example;1",
-            "name": "snee_phi",
+            "name": "alpha_phi",
             "schema": "string"
           }
         }
@@ -1385,19 +1385,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_humpf;1",
+        "@id": "dtmi:example:alpha_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_wum;1",
+          "@id": "dtmi:example:alpha_wum;1",
           "@type": "Map",
           "mapValue": {
-            "name": "snee_um",
-            "schema": "time"
+            "name": "alpha_um",
+            "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:dtdl:example;1",
-            "name": "snee_yuzz",
+            "name": "alpha_yuzz",
             "schema": "string"
           }
         }
@@ -1412,18 +1412,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_snee;1",
+        "@id": "dtmi:example:alpha_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_glikk;1",
+          "@id": "dtmi:example:alpha_glikk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "snee_nuh",
-            "schema": "boolean"
+            "name": "alpha_nuh",
+            "schema": "string"
           },
           "mapKey": {
             "@id": "dtmi:standard:example;1",
-            "name": "snee_fuddle",
+            "name": "alpha_fuddle",
             "schema": "string"
           }
         }
@@ -1438,19 +1438,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_floob;1",
+        "@id": "dtmi:example:alpha_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_thnad;1",
+          "@id": "dtmi:example:alpha_thnad;1",
           "@type": "Map",
           "mapValue": {
-            "name": "snee_spazz",
-            "schema": "date"
+            "name": "alpha_spazz",
+            "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:standard:example;1",
-            "name": "snee_quan",
+            "name": "alpha_quan",
             "schema": "string"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyIdNotArrayV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyIdNotArrayV3.json
index 523123ba..1d3a57cb 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyIdNotArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyIdNotArrayV3.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_itch;1",
+        "@id": "dtmi:example:alpha_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_jogg;1",
+          "@id": "dtmi:example:alpha_jogg;1",
           "@type": "Map",
           "mapValue": {
-            "name": "snee_flunn",
-            "schema": "dateTime"
+            "name": "alpha_flunn",
+            "schema": "boolean"
           },
           "mapKey": {
             "@id": [
               "dtmi:foo:bar;7"
             ],
-            "name": "snee_zatz",
+            "name": "alpha_zatz",
             "schema": "string"
           }
         }
@@ -35,21 +35,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_alpha;1",
+        "@id": "dtmi:example:beta_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_vroo;1",
+          "@id": "dtmi:example:alpha_vroo;1",
           "@type": "Map",
           "mapValue": {
-            "name": "snee_hi",
-            "schema": "double"
+            "name": "alpha_hi",
+            "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;7"
             ],
-            "name": "snee_yekk",
+            "name": "alpha_yekk",
             "schema": "string"
           }
         }
@@ -64,20 +64,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_epsilon;1",
+        "@id": "dtmi:example:beta_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_gamma;1",
+          "@id": "dtmi:example:beta_gamma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "quan_delta",
-            "schema": "duration"
+            "name": "beta_delta",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@id": [
               "dtmi:foo:bar;108675309"
             ],
-            "name": "quan_beta",
+            "name": "beta_beta",
             "schema": "string"
           }
         }
@@ -92,21 +92,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_iota;1",
+        "@id": "dtmi:example:beta_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_eta;1",
+          "@id": "dtmi:example:beta_eta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "quan_theta",
-            "schema": "float"
+            "name": "beta_theta",
+            "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;108675309"
             ],
-            "name": "quan_zeta",
+            "name": "beta_zeta",
             "schema": "string"
           }
         }
@@ -121,20 +121,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_nu;1",
+        "@id": "dtmi:example:beta_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_lambda;1",
+          "@id": "dtmi:example:beta_lambda;1",
           "@type": "Map",
           "mapValue": {
-            "name": "quan_mu",
-            "schema": "integer"
+            "name": "beta_mu",
+            "schema": "duration"
           },
           "mapKey": {
             "@id": [
               "dtmi:foo:bar;999999999"
             ],
-            "name": "quan_kappa",
+            "name": "beta_kappa",
             "schema": "string"
           }
         }
@@ -149,21 +149,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_rho;1",
+        "@id": "dtmi:example:beta_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_omicron;1",
+          "@id": "dtmi:example:beta_omicron;1",
           "@type": "Map",
           "mapValue": {
-            "name": "quan_pi",
-            "schema": "long"
+            "name": "beta_pi",
+            "schema": "float"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;999999999"
             ],
-            "name": "quan_xi",
+            "name": "beta_xi",
             "schema": "string"
           }
         }
@@ -178,20 +178,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_phi;1",
+        "@id": "dtmi:example:beta_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_tau;1",
+          "@id": "dtmi:example:beta_tau;1",
           "@type": "Map",
           "mapValue": {
-            "name": "quan_upsilon",
-            "schema": "string"
+            "name": "beta_upsilon",
+            "schema": "integer"
           },
           "mapKey": {
             "@id": [
               "dtmi:foo;1"
             ],
-            "name": "quan_sigma",
+            "name": "beta_sigma",
             "schema": "string"
           }
         }
@@ -206,21 +206,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_yuzz;1",
+        "@id": "dtmi:example:beta_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_psi;1",
+          "@id": "dtmi:example:beta_psi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "quan_omega",
-            "schema": "time"
+            "name": "beta_omega",
+            "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo;1"
             ],
-            "name": "quan_chi",
+            "name": "beta_chi",
             "schema": "string"
           }
         }
@@ -235,20 +235,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_fuddle;1",
+        "@id": "dtmi:example:beta_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_um;1",
+          "@id": "dtmi:example:beta_um;1",
           "@type": "Map",
           "mapValue": {
-            "name": "quan_humpf",
-            "schema": "boolean"
+            "name": "beta_humpf",
+            "schema": "string"
           },
           "mapKey": {
             "@id": [
               "dtmi:foo:bar"
             ],
-            "name": "quan_wum",
+            "name": "beta_wum",
             "schema": "string"
           }
         }
@@ -263,21 +263,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_quan;1",
+        "@id": "dtmi:example:beta_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_nuh;1",
+          "@id": "dtmi:example:beta_nuh;1",
           "@type": "Map",
           "mapValue": {
-            "name": "quan_snee",
-            "schema": "date"
+            "name": "beta_snee",
+            "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar"
             ],
-            "name": "quan_glikk",
+            "name": "beta_glikk",
             "schema": "string"
           }
         }
@@ -292,20 +292,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_zatz;1",
+        "@id": "dtmi:example:beta_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_spazz;1",
+          "@id": "dtmi:example:beta_spazz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "quan_floob",
-            "schema": "dateTime"
+            "name": "beta_floob",
+            "schema": "boolean"
           },
           "mapKey": {
             "@id": [
               "dtmi:foo:bar;3.14"
             ],
-            "name": "quan_thnad",
+            "name": "beta_thnad",
             "schema": "string"
           }
         }
@@ -320,21 +320,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_yekk;1",
+        "@id": "dtmi:example:beta_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_flunn;1",
+          "@id": "dtmi:example:beta_flunn;1",
           "@type": "Map",
           "mapValue": {
-            "name": "quan_itch",
-            "schema": "double"
+            "name": "beta_itch",
+            "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;3.14"
             ],
-            "name": "quan_jogg",
+            "name": "beta_jogg",
             "schema": "string"
           }
         }
@@ -349,20 +349,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_beta;1",
+        "@id": "dtmi:example:gamma_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_hi;1",
+          "@id": "dtmi:example:beta_hi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "thnad_alpha",
-            "schema": "duration"
+            "name": "gamma_alpha",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@id": [
               "dtmi:foo:bar;3.141592"
             ],
-            "name": "quan_vroo",
+            "name": "beta_vroo",
             "schema": "string"
           }
         }
@@ -377,21 +377,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_zeta;1",
+        "@id": "dtmi:example:gamma_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_delta;1",
+          "@id": "dtmi:example:gamma_delta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "thnad_epsilon",
-            "schema": "float"
+            "name": "gamma_epsilon",
+            "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": [
               "dtmi:foo:bar;3.141592"
             ],
-            "name": "thnad_gamma",
+            "name": "gamma_gamma",
             "schema": "string"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyInvalidKeywordsV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyInvalidKeywordsV3.json
index 2289582a..62e1b0b0 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyInvalidKeywordsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyInvalidKeywordsV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_omega;1",
+        "@id": "dtmi:example:mu_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_chi;1",
+          "@id": "dtmi:example:mu_chi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_psi",
-            "schema": "date"
+            "name": "mu_psi",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "hi_phi",
+            "name": "mu_phi",
             "schema": "string",
             "@graph": {}
           }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_humpf;1",
+        "@id": "dtmi:example:mu_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_wum;1",
+          "@id": "dtmi:example:mu_wum;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_um",
-            "schema": "dateTime"
+            "name": "mu_um",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "hi_yuzz",
+            "name": "mu_yuzz",
             "schema": "string",
             "@graph": {}
           }
@@ -60,17 +60,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_snee;1",
+        "@id": "dtmi:example:mu_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_glikk;1",
+          "@id": "dtmi:example:mu_glikk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_nuh",
-            "schema": "double"
+            "name": "mu_nuh",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "hi_fuddle",
+            "name": "mu_fuddle",
             "schema": "string",
             "@value": 626
           }
@@ -86,18 +86,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_floob;1",
+        "@id": "dtmi:example:mu_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_thnad;1",
+          "@id": "dtmi:example:mu_thnad;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_spazz",
-            "schema": "duration"
+            "name": "mu_spazz",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "hi_quan",
+            "name": "mu_quan",
             "schema": "string",
             "@value": 626
           }
@@ -113,17 +113,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_itch;1",
+        "@id": "dtmi:example:mu_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_jogg;1",
+          "@id": "dtmi:example:mu_jogg;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_flunn",
-            "schema": "float"
+            "name": "mu_flunn",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "hi_zatz",
+            "name": "mu_zatz",
             "schema": "string",
             "@language": "en"
           }
@@ -139,18 +139,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_alpha;1",
+        "@id": "dtmi:example:nu_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_vroo;1",
+          "@id": "dtmi:example:mu_vroo;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_hi",
-            "schema": "integer"
+            "name": "mu_hi",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "hi_yekk",
+            "name": "mu_yekk",
             "schema": "string",
             "@language": "en"
           }
@@ -166,17 +166,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_epsilon;1",
+        "@id": "dtmi:example:nu_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_gamma;1",
+          "@id": "dtmi:example:nu_gamma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "alpha_delta",
-            "schema": "long"
+            "name": "nu_delta",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "alpha_beta",
+            "name": "nu_beta",
             "schema": "string",
             "@foobar": true
           }
@@ -192,18 +192,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_iota;1",
+        "@id": "dtmi:example:nu_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_eta;1",
+          "@id": "dtmi:example:nu_eta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "alpha_theta",
-            "schema": "string"
+            "name": "nu_theta",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "alpha_zeta",
+            "name": "nu_zeta",
             "schema": "string",
             "@foobar": true
           }
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyCommentStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyCommentStringLengthV3.json
index 0358d164..eb172019 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyCommentStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyCommentStringLengthV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_pi;1",
+        "@id": "dtmi:example:epsilon_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_xi;1",
+          "@id": "dtmi:example:epsilon_xi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "floob_omicron",
-            "schema": "time"
+            "name": "epsilon_omicron",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "floob_nu",
+            "name": "epsilon_nu",
             "schema": "string",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_upsilon;1",
+        "@id": "dtmi:example:epsilon_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_sigma;1",
+          "@id": "dtmi:example:epsilon_sigma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "floob_tau",
-            "schema": "boolean"
+            "name": "epsilon_tau",
+            "schema": "string"
           },
           "mapKey": {
-            "name": "floob_rho",
+            "name": "epsilon_rho",
             "schema": "string",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
@@ -59,18 +59,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_omega;1",
+        "@id": "dtmi:example:epsilon_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_chi;1",
+          "@id": "dtmi:example:epsilon_chi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "floob_psi",
-            "schema": "date"
+            "name": "epsilon_psi",
+            "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "floob_phi",
+            "name": "epsilon_phi",
             "schema": "string",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyCommentStringV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyCommentStringV3.json
index 4557d3e7..e22c3380 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyCommentStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyCommentStringV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_sigma;1",
+        "@id": "dtmi:example:gamma_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_pi;1",
+          "@id": "dtmi:example:gamma_pi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "thnad_rho",
-            "schema": "string"
+            "name": "gamma_rho",
+            "schema": "integer"
           },
           "mapKey": {
-            "name": "thnad_omicron",
+            "name": "gamma_omicron",
             "schema": "string",
             "comment": "hello"
           }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_chi;1",
+        "@id": "dtmi:example:gamma_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_upsilon;1",
+          "@id": "dtmi:example:gamma_upsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "thnad_phi",
-            "schema": "time"
+            "name": "gamma_phi",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "thnad_tau",
+            "name": "gamma_tau",
             "schema": "string",
             "comment": [
               "hello"
@@ -61,17 +61,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_wum;1",
+        "@id": "dtmi:example:gamma_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_omega;1",
+          "@id": "dtmi:example:gamma_omega;1",
           "@type": "Map",
           "mapValue": {
-            "name": "thnad_yuzz",
-            "schema": "boolean"
+            "name": "gamma_yuzz",
+            "schema": "string"
           },
           "mapKey": {
-            "name": "thnad_psi",
+            "name": "gamma_psi",
             "schema": "string",
             "comment": {
               "@value": "hello",
@@ -90,17 +90,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_glikk;1",
+        "@id": "dtmi:example:gamma_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_humpf;1",
+          "@id": "dtmi:example:gamma_humpf;1",
           "@type": "Map",
           "mapValue": {
-            "name": "thnad_fuddle",
-            "schema": "date"
+            "name": "gamma_fuddle",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "thnad_um",
+            "name": "gamma_um",
             "schema": "string",
             "comment": [
               {
@@ -121,17 +121,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_thnad;1",
+        "@id": "dtmi:example:gamma_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_snee;1",
+          "@id": "dtmi:example:gamma_snee;1",
           "@type": "Map",
           "mapValue": {
-            "name": "thnad_quan",
-            "schema": "dateTime"
+            "name": "gamma_quan",
+            "schema": "boolean"
           },
           "mapKey": {
-            "name": "thnad_nuh",
+            "name": "gamma_nuh",
             "schema": "string",
             "comment": []
           }
@@ -147,17 +147,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_jogg;1",
+        "@id": "dtmi:example:gamma_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_floob;1",
+          "@id": "dtmi:example:gamma_floob;1",
           "@type": "Map",
           "mapValue": {
-            "name": "thnad_zatz",
-            "schema": "double"
+            "name": "gamma_zatz",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "thnad_spazz",
+            "name": "gamma_spazz",
             "schema": "string",
             "comment": null
           }
@@ -173,18 +173,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_vroo;1",
+        "@id": "dtmi:example:gamma_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_itch;1",
+          "@id": "dtmi:example:gamma_itch;1",
           "@type": "Map",
           "mapValue": {
-            "name": "thnad_yekk",
-            "schema": "duration"
+            "name": "gamma_yekk",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "thnad_flunn",
+            "name": "gamma_flunn",
             "schema": "string",
             "comment": null
           }
@@ -200,17 +200,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_gamma;1",
+        "@id": "dtmi:example:delta_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_alpha;1",
+          "@id": "dtmi:example:delta_alpha;1",
           "@type": "Map",
           "mapValue": {
-            "name": "spazz_beta",
-            "schema": "float"
+            "name": "delta_beta",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "thnad_hi",
+            "name": "gamma_hi",
             "schema": "string",
             "comment": true
           }
@@ -226,18 +226,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_eta;1",
+        "@id": "dtmi:example:delta_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_epsilon;1",
+          "@id": "dtmi:example:delta_epsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "spazz_zeta",
-            "schema": "integer"
+            "name": "delta_zeta",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "spazz_delta",
+            "name": "delta_delta",
             "schema": "string",
             "comment": true
           }
@@ -253,17 +253,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_lambda;1",
+        "@id": "dtmi:example:delta_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_iota;1",
+          "@id": "dtmi:example:delta_iota;1",
           "@type": "Map",
           "mapValue": {
-            "name": "spazz_kappa",
-            "schema": "long"
+            "name": "delta_kappa",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "spazz_theta",
+            "name": "delta_theta",
             "schema": "string",
             "comment": 626
           }
@@ -279,18 +279,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_omicron;1",
+        "@id": "dtmi:example:delta_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_nu;1",
+          "@id": "dtmi:example:delta_nu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "spazz_xi",
-            "schema": "string"
+            "name": "delta_xi",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "spazz_mu",
+            "name": "delta_mu",
             "schema": "string",
             "comment": 626
           }
@@ -306,17 +306,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_tau;1",
+        "@id": "dtmi:example:delta_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_rho;1",
+          "@id": "dtmi:example:delta_rho;1",
           "@type": "Map",
           "mapValue": {
-            "name": "spazz_sigma",
-            "schema": "time"
+            "name": "delta_sigma",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "spazz_pi",
+            "name": "delta_pi",
             "schema": "string",
             "comment": [
               null
@@ -334,18 +334,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_psi;1",
+        "@id": "dtmi:example:delta_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_phi;1",
+          "@id": "dtmi:example:delta_phi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "spazz_chi",
-            "schema": "boolean"
+            "name": "delta_chi",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "spazz_upsilon",
+            "name": "delta_upsilon",
             "schema": "string",
             "comment": [
               null
@@ -363,17 +363,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_um;1",
+        "@id": "dtmi:example:delta_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_yuzz;1",
+          "@id": "dtmi:example:delta_yuzz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "spazz_wum",
-            "schema": "date"
+            "name": "delta_wum",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "spazz_omega",
+            "name": "delta_omega",
             "schema": "string",
             "comment": [
               true
@@ -391,18 +391,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_nuh;1",
+        "@id": "dtmi:example:delta_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_fuddle;1",
+          "@id": "dtmi:example:delta_fuddle;1",
           "@type": "Map",
           "mapValue": {
-            "name": "spazz_glikk",
-            "schema": "dateTime"
+            "name": "delta_glikk",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "spazz_humpf",
+            "name": "delta_humpf",
             "schema": "string",
             "comment": [
               true
@@ -420,17 +420,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_spazz;1",
+        "@id": "dtmi:example:delta_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_quan;1",
+          "@id": "dtmi:example:delta_quan;1",
           "@type": "Map",
           "mapValue": {
-            "name": "spazz_thnad",
-            "schema": "double"
+            "name": "delta_thnad",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "spazz_snee",
+            "name": "delta_snee",
             "schema": "string",
             "comment": [
               626
@@ -448,18 +448,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_flunn;1",
+        "@id": "dtmi:example:delta_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_zatz;1",
+          "@id": "dtmi:example:delta_zatz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "spazz_jogg",
-            "schema": "duration"
+            "name": "delta_jogg",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "spazz_floob",
+            "name": "delta_floob",
             "schema": "string",
             "comment": [
               626
@@ -477,17 +477,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_hi;1",
+        "@id": "dtmi:example:delta_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_yekk;1",
+          "@id": "dtmi:example:delta_yekk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "spazz_vroo",
-            "schema": "float"
+            "name": "delta_vroo",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "spazz_itch",
+            "name": "delta_itch",
             "schema": "string",
             "comment": {}
           }
@@ -503,18 +503,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_delta;1",
+        "@id": "dtmi:example:epsilon_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_beta;1",
+          "@id": "dtmi:example:epsilon_beta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "floob_gamma",
-            "schema": "integer"
+            "name": "epsilon_gamma",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "floob_alpha",
+            "name": "epsilon_alpha",
             "schema": "string",
             "comment": {}
           }
@@ -530,17 +530,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_theta;1",
+        "@id": "dtmi:example:epsilon_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_zeta;1",
+          "@id": "dtmi:example:epsilon_zeta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "floob_eta",
-            "schema": "long"
+            "name": "epsilon_eta",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "floob_epsilon",
+            "name": "epsilon_epsilon",
             "schema": "string",
             "comment": [
               {}
@@ -558,18 +558,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_mu;1",
+        "@id": "dtmi:example:epsilon_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_kappa;1",
+          "@id": "dtmi:example:epsilon_kappa;1",
           "@type": "Map",
           "mapValue": {
-            "name": "floob_lambda",
-            "schema": "string"
+            "name": "epsilon_lambda",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "floob_iota",
+            "name": "epsilon_iota",
             "schema": "string",
             "comment": [
               {}
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyCommentTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyCommentTermAndDtmiV3.json
index 433951d8..5fc4f2a4 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyCommentTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyCommentTermAndDtmiV3.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_beta;1",
+        "@id": "dtmi:example:zeta_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_hi;1",
+          "@id": "dtmi:example:epsilon_hi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "zatz_alpha",
-            "schema": "float"
+            "name": "zeta_alpha",
+            "schema": "double"
           },
           "mapKey": {
-            "comment": "floob_itch",
-            "dtmi:dtdl:property:comment;3": "floob_yekk",
-            "name": "floob_vroo",
+            "comment": "epsilon_itch",
+            "dtmi:dtdl:property:comment;3": "epsilon_yekk",
+            "name": "epsilon_vroo",
             "schema": "string"
           }
         }
@@ -34,20 +34,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_theta;1",
+        "@id": "dtmi:example:zeta_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_zeta;1",
+          "@id": "dtmi:example:zeta_zeta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "zatz_eta",
-            "schema": "integer"
+            "name": "zeta_eta",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "comment": "zatz_gamma",
-            "dtmi:dtdl:property:comment;3": "zatz_delta",
-            "name": "zatz_epsilon",
+            "comment": "zeta_gamma",
+            "dtmi:dtdl:property:comment;3": "zeta_delta",
+            "name": "zeta_epsilon",
             "schema": "string"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyDescriptionLangStringV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyDescriptionLangStringV3.json
index c48045dd..73f9bd68 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyDescriptionLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyDescriptionLangStringV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_mu;1",
+        "@id": "dtmi:example:zeta_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_kappa;1",
+          "@id": "dtmi:example:zeta_kappa;1",
           "@type": "Map",
           "mapValue": {
-            "name": "zatz_lambda",
-            "schema": "long"
+            "name": "zeta_lambda",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "zatz_iota",
+            "name": "zeta_iota",
             "schema": "string",
             "description": "hello"
           }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_pi;1",
+        "@id": "dtmi:example:zeta_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_xi;1",
+          "@id": "dtmi:example:zeta_xi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "zatz_omicron",
-            "schema": "string"
+            "name": "zeta_omicron",
+            "schema": "integer"
           },
           "mapKey": {
-            "name": "zatz_nu",
+            "name": "zeta_nu",
             "schema": "string",
             "description": [
               "hello"
@@ -61,17 +61,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_upsilon;1",
+        "@id": "dtmi:example:zeta_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_sigma;1",
+          "@id": "dtmi:example:zeta_sigma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "zatz_tau",
-            "schema": "time"
+            "name": "zeta_tau",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "zatz_rho",
+            "name": "zeta_rho",
             "schema": "string",
             "description": {
               "en": "hello"
@@ -89,17 +89,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_omega;1",
+        "@id": "dtmi:example:zeta_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_chi;1",
+          "@id": "dtmi:example:zeta_chi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "zatz_psi",
-            "schema": "boolean"
+            "name": "zeta_psi",
+            "schema": "string"
           },
           "mapKey": {
-            "name": "zatz_phi",
+            "name": "zeta_phi",
             "schema": "string",
             "description": [
               {
@@ -120,17 +120,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_humpf;1",
+        "@id": "dtmi:example:zeta_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_wum;1",
+          "@id": "dtmi:example:zeta_wum;1",
           "@type": "Map",
           "mapValue": {
-            "name": "zatz_um",
-            "schema": "date"
+            "name": "zeta_um",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "zatz_yuzz",
+            "name": "zeta_yuzz",
             "schema": "string",
             "description": {}
           }
@@ -146,17 +146,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_snee;1",
+        "@id": "dtmi:example:zeta_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_glikk;1",
+          "@id": "dtmi:example:zeta_glikk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "zatz_nuh",
-            "schema": "dateTime"
+            "name": "zeta_nuh",
+            "schema": "boolean"
           },
           "mapKey": {
-            "name": "zatz_fuddle",
+            "name": "zeta_fuddle",
             "schema": "string",
             "description": []
           }
@@ -172,17 +172,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_floob;1",
+        "@id": "dtmi:example:zeta_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_thnad;1",
+          "@id": "dtmi:example:zeta_thnad;1",
           "@type": "Map",
           "mapValue": {
-            "name": "zatz_spazz",
-            "schema": "double"
+            "name": "zeta_spazz",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "zatz_quan",
+            "name": "zeta_quan",
             "schema": "string",
             "description": null
           }
@@ -198,18 +198,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_itch;1",
+        "@id": "dtmi:example:zeta_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_jogg;1",
+          "@id": "dtmi:example:zeta_jogg;1",
           "@type": "Map",
           "mapValue": {
-            "name": "zatz_flunn",
-            "schema": "duration"
+            "name": "zeta_flunn",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zatz_zatz",
+            "name": "zeta_zatz",
             "schema": "string",
             "description": null
           }
@@ -225,17 +225,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_alpha;1",
+        "@id": "dtmi:example:eta_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_vroo;1",
+          "@id": "dtmi:example:zeta_vroo;1",
           "@type": "Map",
           "mapValue": {
-            "name": "zatz_hi",
-            "schema": "float"
+            "name": "zeta_hi",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "zatz_yekk",
+            "name": "zeta_yekk",
             "schema": "string",
             "description": true
           }
@@ -251,18 +251,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_epsilon;1",
+        "@id": "dtmi:example:eta_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_gamma;1",
+          "@id": "dtmi:example:eta_gamma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "jogg_delta",
-            "schema": "integer"
+            "name": "eta_delta",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "jogg_beta",
+            "name": "eta_beta",
             "schema": "string",
             "description": true
           }
@@ -278,17 +278,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_iota;1",
+        "@id": "dtmi:example:eta_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_eta;1",
+          "@id": "dtmi:example:eta_eta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "jogg_theta",
-            "schema": "long"
+            "name": "eta_theta",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "jogg_zeta",
+            "name": "eta_zeta",
             "schema": "string",
             "description": 626
           }
@@ -304,18 +304,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_nu;1",
+        "@id": "dtmi:example:eta_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_lambda;1",
+          "@id": "dtmi:example:eta_lambda;1",
           "@type": "Map",
           "mapValue": {
-            "name": "jogg_mu",
-            "schema": "string"
+            "name": "eta_mu",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "jogg_kappa",
+            "name": "eta_kappa",
             "schema": "string",
             "description": 626
           }
@@ -331,17 +331,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_rho;1",
+        "@id": "dtmi:example:eta_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_omicron;1",
+          "@id": "dtmi:example:eta_omicron;1",
           "@type": "Map",
           "mapValue": {
-            "name": "jogg_pi",
-            "schema": "time"
+            "name": "eta_pi",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "jogg_xi",
+            "name": "eta_xi",
             "schema": "string",
             "description": [
               null
@@ -359,18 +359,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_phi;1",
+        "@id": "dtmi:example:eta_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_tau;1",
+          "@id": "dtmi:example:eta_tau;1",
           "@type": "Map",
           "mapValue": {
-            "name": "jogg_upsilon",
-            "schema": "boolean"
+            "name": "eta_upsilon",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "jogg_sigma",
+            "name": "eta_sigma",
             "schema": "string",
             "description": [
               null
@@ -388,17 +388,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_yuzz;1",
+        "@id": "dtmi:example:eta_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_psi;1",
+          "@id": "dtmi:example:eta_psi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "jogg_omega",
-            "schema": "date"
+            "name": "eta_omega",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "jogg_chi",
+            "name": "eta_chi",
             "schema": "string",
             "description": [
               true
@@ -416,18 +416,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_fuddle;1",
+        "@id": "dtmi:example:eta_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_um;1",
+          "@id": "dtmi:example:eta_um;1",
           "@type": "Map",
           "mapValue": {
-            "name": "jogg_humpf",
-            "schema": "dateTime"
+            "name": "eta_humpf",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "jogg_wum",
+            "name": "eta_wum",
             "schema": "string",
             "description": [
               true
@@ -445,17 +445,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_quan;1",
+        "@id": "dtmi:example:eta_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_nuh;1",
+          "@id": "dtmi:example:eta_nuh;1",
           "@type": "Map",
           "mapValue": {
-            "name": "jogg_snee",
-            "schema": "double"
+            "name": "eta_snee",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "jogg_glikk",
+            "name": "eta_glikk",
             "schema": "string",
             "description": [
               626
@@ -473,18 +473,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_zatz;1",
+        "@id": "dtmi:example:eta_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_spazz;1",
+          "@id": "dtmi:example:eta_spazz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "jogg_floob",
-            "schema": "duration"
+            "name": "eta_floob",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "jogg_thnad",
+            "name": "eta_thnad",
             "schema": "string",
             "description": [
               626
@@ -502,17 +502,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_yekk;1",
+        "@id": "dtmi:example:eta_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_flunn;1",
+          "@id": "dtmi:example:eta_flunn;1",
           "@type": "Map",
           "mapValue": {
-            "name": "jogg_itch",
-            "schema": "float"
+            "name": "eta_itch",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "jogg_jogg",
+            "name": "eta_jogg",
             "schema": "string",
             "description": [
               {}
@@ -530,18 +530,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_beta;1",
+        "@id": "dtmi:example:theta_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_hi;1",
+          "@id": "dtmi:example:eta_hi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "flunn_alpha",
-            "schema": "integer"
+            "name": "theta_alpha",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "jogg_vroo",
+            "name": "eta_vroo",
             "schema": "string",
             "description": [
               {}
@@ -559,17 +559,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_zeta;1",
+        "@id": "dtmi:example:theta_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_delta;1",
+          "@id": "dtmi:example:theta_delta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "flunn_epsilon",
-            "schema": "long"
+            "name": "theta_epsilon",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "flunn_gamma",
+            "name": "theta_gamma",
             "schema": "string",
             "description": {
               "@value": "hello",
@@ -588,18 +588,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_kappa;1",
+        "@id": "dtmi:example:theta_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_theta;1",
+          "@id": "dtmi:example:theta_theta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "flunn_iota",
-            "schema": "string"
+            "name": "theta_iota",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "flunn_eta",
+            "name": "theta_eta",
             "schema": "string",
             "description": {
               "@value": "hello",
@@ -618,17 +618,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_xi;1",
+        "@id": "dtmi:example:theta_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_mu;1",
+          "@id": "dtmi:example:theta_mu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "flunn_nu",
-            "schema": "time"
+            "name": "theta_nu",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "flunn_lambda",
+            "name": "theta_lambda",
             "schema": "string",
             "description": [
               {
@@ -648,18 +648,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_sigma;1",
+        "@id": "dtmi:example:theta_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_pi;1",
+          "@id": "dtmi:example:theta_pi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "flunn_rho",
-            "schema": "boolean"
+            "name": "theta_rho",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "flunn_omicron",
+            "name": "theta_omicron",
             "schema": "string",
             "description": [
               {
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyDescriptionStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyDescriptionStringLengthV3.json
index 6bb5167f..a1fd4a0f 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyDescriptionStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyDescriptionStringLengthV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_chi;1",
+        "@id": "dtmi:example:theta_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_upsilon;1",
+          "@id": "dtmi:example:theta_upsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "flunn_phi",
-            "schema": "date"
+            "name": "theta_phi",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "flunn_tau",
+            "name": "theta_tau",
             "schema": "string",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_wum;1",
+        "@id": "dtmi:example:theta_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_omega;1",
+          "@id": "dtmi:example:theta_omega;1",
           "@type": "Map",
           "mapValue": {
-            "name": "flunn_yuzz",
-            "schema": "dateTime"
+            "name": "theta_yuzz",
+            "schema": "boolean"
           },
           "mapKey": {
-            "name": "flunn_psi",
+            "name": "theta_psi",
             "schema": "string",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
@@ -59,18 +59,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_glikk;1",
+        "@id": "dtmi:example:theta_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_humpf;1",
+          "@id": "dtmi:example:theta_humpf;1",
           "@type": "Map",
           "mapValue": {
-            "name": "flunn_fuddle",
-            "schema": "double"
+            "name": "theta_fuddle",
+            "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "flunn_um",
+            "name": "theta_um",
             "schema": "string",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyDescriptionTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyDescriptionTermAndDtmiV3.json
index 77a38169..1038841c 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyDescriptionTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyDescriptionTermAndDtmiV3.json
@@ -7,23 +7,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_theta;1",
+        "@id": "dtmi:example:iota_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_zeta;1",
+          "@id": "dtmi:example:iota_zeta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "itch_eta",
-            "schema": "long"
+            "name": "iota_eta",
+            "schema": "float"
           },
           "mapKey": {
             "description": [
-              "itch_gamma"
+              "iota_gamma"
             ],
             "dtmi:dtdl:property:description;3": [
-              "itch_delta"
+              "iota_delta"
             ],
-            "name": "itch_epsilon",
+            "name": "iota_epsilon",
             "schema": "string"
           }
         }
@@ -38,24 +38,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_xi;1",
+        "@id": "dtmi:example:iota_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_mu;1",
+          "@id": "dtmi:example:iota_mu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "itch_nu",
-            "schema": "string"
+            "name": "iota_nu",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "description": [
-              "itch_iota"
+              "iota_iota"
             ],
             "dtmi:dtdl:property:description;3": [
-              "itch_kappa"
+              "iota_kappa"
             ],
-            "name": "itch_lambda",
+            "name": "iota_lambda",
             "schema": "string"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyDisplayNameLangStringV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyDisplayNameLangStringV3.json
index 4160e4dc..d12ad564 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyDisplayNameLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyDisplayNameLangStringV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_sigma;1",
+        "@id": "dtmi:example:iota_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_pi;1",
+          "@id": "dtmi:example:iota_pi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "itch_rho",
-            "schema": "time"
+            "name": "iota_rho",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "itch_omicron",
+            "name": "iota_omicron",
             "schema": "string",
             "displayName": "hello"
           }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_chi;1",
+        "@id": "dtmi:example:iota_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_upsilon;1",
+          "@id": "dtmi:example:iota_upsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "itch_phi",
-            "schema": "boolean"
+            "name": "iota_phi",
+            "schema": "string"
           },
           "mapKey": {
-            "name": "itch_tau",
+            "name": "iota_tau",
             "schema": "string",
             "displayName": [
               "hello"
@@ -61,17 +61,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_wum;1",
+        "@id": "dtmi:example:iota_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_omega;1",
+          "@id": "dtmi:example:iota_omega;1",
           "@type": "Map",
           "mapValue": {
-            "name": "itch_yuzz",
-            "schema": "date"
+            "name": "iota_yuzz",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "itch_psi",
+            "name": "iota_psi",
             "schema": "string",
             "displayName": {
               "en": "hello"
@@ -89,17 +89,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_glikk;1",
+        "@id": "dtmi:example:iota_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_humpf;1",
+          "@id": "dtmi:example:iota_humpf;1",
           "@type": "Map",
           "mapValue": {
-            "name": "itch_fuddle",
-            "schema": "dateTime"
+            "name": "iota_fuddle",
+            "schema": "boolean"
           },
           "mapKey": {
-            "name": "itch_um",
+            "name": "iota_um",
             "schema": "string",
             "displayName": [
               {
@@ -120,17 +120,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_thnad;1",
+        "@id": "dtmi:example:iota_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_snee;1",
+          "@id": "dtmi:example:iota_snee;1",
           "@type": "Map",
           "mapValue": {
-            "name": "itch_quan",
-            "schema": "double"
+            "name": "iota_quan",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "itch_nuh",
+            "name": "iota_nuh",
             "schema": "string",
             "displayName": {}
           }
@@ -146,17 +146,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_jogg;1",
+        "@id": "dtmi:example:iota_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_floob;1",
+          "@id": "dtmi:example:iota_floob;1",
           "@type": "Map",
           "mapValue": {
-            "name": "itch_zatz",
-            "schema": "duration"
+            "name": "iota_zatz",
+            "schema": "dateTime"
           },
           "mapKey": {
-            "name": "itch_spazz",
+            "name": "iota_spazz",
             "schema": "string",
             "displayName": []
           }
@@ -172,17 +172,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_vroo;1",
+        "@id": "dtmi:example:iota_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_itch;1",
+          "@id": "dtmi:example:iota_itch;1",
           "@type": "Map",
           "mapValue": {
-            "name": "itch_yekk",
-            "schema": "float"
+            "name": "iota_yekk",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "itch_flunn",
+            "name": "iota_flunn",
             "schema": "string",
             "displayName": null
           }
@@ -198,18 +198,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_gamma;1",
+        "@id": "dtmi:example:kappa_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_alpha;1",
+          "@id": "dtmi:example:kappa_alpha;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_beta",
-            "schema": "integer"
+            "name": "kappa_beta",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "itch_hi",
+            "name": "iota_hi",
             "schema": "string",
             "displayName": null
           }
@@ -225,17 +225,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_eta;1",
+        "@id": "dtmi:example:kappa_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_epsilon;1",
+          "@id": "dtmi:example:kappa_epsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_zeta",
-            "schema": "long"
+            "name": "kappa_zeta",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "yekk_delta",
+            "name": "kappa_delta",
             "schema": "string",
             "displayName": true
           }
@@ -251,18 +251,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_lambda;1",
+        "@id": "dtmi:example:kappa_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_iota;1",
+          "@id": "dtmi:example:kappa_iota;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_kappa",
-            "schema": "string"
+            "name": "kappa_kappa",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yekk_theta",
+            "name": "kappa_theta",
             "schema": "string",
             "displayName": true
           }
@@ -278,17 +278,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_omicron;1",
+        "@id": "dtmi:example:kappa_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_nu;1",
+          "@id": "dtmi:example:kappa_nu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_xi",
-            "schema": "time"
+            "name": "kappa_xi",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "yekk_mu",
+            "name": "kappa_mu",
             "schema": "string",
             "displayName": 626
           }
@@ -304,18 +304,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_tau;1",
+        "@id": "dtmi:example:kappa_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_rho;1",
+          "@id": "dtmi:example:kappa_rho;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_sigma",
-            "schema": "boolean"
+            "name": "kappa_sigma",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yekk_pi",
+            "name": "kappa_pi",
             "schema": "string",
             "displayName": 626
           }
@@ -331,17 +331,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_psi;1",
+        "@id": "dtmi:example:kappa_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_phi;1",
+          "@id": "dtmi:example:kappa_phi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_chi",
-            "schema": "date"
+            "name": "kappa_chi",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "yekk_upsilon",
+            "name": "kappa_upsilon",
             "schema": "string",
             "displayName": [
               null
@@ -359,18 +359,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_um;1",
+        "@id": "dtmi:example:kappa_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_yuzz;1",
+          "@id": "dtmi:example:kappa_yuzz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_wum",
-            "schema": "dateTime"
+            "name": "kappa_wum",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yekk_omega",
+            "name": "kappa_omega",
             "schema": "string",
             "displayName": [
               null
@@ -388,17 +388,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_nuh;1",
+        "@id": "dtmi:example:kappa_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_fuddle;1",
+          "@id": "dtmi:example:kappa_fuddle;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_glikk",
-            "schema": "double"
+            "name": "kappa_glikk",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "yekk_humpf",
+            "name": "kappa_humpf",
             "schema": "string",
             "displayName": [
               true
@@ -416,18 +416,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_spazz;1",
+        "@id": "dtmi:example:kappa_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_quan;1",
+          "@id": "dtmi:example:kappa_quan;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_thnad",
-            "schema": "duration"
+            "name": "kappa_thnad",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yekk_snee",
+            "name": "kappa_snee",
             "schema": "string",
             "displayName": [
               true
@@ -445,17 +445,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_flunn;1",
+        "@id": "dtmi:example:kappa_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_zatz;1",
+          "@id": "dtmi:example:kappa_zatz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_jogg",
-            "schema": "float"
+            "name": "kappa_jogg",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "yekk_floob",
+            "name": "kappa_floob",
             "schema": "string",
             "displayName": [
               626
@@ -473,18 +473,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_hi;1",
+        "@id": "dtmi:example:kappa_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_yekk;1",
+          "@id": "dtmi:example:kappa_yekk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yekk_vroo",
-            "schema": "integer"
+            "name": "kappa_vroo",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yekk_itch",
+            "name": "kappa_itch",
             "schema": "string",
             "displayName": [
               626
@@ -502,17 +502,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_delta;1",
+        "@id": "dtmi:example:lambda_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_beta;1",
+          "@id": "dtmi:example:lambda_beta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "vroo_gamma",
-            "schema": "long"
+            "name": "lambda_gamma",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "vroo_alpha",
+            "name": "lambda_alpha",
             "schema": "string",
             "displayName": [
               {}
@@ -530,18 +530,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_theta;1",
+        "@id": "dtmi:example:lambda_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_zeta;1",
+          "@id": "dtmi:example:lambda_zeta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "vroo_eta",
-            "schema": "string"
+            "name": "lambda_eta",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "vroo_epsilon",
+            "name": "lambda_epsilon",
             "schema": "string",
             "displayName": [
               {}
@@ -559,17 +559,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_mu;1",
+        "@id": "dtmi:example:lambda_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_kappa;1",
+          "@id": "dtmi:example:lambda_kappa;1",
           "@type": "Map",
           "mapValue": {
-            "name": "vroo_lambda",
-            "schema": "time"
+            "name": "lambda_lambda",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "vroo_iota",
+            "name": "lambda_iota",
             "schema": "string",
             "displayName": {
               "@value": "hello",
@@ -588,18 +588,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_pi;1",
+        "@id": "dtmi:example:lambda_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_xi;1",
+          "@id": "dtmi:example:lambda_xi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "vroo_omicron",
-            "schema": "boolean"
+            "name": "lambda_omicron",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "vroo_nu",
+            "name": "lambda_nu",
             "schema": "string",
             "displayName": {
               "@value": "hello",
@@ -618,17 +618,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_upsilon;1",
+        "@id": "dtmi:example:lambda_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_sigma;1",
+          "@id": "dtmi:example:lambda_sigma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "vroo_tau",
-            "schema": "date"
+            "name": "lambda_tau",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "vroo_rho",
+            "name": "lambda_rho",
             "schema": "string",
             "displayName": [
               {
@@ -648,18 +648,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_omega;1",
+        "@id": "dtmi:example:lambda_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_chi;1",
+          "@id": "dtmi:example:lambda_chi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "vroo_psi",
-            "schema": "dateTime"
+            "name": "lambda_psi",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "vroo_phi",
+            "name": "lambda_phi",
             "schema": "string",
             "displayName": [
               {
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyDisplayNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyDisplayNameStringLengthV3.json
index 6c6c4341..42340f09 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyDisplayNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyDisplayNameStringLengthV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_humpf;1",
+        "@id": "dtmi:example:lambda_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_wum;1",
+          "@id": "dtmi:example:lambda_wum;1",
           "@type": "Map",
           "mapValue": {
-            "name": "vroo_um",
-            "schema": "double"
+            "name": "lambda_um",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "vroo_yuzz",
+            "name": "lambda_yuzz",
             "schema": "string",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_snee;1",
+        "@id": "dtmi:example:lambda_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_glikk;1",
+          "@id": "dtmi:example:lambda_glikk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "vroo_nuh",
-            "schema": "duration"
+            "name": "lambda_nuh",
+            "schema": "dateTime"
           },
           "mapKey": {
-            "name": "vroo_fuddle",
+            "name": "lambda_fuddle",
             "schema": "string",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
@@ -59,18 +59,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_floob;1",
+        "@id": "dtmi:example:lambda_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_thnad;1",
+          "@id": "dtmi:example:lambda_thnad;1",
           "@type": "Map",
           "mapValue": {
-            "name": "vroo_spazz",
-            "schema": "float"
+            "name": "lambda_spazz",
+            "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "vroo_quan",
+            "name": "lambda_quan",
             "schema": "string",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyDisplayNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyDisplayNameTermAndDtmiV3.json
index 670ecb65..51164209 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyDisplayNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyDisplayNameTermAndDtmiV3.json
@@ -7,23 +7,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_xi;1",
+        "@id": "dtmi:example:mu_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_mu;1",
+          "@id": "dtmi:example:mu_mu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_nu",
-            "schema": "time"
+            "name": "mu_nu",
+            "schema": "long"
           },
           "mapKey": {
             "displayName": [
-              "hi_iota"
+              "mu_iota"
             ],
             "dtmi:dtdl:property:displayName;3": [
-              "hi_kappa"
+              "mu_kappa"
             ],
-            "name": "hi_lambda",
+            "name": "mu_lambda",
             "schema": "string"
           }
         }
@@ -38,24 +38,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_upsilon;1",
+        "@id": "dtmi:example:mu_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_sigma;1",
+          "@id": "dtmi:example:mu_sigma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "hi_tau",
-            "schema": "boolean"
+            "name": "mu_tau",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
             "displayName": [
-              "hi_omicron"
+              "mu_omicron"
             ],
             "dtmi:dtdl:property:displayName;3": [
-              "hi_pi"
+              "mu_pi"
             ],
-            "name": "hi_rho",
+            "name": "mu_rho",
             "schema": "string"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyFormallyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyFormallyIrrelevantDtmiOrTermV3.json
index 04e4ce84..fdb58794 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyFormallyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyFormallyIrrelevantDtmiOrTermV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_fuddle;1",
+        "@id": "dtmi:example:nu_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_um;1",
+          "@id": "dtmi:example:nu_um;1",
           "@type": "Map",
           "mapValue": {
-            "name": "alpha_humpf",
-            "schema": "double"
+            "name": "nu_humpf",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "alpha_wum",
+            "name": "nu_wum",
             "schema": "string",
             "dtmi:foo:bar;1": 626
           }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_quan;1",
+        "@id": "dtmi:example:nu_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_nuh;1",
+          "@id": "dtmi:example:nu_nuh;1",
           "@type": "Map",
           "mapValue": {
-            "name": "alpha_snee",
-            "schema": "duration"
+            "name": "nu_snee",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "alpha_glikk",
+            "name": "nu_glikk",
             "schema": "string",
             "dtmi:foo:bar;1": 626
           }
@@ -60,17 +60,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_zatz;1",
+        "@id": "dtmi:example:nu_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_spazz;1",
+          "@id": "dtmi:example:nu_spazz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "alpha_floob",
-            "schema": "float"
+            "name": "nu_floob",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "alpha_thnad",
+            "name": "nu_thnad",
             "schema": "string",
             "boolean": null
           }
@@ -86,18 +86,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_yekk;1",
+        "@id": "dtmi:example:nu_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_flunn;1",
+          "@id": "dtmi:example:nu_flunn;1",
           "@type": "Map",
           "mapValue": {
-            "name": "alpha_itch",
-            "schema": "integer"
+            "name": "nu_itch",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "alpha_jogg",
+            "name": "nu_jogg",
             "schema": "string",
             "boolean": null
           }
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyFormallyUndefinedTermV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyFormallyUndefinedTermV3.json
index 2291246f..26a29467 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyFormallyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyFormallyUndefinedTermV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_wum;1",
+        "@id": "dtmi:example:xi_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_omega;1",
+          "@id": "dtmi:example:xi_omega;1",
           "@type": "Map",
           "mapValue": {
-            "name": "beta_yuzz",
-            "schema": "double"
+            "name": "xi_yuzz",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "beta_psi",
+            "name": "xi_psi",
             "schema": "string",
             "foobar": {}
           }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_glikk;1",
+        "@id": "dtmi:example:xi_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_humpf;1",
+          "@id": "dtmi:example:xi_humpf;1",
           "@type": "Map",
           "mapValue": {
-            "name": "beta_fuddle",
-            "schema": "duration"
+            "name": "xi_fuddle",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "beta_um",
+            "name": "xi_um",
             "schema": "string",
             "foobar": {}
           }
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyInvalidDtmiV3.json
index 23713d60..f45ebd6d 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyInvalidDtmiV3.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_beta;1",
+        "@id": "dtmi:example:xi_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_hi;1",
+          "@id": "dtmi:example:nu_hi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "beta_alpha",
-            "schema": "long"
+            "name": "xi_alpha",
+            "schema": "float"
           },
           "mapKey": {
             "@type": [
               "MapKey",
               "Foobar"
             ],
-            "name": "alpha_vroo",
+            "name": "nu_vroo",
             "schema": "string",
             "dtmi:foo//bar": 626
           }
@@ -37,14 +37,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_zeta;1",
+        "@id": "dtmi:example:xi_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_delta;1",
+          "@id": "dtmi:example:xi_delta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "beta_epsilon",
-            "schema": "string"
+            "name": "xi_epsilon",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -52,7 +52,7 @@
               "MapKey",
               "Foobar"
             ],
-            "name": "beta_gamma",
+            "name": "xi_gamma",
             "schema": "string",
             "dtmi:foo//bar": 626
           }
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyNamePatternV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyNamePatternV3.json
index c050c5fd..f4823cee 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyNamePatternV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyNamePatternV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_floob;1",
+        "@id": "dtmi:example:chi_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_thnad;1",
+          "@id": "dtmi:example:chi_wum;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_spazz",
-            "schema": "time"
+            "name": "chi_um",
+            "schema": "float"
           },
           "mapKey": {
             "schema": "string",
@@ -32,14 +32,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_flunn;1",
+        "@id": "dtmi:example:chi_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_zatz;1",
+          "@id": "dtmi:example:chi_fuddle;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_jogg",
-            "schema": "boolean"
+            "name": "chi_glikk",
+            "schema": "integer"
           },
           "mapKey": {
             "schema": "string",
@@ -57,14 +57,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_vroo;1",
+        "@id": "dtmi:example:chi_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_itch;1",
+          "@id": "dtmi:example:chi_snee;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_yekk",
-            "schema": "date"
+            "name": "chi_quan",
+            "schema": "long"
           },
           "mapKey": {
             "schema": "string",
@@ -82,14 +82,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_beta;1",
+        "@id": "dtmi:example:chi_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_hi;1",
+          "@id": "dtmi:example:chi_spazz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "lambda_alpha",
-            "schema": "dateTime"
+            "name": "chi_floob",
+            "schema": "string"
           },
           "mapKey": {
             "schema": "string",
@@ -107,14 +107,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_epsilon;1",
+        "@id": "dtmi:example:chi_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_gamma;1",
+          "@id": "dtmi:example:chi_jogg;1",
           "@type": "Map",
           "mapValue": {
-            "name": "lambda_delta",
-            "schema": "double"
+            "name": "chi_flunn",
+            "schema": "time"
           },
           "mapKey": {
             "schema": "string",
@@ -132,14 +132,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_theta;1",
+        "@id": "dtmi:example:chi_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_zeta;1",
+          "@id": "dtmi:example:chi_yekk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "lambda_eta",
-            "schema": "duration"
+            "name": "chi_vroo",
+            "schema": "boolean"
           },
           "mapKey": {
             "schema": "string",
@@ -157,14 +157,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_lambda;1",
+        "@id": "dtmi:example:psi_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_iota;1",
+          "@id": "dtmi:example:psi_alpha;1",
           "@type": "Map",
           "mapValue": {
-            "name": "lambda_kappa",
-            "schema": "float"
+            "name": "psi_beta",
+            "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -183,14 +183,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_xi;1",
+        "@id": "dtmi:example:psi_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_mu;1",
+          "@id": "dtmi:example:psi_delta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "lambda_nu",
-            "schema": "integer"
+            "name": "psi_epsilon",
+            "schema": "dateTime"
           },
           "mapKey": {
             "schema": "string",
@@ -208,14 +208,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_rho;1",
+        "@id": "dtmi:example:psi_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_omicron;1",
+          "@id": "dtmi:example:psi_eta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "lambda_pi",
-            "schema": "long"
+            "name": "psi_theta",
+            "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -234,14 +234,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_upsilon;1",
+        "@id": "dtmi:example:psi_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_sigma;1",
+          "@id": "dtmi:example:psi_kappa;1",
           "@type": "Map",
           "mapValue": {
-            "name": "lambda_tau",
-            "schema": "string"
+            "name": "psi_lambda",
+            "schema": "duration"
           },
           "mapKey": {
             "schema": "string",
@@ -259,14 +259,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_psi;1",
+        "@id": "dtmi:example:psi_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_phi;1",
+          "@id": "dtmi:example:psi_nu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "lambda_chi",
-            "schema": "time"
+            "name": "psi_xi",
+            "schema": "float"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -285,14 +285,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_wum;1",
+        "@id": "dtmi:example:psi_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_omega;1",
+          "@id": "dtmi:example:psi_pi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "lambda_yuzz",
-            "schema": "boolean"
+            "name": "psi_rho",
+            "schema": "integer"
           },
           "mapKey": {
             "schema": "string",
@@ -310,14 +310,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_fuddle;1",
+        "@id": "dtmi:example:psi_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_um;1",
+          "@id": "dtmi:example:psi_tau;1",
           "@type": "Map",
           "mapValue": {
-            "name": "lambda_humpf",
-            "schema": "date"
+            "name": "psi_upsilon",
+            "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -336,14 +336,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_snee;1",
+        "@id": "dtmi:example:psi_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_glikk;1",
+          "@id": "dtmi:example:psi_chi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "lambda_nuh",
-            "schema": "dateTime"
+            "name": "psi_psi",
+            "schema": "string"
           },
           "mapKey": {
             "schema": "string",
@@ -361,14 +361,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_spazz;1",
+        "@id": "dtmi:example:psi_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_quan;1",
+          "@id": "dtmi:example:psi_yuzz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "lambda_thnad",
-            "schema": "double"
+            "name": "psi_wum",
+            "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -387,14 +387,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_jogg;1",
+        "@id": "dtmi:example:psi_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_floob;1",
+          "@id": "dtmi:example:psi_humpf;1",
           "@type": "Map",
           "mapValue": {
-            "name": "lambda_zatz",
-            "schema": "duration"
+            "name": "psi_fuddle",
+            "schema": "boolean"
           },
           "mapKey": {
             "schema": "string",
@@ -412,14 +412,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_yekk;1",
+        "@id": "dtmi:example:psi_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_flunn;1",
+          "@id": "dtmi:example:psi_nuh;1",
           "@type": "Map",
           "mapValue": {
-            "name": "lambda_itch",
-            "schema": "float"
+            "name": "psi_snee",
+            "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -438,14 +438,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_alpha;1",
+        "@id": "dtmi:example:psi_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_vroo;1",
+          "@id": "dtmi:example:psi_thnad;1",
           "@type": "Map",
           "mapValue": {
-            "name": "lambda_hi",
-            "schema": "integer"
+            "name": "psi_spazz",
+            "schema": "dateTime"
           },
           "mapKey": {
             "schema": "string",
@@ -463,14 +463,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_delta;1",
+        "@id": "dtmi:example:psi_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_beta;1",
+          "@id": "dtmi:example:psi_zatz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "mu_gamma",
-            "schema": "long"
+            "name": "psi_jogg",
+            "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -489,14 +489,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_eta;1",
+        "@id": "dtmi:example:psi_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_epsilon;1",
+          "@id": "dtmi:example:psi_itch;1",
           "@type": "Map",
           "mapValue": {
-            "name": "mu_zeta",
-            "schema": "string"
+            "name": "psi_yekk",
+            "schema": "duration"
           },
           "mapKey": {
             "schema": "string",
@@ -514,14 +514,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_kappa;1",
+        "@id": "dtmi:example:omega_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_theta;1",
+          "@id": "dtmi:example:psi_hi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "mu_iota",
-            "schema": "time"
+            "name": "omega_alpha",
+            "schema": "float"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -540,14 +540,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_nu;1",
+        "@id": "dtmi:example:omega_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_lambda;1",
+          "@id": "dtmi:example:omega_gamma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "mu_mu",
-            "schema": "boolean"
+            "name": "omega_delta",
+            "schema": "integer"
           },
           "mapKey": {
             "schema": "string",
@@ -565,14 +565,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_pi;1",
+        "@id": "dtmi:example:omega_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_xi;1",
+          "@id": "dtmi:example:omega_zeta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "mu_omicron",
-            "schema": "date"
+            "name": "omega_eta",
+            "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -591,14 +591,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_tau;1",
+        "@id": "dtmi:example:omega_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_rho;1",
+          "@id": "dtmi:example:omega_iota;1",
           "@type": "Map",
           "mapValue": {
-            "name": "mu_sigma",
-            "schema": "dateTime"
+            "name": "omega_kappa",
+            "schema": "string"
           },
           "mapKey": {
             "schema": "string",
@@ -616,14 +616,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_chi;1",
+        "@id": "dtmi:example:omega_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_upsilon;1",
+          "@id": "dtmi:example:omega_mu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "mu_phi",
-            "schema": "double"
+            "name": "omega_nu",
+            "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyNameStringLengthV3.json
index a43f99fe..afbfcbba 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyNameStringLengthV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_um;1",
+        "@id": "dtmi:example:chi_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_yuzz;1",
+          "@id": "dtmi:example:chi_rho;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_wum",
-            "schema": "integer"
+            "name": "chi_sigma",
+            "schema": "dateTime"
           },
           "mapKey": {
             "schema": "string",
@@ -32,14 +32,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_glikk;1",
+        "@id": "dtmi:example:chi_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_humpf;1",
+          "@id": "dtmi:example:chi_upsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_fuddle",
-            "schema": "long"
+            "name": "chi_phi",
+            "schema": "double"
           },
           "mapKey": {
             "schema": "string",
@@ -57,14 +57,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_quan;1",
+        "@id": "dtmi:example:chi_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_nuh;1",
+          "@id": "dtmi:example:chi_psi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_snee",
-            "schema": "string"
+            "name": "chi_omega",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyNameStringV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyNameStringV3.json
index 44db8b3c..144942b1 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyNameStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyNameStringV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_delta;1",
+        "@id": "dtmi:example:upsilon_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_beta;1",
+          "@id": "dtmi:example:upsilon_zatz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_gamma",
-            "schema": "duration"
+            "name": "upsilon_jogg",
+            "schema": "boolean"
           },
           "mapKey": {
             "schema": "string",
@@ -32,14 +32,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_eta;1",
+        "@id": "dtmi:example:upsilon_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_epsilon;1",
+          "@id": "dtmi:example:upsilon_itch;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_zeta",
-            "schema": "float"
+            "name": "upsilon_yekk",
+            "schema": "date"
           },
           "mapKey": {
             "schema": "string",
@@ -59,14 +59,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_kappa;1",
+        "@id": "dtmi:example:phi_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_theta;1",
+          "@id": "dtmi:example:upsilon_hi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_iota",
-            "schema": "integer"
+            "name": "phi_alpha",
+            "schema": "dateTime"
           },
           "mapKey": {
             "schema": "string",
@@ -87,14 +87,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_nu;1",
+        "@id": "dtmi:example:phi_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_lambda;1",
+          "@id": "dtmi:example:phi_gamma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_mu",
-            "schema": "long"
+            "name": "phi_delta",
+            "schema": "double"
           },
           "mapKey": {
             "schema": "string",
@@ -117,14 +117,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_pi;1",
+        "@id": "dtmi:example:phi_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_xi;1",
+          "@id": "dtmi:example:phi_zeta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_omicron",
-            "schema": "string"
+            "name": "phi_eta",
+            "schema": "duration"
           },
           "mapKey": {
             "schema": "string",
@@ -142,14 +142,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_tau;1",
+        "@id": "dtmi:example:phi_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_rho;1",
+          "@id": "dtmi:example:phi_iota;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_sigma",
-            "schema": "time"
+            "name": "phi_kappa",
+            "schema": "float"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -168,14 +168,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_chi;1",
+        "@id": "dtmi:example:phi_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_upsilon;1",
+          "@id": "dtmi:example:phi_mu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_phi",
-            "schema": "boolean"
+            "name": "phi_nu",
+            "schema": "integer"
           },
           "mapKey": {
             "schema": "string",
@@ -193,14 +193,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_yuzz;1",
+        "@id": "dtmi:example:phi_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_psi;1",
+          "@id": "dtmi:example:phi_omicron;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_omega",
-            "schema": "date"
+            "name": "phi_pi",
+            "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -219,14 +219,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_humpf;1",
+        "@id": "dtmi:example:phi_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_wum;1",
+          "@id": "dtmi:example:phi_sigma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_um",
-            "schema": "dateTime"
+            "name": "phi_tau",
+            "schema": "string"
           },
           "mapKey": {
             "schema": "string",
@@ -244,14 +244,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_nuh;1",
+        "@id": "dtmi:example:phi_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_fuddle;1",
+          "@id": "dtmi:example:phi_phi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_glikk",
-            "schema": "double"
+            "name": "phi_chi",
+            "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -270,14 +270,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_thnad;1",
+        "@id": "dtmi:example:phi_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_snee;1",
+          "@id": "dtmi:example:phi_omega;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_quan",
-            "schema": "duration"
+            "name": "phi_yuzz",
+            "schema": "boolean"
           },
           "mapKey": {
             "schema": "string",
@@ -297,14 +297,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_zatz;1",
+        "@id": "dtmi:example:phi_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_spazz;1",
+          "@id": "dtmi:example:phi_um;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_floob",
-            "schema": "float"
+            "name": "phi_humpf",
+            "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -325,14 +325,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_itch;1",
+        "@id": "dtmi:example:phi_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_jogg;1",
+          "@id": "dtmi:example:phi_glikk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_flunn",
-            "schema": "integer"
+            "name": "phi_nuh",
+            "schema": "dateTime"
           },
           "mapKey": {
             "schema": "string",
@@ -352,14 +352,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_hi;1",
+        "@id": "dtmi:example:phi_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_yekk;1",
+          "@id": "dtmi:example:phi_quan;1",
           "@type": "Map",
           "mapValue": {
-            "name": "iota_vroo",
-            "schema": "long"
+            "name": "phi_thnad",
+            "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -380,14 +380,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_gamma;1",
+        "@id": "dtmi:example:phi_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_alpha;1",
+          "@id": "dtmi:example:phi_floob;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_beta",
-            "schema": "string"
+            "name": "phi_zatz",
+            "schema": "duration"
           },
           "mapKey": {
             "schema": "string",
@@ -407,14 +407,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_zeta;1",
+        "@id": "dtmi:example:phi_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_delta;1",
+          "@id": "dtmi:example:phi_flunn;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_epsilon",
-            "schema": "time"
+            "name": "phi_itch",
+            "schema": "float"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -435,14 +435,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_iota;1",
+        "@id": "dtmi:example:chi_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_eta;1",
+          "@id": "dtmi:example:phi_vroo;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_theta",
-            "schema": "boolean"
+            "name": "phi_hi",
+            "schema": "integer"
           },
           "mapKey": {
             "schema": "string",
@@ -460,14 +460,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_mu;1",
+        "@id": "dtmi:example:chi_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_kappa;1",
+          "@id": "dtmi:example:chi_beta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_lambda",
-            "schema": "date"
+            "name": "chi_gamma",
+            "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -486,14 +486,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_omicron;1",
+        "@id": "dtmi:example:chi_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_nu;1",
+          "@id": "dtmi:example:chi_epsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_xi",
-            "schema": "dateTime"
+            "name": "chi_zeta",
+            "schema": "string"
           },
           "mapKey": {
             "schema": "string",
@@ -513,14 +513,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_sigma;1",
+        "@id": "dtmi:example:chi_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_pi;1",
+          "@id": "dtmi:example:chi_theta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_rho",
-            "schema": "double"
+            "name": "chi_iota",
+            "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -541,14 +541,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_phi;1",
+        "@id": "dtmi:example:chi_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_tau;1",
+          "@id": "dtmi:example:chi_lambda;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_upsilon",
-            "schema": "duration"
+            "name": "chi_mu",
+            "schema": "boolean"
           },
           "mapKey": {
             "schema": "string",
@@ -566,14 +566,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_omega;1",
+        "@id": "dtmi:example:chi_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_chi;1",
+          "@id": "dtmi:example:chi_xi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "kappa_psi",
-            "schema": "float"
+            "name": "chi_omicron",
+            "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyNameTermAndDtmiV3.json
index 24a69244..74bfc6c5 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyNameTermAndDtmiV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_flunn;1",
+        "@id": "dtmi:example:omega_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_zatz;1",
+          "@id": "dtmi:example:omega_fuddle;1",
           "@type": "Map",
           "mapValue": {
-            "name": "mu_jogg",
-            "schema": "long"
+            "name": "omega_glikk",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "mu_spazz",
-            "dtmi:dtdl:property:name;3": "mu_floob",
+            "name": "omega_um",
+            "dtmi:dtdl:property:name;3": "omega_humpf",
             "schema": "string"
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_alpha;1",
+        "@id": "dtmi:example:omega_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_vroo;1",
+          "@id": "dtmi:example:omega_thnad;1",
           "@type": "Map",
           "mapValue": {
-            "name": "mu_hi",
-            "schema": "string"
+            "name": "omega_spazz",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "mu_itch",
-            "dtmi:dtdl:property:name;3": "mu_yekk",
+            "name": "omega_snee",
+            "dtmi:dtdl:property:name;3": "omega_quan",
             "schema": "string"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyNotDtmiNorTermV3.json
index ab8e3147..fe2f28ed 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyPropertyNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyPropertyNotDtmiNorTermV3.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_kappa;1",
+        "@id": "dtmi:example:xi_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_theta;1",
+          "@id": "dtmi:example:xi_theta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "beta_iota",
-            "schema": "time"
+            "name": "xi_iota",
+            "schema": "long"
           },
           "mapKey": {
             "@type": [
               "MapKey",
               "Foobar"
             ],
-            "name": "beta_eta",
+            "name": "xi_eta",
             "schema": "string",
             "http://foo.com/bar": true
           }
@@ -37,14 +37,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_xi;1",
+        "@id": "dtmi:example:xi_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_mu;1",
+          "@id": "dtmi:example:xi_mu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "beta_nu",
-            "schema": "boolean"
+            "name": "xi_nu",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -52,7 +52,7 @@
               "MapKey",
               "Foobar"
             ],
-            "name": "beta_lambda",
+            "name": "xi_lambda",
             "schema": "string",
             "http://foo.com/bar": true
           }
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyPropertySchemaSpecificValuesV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyPropertySchemaSpecificValuesV3.json
index 7ed1b205..acf4975d 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyPropertySchemaSpecificValuesV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyPropertySchemaSpecificValuesV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_epsilon;1",
+        "@id": "dtmi:example:omega_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_gamma;1",
+          "@id": "dtmi:example:omega_jogg;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nu_delta",
-            "schema": "time"
+            "name": "omega_flunn",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "nu_beta",
+            "name": "omega_zatz",
             "schema": "string"
           }
         }
@@ -32,17 +32,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_iota;1",
+        "@id": "dtmi:example:yuzz_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_eta;1",
+          "@id": "dtmi:example:omega_vroo;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nu_theta",
-            "schema": "boolean"
+            "name": "omega_hi",
+            "schema": "integer"
           },
           "mapKey": {
-            "name": "nu_zeta",
+            "name": "omega_yekk",
             "schema": [
               "string"
             ]
@@ -59,17 +59,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_nu;1",
+        "@id": "dtmi:example:yuzz_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_lambda;1",
+          "@id": "dtmi:example:yuzz_gamma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nu_mu",
-            "schema": "date"
+            "name": "yuzz_delta",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "nu_kappa",
+            "name": "yuzz_beta",
             "schema": "dtmi:dtdl:instance:Schema:string;3"
           }
         }
@@ -84,17 +84,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_rho;1",
+        "@id": "dtmi:example:yuzz_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_omicron;1",
+          "@id": "dtmi:example:yuzz_eta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nu_pi",
-            "schema": "dateTime"
+            "name": "yuzz_theta",
+            "schema": "string"
           },
           "mapKey": {
-            "name": "nu_xi",
+            "name": "yuzz_zeta",
             "schema": [
               "dtmi:dtdl:instance:Schema:string;3"
             ]
@@ -111,17 +111,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_phi;1",
+        "@id": "dtmi:example:yuzz_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_tau;1",
+          "@id": "dtmi:example:yuzz_lambda;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nu_upsilon",
-            "schema": "double"
+            "name": "yuzz_mu",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "nu_sigma",
+            "name": "yuzz_kappa",
             "schema": [
               "string",
               "dtmi:dtdl:instance:Schema:string;3"
@@ -139,18 +139,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_yuzz;1",
+        "@id": "dtmi:example:yuzz_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_psi;1",
+          "@id": "dtmi:example:yuzz_omicron;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nu_omega",
-            "schema": "duration"
+            "name": "yuzz_pi",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nu_chi",
+            "name": "yuzz_xi",
             "schema": [
               "string",
               "dtmi:dtdl:instance:Schema:string;3"
@@ -168,17 +168,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_fuddle;1",
+        "@id": "dtmi:example:yuzz_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_um;1",
+          "@id": "dtmi:example:yuzz_tau;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nu_humpf",
-            "schema": "float"
+            "name": "yuzz_upsilon",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "nu_wum",
+            "name": "yuzz_sigma",
             "schema": []
           }
         }
@@ -193,18 +193,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_quan;1",
+        "@id": "dtmi:example:yuzz_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_nuh;1",
+          "@id": "dtmi:example:yuzz_psi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nu_snee",
-            "schema": "integer"
+            "name": "yuzz_omega",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nu_glikk",
+            "name": "yuzz_chi",
             "schema": []
           }
         }
@@ -219,17 +219,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_zatz;1",
+        "@id": "dtmi:example:yuzz_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_spazz;1",
+          "@id": "dtmi:example:yuzz_um;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nu_floob",
-            "schema": "long"
+            "name": "yuzz_humpf",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "nu_thnad",
+            "name": "yuzz_wum",
             "schema": null
           }
         }
@@ -244,18 +244,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_yekk;1",
+        "@id": "dtmi:example:yuzz_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_flunn;1",
+          "@id": "dtmi:example:yuzz_nuh;1",
           "@type": "Map",
           "mapValue": {
-            "name": "nu_itch",
-            "schema": "string"
+            "name": "yuzz_snee",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nu_jogg",
+            "name": "yuzz_glikk",
             "schema": null
           }
         }
@@ -270,17 +270,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_beta;1",
+        "@id": "dtmi:example:yuzz_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_hi;1",
+          "@id": "dtmi:example:yuzz_spazz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_alpha",
-            "schema": "time"
+            "name": "yuzz_floob",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "nu_vroo",
+            "name": "yuzz_thnad",
             "schema": true
           }
         }
@@ -295,18 +295,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_zeta;1",
+        "@id": "dtmi:example:yuzz_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_delta;1",
+          "@id": "dtmi:example:yuzz_flunn;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_epsilon",
-            "schema": "boolean"
+            "name": "yuzz_itch",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "xi_gamma",
+            "name": "yuzz_jogg",
             "schema": true
           }
         }
@@ -321,17 +321,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_kappa;1",
+        "@id": "dtmi:example:wum_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_theta;1",
+          "@id": "dtmi:example:yuzz_hi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_iota",
-            "schema": "date"
+            "name": "wum_alpha",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "xi_eta",
+            "name": "yuzz_vroo",
             "schema": 626
           }
         }
@@ -346,18 +346,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_xi;1",
+        "@id": "dtmi:example:wum_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_mu;1",
+          "@id": "dtmi:example:wum_delta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_nu",
-            "schema": "dateTime"
+            "name": "wum_epsilon",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "xi_lambda",
+            "name": "wum_gamma",
             "schema": 626
           }
         }
@@ -372,17 +372,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_sigma;1",
+        "@id": "dtmi:example:wum_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_pi;1",
+          "@id": "dtmi:example:wum_theta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_rho",
-            "schema": "double"
+            "name": "wum_iota",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "xi_omicron",
+            "name": "wum_eta",
             "schema": [
               null
             ]
@@ -399,18 +399,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_chi;1",
+        "@id": "dtmi:example:wum_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_upsilon;1",
+          "@id": "dtmi:example:wum_mu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_phi",
-            "schema": "duration"
+            "name": "wum_nu",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "xi_tau",
+            "name": "wum_lambda",
             "schema": [
               null
             ]
@@ -427,17 +427,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_wum;1",
+        "@id": "dtmi:example:wum_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_omega;1",
+          "@id": "dtmi:example:wum_pi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_yuzz",
-            "schema": "float"
+            "name": "wum_rho",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "xi_psi",
+            "name": "wum_omicron",
             "schema": [
               true
             ]
@@ -454,18 +454,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_glikk;1",
+        "@id": "dtmi:example:wum_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_humpf;1",
+          "@id": "dtmi:example:wum_upsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_fuddle",
-            "schema": "integer"
+            "name": "wum_phi",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "xi_um",
+            "name": "wum_tau",
             "schema": [
               true
             ]
@@ -482,17 +482,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_thnad;1",
+        "@id": "dtmi:example:wum_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_snee;1",
+          "@id": "dtmi:example:wum_omega;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_quan",
-            "schema": "long"
+            "name": "wum_yuzz",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "xi_nuh",
+            "name": "wum_psi",
             "schema": [
               626
             ]
@@ -509,18 +509,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_jogg;1",
+        "@id": "dtmi:example:wum_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_floob;1",
+          "@id": "dtmi:example:wum_humpf;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_zatz",
-            "schema": "string"
+            "name": "wum_fuddle",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "xi_spazz",
+            "name": "wum_um",
             "schema": [
               626
             ]
@@ -537,17 +537,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_vroo;1",
+        "@id": "dtmi:example:wum_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_itch;1",
+          "@id": "dtmi:example:wum_snee;1",
           "@type": "Map",
           "mapValue": {
-            "name": "xi_yekk",
-            "schema": "time"
+            "name": "wum_quan",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "xi_flunn",
+            "name": "wum_nuh",
             "schema": {}
           }
         }
@@ -562,18 +562,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_gamma;1",
+        "@id": "dtmi:example:wum_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_alpha;1",
+          "@id": "dtmi:example:wum_floob;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_beta",
-            "schema": "boolean"
+            "name": "wum_zatz",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "xi_hi",
+            "name": "wum_spazz",
             "schema": {}
           }
         }
@@ -588,17 +588,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_eta;1",
+        "@id": "dtmi:example:wum_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_epsilon;1",
+          "@id": "dtmi:example:wum_itch;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_zeta",
-            "schema": "date"
+            "name": "wum_yekk",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "omicron_delta",
+            "name": "wum_flunn",
             "schema": [
               {}
             ]
@@ -615,18 +615,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_lambda;1",
+        "@id": "dtmi:example:um_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_iota;1",
+          "@id": "dtmi:example:um_alpha;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_kappa",
-            "schema": "dateTime"
+            "name": "um_beta",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omicron_theta",
+            "name": "wum_hi",
             "schema": [
               {}
             ]
@@ -643,17 +643,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_omicron;1",
+        "@id": "dtmi:example:um_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_nu;1",
+          "@id": "dtmi:example:um_epsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_xi",
-            "schema": "double"
+            "name": "um_zeta",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "omicron_mu",
+            "name": "um_delta",
             "schema": "asynchronous"
           }
         }
@@ -668,18 +668,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_tau;1",
+        "@id": "dtmi:example:um_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_rho;1",
+          "@id": "dtmi:example:um_iota;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_sigma",
-            "schema": "duration"
+            "name": "um_kappa",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omicron_pi",
+            "name": "um_theta",
             "schema": "asynchronous"
           }
         }
@@ -694,17 +694,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_psi;1",
+        "@id": "dtmi:example:um_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_phi;1",
+          "@id": "dtmi:example:um_nu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_chi",
-            "schema": "float"
+            "name": "um_xi",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "omicron_upsilon",
+            "name": "um_mu",
             "schema": "dtmi:dtdl:instance:CommandType:asynchronous;3"
           }
         }
@@ -719,18 +719,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_um;1",
+        "@id": "dtmi:example:um_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_yuzz;1",
+          "@id": "dtmi:example:um_rho;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_wum",
-            "schema": "integer"
+            "name": "um_sigma",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omicron_omega",
+            "name": "um_pi",
             "schema": "dtmi:dtdl:instance:CommandType:asynchronous;3"
           }
         }
@@ -745,17 +745,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_nuh;1",
+        "@id": "dtmi:example:um_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_fuddle;1",
+          "@id": "dtmi:example:um_phi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_glikk",
-            "schema": "long"
+            "name": "um_chi",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "omicron_humpf",
+            "name": "um_upsilon",
             "schema": "synchronous"
           }
         }
@@ -770,18 +770,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_spazz;1",
+        "@id": "dtmi:example:um_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_quan;1",
+          "@id": "dtmi:example:um_yuzz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_thnad",
-            "schema": "string"
+            "name": "um_wum",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omicron_snee",
+            "name": "um_omega",
             "schema": "synchronous"
           }
         }
@@ -796,17 +796,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_flunn;1",
+        "@id": "dtmi:example:um_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_zatz;1",
+          "@id": "dtmi:example:um_fuddle;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_jogg",
-            "schema": "time"
+            "name": "um_glikk",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "omicron_floob",
+            "name": "um_humpf",
             "schema": "dtmi:dtdl:instance:CommandType:synchronous;3"
           }
         }
@@ -821,18 +821,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_hi;1",
+        "@id": "dtmi:example:um_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_yekk;1",
+          "@id": "dtmi:example:um_quan;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omicron_vroo",
-            "schema": "boolean"
+            "name": "um_thnad",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omicron_itch",
+            "name": "um_snee",
             "schema": "dtmi:dtdl:instance:CommandType:synchronous;3"
           }
         }
@@ -847,17 +847,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_delta;1",
+        "@id": "dtmi:example:um_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_beta;1",
+          "@id": "dtmi:example:um_zatz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_gamma",
-            "schema": "date"
+            "name": "um_jogg",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "pi_alpha",
+            "name": "um_floob",
             "schema": "boolean"
           }
         }
@@ -872,18 +872,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_theta;1",
+        "@id": "dtmi:example:um_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_zeta;1",
+          "@id": "dtmi:example:um_yekk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_eta",
-            "schema": "dateTime"
+            "name": "um_vroo",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "pi_epsilon",
+            "name": "um_itch",
             "schema": "boolean"
           }
         }
@@ -898,17 +898,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_mu;1",
+        "@id": "dtmi:example:humpf_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_kappa;1",
+          "@id": "dtmi:example:humpf_beta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_lambda",
-            "schema": "double"
+            "name": "humpf_gamma",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "pi_iota",
+            "name": "humpf_alpha",
             "schema": "dtmi:dtdl:instance:Schema:boolean;3"
           }
         }
@@ -923,18 +923,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_pi;1",
+        "@id": "dtmi:example:humpf_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_xi;1",
+          "@id": "dtmi:example:humpf_zeta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_omicron",
-            "schema": "duration"
+            "name": "humpf_eta",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "pi_nu",
+            "name": "humpf_epsilon",
             "schema": "dtmi:dtdl:instance:Schema:boolean;3"
           }
         }
@@ -949,17 +949,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_upsilon;1",
+        "@id": "dtmi:example:humpf_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_sigma;1",
+          "@id": "dtmi:example:humpf_kappa;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_tau",
-            "schema": "float"
+            "name": "humpf_lambda",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "pi_rho",
+            "name": "humpf_iota",
             "schema": "date"
           }
         }
@@ -974,18 +974,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_omega;1",
+        "@id": "dtmi:example:humpf_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_chi;1",
+          "@id": "dtmi:example:humpf_xi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_psi",
-            "schema": "integer"
+            "name": "humpf_omicron",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "pi_phi",
+            "name": "humpf_nu",
             "schema": "date"
           }
         }
@@ -1000,17 +1000,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_humpf;1",
+        "@id": "dtmi:example:humpf_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_wum;1",
+          "@id": "dtmi:example:humpf_sigma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_um",
-            "schema": "long"
+            "name": "humpf_tau",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "pi_yuzz",
+            "name": "humpf_rho",
             "schema": "dtmi:dtdl:instance:Schema:date;3"
           }
         }
@@ -1025,18 +1025,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_snee;1",
+        "@id": "dtmi:example:humpf_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_glikk;1",
+          "@id": "dtmi:example:humpf_chi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_nuh",
-            "schema": "string"
+            "name": "humpf_psi",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "pi_fuddle",
+            "name": "humpf_phi",
             "schema": "dtmi:dtdl:instance:Schema:date;3"
           }
         }
@@ -1051,17 +1051,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_floob;1",
+        "@id": "dtmi:example:humpf_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_thnad;1",
+          "@id": "dtmi:example:humpf_wum;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_spazz",
-            "schema": "time"
+            "name": "humpf_um",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "pi_quan",
+            "name": "humpf_yuzz",
             "schema": "dateTime"
           }
         }
@@ -1076,18 +1076,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_itch;1",
+        "@id": "dtmi:example:humpf_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_jogg;1",
+          "@id": "dtmi:example:humpf_glikk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_flunn",
-            "schema": "boolean"
+            "name": "humpf_nuh",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "pi_zatz",
+            "name": "humpf_fuddle",
             "schema": "dateTime"
           }
         }
@@ -1102,17 +1102,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_alpha;1",
+        "@id": "dtmi:example:humpf_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:pi_vroo;1",
+          "@id": "dtmi:example:humpf_thnad;1",
           "@type": "Map",
           "mapValue": {
-            "name": "pi_hi",
-            "schema": "date"
+            "name": "humpf_spazz",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "pi_yekk",
+            "name": "humpf_quan",
             "schema": "dtmi:dtdl:instance:Schema:dateTime;3"
           }
         }
@@ -1127,18 +1127,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_epsilon;1",
+        "@id": "dtmi:example:humpf_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_gamma;1",
+          "@id": "dtmi:example:humpf_jogg;1",
           "@type": "Map",
           "mapValue": {
-            "name": "rho_delta",
-            "schema": "dateTime"
+            "name": "humpf_flunn",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "rho_beta",
+            "name": "humpf_zatz",
             "schema": "dtmi:dtdl:instance:Schema:dateTime;3"
           }
         }
@@ -1153,17 +1153,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_iota;1",
+        "@id": "dtmi:example:fuddle_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_eta;1",
+          "@id": "dtmi:example:humpf_vroo;1",
           "@type": "Map",
           "mapValue": {
-            "name": "rho_theta",
-            "schema": "double"
+            "name": "humpf_hi",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "rho_zeta",
+            "name": "humpf_yekk",
             "schema": "double"
           }
         }
@@ -1178,18 +1178,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_nu;1",
+        "@id": "dtmi:example:fuddle_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_lambda;1",
+          "@id": "dtmi:example:fuddle_gamma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "rho_mu",
-            "schema": "duration"
+            "name": "fuddle_delta",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "rho_kappa",
+            "name": "fuddle_beta",
             "schema": "double"
           }
         }
@@ -1204,17 +1204,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_rho;1",
+        "@id": "dtmi:example:fuddle_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_omicron;1",
+          "@id": "dtmi:example:fuddle_eta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "rho_pi",
-            "schema": "float"
+            "name": "fuddle_theta",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "rho_xi",
+            "name": "fuddle_zeta",
             "schema": "dtmi:dtdl:instance:Schema:double;3"
           }
         }
@@ -1229,18 +1229,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_phi;1",
+        "@id": "dtmi:example:fuddle_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_tau;1",
+          "@id": "dtmi:example:fuddle_lambda;1",
           "@type": "Map",
           "mapValue": {
-            "name": "rho_upsilon",
-            "schema": "integer"
+            "name": "fuddle_mu",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "rho_sigma",
+            "name": "fuddle_kappa",
             "schema": "dtmi:dtdl:instance:Schema:double;3"
           }
         }
@@ -1255,17 +1255,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_yuzz;1",
+        "@id": "dtmi:example:fuddle_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_psi;1",
+          "@id": "dtmi:example:fuddle_omicron;1",
           "@type": "Map",
           "mapValue": {
-            "name": "rho_omega",
-            "schema": "long"
+            "name": "fuddle_pi",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "rho_chi",
+            "name": "fuddle_xi",
             "schema": "duration"
           }
         }
@@ -1280,18 +1280,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_fuddle;1",
+        "@id": "dtmi:example:fuddle_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_um;1",
+          "@id": "dtmi:example:fuddle_tau;1",
           "@type": "Map",
           "mapValue": {
-            "name": "rho_humpf",
-            "schema": "string"
+            "name": "fuddle_upsilon",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "rho_wum",
+            "name": "fuddle_sigma",
             "schema": "duration"
           }
         }
@@ -1306,17 +1306,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_quan;1",
+        "@id": "dtmi:example:fuddle_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_nuh;1",
+          "@id": "dtmi:example:fuddle_psi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "rho_snee",
-            "schema": "time"
+            "name": "fuddle_omega",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "rho_glikk",
+            "name": "fuddle_chi",
             "schema": "dtmi:dtdl:instance:Schema:duration;3"
           }
         }
@@ -1331,18 +1331,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_zatz;1",
+        "@id": "dtmi:example:fuddle_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_spazz;1",
+          "@id": "dtmi:example:fuddle_um;1",
           "@type": "Map",
           "mapValue": {
-            "name": "rho_floob",
-            "schema": "boolean"
+            "name": "fuddle_humpf",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "rho_thnad",
+            "name": "fuddle_wum",
             "schema": "dtmi:dtdl:instance:Schema:duration;3"
           }
         }
@@ -1357,17 +1357,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_yekk;1",
+        "@id": "dtmi:example:fuddle_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_flunn;1",
+          "@id": "dtmi:example:fuddle_nuh;1",
           "@type": "Map",
           "mapValue": {
-            "name": "rho_itch",
-            "schema": "date"
+            "name": "fuddle_snee",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "rho_jogg",
+            "name": "fuddle_glikk",
             "schema": "float"
           }
         }
@@ -1382,18 +1382,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_beta;1",
+        "@id": "dtmi:example:fuddle_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_hi;1",
+          "@id": "dtmi:example:fuddle_spazz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "sigma_alpha",
-            "schema": "dateTime"
+            "name": "fuddle_floob",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "rho_vroo",
+            "name": "fuddle_thnad",
             "schema": "float"
           }
         }
@@ -1408,17 +1408,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_zeta;1",
+        "@id": "dtmi:example:fuddle_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_delta;1",
+          "@id": "dtmi:example:fuddle_flunn;1",
           "@type": "Map",
           "mapValue": {
-            "name": "sigma_epsilon",
-            "schema": "double"
+            "name": "fuddle_itch",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "sigma_gamma",
+            "name": "fuddle_jogg",
             "schema": "dtmi:dtdl:instance:Schema:float;3"
           }
         }
@@ -1433,18 +1433,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_kappa;1",
+        "@id": "dtmi:example:glikk_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_theta;1",
+          "@id": "dtmi:example:fuddle_hi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "sigma_iota",
-            "schema": "duration"
+            "name": "glikk_alpha",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "sigma_eta",
+            "name": "fuddle_vroo",
             "schema": "dtmi:dtdl:instance:Schema:float;3"
           }
         }
@@ -1459,17 +1459,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_xi;1",
+        "@id": "dtmi:example:glikk_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_mu;1",
+          "@id": "dtmi:example:glikk_delta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "sigma_nu",
-            "schema": "float"
+            "name": "glikk_epsilon",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "sigma_lambda",
+            "name": "glikk_gamma",
             "schema": "integer"
           }
         }
@@ -1484,18 +1484,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_sigma;1",
+        "@id": "dtmi:example:glikk_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_pi;1",
+          "@id": "dtmi:example:glikk_theta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "sigma_rho",
-            "schema": "integer"
+            "name": "glikk_iota",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "sigma_omicron",
+            "name": "glikk_eta",
             "schema": "integer"
           }
         }
@@ -1510,17 +1510,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_chi;1",
+        "@id": "dtmi:example:glikk_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_upsilon;1",
+          "@id": "dtmi:example:glikk_mu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "sigma_phi",
-            "schema": "long"
+            "name": "glikk_nu",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "sigma_tau",
+            "name": "glikk_lambda",
             "schema": "dtmi:dtdl:instance:Schema:integer;3"
           }
         }
@@ -1535,18 +1535,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_wum;1",
+        "@id": "dtmi:example:glikk_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_omega;1",
+          "@id": "dtmi:example:glikk_pi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "sigma_yuzz",
-            "schema": "string"
+            "name": "glikk_rho",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "sigma_psi",
+            "name": "glikk_omicron",
             "schema": "dtmi:dtdl:instance:Schema:integer;3"
           }
         }
@@ -1561,17 +1561,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_glikk;1",
+        "@id": "dtmi:example:glikk_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_humpf;1",
+          "@id": "dtmi:example:glikk_upsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "sigma_fuddle",
-            "schema": "time"
+            "name": "glikk_phi",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "sigma_um",
+            "name": "glikk_tau",
             "schema": "long"
           }
         }
@@ -1586,18 +1586,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_thnad;1",
+        "@id": "dtmi:example:glikk_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_snee;1",
+          "@id": "dtmi:example:glikk_omega;1",
           "@type": "Map",
           "mapValue": {
-            "name": "sigma_quan",
-            "schema": "boolean"
+            "name": "glikk_yuzz",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "sigma_nuh",
+            "name": "glikk_psi",
             "schema": "long"
           }
         }
@@ -1612,17 +1612,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_jogg;1",
+        "@id": "dtmi:example:glikk_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_floob;1",
+          "@id": "dtmi:example:glikk_humpf;1",
           "@type": "Map",
           "mapValue": {
-            "name": "sigma_zatz",
-            "schema": "date"
+            "name": "glikk_fuddle",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "sigma_spazz",
+            "name": "glikk_um",
             "schema": "dtmi:dtdl:instance:Schema:long;3"
           }
         }
@@ -1637,18 +1637,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_vroo;1",
+        "@id": "dtmi:example:glikk_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_itch;1",
+          "@id": "dtmi:example:glikk_snee;1",
           "@type": "Map",
           "mapValue": {
-            "name": "sigma_yekk",
-            "schema": "dateTime"
+            "name": "glikk_quan",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "sigma_flunn",
+            "name": "glikk_nuh",
             "schema": "dtmi:dtdl:instance:Schema:long;3"
           }
         }
@@ -1663,17 +1663,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_gamma;1",
+        "@id": "dtmi:example:glikk_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_alpha;1",
+          "@id": "dtmi:example:glikk_floob;1",
           "@type": "Map",
           "mapValue": {
-            "name": "tau_beta",
-            "schema": "double"
+            "name": "glikk_zatz",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "sigma_hi",
+            "name": "glikk_spazz",
             "schema": "time"
           }
         }
@@ -1688,18 +1688,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_eta;1",
+        "@id": "dtmi:example:glikk_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_epsilon;1",
+          "@id": "dtmi:example:glikk_itch;1",
           "@type": "Map",
           "mapValue": {
-            "name": "tau_zeta",
-            "schema": "duration"
+            "name": "glikk_yekk",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "tau_delta",
+            "name": "glikk_flunn",
             "schema": "time"
           }
         }
@@ -1714,17 +1714,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_lambda;1",
+        "@id": "dtmi:example:nuh_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_iota;1",
+          "@id": "dtmi:example:nuh_alpha;1",
           "@type": "Map",
           "mapValue": {
-            "name": "tau_kappa",
-            "schema": "float"
+            "name": "nuh_beta",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "tau_theta",
+            "name": "glikk_hi",
             "schema": "dtmi:dtdl:instance:Schema:time;3"
           }
         }
@@ -1739,18 +1739,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_omicron;1",
+        "@id": "dtmi:example:nuh_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_nu;1",
+          "@id": "dtmi:example:nuh_epsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "tau_xi",
-            "schema": "integer"
+            "name": "nuh_zeta",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "tau_mu",
+            "name": "nuh_delta",
             "schema": "dtmi:dtdl:instance:Schema:time;3"
           }
         }
@@ -1765,17 +1765,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_tau;1",
+        "@id": "dtmi:example:nuh_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_rho;1",
+          "@id": "dtmi:example:nuh_iota;1",
           "@type": "Map",
           "mapValue": {
-            "name": "tau_sigma",
-            "schema": "long"
+            "name": "nuh_kappa",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "tau_pi",
+            "name": "nuh_theta",
             "schema": "lineString"
           }
         }
@@ -1790,18 +1790,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_psi;1",
+        "@id": "dtmi:example:nuh_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_phi;1",
+          "@id": "dtmi:example:nuh_nu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "tau_chi",
-            "schema": "string"
+            "name": "nuh_xi",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "tau_upsilon",
+            "name": "nuh_mu",
             "schema": "lineString"
           }
         }
@@ -1816,17 +1816,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_um;1",
+        "@id": "dtmi:example:nuh_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_yuzz;1",
+          "@id": "dtmi:example:nuh_rho;1",
           "@type": "Map",
           "mapValue": {
-            "name": "tau_wum",
-            "schema": "time"
+            "name": "nuh_sigma",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "tau_omega",
+            "name": "nuh_pi",
             "schema": "dtmi:standard:schema:geospatial:lineString;3"
           }
         }
@@ -1841,18 +1841,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_nuh;1",
+        "@id": "dtmi:example:nuh_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_fuddle;1",
+          "@id": "dtmi:example:nuh_phi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "tau_glikk",
-            "schema": "boolean"
+            "name": "nuh_chi",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "tau_humpf",
+            "name": "nuh_upsilon",
             "schema": "dtmi:standard:schema:geospatial:lineString;3"
           }
         }
@@ -1867,17 +1867,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_spazz;1",
+        "@id": "dtmi:example:nuh_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_quan;1",
+          "@id": "dtmi:example:nuh_yuzz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "tau_thnad",
-            "schema": "date"
+            "name": "nuh_wum",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "tau_snee",
+            "name": "nuh_omega",
             "schema": "multiLineString"
           }
         }
@@ -1892,18 +1892,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_flunn;1",
+        "@id": "dtmi:example:nuh_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_zatz;1",
+          "@id": "dtmi:example:nuh_fuddle;1",
           "@type": "Map",
           "mapValue": {
-            "name": "tau_jogg",
-            "schema": "dateTime"
+            "name": "nuh_glikk",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "tau_floob",
+            "name": "nuh_humpf",
             "schema": "multiLineString"
           }
         }
@@ -1918,17 +1918,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_hi;1",
+        "@id": "dtmi:example:nuh_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_yekk;1",
+          "@id": "dtmi:example:nuh_quan;1",
           "@type": "Map",
           "mapValue": {
-            "name": "tau_vroo",
-            "schema": "double"
+            "name": "nuh_thnad",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "tau_itch",
+            "name": "nuh_snee",
             "schema": "dtmi:standard:schema:geospatial:multiLineString;3"
           }
         }
@@ -1943,18 +1943,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_delta;1",
+        "@id": "dtmi:example:nuh_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_beta;1",
+          "@id": "dtmi:example:nuh_zatz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "upsilon_gamma",
-            "schema": "duration"
+            "name": "nuh_jogg",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "upsilon_alpha",
+            "name": "nuh_floob",
             "schema": "dtmi:standard:schema:geospatial:multiLineString;3"
           }
         }
@@ -1969,17 +1969,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_theta;1",
+        "@id": "dtmi:example:nuh_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_zeta;1",
+          "@id": "dtmi:example:nuh_yekk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "upsilon_eta",
-            "schema": "float"
+            "name": "nuh_vroo",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "upsilon_epsilon",
+            "name": "nuh_itch",
             "schema": "multiPoint"
           }
         }
@@ -1994,18 +1994,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_mu;1",
+        "@id": "dtmi:example:snee_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_kappa;1",
+          "@id": "dtmi:example:snee_beta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "upsilon_lambda",
-            "schema": "integer"
+            "name": "snee_gamma",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "upsilon_iota",
+            "name": "snee_alpha",
             "schema": "multiPoint"
           }
         }
@@ -2020,17 +2020,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_pi;1",
+        "@id": "dtmi:example:snee_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_xi;1",
+          "@id": "dtmi:example:snee_zeta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "upsilon_omicron",
-            "schema": "long"
+            "name": "snee_eta",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "upsilon_nu",
+            "name": "snee_epsilon",
             "schema": "dtmi:standard:schema:geospatial:multiPoint;3"
           }
         }
@@ -2045,18 +2045,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_upsilon;1",
+        "@id": "dtmi:example:snee_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_sigma;1",
+          "@id": "dtmi:example:snee_kappa;1",
           "@type": "Map",
           "mapValue": {
-            "name": "upsilon_tau",
-            "schema": "string"
+            "name": "snee_lambda",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "upsilon_rho",
+            "name": "snee_iota",
             "schema": "dtmi:standard:schema:geospatial:multiPoint;3"
           }
         }
@@ -2071,17 +2071,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_omega;1",
+        "@id": "dtmi:example:snee_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_chi;1",
+          "@id": "dtmi:example:snee_xi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "upsilon_psi",
-            "schema": "time"
+            "name": "snee_omicron",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "upsilon_phi",
+            "name": "snee_nu",
             "schema": "multiPolygon"
           }
         }
@@ -2096,18 +2096,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_humpf;1",
+        "@id": "dtmi:example:snee_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_wum;1",
+          "@id": "dtmi:example:snee_sigma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "upsilon_um",
-            "schema": "boolean"
+            "name": "snee_tau",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "upsilon_yuzz",
+            "name": "snee_rho",
             "schema": "multiPolygon"
           }
         }
@@ -2122,17 +2122,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_snee;1",
+        "@id": "dtmi:example:snee_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_glikk;1",
+          "@id": "dtmi:example:snee_chi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "upsilon_nuh",
-            "schema": "date"
+            "name": "snee_psi",
+            "schema": "long"
           },
           "mapKey": {
-            "name": "upsilon_fuddle",
+            "name": "snee_phi",
             "schema": "dtmi:standard:schema:geospatial:multiPolygon;3"
           }
         }
@@ -2147,18 +2147,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_floob;1",
+        "@id": "dtmi:example:snee_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_thnad;1",
+          "@id": "dtmi:example:snee_wum;1",
           "@type": "Map",
           "mapValue": {
-            "name": "upsilon_spazz",
-            "schema": "dateTime"
+            "name": "snee_um",
+            "schema": "string"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "upsilon_quan",
+            "name": "snee_yuzz",
             "schema": "dtmi:standard:schema:geospatial:multiPolygon;3"
           }
         }
@@ -2173,17 +2173,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_itch;1",
+        "@id": "dtmi:example:snee_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_jogg;1",
+          "@id": "dtmi:example:snee_glikk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "upsilon_flunn",
-            "schema": "double"
+            "name": "snee_nuh",
+            "schema": "time"
           },
           "mapKey": {
-            "name": "upsilon_zatz",
+            "name": "snee_fuddle",
             "schema": "point"
           }
         }
@@ -2198,18 +2198,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_alpha;1",
+        "@id": "dtmi:example:snee_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_vroo;1",
+          "@id": "dtmi:example:snee_thnad;1",
           "@type": "Map",
           "mapValue": {
-            "name": "upsilon_hi",
-            "schema": "duration"
+            "name": "snee_spazz",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "upsilon_yekk",
+            "name": "snee_quan",
             "schema": "point"
           }
         }
@@ -2224,17 +2224,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_epsilon;1",
+        "@id": "dtmi:example:snee_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_gamma;1",
+          "@id": "dtmi:example:snee_jogg;1",
           "@type": "Map",
           "mapValue": {
-            "name": "phi_delta",
-            "schema": "float"
+            "name": "snee_flunn",
+            "schema": "date"
           },
           "mapKey": {
-            "name": "phi_beta",
+            "name": "snee_zatz",
             "schema": "dtmi:standard:schema:geospatial:point;3"
           }
         }
@@ -2249,18 +2249,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_iota;1",
+        "@id": "dtmi:example:quan_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_eta;1",
+          "@id": "dtmi:example:snee_vroo;1",
           "@type": "Map",
           "mapValue": {
-            "name": "phi_theta",
-            "schema": "integer"
+            "name": "snee_hi",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "phi_zeta",
+            "name": "snee_yekk",
             "schema": "dtmi:standard:schema:geospatial:point;3"
           }
         }
@@ -2275,17 +2275,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_nu;1",
+        "@id": "dtmi:example:quan_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_lambda;1",
+          "@id": "dtmi:example:quan_gamma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "phi_mu",
-            "schema": "long"
+            "name": "quan_delta",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "phi_kappa",
+            "name": "quan_beta",
             "schema": "polygon"
           }
         }
@@ -2300,18 +2300,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_rho;1",
+        "@id": "dtmi:example:quan_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_omicron;1",
+          "@id": "dtmi:example:quan_eta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "phi_pi",
-            "schema": "string"
+            "name": "quan_theta",
+            "schema": "duration"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "phi_xi",
+            "name": "quan_zeta",
             "schema": "polygon"
           }
         }
@@ -2326,17 +2326,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_phi;1",
+        "@id": "dtmi:example:quan_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_tau;1",
+          "@id": "dtmi:example:quan_lambda;1",
           "@type": "Map",
           "mapValue": {
-            "name": "phi_upsilon",
-            "schema": "time"
+            "name": "quan_mu",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "phi_sigma",
+            "name": "quan_kappa",
             "schema": "dtmi:standard:schema:geospatial:polygon;3"
           }
         }
@@ -2351,18 +2351,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_yuzz;1",
+        "@id": "dtmi:example:quan_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_psi;1",
+          "@id": "dtmi:example:quan_omicron;1",
           "@type": "Map",
           "mapValue": {
-            "name": "phi_omega",
-            "schema": "boolean"
+            "name": "quan_pi",
+            "schema": "integer"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "phi_chi",
+            "name": "quan_xi",
             "schema": "dtmi:standard:schema:geospatial:polygon;3"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyPropertySchemaTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyPropertySchemaTermAndDtmiV3.json
index 318e621c..3909c5d7 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyPropertySchemaTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyPropertySchemaTermAndDtmiV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_zeta;1",
+        "@id": "dtmi:example:quan_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_delta;1",
+          "@id": "dtmi:example:quan_flunn;1",
           "@type": "Map",
           "mapValue": {
-            "name": "chi_epsilon",
-            "schema": "integer"
+            "name": "quan_itch",
+            "schema": "dateTime"
           },
           "mapKey": {
-            "name": "chi_gamma",
+            "name": "quan_jogg",
             "schema": "string",
             "dtmi:dtdl:property:schema;3": "string"
           }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_kappa;1",
+        "@id": "dtmi:example:thnad_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_theta;1",
+          "@id": "dtmi:example:quan_hi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "chi_iota",
-            "schema": "long"
+            "name": "thnad_alpha",
+            "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "chi_eta",
+            "name": "quan_vroo",
             "schema": "string",
             "dtmi:dtdl:property:schema;3": "string"
           }
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyRequiredPropertiesV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyRequiredPropertiesV3.json
index 842bc870..056ccbfc 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyRequiredPropertiesV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyRequiredPropertiesV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_quan;1",
+        "@id": "dtmi:example:upsilon_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_nuh;1",
+          "@id": "dtmi:example:upsilon_psi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "theta_snee",
-            "schema": "boolean"
+            "name": "upsilon_omega",
+            "schema": "integer"
           },
           "mapKey": {
             "schema": "string"
@@ -31,14 +31,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_floob;1",
+        "@id": "dtmi:example:upsilon_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_thnad;1",
+          "@id": "dtmi:example:upsilon_wum;1",
           "@type": "Map",
           "mapValue": {
-            "name": "theta_spazz",
-            "schema": "date"
+            "name": "upsilon_um",
+            "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -56,17 +56,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_itch;1",
+        "@id": "dtmi:example:upsilon_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_jogg;1",
+          "@id": "dtmi:example:upsilon_glikk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "theta_flunn",
-            "schema": "dateTime"
+            "name": "upsilon_nuh",
+            "schema": "string"
           },
           "mapKey": {
-            "name": "theta_zatz"
+            "name": "upsilon_fuddle"
           }
         }
       }
@@ -80,18 +80,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_alpha;1",
+        "@id": "dtmi:example:upsilon_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_vroo;1",
+          "@id": "dtmi:example:upsilon_thnad;1",
           "@type": "Map",
           "mapValue": {
-            "name": "theta_hi",
-            "schema": "double"
+            "name": "upsilon_spazz",
+            "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "theta_yekk"
+            "name": "upsilon_quan"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyTypeIncludesInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyTypeIncludesInvalidDtmiV3.json
index 030edd41..38436c92 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyTypeIncludesInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyTypeIncludesInvalidDtmiV3.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_lambda;1",
+        "@id": "dtmi:example:flunn_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_iota;1",
+          "@id": "dtmi:example:flunn_iota;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_kappa",
-            "schema": "date"
+            "name": "flunn_kappa",
+            "schema": "time"
           },
           "mapKey": {
             "@type": [
               "MapKey",
               "dtmi:foo//bar"
             ],
-            "name": "um_theta",
+            "name": "flunn_theta",
             "schema": "string"
           }
         }
@@ -36,14 +36,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_omicron;1",
+        "@id": "dtmi:example:flunn_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_nu;1",
+          "@id": "dtmi:example:flunn_nu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_xi",
-            "schema": "dateTime"
+            "name": "flunn_xi",
+            "schema": "boolean"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -51,7 +51,7 @@
               "MapKey",
               "dtmi:foo//bar"
             ],
-            "name": "um_mu",
+            "name": "flunn_mu",
             "schema": "string"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyTypeIncludesMaterialV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyTypeIncludesMaterialV3.json
index 305a50c7..d5ee9024 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyTypeIncludesMaterialV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyTypeIncludesMaterialV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_fuddle;1",
+        "@id": "dtmi:example:zatz_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_um;1",
+          "@id": "dtmi:example:zatz_um;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_humpf",
-            "schema": "duration"
+            "name": "zatz_humpf",
+            "schema": "dateTime"
           },
           "mapKey": {
-            "name": "yuzz_wum",
+            "name": "zatz_wum",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -33,17 +33,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_quan;1",
+        "@id": "dtmi:example:zatz_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_nuh;1",
+          "@id": "dtmi:example:zatz_nuh;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_snee",
-            "schema": "float"
+            "name": "zatz_snee",
+            "schema": "double"
           },
           "mapKey": {
-            "name": "yuzz_glikk",
+            "name": "zatz_glikk",
             "schema": "string",
             "@type": [
               "MapKey"
@@ -61,17 +61,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_zatz;1",
+        "@id": "dtmi:example:zatz_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_spazz;1",
+          "@id": "dtmi:example:zatz_spazz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_floob",
-            "schema": "integer"
+            "name": "zatz_floob",
+            "schema": "duration"
           },
           "mapKey": {
-            "name": "yuzz_thnad",
+            "name": "zatz_thnad",
             "schema": "string",
             "@type": "dtmi:dtdl:class:MapKey;3"
           }
@@ -87,17 +87,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_yekk;1",
+        "@id": "dtmi:example:zatz_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_flunn;1",
+          "@id": "dtmi:example:zatz_flunn;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_itch",
-            "schema": "long"
+            "name": "zatz_itch",
+            "schema": "float"
           },
           "mapKey": {
-            "name": "yuzz_jogg",
+            "name": "zatz_jogg",
             "schema": "string",
             "@type": [
               "dtmi:dtdl:class:MapKey;3"
@@ -115,17 +115,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_beta;1",
+        "@id": "dtmi:example:jogg_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_hi;1",
+          "@id": "dtmi:example:zatz_hi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_alpha",
-            "schema": "string"
+            "name": "jogg_alpha",
+            "schema": "integer"
           },
           "mapKey": {
-            "name": "yuzz_vroo",
+            "name": "zatz_vroo",
             "schema": "string",
             "@type": "Something"
           }
@@ -141,18 +141,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_zeta;1",
+        "@id": "dtmi:example:jogg_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_delta;1",
+          "@id": "dtmi:example:jogg_delta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_epsilon",
-            "schema": "time"
+            "name": "jogg_epsilon",
+            "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "wum_gamma",
+            "name": "jogg_gamma",
             "schema": "string",
             "@type": "Something"
           }
@@ -168,17 +168,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_kappa;1",
+        "@id": "dtmi:example:jogg_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_theta;1",
+          "@id": "dtmi:example:jogg_theta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_iota",
-            "schema": "boolean"
+            "name": "jogg_iota",
+            "schema": "string"
           },
           "mapKey": {
-            "name": "wum_eta",
+            "name": "jogg_eta",
             "schema": "string",
             "@type": [
               "Something"
@@ -196,18 +196,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_xi;1",
+        "@id": "dtmi:example:jogg_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_mu;1",
+          "@id": "dtmi:example:jogg_mu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_nu",
-            "schema": "date"
+            "name": "jogg_nu",
+            "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "wum_lambda",
+            "name": "jogg_lambda",
             "schema": "string",
             "@type": [
               "Something"
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyTypeIncludesNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyTypeIncludesNotDtmiNorTermV3.json
index 5403dc88..b55e2e86 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyTypeIncludesNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyTypeIncludesNotDtmiNorTermV3.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_tau;1",
+        "@id": "dtmi:example:flunn_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_rho;1",
+          "@id": "dtmi:example:flunn_rho;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_sigma",
-            "schema": "double"
+            "name": "flunn_sigma",
+            "schema": "date"
           },
           "mapKey": {
             "@type": [
               "MapKey",
               "http://foo.com/bar"
             ],
-            "name": "um_pi",
+            "name": "flunn_pi",
             "schema": "string"
           }
         }
@@ -36,14 +36,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_psi;1",
+        "@id": "dtmi:example:flunn_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_phi;1",
+          "@id": "dtmi:example:flunn_phi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_chi",
-            "schema": "duration"
+            "name": "flunn_chi",
+            "schema": "dateTime"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
@@ -51,7 +51,7 @@
               "MapKey",
               "http://foo.com/bar"
             ],
-            "name": "um_upsilon",
+            "name": "flunn_upsilon",
             "schema": "string"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapKeyTypeStringOrArrayV3.json b/DTDL/v3/spec/Requirement-ClassMapKeyTypeStringOrArrayV3.json
index 7dca31f4..783160dc 100644
--- a/DTDL/v3/spec/Requirement-ClassMapKeyTypeStringOrArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapKeyTypeStringOrArrayV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_theta;1",
+        "@id": "dtmi:example:floob_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_zeta;1",
+          "@id": "dtmi:example:floob_zeta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_eta",
-            "schema": "string"
+            "name": "floob_eta",
+            "schema": "integer"
           },
           "mapKey": {
-            "name": "omega_epsilon",
+            "name": "floob_epsilon",
             "schema": "string",
             "@type": 626
           }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_mu;1",
+        "@id": "dtmi:example:floob_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_kappa;1",
+          "@id": "dtmi:example:floob_kappa;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_lambda",
-            "schema": "time"
+            "name": "floob_lambda",
+            "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omega_iota",
+            "name": "floob_iota",
             "schema": "string",
             "@type": 626
           }
@@ -60,17 +60,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_pi;1",
+        "@id": "dtmi:example:floob_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_xi;1",
+          "@id": "dtmi:example:floob_xi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_omicron",
-            "schema": "boolean"
+            "name": "floob_omicron",
+            "schema": "string"
           },
           "mapKey": {
-            "name": "omega_nu",
+            "name": "floob_nu",
             "schema": "string",
             "@type": null
           }
@@ -86,18 +86,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_upsilon;1",
+        "@id": "dtmi:example:floob_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_sigma;1",
+          "@id": "dtmi:example:floob_sigma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_tau",
-            "schema": "date"
+            "name": "floob_tau",
+            "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omega_rho",
+            "name": "floob_rho",
             "schema": "string",
             "@type": null
           }
@@ -113,17 +113,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_omega;1",
+        "@id": "dtmi:example:floob_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_chi;1",
+          "@id": "dtmi:example:floob_chi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_psi",
-            "schema": "dateTime"
+            "name": "floob_psi",
+            "schema": "boolean"
           },
           "mapKey": {
-            "name": "omega_phi",
+            "name": "floob_phi",
             "schema": "string",
             "@type": true
           }
@@ -139,18 +139,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_humpf;1",
+        "@id": "dtmi:example:floob_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_wum;1",
+          "@id": "dtmi:example:floob_wum;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_um",
-            "schema": "double"
+            "name": "floob_um",
+            "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omega_yuzz",
+            "name": "floob_yuzz",
             "schema": "string",
             "@type": true
           }
@@ -166,17 +166,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_snee;1",
+        "@id": "dtmi:example:floob_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_glikk;1",
+          "@id": "dtmi:example:floob_glikk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_nuh",
-            "schema": "duration"
+            "name": "floob_nuh",
+            "schema": "dateTime"
           },
           "mapKey": {
-            "name": "omega_fuddle",
+            "name": "floob_fuddle",
             "schema": "string",
             "@type": {}
           }
@@ -192,18 +192,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_floob;1",
+        "@id": "dtmi:example:floob_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_thnad;1",
+          "@id": "dtmi:example:floob_thnad;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_spazz",
-            "schema": "float"
+            "name": "floob_spazz",
+            "schema": "double"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omega_quan",
+            "name": "floob_quan",
             "schema": "string",
             "@type": {}
           }
@@ -219,17 +219,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_itch;1",
+        "@id": "dtmi:example:floob_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_jogg;1",
+          "@id": "dtmi:example:floob_jogg;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_flunn",
-            "schema": "integer"
+            "name": "floob_flunn",
+            "schema": "duration"
           },
           "mapKey": {
-            "name": "omega_zatz",
+            "name": "floob_zatz",
             "schema": "string",
             "@type": [
               626
@@ -247,18 +247,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_alpha;1",
+        "@id": "dtmi:example:zatz_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_vroo;1",
+          "@id": "dtmi:example:floob_vroo;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_hi",
-            "schema": "long"
+            "name": "floob_hi",
+            "schema": "float"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omega_yekk",
+            "name": "floob_yekk",
             "schema": "string",
             "@type": [
               626
@@ -276,17 +276,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_epsilon;1",
+        "@id": "dtmi:example:zatz_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_gamma;1",
+          "@id": "dtmi:example:zatz_gamma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_delta",
-            "schema": "string"
+            "name": "zatz_delta",
+            "schema": "integer"
           },
           "mapKey": {
-            "name": "yuzz_beta",
+            "name": "zatz_beta",
             "schema": "string",
             "@type": [
               null
@@ -304,18 +304,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_iota;1",
+        "@id": "dtmi:example:zatz_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_eta;1",
+          "@id": "dtmi:example:zatz_eta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_theta",
-            "schema": "time"
+            "name": "zatz_theta",
+            "schema": "long"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yuzz_zeta",
+            "name": "zatz_zeta",
             "schema": "string",
             "@type": [
               null
@@ -333,17 +333,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_nu;1",
+        "@id": "dtmi:example:zatz_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_lambda;1",
+          "@id": "dtmi:example:zatz_lambda;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_mu",
-            "schema": "boolean"
+            "name": "zatz_mu",
+            "schema": "string"
           },
           "mapKey": {
-            "name": "yuzz_kappa",
+            "name": "zatz_kappa",
             "schema": "string",
             "@type": [
               true
@@ -361,18 +361,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_rho;1",
+        "@id": "dtmi:example:zatz_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_omicron;1",
+          "@id": "dtmi:example:zatz_omicron;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_pi",
-            "schema": "date"
+            "name": "zatz_pi",
+            "schema": "time"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yuzz_xi",
+            "name": "zatz_xi",
             "schema": "string",
             "@type": [
               true
@@ -390,17 +390,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_phi;1",
+        "@id": "dtmi:example:zatz_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_tau;1",
+          "@id": "dtmi:example:zatz_tau;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_upsilon",
-            "schema": "dateTime"
+            "name": "zatz_upsilon",
+            "schema": "boolean"
           },
           "mapKey": {
-            "name": "yuzz_sigma",
+            "name": "zatz_sigma",
             "schema": "string",
             "@type": [
               {}
@@ -418,18 +418,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_yuzz;1",
+        "@id": "dtmi:example:zatz_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_psi;1",
+          "@id": "dtmi:example:zatz_psi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_omega",
-            "schema": "double"
+            "name": "zatz_omega",
+            "schema": "date"
           },
           "mapKey": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "yuzz_chi",
+            "name": "zatz_chi",
             "schema": "string",
             "@type": [
               {}
diff --git a/DTDL/v3/spec/Requirement-ClassMapPropertiesElementSchemaSchemaMaxDepthV3.json b/DTDL/v3/spec/Requirement-ClassMapPropertiesElementSchemaSchemaMaxDepthV3.json
index 0a5ef5a0..fecac172 100644
--- a/DTDL/v3/spec/Requirement-ClassMapPropertiesElementSchemaSchemaMaxDepthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapPropertiesElementSchemaSchemaMaxDepthV3.json
@@ -7,51 +7,51 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_omicron;1",
+        "@id": "dtmi:example:quan_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "tau_xi",
+          "name": "quan_theta",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "tau_nu",
+              "name": "quan_eta",
               "schema": "string"
             },
             "mapValue": {
-              "name": "tau_mu",
+              "name": "quan_zeta",
               "schema": {
                 "@type": "Map",
                 "mapKey": {
-                  "name": "tau_lambda",
+                  "name": "quan_epsilon",
                   "schema": "string"
                 },
                 "mapValue": {
-                  "name": "tau_kappa",
+                  "name": "quan_delta",
                   "schema": {
                     "@type": "Map",
                     "mapKey": {
-                      "name": "tau_iota",
+                      "name": "quan_gamma",
                       "schema": "string"
                     },
                     "mapValue": {
-                      "name": "tau_theta",
+                      "name": "quan_beta",
                       "schema": {
                         "@type": "Map",
                         "mapKey": {
-                          "name": "tau_eta",
+                          "name": "quan_alpha",
                           "schema": "string"
                         },
                         "mapValue": {
-                          "name": "tau_zeta",
+                          "name": "snee_hi",
                           "schema": {
                             "@type": "Map",
                             "mapKey": {
-                              "name": "tau_delta",
+                              "name": "snee_yekk",
                               "schema": "string"
                             },
                             "mapValue": {
-                              "name": "tau_epsilon",
+                              "name": "snee_vroo",
                               "schema": "double"
                             }
                           }
@@ -75,59 +75,59 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_fuddle;1",
+        "@id": "dtmi:example:quan_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "tau_humpf",
+          "name": "quan_chi",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "tau_um",
+              "name": "quan_phi",
               "schema": "string"
             },
             "mapValue": {
-              "name": "tau_wum",
+              "name": "quan_upsilon",
               "schema": {
                 "@type": "Map",
                 "mapKey": {
-                  "name": "tau_yuzz",
+                  "name": "quan_tau",
                   "schema": "string"
                 },
                 "mapValue": {
-                  "name": "tau_omega",
+                  "name": "quan_sigma",
                   "schema": {
                     "@type": "Map",
                     "mapKey": {
-                      "name": "tau_psi",
+                      "name": "quan_rho",
                       "schema": "string"
                     },
                     "mapValue": {
-                      "name": "tau_chi",
+                      "name": "quan_pi",
                       "schema": {
                         "@type": "Map",
                         "mapKey": {
-                          "name": "tau_phi",
+                          "name": "quan_omicron",
                           "schema": "string"
                         },
                         "mapValue": {
-                          "name": "tau_upsilon",
+                          "name": "quan_xi",
                           "schema": {
                             "@type": "Map",
                             "mapKey": {
-                              "name": "tau_tau",
+                              "name": "quan_nu",
                               "schema": "string"
                             },
                             "mapValue": {
-                              "name": "tau_sigma",
+                              "name": "quan_mu",
                               "schema": {
                                 "@type": "Map",
                                 "mapKey": {
-                                  "name": "tau_pi",
+                                  "name": "quan_kappa",
                                   "schema": "string"
                                 },
                                 "mapValue": {
-                                  "name": "tau_rho",
+                                  "name": "quan_lambda",
                                   "schema": "duration"
                                 }
                               }
@@ -153,60 +153,60 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_hi;1",
+        "@id": "dtmi:example:quan_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "tau_vroo",
+          "name": "quan_floob",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Map",
             "mapKey": {
-              "name": "tau_yekk",
+              "name": "quan_spazz",
               "schema": "string"
             },
             "mapValue": {
-              "name": "tau_itch",
+              "name": "quan_thnad",
               "schema": {
                 "@type": "Map",
                 "mapKey": {
-                  "name": "tau_flunn",
+                  "name": "quan_quan",
                   "schema": "string"
                 },
                 "mapValue": {
-                  "name": "tau_jogg",
+                  "name": "quan_snee",
                   "schema": {
                     "@type": "Map",
                     "mapKey": {
-                      "name": "tau_zatz",
+                      "name": "quan_nuh",
                       "schema": "string"
                     },
                     "mapValue": {
-                      "name": "tau_floob",
+                      "name": "quan_glikk",
                       "schema": {
                         "@type": "Map",
                         "mapKey": {
-                          "name": "tau_spazz",
+                          "name": "quan_fuddle",
                           "schema": "string"
                         },
                         "mapValue": {
-                          "name": "tau_thnad",
+                          "name": "quan_humpf",
                           "schema": {
                             "@type": "Map",
                             "mapKey": {
-                              "name": "tau_quan",
+                              "name": "quan_um",
                               "schema": "string"
                             },
                             "mapValue": {
-                              "name": "tau_snee",
+                              "name": "quan_wum",
                               "schema": {
                                 "@type": "Map",
                                 "mapKey": {
-                                  "name": "tau_glikk",
+                                  "name": "quan_omega",
                                   "schema": "string"
                                 },
                                 "mapValue": {
-                                  "name": "tau_nuh",
+                                  "name": "quan_yuzz",
                                   "schema": "float"
                                 }
                               }
diff --git a/DTDL/v3/spec/Requirement-ClassMapPropertiesElementSchemaSchemaSelfReferenceV3.json b/DTDL/v3/spec/Requirement-ClassMapPropertiesElementSchemaSchemaSelfReferenceV3.json
new file mode 100644
index 00000000..f361fc79
--- /dev/null
+++ b/DTDL/v3/spec/Requirement-ClassMapPropertiesElementSchemaSchemaSelfReferenceV3.json
@@ -0,0 +1,61 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:quan_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "quan_itch",
+          "schema": {
+            "@id": "dtmi:foo:delta_beta;1",
+            "@type": "Map",
+            "mapKey": {
+              "name": "quan_flunn",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "quan_jogg",
+              "schema": "dtmi:foo:delta_beta;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:thnad_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "thnad_alpha",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:delta_beta;1",
+            "@type": "Map",
+            "mapKey": {
+              "name": "quan_hi",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "quan_vroo",
+              "schema": "dtmi:foo:delta_beta;1"
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v3/spec/Requirement-ClassMapPropertyCommentStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassMapPropertyCommentStringLengthV3.json
index e2a77370..e41eb890 100644
--- a/DTDL/v3/spec/Requirement-ClassMapPropertyCommentStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapPropertyCommentStringLengthV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_pi;1",
+        "@id": "dtmi:example:lambda_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_nu;1",
+          "@id": "dtmi:example:lambda_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "vroo_xi",
+            "name": "lambda_zeta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "vroo_omicron",
-            "schema": "duration"
+            "name": "lambda_eta",
+            "schema": "boolean"
           },
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_upsilon;1",
+        "@id": "dtmi:example:lambda_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_rho;1",
+          "@id": "dtmi:example:lambda_iota;1",
           "@type": "Map",
           "mapKey": {
-            "name": "vroo_sigma",
+            "name": "lambda_kappa",
             "schema": "string"
           },
           "mapValue": {
-            "name": "vroo_tau",
-            "schema": "float"
+            "name": "lambda_lambda",
+            "schema": "date"
           },
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
@@ -59,19 +59,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_omega;1",
+        "@id": "dtmi:example:lambda_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:vroo_phi;1",
+          "@id": "dtmi:example:lambda_nu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "vroo_chi",
+            "name": "lambda_xi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "vroo_psi",
-            "schema": "integer"
+            "name": "lambda_omicron",
+            "schema": "dateTime"
           },
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapPropertyCommentStringV3.json b/DTDL/v3/spec/Requirement-ClassMapPropertyCommentStringV3.json
index 98f5b7ac..99e3db88 100644
--- a/DTDL/v3/spec/Requirement-ClassMapPropertyCommentStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapPropertyCommentStringV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_sigma;1",
+        "@id": "dtmi:example:iota_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_omicron;1",
+          "@id": "dtmi:example:iota_eta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "itch_pi",
+            "name": "iota_theta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "itch_rho",
-            "schema": "double"
+            "name": "iota_iota",
+            "schema": "time"
           },
           "comment": "hello"
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_chi;1",
+        "@id": "dtmi:example:iota_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_tau;1",
+          "@id": "dtmi:example:iota_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "itch_upsilon",
+            "name": "iota_mu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "itch_phi",
-            "schema": "duration"
+            "name": "iota_nu",
+            "schema": "boolean"
           },
           "comment": [
             "hello"
@@ -61,18 +61,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_wum;1",
+        "@id": "dtmi:example:iota_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_psi;1",
+          "@id": "dtmi:example:iota_omicron;1",
           "@type": "Map",
           "mapKey": {
-            "name": "itch_omega",
+            "name": "iota_pi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "itch_yuzz",
-            "schema": "float"
+            "name": "iota_rho",
+            "schema": "date"
           },
           "comment": {
             "@value": "hello",
@@ -90,18 +90,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_glikk;1",
+        "@id": "dtmi:example:iota_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_um;1",
+          "@id": "dtmi:example:iota_tau;1",
           "@type": "Map",
           "mapKey": {
-            "name": "itch_humpf",
+            "name": "iota_upsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "itch_fuddle",
-            "schema": "integer"
+            "name": "iota_phi",
+            "schema": "dateTime"
           },
           "comment": [
             {
@@ -121,18 +121,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_thnad;1",
+        "@id": "dtmi:example:iota_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_nuh;1",
+          "@id": "dtmi:example:iota_psi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "itch_snee",
+            "name": "iota_omega",
             "schema": "string"
           },
           "mapValue": {
-            "name": "itch_quan",
-            "schema": "long"
+            "name": "iota_yuzz",
+            "schema": "double"
           },
           "comment": []
         }
@@ -147,18 +147,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_jogg;1",
+        "@id": "dtmi:example:iota_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_spazz;1",
+          "@id": "dtmi:example:iota_um;1",
           "@type": "Map",
           "mapKey": {
-            "name": "itch_floob",
+            "name": "iota_humpf",
             "schema": "string"
           },
           "mapValue": {
-            "name": "itch_zatz",
-            "schema": "string"
+            "name": "iota_fuddle",
+            "schema": "duration"
           },
           "comment": null
         }
@@ -173,19 +173,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_vroo;1",
+        "@id": "dtmi:example:iota_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:itch_flunn;1",
+          "@id": "dtmi:example:iota_nuh;1",
           "@type": "Map",
           "mapKey": {
-            "name": "itch_itch",
+            "name": "iota_snee",
             "schema": "string"
           },
           "mapValue": {
-            "name": "itch_yekk",
-            "schema": "time"
+            "name": "iota_quan",
+            "schema": "float"
           },
           "comment": null
         }
@@ -200,18 +200,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_gamma;1",
+        "@id": "dtmi:example:iota_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_hi;1",
+          "@id": "dtmi:example:iota_spazz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yekk_alpha",
+            "name": "iota_floob",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yekk_beta",
-            "schema": "boolean"
+            "name": "iota_zatz",
+            "schema": "integer"
           },
           "comment": true
         }
@@ -226,19 +226,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_eta;1",
+        "@id": "dtmi:example:iota_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yekk_delta;1",
+          "@id": "dtmi:example:iota_flunn;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yekk_epsilon",
+            "name": "iota_itch",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yekk_zeta",
-            "schema": "date"
+            "name": "iota_yekk",
+            "schema": "long"
           },
           "comment": true
         }
@@ -253,18 +253,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_lambda;1",
+        "@id": "dtmi:example:kappa_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_theta;1",
+          "@id": "dtmi:example:iota_hi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yekk_iota",
+            "name": "kappa_alpha",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yekk_kappa",
-            "schema": "dateTime"
+            "name": "kappa_beta",
+            "schema": "string"
           },
           "comment": 626
         }
@@ -279,19 +279,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_omicron;1",
+        "@id": "dtmi:example:kappa_eta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yekk_mu;1",
+          "@id": "dtmi:example:kappa_delta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yekk_nu",
+            "name": "kappa_epsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yekk_xi",
-            "schema": "double"
+            "name": "kappa_zeta",
+            "schema": "time"
           },
           "comment": 626
         }
@@ -306,18 +306,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_tau;1",
+        "@id": "dtmi:example:kappa_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_pi;1",
+          "@id": "dtmi:example:kappa_theta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yekk_rho",
+            "name": "kappa_iota",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yekk_sigma",
-            "schema": "duration"
+            "name": "kappa_kappa",
+            "schema": "boolean"
           },
           "comment": [
             null
@@ -334,19 +334,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_psi;1",
+        "@id": "dtmi:example:kappa_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yekk_upsilon;1",
+          "@id": "dtmi:example:kappa_mu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yekk_phi",
+            "name": "kappa_nu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yekk_chi",
-            "schema": "float"
+            "name": "kappa_xi",
+            "schema": "date"
           },
           "comment": [
             null
@@ -363,18 +363,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_um;1",
+        "@id": "dtmi:example:kappa_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_omega;1",
+          "@id": "dtmi:example:kappa_pi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yekk_yuzz",
+            "name": "kappa_rho",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yekk_wum",
-            "schema": "integer"
+            "name": "kappa_sigma",
+            "schema": "dateTime"
           },
           "comment": [
             true
@@ -391,19 +391,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_nuh;1",
+        "@id": "dtmi:example:kappa_psi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yekk_humpf;1",
+          "@id": "dtmi:example:kappa_upsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yekk_fuddle",
+            "name": "kappa_phi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yekk_glikk",
-            "schema": "long"
+            "name": "kappa_chi",
+            "schema": "double"
           },
           "comment": [
             true
@@ -420,18 +420,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_spazz;1",
+        "@id": "dtmi:example:kappa_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_snee;1",
+          "@id": "dtmi:example:kappa_omega;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yekk_quan",
+            "name": "kappa_yuzz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yekk_thnad",
-            "schema": "string"
+            "name": "kappa_wum",
+            "schema": "duration"
           },
           "comment": [
             626
@@ -448,19 +448,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_flunn;1",
+        "@id": "dtmi:example:kappa_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yekk_floob;1",
+          "@id": "dtmi:example:kappa_humpf;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yekk_zatz",
+            "name": "kappa_fuddle",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yekk_jogg",
-            "schema": "time"
+            "name": "kappa_glikk",
+            "schema": "float"
           },
           "comment": [
             626
@@ -477,18 +477,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_hi;1",
+        "@id": "dtmi:example:kappa_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_itch;1",
+          "@id": "dtmi:example:kappa_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yekk_yekk",
+            "name": "kappa_quan",
             "schema": "string"
           },
           "mapValue": {
-            "name": "yekk_vroo",
-            "schema": "boolean"
+            "name": "kappa_thnad",
+            "schema": "integer"
           },
           "comment": {}
         }
@@ -503,19 +503,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_delta;1",
+        "@id": "dtmi:example:kappa_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:vroo_alpha;1",
+          "@id": "dtmi:example:kappa_floob;1",
           "@type": "Map",
           "mapKey": {
-            "name": "vroo_beta",
+            "name": "kappa_zatz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "vroo_gamma",
-            "schema": "date"
+            "name": "kappa_jogg",
+            "schema": "long"
           },
           "comment": {}
         }
@@ -530,18 +530,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_theta;1",
+        "@id": "dtmi:example:kappa_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_epsilon;1",
+          "@id": "dtmi:example:kappa_itch;1",
           "@type": "Map",
           "mapKey": {
-            "name": "vroo_zeta",
+            "name": "kappa_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "vroo_eta",
-            "schema": "dateTime"
+            "name": "kappa_vroo",
+            "schema": "string"
           },
           "comment": [
             {}
@@ -558,19 +558,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_mu;1",
+        "@id": "dtmi:example:lambda_delta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:vroo_iota;1",
+          "@id": "dtmi:example:lambda_alpha;1",
           "@type": "Map",
           "mapKey": {
-            "name": "vroo_kappa",
+            "name": "lambda_beta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "vroo_lambda",
-            "schema": "double"
+            "name": "lambda_gamma",
+            "schema": "time"
           },
           "comment": [
             {}
diff --git a/DTDL/v3/spec/Requirement-ClassMapPropertyCommentTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassMapPropertyCommentTermAndDtmiV3.json
index ae953d4b..4e639043 100644
--- a/DTDL/v3/spec/Requirement-ClassMapPropertyCommentTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapPropertyCommentTermAndDtmiV3.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_beta;1",
+        "@id": "dtmi:example:lambda_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:vroo_itch;1",
+          "@id": "dtmi:example:lambda_snee;1",
           "@type": "Map",
-          "comment": "vroo_yekk",
-          "dtmi:dtdl:property:comment;3": "vroo_vroo",
+          "comment": "lambda_quan",
+          "dtmi:dtdl:property:comment;3": "lambda_thnad",
           "mapKey": {
-            "name": "vroo_hi",
+            "name": "lambda_spazz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "hi_alpha",
-            "schema": "boolean"
+            "name": "lambda_floob",
+            "schema": "integer"
           }
         }
       }
@@ -34,21 +34,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_theta;1",
+        "@id": "dtmi:example:lambda_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:hi_gamma;1",
+          "@id": "dtmi:example:lambda_jogg;1",
           "@type": "Map",
-          "comment": "hi_delta",
-          "dtmi:dtdl:property:comment;3": "hi_epsilon",
+          "comment": "lambda_flunn",
+          "dtmi:dtdl:property:comment;3": "lambda_itch",
           "mapKey": {
-            "name": "hi_zeta",
+            "name": "lambda_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "hi_eta",
-            "schema": "date"
+            "name": "lambda_vroo",
+            "schema": "long"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassMapPropertyDescriptionLangStringV3.json b/DTDL/v3/spec/Requirement-ClassMapPropertyDescriptionLangStringV3.json
index 3243e0ac..fde5f72c 100644
--- a/DTDL/v3/spec/Requirement-ClassMapPropertyDescriptionLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapPropertyDescriptionLangStringV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_mu;1",
+        "@id": "dtmi:example:mu_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_iota;1",
+          "@id": "dtmi:example:mu_alpha;1",
           "@type": "Map",
           "mapKey": {
-            "name": "hi_kappa",
+            "name": "mu_beta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "hi_lambda",
-            "schema": "dateTime"
+            "name": "mu_gamma",
+            "schema": "string"
           },
           "description": "hello"
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_pi;1",
+        "@id": "dtmi:example:mu_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_nu;1",
+          "@id": "dtmi:example:mu_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "hi_xi",
+            "name": "mu_zeta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "hi_omicron",
-            "schema": "double"
+            "name": "mu_eta",
+            "schema": "time"
           },
           "description": [
             "hello"
@@ -61,18 +61,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_upsilon;1",
+        "@id": "dtmi:example:mu_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_rho;1",
+          "@id": "dtmi:example:mu_iota;1",
           "@type": "Map",
           "mapKey": {
-            "name": "hi_sigma",
+            "name": "mu_kappa",
             "schema": "string"
           },
           "mapValue": {
-            "name": "hi_tau",
-            "schema": "duration"
+            "name": "mu_lambda",
+            "schema": "boolean"
           },
           "description": {
             "en": "hello"
@@ -89,18 +89,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_omega;1",
+        "@id": "dtmi:example:mu_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_phi;1",
+          "@id": "dtmi:example:mu_nu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "hi_chi",
+            "name": "mu_xi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "hi_psi",
-            "schema": "float"
+            "name": "mu_omicron",
+            "schema": "date"
           },
           "description": [
             {
@@ -120,18 +120,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_humpf;1",
+        "@id": "dtmi:example:mu_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_yuzz;1",
+          "@id": "dtmi:example:mu_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "hi_wum",
+            "name": "mu_sigma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "hi_um",
-            "schema": "integer"
+            "name": "mu_tau",
+            "schema": "dateTime"
           },
           "description": {}
         }
@@ -146,18 +146,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_snee;1",
+        "@id": "dtmi:example:mu_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_fuddle;1",
+          "@id": "dtmi:example:mu_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "hi_glikk",
+            "name": "mu_chi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "hi_nuh",
-            "schema": "long"
+            "name": "mu_psi",
+            "schema": "double"
           },
           "description": []
         }
@@ -172,18 +172,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_floob;1",
+        "@id": "dtmi:example:mu_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_quan;1",
+          "@id": "dtmi:example:mu_yuzz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "hi_thnad",
+            "name": "mu_wum",
             "schema": "string"
           },
           "mapValue": {
-            "name": "hi_spazz",
-            "schema": "string"
+            "name": "mu_um",
+            "schema": "duration"
           },
           "description": null
         }
@@ -198,19 +198,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_itch;1",
+        "@id": "dtmi:example:mu_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:hi_zatz;1",
+          "@id": "dtmi:example:mu_fuddle;1",
           "@type": "Map",
           "mapKey": {
-            "name": "hi_jogg",
+            "name": "mu_glikk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "hi_flunn",
-            "schema": "time"
+            "name": "mu_nuh",
+            "schema": "float"
           },
           "description": null
         }
@@ -225,18 +225,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_alpha;1",
+        "@id": "dtmi:example:mu_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_yekk;1",
+          "@id": "dtmi:example:mu_quan;1",
           "@type": "Map",
           "mapKey": {
-            "name": "hi_vroo",
+            "name": "mu_thnad",
             "schema": "string"
           },
           "mapValue": {
-            "name": "hi_hi",
-            "schema": "boolean"
+            "name": "mu_spazz",
+            "schema": "integer"
           },
           "description": true
         }
@@ -251,19 +251,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_epsilon;1",
+        "@id": "dtmi:example:mu_itch;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:alpha_beta;1",
+          "@id": "dtmi:example:mu_zatz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "alpha_gamma",
+            "name": "mu_jogg",
             "schema": "string"
           },
           "mapValue": {
-            "name": "alpha_delta",
-            "schema": "date"
+            "name": "mu_flunn",
+            "schema": "long"
           },
           "description": true
         }
@@ -278,18 +278,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_iota;1",
+        "@id": "dtmi:example:nu_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_zeta;1",
+          "@id": "dtmi:example:mu_yekk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "alpha_eta",
+            "name": "mu_vroo",
             "schema": "string"
           },
           "mapValue": {
-            "name": "alpha_theta",
-            "schema": "dateTime"
+            "name": "mu_hi",
+            "schema": "string"
           },
           "description": 626
         }
@@ -304,19 +304,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_nu;1",
+        "@id": "dtmi:example:nu_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:alpha_kappa;1",
+          "@id": "dtmi:example:nu_beta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "alpha_lambda",
+            "name": "nu_gamma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "alpha_mu",
-            "schema": "double"
+            "name": "nu_delta",
+            "schema": "time"
           },
           "description": 626
         }
@@ -331,18 +331,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_rho;1",
+        "@id": "dtmi:example:nu_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_xi;1",
+          "@id": "dtmi:example:nu_zeta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "alpha_omicron",
+            "name": "nu_eta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "alpha_pi",
-            "schema": "duration"
+            "name": "nu_theta",
+            "schema": "boolean"
           },
           "description": [
             null
@@ -359,19 +359,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_phi;1",
+        "@id": "dtmi:example:nu_nu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:alpha_sigma;1",
+          "@id": "dtmi:example:nu_kappa;1",
           "@type": "Map",
           "mapKey": {
-            "name": "alpha_tau",
+            "name": "nu_lambda",
             "schema": "string"
           },
           "mapValue": {
-            "name": "alpha_upsilon",
-            "schema": "float"
+            "name": "nu_mu",
+            "schema": "date"
           },
           "description": [
             null
@@ -388,18 +388,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_yuzz;1",
+        "@id": "dtmi:example:nu_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_chi;1",
+          "@id": "dtmi:example:nu_xi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "alpha_psi",
+            "name": "nu_omicron",
             "schema": "string"
           },
           "mapValue": {
-            "name": "alpha_omega",
-            "schema": "integer"
+            "name": "nu_pi",
+            "schema": "dateTime"
           },
           "description": [
             true
@@ -416,19 +416,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_fuddle;1",
+        "@id": "dtmi:example:nu_phi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:alpha_wum;1",
+          "@id": "dtmi:example:nu_sigma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "alpha_um",
+            "name": "nu_tau",
             "schema": "string"
           },
           "mapValue": {
-            "name": "alpha_humpf",
-            "schema": "long"
+            "name": "nu_upsilon",
+            "schema": "double"
           },
           "description": [
             true
@@ -445,18 +445,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_quan;1",
+        "@id": "dtmi:example:nu_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_glikk;1",
+          "@id": "dtmi:example:nu_chi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "alpha_nuh",
+            "name": "nu_psi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "alpha_snee",
-            "schema": "string"
+            "name": "nu_omega",
+            "schema": "duration"
           },
           "description": [
             626
@@ -473,19 +473,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_zatz;1",
+        "@id": "dtmi:example:nu_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:alpha_thnad;1",
+          "@id": "dtmi:example:nu_wum;1",
           "@type": "Map",
           "mapKey": {
-            "name": "alpha_spazz",
+            "name": "nu_um",
             "schema": "string"
           },
           "mapValue": {
-            "name": "alpha_floob",
-            "schema": "time"
+            "name": "nu_humpf",
+            "schema": "float"
           },
           "description": [
             626
@@ -502,18 +502,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_yekk;1",
+        "@id": "dtmi:example:nu_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_jogg;1",
+          "@id": "dtmi:example:nu_glikk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "alpha_flunn",
+            "name": "nu_nuh",
             "schema": "string"
           },
           "mapValue": {
-            "name": "alpha_itch",
-            "schema": "boolean"
+            "name": "nu_snee",
+            "schema": "integer"
           },
           "description": [
             {}
@@ -530,19 +530,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_beta;1",
+        "@id": "dtmi:example:nu_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:alpha_vroo;1",
+          "@id": "dtmi:example:nu_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "alpha_hi",
+            "name": "nu_spazz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "beta_alpha",
-            "schema": "date"
+            "name": "nu_floob",
+            "schema": "long"
           },
           "description": [
             {}
@@ -559,18 +559,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_zeta;1",
+        "@id": "dtmi:example:nu_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_gamma;1",
+          "@id": "dtmi:example:nu_jogg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "beta_delta",
+            "name": "nu_flunn",
             "schema": "string"
           },
           "mapValue": {
-            "name": "beta_epsilon",
-            "schema": "dateTime"
+            "name": "nu_itch",
+            "schema": "string"
           },
           "description": {
             "@value": "hello",
@@ -588,19 +588,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_kappa;1",
+        "@id": "dtmi:example:xi_beta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:beta_eta;1",
+          "@id": "dtmi:example:nu_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "beta_theta",
+            "name": "nu_hi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "beta_iota",
-            "schema": "double"
+            "name": "xi_alpha",
+            "schema": "time"
           },
           "description": {
             "@value": "hello",
@@ -618,18 +618,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_xi;1",
+        "@id": "dtmi:example:xi_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_lambda;1",
+          "@id": "dtmi:example:xi_gamma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "beta_mu",
+            "name": "xi_delta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "beta_nu",
-            "schema": "duration"
+            "name": "xi_epsilon",
+            "schema": "boolean"
           },
           "description": [
             {
@@ -648,19 +648,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_sigma;1",
+        "@id": "dtmi:example:xi_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:beta_omicron;1",
+          "@id": "dtmi:example:xi_eta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "beta_pi",
+            "name": "xi_theta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "beta_rho",
-            "schema": "float"
+            "name": "xi_iota",
+            "schema": "date"
           },
           "description": [
             {
diff --git a/DTDL/v3/spec/Requirement-ClassMapPropertyDescriptionStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassMapPropertyDescriptionStringLengthV3.json
index 39b1926b..005cb0f1 100644
--- a/DTDL/v3/spec/Requirement-ClassMapPropertyDescriptionStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapPropertyDescriptionStringLengthV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_chi;1",
+        "@id": "dtmi:example:xi_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_tau;1",
+          "@id": "dtmi:example:xi_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "beta_upsilon",
+            "name": "xi_mu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "beta_phi",
-            "schema": "integer"
+            "name": "xi_nu",
+            "schema": "dateTime"
           },
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_wum;1",
+        "@id": "dtmi:example:xi_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_psi;1",
+          "@id": "dtmi:example:xi_omicron;1",
           "@type": "Map",
           "mapKey": {
-            "name": "beta_omega",
+            "name": "xi_pi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "beta_yuzz",
-            "schema": "long"
+            "name": "xi_rho",
+            "schema": "double"
           },
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
@@ -59,19 +59,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_glikk;1",
+        "@id": "dtmi:example:xi_chi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:beta_um;1",
+          "@id": "dtmi:example:xi_tau;1",
           "@type": "Map",
           "mapKey": {
-            "name": "beta_humpf",
+            "name": "xi_upsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "beta_fuddle",
-            "schema": "string"
+            "name": "xi_phi",
+            "schema": "duration"
           },
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapPropertyDescriptionTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassMapPropertyDescriptionTermAndDtmiV3.json
index c89b9337..736a072c 100644
--- a/DTDL/v3/spec/Requirement-ClassMapPropertyDescriptionTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapPropertyDescriptionTermAndDtmiV3.json
@@ -7,24 +7,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_theta;1",
+        "@id": "dtmi:example:xi_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_gamma;1",
+          "@id": "dtmi:example:xi_jogg;1",
           "@type": "Map",
           "description": [
-            "gamma_delta"
+            "xi_flunn"
           ],
           "dtmi:dtdl:property:description;3": [
-            "gamma_epsilon"
+            "xi_itch"
           ],
           "mapKey": {
-            "name": "gamma_zeta",
+            "name": "xi_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "gamma_eta",
-            "schema": "dateTime"
+            "name": "xi_vroo",
+            "schema": "string"
           }
         }
       }
@@ -38,25 +38,25 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_xi;1",
+        "@id": "dtmi:example:omicron_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:gamma_iota;1",
+          "@id": "dtmi:example:omicron_alpha;1",
           "@type": "Map",
           "description": [
-            "gamma_kappa"
+            "omicron_beta"
           ],
           "dtmi:dtdl:property:description;3": [
-            "gamma_lambda"
+            "omicron_gamma"
           ],
           "mapKey": {
-            "name": "gamma_mu",
+            "name": "omicron_delta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "gamma_nu",
-            "schema": "double"
+            "name": "omicron_epsilon",
+            "schema": "time"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassMapPropertyDisplayNameLangStringV3.json b/DTDL/v3/spec/Requirement-ClassMapPropertyDisplayNameLangStringV3.json
index 5ce69280..77fc78ae 100644
--- a/DTDL/v3/spec/Requirement-ClassMapPropertyDisplayNameLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapPropertyDisplayNameLangStringV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_sigma;1",
+        "@id": "dtmi:example:omicron_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_omicron;1",
+          "@id": "dtmi:example:omicron_eta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_pi",
+            "name": "omicron_theta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "gamma_rho",
-            "schema": "duration"
+            "name": "omicron_iota",
+            "schema": "boolean"
           },
           "displayName": "hello"
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_chi;1",
+        "@id": "dtmi:example:omicron_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_tau;1",
+          "@id": "dtmi:example:omicron_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_upsilon",
+            "name": "omicron_mu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "gamma_phi",
-            "schema": "float"
+            "name": "omicron_nu",
+            "schema": "date"
           },
           "displayName": [
             "hello"
@@ -61,18 +61,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_wum;1",
+        "@id": "dtmi:example:omicron_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_psi;1",
+          "@id": "dtmi:example:omicron_omicron;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_omega",
+            "name": "omicron_pi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "gamma_yuzz",
-            "schema": "integer"
+            "name": "omicron_rho",
+            "schema": "dateTime"
           },
           "displayName": {
             "en": "hello"
@@ -89,18 +89,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_glikk;1",
+        "@id": "dtmi:example:omicron_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_um;1",
+          "@id": "dtmi:example:omicron_tau;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_humpf",
+            "name": "omicron_upsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "gamma_fuddle",
-            "schema": "long"
+            "name": "omicron_phi",
+            "schema": "double"
           },
           "displayName": [
             {
@@ -120,18 +120,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_thnad;1",
+        "@id": "dtmi:example:omicron_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_nuh;1",
+          "@id": "dtmi:example:omicron_psi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_snee",
+            "name": "omicron_omega",
             "schema": "string"
           },
           "mapValue": {
-            "name": "gamma_quan",
-            "schema": "string"
+            "name": "omicron_yuzz",
+            "schema": "duration"
           },
           "displayName": {}
         }
@@ -146,18 +146,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_jogg;1",
+        "@id": "dtmi:example:omicron_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_spazz;1",
+          "@id": "dtmi:example:omicron_um;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_floob",
+            "name": "omicron_humpf",
             "schema": "string"
           },
           "mapValue": {
-            "name": "gamma_zatz",
-            "schema": "time"
+            "name": "omicron_fuddle",
+            "schema": "float"
           },
           "displayName": []
         }
@@ -172,18 +172,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_vroo;1",
+        "@id": "dtmi:example:omicron_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_flunn;1",
+          "@id": "dtmi:example:omicron_nuh;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_itch",
+            "name": "omicron_snee",
             "schema": "string"
           },
           "mapValue": {
-            "name": "gamma_yekk",
-            "schema": "boolean"
+            "name": "omicron_quan",
+            "schema": "integer"
           },
           "displayName": null
         }
@@ -198,19 +198,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_gamma;1",
+        "@id": "dtmi:example:omicron_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:gamma_hi;1",
+          "@id": "dtmi:example:omicron_spazz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_alpha",
+            "name": "omicron_floob",
             "schema": "string"
           },
           "mapValue": {
-            "name": "delta_beta",
-            "schema": "date"
+            "name": "omicron_zatz",
+            "schema": "long"
           },
           "displayName": null
         }
@@ -225,18 +225,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_eta;1",
+        "@id": "dtmi:example:omicron_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_delta;1",
+          "@id": "dtmi:example:omicron_flunn;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_epsilon",
+            "name": "omicron_itch",
             "schema": "string"
           },
           "mapValue": {
-            "name": "delta_zeta",
-            "schema": "dateTime"
+            "name": "omicron_yekk",
+            "schema": "string"
           },
           "displayName": true
         }
@@ -251,19 +251,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_lambda;1",
+        "@id": "dtmi:example:pi_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_theta;1",
+          "@id": "dtmi:example:omicron_hi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_iota",
+            "name": "pi_alpha",
             "schema": "string"
           },
           "mapValue": {
-            "name": "delta_kappa",
-            "schema": "double"
+            "name": "pi_beta",
+            "schema": "time"
           },
           "displayName": true
         }
@@ -278,18 +278,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_omicron;1",
+        "@id": "dtmi:example:pi_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_mu;1",
+          "@id": "dtmi:example:pi_delta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_nu",
+            "name": "pi_epsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "delta_xi",
-            "schema": "duration"
+            "name": "pi_zeta",
+            "schema": "boolean"
           },
           "displayName": 626
         }
@@ -304,19 +304,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_tau;1",
+        "@id": "dtmi:example:pi_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_pi;1",
+          "@id": "dtmi:example:pi_theta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_rho",
+            "name": "pi_iota",
             "schema": "string"
           },
           "mapValue": {
-            "name": "delta_sigma",
-            "schema": "float"
+            "name": "pi_kappa",
+            "schema": "date"
           },
           "displayName": 626
         }
@@ -331,18 +331,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_psi;1",
+        "@id": "dtmi:example:pi_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_upsilon;1",
+          "@id": "dtmi:example:pi_mu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_phi",
+            "name": "pi_nu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "delta_chi",
-            "schema": "integer"
+            "name": "pi_xi",
+            "schema": "dateTime"
           },
           "displayName": [
             null
@@ -359,19 +359,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_um;1",
+        "@id": "dtmi:example:pi_tau;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_omega;1",
+          "@id": "dtmi:example:pi_pi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_yuzz",
+            "name": "pi_rho",
             "schema": "string"
           },
           "mapValue": {
-            "name": "delta_wum",
-            "schema": "long"
+            "name": "pi_sigma",
+            "schema": "double"
           },
           "displayName": [
             null
@@ -388,18 +388,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_nuh;1",
+        "@id": "dtmi:example:pi_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_humpf;1",
+          "@id": "dtmi:example:pi_upsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_fuddle",
+            "name": "pi_phi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "delta_glikk",
-            "schema": "string"
+            "name": "pi_chi",
+            "schema": "duration"
           },
           "displayName": [
             true
@@ -416,19 +416,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_spazz;1",
+        "@id": "dtmi:example:pi_um;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_snee;1",
+          "@id": "dtmi:example:pi_omega;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_quan",
+            "name": "pi_yuzz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "delta_thnad",
-            "schema": "time"
+            "name": "pi_wum",
+            "schema": "float"
           },
           "displayName": [
             true
@@ -445,18 +445,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_flunn;1",
+        "@id": "dtmi:example:pi_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_floob;1",
+          "@id": "dtmi:example:pi_humpf;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_zatz",
+            "name": "pi_fuddle",
             "schema": "string"
           },
           "mapValue": {
-            "name": "delta_jogg",
-            "schema": "boolean"
+            "name": "pi_glikk",
+            "schema": "integer"
           },
           "displayName": [
             626
@@ -473,19 +473,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_hi;1",
+        "@id": "dtmi:example:pi_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_itch;1",
+          "@id": "dtmi:example:pi_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_yekk",
+            "name": "pi_quan",
             "schema": "string"
           },
           "mapValue": {
-            "name": "delta_vroo",
-            "schema": "date"
+            "name": "pi_thnad",
+            "schema": "long"
           },
           "displayName": [
             626
@@ -502,18 +502,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_delta;1",
+        "@id": "dtmi:example:pi_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_alpha;1",
+          "@id": "dtmi:example:pi_floob;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_beta",
+            "name": "pi_zatz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "epsilon_gamma",
-            "schema": "dateTime"
+            "name": "pi_jogg",
+            "schema": "string"
           },
           "displayName": [
             {}
@@ -530,19 +530,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_theta;1",
+        "@id": "dtmi:example:pi_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:epsilon_epsilon;1",
+          "@id": "dtmi:example:pi_itch;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_zeta",
+            "name": "pi_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "epsilon_eta",
-            "schema": "double"
+            "name": "pi_vroo",
+            "schema": "time"
           },
           "displayName": [
             {}
@@ -559,18 +559,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_mu;1",
+        "@id": "dtmi:example:rho_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_iota;1",
+          "@id": "dtmi:example:rho_alpha;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_kappa",
+            "name": "rho_beta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "epsilon_lambda",
-            "schema": "duration"
+            "name": "rho_gamma",
+            "schema": "boolean"
           },
           "displayName": {
             "@value": "hello",
@@ -588,19 +588,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_pi;1",
+        "@id": "dtmi:example:rho_theta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:epsilon_nu;1",
+          "@id": "dtmi:example:rho_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_xi",
+            "name": "rho_zeta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "epsilon_omicron",
-            "schema": "float"
+            "name": "rho_eta",
+            "schema": "date"
           },
           "displayName": {
             "@value": "hello",
@@ -618,18 +618,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_upsilon;1",
+        "@id": "dtmi:example:rho_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_rho;1",
+          "@id": "dtmi:example:rho_iota;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_sigma",
+            "name": "rho_kappa",
             "schema": "string"
           },
           "mapValue": {
-            "name": "epsilon_tau",
-            "schema": "integer"
+            "name": "rho_lambda",
+            "schema": "dateTime"
           },
           "displayName": [
             {
@@ -648,19 +648,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_omega;1",
+        "@id": "dtmi:example:rho_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:epsilon_phi;1",
+          "@id": "dtmi:example:rho_nu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_chi",
+            "name": "rho_xi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "epsilon_psi",
-            "schema": "long"
+            "name": "rho_omicron",
+            "schema": "double"
           },
           "displayName": [
             {
diff --git a/DTDL/v3/spec/Requirement-ClassMapPropertyDisplayNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassMapPropertyDisplayNameStringLengthV3.json
index e8e57052..be0acef8 100644
--- a/DTDL/v3/spec/Requirement-ClassMapPropertyDisplayNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapPropertyDisplayNameStringLengthV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_humpf;1",
+        "@id": "dtmi:example:rho_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_yuzz;1",
+          "@id": "dtmi:example:rho_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_wum",
+            "name": "rho_sigma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "epsilon_um",
-            "schema": "string"
+            "name": "rho_tau",
+            "schema": "duration"
           },
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_snee;1",
+        "@id": "dtmi:example:rho_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_fuddle;1",
+          "@id": "dtmi:example:rho_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_glikk",
+            "name": "rho_chi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "epsilon_nuh",
-            "schema": "time"
+            "name": "rho_psi",
+            "schema": "float"
           },
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
@@ -59,19 +59,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_floob;1",
+        "@id": "dtmi:example:rho_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:epsilon_quan;1",
+          "@id": "dtmi:example:rho_yuzz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_thnad",
+            "name": "rho_wum",
             "schema": "string"
           },
           "mapValue": {
-            "name": "epsilon_spazz",
-            "schema": "boolean"
+            "name": "rho_um",
+            "schema": "integer"
           },
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapPropertyDisplayNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassMapPropertyDisplayNameTermAndDtmiV3.json
index e9ec5d1d..9c7df216 100644
--- a/DTDL/v3/spec/Requirement-ClassMapPropertyDisplayNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapPropertyDisplayNameTermAndDtmiV3.json
@@ -7,24 +7,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_xi;1",
+        "@id": "dtmi:example:sigma_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_iota;1",
+          "@id": "dtmi:example:sigma_alpha;1",
           "@type": "Map",
           "displayName": [
-            "zeta_kappa"
+            "sigma_beta"
           ],
           "dtmi:dtdl:property:displayName;3": [
-            "zeta_lambda"
+            "sigma_gamma"
           ],
           "mapKey": {
-            "name": "zeta_mu",
+            "name": "sigma_delta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zeta_nu",
-            "schema": "duration"
+            "name": "sigma_epsilon",
+            "schema": "boolean"
           }
         }
       }
@@ -38,25 +38,25 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_upsilon;1",
+        "@id": "dtmi:example:sigma_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zeta_omicron;1",
+          "@id": "dtmi:example:sigma_eta;1",
           "@type": "Map",
           "displayName": [
-            "zeta_pi"
+            "sigma_theta"
           ],
           "dtmi:dtdl:property:displayName;3": [
-            "zeta_rho"
+            "sigma_iota"
           ],
           "mapKey": {
-            "name": "zeta_sigma",
+            "name": "sigma_kappa",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zeta_tau",
-            "schema": "float"
+            "name": "sigma_lambda",
+            "schema": "date"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassMapPropertyFormallyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Requirement-ClassMapPropertyFormallyIrrelevantDtmiOrTermV3.json
index 9249b7ed..ba3e3dde 100644
--- a/DTDL/v3/spec/Requirement-ClassMapPropertyFormallyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapPropertyFormallyIrrelevantDtmiOrTermV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_fuddle;1",
+        "@id": "dtmi:example:tau_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_wum;1",
+          "@id": "dtmi:example:tau_sigma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "eta_um",
+            "name": "tau_tau",
             "schema": "string"
           },
           "mapValue": {
-            "name": "eta_humpf",
-            "schema": "string"
+            "name": "tau_upsilon",
+            "schema": "duration"
           },
           "dtmi:foo:bar;1": 626
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_quan;1",
+        "@id": "dtmi:example:tau_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:eta_glikk;1",
+          "@id": "dtmi:example:tau_chi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "eta_nuh",
+            "name": "tau_psi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "eta_snee",
-            "schema": "time"
+            "name": "tau_omega",
+            "schema": "float"
           },
           "dtmi:foo:bar;1": 626
         }
@@ -60,18 +60,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_zatz;1",
+        "@id": "dtmi:example:tau_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_thnad;1",
+          "@id": "dtmi:example:tau_wum;1",
           "@type": "Map",
           "mapKey": {
-            "name": "eta_spazz",
+            "name": "tau_um",
             "schema": "string"
           },
           "mapValue": {
-            "name": "eta_floob",
-            "schema": "boolean"
+            "name": "tau_humpf",
+            "schema": "integer"
           },
           "boolean": null
         }
@@ -86,19 +86,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_yekk;1",
+        "@id": "dtmi:example:tau_quan;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:eta_jogg;1",
+          "@id": "dtmi:example:tau_glikk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "eta_flunn",
+            "name": "tau_nuh",
             "schema": "string"
           },
           "mapValue": {
-            "name": "eta_itch",
-            "schema": "date"
+            "name": "tau_snee",
+            "schema": "long"
           },
           "boolean": null
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapPropertyFormallyUndefinedTermV3.json b/DTDL/v3/spec/Requirement-ClassMapPropertyFormallyUndefinedTermV3.json
index cdc5446c..89211d0a 100644
--- a/DTDL/v3/spec/Requirement-ClassMapPropertyFormallyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapPropertyFormallyUndefinedTermV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_wum;1",
+        "@id": "dtmi:example:upsilon_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_psi;1",
+          "@id": "dtmi:example:upsilon_omicron;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_omega",
+            "name": "upsilon_pi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_yuzz",
-            "schema": "string"
+            "name": "upsilon_rho",
+            "schema": "duration"
           },
           "foobar": {}
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_glikk;1",
+        "@id": "dtmi:example:upsilon_chi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:theta_um;1",
+          "@id": "dtmi:example:upsilon_tau;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_humpf",
+            "name": "upsilon_upsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_fuddle",
-            "schema": "time"
+            "name": "upsilon_phi",
+            "schema": "float"
           },
           "foobar": {}
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapPropertyInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassMapPropertyInvalidDtmiV3.json
index fa8406c5..367cfab1 100644
--- a/DTDL/v3/spec/Requirement-ClassMapPropertyInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapPropertyInvalidDtmiV3.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_beta;1",
+        "@id": "dtmi:example:tau_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_vroo;1",
+          "@id": "dtmi:example:tau_thnad;1",
           "@type": [
             "Map",
             "Foobar"
           ],
           "mapKey": {
-            "name": "eta_hi",
+            "name": "tau_spazz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_alpha",
-            "schema": "dateTime"
+            "name": "tau_floob",
+            "schema": "string"
           },
           "dtmi:foo//bar": 626
         }
@@ -36,22 +36,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_zeta;1",
+        "@id": "dtmi:example:tau_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:theta_gamma;1",
+          "@id": "dtmi:example:tau_jogg;1",
           "@type": [
             "Map",
             "Foobar"
           ],
           "mapKey": {
-            "name": "theta_delta",
+            "name": "tau_flunn",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_epsilon",
-            "schema": "double"
+            "name": "tau_itch",
+            "schema": "time"
           },
           "dtmi:foo//bar": 626
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapPropertyMapKeyElementV3.json b/DTDL/v3/spec/Requirement-ClassMapPropertyMapKeyElementV3.json
index d87cb032..b3258775 100644
--- a/DTDL/v3/spec/Requirement-ClassMapPropertyMapKeyElementV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapPropertyMapKeyElementV3.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_wum;1",
+        "@id": "dtmi:example:quan_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "chi_yuzz",
+          "name": "quan_snee",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "chi_omega",
+              "name": "quan_nuh",
               "schema": "date"
             },
             "mapKey": {
-              "@id": "dtmi:example:chi_chi;1",
-              "name": "chi_psi",
+              "@id": "dtmi:example:quan_fuddle;1",
+              "name": "quan_glikk",
               "schema": "string"
             }
           }
@@ -36,21 +36,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_nuh;1",
+        "@id": "dtmi:example:quan_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "chi_glikk",
+          "name": "quan_zatz",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "chi_fuddle",
+              "name": "quan_floob",
               "schema": "dateTime"
             },
             "mapKey": [
               {
-                "@id": "dtmi:example:chi_um;1",
-                "name": "chi_humpf",
+                "@id": "dtmi:example:quan_thnad;1",
+                "name": "quan_spazz",
                 "schema": "string"
               }
             ]
@@ -67,28 +67,28 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_spazz;1",
+        "@id": "dtmi:example:quan_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_quan;1",
+          "@id": "dtmi:example:quan_itch;1",
           "@type": "Map",
           "mapValue": {
-            "name": "chi_thnad",
+            "name": "quan_yekk",
             "schema": "double"
           },
           "mapKey": {
             "@id": "dtmi:ex:dependentRef;1",
-            "name": "chi_snee",
+            "name": "quan_flunn",
             "schema": "string"
           }
         },
         "contents": {
           "@type": "Property",
-          "name": "chi_zatz",
+          "name": "thnad_alpha",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "chi_floob",
+              "name": "quan_hi",
               "schema": "duration"
             },
             "mapKey": "dtmi:ex:dependentRef;1"
@@ -105,28 +105,28 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_yekk;1",
+        "@id": "dtmi:example:thnad_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_flunn;1",
+          "@id": "dtmi:example:thnad_gamma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "chi_itch",
+            "name": "thnad_delta",
             "schema": "float"
           },
           "mapKey": {
             "@id": "dtmi:ex:dependentRef;1",
-            "name": "chi_jogg",
+            "name": "thnad_beta",
             "schema": "string"
           }
         },
         "contents": {
           "@type": "Property",
-          "name": "chi_hi",
+          "name": "thnad_eta",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "chi_vroo",
+              "name": "thnad_zeta",
               "schema": "integer"
             },
             "mapKey": [
@@ -145,20 +145,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_epsilon;1",
+        "@id": "dtmi:example:thnad_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_delta",
+          "name": "thnad_lambda",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "psi_gamma",
+              "name": "thnad_kappa",
               "schema": "long"
             },
             "mapKey": {
-              "@id": "dtmi:example:psi_alpha;1",
-              "name": "psi_beta",
+              "@id": "dtmi:example:thnad_theta;1",
+              "name": "thnad_iota",
               "schema": "string",
               "@context": "dtmi:dtdl:context;2"
             }
@@ -175,21 +175,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_kappa;1",
+        "@id": "dtmi:example:thnad_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_iota",
+          "name": "thnad_pi",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Map",
             "mapValue": {
-              "name": "psi_theta",
+              "name": "thnad_omicron",
               "schema": "string"
             },
             "mapKey": {
-              "@id": "dtmi:example:psi_zeta;1",
-              "name": "psi_eta",
+              "@id": "dtmi:example:thnad_nu;1",
+              "name": "thnad_xi",
               "schema": "string",
               "@context": "dtmi:dtdl:context;2"
             }
@@ -206,18 +206,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_nu;1",
+        "@id": "dtmi:example:thnad_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_mu",
+          "name": "thnad_phi",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "psi_lambda",
+              "name": "thnad_upsilon",
               "schema": "time"
             },
-            "mapKey": []
+            "mapKey": {
+              "@id": "dtmi:example:thnad_sigma;1",
+              "name": "thnad_tau",
+              "schema": "string",
+              "@context": "dtmi:dtdl:context;4"
+            }
           }
         }
       }
@@ -231,19 +236,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_pi;1",
+        "@id": "dtmi:example:thnad_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_omicron",
+          "name": "thnad_wum",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Map",
             "mapValue": {
-              "name": "psi_xi",
+              "name": "thnad_yuzz",
               "schema": "boolean"
             },
-            "mapKey": []
+            "mapKey": {
+              "@id": "dtmi:example:thnad_psi;1",
+              "name": "thnad_omega",
+              "schema": "string",
+              "@context": "dtmi:dtdl:context;4"
+            }
           }
         }
       }
@@ -257,26 +267,77 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_psi;1",
+        "@id": "dtmi:example:thnad_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_chi",
+          "name": "thnad_fuddle",
           "schema": {
             "@type": "Map",
             "mapValue": {
-              "name": "psi_phi",
+              "name": "thnad_humpf",
               "schema": "date"
             },
+            "mapKey": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:thnad_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "thnad_snee",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Map",
+            "mapValue": {
+              "name": "thnad_nuh",
+              "schema": "dateTime"
+            },
+            "mapKey": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:thnad_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "thnad_flunn",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "thnad_jogg",
+              "schema": "double"
+            },
             "mapKey": [
               {
-                "@id": "dtmi:example:psi_rho;1",
-                "name": "psi_sigma",
+                "@id": "dtmi:example:thnad_thnad;1",
+                "name": "thnad_spazz",
                 "schema": "string"
               },
               {
-                "@id": "dtmi:example:psi_tau;1",
-                "name": "psi_upsilon",
+                "@id": "dtmi:example:thnad_floob;1",
+                "name": "thnad_zatz",
                 "schema": "string"
               }
             ]
@@ -293,27 +354,27 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_glikk;1",
+        "@id": "dtmi:example:spazz_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_fuddle",
+          "name": "spazz_gamma",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Map",
             "mapValue": {
-              "name": "psi_humpf",
-              "schema": "dateTime"
+              "name": "spazz_beta",
+              "schema": "duration"
             },
             "mapKey": [
               {
-                "@id": "dtmi:example:psi_omega;1",
-                "name": "psi_yuzz",
+                "@id": "dtmi:example:thnad_yekk;1",
+                "name": "thnad_vroo",
                 "schema": "string"
               },
               {
-                "@id": "dtmi:example:psi_wum;1",
-                "name": "psi_um",
+                "@id": "dtmi:example:thnad_hi;1",
+                "name": "spazz_alpha",
                 "schema": "string"
               }
             ]
diff --git a/DTDL/v3/spec/Requirement-ClassMapPropertyMapKeyTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassMapPropertyMapKeyTermAndDtmiV3.json
index dca85f05..ece8d89d 100644
--- a/DTDL/v3/spec/Requirement-ClassMapPropertyMapKeyTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapPropertyMapKeyTermAndDtmiV3.json
@@ -7,22 +7,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_snee;1",
+        "@id": "dtmi:example:flunn_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_humpf;1",
+          "@id": "dtmi:example:flunn_beta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "um_fuddle",
+            "name": "flunn_gamma",
             "schema": "string"
           },
           "dtmi:dtdl:property:mapKey;3": {
-            "name": "um_glikk",
+            "name": "flunn_delta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_nuh",
-            "schema": "float"
+            "name": "flunn_epsilon",
+            "schema": "long"
           }
         }
       }
@@ -36,23 +36,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_zatz;1",
+        "@id": "dtmi:example:flunn_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:um_quan;1",
+          "@id": "dtmi:example:flunn_eta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "um_thnad",
+            "name": "flunn_theta",
             "schema": "string"
           },
           "dtmi:dtdl:property:mapKey;3": {
-            "name": "um_spazz",
+            "name": "flunn_iota",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_floob",
-            "schema": "integer"
+            "name": "flunn_kappa",
+            "schema": "string"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassMapPropertyMapKeyTypeConformanceV3.json b/DTDL/v3/spec/Requirement-ClassMapPropertyMapKeyTypeConformanceV3.json
index c3255a72..e35673c5 100644
--- a/DTDL/v3/spec/Requirement-ClassMapPropertyMapKeyTypeConformanceV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapPropertyMapKeyTypeConformanceV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_itch;1",
+        "@id": "dtmi:example:spazz_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_jogg;1",
+          "@id": "dtmi:example:spazz_mu;1",
           "@type": "Map",
           "mapValue": {
-            "name": "psi_flunn",
-            "schema": "integer"
+            "name": "spazz_nu",
+            "schema": "string"
           },
           "mapKey": {
-            "@id": "dtmi:example:psi_zatz;1",
-            "elementSchema": "float",
+            "@id": "dtmi:example:spazz_lambda;1",
+            "elementSchema": "long",
             "@type": "Array"
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_alpha;1",
+        "@id": "dtmi:example:spazz_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:psi_vroo;1",
+          "@id": "dtmi:example:spazz_pi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "psi_hi",
-            "schema": "string"
+            "name": "spazz_rho",
+            "schema": "boolean"
           },
           "mapKey": {
-            "@id": "dtmi:example:psi_yekk;1",
-            "elementSchema": "long",
+            "@id": "dtmi:example:spazz_omicron;1",
+            "elementSchema": "time",
             "@type": "Array"
           }
         }
@@ -60,18 +60,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_zeta;1",
+        "@id": "dtmi:example:spazz_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_delta;1",
+          "@id": "dtmi:example:spazz_phi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_epsilon",
-            "schema": "time"
+            "name": "spazz_chi",
+            "schema": "date"
           },
           "mapKey": {
-            "@id": "dtmi:example:omega_beta;1",
-            "name": "omega_gamma",
+            "@id": "dtmi:example:spazz_tau;1",
+            "name": "spazz_upsilon",
             "@type": "Command"
           }
         }
@@ -86,19 +86,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_lambda;1",
+        "@id": "dtmi:example:spazz_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omega_iota;1",
+          "@id": "dtmi:example:spazz_wum;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_kappa",
-            "schema": "boolean"
+            "name": "spazz_um",
+            "schema": "dateTime"
           },
           "mapKey": {
-            "@id": "dtmi:example:omega_eta;1",
-            "name": "omega_theta",
+            "@id": "dtmi:example:spazz_omega;1",
+            "name": "spazz_yuzz",
             "@type": "Command"
           }
         }
@@ -113,19 +113,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_pi;1",
+        "@id": "dtmi:example:spazz_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_xi;1",
+          "@id": "dtmi:example:spazz_nuh;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_omicron",
-            "schema": "dateTime"
+            "name": "spazz_snee",
+            "schema": "duration"
           },
           "mapKey": {
-            "@id": "dtmi:example:omega_mu;1",
-            "name": "omega_nu",
-            "schema": "date",
+            "@id": "dtmi:example:spazz_fuddle;1",
+            "name": "spazz_glikk",
+            "schema": "double",
             "@type": "CommandRequest"
           }
         }
@@ -140,20 +140,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_phi;1",
+        "@id": "dtmi:example:spazz_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omega_tau;1",
+          "@id": "dtmi:example:spazz_floob;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_upsilon",
-            "schema": "duration"
+            "name": "spazz_zatz",
+            "schema": "integer"
           },
           "mapKey": {
-            "@id": "dtmi:example:omega_rho;1",
-            "name": "omega_sigma",
-            "schema": "double",
+            "@id": "dtmi:example:spazz_thnad;1",
+            "name": "spazz_spazz",
+            "schema": "float",
             "@type": "CommandRequest"
           }
         }
@@ -168,19 +168,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_wum;1",
+        "@id": "dtmi:example:spazz_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_omega;1",
+          "@id": "dtmi:example:spazz_yekk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_yuzz",
-            "schema": "integer"
+            "name": "spazz_vroo",
+            "schema": "string"
           },
           "mapKey": {
-            "@id": "dtmi:example:omega_chi;1",
-            "name": "omega_psi",
-            "schema": "float",
+            "@id": "dtmi:example:spazz_flunn;1",
+            "name": "spazz_itch",
+            "schema": "long",
             "@type": "CommandResponse"
           }
         }
@@ -195,20 +195,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_nuh;1",
+        "@id": "dtmi:example:floob_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omega_fuddle;1",
+          "@id": "dtmi:example:floob_gamma;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_glikk",
-            "schema": "string"
+            "name": "floob_delta",
+            "schema": "boolean"
           },
           "mapKey": {
-            "@id": "dtmi:example:omega_um;1",
-            "name": "omega_humpf",
-            "schema": "long",
+            "@id": "dtmi:example:floob_alpha;1",
+            "name": "floob_beta",
+            "schema": "time",
             "@type": "CommandResponse"
           }
         }
@@ -223,20 +223,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_zatz;1",
+        "@id": "dtmi:example:floob_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_spazz;1",
+          "@id": "dtmi:example:floob_iota;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_floob",
-            "schema": "time"
+            "name": "floob_kappa",
+            "schema": "date"
           },
           "mapKey": {
-            "@id": "dtmi:example:omega_snee;1",
-            "name": "omega_quan",
+            "@id": "dtmi:example:floob_zeta;1",
+            "name": "floob_eta",
             "schema": {
-              "@id": "dtmi:example:omega_thnad;1",
+              "@id": "dtmi:example:floob_theta;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -253,21 +253,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_hi;1",
+        "@id": "dtmi:example:floob_rho;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:omega_yekk;1",
+          "@id": "dtmi:example:floob_omicron;1",
           "@type": "Map",
           "mapValue": {
-            "name": "omega_vroo",
-            "schema": "boolean"
+            "name": "floob_pi",
+            "schema": "dateTime"
           },
           "mapKey": {
-            "@id": "dtmi:example:omega_jogg;1",
-            "name": "omega_flunn",
+            "@id": "dtmi:example:floob_mu;1",
+            "name": "floob_nu",
             "schema": {
-              "@id": "dtmi:example:omega_itch;1",
+              "@id": "dtmi:example:floob_xi;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -284,17 +284,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_delta;1",
+        "@id": "dtmi:example:floob_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_beta;1",
+          "@id": "dtmi:example:floob_tau;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_gamma",
-            "schema": "date"
+            "name": "floob_upsilon",
+            "schema": "double"
           },
           "mapKey": {
-            "@id": "dtmi:example:yuzz_alpha;1",
+            "@id": "dtmi:example:floob_sigma;1",
             "valueSchema": "integer",
             "@type": "Enum"
           }
@@ -310,18 +310,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_theta;1",
+        "@id": "dtmi:example:floob_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yuzz_zeta;1",
+          "@id": "dtmi:example:floob_psi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_eta",
-            "schema": "dateTime"
+            "name": "floob_omega",
+            "schema": "duration"
           },
           "mapKey": {
-            "@id": "dtmi:example:yuzz_epsilon;1",
+            "@id": "dtmi:example:floob_chi;1",
             "valueSchema": "integer",
             "@type": "Enum"
           }
@@ -337,19 +337,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_nu;1",
+        "@id": "dtmi:example:floob_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_lambda;1",
+          "@id": "dtmi:example:floob_humpf;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_mu",
-            "schema": "double"
+            "name": "floob_fuddle",
+            "schema": "float"
           },
           "mapKey": {
-            "@id": "dtmi:example:yuzz_iota;1",
-            "enumValue": 1460,
-            "name": "yuzz_kappa",
+            "@id": "dtmi:example:floob_wum;1",
+            "enumValue": 1477,
+            "name": "floob_um",
             "@type": "EnumValue"
           }
         }
@@ -364,20 +364,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_sigma;1",
+        "@id": "dtmi:example:floob_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yuzz_pi;1",
+          "@id": "dtmi:example:floob_quan;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_rho",
-            "schema": "duration"
+            "name": "floob_thnad",
+            "schema": "integer"
           },
           "mapKey": {
-            "@id": "dtmi:example:yuzz_xi;1",
-            "enumValue": 1461,
-            "name": "yuzz_omicron",
+            "@id": "dtmi:example:floob_nuh;1",
+            "enumValue": 1478,
+            "name": "floob_snee",
             "@type": "EnumValue"
           }
         }
@@ -392,19 +392,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_psi;1",
+        "@id": "dtmi:example:floob_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_phi;1",
+          "@id": "dtmi:example:floob_jogg;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_chi",
-            "schema": "integer"
+            "name": "floob_flunn",
+            "schema": "string"
           },
           "mapKey": {
-            "@id": "dtmi:example:yuzz_tau;1",
-            "name": "yuzz_upsilon",
-            "schema": "float",
+            "@id": "dtmi:example:floob_floob;1",
+            "name": "floob_zatz",
+            "schema": "long",
             "@type": "Field"
           }
         }
@@ -419,20 +419,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_humpf;1",
+        "@id": "dtmi:example:zatz_beta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yuzz_wum;1",
+          "@id": "dtmi:example:floob_hi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_um",
-            "schema": "string"
+            "name": "zatz_alpha",
+            "schema": "boolean"
           },
           "mapKey": {
-            "@id": "dtmi:example:yuzz_omega;1",
-            "name": "yuzz_yuzz",
-            "schema": "long",
+            "@id": "dtmi:example:floob_yekk;1",
+            "name": "floob_vroo",
+            "schema": "time",
             "@type": "Field"
           }
         }
@@ -447,17 +447,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_snee;1",
+        "@id": "dtmi:example:zatz_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_glikk;1",
+          "@id": "dtmi:example:zatz_delta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_nuh",
-            "schema": "time"
+            "name": "zatz_epsilon",
+            "schema": "date"
           },
           "mapKey": {
-            "@id": "dtmi:example:yuzz_fuddle;1",
+            "@id": "dtmi:example:zatz_gamma;1",
             "@type": "Interface"
           }
         }
@@ -472,18 +472,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_floob;1",
+        "@id": "dtmi:example:zatz_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:yuzz_thnad;1",
+          "@id": "dtmi:example:zatz_theta;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_spazz",
-            "schema": "boolean"
+            "name": "zatz_iota",
+            "schema": "dateTime"
           },
           "mapKey": {
-            "@id": "dtmi:example:yuzz_quan;1",
+            "@id": "dtmi:example:zatz_eta;1",
             "@type": "Interface"
           }
         }
@@ -498,24 +498,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_vroo;1",
+        "@id": "dtmi:example:zatz_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_itch;1",
+          "@id": "dtmi:example:zatz_xi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "yuzz_yekk",
-            "schema": "dateTime"
+            "name": "zatz_omicron",
+            "schema": "duration"
           },
           "mapKey": {
-            "@id": "dtmi:example:yuzz_zatz;1",
+            "@id": "dtmi:example:zatz_lambda;1",
             "mapKey": {
-              "name": "yuzz_jogg",
+              "name": "zatz_mu",
               "schema": "string"
             },
             "mapValue": {
-              "name": "yuzz_flunn",
-              "schema": "date"
+              "name": "zatz_nu",
+              "schema": "double"
             },
             "@type": "Map"
           }
@@ -531,25 +531,25 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_epsilon;1",
+        "@id": "dtmi:example:zatz_chi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:wum_gamma;1",
+          "@id": "dtmi:example:zatz_upsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_delta",
-            "schema": "duration"
+            "name": "zatz_phi",
+            "schema": "integer"
           },
           "mapKey": {
-            "@id": "dtmi:example:yuzz_hi;1",
+            "@id": "dtmi:example:zatz_rho;1",
             "mapKey": {
-              "name": "wum_alpha",
+              "name": "zatz_sigma",
               "schema": "string"
             },
             "mapValue": {
-              "name": "wum_beta",
-              "schema": "double"
+              "name": "zatz_tau",
+              "schema": "float"
             },
             "@type": "Map"
           }
@@ -565,18 +565,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_kappa;1",
+        "@id": "dtmi:example:zatz_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_theta;1",
+          "@id": "dtmi:example:zatz_yuzz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_iota",
-            "schema": "float"
+            "name": "zatz_wum",
+            "schema": "long"
           },
           "mapKey": {
-            "@id": "dtmi:example:wum_zeta;1",
-            "name": "wum_eta",
+            "@id": "dtmi:example:zatz_psi;1",
+            "name": "zatz_omega",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -592,19 +592,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_omicron;1",
+        "@id": "dtmi:example:zatz_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_nu;1",
+          "@id": "dtmi:example:zatz_glikk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_xi",
-            "schema": "long"
+            "name": "zatz_nuh",
+            "schema": "time"
           },
           "mapKey": {
-            "@id": "dtmi:example:wum_lambda;1",
-            "name": "wum_mu",
-            "schema": "integer",
+            "@id": "dtmi:example:zatz_humpf;1",
+            "name": "zatz_fuddle",
+            "schema": "string",
             "@type": "MapValue"
           }
         }
@@ -619,20 +619,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_upsilon;1",
+        "@id": "dtmi:example:zatz_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:wum_sigma;1",
+          "@id": "dtmi:example:zatz_spazz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_tau",
-            "schema": "time"
+            "name": "zatz_floob",
+            "schema": "date"
           },
           "mapKey": {
-            "@id": "dtmi:example:wum_pi;1",
-            "name": "wum_rho",
-            "schema": "string",
+            "@id": "dtmi:example:zatz_quan;1",
+            "name": "zatz_thnad",
+            "schema": "boolean",
             "@type": "MapValue"
           }
         }
@@ -647,17 +647,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_omega;1",
+        "@id": "dtmi:example:zatz_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_chi;1",
+          "@id": "dtmi:example:zatz_flunn;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_psi",
-            "schema": "boolean"
+            "name": "zatz_itch",
+            "schema": "dateTime"
           },
           "mapKey": {
-            "@id": "dtmi:example:wum_phi;1",
+            "@id": "dtmi:example:zatz_jogg;1",
             "@type": "Object"
           }
         }
@@ -672,18 +672,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_humpf;1",
+        "@id": "dtmi:example:jogg_beta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:wum_wum;1",
+          "@id": "dtmi:example:zatz_hi;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_um",
-            "schema": "date"
+            "name": "jogg_alpha",
+            "schema": "double"
           },
           "mapKey": {
-            "@id": "dtmi:example:wum_yuzz;1",
+            "@id": "dtmi:example:zatz_vroo;1",
             "@type": "Object"
           }
         }
@@ -698,19 +698,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_quan;1",
+        "@id": "dtmi:example:jogg_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_nuh;1",
+          "@id": "dtmi:example:jogg_epsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_snee",
-            "schema": "double"
+            "name": "jogg_zeta",
+            "schema": "float"
           },
           "mapKey": {
-            "@id": "dtmi:example:wum_fuddle;1",
-            "name": "wum_glikk",
-            "schema": "dateTime",
+            "@id": "dtmi:example:jogg_gamma;1",
+            "name": "jogg_delta",
+            "schema": "duration",
             "@type": "Property"
           }
         }
@@ -725,20 +725,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_jogg;1",
+        "@id": "dtmi:example:jogg_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:wum_floob;1",
+          "@id": "dtmi:example:jogg_kappa;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_zatz",
-            "schema": "float"
+            "name": "jogg_lambda",
+            "schema": "long"
           },
           "mapKey": {
-            "@id": "dtmi:example:wum_thnad;1",
-            "name": "wum_spazz",
-            "schema": "duration",
+            "@id": "dtmi:example:jogg_theta;1",
+            "name": "jogg_iota",
+            "schema": "integer",
             "@type": "Property"
           }
         }
@@ -753,18 +753,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_hi;1",
+        "@id": "dtmi:example:jogg_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_yekk;1",
+          "@id": "dtmi:example:jogg_omicron;1",
           "@type": "Map",
           "mapValue": {
-            "name": "wum_vroo",
-            "schema": "integer"
+            "name": "jogg_pi",
+            "schema": "string"
           },
           "mapKey": {
-            "@id": "dtmi:example:wum_flunn;1",
-            "name": "wum_itch",
+            "@id": "dtmi:example:jogg_nu;1",
+            "name": "jogg_xi",
             "@type": "Relationship"
           }
         }
@@ -779,19 +779,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_epsilon;1",
+        "@id": "dtmi:example:jogg_chi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:um_gamma;1",
+          "@id": "dtmi:example:jogg_upsilon;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_delta",
-            "schema": "long"
+            "name": "jogg_phi",
+            "schema": "time"
           },
           "mapKey": {
-            "@id": "dtmi:example:um_alpha;1",
-            "name": "um_beta",
+            "@id": "dtmi:example:jogg_sigma;1",
+            "name": "jogg_tau",
             "@type": "Relationship"
           }
         }
@@ -806,19 +806,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_kappa;1",
+        "@id": "dtmi:example:jogg_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_theta;1",
+          "@id": "dtmi:example:jogg_yuzz;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_iota",
-            "schema": "time"
+            "name": "jogg_wum",
+            "schema": "date"
           },
           "mapKey": {
-            "@id": "dtmi:example:um_zeta;1",
-            "name": "um_eta",
-            "schema": "string",
+            "@id": "dtmi:example:jogg_psi;1",
+            "name": "jogg_omega",
+            "schema": "boolean",
             "@type": "Telemetry"
           }
         }
@@ -833,20 +833,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_omicron;1",
+        "@id": "dtmi:example:jogg_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:um_nu;1",
+          "@id": "dtmi:example:jogg_glikk;1",
           "@type": "Map",
           "mapValue": {
-            "name": "um_xi",
-            "schema": "date"
+            "name": "jogg_nuh",
+            "schema": "double"
           },
           "mapKey": {
-            "@id": "dtmi:example:um_lambda;1",
-            "name": "um_mu",
-            "schema": "boolean",
+            "@id": "dtmi:example:jogg_humpf;1",
+            "name": "jogg_fuddle",
+            "schema": "dateTime",
             "@type": "Telemetry"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapPropertyMapValueElementV3.json b/DTDL/v3/spec/Requirement-ClassMapPropertyMapValueElementV3.json
index 5fac36b5..a55da0ab 100644
--- a/DTDL/v3/spec/Requirement-ClassMapPropertyMapValueElementV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapPropertyMapValueElementV3.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_vroo;1",
+        "@id": "dtmi:example:flunn_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "um_yekk",
+          "name": "flunn_omicron",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "um_itch",
+              "name": "flunn_xi",
               "schema": "string"
             },
             "mapValue": {
-              "@id": "dtmi:example:um_jogg;1",
-              "name": "um_flunn",
-              "schema": "long"
+              "@id": "dtmi:example:flunn_mu;1",
+              "name": "flunn_nu",
+              "schema": "time"
             }
           }
         }
@@ -36,22 +36,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_delta;1",
+        "@id": "dtmi:example:flunn_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_gamma",
+          "name": "flunn_upsilon",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "humpf_beta",
+              "name": "flunn_tau",
               "schema": "string"
             },
             "mapValue": [
               {
-                "@id": "dtmi:example:um_hi;1",
-                "name": "humpf_alpha",
-                "schema": "string"
+                "@id": "dtmi:example:flunn_rho;1",
+                "name": "flunn_sigma",
+                "schema": "boolean"
               }
             ]
           }
@@ -67,28 +67,28 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_theta;1",
+        "@id": "dtmi:example:flunn_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_zeta;1",
+          "@id": "dtmi:example:flunn_psi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_eta",
+            "name": "flunn_omega",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:ex:dependentRef;1",
-            "name": "humpf_epsilon",
-            "schema": "time"
+            "name": "flunn_chi",
+            "schema": "date"
           }
         },
         "contents": {
           "@type": "Property",
-          "name": "humpf_kappa",
+          "name": "flunn_um",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "humpf_iota",
+              "name": "flunn_wum",
               "schema": "string"
             },
             "mapValue": "dtmi:ex:dependentRef;1"
@@ -105,28 +105,28 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_xi;1",
+        "@id": "dtmi:example:flunn_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_mu;1",
+          "@id": "dtmi:example:flunn_fuddle;1",
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_nu",
+            "name": "flunn_glikk",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:ex:dependentRef;1",
-            "name": "humpf_lambda",
-            "schema": "boolean"
+            "name": "flunn_humpf",
+            "schema": "dateTime"
           }
         },
         "contents": {
           "@type": "Property",
-          "name": "humpf_pi",
+          "name": "flunn_quan",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "humpf_omicron",
+              "name": "flunn_snee",
               "schema": "string"
             },
             "mapValue": [
@@ -145,21 +145,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_phi;1",
+        "@id": "dtmi:example:flunn_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_upsilon",
+          "name": "flunn_zatz",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "humpf_tau",
+              "name": "flunn_floob",
               "schema": "string"
             },
             "mapValue": {
-              "@id": "dtmi:example:humpf_rho;1",
-              "name": "humpf_sigma",
-              "schema": "date",
+              "@id": "dtmi:example:flunn_thnad;1",
+              "name": "flunn_spazz",
+              "schema": "double",
               "@context": "dtmi:dtdl:context;2"
             }
           }
@@ -175,22 +175,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_wum;1",
+        "@id": "dtmi:example:flunn_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_yuzz",
+          "name": "flunn_vroo",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Map",
             "mapKey": {
-              "name": "humpf_omega",
+              "name": "flunn_yekk",
               "schema": "string"
             },
             "mapValue": {
-              "@id": "dtmi:example:humpf_chi;1",
-              "name": "humpf_psi",
-              "schema": "dateTime",
+              "@id": "dtmi:example:flunn_flunn;1",
+              "name": "flunn_itch",
+              "schema": "duration",
               "@context": "dtmi:dtdl:context;2"
             }
           }
@@ -206,15 +206,76 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_fuddle;1",
+        "@id": "dtmi:example:itch_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_humpf",
+          "name": "itch_delta",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "humpf_um",
+              "name": "itch_gamma",
+              "schema": "string"
+            },
+            "mapValue": {
+              "@id": "dtmi:example:itch_alpha;1",
+              "name": "itch_beta",
+              "schema": "unsignedShort",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:itch_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "itch_iota",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Map",
+            "mapKey": {
+              "name": "itch_theta",
+              "schema": "string"
+            },
+            "mapValue": {
+              "@id": "dtmi:example:itch_zeta;1",
+              "name": "itch_eta",
+              "schema": "uuid",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:itch_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "itch_mu",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "itch_lambda",
               "schema": "string"
             },
             "mapValue": []
@@ -231,16 +292,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_snee;1",
+        "@id": "dtmi:example:itch_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_nuh",
+          "name": "itch_omicron",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Map",
             "mapKey": {
-              "name": "humpf_glikk",
+              "name": "itch_xi",
               "schema": "string"
             },
             "mapValue": []
@@ -257,27 +318,27 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_flunn;1",
+        "@id": "dtmi:example:itch_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_jogg",
+          "name": "itch_chi",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "humpf_zatz",
+              "name": "itch_phi",
               "schema": "string"
             },
             "mapValue": [
               {
-                "@id": "dtmi:example:humpf_quan;1",
-                "name": "humpf_thnad",
-                "schema": "double"
+                "@id": "dtmi:example:itch_rho;1",
+                "name": "itch_sigma",
+                "schema": "long"
               },
               {
-                "@id": "dtmi:example:humpf_spazz;1",
-                "name": "humpf_floob",
-                "schema": "duration"
+                "@id": "dtmi:example:itch_tau;1",
+                "name": "itch_upsilon",
+                "schema": "string"
               }
             ]
           }
@@ -293,28 +354,28 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_gamma;1",
+        "@id": "dtmi:example:itch_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_beta",
+          "name": "itch_fuddle",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Map",
             "mapKey": {
-              "name": "fuddle_alpha",
+              "name": "itch_humpf",
               "schema": "string"
             },
             "mapValue": [
               {
-                "@id": "dtmi:example:humpf_itch;1",
-                "name": "humpf_yekk",
-                "schema": "float"
+                "@id": "dtmi:example:itch_omega;1",
+                "name": "itch_yuzz",
+                "schema": "time"
               },
               {
-                "@id": "dtmi:example:humpf_vroo;1",
-                "name": "humpf_hi",
-                "schema": "integer"
+                "@id": "dtmi:example:itch_wum;1",
+                "name": "itch_um",
+                "schema": "boolean"
               }
             ]
           }
diff --git a/DTDL/v3/spec/Requirement-ClassMapPropertyMapValueTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassMapPropertyMapValueTermAndDtmiV3.json
index b4dd1ffd..38eedc6d 100644
--- a/DTDL/v3/spec/Requirement-ClassMapPropertyMapValueTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapPropertyMapValueTermAndDtmiV3.json
@@ -7,22 +7,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_epsilon;1",
+        "@id": "dtmi:example:alpha_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_alpha;1",
+          "@id": "dtmi:example:alpha_humpf;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_beta",
+            "name": "alpha_fuddle",
             "schema": "string"
           },
           "mapValue": {
-            "name": "quan_gamma",
-            "schema": "float"
+            "name": "alpha_glikk",
+            "schema": "time"
           },
           "dtmi:dtdl:property:mapValue;3": {
-            "name": "quan_delta",
-            "schema": "integer"
+            "name": "alpha_nuh",
+            "schema": "boolean"
           }
         }
       }
@@ -36,23 +36,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_kappa;1",
+        "@id": "dtmi:example:alpha_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:quan_zeta;1",
+          "@id": "dtmi:example:alpha_quan;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_eta",
+            "name": "alpha_thnad",
             "schema": "string"
           },
           "mapValue": {
-            "name": "quan_theta",
-            "schema": "long"
+            "name": "alpha_spazz",
+            "schema": "date"
           },
           "dtmi:dtdl:property:mapValue;3": {
-            "name": "quan_iota",
-            "schema": "string"
+            "name": "alpha_floob",
+            "schema": "dateTime"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassMapPropertyMapValueTypeConformanceV3.json b/DTDL/v3/spec/Requirement-ClassMapPropertyMapValueTypeConformanceV3.json
index 645bfeb6..5db817cd 100644
--- a/DTDL/v3/spec/Requirement-ClassMapPropertyMapValueTypeConformanceV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapPropertyMapValueTypeConformanceV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_nu;1",
+        "@id": "dtmi:example:itch_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_lambda;1",
+          "@id": "dtmi:example:itch_jogg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_mu",
+            "name": "itch_flunn",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:fuddle_kappa;1",
-            "elementSchema": "long",
+            "@id": "dtmi:example:itch_zatz;1",
+            "elementSchema": "date",
             "@type": "Array"
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_rho;1",
+        "@id": "dtmi:example:yekk_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_omicron;1",
+          "@id": "dtmi:example:itch_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_pi",
+            "name": "itch_hi",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:fuddle_xi;1",
-            "elementSchema": "string",
+            "@id": "dtmi:example:itch_yekk;1",
+            "elementSchema": "dateTime",
             "@type": "Array"
           }
         }
@@ -60,18 +60,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_chi;1",
+        "@id": "dtmi:example:yekk_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_upsilon;1",
+          "@id": "dtmi:example:yekk_delta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_phi",
+            "name": "yekk_epsilon",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:fuddle_sigma;1",
-            "name": "fuddle_tau",
+            "@id": "dtmi:example:yekk_beta;1",
+            "name": "yekk_gamma",
             "@type": "Command"
           }
         }
@@ -86,19 +86,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_um;1",
+        "@id": "dtmi:example:yekk_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_yuzz;1",
+          "@id": "dtmi:example:yekk_iota;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_wum",
+            "name": "yekk_kappa",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:fuddle_psi;1",
-            "name": "fuddle_omega",
+            "@id": "dtmi:example:yekk_eta;1",
+            "name": "yekk_theta",
             "@type": "Command"
           }
         }
@@ -113,19 +113,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_snee;1",
+        "@id": "dtmi:example:yekk_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_glikk;1",
+          "@id": "dtmi:example:yekk_xi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_nuh",
+            "name": "yekk_omicron",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:fuddle_humpf;1",
-            "name": "fuddle_fuddle",
-            "schema": "time",
+            "@id": "dtmi:example:yekk_mu;1",
+            "name": "yekk_nu",
+            "schema": "double",
             "@type": "CommandRequest"
           }
         }
@@ -140,20 +140,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_zatz;1",
+        "@id": "dtmi:example:yekk_phi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:fuddle_spazz;1",
+          "@id": "dtmi:example:yekk_tau;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_floob",
+            "name": "yekk_upsilon",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:fuddle_quan;1",
-            "name": "fuddle_thnad",
-            "schema": "boolean",
+            "@id": "dtmi:example:yekk_rho;1",
+            "name": "yekk_sigma",
+            "schema": "duration",
             "@type": "CommandRequest"
           }
         }
@@ -168,19 +168,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_vroo;1",
+        "@id": "dtmi:example:yekk_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_itch;1",
+          "@id": "dtmi:example:yekk_omega;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_yekk",
+            "name": "yekk_yuzz",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:fuddle_jogg;1",
-            "name": "fuddle_flunn",
-            "schema": "date",
+            "@id": "dtmi:example:yekk_chi;1",
+            "name": "yekk_psi",
+            "schema": "float",
             "@type": "CommandResponse"
           }
         }
@@ -195,20 +195,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_delta;1",
+        "@id": "dtmi:example:yekk_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_beta;1",
+          "@id": "dtmi:example:yekk_fuddle;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_gamma",
+            "name": "yekk_glikk",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:fuddle_hi;1",
-            "name": "glikk_alpha",
-            "schema": "dateTime",
+            "@id": "dtmi:example:yekk_um;1",
+            "name": "yekk_humpf",
+            "schema": "integer",
             "@type": "CommandResponse"
           }
         }
@@ -223,20 +223,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_kappa;1",
+        "@id": "dtmi:example:yekk_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_theta;1",
+          "@id": "dtmi:example:yekk_spazz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_iota",
+            "name": "yekk_floob",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:glikk_epsilon;1",
-            "name": "glikk_zeta",
+            "@id": "dtmi:example:yekk_snee;1",
+            "name": "yekk_quan",
             "schema": {
-              "@id": "dtmi:example:glikk_eta;1",
+              "@id": "dtmi:example:yekk_thnad;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -253,21 +253,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_pi;1",
+        "@id": "dtmi:example:yekk_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_xi;1",
+          "@id": "dtmi:example:yekk_yekk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_omicron",
+            "name": "yekk_vroo",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:glikk_lambda;1",
-            "name": "glikk_mu",
+            "@id": "dtmi:example:yekk_jogg;1",
+            "name": "yekk_flunn",
             "schema": {
-              "@id": "dtmi:example:glikk_nu;1",
+              "@id": "dtmi:example:yekk_itch;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -284,17 +284,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_upsilon;1",
+        "@id": "dtmi:example:vroo_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_sigma;1",
+          "@id": "dtmi:example:vroo_beta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_tau",
+            "name": "vroo_gamma",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:glikk_rho;1",
+            "@id": "dtmi:example:vroo_alpha;1",
             "valueSchema": "integer",
             "@type": "Enum"
           }
@@ -310,18 +310,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_omega;1",
+        "@id": "dtmi:example:vroo_theta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_chi;1",
+          "@id": "dtmi:example:vroo_zeta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_psi",
+            "name": "vroo_eta",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:glikk_phi;1",
+            "@id": "dtmi:example:vroo_epsilon;1",
             "valueSchema": "integer",
             "@type": "Enum"
           }
@@ -337,19 +337,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_fuddle;1",
+        "@id": "dtmi:example:vroo_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_um;1",
+          "@id": "dtmi:example:vroo_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_humpf",
+            "name": "vroo_mu",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:glikk_yuzz;1",
-            "enumValue": 1462,
-            "name": "glikk_wum",
+            "@id": "dtmi:example:vroo_iota;1",
+            "enumValue": 1479,
+            "name": "vroo_kappa",
             "@type": "EnumValue"
           }
         }
@@ -364,20 +364,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_thnad;1",
+        "@id": "dtmi:example:vroo_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_snee;1",
+          "@id": "dtmi:example:vroo_pi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_quan",
+            "name": "vroo_rho",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:glikk_glikk;1",
-            "enumValue": 1463,
-            "name": "glikk_nuh",
+            "@id": "dtmi:example:vroo_xi;1",
+            "enumValue": 1480,
+            "name": "vroo_omicron",
             "@type": "EnumValue"
           }
         }
@@ -392,19 +392,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_flunn;1",
+        "@id": "dtmi:example:vroo_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_zatz;1",
+          "@id": "dtmi:example:vroo_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_jogg",
+            "name": "vroo_chi",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:glikk_spazz;1",
-            "name": "glikk_floob",
-            "schema": "double",
+            "@id": "dtmi:example:vroo_tau;1",
+            "name": "vroo_upsilon",
+            "schema": "long",
             "@type": "Field"
           }
         }
@@ -419,20 +419,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_alpha;1",
+        "@id": "dtmi:example:vroo_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:glikk_vroo;1",
+          "@id": "dtmi:example:vroo_wum;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_hi",
+            "name": "vroo_um",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:glikk_itch;1",
-            "name": "glikk_yekk",
-            "schema": "duration",
+            "@id": "dtmi:example:vroo_omega;1",
+            "name": "vroo_yuzz",
+            "schema": "string",
             "@type": "Field"
           }
         }
@@ -447,17 +447,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_epsilon;1",
+        "@id": "dtmi:example:vroo_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_gamma;1",
+          "@id": "dtmi:example:vroo_glikk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_delta",
+            "name": "vroo_nuh",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:nuh_beta;1",
+            "@id": "dtmi:example:vroo_fuddle;1",
             "@type": "Interface"
           }
         }
@@ -472,18 +472,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_iota;1",
+        "@id": "dtmi:example:vroo_floob;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_eta;1",
+          "@id": "dtmi:example:vroo_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_theta",
+            "name": "vroo_spazz",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:nuh_zeta;1",
+            "@id": "dtmi:example:vroo_quan;1",
             "@type": "Interface"
           }
         }
@@ -498,24 +498,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_omicron;1",
+        "@id": "dtmi:example:vroo_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_nu;1",
+          "@id": "dtmi:example:vroo_itch;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_xi",
+            "name": "vroo_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:nuh_kappa;1",
+            "@id": "dtmi:example:vroo_zatz;1",
             "mapKey": {
-              "name": "nuh_lambda",
+              "name": "vroo_jogg",
               "schema": "string"
             },
             "mapValue": {
-              "name": "nuh_mu",
-              "schema": "float"
+              "name": "vroo_flunn",
+              "schema": "time"
             },
             "@type": "Map"
           }
@@ -531,25 +531,25 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_phi;1",
+        "@id": "dtmi:example:hi_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_tau;1",
+          "@id": "dtmi:example:hi_gamma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_upsilon",
+            "name": "hi_delta",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:nuh_pi;1",
+            "@id": "dtmi:example:vroo_hi;1",
             "mapKey": {
-              "name": "nuh_rho",
+              "name": "hi_alpha",
               "schema": "string"
             },
             "mapValue": {
-              "name": "nuh_sigma",
-              "schema": "integer"
+              "name": "hi_beta",
+              "schema": "boolean"
             },
             "@type": "Map"
           }
@@ -565,18 +565,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_wum;1",
+        "@id": "dtmi:example:hi_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_omega;1",
+          "@id": "dtmi:example:hi_theta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_yuzz",
+            "name": "hi_iota",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:nuh_chi;1",
-            "name": "nuh_psi",
+            "@id": "dtmi:example:hi_zeta;1",
+            "name": "hi_eta",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -592,19 +592,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_nuh;1",
+        "@id": "dtmi:example:hi_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_fuddle;1",
+          "@id": "dtmi:example:hi_nu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_glikk",
+            "name": "hi_xi",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:nuh_um;1",
-            "name": "nuh_humpf",
+            "@id": "dtmi:example:hi_lambda;1",
+            "name": "hi_mu",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -620,19 +620,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_floob;1",
+        "@id": "dtmi:example:hi_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_thnad;1",
+          "@id": "dtmi:example:hi_sigma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_spazz",
+            "name": "hi_tau",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:nuh_snee;1",
-            "name": "nuh_quan",
-            "schema": "long",
+            "@id": "dtmi:example:hi_pi;1",
+            "name": "hi_rho",
+            "schema": "date",
             "@type": "MapValue"
           }
         }
@@ -647,17 +647,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_itch;1",
+        "@id": "dtmi:example:hi_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_jogg;1",
+          "@id": "dtmi:example:hi_chi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_flunn",
+            "name": "hi_psi",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:nuh_zatz;1",
+            "@id": "dtmi:example:hi_phi;1",
             "@type": "Object"
           }
         }
@@ -672,18 +672,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_alpha;1",
+        "@id": "dtmi:example:hi_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:nuh_vroo;1",
+          "@id": "dtmi:example:hi_wum;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_hi",
+            "name": "hi_um",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:nuh_yekk;1",
+            "@id": "dtmi:example:hi_yuzz;1",
             "@type": "Object"
           }
         }
@@ -698,19 +698,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_zeta;1",
+        "@id": "dtmi:example:hi_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_delta;1",
+          "@id": "dtmi:example:hi_nuh;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_epsilon",
+            "name": "hi_snee",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:snee_beta;1",
-            "name": "snee_gamma",
-            "schema": "string",
+            "@id": "dtmi:example:hi_fuddle;1",
+            "name": "hi_glikk",
+            "schema": "dateTime",
             "@type": "Property"
           }
         }
@@ -725,20 +725,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_lambda;1",
+        "@id": "dtmi:example:hi_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:snee_iota;1",
+          "@id": "dtmi:example:hi_floob;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_kappa",
+            "name": "hi_zatz",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:snee_eta;1",
-            "name": "snee_theta",
-            "schema": "time",
+            "@id": "dtmi:example:hi_thnad;1",
+            "name": "hi_spazz",
+            "schema": "double",
             "@type": "Property"
           }
         }
@@ -753,18 +753,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_pi;1",
+        "@id": "dtmi:example:hi_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_xi;1",
+          "@id": "dtmi:example:hi_yekk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_omicron",
+            "name": "hi_vroo",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:snee_mu;1",
-            "name": "snee_nu",
+            "@id": "dtmi:example:hi_flunn;1",
+            "name": "hi_itch",
             "@type": "Relationship"
           }
         }
@@ -779,19 +779,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_phi;1",
+        "@id": "dtmi:example:alpha_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:snee_tau;1",
+          "@id": "dtmi:example:alpha_gamma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_upsilon",
+            "name": "alpha_delta",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:snee_rho;1",
-            "name": "snee_sigma",
+            "@id": "dtmi:example:alpha_alpha;1",
+            "name": "alpha_beta",
             "@type": "Relationship"
           }
         }
@@ -806,19 +806,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_wum;1",
+        "@id": "dtmi:example:alpha_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_omega;1",
+          "@id": "dtmi:example:alpha_theta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_yuzz",
+            "name": "alpha_iota",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:snee_chi;1",
-            "name": "snee_psi",
-            "schema": "boolean",
+            "@id": "dtmi:example:alpha_zeta;1",
+            "name": "alpha_eta",
+            "schema": "duration",
             "@type": "Telemetry"
           }
         }
@@ -833,20 +833,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_nuh;1",
+        "@id": "dtmi:example:alpha_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:snee_fuddle;1",
+          "@id": "dtmi:example:alpha_nu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_glikk",
+            "name": "alpha_xi",
             "schema": "string"
           },
           "mapValue": {
-            "@id": "dtmi:example:snee_um;1",
-            "name": "snee_humpf",
-            "schema": "date",
+            "@id": "dtmi:example:alpha_lambda;1",
+            "name": "alpha_mu",
+            "schema": "float",
             "@type": "Telemetry"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapPropertyNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassMapPropertyNotDtmiNorTermV3.json
index 61a1aa2d..777c474c 100644
--- a/DTDL/v3/spec/Requirement-ClassMapPropertyNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapPropertyNotDtmiNorTermV3.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_kappa;1",
+        "@id": "dtmi:example:upsilon_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_eta;1",
+          "@id": "dtmi:example:tau_vroo;1",
           "@type": [
             "Map",
             "Foobar"
           ],
           "mapKey": {
-            "name": "theta_theta",
+            "name": "tau_hi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_iota",
-            "schema": "duration"
+            "name": "upsilon_alpha",
+            "schema": "boolean"
           },
           "http://foo.com/bar": true
         }
@@ -36,22 +36,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_xi;1",
+        "@id": "dtmi:example:upsilon_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:theta_lambda;1",
+          "@id": "dtmi:example:upsilon_gamma;1",
           "@type": [
             "Map",
             "Foobar"
           ],
           "mapKey": {
-            "name": "theta_mu",
+            "name": "upsilon_delta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_nu",
-            "schema": "float"
+            "name": "upsilon_epsilon",
+            "schema": "date"
           },
           "http://foo.com/bar": true
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapRequiredPropertiesV3.json b/DTDL/v3/spec/Requirement-ClassMapRequiredPropertiesV3.json
index 2f5b6b2d..f1d43b84 100644
--- a/DTDL/v3/spec/Requirement-ClassMapRequiredPropertiesV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapRequiredPropertiesV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_phi;1",
+        "@id": "dtmi:example:fuddle_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_sigma;1",
+          "@id": "dtmi:example:fuddle_yuzz;1",
           "mapKey": {
-            "name": "sigma_tau",
+            "name": "fuddle_wum",
             "schema": "string"
           },
           "mapValue": {
-            "name": "sigma_upsilon",
+            "name": "fuddle_um",
             "schema": "string"
           }
         }
@@ -31,17 +31,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_yuzz;1",
+        "@id": "dtmi:example:fuddle_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:sigma_chi;1",
+          "@id": "dtmi:example:fuddle_fuddle;1",
           "mapKey": {
-            "name": "sigma_psi",
+            "name": "fuddle_glikk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "sigma_omega",
+            "name": "fuddle_nuh",
             "schema": "time"
           }
         }
@@ -56,13 +56,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_humpf;1",
+        "@id": "dtmi:example:fuddle_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_wum;1",
+          "@id": "dtmi:example:fuddle_quan;1",
           "@type": "Map",
           "mapValue": {
-            "name": "sigma_um",
+            "name": "fuddle_thnad",
             "schema": "boolean"
           }
         }
@@ -77,14 +77,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_nuh;1",
+        "@id": "dtmi:example:fuddle_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:sigma_fuddle;1",
+          "@id": "dtmi:example:fuddle_floob;1",
           "@type": "Map",
           "mapValue": {
-            "name": "sigma_glikk",
+            "name": "fuddle_zatz",
             "schema": "date"
           }
         }
@@ -99,13 +99,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_thnad;1",
+        "@id": "dtmi:example:fuddle_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_snee;1",
+          "@id": "dtmi:example:fuddle_flunn;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_quan",
+            "name": "fuddle_itch",
             "schema": "string"
           }
         }
@@ -120,14 +120,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_zatz;1",
+        "@id": "dtmi:example:glikk_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:sigma_spazz;1",
+          "@id": "dtmi:example:fuddle_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_floob",
+            "name": "fuddle_hi",
             "schema": "string"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapTypeIncludesInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassMapTypeIncludesInvalidDtmiV3.json
index ae4d9ec1..e38f3248 100644
--- a/DTDL/v3/spec/Requirement-ClassMapTypeIncludesInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapTypeIncludesInvalidDtmiV3.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_alpha;1",
+        "@id": "dtmi:example:quan_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_yekk;1",
+          "@id": "dtmi:example:quan_epsilon;1",
           "@type": [
             "Map",
             "dtmi:foo//bar"
           ],
           "mapKey": {
-            "name": "phi_vroo",
+            "name": "quan_zeta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "phi_hi",
+            "name": "quan_eta",
             "schema": "float"
           }
         }
@@ -35,21 +35,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_epsilon;1",
+        "@id": "dtmi:example:quan_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:chi_beta;1",
+          "@id": "dtmi:example:quan_iota;1",
           "@type": [
             "Map",
             "dtmi:foo//bar"
           ],
           "mapKey": {
-            "name": "chi_gamma",
+            "name": "quan_kappa",
             "schema": "string"
           },
           "mapValue": {
-            "name": "chi_delta",
+            "name": "quan_lambda",
             "schema": "integer"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapTypeIncludesMaterialV3.json b/DTDL/v3/spec/Requirement-ClassMapTypeIncludesMaterialV3.json
index 6a9f073f..719a68df 100644
--- a/DTDL/v3/spec/Requirement-ClassMapTypeIncludesMaterialV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapTypeIncludesMaterialV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_tau;1",
+        "@id": "dtmi:example:nuh_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_pi;1",
+          "@id": "dtmi:example:nuh_psi;1",
           "mapKey": {
-            "name": "upsilon_rho",
+            "name": "nuh_omega",
             "schema": "string"
           },
           "mapValue": {
-            "name": "upsilon_sigma",
+            "name": "nuh_yuzz",
             "schema": "string"
           },
           "@type": "Map"
@@ -32,16 +32,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_psi;1",
+        "@id": "dtmi:example:nuh_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_upsilon;1",
+          "@id": "dtmi:example:nuh_um;1",
           "mapKey": {
-            "name": "upsilon_phi",
+            "name": "nuh_humpf",
             "schema": "string"
           },
           "mapValue": {
-            "name": "upsilon_chi",
+            "name": "nuh_fuddle",
             "schema": "time"
           },
           "@type": [
@@ -59,16 +59,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_um;1",
+        "@id": "dtmi:example:nuh_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_omega;1",
+          "@id": "dtmi:example:nuh_nuh;1",
           "mapKey": {
-            "name": "upsilon_yuzz",
+            "name": "nuh_snee",
             "schema": "string"
           },
           "mapValue": {
-            "name": "upsilon_wum",
+            "name": "nuh_quan",
             "schema": "boolean"
           },
           "@type": "dtmi:dtdl:class:Map;3"
@@ -84,16 +84,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_nuh;1",
+        "@id": "dtmi:example:nuh_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_humpf;1",
+          "@id": "dtmi:example:nuh_spazz;1",
           "mapKey": {
-            "name": "upsilon_fuddle",
+            "name": "nuh_floob",
             "schema": "string"
           },
           "mapValue": {
-            "name": "upsilon_glikk",
+            "name": "nuh_zatz",
             "schema": "date"
           },
           "@type": [
@@ -111,16 +111,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_spazz;1",
+        "@id": "dtmi:example:nuh_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_snee;1",
+          "@id": "dtmi:example:nuh_flunn;1",
           "mapKey": {
-            "name": "upsilon_quan",
+            "name": "nuh_itch",
             "schema": "string"
           },
           "mapValue": {
-            "name": "upsilon_thnad",
+            "name": "nuh_yekk",
             "schema": "dateTime"
           },
           "@type": "Something"
@@ -136,17 +136,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_flunn;1",
+        "@id": "dtmi:example:snee_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:upsilon_floob;1",
+          "@id": "dtmi:example:nuh_hi;1",
           "mapKey": {
-            "name": "upsilon_zatz",
+            "name": "snee_alpha",
             "schema": "string"
           },
           "mapValue": {
-            "name": "upsilon_jogg",
+            "name": "snee_beta",
             "schema": "double"
           },
           "@type": "Something"
@@ -162,16 +162,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_hi;1",
+        "@id": "dtmi:example:snee_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_itch;1",
+          "@id": "dtmi:example:snee_delta;1",
           "mapKey": {
-            "name": "upsilon_yekk",
+            "name": "snee_epsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "upsilon_vroo",
+            "name": "snee_zeta",
             "schema": "duration"
           },
           "@type": [
@@ -189,17 +189,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_delta;1",
+        "@id": "dtmi:example:snee_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:phi_alpha;1",
+          "@id": "dtmi:example:snee_theta;1",
           "mapKey": {
-            "name": "phi_beta",
+            "name": "snee_iota",
             "schema": "string"
           },
           "mapValue": {
-            "name": "phi_gamma",
+            "name": "snee_kappa",
             "schema": "float"
           },
           "@type": [
diff --git a/DTDL/v3/spec/Requirement-ClassMapTypeIncludesNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassMapTypeIncludesNotDtmiNorTermV3.json
index cd9902c6..fafefd9d 100644
--- a/DTDL/v3/spec/Requirement-ClassMapTypeIncludesNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapTypeIncludesNotDtmiNorTermV3.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_iota;1",
+        "@id": "dtmi:example:quan_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_zeta;1",
+          "@id": "dtmi:example:quan_nu;1",
           "@type": [
             "Map",
             "http://foo.com/bar"
           ],
           "mapKey": {
-            "name": "chi_eta",
+            "name": "quan_xi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "chi_theta",
+            "name": "quan_omicron",
             "schema": "long"
           }
         }
@@ -35,21 +35,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_nu;1",
+        "@id": "dtmi:example:quan_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:chi_kappa;1",
+          "@id": "dtmi:example:quan_rho;1",
           "@type": [
             "Map",
             "http://foo.com/bar"
           ],
           "mapKey": {
-            "name": "chi_lambda",
+            "name": "quan_sigma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "chi_mu",
+            "name": "quan_tau",
             "schema": "string"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapTypeStringOrArrayV3.json b/DTDL/v3/spec/Requirement-ClassMapTypeStringOrArrayV3.json
index 3b114190..de5b6cec 100644
--- a/DTDL/v3/spec/Requirement-ClassMapTypeStringOrArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapTypeStringOrArrayV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_yekk;1",
+        "@id": "dtmi:example:glikk_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_jogg;1",
+          "@id": "dtmi:example:glikk_beta;1",
           "mapKey": {
-            "name": "sigma_flunn",
+            "name": "glikk_gamma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "sigma_itch",
+            "name": "glikk_delta",
             "schema": "dateTime"
           },
           "@type": 626
@@ -32,17 +32,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_beta;1",
+        "@id": "dtmi:example:glikk_iota;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:sigma_vroo;1",
+          "@id": "dtmi:example:glikk_zeta;1",
           "mapKey": {
-            "name": "sigma_hi",
+            "name": "glikk_eta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "tau_alpha",
+            "name": "glikk_theta",
             "schema": "double"
           },
           "@type": 626
@@ -58,16 +58,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_zeta;1",
+        "@id": "dtmi:example:glikk_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_gamma;1",
+          "@id": "dtmi:example:glikk_kappa;1",
           "mapKey": {
-            "name": "tau_delta",
+            "name": "glikk_lambda",
             "schema": "string"
           },
           "mapValue": {
-            "name": "tau_epsilon",
+            "name": "glikk_mu",
             "schema": "duration"
           },
           "@type": null
@@ -83,17 +83,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_kappa;1",
+        "@id": "dtmi:example:glikk_rho;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:tau_eta;1",
+          "@id": "dtmi:example:glikk_xi;1",
           "mapKey": {
-            "name": "tau_theta",
+            "name": "glikk_omicron",
             "schema": "string"
           },
           "mapValue": {
-            "name": "tau_iota",
+            "name": "glikk_pi",
             "schema": "float"
           },
           "@type": null
@@ -109,16 +109,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_xi;1",
+        "@id": "dtmi:example:glikk_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_lambda;1",
+          "@id": "dtmi:example:glikk_sigma;1",
           "mapKey": {
-            "name": "tau_mu",
+            "name": "glikk_tau",
             "schema": "string"
           },
           "mapValue": {
-            "name": "tau_nu",
+            "name": "glikk_upsilon",
             "schema": "integer"
           },
           "@type": true
@@ -134,17 +134,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_sigma;1",
+        "@id": "dtmi:example:glikk_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:tau_omicron;1",
+          "@id": "dtmi:example:glikk_chi;1",
           "mapKey": {
-            "name": "tau_pi",
+            "name": "glikk_psi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "tau_rho",
+            "name": "glikk_omega",
             "schema": "long"
           },
           "@type": true
@@ -160,16 +160,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_chi;1",
+        "@id": "dtmi:example:glikk_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_tau;1",
+          "@id": "dtmi:example:glikk_wum;1",
           "mapKey": {
-            "name": "tau_upsilon",
+            "name": "glikk_um",
             "schema": "string"
           },
           "mapValue": {
-            "name": "tau_phi",
+            "name": "glikk_humpf",
             "schema": "string"
           },
           "@type": {}
@@ -185,17 +185,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_wum;1",
+        "@id": "dtmi:example:glikk_quan;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:tau_psi;1",
+          "@id": "dtmi:example:glikk_glikk;1",
           "mapKey": {
-            "name": "tau_omega",
+            "name": "glikk_nuh",
             "schema": "string"
           },
           "mapValue": {
-            "name": "tau_yuzz",
+            "name": "glikk_snee",
             "schema": "time"
           },
           "@type": {}
@@ -211,16 +211,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_glikk;1",
+        "@id": "dtmi:example:glikk_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_um;1",
+          "@id": "dtmi:example:glikk_thnad;1",
           "mapKey": {
-            "name": "tau_humpf",
+            "name": "glikk_spazz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "tau_fuddle",
+            "name": "glikk_floob",
             "schema": "boolean"
           },
           "@type": [
@@ -238,17 +238,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_thnad;1",
+        "@id": "dtmi:example:glikk_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:tau_nuh;1",
+          "@id": "dtmi:example:glikk_jogg;1",
           "mapKey": {
-            "name": "tau_snee",
+            "name": "glikk_flunn",
             "schema": "string"
           },
           "mapValue": {
-            "name": "tau_quan",
+            "name": "glikk_itch",
             "schema": "date"
           },
           "@type": [
@@ -266,16 +266,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_jogg;1",
+        "@id": "dtmi:example:nuh_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_spazz;1",
+          "@id": "dtmi:example:glikk_vroo;1",
           "mapKey": {
-            "name": "tau_floob",
+            "name": "glikk_hi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "tau_zatz",
+            "name": "nuh_alpha",
             "schema": "dateTime"
           },
           "@type": [
@@ -293,17 +293,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_vroo;1",
+        "@id": "dtmi:example:nuh_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:tau_flunn;1",
+          "@id": "dtmi:example:nuh_gamma;1",
           "mapKey": {
-            "name": "tau_itch",
+            "name": "nuh_delta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "tau_yekk",
+            "name": "nuh_epsilon",
             "schema": "double"
           },
           "@type": [
@@ -321,16 +321,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_gamma;1",
+        "@id": "dtmi:example:nuh_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_hi;1",
+          "@id": "dtmi:example:nuh_eta;1",
           "mapKey": {
-            "name": "upsilon_alpha",
+            "name": "nuh_theta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "upsilon_beta",
+            "name": "nuh_iota",
             "schema": "duration"
           },
           "@type": [
@@ -348,17 +348,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_eta;1",
+        "@id": "dtmi:example:nuh_xi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:upsilon_delta;1",
+          "@id": "dtmi:example:nuh_lambda;1",
           "mapKey": {
-            "name": "upsilon_epsilon",
+            "name": "nuh_mu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "upsilon_zeta",
+            "name": "nuh_nu",
             "schema": "float"
           },
           "@type": [
@@ -376,16 +376,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_lambda;1",
+        "@id": "dtmi:example:nuh_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_theta;1",
+          "@id": "dtmi:example:nuh_omicron;1",
           "mapKey": {
-            "name": "upsilon_iota",
+            "name": "nuh_pi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "upsilon_kappa",
+            "name": "nuh_rho",
             "schema": "integer"
           },
           "@type": [
@@ -403,17 +403,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_omicron;1",
+        "@id": "dtmi:example:nuh_chi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:upsilon_mu;1",
+          "@id": "dtmi:example:nuh_tau;1",
           "mapKey": {
-            "name": "upsilon_nu",
+            "name": "nuh_upsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "upsilon_xi",
+            "name": "nuh_phi",
             "schema": "long"
           },
           "@type": [
diff --git a/DTDL/v3/spec/Requirement-ClassMapValueContextConformsV3.json b/DTDL/v3/spec/Requirement-ClassMapValueContextConformsV3.json
index 649f82b2..48f5d252 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValueContextConformsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValueContextConformsV3.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_floob;1",
+        "@id": "dtmi:example:humpf_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omicron_spazz",
+          "name": "humpf_beta",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "omicron_thnad",
+              "name": "humpf_alpha",
               "schema": "string"
             },
             "mapValue": {
-              "name": "omicron_quan",
+              "name": "um_hi",
               "schema": "string",
               "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
             }
@@ -36,19 +36,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_itch;1",
+        "@id": "dtmi:example:humpf_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omicron_flunn",
+          "name": "humpf_zeta",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "omicron_jogg",
+              "name": "humpf_epsilon",
               "schema": "string"
             },
             "mapValue": {
-              "name": "omicron_zatz",
+              "name": "humpf_delta",
               "schema": "time",
               "@context": []
             }
@@ -65,19 +65,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_alpha;1",
+        "@id": "dtmi:example:humpf_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omicron_hi",
+          "name": "humpf_kappa",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "omicron_vroo",
+              "name": "humpf_iota",
               "schema": "string"
             },
             "mapValue": {
-              "name": "omicron_yekk",
+              "name": "humpf_theta",
               "schema": "boolean",
               "@context": [
                 "dtmi:dtdl:extension:quantitativeTypes;1"
@@ -96,19 +96,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_epsilon;1",
+        "@id": "dtmi:example:humpf_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "pi_delta",
+          "name": "humpf_xi",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "pi_gamma",
+              "name": "humpf_nu",
               "schema": "string"
             },
             "mapValue": {
-              "name": "pi_beta",
+              "name": "humpf_mu",
               "schema": "date",
               "@context": null
             }
@@ -125,19 +125,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_iota;1",
+        "@id": "dtmi:example:humpf_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "pi_theta",
+          "name": "humpf_sigma",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "pi_eta",
+              "name": "humpf_rho",
               "schema": "string"
             },
             "mapValue": {
-              "name": "pi_zeta",
+              "name": "humpf_pi",
               "schema": "dateTime",
               "@context": 626
             }
@@ -154,19 +154,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_nu;1",
+        "@id": "dtmi:example:humpf_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "pi_mu",
+          "name": "humpf_chi",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "pi_lambda",
+              "name": "humpf_phi",
               "schema": "string"
             },
             "mapValue": {
-              "name": "pi_kappa",
+              "name": "humpf_upsilon",
               "schema": "double",
               "@context": true
             }
@@ -183,19 +183,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_rho;1",
+        "@id": "dtmi:example:humpf_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "pi_pi",
+          "name": "humpf_wum",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "pi_omicron",
+              "name": "humpf_yuzz",
               "schema": "string"
             },
             "mapValue": {
-              "name": "pi_xi",
+              "name": "humpf_omega",
               "schema": "duration",
               "@context": [
                 null
@@ -214,19 +214,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_phi;1",
+        "@id": "dtmi:example:humpf_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "pi_upsilon",
+          "name": "humpf_glikk",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "pi_tau",
+              "name": "humpf_fuddle",
               "schema": "string"
             },
             "mapValue": {
-              "name": "pi_sigma",
+              "name": "humpf_humpf",
               "schema": "float",
               "@context": [
                 626
@@ -245,19 +245,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_yuzz;1",
+        "@id": "dtmi:example:humpf_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "pi_omega",
+          "name": "humpf_thnad",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "pi_psi",
+              "name": "humpf_quan",
               "schema": "string"
             },
             "mapValue": {
-              "name": "pi_chi",
+              "name": "humpf_snee",
               "schema": "integer",
               "@context": [
                 true
@@ -276,21 +276,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_fuddle;1",
+        "@id": "dtmi:example:humpf_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "pi_humpf",
+          "name": "humpf_jogg",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "pi_um",
+              "name": "humpf_zatz",
               "schema": "string"
             },
             "mapValue": {
-              "name": "pi_wum",
+              "name": "humpf_floob",
               "schema": "long",
-              "@context": {}
+              "@context": "dtmi:dtdl:extension:quantitativeTypes"
             }
           }
         }
@@ -305,23 +305,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_quan;1",
+        "@id": "dtmi:example:humpf_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "pi_snee",
+          "name": "humpf_vroo",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "pi_nuh",
+              "name": "humpf_yekk",
               "schema": "string"
             },
             "mapValue": {
-              "name": "pi_glikk",
+              "name": "humpf_itch",
               "schema": "string",
-              "@context": [
-                {}
-              ]
+              "@context": "http://dtdl/extension/quantitativeTypes/1"
             }
           }
         }
@@ -336,21 +334,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_zatz;1",
+        "@id": "dtmi:example:fuddle_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "pi_floob",
+          "name": "fuddle_gamma",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "pi_spazz",
+              "name": "fuddle_beta",
               "schema": "string"
             },
             "mapValue": {
-              "name": "pi_thnad",
+              "name": "fuddle_alpha",
               "schema": "time",
-              "@context": "dtmi:dtdl:extension:quantitativeTypes"
+              "@context": "quantitativeTypes;1"
             }
           }
         }
@@ -365,21 +363,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_yekk;1",
+        "@id": "dtmi:example:fuddle_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "pi_itch",
+          "name": "fuddle_eta",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "pi_flunn",
+              "name": "fuddle_zeta",
               "schema": "string"
             },
             "mapValue": {
-              "name": "pi_jogg",
+              "name": "fuddle_epsilon",
               "schema": "boolean",
-              "@context": "http://dtdl/extension/quantitativeTypes/1"
+              "@context": {}
             }
           }
         }
@@ -394,21 +392,87 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_beta;1",
+        "@id": "dtmi:example:fuddle_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "rho_alpha",
+          "name": "fuddle_lambda",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "pi_hi",
+              "name": "fuddle_kappa",
               "schema": "string"
             },
             "mapValue": {
-              "name": "pi_vroo",
+              "name": "fuddle_iota",
               "schema": "date",
-              "@context": "quantitativeTypes;1"
+              "@context": {
+                "foo": "dtmi:foo:bar;1"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:fuddle_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "fuddle_omicron",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "fuddle_xi",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "fuddle_nu",
+              "schema": "dateTime",
+              "@context": [
+                {}
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:fuddle_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "fuddle_tau",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "fuddle_sigma",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "fuddle_rho",
+              "schema": "double",
+              "@context": [
+                {
+                  "foo": "dtmi:foo:bar;1"
+                }
+              ]
             }
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValueIdDuplicateV3.json b/DTDL/v3/spec/Requirement-ClassMapValueIdDuplicateV3.json
index 04244633..7cb7d0d7 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValueIdDuplicateV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValueIdDuplicateV3.json
@@ -7,23 +7,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_epsilon;1",
+        "@id": "dtmi:example:flunn_psi;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:um_epsilon;1",
+          "@id": "dtmi:example:flunn_psi;1",
           "@type": "Property",
-          "name": "um_theta",
+          "name": "flunn_wum",
           "schema": {
-            "@id": "dtmi:example:um_epsilon;1",
+            "@id": "dtmi:example:flunn_psi;1",
             "@type": "Map",
             "mapKey": {
-              "name": "um_eta",
+              "name": "flunn_yuzz",
               "schema": "string"
             },
             "mapValue": {
-              "@id": "dtmi:example:um_epsilon;1",
-              "name": "um_zeta",
-              "schema": "boolean"
+              "@id": "dtmi:example:flunn_psi;1",
+              "name": "flunn_omega",
+              "schema": "dateTime"
             }
           }
         }
@@ -38,24 +38,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_iota;1",
+        "@id": "dtmi:example:flunn_um;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:um_iota;1",
+          "@id": "dtmi:example:flunn_um;1",
           "@type": "Property",
-          "name": "um_mu",
+          "name": "flunn_glikk",
           "schema": {
-            "@id": "dtmi:example:um_iota;1",
+            "@id": "dtmi:example:flunn_um;1",
             "@type": "Map",
             "mapKey": {
-              "name": "um_lambda",
+              "name": "flunn_fuddle",
               "schema": "string"
             },
             "mapValue": {
               "@context": "dtmi:undefinedExtension:context;1",
-              "@id": "dtmi:example:um_iota;1",
-              "name": "um_kappa",
-              "schema": "date"
+              "@id": "dtmi:example:flunn_um;1",
+              "name": "flunn_humpf",
+              "schema": "double"
             }
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValueIdIsDtmiV3.json b/DTDL/v3/spec/Requirement-ClassMapValueIdIsDtmiV3.json
index 5b45ab55..ec4aeccf 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValueIdIsDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValueIdIsDtmiV3.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_quan;1",
+        "@id": "dtmi:example:quan_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_nuh;1",
+          "@id": "dtmi:example:quan_zeta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_snee",
+            "name": "quan_eta",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;7",
-            "name": "upsilon_glikk",
-            "schema": "date"
+            "name": "quan_epsilon",
+            "schema": "double"
           }
         }
       }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_zatz;1",
+        "@id": "dtmi:example:quan_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_spazz;1",
+          "@id": "dtmi:example:quan_kappa;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_floob",
+            "name": "quan_lambda",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;108675309",
-            "name": "upsilon_thnad",
-            "schema": "dateTime"
+            "name": "quan_iota",
+            "schema": "duration"
           }
         }
       }
@@ -59,19 +59,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_yekk;1",
+        "@id": "dtmi:example:quan_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_flunn;1",
+          "@id": "dtmi:example:quan_xi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_itch",
+            "name": "quan_omicron",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;999999999",
-            "name": "upsilon_jogg",
-            "schema": "double"
+            "name": "quan_nu",
+            "schema": "float"
           }
         }
       }
@@ -85,19 +85,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_beta;1",
+        "@id": "dtmi:example:quan_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_hi;1",
+          "@id": "dtmi:example:quan_sigma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_alpha",
+            "name": "quan_tau",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo;1",
-            "name": "upsilon_vroo",
-            "schema": "duration"
+            "name": "quan_rho",
+            "schema": "integer"
           }
         }
       }
@@ -111,19 +111,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_zeta;1",
+        "@id": "dtmi:example:quan_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_delta;1",
+          "@id": "dtmi:example:quan_chi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_epsilon",
+            "name": "quan_psi",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar",
-            "name": "phi_gamma",
-            "schema": "float"
+            "name": "quan_phi",
+            "schema": "long"
           }
         }
       }
@@ -137,19 +137,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_kappa;1",
+        "@id": "dtmi:example:quan_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_theta;1",
+          "@id": "dtmi:example:quan_wum;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_iota",
+            "name": "quan_um",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;3.14",
-            "name": "phi_eta",
-            "schema": "integer"
+            "name": "quan_yuzz",
+            "schema": "string"
           }
         }
       }
@@ -163,19 +163,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_xi;1",
+        "@id": "dtmi:example:quan_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_mu;1",
+          "@id": "dtmi:example:quan_glikk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_nu",
+            "name": "quan_nuh",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;3.141592",
-            "name": "phi_lambda",
-            "schema": "long"
+            "name": "quan_fuddle",
+            "schema": "time"
           }
         }
       }
@@ -189,19 +189,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_sigma;1",
+        "@id": "dtmi:example:quan_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_pi;1",
+          "@id": "dtmi:example:quan_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_rho",
+            "name": "quan_spazz",
             "schema": "string"
           },
           "mapValue": {
             "@id": null,
-            "name": "phi_omicron",
-            "schema": "string"
+            "name": "quan_quan",
+            "schema": "boolean"
           }
         }
       }
@@ -215,20 +215,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_chi;1",
+        "@id": "dtmi:example:quan_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_upsilon;1",
+          "@id": "dtmi:example:quan_jogg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_phi",
+            "name": "quan_flunn",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": null,
-            "name": "phi_tau",
-            "schema": "time"
+            "name": "quan_zatz",
+            "schema": "date"
           }
         }
       }
@@ -242,19 +242,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_wum;1",
+        "@id": "dtmi:example:thnad_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_omega;1",
+          "@id": "dtmi:example:quan_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_yuzz",
+            "name": "quan_hi",
             "schema": "string"
           },
           "mapValue": {
             "@id": 626,
-            "name": "phi_psi",
-            "schema": "boolean"
+            "name": "quan_yekk",
+            "schema": "dateTime"
           }
         }
       }
@@ -268,20 +268,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_glikk;1",
+        "@id": "dtmi:example:thnad_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_humpf;1",
+          "@id": "dtmi:example:thnad_gamma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_fuddle",
+            "name": "thnad_delta",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": 626,
-            "name": "phi_um",
-            "schema": "date"
+            "name": "thnad_beta",
+            "schema": "double"
           }
         }
       }
@@ -295,19 +295,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_thnad;1",
+        "@id": "dtmi:example:thnad_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_snee;1",
+          "@id": "dtmi:example:thnad_eta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_quan",
+            "name": "thnad_theta",
             "schema": "string"
           },
           "mapValue": {
             "@id": true,
-            "name": "phi_nuh",
-            "schema": "dateTime"
+            "name": "thnad_zeta",
+            "schema": "duration"
           }
         }
       }
@@ -321,20 +321,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_jogg;1",
+        "@id": "dtmi:example:thnad_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_floob;1",
+          "@id": "dtmi:example:thnad_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_zatz",
+            "name": "thnad_mu",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": true,
-            "name": "phi_spazz",
-            "schema": "double"
+            "name": "thnad_kappa",
+            "schema": "float"
           }
         }
       }
@@ -348,21 +348,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_vroo;1",
+        "@id": "dtmi:example:thnad_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:phi_itch;1",
+          "@id": "dtmi:example:thnad_omicron;1",
           "@type": "Map",
           "mapKey": {
-            "name": "phi_yekk",
+            "name": "thnad_pi",
             "schema": "string"
           },
           "mapValue": {
             "@id": {
               "@value": "dtmi:apparently:valid:identifier;3"
             },
-            "name": "phi_flunn",
-            "schema": "duration"
+            "name": "thnad_xi",
+            "schema": "integer"
           }
         }
       }
@@ -376,13 +376,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_gamma;1",
+        "@id": "dtmi:example:thnad_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_alpha;1",
+          "@id": "dtmi:example:thnad_tau;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_beta",
+            "name": "thnad_upsilon",
             "schema": "string"
           },
           "mapValue": {
@@ -390,8 +390,8 @@
             "@id": {
               "@value": "dtmi:apparently:valid:identifier;3"
             },
-            "name": "phi_hi",
-            "schema": "float"
+            "name": "thnad_sigma",
+            "schema": "long"
           }
         }
       }
@@ -405,19 +405,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_eta;1",
+        "@id": "dtmi:example:thnad_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_epsilon;1",
+          "@id": "dtmi:example:thnad_psi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_zeta",
+            "name": "thnad_omega",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;0",
-            "name": "chi_delta",
-            "schema": "integer"
+            "name": "thnad_chi",
+            "schema": "string"
           }
         }
       }
@@ -431,20 +431,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_lambda;1",
+        "@id": "dtmi:example:thnad_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_iota;1",
+          "@id": "dtmi:example:thnad_um;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_kappa",
+            "name": "thnad_humpf",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0",
-            "name": "chi_theta",
-            "schema": "long"
+            "name": "thnad_wum",
+            "schema": "time"
           }
         }
       }
@@ -458,19 +458,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_omicron;1",
+        "@id": "dtmi:example:thnad_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_nu;1",
+          "@id": "dtmi:example:thnad_nuh;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_xi",
+            "name": "thnad_snee",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;0.0",
-            "name": "chi_mu",
-            "schema": "string"
+            "name": "thnad_glikk",
+            "schema": "boolean"
           }
         }
       }
@@ -484,20 +484,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_tau;1",
+        "@id": "dtmi:example:thnad_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_rho;1",
+          "@id": "dtmi:example:thnad_spazz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_sigma",
+            "name": "thnad_floob",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0.0",
-            "name": "chi_pi",
-            "schema": "time"
+            "name": "thnad_thnad",
+            "schema": "date"
           }
         }
       }
@@ -511,19 +511,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_psi;1",
+        "@id": "dtmi:example:thnad_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_phi;1",
+          "@id": "dtmi:example:thnad_flunn;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_chi",
+            "name": "thnad_itch",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;1234567890",
-            "name": "chi_upsilon",
-            "schema": "boolean"
+            "name": "thnad_jogg",
+            "schema": "dateTime"
           }
         }
       }
@@ -537,20 +537,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_um;1",
+        "@id": "dtmi:example:spazz_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_yuzz;1",
+          "@id": "dtmi:example:thnad_hi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_wum",
+            "name": "spazz_alpha",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;1234567890",
-            "name": "chi_omega",
-            "schema": "date"
+            "name": "thnad_vroo",
+            "schema": "double"
           }
         }
       }
@@ -564,19 +564,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_nuh;1",
+        "@id": "dtmi:example:spazz_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_fuddle;1",
+          "@id": "dtmi:example:spazz_delta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_glikk",
+            "name": "spazz_epsilon",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;1a",
-            "name": "chi_humpf",
-            "schema": "dateTime"
+            "name": "spazz_gamma",
+            "schema": "duration"
           }
         }
       }
@@ -590,20 +590,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_spazz;1",
+        "@id": "dtmi:example:spazz_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_quan;1",
+          "@id": "dtmi:example:spazz_theta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_thnad",
+            "name": "spazz_iota",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;1a",
-            "name": "chi_snee",
-            "schema": "double"
+            "name": "spazz_eta",
+            "schema": "float"
           }
         }
       }
@@ -617,19 +617,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_flunn;1",
+        "@id": "dtmi:example:spazz_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_zatz;1",
+          "@id": "dtmi:example:spazz_mu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_jogg",
+            "name": "spazz_nu",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;3.0",
-            "name": "chi_floob",
-            "schema": "duration"
+            "name": "spazz_lambda",
+            "schema": "integer"
           }
         }
       }
@@ -643,20 +643,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_hi;1",
+        "@id": "dtmi:example:spazz_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:chi_yekk;1",
+          "@id": "dtmi:example:spazz_pi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "chi_vroo",
+            "name": "spazz_rho",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.0",
-            "name": "chi_itch",
-            "schema": "float"
+            "name": "spazz_omicron",
+            "schema": "long"
           }
         }
       }
@@ -670,19 +670,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_delta;1",
+        "@id": "dtmi:example:spazz_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_beta;1",
+          "@id": "dtmi:example:spazz_upsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "psi_gamma",
+            "name": "spazz_phi",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;3.1415926",
-            "name": "psi_alpha",
-            "schema": "integer"
+            "name": "spazz_tau",
+            "schema": "string"
           }
         }
       }
@@ -696,20 +696,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_theta;1",
+        "@id": "dtmi:example:spazz_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_zeta;1",
+          "@id": "dtmi:example:spazz_omega;1",
           "@type": "Map",
           "mapKey": {
-            "name": "psi_eta",
+            "name": "spazz_yuzz",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;3.1415926",
-            "name": "psi_epsilon",
-            "schema": "long"
+            "name": "spazz_psi",
+            "schema": "time"
           }
         }
       }
@@ -723,19 +723,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_mu;1",
+        "@id": "dtmi:example:spazz_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_kappa;1",
+          "@id": "dtmi:example:spazz_humpf;1",
           "@type": "Map",
           "mapKey": {
-            "name": "psi_lambda",
+            "name": "spazz_fuddle",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;6.02",
-            "name": "psi_iota",
-            "schema": "string"
+            "name": "spazz_um",
+            "schema": "boolean"
           }
         }
       }
@@ -749,20 +749,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_pi;1",
+        "@id": "dtmi:example:spazz_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_xi;1",
+          "@id": "dtmi:example:spazz_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "psi_omicron",
+            "name": "spazz_quan",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;6.02",
-            "name": "psi_nu",
-            "schema": "time"
+            "name": "spazz_nuh",
+            "schema": "date"
           }
         }
       }
@@ -776,19 +776,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_upsilon;1",
+        "@id": "dtmi:example:spazz_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_sigma;1",
+          "@id": "dtmi:example:spazz_floob;1",
           "@type": "Map",
           "mapKey": {
-            "name": "psi_tau",
+            "name": "spazz_zatz",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;0.1",
-            "name": "psi_rho",
-            "schema": "boolean"
+            "name": "spazz_spazz",
+            "schema": "dateTime"
           }
         }
       }
@@ -802,20 +802,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_omega;1",
+        "@id": "dtmi:example:spazz_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_chi;1",
+          "@id": "dtmi:example:spazz_itch;1",
           "@type": "Map",
           "mapKey": {
-            "name": "psi_psi",
+            "name": "spazz_yekk",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;0.1",
-            "name": "psi_phi",
-            "schema": "date"
+            "name": "spazz_flunn",
+            "schema": "double"
           }
         }
       }
@@ -829,19 +829,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_humpf;1",
+        "@id": "dtmi:example:floob_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_wum;1",
+          "@id": "dtmi:example:floob_alpha;1",
           "@type": "Map",
           "mapKey": {
-            "name": "psi_um",
+            "name": "floob_beta",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;01",
-            "name": "psi_yuzz",
-            "schema": "dateTime"
+            "name": "spazz_hi",
+            "schema": "duration"
           }
         }
       }
@@ -855,20 +855,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_snee;1",
+        "@id": "dtmi:example:floob_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_glikk;1",
+          "@id": "dtmi:example:floob_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "psi_nuh",
+            "name": "floob_zeta",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;01",
-            "name": "psi_fuddle",
-            "schema": "double"
+            "name": "floob_delta",
+            "schema": "float"
           }
         }
       }
@@ -882,19 +882,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_floob;1",
+        "@id": "dtmi:example:floob_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_thnad;1",
+          "@id": "dtmi:example:floob_iota;1",
           "@type": "Map",
           "mapKey": {
-            "name": "psi_spazz",
+            "name": "floob_kappa",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar;",
-            "name": "psi_quan",
-            "schema": "duration"
+            "name": "floob_theta",
+            "schema": "integer"
           }
         }
       }
@@ -908,20 +908,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_itch;1",
+        "@id": "dtmi:example:floob_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_jogg;1",
+          "@id": "dtmi:example:floob_nu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "psi_flunn",
+            "name": "floob_xi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar;",
-            "name": "psi_zatz",
-            "schema": "float"
+            "name": "floob_mu",
+            "schema": "long"
           }
         }
       }
@@ -935,19 +935,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_alpha;1",
+        "@id": "dtmi:example:floob_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:psi_vroo;1",
+          "@id": "dtmi:example:floob_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "psi_hi",
+            "name": "floob_sigma",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:test:invalidId_;1",
-            "name": "psi_yekk",
-            "schema": "integer"
+            "name": "floob_pi",
+            "schema": "string"
           }
         }
       }
@@ -961,20 +961,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_epsilon;1",
+        "@id": "dtmi:example:floob_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_gamma;1",
+          "@id": "dtmi:example:floob_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_delta",
+            "name": "floob_chi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:invalidId_;1",
-            "name": "omega_beta",
-            "schema": "long"
+            "name": "floob_upsilon",
+            "schema": "time"
           }
         }
       }
@@ -988,19 +988,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_iota;1",
+        "@id": "dtmi:example:floob_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_eta;1",
+          "@id": "dtmi:example:floob_yuzz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_theta",
+            "name": "floob_wum",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:test:_invalidUserId;1",
-            "name": "omega_zeta",
-            "schema": "string"
+            "name": "floob_omega",
+            "schema": "boolean"
           }
         }
       }
@@ -1014,20 +1014,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_nu;1",
+        "@id": "dtmi:example:floob_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_lambda;1",
+          "@id": "dtmi:example:floob_fuddle;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_mu",
+            "name": "floob_glikk",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:_invalidUserId;1",
-            "name": "omega_kappa",
-            "schema": "time"
+            "name": "floob_humpf",
+            "schema": "date"
           }
         }
       }
@@ -1041,19 +1041,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_rho;1",
+        "@id": "dtmi:example:floob_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_omicron;1",
+          "@id": "dtmi:example:floob_quan;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_pi",
+            "name": "floob_thnad",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:test:1seg;1",
-            "name": "omega_xi",
-            "schema": "boolean"
+            "name": "floob_snee",
+            "schema": "dateTime"
           }
         }
       }
@@ -1067,20 +1067,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_phi;1",
+        "@id": "dtmi:example:floob_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_tau;1",
+          "@id": "dtmi:example:floob_zatz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_upsilon",
+            "name": "floob_jogg",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:test:1seg;1",
-            "name": "omega_sigma",
-            "schema": "date"
+            "name": "floob_floob",
+            "schema": "double"
           }
         }
       }
@@ -1094,19 +1094,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_yuzz;1",
+        "@id": "dtmi:example:floob_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_psi;1",
+          "@id": "dtmi:example:floob_yekk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_omega",
+            "name": "floob_vroo",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo:bar.baz;1",
-            "name": "omega_chi",
-            "schema": "dateTime"
+            "name": "floob_itch",
+            "schema": "duration"
           }
         }
       }
@@ -1120,20 +1120,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_fuddle;1",
+        "@id": "dtmi:example:zatz_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_um;1",
+          "@id": "dtmi:example:zatz_beta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_humpf",
+            "name": "zatz_gamma",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo:bar.baz;1",
-            "name": "omega_wum",
-            "schema": "double"
+            "name": "zatz_alpha",
+            "schema": "float"
           }
         }
       }
@@ -1147,19 +1147,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_quan;1",
+        "@id": "dtmi:example:zatz_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_nuh;1",
+          "@id": "dtmi:example:zatz_zeta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_snee",
+            "name": "zatz_eta",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:foo::bar;1",
-            "name": "omega_glikk",
-            "schema": "duration"
+            "name": "zatz_epsilon",
+            "schema": "integer"
           }
         }
       }
@@ -1173,20 +1173,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_zatz;1",
+        "@id": "dtmi:example:zatz_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_spazz;1",
+          "@id": "dtmi:example:zatz_kappa;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_floob",
+            "name": "zatz_lambda",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:foo::bar;1",
-            "name": "omega_thnad",
-            "schema": "float"
+            "name": "zatz_iota",
+            "schema": "long"
           }
         }
       }
@@ -1200,19 +1200,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_yekk;1",
+        "@id": "dtmi:example:zatz_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_flunn;1",
+          "@id": "dtmi:example:zatz_xi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omega_itch",
+            "name": "zatz_omicron",
             "schema": "string"
           },
           "mapValue": {
             "@id": "urn:foo:bar:1",
-            "name": "omega_jogg",
-            "schema": "integer"
+            "name": "zatz_nu",
+            "schema": "string"
           }
         }
       }
@@ -1226,20 +1226,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_beta;1",
+        "@id": "dtmi:example:zatz_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omega_hi;1",
+          "@id": "dtmi:example:zatz_sigma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_alpha",
+            "name": "zatz_tau",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "urn:foo:bar:1",
-            "name": "omega_vroo",
-            "schema": "long"
+            "name": "zatz_rho",
+            "schema": "time"
           }
         }
       }
@@ -1253,19 +1253,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_zeta;1",
+        "@id": "dtmi:example:zatz_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_delta;1",
+          "@id": "dtmi:example:zatz_chi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_epsilon",
+            "name": "zatz_psi",
             "schema": "string"
           },
           "mapValue": {
             "@id": "http://foo/bar/baz",
-            "name": "yuzz_gamma",
-            "schema": "string"
+            "name": "zatz_phi",
+            "schema": "boolean"
           }
         }
       }
@@ -1279,20 +1279,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_kappa;1",
+        "@id": "dtmi:example:zatz_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_theta;1",
+          "@id": "dtmi:example:zatz_wum;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_iota",
+            "name": "zatz_um",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "http://foo/bar/baz",
-            "name": "yuzz_eta",
-            "schema": "time"
+            "name": "zatz_yuzz",
+            "schema": "date"
           }
         }
       }
@@ -1306,19 +1306,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_xi;1",
+        "@id": "dtmi:example:zatz_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_mu;1",
+          "@id": "dtmi:example:zatz_glikk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_nu",
+            "name": "zatz_nuh",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:;1",
-            "name": "yuzz_lambda",
-            "schema": "boolean"
+            "name": "zatz_fuddle",
+            "schema": "dateTime"
           }
         }
       }
@@ -1332,20 +1332,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_sigma;1",
+        "@id": "dtmi:example:zatz_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_pi;1",
+          "@id": "dtmi:example:zatz_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_rho",
+            "name": "zatz_spazz",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:;1",
-            "name": "yuzz_omicron",
-            "schema": "date"
+            "name": "zatz_quan",
+            "schema": "double"
           }
         }
       }
@@ -1359,19 +1359,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_chi;1",
+        "@id": "dtmi:example:zatz_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_upsilon;1",
+          "@id": "dtmi:example:zatz_jogg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_phi",
+            "name": "zatz_flunn",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:dtdl:example;1",
-            "name": "yuzz_tau",
-            "schema": "dateTime"
+            "name": "zatz_zatz",
+            "schema": "duration"
           }
         }
       }
@@ -1385,20 +1385,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_wum;1",
+        "@id": "dtmi:example:jogg_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_omega;1",
+          "@id": "dtmi:example:zatz_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_yuzz",
+            "name": "zatz_hi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:dtdl:example;1",
-            "name": "yuzz_psi",
-            "schema": "double"
+            "name": "zatz_yekk",
+            "schema": "float"
           }
         }
       }
@@ -1412,19 +1412,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_glikk;1",
+        "@id": "dtmi:example:jogg_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_humpf;1",
+          "@id": "dtmi:example:jogg_gamma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_fuddle",
+            "name": "jogg_delta",
             "schema": "string"
           },
           "mapValue": {
             "@id": "dtmi:standard:example;1",
-            "name": "yuzz_um",
-            "schema": "duration"
+            "name": "jogg_beta",
+            "schema": "integer"
           }
         }
       }
@@ -1438,20 +1438,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_thnad;1",
+        "@id": "dtmi:example:jogg_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_snee;1",
+          "@id": "dtmi:example:jogg_eta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_quan",
+            "name": "jogg_theta",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@id": "dtmi:standard:example;1",
-            "name": "yuzz_nuh",
-            "schema": "float"
+            "name": "jogg_zeta",
+            "schema": "long"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValueIdNotArrayV3.json b/DTDL/v3/spec/Requirement-ClassMapValueIdNotArrayV3.json
index f74d6307..574516c5 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValueIdNotArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValueIdNotArrayV3.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_jogg;1",
+        "@id": "dtmi:example:jogg_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_floob;1",
+          "@id": "dtmi:example:jogg_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_zatz",
+            "name": "jogg_mu",
             "schema": "string"
           },
           "mapValue": {
             "@id": [
               "dtmi:foo:bar;7"
             ],
-            "name": "yuzz_spazz",
-            "schema": "integer"
+            "name": "jogg_kappa",
+            "schema": "string"
           }
         }
       }
@@ -35,13 +35,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_vroo;1",
+        "@id": "dtmi:example:jogg_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yuzz_itch;1",
+          "@id": "dtmi:example:jogg_omicron;1",
           "@type": "Map",
           "mapKey": {
-            "name": "yuzz_yekk",
+            "name": "jogg_pi",
             "schema": "string"
           },
           "mapValue": {
@@ -49,8 +49,8 @@
             "@id": [
               "dtmi:foo:bar;7"
             ],
-            "name": "yuzz_flunn",
-            "schema": "long"
+            "name": "jogg_xi",
+            "schema": "time"
           }
         }
       }
@@ -64,21 +64,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_gamma;1",
+        "@id": "dtmi:example:jogg_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_alpha;1",
+          "@id": "dtmi:example:jogg_tau;1",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_beta",
+            "name": "jogg_upsilon",
             "schema": "string"
           },
           "mapValue": {
             "@id": [
               "dtmi:foo:bar;108675309"
             ],
-            "name": "yuzz_hi",
-            "schema": "string"
+            "name": "jogg_sigma",
+            "schema": "boolean"
           }
         }
       }
@@ -92,13 +92,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_eta;1",
+        "@id": "dtmi:example:jogg_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_epsilon;1",
+          "@id": "dtmi:example:jogg_psi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_zeta",
+            "name": "jogg_omega",
             "schema": "string"
           },
           "mapValue": {
@@ -106,8 +106,8 @@
             "@id": [
               "dtmi:foo:bar;108675309"
             ],
-            "name": "wum_delta",
-            "schema": "time"
+            "name": "jogg_chi",
+            "schema": "date"
           }
         }
       }
@@ -121,21 +121,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_lambda;1",
+        "@id": "dtmi:example:jogg_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_iota;1",
+          "@id": "dtmi:example:jogg_um;1",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_kappa",
+            "name": "jogg_humpf",
             "schema": "string"
           },
           "mapValue": {
             "@id": [
               "dtmi:foo:bar;999999999"
             ],
-            "name": "wum_theta",
-            "schema": "boolean"
+            "name": "jogg_wum",
+            "schema": "dateTime"
           }
         }
       }
@@ -149,13 +149,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_omicron;1",
+        "@id": "dtmi:example:jogg_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_nu;1",
+          "@id": "dtmi:example:jogg_nuh;1",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_xi",
+            "name": "jogg_snee",
             "schema": "string"
           },
           "mapValue": {
@@ -163,8 +163,8 @@
             "@id": [
               "dtmi:foo:bar;999999999"
             ],
-            "name": "wum_mu",
-            "schema": "date"
+            "name": "jogg_glikk",
+            "schema": "double"
           }
         }
       }
@@ -178,21 +178,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_tau;1",
+        "@id": "dtmi:example:jogg_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_rho;1",
+          "@id": "dtmi:example:jogg_spazz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_sigma",
+            "name": "jogg_floob",
             "schema": "string"
           },
           "mapValue": {
             "@id": [
               "dtmi:foo;1"
             ],
-            "name": "wum_pi",
-            "schema": "dateTime"
+            "name": "jogg_thnad",
+            "schema": "duration"
           }
         }
       }
@@ -206,13 +206,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_psi;1",
+        "@id": "dtmi:example:jogg_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_phi;1",
+          "@id": "dtmi:example:jogg_flunn;1",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_chi",
+            "name": "jogg_itch",
             "schema": "string"
           },
           "mapValue": {
@@ -220,8 +220,8 @@
             "@id": [
               "dtmi:foo;1"
             ],
-            "name": "wum_upsilon",
-            "schema": "double"
+            "name": "jogg_jogg",
+            "schema": "float"
           }
         }
       }
@@ -235,21 +235,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_um;1",
+        "@id": "dtmi:example:flunn_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_yuzz;1",
+          "@id": "dtmi:example:jogg_hi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_wum",
+            "name": "flunn_alpha",
             "schema": "string"
           },
           "mapValue": {
             "@id": [
               "dtmi:foo:bar"
             ],
-            "name": "wum_omega",
-            "schema": "duration"
+            "name": "jogg_vroo",
+            "schema": "integer"
           }
         }
       }
@@ -263,13 +263,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_nuh;1",
+        "@id": "dtmi:example:flunn_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_fuddle;1",
+          "@id": "dtmi:example:flunn_delta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_glikk",
+            "name": "flunn_epsilon",
             "schema": "string"
           },
           "mapValue": {
@@ -277,8 +277,8 @@
             "@id": [
               "dtmi:foo:bar"
             ],
-            "name": "wum_humpf",
-            "schema": "float"
+            "name": "flunn_gamma",
+            "schema": "long"
           }
         }
       }
@@ -292,21 +292,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_spazz;1",
+        "@id": "dtmi:example:flunn_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_quan;1",
+          "@id": "dtmi:example:flunn_theta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_thnad",
+            "name": "flunn_iota",
             "schema": "string"
           },
           "mapValue": {
             "@id": [
               "dtmi:foo:bar;3.14"
             ],
-            "name": "wum_snee",
-            "schema": "integer"
+            "name": "flunn_eta",
+            "schema": "string"
           }
         }
       }
@@ -320,13 +320,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_flunn;1",
+        "@id": "dtmi:example:flunn_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_zatz;1",
+          "@id": "dtmi:example:flunn_mu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_jogg",
+            "name": "flunn_nu",
             "schema": "string"
           },
           "mapValue": {
@@ -334,8 +334,8 @@
             "@id": [
               "dtmi:foo:bar;3.14"
             ],
-            "name": "wum_floob",
-            "schema": "long"
+            "name": "flunn_lambda",
+            "schema": "time"
           }
         }
       }
@@ -349,21 +349,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_hi;1",
+        "@id": "dtmi:example:flunn_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:wum_yekk;1",
+          "@id": "dtmi:example:flunn_pi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "wum_vroo",
+            "name": "flunn_rho",
             "schema": "string"
           },
           "mapValue": {
             "@id": [
               "dtmi:foo:bar;3.141592"
             ],
-            "name": "wum_itch",
-            "schema": "string"
+            "name": "flunn_omicron",
+            "schema": "boolean"
           }
         }
       }
@@ -377,13 +377,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_delta;1",
+        "@id": "dtmi:example:flunn_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_beta;1",
+          "@id": "dtmi:example:flunn_upsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "um_gamma",
+            "name": "flunn_phi",
             "schema": "string"
           },
           "mapValue": {
@@ -391,8 +391,8 @@
             "@id": [
               "dtmi:foo:bar;3.141592"
             ],
-            "name": "um_alpha",
-            "schema": "time"
+            "name": "flunn_tau",
+            "schema": "date"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValueInvalidKeywordsV3.json b/DTDL/v3/spec/Requirement-ClassMapValueInvalidKeywordsV3.json
index 2be90d13..f7217029 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValueInvalidKeywordsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValueInvalidKeywordsV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_chi;1",
+        "@id": "dtmi:example:epsilon_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_upsilon;1",
+          "@id": "dtmi:example:epsilon_jogg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_phi",
+            "name": "epsilon_flunn",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_tau",
-            "schema": "float",
+            "name": "epsilon_zatz",
+            "schema": "long",
             "@graph": {}
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_wum;1",
+        "@id": "dtmi:example:zeta_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_omega;1",
+          "@id": "dtmi:example:epsilon_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_yuzz",
+            "name": "epsilon_hi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "floob_psi",
-            "schema": "integer",
+            "name": "epsilon_yekk",
+            "schema": "string",
             "@graph": {}
           }
         }
@@ -60,18 +60,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_glikk;1",
+        "@id": "dtmi:example:zeta_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_humpf;1",
+          "@id": "dtmi:example:zeta_gamma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_fuddle",
+            "name": "zeta_delta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_um",
-            "schema": "long",
+            "name": "zeta_beta",
+            "schema": "time",
             "@value": 626
           }
         }
@@ -86,19 +86,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_thnad;1",
+        "@id": "dtmi:example:zeta_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_snee;1",
+          "@id": "dtmi:example:zeta_eta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_quan",
+            "name": "zeta_theta",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "floob_nuh",
-            "schema": "string",
+            "name": "zeta_zeta",
+            "schema": "boolean",
             "@value": 626
           }
         }
@@ -113,18 +113,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_jogg;1",
+        "@id": "dtmi:example:zeta_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_floob;1",
+          "@id": "dtmi:example:zeta_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_zatz",
+            "name": "zeta_mu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_spazz",
-            "schema": "time",
+            "name": "zeta_kappa",
+            "schema": "date",
             "@language": "en"
           }
         }
@@ -139,19 +139,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_vroo;1",
+        "@id": "dtmi:example:zeta_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_itch;1",
+          "@id": "dtmi:example:zeta_omicron;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_yekk",
+            "name": "zeta_pi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "floob_flunn",
-            "schema": "boolean",
+            "name": "zeta_xi",
+            "schema": "dateTime",
             "@language": "en"
           }
         }
@@ -166,18 +166,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_gamma;1",
+        "@id": "dtmi:example:zeta_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_alpha;1",
+          "@id": "dtmi:example:zeta_tau;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_beta",
+            "name": "zeta_upsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "floob_hi",
-            "schema": "date",
+            "name": "zeta_sigma",
+            "schema": "double",
             "@foobar": true
           }
         }
@@ -192,19 +192,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_eta;1",
+        "@id": "dtmi:example:zeta_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_epsilon;1",
+          "@id": "dtmi:example:zeta_psi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_zeta",
+            "name": "zeta_omega",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zatz_delta",
-            "schema": "dateTime",
+            "name": "zeta_chi",
+            "schema": "duration",
             "@foobar": true
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValuePropertyCommentStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassMapValuePropertyCommentStringLengthV3.json
index 4e9a3043..3b73557a 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValuePropertyCommentStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValuePropertyCommentStringLengthV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_xi;1",
+        "@id": "dtmi:example:yekk_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_mu;1",
+          "@id": "dtmi:example:yekk_glikk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_nu",
+            "name": "yekk_nuh",
             "schema": "string"
           },
           "mapValue": {
-            "name": "fuddle_lambda",
-            "schema": "double",
+            "name": "yekk_fuddle",
+            "schema": "float",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_sigma;1",
+        "@id": "dtmi:example:yekk_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_pi;1",
+          "@id": "dtmi:example:yekk_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_rho",
+            "name": "yekk_spazz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "fuddle_omicron",
-            "schema": "duration",
+            "name": "yekk_quan",
+            "schema": "integer",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
@@ -59,19 +59,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_chi;1",
+        "@id": "dtmi:example:yekk_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_upsilon;1",
+          "@id": "dtmi:example:yekk_jogg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_phi",
+            "name": "yekk_flunn",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "fuddle_tau",
-            "schema": "float",
+            "name": "yekk_zatz",
+            "schema": "long",
             "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValuePropertyCommentStringV3.json b/DTDL/v3/spec/Requirement-ClassMapValuePropertyCommentStringV3.json
index d3bfca38..8b559746 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValuePropertyCommentStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValuePropertyCommentStringV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_pi;1",
+        "@id": "dtmi:example:flunn_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_xi;1",
+          "@id": "dtmi:example:flunn_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "um_omicron",
+            "name": "flunn_quan",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_nu",
-            "schema": "dateTime",
+            "name": "flunn_nuh",
+            "schema": "duration",
             "comment": "hello"
           }
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_upsilon;1",
+        "@id": "dtmi:example:flunn_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_sigma;1",
+          "@id": "dtmi:example:flunn_floob;1",
           "@type": "Map",
           "mapKey": {
-            "name": "um_tau",
+            "name": "flunn_zatz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_rho",
-            "schema": "double",
+            "name": "flunn_spazz",
+            "schema": "float",
             "comment": [
               "hello"
             ]
@@ -61,18 +61,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_omega;1",
+        "@id": "dtmi:example:flunn_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_chi;1",
+          "@id": "dtmi:example:flunn_itch;1",
           "@type": "Map",
           "mapKey": {
-            "name": "um_psi",
+            "name": "flunn_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_phi",
-            "schema": "duration",
+            "name": "flunn_flunn",
+            "schema": "integer",
             "comment": {
               "@value": "hello",
               "@type": "xsd:string"
@@ -90,18 +90,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_humpf;1",
+        "@id": "dtmi:example:itch_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_wum;1",
+          "@id": "dtmi:example:itch_alpha;1",
           "@type": "Map",
           "mapKey": {
-            "name": "um_um",
+            "name": "itch_beta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_yuzz",
-            "schema": "float",
+            "name": "flunn_hi",
+            "schema": "long",
             "comment": [
               {
                 "@value": "hello",
@@ -121,18 +121,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_snee;1",
+        "@id": "dtmi:example:itch_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_glikk;1",
+          "@id": "dtmi:example:itch_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "um_nuh",
+            "name": "itch_zeta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_fuddle",
-            "schema": "integer",
+            "name": "itch_delta",
+            "schema": "string",
             "comment": []
           }
         }
@@ -147,18 +147,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_floob;1",
+        "@id": "dtmi:example:itch_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_thnad;1",
+          "@id": "dtmi:example:itch_iota;1",
           "@type": "Map",
           "mapKey": {
-            "name": "um_spazz",
+            "name": "itch_kappa",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_quan",
-            "schema": "long",
+            "name": "itch_theta",
+            "schema": "time",
             "comment": null
           }
         }
@@ -173,19 +173,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_itch;1",
+        "@id": "dtmi:example:itch_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_jogg;1",
+          "@id": "dtmi:example:itch_nu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "um_flunn",
+            "name": "itch_xi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "um_zatz",
-            "schema": "string",
+            "name": "itch_mu",
+            "schema": "boolean",
             "comment": null
           }
         }
@@ -200,18 +200,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_alpha;1",
+        "@id": "dtmi:example:itch_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:um_vroo;1",
+          "@id": "dtmi:example:itch_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "um_hi",
+            "name": "itch_sigma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "um_yekk",
-            "schema": "time",
+            "name": "itch_pi",
+            "schema": "date",
             "comment": true
           }
         }
@@ -226,19 +226,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_epsilon;1",
+        "@id": "dtmi:example:itch_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_gamma;1",
+          "@id": "dtmi:example:itch_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_delta",
+            "name": "itch_chi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "humpf_beta",
-            "schema": "boolean",
+            "name": "itch_upsilon",
+            "schema": "dateTime",
             "comment": true
           }
         }
@@ -253,18 +253,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_iota;1",
+        "@id": "dtmi:example:itch_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_eta;1",
+          "@id": "dtmi:example:itch_yuzz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_theta",
+            "name": "itch_wum",
             "schema": "string"
           },
           "mapValue": {
-            "name": "humpf_zeta",
-            "schema": "date",
+            "name": "itch_omega",
+            "schema": "double",
             "comment": 626
           }
         }
@@ -279,19 +279,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_nu;1",
+        "@id": "dtmi:example:itch_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_lambda;1",
+          "@id": "dtmi:example:itch_fuddle;1",
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_mu",
+            "name": "itch_glikk",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "humpf_kappa",
-            "schema": "dateTime",
+            "name": "itch_humpf",
+            "schema": "duration",
             "comment": 626
           }
         }
@@ -306,18 +306,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_rho;1",
+        "@id": "dtmi:example:itch_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_omicron;1",
+          "@id": "dtmi:example:itch_quan;1",
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_pi",
+            "name": "itch_thnad",
             "schema": "string"
           },
           "mapValue": {
-            "name": "humpf_xi",
-            "schema": "double",
+            "name": "itch_snee",
+            "schema": "float",
             "comment": [
               null
             ]
@@ -334,19 +334,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_phi;1",
+        "@id": "dtmi:example:itch_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_tau;1",
+          "@id": "dtmi:example:itch_zatz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_upsilon",
+            "name": "itch_jogg",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "humpf_sigma",
-            "schema": "duration",
+            "name": "itch_floob",
+            "schema": "integer",
             "comment": [
               null
             ]
@@ -363,18 +363,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_yuzz;1",
+        "@id": "dtmi:example:itch_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_psi;1",
+          "@id": "dtmi:example:itch_yekk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_omega",
+            "name": "itch_vroo",
             "schema": "string"
           },
           "mapValue": {
-            "name": "humpf_chi",
-            "schema": "float",
+            "name": "itch_itch",
+            "schema": "long",
             "comment": [
               true
             ]
@@ -391,19 +391,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_fuddle;1",
+        "@id": "dtmi:example:yekk_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_um;1",
+          "@id": "dtmi:example:yekk_beta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_humpf",
+            "name": "yekk_gamma",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "humpf_wum",
-            "schema": "integer",
+            "name": "yekk_alpha",
+            "schema": "string",
             "comment": [
               true
             ]
@@ -420,18 +420,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_quan;1",
+        "@id": "dtmi:example:yekk_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_nuh;1",
+          "@id": "dtmi:example:yekk_zeta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_snee",
+            "name": "yekk_eta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "humpf_glikk",
-            "schema": "long",
+            "name": "yekk_epsilon",
+            "schema": "time",
             "comment": [
               626
             ]
@@ -448,19 +448,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_zatz;1",
+        "@id": "dtmi:example:yekk_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_spazz;1",
+          "@id": "dtmi:example:yekk_kappa;1",
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_floob",
+            "name": "yekk_lambda",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "humpf_thnad",
-            "schema": "string",
+            "name": "yekk_iota",
+            "schema": "boolean",
             "comment": [
               626
             ]
@@ -477,18 +477,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_yekk;1",
+        "@id": "dtmi:example:yekk_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_flunn;1",
+          "@id": "dtmi:example:yekk_xi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "humpf_itch",
+            "name": "yekk_omicron",
             "schema": "string"
           },
           "mapValue": {
-            "name": "humpf_jogg",
-            "schema": "time",
+            "name": "yekk_nu",
+            "schema": "date",
             "comment": {}
           }
         }
@@ -503,19 +503,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_beta;1",
+        "@id": "dtmi:example:yekk_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:humpf_hi;1",
+          "@id": "dtmi:example:yekk_sigma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_alpha",
+            "name": "yekk_tau",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "humpf_vroo",
-            "schema": "boolean",
+            "name": "yekk_rho",
+            "schema": "dateTime",
             "comment": {}
           }
         }
@@ -530,18 +530,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_zeta;1",
+        "@id": "dtmi:example:yekk_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_delta;1",
+          "@id": "dtmi:example:yekk_chi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_epsilon",
+            "name": "yekk_psi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "fuddle_gamma",
-            "schema": "date",
+            "name": "yekk_phi",
+            "schema": "double",
             "comment": [
               {}
             ]
@@ -558,19 +558,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_kappa;1",
+        "@id": "dtmi:example:yekk_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_theta;1",
+          "@id": "dtmi:example:yekk_wum;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_iota",
+            "name": "yekk_um",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "fuddle_eta",
-            "schema": "dateTime",
+            "name": "yekk_yuzz",
+            "schema": "duration",
             "comment": [
               {}
             ]
diff --git a/DTDL/v3/spec/Requirement-ClassMapValuePropertyCommentTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassMapValuePropertyCommentTermAndDtmiV3.json
index 3c1f6423..f3625b15 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValuePropertyCommentTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValuePropertyCommentTermAndDtmiV3.json
@@ -7,20 +7,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_hi;1",
+        "@id": "dtmi:example:vroo_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:fuddle_yekk;1",
+          "@id": "dtmi:example:vroo_pi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "fuddle_vroo",
+            "name": "vroo_rho",
             "schema": "string"
           },
           "mapValue": {
-            "comment": "fuddle_jogg",
-            "dtmi:dtdl:property:comment;3": "fuddle_flunn",
-            "name": "fuddle_itch",
-            "schema": "time"
+            "comment": "vroo_nu",
+            "dtmi:dtdl:property:comment;3": "vroo_xi",
+            "name": "vroo_omicron",
+            "schema": "date"
           }
         }
       }
@@ -34,21 +34,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_zeta;1",
+        "@id": "dtmi:example:vroo_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_delta;1",
+          "@id": "dtmi:example:vroo_chi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_epsilon",
+            "name": "vroo_psi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "comment": "glikk_alpha",
-            "dtmi:dtdl:property:comment;3": "glikk_beta",
-            "name": "glikk_gamma",
-            "schema": "boolean"
+            "comment": "vroo_tau",
+            "dtmi:dtdl:property:comment;3": "vroo_upsilon",
+            "name": "vroo_phi",
+            "schema": "dateTime"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValuePropertyDescriptionLangStringV3.json b/DTDL/v3/spec/Requirement-ClassMapValuePropertyDescriptionLangStringV3.json
index 55d87f55..03b67f5e 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValuePropertyDescriptionLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValuePropertyDescriptionLangStringV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_kappa;1",
+        "@id": "dtmi:example:vroo_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_theta;1",
+          "@id": "dtmi:example:vroo_wum;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_iota",
+            "name": "vroo_um",
             "schema": "string"
           },
           "mapValue": {
-            "name": "glikk_eta",
-            "schema": "date",
+            "name": "vroo_yuzz",
+            "schema": "double",
             "description": "hello"
           }
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_xi;1",
+        "@id": "dtmi:example:vroo_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_mu;1",
+          "@id": "dtmi:example:vroo_glikk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_nu",
+            "name": "vroo_nuh",
             "schema": "string"
           },
           "mapValue": {
-            "name": "glikk_lambda",
-            "schema": "dateTime",
+            "name": "vroo_fuddle",
+            "schema": "duration",
             "description": [
               "hello"
             ]
@@ -61,18 +61,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_sigma;1",
+        "@id": "dtmi:example:vroo_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_pi;1",
+          "@id": "dtmi:example:vroo_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_rho",
+            "name": "vroo_spazz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "glikk_omicron",
-            "schema": "double",
+            "name": "vroo_quan",
+            "schema": "float",
             "description": {
               "en": "hello"
             }
@@ -89,18 +89,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_chi;1",
+        "@id": "dtmi:example:vroo_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_upsilon;1",
+          "@id": "dtmi:example:vroo_jogg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_phi",
+            "name": "vroo_flunn",
             "schema": "string"
           },
           "mapValue": {
-            "name": "glikk_tau",
-            "schema": "duration",
+            "name": "vroo_zatz",
+            "schema": "integer",
             "description": [
               {
                 "@value": "hello",
@@ -120,18 +120,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_wum;1",
+        "@id": "dtmi:example:hi_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_omega;1",
+          "@id": "dtmi:example:vroo_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_yuzz",
+            "name": "vroo_hi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "glikk_psi",
-            "schema": "float",
+            "name": "vroo_yekk",
+            "schema": "long",
             "description": {}
           }
         }
@@ -146,18 +146,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_glikk;1",
+        "@id": "dtmi:example:hi_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_humpf;1",
+          "@id": "dtmi:example:hi_gamma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_fuddle",
+            "name": "hi_delta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "glikk_um",
-            "schema": "integer",
+            "name": "hi_beta",
+            "schema": "string",
             "description": []
           }
         }
@@ -172,18 +172,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_thnad;1",
+        "@id": "dtmi:example:hi_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_snee;1",
+          "@id": "dtmi:example:hi_eta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_quan",
+            "name": "hi_theta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "glikk_nuh",
-            "schema": "long",
+            "name": "hi_zeta",
+            "schema": "time",
             "description": null
           }
         }
@@ -198,19 +198,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_jogg;1",
+        "@id": "dtmi:example:hi_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_floob;1",
+          "@id": "dtmi:example:hi_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_zatz",
+            "name": "hi_mu",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "glikk_spazz",
-            "schema": "string",
+            "name": "hi_kappa",
+            "schema": "boolean",
             "description": null
           }
         }
@@ -225,18 +225,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_vroo;1",
+        "@id": "dtmi:example:hi_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:glikk_itch;1",
+          "@id": "dtmi:example:hi_omicron;1",
           "@type": "Map",
           "mapKey": {
-            "name": "glikk_yekk",
+            "name": "hi_pi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "glikk_flunn",
-            "schema": "time",
+            "name": "hi_xi",
+            "schema": "date",
             "description": true
           }
         }
@@ -251,19 +251,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_gamma;1",
+        "@id": "dtmi:example:hi_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_alpha;1",
+          "@id": "dtmi:example:hi_tau;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_beta",
+            "name": "hi_upsilon",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "glikk_hi",
-            "schema": "boolean",
+            "name": "hi_sigma",
+            "schema": "dateTime",
             "description": true
           }
         }
@@ -278,18 +278,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_eta;1",
+        "@id": "dtmi:example:hi_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_epsilon;1",
+          "@id": "dtmi:example:hi_psi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_zeta",
+            "name": "hi_omega",
             "schema": "string"
           },
           "mapValue": {
-            "name": "nuh_delta",
-            "schema": "date",
+            "name": "hi_chi",
+            "schema": "double",
             "description": 626
           }
         }
@@ -304,19 +304,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_lambda;1",
+        "@id": "dtmi:example:hi_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_iota;1",
+          "@id": "dtmi:example:hi_um;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_kappa",
+            "name": "hi_humpf",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nuh_theta",
-            "schema": "dateTime",
+            "name": "hi_wum",
+            "schema": "duration",
             "description": 626
           }
         }
@@ -331,18 +331,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_omicron;1",
+        "@id": "dtmi:example:hi_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_nu;1",
+          "@id": "dtmi:example:hi_nuh;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_xi",
+            "name": "hi_snee",
             "schema": "string"
           },
           "mapValue": {
-            "name": "nuh_mu",
-            "schema": "double",
+            "name": "hi_glikk",
+            "schema": "float",
             "description": [
               null
             ]
@@ -359,19 +359,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_tau;1",
+        "@id": "dtmi:example:hi_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_rho;1",
+          "@id": "dtmi:example:hi_spazz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_sigma",
+            "name": "hi_floob",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nuh_pi",
-            "schema": "duration",
+            "name": "hi_thnad",
+            "schema": "integer",
             "description": [
               null
             ]
@@ -388,18 +388,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_psi;1",
+        "@id": "dtmi:example:hi_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_phi;1",
+          "@id": "dtmi:example:hi_flunn;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_chi",
+            "name": "hi_itch",
             "schema": "string"
           },
           "mapValue": {
-            "name": "nuh_upsilon",
-            "schema": "float",
+            "name": "hi_jogg",
+            "schema": "long",
             "description": [
               true
             ]
@@ -416,19 +416,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_um;1",
+        "@id": "dtmi:example:alpha_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_yuzz;1",
+          "@id": "dtmi:example:hi_hi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_wum",
+            "name": "alpha_alpha",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nuh_omega",
-            "schema": "integer",
+            "name": "hi_vroo",
+            "schema": "string",
             "description": [
               true
             ]
@@ -445,18 +445,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_nuh;1",
+        "@id": "dtmi:example:alpha_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_fuddle;1",
+          "@id": "dtmi:example:alpha_delta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_glikk",
+            "name": "alpha_epsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "nuh_humpf",
-            "schema": "long",
+            "name": "alpha_gamma",
+            "schema": "time",
             "description": [
               626
             ]
@@ -473,19 +473,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_spazz;1",
+        "@id": "dtmi:example:alpha_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_quan;1",
+          "@id": "dtmi:example:alpha_theta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_thnad",
+            "name": "alpha_iota",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nuh_snee",
-            "schema": "string",
+            "name": "alpha_eta",
+            "schema": "boolean",
             "description": [
               626
             ]
@@ -502,18 +502,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_flunn;1",
+        "@id": "dtmi:example:alpha_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_zatz;1",
+          "@id": "dtmi:example:alpha_mu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_jogg",
+            "name": "alpha_nu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "nuh_floob",
-            "schema": "time",
+            "name": "alpha_lambda",
+            "schema": "date",
             "description": [
               {}
             ]
@@ -530,19 +530,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_hi;1",
+        "@id": "dtmi:example:alpha_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nuh_yekk;1",
+          "@id": "dtmi:example:alpha_pi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nuh_vroo",
+            "name": "alpha_rho",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nuh_itch",
-            "schema": "boolean",
+            "name": "alpha_omicron",
+            "schema": "dateTime",
             "description": [
               {}
             ]
@@ -559,18 +559,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_delta;1",
+        "@id": "dtmi:example:alpha_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_beta;1",
+          "@id": "dtmi:example:alpha_upsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_gamma",
+            "name": "alpha_phi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "snee_alpha",
-            "schema": "date",
+            "name": "alpha_tau",
+            "schema": "double",
             "description": {
               "@value": "hello",
               "@language": "en"
@@ -588,19 +588,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_theta;1",
+        "@id": "dtmi:example:alpha_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_zeta;1",
+          "@id": "dtmi:example:alpha_omega;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_eta",
+            "name": "alpha_yuzz",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "snee_epsilon",
-            "schema": "dateTime",
+            "name": "alpha_psi",
+            "schema": "duration",
             "description": {
               "@value": "hello",
               "@language": "en"
@@ -618,18 +618,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_mu;1",
+        "@id": "dtmi:example:alpha_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_kappa;1",
+          "@id": "dtmi:example:alpha_humpf;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_lambda",
+            "name": "alpha_fuddle",
             "schema": "string"
           },
           "mapValue": {
-            "name": "snee_iota",
-            "schema": "double",
+            "name": "alpha_um",
+            "schema": "float",
             "description": [
               {
                 "en": "hello"
@@ -648,19 +648,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_pi;1",
+        "@id": "dtmi:example:alpha_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_xi;1",
+          "@id": "dtmi:example:alpha_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_omicron",
+            "name": "alpha_quan",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "snee_nu",
-            "schema": "duration",
+            "name": "alpha_nuh",
+            "schema": "integer",
             "description": [
               {
                 "en": "hello"
diff --git a/DTDL/v3/spec/Requirement-ClassMapValuePropertyDescriptionStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassMapValuePropertyDescriptionStringLengthV3.json
index f71bbaf6..d14ee300 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValuePropertyDescriptionStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValuePropertyDescriptionStringLengthV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_upsilon;1",
+        "@id": "dtmi:example:alpha_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_sigma;1",
+          "@id": "dtmi:example:alpha_floob;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_tau",
+            "name": "alpha_zatz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "snee_rho",
-            "schema": "float",
+            "name": "alpha_spazz",
+            "schema": "long",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_omega;1",
+        "@id": "dtmi:example:alpha_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_chi;1",
+          "@id": "dtmi:example:alpha_itch;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_psi",
+            "name": "alpha_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "snee_phi",
-            "schema": "integer",
+            "name": "alpha_flunn",
+            "schema": "string",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
@@ -59,19 +59,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_humpf;1",
+        "@id": "dtmi:example:beta_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:snee_wum;1",
+          "@id": "dtmi:example:beta_alpha;1",
           "@type": "Map",
           "mapKey": {
-            "name": "snee_um",
+            "name": "beta_beta",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "snee_yuzz",
-            "schema": "long",
+            "name": "alpha_hi",
+            "schema": "time",
             "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValuePropertyDescriptionTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassMapValuePropertyDescriptionTermAndDtmiV3.json
index 63cb8448..fdc86f13 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValuePropertyDescriptionTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValuePropertyDescriptionTermAndDtmiV3.json
@@ -7,24 +7,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_zeta;1",
+        "@id": "dtmi:example:beta_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_delta;1",
+          "@id": "dtmi:example:beta_chi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_epsilon",
+            "name": "beta_psi",
             "schema": "string"
           },
           "mapValue": {
             "description": [
-              "quan_alpha"
+              "beta_tau"
             ],
             "dtmi:dtdl:property:description;3": [
-              "quan_beta"
+              "beta_upsilon"
             ],
-            "name": "quan_gamma",
-            "schema": "date"
+            "name": "beta_phi",
+            "schema": "double"
           }
         }
       }
@@ -38,25 +38,25 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_mu;1",
+        "@id": "dtmi:example:beta_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_kappa;1",
+          "@id": "dtmi:example:beta_humpf;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_lambda",
+            "name": "beta_fuddle",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "description": [
-              "quan_eta"
+              "beta_yuzz"
             ],
             "dtmi:dtdl:property:description;3": [
-              "quan_theta"
+              "beta_wum"
             ],
-            "name": "quan_iota",
-            "schema": "dateTime"
+            "name": "beta_um",
+            "schema": "duration"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValuePropertyDisplayNameLangStringV3.json b/DTDL/v3/spec/Requirement-ClassMapValuePropertyDisplayNameLangStringV3.json
index b7130795..25631db4 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValuePropertyDisplayNameLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValuePropertyDisplayNameLangStringV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_pi;1",
+        "@id": "dtmi:example:beta_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_xi;1",
+          "@id": "dtmi:example:beta_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_omicron",
+            "name": "beta_quan",
             "schema": "string"
           },
           "mapValue": {
-            "name": "quan_nu",
-            "schema": "double",
+            "name": "beta_nuh",
+            "schema": "float",
             "displayName": "hello"
           }
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_upsilon;1",
+        "@id": "dtmi:example:beta_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_sigma;1",
+          "@id": "dtmi:example:beta_floob;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_tau",
+            "name": "beta_zatz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "quan_rho",
-            "schema": "duration",
+            "name": "beta_spazz",
+            "schema": "integer",
             "displayName": [
               "hello"
             ]
@@ -61,18 +61,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_omega;1",
+        "@id": "dtmi:example:beta_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_chi;1",
+          "@id": "dtmi:example:beta_itch;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_psi",
+            "name": "beta_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "quan_phi",
-            "schema": "float",
+            "name": "beta_flunn",
+            "schema": "long",
             "displayName": {
               "en": "hello"
             }
@@ -89,18 +89,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_humpf;1",
+        "@id": "dtmi:example:gamma_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_wum;1",
+          "@id": "dtmi:example:gamma_alpha;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_um",
+            "name": "gamma_beta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "quan_yuzz",
-            "schema": "integer",
+            "name": "beta_hi",
+            "schema": "string",
             "displayName": [
               {
                 "@value": "hello",
@@ -120,18 +120,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_snee;1",
+        "@id": "dtmi:example:gamma_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_glikk;1",
+          "@id": "dtmi:example:gamma_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_nuh",
+            "name": "gamma_zeta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "quan_fuddle",
-            "schema": "long",
+            "name": "gamma_delta",
+            "schema": "time",
             "displayName": {}
           }
         }
@@ -146,18 +146,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_floob;1",
+        "@id": "dtmi:example:gamma_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_thnad;1",
+          "@id": "dtmi:example:gamma_iota;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_spazz",
+            "name": "gamma_kappa",
             "schema": "string"
           },
           "mapValue": {
-            "name": "quan_quan",
-            "schema": "string",
+            "name": "gamma_theta",
+            "schema": "boolean",
             "displayName": []
           }
         }
@@ -172,18 +172,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_itch;1",
+        "@id": "dtmi:example:gamma_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_jogg;1",
+          "@id": "dtmi:example:gamma_nu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_flunn",
+            "name": "gamma_xi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "quan_zatz",
-            "schema": "time",
+            "name": "gamma_mu",
+            "schema": "date",
             "displayName": null
           }
         }
@@ -198,19 +198,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_alpha;1",
+        "@id": "dtmi:example:gamma_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:quan_vroo;1",
+          "@id": "dtmi:example:gamma_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "quan_hi",
+            "name": "gamma_sigma",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "quan_yekk",
-            "schema": "boolean",
+            "name": "gamma_pi",
+            "schema": "dateTime",
             "displayName": null
           }
         }
@@ -225,18 +225,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_epsilon;1",
+        "@id": "dtmi:example:gamma_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_gamma;1",
+          "@id": "dtmi:example:gamma_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_delta",
+            "name": "gamma_chi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "thnad_beta",
-            "schema": "date",
+            "name": "gamma_upsilon",
+            "schema": "double",
             "displayName": true
           }
         }
@@ -251,19 +251,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_iota;1",
+        "@id": "dtmi:example:gamma_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_eta;1",
+          "@id": "dtmi:example:gamma_yuzz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_theta",
+            "name": "gamma_wum",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "thnad_zeta",
-            "schema": "dateTime",
+            "name": "gamma_omega",
+            "schema": "duration",
             "displayName": true
           }
         }
@@ -278,18 +278,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_nu;1",
+        "@id": "dtmi:example:gamma_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_lambda;1",
+          "@id": "dtmi:example:gamma_fuddle;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_mu",
+            "name": "gamma_glikk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "thnad_kappa",
-            "schema": "double",
+            "name": "gamma_humpf",
+            "schema": "float",
             "displayName": 626
           }
         }
@@ -304,19 +304,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_rho;1",
+        "@id": "dtmi:example:gamma_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_omicron;1",
+          "@id": "dtmi:example:gamma_quan;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_pi",
+            "name": "gamma_thnad",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "thnad_xi",
-            "schema": "duration",
+            "name": "gamma_snee",
+            "schema": "integer",
             "displayName": 626
           }
         }
@@ -331,18 +331,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_phi;1",
+        "@id": "dtmi:example:gamma_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_tau;1",
+          "@id": "dtmi:example:gamma_zatz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_upsilon",
+            "name": "gamma_jogg",
             "schema": "string"
           },
           "mapValue": {
-            "name": "thnad_sigma",
-            "schema": "float",
+            "name": "gamma_floob",
+            "schema": "long",
             "displayName": [
               null
             ]
@@ -359,19 +359,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_yuzz;1",
+        "@id": "dtmi:example:gamma_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_psi;1",
+          "@id": "dtmi:example:gamma_yekk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_omega",
+            "name": "gamma_vroo",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "thnad_chi",
-            "schema": "integer",
+            "name": "gamma_itch",
+            "schema": "string",
             "displayName": [
               null
             ]
@@ -388,18 +388,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_fuddle;1",
+        "@id": "dtmi:example:delta_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_um;1",
+          "@id": "dtmi:example:delta_beta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_humpf",
+            "name": "delta_gamma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "thnad_wum",
-            "schema": "long",
+            "name": "delta_alpha",
+            "schema": "time",
             "displayName": [
               true
             ]
@@ -416,19 +416,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_quan;1",
+        "@id": "dtmi:example:delta_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_nuh;1",
+          "@id": "dtmi:example:delta_zeta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_snee",
+            "name": "delta_eta",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "thnad_glikk",
-            "schema": "string",
+            "name": "delta_epsilon",
+            "schema": "boolean",
             "displayName": [
               true
             ]
@@ -445,18 +445,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_zatz;1",
+        "@id": "dtmi:example:delta_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_spazz;1",
+          "@id": "dtmi:example:delta_kappa;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_floob",
+            "name": "delta_lambda",
             "schema": "string"
           },
           "mapValue": {
-            "name": "thnad_thnad",
-            "schema": "time",
+            "name": "delta_iota",
+            "schema": "date",
             "displayName": [
               626
             ]
@@ -473,19 +473,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_yekk;1",
+        "@id": "dtmi:example:delta_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_flunn;1",
+          "@id": "dtmi:example:delta_xi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "thnad_itch",
+            "name": "delta_omicron",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "thnad_jogg",
-            "schema": "boolean",
+            "name": "delta_nu",
+            "schema": "dateTime",
             "displayName": [
               626
             ]
@@ -502,18 +502,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_beta;1",
+        "@id": "dtmi:example:delta_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:thnad_hi;1",
+          "@id": "dtmi:example:delta_sigma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_alpha",
+            "name": "delta_tau",
             "schema": "string"
           },
           "mapValue": {
-            "name": "thnad_vroo",
-            "schema": "date",
+            "name": "delta_rho",
+            "schema": "double",
             "displayName": [
               {}
             ]
@@ -530,19 +530,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_zeta;1",
+        "@id": "dtmi:example:delta_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_delta;1",
+          "@id": "dtmi:example:delta_chi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_epsilon",
+            "name": "delta_psi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "spazz_gamma",
-            "schema": "dateTime",
+            "name": "delta_phi",
+            "schema": "duration",
             "displayName": [
               {}
             ]
@@ -559,18 +559,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_kappa;1",
+        "@id": "dtmi:example:delta_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_theta;1",
+          "@id": "dtmi:example:delta_wum;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_iota",
+            "name": "delta_um",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_eta",
-            "schema": "double",
+            "name": "delta_yuzz",
+            "schema": "float",
             "displayName": {
               "@value": "hello",
               "@language": "en"
@@ -588,19 +588,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_xi;1",
+        "@id": "dtmi:example:delta_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_mu;1",
+          "@id": "dtmi:example:delta_glikk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_nu",
+            "name": "delta_nuh",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "spazz_lambda",
-            "schema": "duration",
+            "name": "delta_fuddle",
+            "schema": "integer",
             "displayName": {
               "@value": "hello",
               "@language": "en"
@@ -618,18 +618,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_sigma;1",
+        "@id": "dtmi:example:delta_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_pi;1",
+          "@id": "dtmi:example:delta_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_rho",
+            "name": "delta_spazz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_omicron",
-            "schema": "float",
+            "name": "delta_quan",
+            "schema": "long",
             "displayName": [
               {
                 "en": "hello"
@@ -648,19 +648,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_chi;1",
+        "@id": "dtmi:example:delta_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_upsilon;1",
+          "@id": "dtmi:example:delta_jogg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_phi",
+            "name": "delta_flunn",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "spazz_tau",
-            "schema": "integer",
+            "name": "delta_zatz",
+            "schema": "string",
             "displayName": [
               {
                 "en": "hello"
diff --git a/DTDL/v3/spec/Requirement-ClassMapValuePropertyDisplayNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassMapValuePropertyDisplayNameStringLengthV3.json
index 6fff4ffd..9f110f5c 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValuePropertyDisplayNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValuePropertyDisplayNameStringLengthV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_wum;1",
+        "@id": "dtmi:example:epsilon_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_omega;1",
+          "@id": "dtmi:example:delta_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_yuzz",
+            "name": "delta_hi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_psi",
-            "schema": "long",
+            "name": "delta_yekk",
+            "schema": "time",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_glikk;1",
+        "@id": "dtmi:example:epsilon_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_humpf;1",
+          "@id": "dtmi:example:epsilon_gamma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_fuddle",
+            "name": "epsilon_delta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "spazz_um",
-            "schema": "string",
+            "name": "epsilon_beta",
+            "schema": "boolean",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
@@ -59,19 +59,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_thnad;1",
+        "@id": "dtmi:example:epsilon_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:spazz_snee;1",
+          "@id": "dtmi:example:epsilon_eta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "spazz_quan",
+            "name": "epsilon_theta",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "spazz_nuh",
-            "schema": "time",
+            "name": "epsilon_zeta",
+            "schema": "date",
             "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValuePropertyDisplayNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassMapValuePropertyDisplayNameTermAndDtmiV3.json
index fa1b3078..ec4ad8a8 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValuePropertyDisplayNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValuePropertyDisplayNameTermAndDtmiV3.json
@@ -7,24 +7,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_mu;1",
+        "@id": "dtmi:example:epsilon_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_kappa;1",
+          "@id": "dtmi:example:epsilon_humpf;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_lambda",
+            "name": "epsilon_fuddle",
             "schema": "string"
           },
           "mapValue": {
             "displayName": [
-              "floob_eta"
+              "epsilon_yuzz"
             ],
             "dtmi:dtdl:property:displayName;3": [
-              "floob_theta"
+              "epsilon_wum"
             ],
-            "name": "floob_iota",
-            "schema": "double"
+            "name": "epsilon_um",
+            "schema": "float"
           }
         }
       }
@@ -38,25 +38,25 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_sigma;1",
+        "@id": "dtmi:example:epsilon_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:floob_pi;1",
+          "@id": "dtmi:example:epsilon_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "floob_rho",
+            "name": "epsilon_spazz",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
             "displayName": [
-              "floob_nu"
+              "epsilon_nuh"
             ],
             "dtmi:dtdl:property:displayName;3": [
-              "floob_xi"
+              "epsilon_snee"
             ],
-            "name": "floob_omicron",
-            "schema": "duration"
+            "name": "epsilon_quan",
+            "schema": "integer"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValuePropertyFormallyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Requirement-ClassMapValuePropertyFormallyIrrelevantDtmiOrTermV3.json
index 16f2bc2d..df04535e 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValuePropertyFormallyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValuePropertyFormallyIrrelevantDtmiOrTermV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_um;1",
+        "@id": "dtmi:example:eta_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_yuzz;1",
+          "@id": "dtmi:example:zeta_hi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_wum",
+            "name": "eta_alpha",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_omega",
-            "schema": "long",
+            "name": "zeta_vroo",
+            "schema": "time",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_nuh;1",
+        "@id": "dtmi:example:eta_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_fuddle;1",
+          "@id": "dtmi:example:eta_delta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_glikk",
+            "name": "eta_epsilon",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zatz_humpf",
-            "schema": "string",
+            "name": "eta_gamma",
+            "schema": "boolean",
             "dtmi:foo:bar;1": 626
           }
         }
@@ -60,18 +60,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_spazz;1",
+        "@id": "dtmi:example:eta_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_quan;1",
+          "@id": "dtmi:example:eta_theta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_thnad",
+            "name": "eta_iota",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zatz_snee",
-            "schema": "time",
+            "name": "eta_eta",
+            "schema": "date",
             "boolean": null
           }
         }
@@ -86,19 +86,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_flunn;1",
+        "@id": "dtmi:example:eta_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_zatz;1",
+          "@id": "dtmi:example:eta_mu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_jogg",
+            "name": "eta_nu",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zatz_floob",
-            "schema": "boolean",
+            "name": "eta_lambda",
+            "schema": "dateTime",
             "boolean": null
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValuePropertyFormallyUndefinedTermV3.json b/DTDL/v3/spec/Requirement-ClassMapValuePropertyFormallyUndefinedTermV3.json
index af1d3a41..c0df55ee 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValuePropertyFormallyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValuePropertyFormallyUndefinedTermV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_omega;1",
+        "@id": "dtmi:example:eta_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_chi;1",
+          "@id": "dtmi:example:eta_itch;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_psi",
+            "name": "eta_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "jogg_phi",
-            "schema": "long",
+            "name": "eta_flunn",
+            "schema": "time",
             "foobar": {}
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_humpf;1",
+        "@id": "dtmi:example:theta_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_wum;1",
+          "@id": "dtmi:example:theta_alpha;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_um",
+            "name": "theta_beta",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "jogg_yuzz",
-            "schema": "string",
+            "name": "eta_hi",
+            "schema": "boolean",
             "foobar": {}
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValuePropertyInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassMapValuePropertyInvalidDtmiV3.json
index 3098a45b..5799eb7d 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValuePropertyInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValuePropertyInvalidDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_hi;1",
+        "@id": "dtmi:example:eta_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zatz_yekk;1",
+          "@id": "dtmi:example:eta_pi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zatz_vroo",
+            "name": "eta_rho",
             "schema": "string"
           },
           "mapValue": {
@@ -21,8 +21,8 @@
               "MapValue",
               "Foobar"
             ],
-            "name": "zatz_itch",
-            "schema": "date",
+            "name": "eta_omicron",
+            "schema": "double",
             "dtmi:foo//bar": 626
           }
         }
@@ -37,13 +37,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_delta;1",
+        "@id": "dtmi:example:eta_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_beta;1",
+          "@id": "dtmi:example:eta_upsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_gamma",
+            "name": "eta_phi",
             "schema": "string"
           },
           "mapValue": {
@@ -52,8 +52,8 @@
               "MapValue",
               "Foobar"
             ],
-            "name": "jogg_alpha",
-            "schema": "dateTime",
+            "name": "eta_tau",
+            "schema": "duration",
             "dtmi:foo//bar": 626
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValuePropertyNamePatternV3.json b/DTDL/v3/spec/Requirement-ClassMapValuePropertyNamePatternV3.json
index d043b7ec..30d53f93 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValuePropertyNamePatternV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValuePropertyNamePatternV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_floob;1",
+        "@id": "dtmi:example:pi_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_thnad;1",
+          "@id": "dtmi:example:pi_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_spazz",
+            "name": "pi_spazz",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "dateTime",
+            "schema": "boolean",
             "name": "EARTH"
           }
         }
@@ -32,17 +32,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_flunn;1",
+        "@id": "dtmi:example:pi_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_zatz;1",
+          "@id": "dtmi:example:pi_zatz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_jogg",
+            "name": "pi_jogg",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "double",
+            "schema": "date",
             "name": "Air"
           }
         }
@@ -57,17 +57,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_vroo;1",
+        "@id": "dtmi:example:pi_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_itch;1",
+          "@id": "dtmi:example:pi_itch;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_yekk",
+            "name": "pi_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "duration",
+            "schema": "dateTime",
             "name": "fire"
           }
         }
@@ -82,17 +82,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_beta;1",
+        "@id": "dtmi:example:rho_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_hi;1",
+          "@id": "dtmi:example:pi_hi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_alpha",
+            "name": "rho_alpha",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "float",
+            "schema": "double",
             "name": "hello_world"
           }
         }
@@ -107,17 +107,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_epsilon;1",
+        "@id": "dtmi:example:rho_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_gamma;1",
+          "@id": "dtmi:example:rho_gamma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_delta",
+            "name": "rho_delta",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "integer",
+            "schema": "duration",
             "name": "Anarchy99"
           }
         }
@@ -132,17 +132,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_theta;1",
+        "@id": "dtmi:example:rho_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_zeta;1",
+          "@id": "dtmi:example:rho_zeta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_eta",
+            "name": "rho_eta",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "long",
+            "schema": "float",
             "name": "23skidoo"
           }
         }
@@ -157,18 +157,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_lambda;1",
+        "@id": "dtmi:example:rho_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_iota;1",
+          "@id": "dtmi:example:rho_iota;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_kappa",
+            "name": "rho_kappa",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "string",
+            "schema": "integer",
             "name": "23skidoo"
           }
         }
@@ -183,17 +183,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_xi;1",
+        "@id": "dtmi:example:rho_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_mu;1",
+          "@id": "dtmi:example:rho_mu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_nu",
+            "name": "rho_nu",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "time",
+            "schema": "long",
             "name": "626"
           }
         }
@@ -208,18 +208,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_rho;1",
+        "@id": "dtmi:example:rho_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_omicron;1",
+          "@id": "dtmi:example:rho_omicron;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_pi",
+            "name": "rho_pi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "boolean",
+            "schema": "string",
             "name": "626"
           }
         }
@@ -234,17 +234,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_upsilon;1",
+        "@id": "dtmi:example:rho_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_sigma;1",
+          "@id": "dtmi:example:rho_sigma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_tau",
+            "name": "rho_tau",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "date",
+            "schema": "time",
             "name": "goodbye-world"
           }
         }
@@ -259,18 +259,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_psi;1",
+        "@id": "dtmi:example:rho_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_phi;1",
+          "@id": "dtmi:example:rho_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_chi",
+            "name": "rho_chi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "dateTime",
+            "schema": "boolean",
             "name": "goodbye-world"
           }
         }
@@ -285,17 +285,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_wum;1",
+        "@id": "dtmi:example:rho_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_omega;1",
+          "@id": "dtmi:example:rho_omega;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_yuzz",
+            "name": "rho_yuzz",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "double",
+            "schema": "date",
             "name": "_haha"
           }
         }
@@ -310,18 +310,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_fuddle;1",
+        "@id": "dtmi:example:rho_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_um;1",
+          "@id": "dtmi:example:rho_um;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_humpf",
+            "name": "rho_humpf",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "duration",
+            "schema": "dateTime",
             "name": "_haha"
           }
         }
@@ -336,17 +336,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_snee;1",
+        "@id": "dtmi:example:rho_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_glikk;1",
+          "@id": "dtmi:example:rho_glikk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_nuh",
+            "name": "rho_nuh",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "float",
+            "schema": "double",
             "name": "toodaloo_"
           }
         }
@@ -361,18 +361,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_spazz;1",
+        "@id": "dtmi:example:rho_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_quan;1",
+          "@id": "dtmi:example:rho_quan;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_thnad",
+            "name": "rho_thnad",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "integer",
+            "schema": "duration",
             "name": "toodaloo_"
           }
         }
@@ -387,17 +387,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_jogg;1",
+        "@id": "dtmi:example:rho_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_floob;1",
+          "@id": "dtmi:example:rho_floob;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_zatz",
+            "name": "rho_zatz",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "long",
+            "schema": "float",
             "name": "pro:con"
           }
         }
@@ -412,18 +412,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_yekk;1",
+        "@id": "dtmi:example:rho_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_flunn;1",
+          "@id": "dtmi:example:rho_flunn;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_itch",
+            "name": "rho_itch",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "string",
+            "schema": "integer",
             "name": "pro:con"
           }
         }
@@ -438,17 +438,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_alpha;1",
+        "@id": "dtmi:example:sigma_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_vroo;1",
+          "@id": "dtmi:example:rho_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "epsilon_hi",
+            "name": "rho_hi",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "time",
+            "schema": "long",
             "name": "mish/mash"
           }
         }
@@ -463,18 +463,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_delta;1",
+        "@id": "dtmi:example:sigma_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_beta;1",
+          "@id": "dtmi:example:sigma_beta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_gamma",
+            "name": "sigma_gamma",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "boolean",
+            "schema": "string",
             "name": "mish/mash"
           }
         }
@@ -489,17 +489,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_eta;1",
+        "@id": "dtmi:example:sigma_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_epsilon;1",
+          "@id": "dtmi:example:sigma_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_zeta",
+            "name": "sigma_zeta",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "date",
+            "schema": "time",
             "name": "#tag"
           }
         }
@@ -514,18 +514,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_kappa;1",
+        "@id": "dtmi:example:sigma_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_theta;1",
+          "@id": "dtmi:example:sigma_theta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_iota",
+            "name": "sigma_iota",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "dateTime",
+            "schema": "boolean",
             "name": "#tag"
           }
         }
@@ -540,17 +540,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_nu;1",
+        "@id": "dtmi:example:sigma_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_lambda;1",
+          "@id": "dtmi:example:sigma_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_mu",
+            "name": "sigma_mu",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "double",
+            "schema": "date",
             "name": "@tweet"
           }
         }
@@ -565,18 +565,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_pi;1",
+        "@id": "dtmi:example:sigma_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_xi;1",
+          "@id": "dtmi:example:sigma_xi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_omicron",
+            "name": "sigma_omicron",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "duration",
+            "schema": "dateTime",
             "name": "@tweet"
           }
         }
@@ -591,17 +591,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_tau;1",
+        "@id": "dtmi:example:sigma_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_rho;1",
+          "@id": "dtmi:example:sigma_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_sigma",
+            "name": "sigma_sigma",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "float",
+            "schema": "double",
             "name": "$money"
           }
         }
@@ -616,18 +616,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_chi;1",
+        "@id": "dtmi:example:sigma_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_upsilon;1",
+          "@id": "dtmi:example:sigma_upsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_phi",
+            "name": "sigma_phi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "integer",
+            "schema": "duration",
             "name": "$money"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValuePropertyNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassMapValuePropertyNameStringLengthV3.json
index 0f5fd006..352306ba 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValuePropertyNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValuePropertyNameStringLengthV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_um;1",
+        "@id": "dtmi:example:pi_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_yuzz;1",
+          "@id": "dtmi:example:pi_yuzz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_wum",
+            "name": "pi_wum",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "time",
+            "schema": "long",
             "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
           }
         }
@@ -32,17 +32,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_glikk;1",
+        "@id": "dtmi:example:pi_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_humpf;1",
+          "@id": "dtmi:example:pi_humpf;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_fuddle",
+            "name": "pi_fuddle",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "boolean",
+            "schema": "string",
             "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
@@ -57,18 +57,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_quan;1",
+        "@id": "dtmi:example:pi_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_nuh;1",
+          "@id": "dtmi:example:pi_nuh;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_snee",
+            "name": "pi_snee",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "date",
+            "schema": "time",
             "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValuePropertyNameStringV3.json b/DTDL/v3/spec/Requirement-ClassMapValuePropertyNameStringV3.json
index 5904e824..6fd157d1 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValuePropertyNameStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValuePropertyNameStringV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_delta;1",
+        "@id": "dtmi:example:omicron_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_beta;1",
+          "@id": "dtmi:example:omicron_beta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_gamma",
+            "name": "omicron_gamma",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "long",
+            "schema": "float",
             "name": "hello"
           }
         }
@@ -32,17 +32,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_eta;1",
+        "@id": "dtmi:example:omicron_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_epsilon;1",
+          "@id": "dtmi:example:omicron_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_zeta",
+            "name": "omicron_zeta",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "string",
+            "schema": "integer",
             "name": [
               "hello"
             ]
@@ -59,17 +59,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_kappa;1",
+        "@id": "dtmi:example:omicron_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_theta;1",
+          "@id": "dtmi:example:omicron_theta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_iota",
+            "name": "omicron_iota",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "time",
+            "schema": "long",
             "name": {
               "@value": "hello",
               "@type": "xsd:string"
@@ -87,17 +87,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_nu;1",
+        "@id": "dtmi:example:omicron_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_lambda;1",
+          "@id": "dtmi:example:omicron_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_mu",
+            "name": "omicron_mu",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "boolean",
+            "schema": "string",
             "name": [
               {
                 "@value": "hello",
@@ -117,17 +117,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_pi;1",
+        "@id": "dtmi:example:omicron_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_xi;1",
+          "@id": "dtmi:example:omicron_xi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_omicron",
+            "name": "omicron_omicron",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "date",
+            "schema": "time",
             "name": null
           }
         }
@@ -142,18 +142,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_tau;1",
+        "@id": "dtmi:example:omicron_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_rho;1",
+          "@id": "dtmi:example:omicron_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_sigma",
+            "name": "omicron_sigma",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "dateTime",
+            "schema": "boolean",
             "name": null
           }
         }
@@ -168,17 +168,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_chi;1",
+        "@id": "dtmi:example:omicron_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_upsilon;1",
+          "@id": "dtmi:example:omicron_upsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_phi",
+            "name": "omicron_phi",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "double",
+            "schema": "date",
             "name": true
           }
         }
@@ -193,18 +193,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_yuzz;1",
+        "@id": "dtmi:example:omicron_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_psi;1",
+          "@id": "dtmi:example:omicron_psi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_omega",
+            "name": "omicron_omega",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "duration",
+            "schema": "dateTime",
             "name": true
           }
         }
@@ -219,17 +219,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_humpf;1",
+        "@id": "dtmi:example:omicron_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_wum;1",
+          "@id": "dtmi:example:omicron_wum;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_um",
+            "name": "omicron_um",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "float",
+            "schema": "double",
             "name": 626
           }
         }
@@ -244,18 +244,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_nuh;1",
+        "@id": "dtmi:example:omicron_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_fuddle;1",
+          "@id": "dtmi:example:omicron_fuddle;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_glikk",
+            "name": "omicron_glikk",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "integer",
+            "schema": "duration",
             "name": 626
           }
         }
@@ -270,17 +270,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_thnad;1",
+        "@id": "dtmi:example:omicron_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_snee;1",
+          "@id": "dtmi:example:omicron_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_quan",
+            "name": "omicron_quan",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "long",
+            "schema": "float",
             "name": [
               null
             ]
@@ -297,18 +297,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_zatz;1",
+        "@id": "dtmi:example:omicron_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_spazz;1",
+          "@id": "dtmi:example:omicron_spazz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_floob",
+            "name": "omicron_floob",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "string",
+            "schema": "integer",
             "name": [
               null
             ]
@@ -325,17 +325,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_itch;1",
+        "@id": "dtmi:example:omicron_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_jogg;1",
+          "@id": "dtmi:example:omicron_jogg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_flunn",
+            "name": "omicron_flunn",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "time",
+            "schema": "long",
             "name": [
               true
             ]
@@ -352,18 +352,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_hi;1",
+        "@id": "dtmi:example:omicron_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_yekk;1",
+          "@id": "dtmi:example:omicron_yekk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "gamma_vroo",
+            "name": "omicron_vroo",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "boolean",
+            "schema": "string",
             "name": [
               true
             ]
@@ -380,17 +380,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_gamma;1",
+        "@id": "dtmi:example:pi_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_alpha;1",
+          "@id": "dtmi:example:pi_alpha;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_beta",
+            "name": "pi_beta",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "date",
+            "schema": "time",
             "name": [
               626
             ]
@@ -407,18 +407,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_zeta;1",
+        "@id": "dtmi:example:pi_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_delta;1",
+          "@id": "dtmi:example:pi_delta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_epsilon",
+            "name": "pi_epsilon",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "dateTime",
+            "schema": "boolean",
             "name": [
               626
             ]
@@ -435,17 +435,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_iota;1",
+        "@id": "dtmi:example:pi_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_eta;1",
+          "@id": "dtmi:example:pi_eta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_theta",
+            "name": "pi_theta",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "double",
+            "schema": "date",
             "name": {}
           }
         }
@@ -460,18 +460,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_mu;1",
+        "@id": "dtmi:example:pi_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_kappa;1",
+          "@id": "dtmi:example:pi_kappa;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_lambda",
+            "name": "pi_lambda",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "duration",
+            "schema": "dateTime",
             "name": {}
           }
         }
@@ -486,17 +486,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_omicron;1",
+        "@id": "dtmi:example:pi_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_nu;1",
+          "@id": "dtmi:example:pi_nu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_xi",
+            "name": "pi_xi",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "float",
+            "schema": "double",
             "name": [
               {}
             ]
@@ -513,18 +513,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_sigma;1",
+        "@id": "dtmi:example:pi_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_pi;1",
+          "@id": "dtmi:example:pi_pi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_rho",
+            "name": "pi_rho",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "integer",
+            "schema": "duration",
             "name": [
               {}
             ]
@@ -541,17 +541,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_phi;1",
+        "@id": "dtmi:example:pi_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_tau;1",
+          "@id": "dtmi:example:pi_tau;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_upsilon",
+            "name": "pi_upsilon",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "long",
+            "schema": "float",
             "name": []
           }
         }
@@ -566,18 +566,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_omega;1",
+        "@id": "dtmi:example:pi_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_chi;1",
+          "@id": "dtmi:example:pi_chi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "delta_psi",
+            "name": "pi_psi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "string",
+            "schema": "integer",
             "name": []
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValuePropertyNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassMapValuePropertyNameTermAndDtmiV3.json
index 3b81c07e..9e36996d 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValuePropertyNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValuePropertyNameTermAndDtmiV3.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_flunn;1",
+        "@id": "dtmi:example:sigma_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_zatz;1",
+          "@id": "dtmi:example:sigma_zatz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_jogg",
+            "name": "sigma_jogg",
             "schema": "string"
           },
           "mapValue": {
-            "name": "zeta_spazz",
-            "dtmi:dtdl:property:name;3": "zeta_floob",
-            "schema": "boolean"
+            "name": "sigma_spazz",
+            "dtmi:dtdl:property:name;3": "sigma_floob",
+            "schema": "string"
           }
         }
       }
@@ -33,20 +33,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_alpha;1",
+        "@id": "dtmi:example:tau_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_vroo;1",
+          "@id": "dtmi:example:sigma_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "zeta_hi",
+            "name": "sigma_hi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "zeta_itch",
-            "dtmi:dtdl:property:name;3": "zeta_yekk",
-            "schema": "date"
+            "name": "sigma_itch",
+            "dtmi:dtdl:property:name;3": "sigma_yekk",
+            "schema": "time"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValuePropertyNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassMapValuePropertyNotDtmiNorTermV3.json
index b9485472..60db737c 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValuePropertyNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValuePropertyNotDtmiNorTermV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_theta;1",
+        "@id": "dtmi:example:eta_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_zeta;1",
+          "@id": "dtmi:example:eta_omega;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_eta",
+            "name": "eta_yuzz",
             "schema": "string"
           },
           "mapValue": {
@@ -21,8 +21,8 @@
               "MapValue",
               "Foobar"
             ],
-            "name": "jogg_epsilon",
-            "schema": "double",
+            "name": "eta_psi",
+            "schema": "float",
             "http://foo.com/bar": true
           }
         }
@@ -37,13 +37,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_mu;1",
+        "@id": "dtmi:example:eta_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_kappa;1",
+          "@id": "dtmi:example:eta_humpf;1",
           "@type": "Map",
           "mapKey": {
-            "name": "jogg_lambda",
+            "name": "eta_fuddle",
             "schema": "string"
           },
           "mapValue": {
@@ -52,8 +52,8 @@
               "MapValue",
               "Foobar"
             ],
-            "name": "jogg_iota",
-            "schema": "duration",
+            "name": "eta_um",
+            "schema": "integer",
             "http://foo.com/bar": true
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValuePropertySchemaElementV3.json b/DTDL/v3/spec/Requirement-ClassMapValuePropertySchemaElementV3.json
index ed4ca765..acf19769 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValuePropertySchemaElementV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValuePropertySchemaElementV3.json
@@ -7,22 +7,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_epsilon;1",
+        "@id": "dtmi:example:tau_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "eta_delta",
+          "name": "tau_delta",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "eta_gamma",
+              "name": "tau_gamma",
               "schema": "string"
             },
             "mapValue": {
-              "name": "eta_beta",
+              "name": "tau_beta",
               "schema": {
                 "@type": "Array",
-                "elementSchema": "dateTime"
+                "elementSchema": "boolean"
               }
             }
           }
@@ -38,23 +38,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_iota;1",
+        "@id": "dtmi:example:tau_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "eta_theta",
+          "name": "tau_theta",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "eta_eta",
+              "name": "tau_eta",
               "schema": "string"
             },
             "mapValue": {
-              "name": "eta_zeta",
+              "name": "tau_zeta",
               "schema": [
                 {
                   "@type": "Array",
-                  "elementSchema": "double"
+                  "elementSchema": "date"
                 }
               ]
             }
@@ -71,24 +71,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_kappa;1",
+        "@id": "dtmi:example:tau_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Array",
-          "elementSchema": "duration"
+          "elementSchema": "dateTime"
         },
         "contents": {
           "@type": "Property",
-          "name": "eta_nu",
+          "name": "tau_nu",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "eta_mu",
+              "name": "tau_mu",
               "schema": "string"
             },
             "mapValue": {
-              "name": "eta_lambda",
+              "name": "tau_lambda",
               "schema": "dtmi:ex:dependentRef;1"
             }
           }
@@ -104,24 +104,24 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_xi;1",
+        "@id": "dtmi:example:tau_xi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Array",
-          "elementSchema": "float"
+          "elementSchema": "double"
         },
         "contents": {
           "@type": "Property",
-          "name": "eta_rho",
+          "name": "tau_rho",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "eta_pi",
+              "name": "tau_pi",
               "schema": "string"
             },
             "mapValue": {
-              "name": "eta_omicron",
+              "name": "tau_omicron",
               "schema": [
                 "dtmi:ex:dependentRef;1"
               ]
@@ -139,23 +139,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_chi;1",
+        "@id": "dtmi:example:tau_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "eta_phi",
+          "name": "tau_phi",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "eta_upsilon",
+              "name": "tau_upsilon",
               "schema": "string"
             },
             "mapValue": {
-              "name": "eta_tau",
+              "name": "tau_tau",
               "schema": {
-                "@id": "dtmi:example:eta_sigma;1",
+                "@id": "dtmi:example:tau_sigma;1",
                 "@type": "Array",
-                "elementSchema": "integer",
+                "elementSchema": "duration",
                 "@context": "dtmi:dtdl:context;2"
               }
             }
@@ -172,7 +172,74 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_psi;1",
+        "@id": "dtmi:example:tau_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "tau_wum",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "tau_yuzz",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "tau_omega",
+              "schema": {
+                "@id": "dtmi:example:tau_psi;1",
+                "@type": "Array",
+                "elementSchema": "decimal",
+                "@context": "dtmi:dtdl:context;4"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:tau_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "tau_nuh",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "tau_glikk",
+              "schema": "string"
+            },
+            "mapValue": {
+              "@context": "dtmi:undefinedExtension:context;1",
+              "name": "tau_fuddle",
+              "schema": {
+                "@id": "dtmi:example:tau_humpf;1",
+                "@type": "Array",
+                "elementSchema": "double",
+                "@context": "dtmi:dtdl:context;4"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:tau_quan;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
@@ -181,15 +248,15 @@
         },
         "contents": {
           "@type": "Property",
-          "name": "eta_wum",
+          "name": "tau_floob",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "eta_yuzz",
+              "name": "tau_spazz",
               "schema": "string"
             },
             "mapValue": {
-              "name": "eta_omega",
+              "name": "tau_thnad",
               "schema": [
                 {
                   "@type": "Array",
@@ -211,7 +278,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_um;1",
+        "@id": "dtmi:example:tau_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
@@ -220,16 +287,16 @@
         },
         "contents": {
           "@type": "Property",
-          "name": "eta_glikk",
+          "name": "tau_itch",
           "schema": {
             "@type": "Map",
             "mapKey": {
-              "name": "eta_fuddle",
+              "name": "tau_flunn",
               "schema": "string"
             },
             "mapValue": {
               "@context": "dtmi:undefinedExtension:context;1",
-              "name": "eta_humpf",
+              "name": "tau_jogg",
               "schema": [
                 {
                   "@type": "Array",
@@ -251,17 +318,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_thnad;1",
+        "@id": "dtmi:example:upsilon_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_snee;1",
+          "@id": "dtmi:example:tau_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "eta_quan",
+            "name": "tau_hi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "eta_nuh",
+            "name": "tau_yekk",
             "schema": "string"
           }
         }
@@ -276,17 +343,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_jogg;1",
+        "@id": "dtmi:example:upsilon_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_floob;1",
+          "@id": "dtmi:example:upsilon_gamma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "eta_zatz",
+            "name": "upsilon_delta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "eta_spazz",
+            "name": "upsilon_beta",
             "schema": [
               "string"
             ]
@@ -303,17 +370,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_vroo;1",
+        "@id": "dtmi:example:upsilon_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_itch;1",
+          "@id": "dtmi:example:upsilon_eta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "eta_yekk",
+            "name": "upsilon_theta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "eta_flunn",
+            "name": "upsilon_zeta",
             "schema": "dtmi:dtdl:instance:Schema:string;3"
           }
         }
@@ -328,17 +395,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_gamma;1",
+        "@id": "dtmi:example:upsilon_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_alpha;1",
+          "@id": "dtmi:example:upsilon_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_beta",
+            "name": "upsilon_mu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "eta_hi",
+            "name": "upsilon_kappa",
             "schema": [
               "dtmi:dtdl:instance:Schema:string;3"
             ]
@@ -355,17 +422,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_eta;1",
+        "@id": "dtmi:example:upsilon_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_epsilon;1",
+          "@id": "dtmi:example:upsilon_omicron;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_zeta",
+            "name": "upsilon_pi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_delta",
+            "name": "upsilon_xi",
             "schema": "point"
           }
         }
@@ -380,17 +447,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_lambda;1",
+        "@id": "dtmi:example:upsilon_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_iota;1",
+          "@id": "dtmi:example:upsilon_tau;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_kappa",
+            "name": "upsilon_upsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_theta",
+            "name": "upsilon_sigma",
             "schema": [
               "point"
             ]
@@ -407,17 +474,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_omicron;1",
+        "@id": "dtmi:example:upsilon_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_nu;1",
+          "@id": "dtmi:example:upsilon_psi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_xi",
+            "name": "upsilon_omega",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_mu",
+            "name": "upsilon_chi",
             "schema": "dtmi:standard:schema:geospatial:point;3"
           }
         }
@@ -432,17 +499,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_tau;1",
+        "@id": "dtmi:example:upsilon_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_rho;1",
+          "@id": "dtmi:example:upsilon_um;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_sigma",
+            "name": "upsilon_humpf",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_pi",
+            "name": "upsilon_wum",
             "schema": [
               "dtmi:standard:schema:geospatial:point;3"
             ]
@@ -459,17 +526,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_psi;1",
+        "@id": "dtmi:example:upsilon_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_phi;1",
+          "@id": "dtmi:example:upsilon_nuh;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_chi",
+            "name": "upsilon_snee",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_upsilon",
+            "name": "upsilon_glikk",
             "schema": "Foobar"
           }
         }
@@ -484,18 +551,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_um;1",
+        "@id": "dtmi:example:upsilon_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_yuzz;1",
+          "@id": "dtmi:example:upsilon_spazz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_wum",
+            "name": "upsilon_floob",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "theta_omega",
+            "name": "upsilon_thnad",
             "schema": "Foobar"
           }
         }
@@ -510,17 +577,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_nuh;1",
+        "@id": "dtmi:example:upsilon_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_fuddle;1",
+          "@id": "dtmi:example:upsilon_flunn;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_glikk",
+            "name": "upsilon_itch",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_humpf",
+            "name": "upsilon_jogg",
             "schema": null
           }
         }
@@ -535,18 +602,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_spazz;1",
+        "@id": "dtmi:example:phi_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_quan;1",
+          "@id": "dtmi:example:upsilon_hi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_thnad",
+            "name": "phi_alpha",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "theta_snee",
+            "name": "upsilon_vroo",
             "schema": null
           }
         }
@@ -561,17 +628,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_flunn;1",
+        "@id": "dtmi:example:phi_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_zatz;1",
+          "@id": "dtmi:example:phi_delta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_jogg",
+            "name": "phi_epsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "theta_floob",
+            "name": "phi_gamma",
             "schema": true
           }
         }
@@ -586,18 +653,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_hi;1",
+        "@id": "dtmi:example:phi_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_yekk;1",
+          "@id": "dtmi:example:phi_theta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "theta_vroo",
+            "name": "phi_iota",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "theta_itch",
+            "name": "phi_eta",
             "schema": true
           }
         }
@@ -612,17 +679,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_delta;1",
+        "@id": "dtmi:example:phi_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_beta;1",
+          "@id": "dtmi:example:phi_mu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "iota_gamma",
+            "name": "phi_nu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "iota_alpha",
+            "name": "phi_lambda",
             "schema": 626
           }
         }
@@ -637,18 +704,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_theta;1",
+        "@id": "dtmi:example:phi_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_zeta;1",
+          "@id": "dtmi:example:phi_pi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "iota_eta",
+            "name": "phi_rho",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "iota_epsilon",
+            "name": "phi_omicron",
             "schema": 626
           }
         }
@@ -663,17 +730,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_mu;1",
+        "@id": "dtmi:example:phi_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_kappa;1",
+          "@id": "dtmi:example:phi_upsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "iota_lambda",
+            "name": "phi_phi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "iota_iota",
+            "name": "phi_tau",
             "schema": [
               null
             ]
@@ -690,18 +757,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_pi;1",
+        "@id": "dtmi:example:phi_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_xi;1",
+          "@id": "dtmi:example:phi_omega;1",
           "@type": "Map",
           "mapKey": {
-            "name": "iota_omicron",
+            "name": "phi_yuzz",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "iota_nu",
+            "name": "phi_psi",
             "schema": [
               null
             ]
@@ -718,17 +785,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_upsilon;1",
+        "@id": "dtmi:example:phi_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_sigma;1",
+          "@id": "dtmi:example:phi_humpf;1",
           "@type": "Map",
           "mapKey": {
-            "name": "iota_tau",
+            "name": "phi_fuddle",
             "schema": "string"
           },
           "mapValue": {
-            "name": "iota_rho",
+            "name": "phi_um",
             "schema": [
               true
             ]
@@ -745,18 +812,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_omega;1",
+        "@id": "dtmi:example:phi_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_chi;1",
+          "@id": "dtmi:example:phi_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "iota_psi",
+            "name": "phi_quan",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "iota_phi",
+            "name": "phi_nuh",
             "schema": [
               true
             ]
@@ -773,17 +840,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_humpf;1",
+        "@id": "dtmi:example:phi_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_wum;1",
+          "@id": "dtmi:example:phi_floob;1",
           "@type": "Map",
           "mapKey": {
-            "name": "iota_um",
+            "name": "phi_zatz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "iota_yuzz",
+            "name": "phi_spazz",
             "schema": [
               626
             ]
@@ -800,18 +867,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_snee;1",
+        "@id": "dtmi:example:phi_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_glikk;1",
+          "@id": "dtmi:example:phi_itch;1",
           "@type": "Map",
           "mapKey": {
-            "name": "iota_nuh",
+            "name": "phi_yekk",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "iota_fuddle",
+            "name": "phi_flunn",
             "schema": [
               626
             ]
@@ -828,17 +895,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_floob;1",
+        "@id": "dtmi:example:chi_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_thnad;1",
+          "@id": "dtmi:example:chi_alpha;1",
           "@type": "Map",
           "mapKey": {
-            "name": "iota_spazz",
+            "name": "chi_beta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "iota_quan",
+            "name": "phi_hi",
             "schema": {}
           }
         }
@@ -853,18 +920,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_itch;1",
+        "@id": "dtmi:example:chi_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_jogg;1",
+          "@id": "dtmi:example:chi_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "iota_flunn",
+            "name": "chi_zeta",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "iota_zatz",
+            "name": "chi_delta",
             "schema": {}
           }
         }
@@ -879,17 +946,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_alpha;1",
+        "@id": "dtmi:example:chi_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_vroo;1",
+          "@id": "dtmi:example:chi_iota;1",
           "@type": "Map",
           "mapKey": {
-            "name": "iota_hi",
+            "name": "chi_kappa",
             "schema": "string"
           },
           "mapValue": {
-            "name": "iota_yekk",
+            "name": "chi_theta",
             "schema": [
               {}
             ]
@@ -906,18 +973,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_epsilon;1",
+        "@id": "dtmi:example:chi_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_gamma;1",
+          "@id": "dtmi:example:chi_nu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "kappa_delta",
+            "name": "chi_xi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "kappa_beta",
+            "name": "chi_mu",
             "schema": [
               {}
             ]
@@ -934,17 +1001,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_iota;1",
+        "@id": "dtmi:example:chi_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_eta;1",
+          "@id": "dtmi:example:chi_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "kappa_theta",
+            "name": "chi_sigma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "kappa_zeta",
+            "name": "chi_pi",
             "schema": []
           }
         }
@@ -959,18 +1026,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_nu;1",
+        "@id": "dtmi:example:chi_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_lambda;1",
+          "@id": "dtmi:example:chi_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "kappa_mu",
+            "name": "chi_chi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "kappa_kappa",
+            "name": "chi_upsilon",
             "schema": []
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValuePropertySchemaTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassMapValuePropertySchemaTermAndDtmiV3.json
index 7eebfe28..aa06888f 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValuePropertySchemaTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValuePropertySchemaTermAndDtmiV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_delta;1",
+        "@id": "dtmi:example:um_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_beta;1",
+          "@id": "dtmi:example:um_mu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omicron_gamma",
+            "name": "um_nu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "omicron_alpha",
+            "name": "um_lambda",
             "schema": "string",
             "dtmi:dtdl:property:schema;3": "time"
           }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_theta;1",
+        "@id": "dtmi:example:um_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:omicron_zeta;1",
+          "@id": "dtmi:example:um_pi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "omicron_eta",
+            "name": "um_rho",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "omicron_epsilon",
+            "name": "um_omicron",
             "schema": "boolean",
             "dtmi:dtdl:property:schema;3": "date"
           }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValuePropertySchemaTypeConformanceV3.json b/DTDL/v3/spec/Requirement-ClassMapValuePropertySchemaTypeConformanceV3.json
index dd965e9a..91a7a0ac 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValuePropertySchemaTypeConformanceV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValuePropertySchemaTypeConformanceV3.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_wum;1",
+        "@id": "dtmi:example:chi_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_omega;1",
+          "@id": "dtmi:example:chi_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "kappa_yuzz",
+            "name": "chi_spazz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "kappa_psi",
+            "name": "chi_quan",
             "schema": {
-              "@id": "dtmi:example:kappa_chi;1",
+              "@id": "dtmi:example:chi_snee;1",
               "elementSchema": "date",
               "@type": "Array"
             }
@@ -36,20 +36,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_snee;1",
+        "@id": "dtmi:example:chi_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_glikk;1",
+          "@id": "dtmi:example:chi_itch;1",
           "@type": "Map",
           "mapKey": {
-            "name": "kappa_nuh",
+            "name": "chi_yekk",
             "schema": "string"
           },
           "mapValue": {
-            "name": "kappa_fuddle",
+            "name": "chi_flunn",
             "schema": {
-              "@id": "dtmi:example:kappa_um;1",
-              "name": "kappa_humpf",
+              "@id": "dtmi:example:chi_zatz;1",
+              "name": "chi_jogg",
               "@type": "Command"
             }
           }
@@ -65,21 +65,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_jogg;1",
+        "@id": "dtmi:example:psi_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_floob;1",
+          "@id": "dtmi:example:psi_gamma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "kappa_zatz",
+            "name": "psi_delta",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "kappa_spazz",
+            "name": "psi_beta",
             "schema": {
-              "@id": "dtmi:example:kappa_quan;1",
-              "name": "kappa_thnad",
+              "@id": "dtmi:example:chi_hi;1",
+              "name": "psi_alpha",
               "@type": "Command"
             }
           }
@@ -95,20 +95,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_alpha;1",
+        "@id": "dtmi:example:psi_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_vroo;1",
+          "@id": "dtmi:example:psi_iota;1",
           "@type": "Map",
           "mapKey": {
-            "name": "kappa_hi",
+            "name": "psi_kappa",
             "schema": "string"
           },
           "mapValue": {
-            "name": "kappa_yekk",
+            "name": "psi_theta",
             "schema": {
-              "@id": "dtmi:example:kappa_flunn;1",
-              "name": "kappa_itch",
+              "@id": "dtmi:example:psi_zeta;1",
+              "name": "psi_eta",
               "schema": "dateTime",
               "@type": "CommandRequest"
             }
@@ -125,21 +125,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_eta;1",
+        "@id": "dtmi:example:psi_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_epsilon;1",
+          "@id": "dtmi:example:psi_omicron;1",
           "@type": "Map",
           "mapKey": {
-            "name": "lambda_zeta",
+            "name": "psi_pi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "lambda_delta",
+            "name": "psi_xi",
             "schema": {
-              "@id": "dtmi:example:lambda_beta;1",
-              "name": "lambda_gamma",
+              "@id": "dtmi:example:psi_mu;1",
+              "name": "psi_nu",
               "schema": "double",
               "@type": "CommandRequest"
             }
@@ -156,20 +156,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_nu;1",
+        "@id": "dtmi:example:psi_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_lambda;1",
+          "@id": "dtmi:example:psi_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "lambda_mu",
+            "name": "psi_chi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "lambda_kappa",
+            "name": "psi_upsilon",
             "schema": {
-              "@id": "dtmi:example:lambda_theta;1",
-              "name": "lambda_iota",
+              "@id": "dtmi:example:psi_sigma;1",
+              "name": "psi_tau",
               "schema": "duration",
               "@type": "CommandResponse"
             }
@@ -186,21 +186,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_tau;1",
+        "@id": "dtmi:example:psi_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_rho;1",
+          "@id": "dtmi:example:psi_um;1",
           "@type": "Map",
           "mapKey": {
-            "name": "lambda_sigma",
+            "name": "psi_humpf",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "lambda_pi",
+            "name": "psi_wum",
             "schema": {
-              "@id": "dtmi:example:lambda_xi;1",
-              "name": "lambda_omicron",
+              "@id": "dtmi:example:psi_omega;1",
+              "name": "psi_yuzz",
               "schema": "float",
               "@type": "CommandResponse"
             }
@@ -217,22 +217,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_wum;1",
+        "@id": "dtmi:example:psi_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_omega;1",
+          "@id": "dtmi:example:psi_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "lambda_yuzz",
+            "name": "psi_spazz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "lambda_psi",
+            "name": "psi_quan",
             "schema": {
-              "@id": "dtmi:example:lambda_upsilon;1",
-              "name": "lambda_phi",
+              "@id": "dtmi:example:psi_glikk;1",
+              "name": "psi_nuh",
               "schema": {
-                "@id": "dtmi:example:lambda_chi;1",
+                "@id": "dtmi:example:psi_snee;1",
                 "@type": "Interface"
               },
               "@type": "Component"
@@ -250,23 +250,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_quan;1",
+        "@id": "dtmi:example:psi_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_nuh;1",
+          "@id": "dtmi:example:psi_yekk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "lambda_snee",
+            "name": "psi_vroo",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "lambda_glikk",
+            "name": "psi_itch",
             "schema": {
-              "@id": "dtmi:example:lambda_um;1",
-              "name": "lambda_humpf",
+              "@id": "dtmi:example:psi_zatz;1",
+              "name": "psi_jogg",
               "schema": {
-                "@id": "dtmi:example:lambda_fuddle;1",
+                "@id": "dtmi:example:psi_flunn;1",
                 "@type": "Interface"
               },
               "@type": "Component"
@@ -284,19 +284,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_jogg;1",
+        "@id": "dtmi:example:omega_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_floob;1",
+          "@id": "dtmi:example:omega_gamma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "lambda_zatz",
+            "name": "omega_delta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "lambda_spazz",
+            "name": "omega_beta",
             "schema": {
-              "@id": "dtmi:example:lambda_thnad;1",
+              "@id": "dtmi:example:omega_alpha;1",
               "valueSchema": "integer",
               "@type": "Enum"
             }
@@ -313,21 +313,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_alpha;1",
+        "@id": "dtmi:example:omega_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:lambda_vroo;1",
+          "@id": "dtmi:example:omega_iota;1",
           "@type": "Map",
           "mapKey": {
-            "name": "lambda_hi",
+            "name": "omega_kappa",
             "schema": "string"
           },
           "mapValue": {
-            "name": "lambda_yekk",
+            "name": "omega_theta",
             "schema": {
-              "@id": "dtmi:example:lambda_flunn;1",
-              "enumValue": 1464,
-              "name": "lambda_itch",
+              "@id": "dtmi:example:omega_zeta;1",
+              "enumValue": 1481,
+              "name": "omega_eta",
               "@type": "EnumValue"
             }
           }
@@ -343,22 +343,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_eta;1",
+        "@id": "dtmi:example:omega_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_epsilon;1",
+          "@id": "dtmi:example:omega_omicron;1",
           "@type": "Map",
           "mapKey": {
-            "name": "mu_zeta",
+            "name": "omega_pi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "mu_delta",
+            "name": "omega_xi",
             "schema": {
-              "@id": "dtmi:example:mu_beta;1",
-              "enumValue": 1465,
-              "name": "mu_gamma",
+              "@id": "dtmi:example:omega_mu;1",
+              "enumValue": 1482,
+              "name": "omega_nu",
               "@type": "EnumValue"
             }
           }
@@ -374,20 +374,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_nu;1",
+        "@id": "dtmi:example:omega_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_lambda;1",
+          "@id": "dtmi:example:omega_phi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "mu_mu",
+            "name": "omega_chi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "mu_kappa",
+            "name": "omega_upsilon",
             "schema": {
-              "@id": "dtmi:example:mu_theta;1",
-              "name": "mu_iota",
+              "@id": "dtmi:example:omega_sigma;1",
+              "name": "omega_tau",
               "schema": "integer",
               "@type": "Field"
             }
@@ -404,21 +404,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_tau;1",
+        "@id": "dtmi:example:omega_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_rho;1",
+          "@id": "dtmi:example:omega_um;1",
           "@type": "Map",
           "mapKey": {
-            "name": "mu_sigma",
+            "name": "omega_humpf",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "mu_pi",
+            "name": "omega_wum",
             "schema": {
-              "@id": "dtmi:example:mu_xi;1",
-              "name": "mu_omicron",
+              "@id": "dtmi:example:omega_omega;1",
+              "name": "omega_yuzz",
               "schema": "long",
               "@type": "Field"
             }
@@ -435,19 +435,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_omega;1",
+        "@id": "dtmi:example:omega_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_chi;1",
+          "@id": "dtmi:example:omega_snee;1",
           "@type": "Map",
           "mapKey": {
-            "name": "mu_psi",
+            "name": "omega_quan",
             "schema": "string"
           },
           "mapValue": {
-            "name": "mu_phi",
+            "name": "omega_nuh",
             "schema": {
-              "@id": "dtmi:example:mu_upsilon;1",
+              "@id": "dtmi:example:omega_glikk;1",
               "@type": "Interface"
             }
           }
@@ -463,20 +463,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_fuddle;1",
+        "@id": "dtmi:example:omega_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_um;1",
+          "@id": "dtmi:example:omega_zatz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "mu_humpf",
+            "name": "omega_jogg",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "mu_wum",
+            "name": "omega_floob",
             "schema": {
-              "@id": "dtmi:example:mu_yuzz;1",
+              "@id": "dtmi:example:omega_spazz;1",
               "@type": "Interface"
             }
           }
@@ -492,25 +492,25 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_floob;1",
+        "@id": "dtmi:example:yuzz_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_thnad;1",
+          "@id": "dtmi:example:yuzz_alpha;1",
           "@type": "Map",
           "mapKey": {
-            "name": "mu_spazz",
+            "name": "yuzz_beta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "mu_quan",
+            "name": "omega_hi",
             "schema": {
-              "@id": "dtmi:example:mu_glikk;1",
+              "@id": "dtmi:example:omega_itch;1",
               "mapKey": {
-                "name": "mu_nuh",
+                "name": "omega_yekk",
                 "schema": "string"
               },
               "mapValue": {
-                "name": "mu_snee",
+                "name": "omega_vroo",
                 "schema": "string"
               },
               "@type": "Map"
@@ -528,20 +528,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_vroo;1",
+        "@id": "dtmi:example:yuzz_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:mu_itch;1",
+          "@id": "dtmi:example:yuzz_eta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "mu_yekk",
+            "name": "yuzz_theta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "mu_flunn",
+            "name": "yuzz_zeta",
             "schema": {
-              "@id": "dtmi:example:mu_zatz;1",
-              "name": "mu_jogg",
+              "@id": "dtmi:example:yuzz_delta;1",
+              "name": "yuzz_epsilon",
               "schema": "string",
               "@type": "MapKey"
             }
@@ -558,21 +558,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_epsilon;1",
+        "@id": "dtmi:example:yuzz_omicron;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_gamma;1",
+          "@id": "dtmi:example:yuzz_nu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nu_delta",
+            "name": "yuzz_xi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nu_beta",
+            "name": "yuzz_mu",
             "schema": {
-              "@id": "dtmi:example:mu_hi;1",
-              "name": "nu_alpha",
+              "@id": "dtmi:example:yuzz_kappa;1",
+              "name": "yuzz_lambda",
               "schema": "string",
               "@type": "MapKey"
             }
@@ -589,20 +589,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_lambda;1",
+        "@id": "dtmi:example:yuzz_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_iota;1",
+          "@id": "dtmi:example:yuzz_tau;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nu_kappa",
+            "name": "yuzz_upsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "nu_theta",
+            "name": "yuzz_sigma",
             "schema": {
-              "@id": "dtmi:example:nu_zeta;1",
-              "name": "nu_eta",
+              "@id": "dtmi:example:yuzz_pi;1",
+              "name": "yuzz_rho",
               "schema": "time",
               "@type": "MapValue"
             }
@@ -619,21 +619,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_rho;1",
+        "@id": "dtmi:example:yuzz_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_omicron;1",
+          "@id": "dtmi:example:yuzz_yuzz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nu_pi",
+            "name": "yuzz_wum",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nu_xi",
+            "name": "yuzz_omega",
             "schema": {
-              "@id": "dtmi:example:nu_mu;1",
-              "name": "nu_nu",
+              "@id": "dtmi:example:yuzz_chi;1",
+              "name": "yuzz_psi",
               "schema": "boolean",
               "@type": "MapValue"
             }
@@ -650,19 +650,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_chi;1",
+        "@id": "dtmi:example:yuzz_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_upsilon;1",
+          "@id": "dtmi:example:yuzz_glikk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nu_phi",
+            "name": "yuzz_nuh",
             "schema": "string"
           },
           "mapValue": {
-            "name": "nu_tau",
+            "name": "yuzz_fuddle",
             "schema": {
-              "@id": "dtmi:example:nu_sigma;1",
+              "@id": "dtmi:example:yuzz_humpf;1",
               "@type": "Object"
             }
           }
@@ -678,20 +678,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_humpf;1",
+        "@id": "dtmi:example:yuzz_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_wum;1",
+          "@id": "dtmi:example:yuzz_floob;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nu_um",
+            "name": "yuzz_zatz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "nu_yuzz",
+            "name": "yuzz_spazz",
             "schema": {
-              "@id": "dtmi:example:nu_psi;1",
-              "name": "nu_omega",
+              "@id": "dtmi:example:yuzz_quan;1",
+              "name": "yuzz_thnad",
               "schema": "date",
               "@type": "Property"
             }
@@ -708,21 +708,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_thnad;1",
+        "@id": "dtmi:example:wum_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_snee;1",
+          "@id": "dtmi:example:yuzz_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nu_quan",
+            "name": "yuzz_hi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nu_nuh",
+            "name": "yuzz_yekk",
             "schema": {
-              "@id": "dtmi:example:nu_fuddle;1",
-              "name": "nu_glikk",
+              "@id": "dtmi:example:yuzz_flunn;1",
+              "name": "yuzz_itch",
               "schema": "dateTime",
               "@type": "Property"
             }
@@ -739,20 +739,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_itch;1",
+        "@id": "dtmi:example:wum_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:nu_jogg;1",
+          "@id": "dtmi:example:wum_epsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "nu_flunn",
+            "name": "wum_zeta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "nu_zatz",
+            "name": "wum_delta",
             "schema": {
-              "@id": "dtmi:example:nu_spazz;1",
-              "name": "nu_floob",
+              "@id": "dtmi:example:wum_beta;1",
+              "name": "wum_gamma",
               "@type": "Relationship"
             }
           }
@@ -768,21 +768,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_gamma;1",
+        "@id": "dtmi:example:wum_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_alpha;1",
+          "@id": "dtmi:example:wum_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "xi_beta",
+            "name": "wum_mu",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "nu_hi",
+            "name": "wum_kappa",
             "schema": {
-              "@id": "dtmi:example:nu_yekk;1",
-              "name": "nu_vroo",
+              "@id": "dtmi:example:wum_theta;1",
+              "name": "wum_iota",
               "@type": "Relationship"
             }
           }
@@ -798,20 +798,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_iota;1",
+        "@id": "dtmi:example:wum_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_eta;1",
+          "@id": "dtmi:example:wum_rho;1",
           "@type": "Map",
           "mapKey": {
-            "name": "xi_theta",
+            "name": "wum_sigma",
             "schema": "string"
           },
           "mapValue": {
-            "name": "xi_zeta",
+            "name": "wum_pi",
             "schema": {
-              "@id": "dtmi:example:xi_delta;1",
-              "name": "xi_epsilon",
+              "@id": "dtmi:example:wum_xi;1",
+              "name": "wum_omicron",
               "schema": "double",
               "@type": "Telemetry"
             }
@@ -828,21 +828,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_omicron;1",
+        "@id": "dtmi:example:wum_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:xi_nu;1",
+          "@id": "dtmi:example:wum_psi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "xi_xi",
+            "name": "wum_omega",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "xi_mu",
+            "name": "wum_chi",
             "schema": {
-              "@id": "dtmi:example:xi_kappa;1",
-              "name": "xi_lambda",
+              "@id": "dtmi:example:wum_upsilon;1",
+              "name": "wum_phi",
               "schema": "duration",
               "@type": "Telemetry"
             }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValueRequiredPropertiesV3.json b/DTDL/v3/spec/Requirement-ClassMapValueRequiredPropertiesV3.json
index 7749f1d5..88ef4add 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValueRequiredPropertiesV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValueRequiredPropertiesV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_quan;1",
+        "@id": "dtmi:example:xi_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_nuh;1",
+          "@id": "dtmi:example:xi_nuh;1",
           "@type": "Map",
           "mapKey": {
-            "name": "beta_snee",
+            "name": "xi_snee",
             "schema": "string"
           },
           "mapValue": {
-            "schema": "float"
+            "schema": "double"
           }
         }
       }
@@ -31,18 +31,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_floob;1",
+        "@id": "dtmi:example:xi_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_thnad;1",
+          "@id": "dtmi:example:xi_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "beta_spazz",
+            "name": "xi_spazz",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "schema": "integer"
+            "schema": "duration"
           }
         }
       }
@@ -56,17 +56,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_itch;1",
+        "@id": "dtmi:example:xi_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_jogg;1",
+          "@id": "dtmi:example:xi_jogg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "beta_flunn",
+            "name": "xi_flunn",
             "schema": "string"
           },
           "mapValue": {
-            "name": "beta_zatz"
+            "name": "xi_zatz"
           }
         }
       }
@@ -80,18 +80,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_alpha;1",
+        "@id": "dtmi:example:omicron_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_vroo;1",
+          "@id": "dtmi:example:xi_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "beta_hi",
+            "name": "xi_hi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "beta_yekk"
+            "name": "xi_yekk"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValueTypeIncludesInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassMapValueTypeIncludesInvalidDtmiV3.json
index f259fa40..7f1fd2a5 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValueTypeIncludesInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValueTypeIncludesInvalidDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_iota;1",
+        "@id": "dtmi:example:snee_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_eta;1",
+          "@id": "dtmi:example:snee_yuzz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_theta",
+            "name": "snee_wum",
             "schema": "string"
           },
           "mapValue": {
@@ -21,8 +21,8 @@
               "MapValue",
               "dtmi:foo//bar"
             ],
-            "name": "upsilon_zeta",
-            "schema": "float"
+            "name": "snee_omega",
+            "schema": "long"
           }
         }
       }
@@ -36,13 +36,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_nu;1",
+        "@id": "dtmi:example:snee_nuh;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_lambda;1",
+          "@id": "dtmi:example:snee_fuddle;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_mu",
+            "name": "snee_glikk",
             "schema": "string"
           },
           "mapValue": {
@@ -51,8 +51,8 @@
               "MapValue",
               "dtmi:foo//bar"
             ],
-            "name": "upsilon_kappa",
-            "schema": "integer"
+            "name": "snee_humpf",
+            "schema": "string"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValueTypeIncludesMaterialV3.json b/DTDL/v3/spec/Requirement-ClassMapValueTypeIncludesMaterialV3.json
index c7523b4b..6e627d5d 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValueTypeIncludesMaterialV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValueTypeIncludesMaterialV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_um;1",
+        "@id": "dtmi:example:nuh_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_yuzz;1",
+          "@id": "dtmi:example:glikk_hi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_wum",
+            "name": "nuh_alpha",
             "schema": "string"
           },
           "mapValue": {
-            "name": "sigma_omega",
-            "schema": "string",
+            "name": "glikk_vroo",
+            "schema": "boolean",
             "@type": "MapValue"
           }
         }
@@ -33,18 +33,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_nuh;1",
+        "@id": "dtmi:example:nuh_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_fuddle;1",
+          "@id": "dtmi:example:nuh_delta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_glikk",
+            "name": "nuh_epsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "sigma_humpf",
-            "schema": "time",
+            "name": "nuh_gamma",
+            "schema": "date",
             "@type": [
               "MapValue"
             ]
@@ -61,18 +61,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_spazz;1",
+        "@id": "dtmi:example:nuh_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_quan;1",
+          "@id": "dtmi:example:nuh_theta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_thnad",
+            "name": "nuh_iota",
             "schema": "string"
           },
           "mapValue": {
-            "name": "sigma_snee",
-            "schema": "boolean",
+            "name": "nuh_eta",
+            "schema": "dateTime",
             "@type": "dtmi:dtdl:class:MapValue;3"
           }
         }
@@ -87,18 +87,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_flunn;1",
+        "@id": "dtmi:example:nuh_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_zatz;1",
+          "@id": "dtmi:example:nuh_mu;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_jogg",
+            "name": "nuh_nu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "sigma_floob",
-            "schema": "date",
+            "name": "nuh_lambda",
+            "schema": "double",
             "@type": [
               "dtmi:dtdl:class:MapValue;3"
             ]
@@ -115,18 +115,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_hi;1",
+        "@id": "dtmi:example:nuh_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_yekk;1",
+          "@id": "dtmi:example:nuh_pi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_vroo",
+            "name": "nuh_rho",
             "schema": "string"
           },
           "mapValue": {
-            "name": "sigma_itch",
-            "schema": "dateTime",
+            "name": "nuh_omicron",
+            "schema": "duration",
             "@type": "Something"
           }
         }
@@ -141,19 +141,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_delta;1",
+        "@id": "dtmi:example:nuh_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_beta;1",
+          "@id": "dtmi:example:nuh_upsilon;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_gamma",
+            "name": "nuh_phi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "tau_alpha",
-            "schema": "double",
+            "name": "nuh_tau",
+            "schema": "float",
             "@type": "Something"
           }
         }
@@ -168,18 +168,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_theta;1",
+        "@id": "dtmi:example:nuh_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_zeta;1",
+          "@id": "dtmi:example:nuh_omega;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_eta",
+            "name": "nuh_yuzz",
             "schema": "string"
           },
           "mapValue": {
-            "name": "tau_epsilon",
-            "schema": "duration",
+            "name": "nuh_psi",
+            "schema": "integer",
             "@type": [
               "Something"
             ]
@@ -196,19 +196,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_mu;1",
+        "@id": "dtmi:example:nuh_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:tau_kappa;1",
+          "@id": "dtmi:example:nuh_humpf;1",
           "@type": "Map",
           "mapKey": {
-            "name": "tau_lambda",
+            "name": "nuh_fuddle",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "tau_iota",
-            "schema": "float",
+            "name": "nuh_um",
+            "schema": "long",
             "@type": [
               "Something"
             ]
diff --git a/DTDL/v3/spec/Requirement-ClassMapValueTypeIncludesNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassMapValueTypeIncludesNotDtmiNorTermV3.json
index 9c41239b..f5239f71 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValueTypeIncludesNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValueTypeIncludesNotDtmiNorTermV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_rho;1",
+        "@id": "dtmi:example:snee_spazz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_omicron;1",
+          "@id": "dtmi:example:snee_quan;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_pi",
+            "name": "snee_thnad",
             "schema": "string"
           },
           "mapValue": {
@@ -21,8 +21,8 @@
               "MapValue",
               "http://foo.com/bar"
             ],
-            "name": "upsilon_xi",
-            "schema": "long"
+            "name": "snee_snee",
+            "schema": "time"
           }
         }
       }
@@ -36,13 +36,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_phi;1",
+        "@id": "dtmi:example:snee_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:upsilon_tau;1",
+          "@id": "dtmi:example:snee_zatz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "upsilon_upsilon",
+            "name": "snee_jogg",
             "schema": "string"
           },
           "mapValue": {
@@ -51,8 +51,8 @@
               "MapValue",
               "http://foo.com/bar"
             ],
-            "name": "upsilon_sigma",
-            "schema": "string"
+            "name": "snee_floob",
+            "schema": "boolean"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassMapValueTypeStringOrArrayV3.json b/DTDL/v3/spec/Requirement-ClassMapValueTypeStringOrArrayV3.json
index a2d40d10..a5c7ca9d 100644
--- a/DTDL/v3/spec/Requirement-ClassMapValueTypeStringOrArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassMapValueTypeStringOrArrayV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_zeta;1",
+        "@id": "dtmi:example:fuddle_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_delta;1",
+          "@id": "dtmi:example:fuddle_chi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "rho_epsilon",
+            "name": "fuddle_psi",
             "schema": "string"
           },
           "mapValue": {
-            "name": "rho_gamma",
-            "schema": "dateTime",
+            "name": "fuddle_phi",
+            "schema": "duration",
             "@type": 626
           }
         }
@@ -33,19 +33,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_kappa;1",
+        "@id": "dtmi:example:fuddle_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_theta;1",
+          "@id": "dtmi:example:fuddle_wum;1",
           "@type": "Map",
           "mapKey": {
-            "name": "rho_iota",
+            "name": "fuddle_um",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "rho_eta",
-            "schema": "double",
+            "name": "fuddle_yuzz",
+            "schema": "float",
             "@type": 626
           }
         }
@@ -60,18 +60,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_xi;1",
+        "@id": "dtmi:example:fuddle_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_mu;1",
+          "@id": "dtmi:example:fuddle_glikk;1",
           "@type": "Map",
           "mapKey": {
-            "name": "rho_nu",
+            "name": "fuddle_nuh",
             "schema": "string"
           },
           "mapValue": {
-            "name": "rho_lambda",
-            "schema": "duration",
+            "name": "fuddle_fuddle",
+            "schema": "integer",
             "@type": null
           }
         }
@@ -86,19 +86,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_sigma;1",
+        "@id": "dtmi:example:fuddle_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_pi;1",
+          "@id": "dtmi:example:fuddle_thnad;1",
           "@type": "Map",
           "mapKey": {
-            "name": "rho_rho",
+            "name": "fuddle_spazz",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "rho_omicron",
-            "schema": "float",
+            "name": "fuddle_quan",
+            "schema": "long",
             "@type": null
           }
         }
@@ -113,18 +113,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_chi;1",
+        "@id": "dtmi:example:fuddle_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_upsilon;1",
+          "@id": "dtmi:example:fuddle_jogg;1",
           "@type": "Map",
           "mapKey": {
-            "name": "rho_phi",
+            "name": "fuddle_flunn",
             "schema": "string"
           },
           "mapValue": {
-            "name": "rho_tau",
-            "schema": "integer",
+            "name": "fuddle_zatz",
+            "schema": "string",
             "@type": true
           }
         }
@@ -139,19 +139,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_wum;1",
+        "@id": "dtmi:example:glikk_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_omega;1",
+          "@id": "dtmi:example:fuddle_vroo;1",
           "@type": "Map",
           "mapKey": {
-            "name": "rho_yuzz",
+            "name": "fuddle_hi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "rho_psi",
-            "schema": "long",
+            "name": "fuddle_yekk",
+            "schema": "time",
             "@type": true
           }
         }
@@ -166,18 +166,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_glikk;1",
+        "@id": "dtmi:example:glikk_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_humpf;1",
+          "@id": "dtmi:example:glikk_gamma;1",
           "@type": "Map",
           "mapKey": {
-            "name": "rho_fuddle",
+            "name": "glikk_delta",
             "schema": "string"
           },
           "mapValue": {
-            "name": "rho_um",
-            "schema": "string",
+            "name": "glikk_beta",
+            "schema": "boolean",
             "@type": {}
           }
         }
@@ -192,19 +192,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_thnad;1",
+        "@id": "dtmi:example:glikk_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_snee;1",
+          "@id": "dtmi:example:glikk_eta;1",
           "@type": "Map",
           "mapKey": {
-            "name": "rho_quan",
+            "name": "glikk_theta",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "rho_nuh",
-            "schema": "time",
+            "name": "glikk_zeta",
+            "schema": "date",
             "@type": {}
           }
         }
@@ -219,18 +219,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_jogg;1",
+        "@id": "dtmi:example:glikk_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_floob;1",
+          "@id": "dtmi:example:glikk_lambda;1",
           "@type": "Map",
           "mapKey": {
-            "name": "rho_zatz",
+            "name": "glikk_mu",
             "schema": "string"
           },
           "mapValue": {
-            "name": "rho_spazz",
-            "schema": "boolean",
+            "name": "glikk_kappa",
+            "schema": "dateTime",
             "@type": [
               626
             ]
@@ -247,19 +247,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_vroo;1",
+        "@id": "dtmi:example:glikk_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:rho_itch;1",
+          "@id": "dtmi:example:glikk_omicron;1",
           "@type": "Map",
           "mapKey": {
-            "name": "rho_yekk",
+            "name": "glikk_pi",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "rho_flunn",
-            "schema": "date",
+            "name": "glikk_xi",
+            "schema": "double",
             "@type": [
               626
             ]
@@ -276,18 +276,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_gamma;1",
+        "@id": "dtmi:example:glikk_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_alpha;1",
+          "@id": "dtmi:example:glikk_tau;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_beta",
+            "name": "glikk_upsilon",
             "schema": "string"
           },
           "mapValue": {
-            "name": "rho_hi",
-            "schema": "dateTime",
+            "name": "glikk_sigma",
+            "schema": "duration",
             "@type": [
               null
             ]
@@ -304,19 +304,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_eta;1",
+        "@id": "dtmi:example:glikk_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_epsilon;1",
+          "@id": "dtmi:example:glikk_psi;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_zeta",
+            "name": "glikk_omega",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "sigma_delta",
-            "schema": "double",
+            "name": "glikk_chi",
+            "schema": "float",
             "@type": [
               null
             ]
@@ -333,18 +333,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_lambda;1",
+        "@id": "dtmi:example:glikk_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_iota;1",
+          "@id": "dtmi:example:glikk_um;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_kappa",
+            "name": "glikk_humpf",
             "schema": "string"
           },
           "mapValue": {
-            "name": "sigma_theta",
-            "schema": "duration",
+            "name": "glikk_wum",
+            "schema": "integer",
             "@type": [
               true
             ]
@@ -361,19 +361,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_omicron;1",
+        "@id": "dtmi:example:glikk_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_nu;1",
+          "@id": "dtmi:example:glikk_nuh;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_xi",
+            "name": "glikk_snee",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "sigma_mu",
-            "schema": "float",
+            "name": "glikk_glikk",
+            "schema": "long",
             "@type": [
               true
             ]
@@ -390,18 +390,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_tau;1",
+        "@id": "dtmi:example:glikk_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_rho;1",
+          "@id": "dtmi:example:glikk_spazz;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_sigma",
+            "name": "glikk_floob",
             "schema": "string"
           },
           "mapValue": {
-            "name": "sigma_pi",
-            "schema": "integer",
+            "name": "glikk_thnad",
+            "schema": "string",
             "@type": [
               {}
             ]
@@ -418,19 +418,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_psi;1",
+        "@id": "dtmi:example:glikk_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:sigma_phi;1",
+          "@id": "dtmi:example:glikk_flunn;1",
           "@type": "Map",
           "mapKey": {
-            "name": "sigma_chi",
+            "name": "glikk_itch",
             "schema": "string"
           },
           "mapValue": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "name": "sigma_upsilon",
-            "schema": "long",
+            "name": "glikk_jogg",
+            "schema": "time",
             "@type": [
               {}
             ]
diff --git a/DTDL/v3/spec/Requirement-ClassObjectContextConformsV3.json b/DTDL/v3/spec/Requirement-ClassObjectContextConformsV3.json
index 898907a4..ef21d544 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectContextConformsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectContextConformsV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_jogg;1",
+        "@id": "dtmi:example:kappa_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "itch_zatz",
+          "name": "kappa_mu",
           "schema": {
             "@type": "Object",
             "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
@@ -28,11 +28,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_itch;1",
+        "@id": "dtmi:example:kappa_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "itch_flunn",
+          "name": "kappa_xi",
           "schema": {
             "@type": "Object",
             "@context": []
@@ -49,11 +49,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_vroo;1",
+        "@id": "dtmi:example:kappa_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "itch_yekk",
+          "name": "kappa_pi",
           "schema": {
             "@type": "Object",
             "@context": [
@@ -72,11 +72,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_alpha;1",
+        "@id": "dtmi:example:kappa_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "itch_hi",
+          "name": "kappa_sigma",
           "schema": {
             "@type": "Object",
             "@context": null
@@ -93,11 +93,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_gamma;1",
+        "@id": "dtmi:example:kappa_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yekk_beta",
+          "name": "kappa_upsilon",
           "schema": {
             "@type": "Object",
             "@context": 626
@@ -114,11 +114,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_epsilon;1",
+        "@id": "dtmi:example:kappa_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yekk_delta",
+          "name": "kappa_chi",
           "schema": {
             "@type": "Object",
             "@context": true
@@ -135,11 +135,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_eta;1",
+        "@id": "dtmi:example:kappa_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yekk_zeta",
+          "name": "kappa_omega",
           "schema": {
             "@type": "Object",
             "@context": [
@@ -158,11 +158,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_iota;1",
+        "@id": "dtmi:example:kappa_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yekk_theta",
+          "name": "kappa_wum",
           "schema": {
             "@type": "Object",
             "@context": [
@@ -181,11 +181,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_lambda;1",
+        "@id": "dtmi:example:kappa_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yekk_kappa",
+          "name": "kappa_humpf",
           "schema": {
             "@type": "Object",
             "@context": [
@@ -204,14 +204,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_nu;1",
+        "@id": "dtmi:example:kappa_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yekk_mu",
+          "name": "kappa_glikk",
           "schema": {
             "@type": "Object",
-            "@context": {}
+            "@context": "dtmi:dtdl:extension:quantitativeTypes"
           }
         }
       }
@@ -225,16 +225,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_omicron;1",
+        "@id": "dtmi:example:kappa_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yekk_xi",
+          "name": "kappa_snee",
           "schema": {
             "@type": "Object",
-            "@context": [
-              {}
-            ]
+            "@context": "http://dtdl/extension/quantitativeTypes/1"
           }
         }
       }
@@ -248,14 +246,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_rho;1",
+        "@id": "dtmi:example:kappa_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yekk_pi",
+          "name": "kappa_thnad",
           "schema": {
             "@type": "Object",
-            "@context": "dtmi:dtdl:extension:quantitativeTypes"
+            "@context": "quantitativeTypes;1"
           }
         }
       }
@@ -269,14 +267,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_tau;1",
+        "@id": "dtmi:example:kappa_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yekk_sigma",
+          "name": "kappa_floob",
           "schema": {
             "@type": "Object",
-            "@context": "http://dtdl/extension/quantitativeTypes/1"
+            "@context": {}
           }
         }
       }
@@ -290,14 +288,64 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_phi;1",
+        "@id": "dtmi:example:kappa_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yekk_upsilon",
+          "name": "kappa_jogg",
           "schema": {
             "@type": "Object",
-            "@context": "quantitativeTypes;1"
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:kappa_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "kappa_itch",
+          "schema": {
+            "@type": "Object",
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:kappa_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "kappa_vroo",
+          "schema": {
+            "@type": "Object",
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassObjectIdDuplicateV3.json b/DTDL/v3/spec/Requirement-ClassObjectIdDuplicateV3.json
index 0f9410c0..cbc268f4 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectIdDuplicateV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectIdDuplicateV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_lambda;1",
+        "@id": "dtmi:example:mu_quan;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:hi_lambda;1",
+          "@id": "dtmi:example:mu_quan;1",
           "@type": "Property",
-          "name": "hi_mu",
+          "name": "mu_thnad",
           "schema": {
-            "@id": "dtmi:example:hi_lambda;1",
+            "@id": "dtmi:example:mu_quan;1",
             "@type": "Object"
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_nu;1",
+        "@id": "dtmi:example:mu_spazz;1",
         "@type": "Interface",
         "contents": {
-          "@id": "dtmi:example:hi_nu;1",
+          "@id": "dtmi:example:mu_spazz;1",
           "@type": "Property",
-          "name": "hi_xi",
+          "name": "mu_floob",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "@id": "dtmi:example:hi_nu;1",
+            "@id": "dtmi:example:mu_spazz;1",
             "@type": "Object"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassObjectIdIsDtmiV3.json b/DTDL/v3/spec/Requirement-ClassObjectIdIsDtmiV3.json
index 27991c7b..9ded03e3 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectIdIsDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectIdIsDtmiV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_humpf;1",
+        "@id": "dtmi:example:lambda_eta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;7",
@@ -24,7 +24,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_fuddle;1",
+        "@id": "dtmi:example:lambda_theta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;108675309",
@@ -41,7 +41,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_glikk;1",
+        "@id": "dtmi:example:lambda_iota;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;999999999",
@@ -58,7 +58,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_nuh;1",
+        "@id": "dtmi:example:lambda_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo;1",
@@ -75,7 +75,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_snee;1",
+        "@id": "dtmi:example:lambda_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar",
@@ -92,7 +92,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_quan;1",
+        "@id": "dtmi:example:lambda_mu;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.14",
@@ -109,7 +109,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_thnad;1",
+        "@id": "dtmi:example:lambda_nu;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.141592",
@@ -126,7 +126,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_spazz;1",
+        "@id": "dtmi:example:lambda_xi;1",
         "@type": "Interface",
         "schemas": {
           "@id": null,
@@ -143,7 +143,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_floob;1",
+        "@id": "dtmi:example:lambda_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -161,7 +161,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_zatz;1",
+        "@id": "dtmi:example:lambda_pi;1",
         "@type": "Interface",
         "schemas": {
           "@id": 626,
@@ -178,7 +178,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_jogg;1",
+        "@id": "dtmi:example:lambda_rho;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -196,7 +196,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_flunn;1",
+        "@id": "dtmi:example:lambda_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@id": true,
@@ -213,7 +213,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_itch;1",
+        "@id": "dtmi:example:lambda_tau;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -231,7 +231,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_yekk;1",
+        "@id": "dtmi:example:lambda_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@id": {
@@ -250,7 +250,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_vroo;1",
+        "@id": "dtmi:example:lambda_phi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -270,7 +270,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_hi;1",
+        "@id": "dtmi:example:lambda_chi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;0",
@@ -287,7 +287,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_alpha;1",
+        "@id": "dtmi:example:lambda_psi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -305,7 +305,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_beta;1",
+        "@id": "dtmi:example:lambda_omega;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;0.0",
@@ -322,7 +322,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_gamma;1",
+        "@id": "dtmi:example:lambda_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -340,7 +340,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_delta;1",
+        "@id": "dtmi:example:lambda_wum;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;1234567890",
@@ -357,7 +357,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_epsilon;1",
+        "@id": "dtmi:example:lambda_um;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -375,7 +375,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_zeta;1",
+        "@id": "dtmi:example:lambda_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;1a",
@@ -392,7 +392,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_eta;1",
+        "@id": "dtmi:example:lambda_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -410,7 +410,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_theta;1",
+        "@id": "dtmi:example:lambda_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.0",
@@ -427,7 +427,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_iota;1",
+        "@id": "dtmi:example:lambda_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -445,7 +445,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_kappa;1",
+        "@id": "dtmi:example:lambda_snee;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;3.1415926",
@@ -462,7 +462,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_lambda;1",
+        "@id": "dtmi:example:lambda_quan;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -480,7 +480,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_mu;1",
+        "@id": "dtmi:example:lambda_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;6.02",
@@ -497,7 +497,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_nu;1",
+        "@id": "dtmi:example:lambda_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -515,7 +515,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_xi;1",
+        "@id": "dtmi:example:lambda_floob;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;0.1",
@@ -532,7 +532,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_omicron;1",
+        "@id": "dtmi:example:lambda_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -550,7 +550,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_pi;1",
+        "@id": "dtmi:example:lambda_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;01",
@@ -567,7 +567,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_rho;1",
+        "@id": "dtmi:example:lambda_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -585,7 +585,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_sigma;1",
+        "@id": "dtmi:example:lambda_itch;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar;",
@@ -602,7 +602,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_tau;1",
+        "@id": "dtmi:example:lambda_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -620,7 +620,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_upsilon;1",
+        "@id": "dtmi:example:lambda_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:test:invalidId_;1",
@@ -637,7 +637,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_phi;1",
+        "@id": "dtmi:example:lambda_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -655,7 +655,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_chi;1",
+        "@id": "dtmi:example:mu_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:test:_invalidUserId;1",
@@ -672,7 +672,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_psi;1",
+        "@id": "dtmi:example:mu_beta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -690,7 +690,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_omega;1",
+        "@id": "dtmi:example:mu_gamma;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:test:1seg;1",
@@ -707,7 +707,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_yuzz;1",
+        "@id": "dtmi:example:mu_delta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -725,7 +725,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_wum;1",
+        "@id": "dtmi:example:mu_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo:bar.baz;1",
@@ -742,7 +742,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_um;1",
+        "@id": "dtmi:example:mu_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -760,7 +760,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_humpf;1",
+        "@id": "dtmi:example:mu_eta;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:foo::bar;1",
@@ -777,7 +777,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_fuddle;1",
+        "@id": "dtmi:example:mu_theta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -795,7 +795,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_glikk;1",
+        "@id": "dtmi:example:mu_iota;1",
         "@type": "Interface",
         "schemas": {
           "@id": "urn:foo:bar:1",
@@ -812,7 +812,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_nuh;1",
+        "@id": "dtmi:example:mu_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -830,7 +830,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_snee;1",
+        "@id": "dtmi:example:mu_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@id": "http://foo/bar/baz",
@@ -847,7 +847,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_quan;1",
+        "@id": "dtmi:example:mu_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -865,7 +865,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_thnad;1",
+        "@id": "dtmi:example:mu_nu;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:;1",
@@ -882,7 +882,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_spazz;1",
+        "@id": "dtmi:example:mu_xi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -900,7 +900,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_floob;1",
+        "@id": "dtmi:example:mu_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:dtdl:example;1",
@@ -917,7 +917,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_zatz;1",
+        "@id": "dtmi:example:mu_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -935,7 +935,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_jogg;1",
+        "@id": "dtmi:example:mu_rho;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:standard:example;1",
@@ -952,7 +952,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_flunn;1",
+        "@id": "dtmi:example:mu_sigma;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v3/spec/Requirement-ClassObjectIdNotArrayV3.json b/DTDL/v3/spec/Requirement-ClassObjectIdNotArrayV3.json
index 446b60d9..875d67ac 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectIdNotArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectIdNotArrayV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_itch;1",
+        "@id": "dtmi:example:mu_tau;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -26,7 +26,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_yekk;1",
+        "@id": "dtmi:example:mu_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -46,7 +46,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_vroo;1",
+        "@id": "dtmi:example:mu_phi;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -65,7 +65,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_hi;1",
+        "@id": "dtmi:example:mu_chi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -85,7 +85,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_alpha;1",
+        "@id": "dtmi:example:mu_psi;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -104,7 +104,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_beta;1",
+        "@id": "dtmi:example:mu_omega;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -124,7 +124,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_gamma;1",
+        "@id": "dtmi:example:mu_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -143,7 +143,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_delta;1",
+        "@id": "dtmi:example:mu_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -163,7 +163,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_epsilon;1",
+        "@id": "dtmi:example:mu_um;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -182,7 +182,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_zeta;1",
+        "@id": "dtmi:example:mu_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -202,7 +202,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_eta;1",
+        "@id": "dtmi:example:mu_fuddle;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -221,7 +221,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_theta;1",
+        "@id": "dtmi:example:mu_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -241,7 +241,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_iota;1",
+        "@id": "dtmi:example:mu_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@id": [
@@ -260,7 +260,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_kappa;1",
+        "@id": "dtmi:example:mu_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v3/spec/Requirement-ClassObjectIdRequiredV3.json b/DTDL/v3/spec/Requirement-ClassObjectIdRequiredV3.json
index 1fbbaf20..09552ad4 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectIdRequiredV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectIdRequiredV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_psi;1",
+        "@id": "dtmi:example:lambda_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yekk_chi",
+          "name": "lambda_alpha",
           "schema": {
             "@type": "Object"
           }
@@ -27,10 +27,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_yuzz;1",
+        "@id": "dtmi:example:lambda_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:yekk_omega;1",
+          "@id": "dtmi:example:lambda_gamma;1",
           "@type": "Object"
         }
       }
@@ -44,7 +44,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_wum;1",
+        "@id": "dtmi:example:lambda_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@type": "Object"
@@ -60,7 +60,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_um;1",
+        "@id": "dtmi:example:lambda_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v3/spec/Requirement-ClassObjectInvalidKeywordsV3.json b/DTDL/v3/spec/Requirement-ClassObjectInvalidKeywordsV3.json
index b0ca8d70..ed56d150 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectInvalidKeywordsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectInvalidKeywordsV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_iota;1",
+        "@id": "dtmi:example:phi_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_theta;1",
+          "@id": "dtmi:example:phi_jogg;1",
           "@type": "Object",
           "@graph": {}
         }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_lambda;1",
+        "@id": "dtmi:example:phi_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:iota_kappa;1",
+          "@id": "dtmi:example:phi_itch;1",
           "@type": "Object",
           "@graph": {}
         }
@@ -44,10 +44,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_nu;1",
+        "@id": "dtmi:example:phi_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_mu;1",
+          "@id": "dtmi:example:phi_vroo;1",
           "@type": "Object",
           "@value": 626
         }
@@ -62,11 +62,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_omicron;1",
+        "@id": "dtmi:example:chi_beta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:iota_xi;1",
+          "@id": "dtmi:example:chi_alpha;1",
           "@type": "Object",
           "@value": 626
         }
@@ -81,10 +81,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_rho;1",
+        "@id": "dtmi:example:chi_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_pi;1",
+          "@id": "dtmi:example:chi_gamma;1",
           "@type": "Object",
           "@language": "en"
         }
@@ -99,11 +99,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_tau;1",
+        "@id": "dtmi:example:chi_zeta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:iota_sigma;1",
+          "@id": "dtmi:example:chi_epsilon;1",
           "@type": "Object",
           "@language": "en"
         }
@@ -118,10 +118,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_phi;1",
+        "@id": "dtmi:example:chi_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_upsilon;1",
+          "@id": "dtmi:example:chi_eta;1",
           "@type": "Object",
           "@foobar": true
         }
@@ -136,11 +136,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_psi;1",
+        "@id": "dtmi:example:chi_kappa;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:iota_chi;1",
+          "@id": "dtmi:example:chi_iota;1",
           "@type": "Object",
           "@foobar": true
         }
diff --git a/DTDL/v3/spec/Requirement-ClassObjectPropertiesElementSchemaSchemaMaxDepthV3.json b/DTDL/v3/spec/Requirement-ClassObjectPropertiesElementSchemaSchemaMaxDepthV3.json
index 5aa79989..1abeb11b 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectPropertiesElementSchemaSchemaMaxDepthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectPropertiesElementSchemaSchemaMaxDepthV3.json
@@ -7,32 +7,32 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_eta;1",
+        "@id": "dtmi:example:thnad_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "upsilon_zeta",
+          "name": "thnad_theta",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "upsilon_epsilon",
+              "name": "thnad_eta",
               "schema": {
                 "@type": "Object",
                 "fields": {
-                  "name": "upsilon_delta",
+                  "name": "thnad_zeta",
                   "schema": {
                     "@type": "Object",
                     "fields": {
-                      "name": "upsilon_gamma",
+                      "name": "thnad_epsilon",
                       "schema": {
                         "@type": "Object",
                         "fields": {
-                          "name": "upsilon_beta",
+                          "name": "thnad_delta",
                           "schema": {
                             "@type": "Object",
                             "fields": [
                               {
-                                "name": "upsilon_alpha",
+                                "name": "thnad_gamma",
                                 "schema": "integer"
                               }
                             ]
@@ -57,36 +57,36 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_omicron;1",
+        "@id": "dtmi:example:thnad_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "upsilon_xi",
+          "name": "thnad_pi",
           "schema": {
             "@type": "Object",
             "fields": {
-              "name": "upsilon_nu",
+              "name": "thnad_omicron",
               "schema": {
                 "@type": "Object",
                 "fields": {
-                  "name": "upsilon_mu",
+                  "name": "thnad_xi",
                   "schema": {
                     "@type": "Object",
                     "fields": {
-                      "name": "upsilon_lambda",
+                      "name": "thnad_nu",
                       "schema": {
                         "@type": "Object",
                         "fields": {
-                          "name": "upsilon_kappa",
+                          "name": "thnad_mu",
                           "schema": {
                             "@type": "Object",
                             "fields": {
-                              "name": "upsilon_iota",
+                              "name": "thnad_lambda",
                               "schema": {
                                 "@type": "Object",
                                 "fields": [
                                   {
-                                    "name": "upsilon_theta",
+                                    "name": "thnad_kappa",
                                     "schema": "long"
                                   }
                                 ]
@@ -113,37 +113,37 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_psi;1",
+        "@id": "dtmi:example:thnad_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "upsilon_chi",
+          "name": "thnad_omega",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Object",
             "fields": {
-              "name": "upsilon_phi",
+              "name": "thnad_psi",
               "schema": {
                 "@type": "Object",
                 "fields": {
-                  "name": "upsilon_upsilon",
+                  "name": "thnad_chi",
                   "schema": {
                     "@type": "Object",
                     "fields": {
-                      "name": "upsilon_tau",
+                      "name": "thnad_phi",
                       "schema": {
                         "@type": "Object",
                         "fields": {
-                          "name": "upsilon_sigma",
+                          "name": "thnad_upsilon",
                           "schema": {
                             "@type": "Object",
                             "fields": {
-                              "name": "upsilon_rho",
+                              "name": "thnad_tau",
                               "schema": {
                                 "@type": "Object",
                                 "fields": [
                                   {
-                                    "name": "upsilon_pi",
+                                    "name": "thnad_sigma",
                                     "schema": "string"
                                   }
                                 ]
diff --git a/DTDL/v3/spec/Requirement-ClassObjectPropertiesElementSchemaSchemaSelfReferenceV3.json b/DTDL/v3/spec/Requirement-ClassObjectPropertiesElementSchemaSchemaSelfReferenceV3.json
new file mode 100644
index 00000000..ac58cfeb
--- /dev/null
+++ b/DTDL/v3/spec/Requirement-ClassObjectPropertiesElementSchemaSchemaSelfReferenceV3.json
@@ -0,0 +1,53 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:thnad_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "thnad_um",
+          "schema": {
+            "@id": "dtmi:foo:delta_gamma;1",
+            "@type": "Object",
+            "fields": {
+              "name": "thnad_wum",
+              "schema": "dtmi:foo:delta_gamma;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:thnad_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "thnad_glikk",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:delta_gamma;1",
+            "@type": "Object",
+            "fields": {
+              "name": "thnad_fuddle",
+              "schema": "dtmi:foo:delta_gamma;1"
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v3/spec/Requirement-ClassObjectPropertyCommentStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassObjectPropertyCommentStringLengthV3.json
index 862b8b90..fa1ac4f4 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectPropertyCommentStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectPropertyCommentStringLengthV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_omicron;1",
+        "@id": "dtmi:example:nu_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_xi;1",
+          "@id": "dtmi:example:nu_floob;1",
           "@type": "Object",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
@@ -25,10 +25,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_rho;1",
+        "@id": "dtmi:example:nu_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_pi;1",
+          "@id": "dtmi:example:nu_jogg;1",
           "@type": "Object",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
@@ -43,11 +43,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_tau;1",
+        "@id": "dtmi:example:nu_yekk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:alpha_sigma;1",
+          "@id": "dtmi:example:nu_itch;1",
           "@type": "Object",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
diff --git a/DTDL/v3/spec/Requirement-ClassObjectPropertyCommentStringV3.json b/DTDL/v3/spec/Requirement-ClassObjectPropertyCommentStringV3.json
index 53ca9103..93e955be 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectPropertyCommentStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectPropertyCommentStringV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_pi;1",
+        "@id": "dtmi:example:mu_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_omicron;1",
+          "@id": "dtmi:example:mu_zatz;1",
           "@type": "Object",
           "comment": "hello"
         }
@@ -25,10 +25,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_sigma;1",
+        "@id": "dtmi:example:mu_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_rho;1",
+          "@id": "dtmi:example:mu_flunn;1",
           "@type": "Object",
           "comment": [
             "hello"
@@ -45,10 +45,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_upsilon;1",
+        "@id": "dtmi:example:mu_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_tau;1",
+          "@id": "dtmi:example:mu_yekk;1",
           "@type": "Object",
           "comment": {
             "@value": "hello",
@@ -66,10 +66,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_chi;1",
+        "@id": "dtmi:example:nu_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_phi;1",
+          "@id": "dtmi:example:mu_hi;1",
           "@type": "Object",
           "comment": [
             {
@@ -89,10 +89,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_omega;1",
+        "@id": "dtmi:example:nu_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_psi;1",
+          "@id": "dtmi:example:nu_beta;1",
           "@type": "Object",
           "comment": []
         }
@@ -107,10 +107,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_wum;1",
+        "@id": "dtmi:example:nu_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_yuzz;1",
+          "@id": "dtmi:example:nu_delta;1",
           "@type": "Object",
           "comment": null
         }
@@ -125,11 +125,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_humpf;1",
+        "@id": "dtmi:example:nu_eta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:hi_um;1",
+          "@id": "dtmi:example:nu_zeta;1",
           "@type": "Object",
           "comment": null
         }
@@ -144,10 +144,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_glikk;1",
+        "@id": "dtmi:example:nu_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_fuddle;1",
+          "@id": "dtmi:example:nu_theta;1",
           "@type": "Object",
           "comment": true
         }
@@ -162,11 +162,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_snee;1",
+        "@id": "dtmi:example:nu_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:hi_nuh;1",
+          "@id": "dtmi:example:nu_kappa;1",
           "@type": "Object",
           "comment": true
         }
@@ -181,10 +181,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_thnad;1",
+        "@id": "dtmi:example:nu_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_quan;1",
+          "@id": "dtmi:example:nu_mu;1",
           "@type": "Object",
           "comment": 626
         }
@@ -199,11 +199,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_floob;1",
+        "@id": "dtmi:example:nu_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:hi_spazz;1",
+          "@id": "dtmi:example:nu_xi;1",
           "@type": "Object",
           "comment": 626
         }
@@ -218,10 +218,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_jogg;1",
+        "@id": "dtmi:example:nu_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_zatz;1",
+          "@id": "dtmi:example:nu_pi;1",
           "@type": "Object",
           "comment": [
             null
@@ -238,11 +238,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_itch;1",
+        "@id": "dtmi:example:nu_tau;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:hi_flunn;1",
+          "@id": "dtmi:example:nu_sigma;1",
           "@type": "Object",
           "comment": [
             null
@@ -259,10 +259,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_vroo;1",
+        "@id": "dtmi:example:nu_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:hi_yekk;1",
+          "@id": "dtmi:example:nu_upsilon;1",
           "@type": "Object",
           "comment": [
             true
@@ -279,11 +279,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_alpha;1",
+        "@id": "dtmi:example:nu_psi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:hi_hi;1",
+          "@id": "dtmi:example:nu_chi;1",
           "@type": "Object",
           "comment": [
             true
@@ -300,10 +300,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_gamma;1",
+        "@id": "dtmi:example:nu_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_beta;1",
+          "@id": "dtmi:example:nu_omega;1",
           "@type": "Object",
           "comment": [
             626
@@ -320,11 +320,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_epsilon;1",
+        "@id": "dtmi:example:nu_um;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:alpha_delta;1",
+          "@id": "dtmi:example:nu_wum;1",
           "@type": "Object",
           "comment": [
             626
@@ -341,10 +341,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_eta;1",
+        "@id": "dtmi:example:nu_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_zeta;1",
+          "@id": "dtmi:example:nu_humpf;1",
           "@type": "Object",
           "comment": {}
         }
@@ -359,11 +359,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_iota;1",
+        "@id": "dtmi:example:nu_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:alpha_theta;1",
+          "@id": "dtmi:example:nu_glikk;1",
           "@type": "Object",
           "comment": {}
         }
@@ -378,10 +378,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_lambda;1",
+        "@id": "dtmi:example:nu_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_kappa;1",
+          "@id": "dtmi:example:nu_snee;1",
           "@type": "Object",
           "comment": [
             {}
@@ -398,11 +398,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_nu;1",
+        "@id": "dtmi:example:nu_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:alpha_mu;1",
+          "@id": "dtmi:example:nu_thnad;1",
           "@type": "Object",
           "comment": [
             {}
diff --git a/DTDL/v3/spec/Requirement-ClassObjectPropertyCommentTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassObjectPropertyCommentTermAndDtmiV3.json
index 60e7acd6..ae6cdd30 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectPropertyCommentTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectPropertyCommentTermAndDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_snee;1",
+        "@id": "dtmi:example:xi_lambda;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_fuddle;1",
+          "@id": "dtmi:example:xi_theta;1",
           "@type": "Object",
-          "comment": "alpha_glikk",
-          "dtmi:dtdl:property:comment;3": "alpha_nuh"
+          "comment": "xi_iota",
+          "dtmi:dtdl:property:comment;3": "xi_kappa"
         }
       }
     ]
@@ -26,14 +26,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_floob;1",
+        "@id": "dtmi:example:xi_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:alpha_quan;1",
+          "@id": "dtmi:example:xi_mu;1",
           "@type": "Object",
-          "comment": "alpha_thnad",
-          "dtmi:dtdl:property:comment;3": "alpha_spazz"
+          "comment": "xi_nu",
+          "dtmi:dtdl:property:comment;3": "xi_xi"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassObjectPropertyDescriptionLangStringV3.json b/DTDL/v3/spec/Requirement-ClassObjectPropertyDescriptionLangStringV3.json
index 1f61feb3..7f060d7d 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectPropertyDescriptionLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectPropertyDescriptionLangStringV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_jogg;1",
+        "@id": "dtmi:example:xi_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_zatz;1",
+          "@id": "dtmi:example:xi_pi;1",
           "@type": "Object",
           "description": "hello"
         }
@@ -25,10 +25,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_itch;1",
+        "@id": "dtmi:example:xi_tau;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_flunn;1",
+          "@id": "dtmi:example:xi_sigma;1",
           "@type": "Object",
           "description": [
             "hello"
@@ -45,10 +45,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_vroo;1",
+        "@id": "dtmi:example:xi_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_yekk;1",
+          "@id": "dtmi:example:xi_upsilon;1",
           "@type": "Object",
           "description": {
             "en": "hello"
@@ -65,10 +65,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_alpha;1",
+        "@id": "dtmi:example:xi_psi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:alpha_hi;1",
+          "@id": "dtmi:example:xi_chi;1",
           "@type": "Object",
           "description": [
             {
@@ -88,10 +88,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_gamma;1",
+        "@id": "dtmi:example:xi_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_beta;1",
+          "@id": "dtmi:example:xi_omega;1",
           "@type": "Object",
           "description": {}
         }
@@ -106,10 +106,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_epsilon;1",
+        "@id": "dtmi:example:xi_um;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_delta;1",
+          "@id": "dtmi:example:xi_wum;1",
           "@type": "Object",
           "description": []
         }
@@ -124,10 +124,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_eta;1",
+        "@id": "dtmi:example:xi_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_zeta;1",
+          "@id": "dtmi:example:xi_humpf;1",
           "@type": "Object",
           "description": null
         }
@@ -142,11 +142,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_iota;1",
+        "@id": "dtmi:example:xi_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:beta_theta;1",
+          "@id": "dtmi:example:xi_glikk;1",
           "@type": "Object",
           "description": null
         }
@@ -161,10 +161,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_lambda;1",
+        "@id": "dtmi:example:xi_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_kappa;1",
+          "@id": "dtmi:example:xi_snee;1",
           "@type": "Object",
           "description": true
         }
@@ -179,11 +179,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_nu;1",
+        "@id": "dtmi:example:xi_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:beta_mu;1",
+          "@id": "dtmi:example:xi_thnad;1",
           "@type": "Object",
           "description": true
         }
@@ -198,10 +198,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_omicron;1",
+        "@id": "dtmi:example:xi_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_xi;1",
+          "@id": "dtmi:example:xi_floob;1",
           "@type": "Object",
           "description": 626
         }
@@ -216,11 +216,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_rho;1",
+        "@id": "dtmi:example:xi_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:beta_pi;1",
+          "@id": "dtmi:example:xi_jogg;1",
           "@type": "Object",
           "description": 626
         }
@@ -235,10 +235,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_tau;1",
+        "@id": "dtmi:example:xi_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_sigma;1",
+          "@id": "dtmi:example:xi_itch;1",
           "@type": "Object",
           "description": [
             null
@@ -255,11 +255,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_phi;1",
+        "@id": "dtmi:example:xi_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:beta_upsilon;1",
+          "@id": "dtmi:example:xi_vroo;1",
           "@type": "Object",
           "description": [
             null
@@ -276,10 +276,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_psi;1",
+        "@id": "dtmi:example:omicron_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_chi;1",
+          "@id": "dtmi:example:omicron_alpha;1",
           "@type": "Object",
           "description": [
             true
@@ -296,11 +296,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_yuzz;1",
+        "@id": "dtmi:example:omicron_delta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:beta_omega;1",
+          "@id": "dtmi:example:omicron_gamma;1",
           "@type": "Object",
           "description": [
             true
@@ -317,10 +317,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_um;1",
+        "@id": "dtmi:example:omicron_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_wum;1",
+          "@id": "dtmi:example:omicron_epsilon;1",
           "@type": "Object",
           "description": [
             626
@@ -337,11 +337,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_fuddle;1",
+        "@id": "dtmi:example:omicron_theta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:beta_humpf;1",
+          "@id": "dtmi:example:omicron_eta;1",
           "@type": "Object",
           "description": [
             626
@@ -358,10 +358,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_nuh;1",
+        "@id": "dtmi:example:omicron_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_glikk;1",
+          "@id": "dtmi:example:omicron_iota;1",
           "@type": "Object",
           "description": [
             {}
@@ -378,11 +378,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_quan;1",
+        "@id": "dtmi:example:omicron_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:beta_snee;1",
+          "@id": "dtmi:example:omicron_lambda;1",
           "@type": "Object",
           "description": [
             {}
@@ -399,10 +399,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_spazz;1",
+        "@id": "dtmi:example:omicron_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_thnad;1",
+          "@id": "dtmi:example:omicron_nu;1",
           "@type": "Object",
           "description": {
             "@value": "hello",
@@ -420,11 +420,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_zatz;1",
+        "@id": "dtmi:example:omicron_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:beta_floob;1",
+          "@id": "dtmi:example:omicron_omicron;1",
           "@type": "Object",
           "description": {
             "@value": "hello",
@@ -442,10 +442,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_flunn;1",
+        "@id": "dtmi:example:omicron_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_jogg;1",
+          "@id": "dtmi:example:omicron_rho;1",
           "@type": "Object",
           "description": [
             {
@@ -464,11 +464,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_yekk;1",
+        "@id": "dtmi:example:omicron_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:beta_itch;1",
+          "@id": "dtmi:example:omicron_tau;1",
           "@type": "Object",
           "description": [
             {
diff --git a/DTDL/v3/spec/Requirement-ClassObjectPropertyDescriptionStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassObjectPropertyDescriptionStringLengthV3.json
index 0282125a..22080006 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectPropertyDescriptionStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectPropertyDescriptionStringLengthV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_hi;1",
+        "@id": "dtmi:example:omicron_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:beta_vroo;1",
+          "@id": "dtmi:example:omicron_phi;1",
           "@type": "Object",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
@@ -25,10 +25,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_beta;1",
+        "@id": "dtmi:example:omicron_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_alpha;1",
+          "@id": "dtmi:example:omicron_psi;1",
           "@type": "Object",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
@@ -43,11 +43,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_delta;1",
+        "@id": "dtmi:example:omicron_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:gamma_gamma;1",
+          "@id": "dtmi:example:omicron_yuzz;1",
           "@type": "Object",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
diff --git a/DTDL/v3/spec/Requirement-ClassObjectPropertyDescriptionTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassObjectPropertyDescriptionTermAndDtmiV3.json
index 891761b2..41aa2218 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectPropertyDescriptionTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectPropertyDescriptionTermAndDtmiV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_rho;1",
+        "@id": "dtmi:example:omicron_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_xi;1",
+          "@id": "dtmi:example:omicron_floob;1",
           "@type": "Object",
           "description": [
-            "gamma_omicron"
+            "omicron_zatz"
           ],
           "dtmi:dtdl:property:description;3": [
-            "gamma_pi"
+            "omicron_jogg"
           ]
         }
       }
@@ -30,17 +30,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_phi;1",
+        "@id": "dtmi:example:omicron_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:gamma_sigma;1",
+          "@id": "dtmi:example:omicron_itch;1",
           "@type": "Object",
           "description": [
-            "gamma_tau"
+            "omicron_yekk"
           ],
           "dtmi:dtdl:property:description;3": [
-            "gamma_upsilon"
+            "omicron_vroo"
           ]
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassObjectPropertyDisplayNameLangStringV3.json b/DTDL/v3/spec/Requirement-ClassObjectPropertyDisplayNameLangStringV3.json
index 6408a45c..16bc614c 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectPropertyDisplayNameLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectPropertyDisplayNameLangStringV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_psi;1",
+        "@id": "dtmi:example:pi_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_chi;1",
+          "@id": "dtmi:example:pi_alpha;1",
           "@type": "Object",
           "displayName": "hello"
         }
@@ -25,10 +25,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_yuzz;1",
+        "@id": "dtmi:example:pi_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_omega;1",
+          "@id": "dtmi:example:pi_gamma;1",
           "@type": "Object",
           "displayName": [
             "hello"
@@ -45,10 +45,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_um;1",
+        "@id": "dtmi:example:pi_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_wum;1",
+          "@id": "dtmi:example:pi_epsilon;1",
           "@type": "Object",
           "displayName": {
             "en": "hello"
@@ -65,10 +65,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_fuddle;1",
+        "@id": "dtmi:example:pi_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_humpf;1",
+          "@id": "dtmi:example:pi_eta;1",
           "@type": "Object",
           "displayName": [
             {
@@ -88,10 +88,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_nuh;1",
+        "@id": "dtmi:example:pi_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_glikk;1",
+          "@id": "dtmi:example:pi_iota;1",
           "@type": "Object",
           "displayName": {}
         }
@@ -106,10 +106,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_quan;1",
+        "@id": "dtmi:example:pi_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_snee;1",
+          "@id": "dtmi:example:pi_lambda;1",
           "@type": "Object",
           "displayName": []
         }
@@ -124,10 +124,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_spazz;1",
+        "@id": "dtmi:example:pi_xi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_thnad;1",
+          "@id": "dtmi:example:pi_nu;1",
           "@type": "Object",
           "displayName": null
         }
@@ -142,11 +142,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_zatz;1",
+        "@id": "dtmi:example:pi_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:gamma_floob;1",
+          "@id": "dtmi:example:pi_omicron;1",
           "@type": "Object",
           "displayName": null
         }
@@ -161,10 +161,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_flunn;1",
+        "@id": "dtmi:example:pi_sigma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_jogg;1",
+          "@id": "dtmi:example:pi_rho;1",
           "@type": "Object",
           "displayName": true
         }
@@ -179,11 +179,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_yekk;1",
+        "@id": "dtmi:example:pi_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:gamma_itch;1",
+          "@id": "dtmi:example:pi_tau;1",
           "@type": "Object",
           "displayName": true
         }
@@ -198,10 +198,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_hi;1",
+        "@id": "dtmi:example:pi_chi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:gamma_vroo;1",
+          "@id": "dtmi:example:pi_phi;1",
           "@type": "Object",
           "displayName": 626
         }
@@ -216,11 +216,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_beta;1",
+        "@id": "dtmi:example:pi_omega;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_alpha;1",
+          "@id": "dtmi:example:pi_psi;1",
           "@type": "Object",
           "displayName": 626
         }
@@ -235,10 +235,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_delta;1",
+        "@id": "dtmi:example:pi_wum;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_gamma;1",
+          "@id": "dtmi:example:pi_yuzz;1",
           "@type": "Object",
           "displayName": [
             null
@@ -255,11 +255,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_zeta;1",
+        "@id": "dtmi:example:pi_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_epsilon;1",
+          "@id": "dtmi:example:pi_um;1",
           "@type": "Object",
           "displayName": [
             null
@@ -276,10 +276,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_theta;1",
+        "@id": "dtmi:example:pi_glikk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_eta;1",
+          "@id": "dtmi:example:pi_fuddle;1",
           "@type": "Object",
           "displayName": [
             true
@@ -296,11 +296,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_kappa;1",
+        "@id": "dtmi:example:pi_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_iota;1",
+          "@id": "dtmi:example:pi_nuh;1",
           "@type": "Object",
           "displayName": [
             true
@@ -317,10 +317,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_mu;1",
+        "@id": "dtmi:example:pi_thnad;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_lambda;1",
+          "@id": "dtmi:example:pi_quan;1",
           "@type": "Object",
           "displayName": [
             626
@@ -337,11 +337,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_xi;1",
+        "@id": "dtmi:example:pi_floob;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_nu;1",
+          "@id": "dtmi:example:pi_spazz;1",
           "@type": "Object",
           "displayName": [
             626
@@ -358,10 +358,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_pi;1",
+        "@id": "dtmi:example:pi_jogg;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_omicron;1",
+          "@id": "dtmi:example:pi_zatz;1",
           "@type": "Object",
           "displayName": [
             {}
@@ -378,11 +378,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_sigma;1",
+        "@id": "dtmi:example:pi_itch;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_rho;1",
+          "@id": "dtmi:example:pi_flunn;1",
           "@type": "Object",
           "displayName": [
             {}
@@ -399,10 +399,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_upsilon;1",
+        "@id": "dtmi:example:pi_vroo;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_tau;1",
+          "@id": "dtmi:example:pi_yekk;1",
           "@type": "Object",
           "displayName": {
             "@value": "hello",
@@ -420,11 +420,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_chi;1",
+        "@id": "dtmi:example:rho_alpha;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_phi;1",
+          "@id": "dtmi:example:pi_hi;1",
           "@type": "Object",
           "displayName": {
             "@value": "hello",
@@ -442,10 +442,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_omega;1",
+        "@id": "dtmi:example:rho_gamma;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_psi;1",
+          "@id": "dtmi:example:rho_beta;1",
           "@type": "Object",
           "displayName": [
             {
@@ -464,11 +464,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_wum;1",
+        "@id": "dtmi:example:rho_epsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_yuzz;1",
+          "@id": "dtmi:example:rho_delta;1",
           "@type": "Object",
           "displayName": [
             {
diff --git a/DTDL/v3/spec/Requirement-ClassObjectPropertyDisplayNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassObjectPropertyDisplayNameStringLengthV3.json
index 07ab151f..28b9e6ec 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectPropertyDisplayNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectPropertyDisplayNameStringLengthV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_humpf;1",
+        "@id": "dtmi:example:rho_eta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_um;1",
+          "@id": "dtmi:example:rho_zeta;1",
           "@type": "Object",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
@@ -25,10 +25,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_glikk;1",
+        "@id": "dtmi:example:rho_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_fuddle;1",
+          "@id": "dtmi:example:rho_theta;1",
           "@type": "Object",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
@@ -43,11 +43,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_snee;1",
+        "@id": "dtmi:example:rho_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:delta_nuh;1",
+          "@id": "dtmi:example:rho_kappa;1",
           "@type": "Object",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
diff --git a/DTDL/v3/spec/Requirement-ClassObjectPropertyDisplayNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassObjectPropertyDisplayNameTermAndDtmiV3.json
index a299ad88..5721dc85 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectPropertyDisplayNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectPropertyDisplayNameTermAndDtmiV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_beta;1",
+        "@id": "dtmi:example:rho_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:delta_vroo;1",
+          "@id": "dtmi:example:rho_phi;1",
           "@type": "Object",
           "displayName": [
-            "delta_hi"
+            "rho_chi"
           ],
           "dtmi:dtdl:property:displayName;3": [
-            "epsilon_alpha"
+            "rho_psi"
           ]
         }
       }
@@ -30,17 +30,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_zeta;1",
+        "@id": "dtmi:example:rho_humpf;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:epsilon_gamma;1",
+          "@id": "dtmi:example:rho_yuzz;1",
           "@type": "Object",
           "displayName": [
-            "epsilon_delta"
+            "rho_wum"
           ],
           "dtmi:dtdl:property:displayName;3": [
-            "epsilon_epsilon"
+            "rho_um"
           ]
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassObjectPropertyFieldsElementV3.json b/DTDL/v3/spec/Requirement-ClassObjectPropertyFieldsElementV3.json
index 18c35cc2..03fffb95 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectPropertyFieldsElementV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectPropertyFieldsElementV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_kappa;1",
+        "@id": "dtmi:example:rho_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "epsilon_iota",
+          "name": "rho_nuh",
           "schema": {
             "@type": "Object",
             "fields": {
-              "@id": "dtmi:example:epsilon_eta;1",
-              "name": "epsilon_theta",
-              "schema": "time"
+              "@id": "dtmi:example:rho_fuddle;1",
+              "name": "rho_glikk",
+              "schema": "date"
             }
           }
         }
@@ -32,18 +32,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_xi;1",
+        "@id": "dtmi:example:rho_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "epsilon_nu",
+          "name": "rho_spazz",
           "schema": {
             "@type": "Object",
             "fields": [
               {
-                "@id": "dtmi:example:epsilon_lambda;1",
-                "name": "epsilon_mu",
-                "schema": "boolean"
+                "@id": "dtmi:example:rho_quan;1",
+                "name": "rho_thnad",
+                "schema": "dateTime"
               }
             ]
           }
@@ -59,20 +59,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_rho;1",
+        "@id": "dtmi:example:rho_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_pi;1",
+          "@id": "dtmi:example:rho_jogg;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:ex:dependentRef;1",
-            "name": "epsilon_omicron",
-            "schema": "date"
+            "name": "rho_zatz",
+            "schema": "double"
           }
         },
         "contents": {
           "@type": "Property",
-          "name": "epsilon_sigma",
+          "name": "rho_itch",
           "schema": {
             "@type": "Object",
             "fields": "dtmi:ex:dependentRef;1"
@@ -89,20 +89,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_phi;1",
+        "@id": "dtmi:example:rho_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:epsilon_upsilon;1",
+          "@id": "dtmi:example:rho_vroo;1",
           "@type": "Object",
           "fields": {
             "@id": "dtmi:ex:dependentRef;1",
-            "name": "epsilon_tau",
-            "schema": "dateTime"
+            "name": "rho_yekk",
+            "schema": "duration"
           }
         },
         "contents": {
           "@type": "Property",
-          "name": "epsilon_chi",
+          "name": "sigma_alpha",
           "schema": {
             "@type": "Object",
             "fields": [
@@ -121,17 +121,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_wum;1",
+        "@id": "dtmi:example:sigma_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "epsilon_yuzz",
+          "name": "sigma_delta",
           "schema": {
             "@type": "Object",
             "fields": {
-              "@id": "dtmi:example:epsilon_psi;1",
-              "name": "epsilon_omega",
-              "schema": "double",
+              "@id": "dtmi:example:sigma_beta;1",
+              "name": "sigma_gamma",
+              "schema": "float",
               "@context": "dtmi:dtdl:context;2"
             }
           }
@@ -147,18 +147,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_glikk;1",
+        "@id": "dtmi:example:sigma_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "epsilon_fuddle",
+          "name": "sigma_theta",
           "schema": {
             "@context": "dtmi:undefinedExtension:context;1",
             "@type": "Object",
             "fields": {
-              "@id": "dtmi:example:epsilon_um;1",
-              "name": "epsilon_humpf",
-              "schema": "duration",
+              "@id": "dtmi:example:sigma_zeta;1",
+              "name": "sigma_eta",
+              "schema": "integer",
               "@context": "dtmi:dtdl:context;2"
             }
           }
@@ -166,6 +166,59 @@
       }
     ]
   },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:sigma_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "sigma_mu",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "@id": "dtmi:example:sigma_kappa;1",
+              "name": "sigma_lambda",
+              "schema": "bytes",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:sigma_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "sigma_pi",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Object",
+            "fields": {
+              "@id": "dtmi:example:sigma_xi;1",
+              "name": "sigma_omicron",
+              "schema": "date",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
   {
     "valid": true,
     "options": [
@@ -174,11 +227,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_snee;1",
+        "@id": "dtmi:example:sigma_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "epsilon_nuh",
+          "name": "sigma_sigma",
           "schema": {
             "@type": "Object",
             "fields": []
@@ -195,23 +248,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_jogg;1",
+        "@id": "dtmi:example:sigma_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "epsilon_zatz",
+          "name": "sigma_omega",
           "schema": {
             "@type": "Object",
             "fields": [
               {
-                "@id": "dtmi:example:epsilon_quan;1",
-                "name": "epsilon_thnad",
-                "schema": "float"
+                "@id": "dtmi:example:sigma_upsilon;1",
+                "name": "sigma_phi",
+                "schema": "time"
               },
               {
-                "@id": "dtmi:example:epsilon_spazz;1",
-                "name": "epsilon_floob",
-                "schema": "integer"
+                "@id": "dtmi:example:sigma_chi;1",
+                "name": "sigma_psi",
+                "schema": "boolean"
               }
             ]
           }
diff --git a/DTDL/v3/spec/Requirement-ClassObjectPropertyFieldsTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassObjectPropertyFieldsTermAndDtmiV3.json
index 9198f46c..5e613e20 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectPropertyFieldsTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectPropertyFieldsTermAndDtmiV3.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_gamma;1",
+        "@id": "dtmi:example:phi_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_hi;1",
+          "@id": "dtmi:example:phi_glikk;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "iota_alpha",
-              "schema": "float"
+              "name": "phi_nuh",
+              "schema": "time"
             }
           ],
           "dtmi:dtdl:property:fields;3": [
             {
-              "name": "iota_beta",
-              "schema": "integer"
+              "name": "phi_snee",
+              "schema": "boolean"
             }
           ]
         }
@@ -36,22 +36,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_eta;1",
+        "@id": "dtmi:example:phi_zatz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:iota_delta;1",
+          "@id": "dtmi:example:phi_thnad;1",
           "@type": "Object",
           "fields": [
             {
-              "name": "iota_epsilon",
-              "schema": "long"
+              "name": "phi_spazz",
+              "schema": "date"
             }
           ],
           "dtmi:dtdl:property:fields;3": [
             {
-              "name": "iota_zeta",
-              "schema": "string"
+              "name": "phi_floob",
+              "schema": "dateTime"
             }
           ]
         }
diff --git a/DTDL/v3/spec/Requirement-ClassObjectPropertyFieldsTypeConformanceV3.json b/DTDL/v3/spec/Requirement-ClassObjectPropertyFieldsTypeConformanceV3.json
index b9770b57..be06001e 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectPropertyFieldsTypeConformanceV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectPropertyFieldsTypeConformanceV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_beta;1",
+        "@id": "dtmi:example:sigma_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_alpha;1",
+          "@id": "dtmi:example:sigma_nuh;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:epsilon_hi;1",
-            "elementSchema": "long",
+            "@id": "dtmi:example:sigma_glikk;1",
+            "elementSchema": "date",
             "@type": "Array"
           }
         }
@@ -29,15 +29,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_epsilon;1",
+        "@id": "dtmi:example:sigma_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zeta_delta;1",
+          "@id": "dtmi:example:sigma_thnad;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:zeta_gamma;1",
-            "elementSchema": "string",
+            "@id": "dtmi:example:sigma_quan;1",
+            "elementSchema": "dateTime",
             "@type": "Array"
           }
         }
@@ -52,14 +52,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_iota;1",
+        "@id": "dtmi:example:sigma_flunn;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_theta;1",
+          "@id": "dtmi:example:sigma_jogg;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:zeta_zeta;1",
-            "name": "zeta_eta",
+            "@id": "dtmi:example:sigma_floob;1",
+            "name": "sigma_zatz",
             "@type": "Command"
           }
         }
@@ -74,15 +74,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_nu;1",
+        "@id": "dtmi:example:sigma_hi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zeta_mu;1",
+          "@id": "dtmi:example:sigma_vroo;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:zeta_kappa;1",
-            "name": "zeta_lambda",
+            "@id": "dtmi:example:sigma_itch;1",
+            "name": "sigma_yekk",
             "@type": "Command"
           }
         }
@@ -97,15 +97,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_rho;1",
+        "@id": "dtmi:example:tau_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_pi;1",
+          "@id": "dtmi:example:tau_gamma;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:zeta_xi;1",
-            "name": "zeta_omicron",
-            "schema": "time",
+            "@id": "dtmi:example:tau_alpha;1",
+            "name": "tau_beta",
+            "schema": "double",
             "@type": "CommandRequest"
           }
         }
@@ -120,16 +120,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_phi;1",
+        "@id": "dtmi:example:tau_theta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zeta_upsilon;1",
+          "@id": "dtmi:example:tau_eta;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:zeta_sigma;1",
-            "name": "zeta_tau",
-            "schema": "boolean",
+            "@id": "dtmi:example:tau_epsilon;1",
+            "name": "tau_zeta",
+            "schema": "duration",
             "@type": "CommandRequest"
           }
         }
@@ -144,15 +144,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_yuzz;1",
+        "@id": "dtmi:example:tau_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_omega;1",
+          "@id": "dtmi:example:tau_lambda;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:zeta_chi;1",
-            "name": "zeta_psi",
-            "schema": "date",
+            "@id": "dtmi:example:tau_iota;1",
+            "name": "tau_kappa",
+            "schema": "float",
             "@type": "CommandResponse"
           }
         }
@@ -167,16 +167,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_fuddle;1",
+        "@id": "dtmi:example:tau_pi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zeta_humpf;1",
+          "@id": "dtmi:example:tau_omicron;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:zeta_wum;1",
-            "name": "zeta_um",
-            "schema": "dateTime",
+            "@id": "dtmi:example:tau_nu;1",
+            "name": "tau_xi",
+            "schema": "integer",
             "@type": "CommandResponse"
           }
         }
@@ -191,16 +191,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_thnad;1",
+        "@id": "dtmi:example:tau_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_quan;1",
+          "@id": "dtmi:example:tau_upsilon;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:zeta_glikk;1",
-            "name": "zeta_nuh",
+            "@id": "dtmi:example:tau_rho;1",
+            "name": "tau_sigma",
             "schema": {
-              "@id": "dtmi:example:zeta_snee;1",
+              "@id": "dtmi:example:tau_tau;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -217,17 +217,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_flunn;1",
+        "@id": "dtmi:example:tau_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:zeta_jogg;1",
+          "@id": "dtmi:example:tau_yuzz;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:zeta_spazz;1",
-            "name": "zeta_floob",
+            "@id": "dtmi:example:tau_chi;1",
+            "name": "tau_psi",
             "schema": {
-              "@id": "dtmi:example:zeta_zatz;1",
+              "@id": "dtmi:example:tau_omega;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -244,13 +244,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_vroo;1",
+        "@id": "dtmi:example:tau_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:zeta_yekk;1",
+          "@id": "dtmi:example:tau_humpf;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:zeta_itch;1",
+            "@id": "dtmi:example:tau_um;1",
             "valueSchema": "integer",
             "@type": "Enum"
           }
@@ -266,14 +266,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_beta;1",
+        "@id": "dtmi:example:tau_snee;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:eta_alpha;1",
+          "@id": "dtmi:example:tau_nuh;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:zeta_hi;1",
+            "@id": "dtmi:example:tau_glikk;1",
             "valueSchema": "integer",
             "@type": "Enum"
           }
@@ -289,15 +289,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_zeta;1",
+        "@id": "dtmi:example:tau_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_epsilon;1",
+          "@id": "dtmi:example:tau_spazz;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:eta_gamma;1",
-            "enumValue": 1466,
-            "name": "eta_delta",
+            "@id": "dtmi:example:tau_quan;1",
+            "enumValue": 1483,
+            "name": "tau_thnad",
             "@type": "EnumValue"
           }
         }
@@ -312,16 +312,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_kappa;1",
+        "@id": "dtmi:example:tau_itch;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:eta_iota;1",
+          "@id": "dtmi:example:tau_flunn;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:eta_eta;1",
-            "enumValue": 1467,
-            "name": "eta_theta",
+            "@id": "dtmi:example:tau_zatz;1",
+            "enumValue": 1484,
+            "name": "tau_jogg",
             "@type": "EnumValue"
           }
         }
@@ -336,15 +336,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_xi;1",
+        "@id": "dtmi:example:upsilon_alpha;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_nu;1",
+          "@id": "dtmi:example:tau_hi;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:eta_lambda;1",
-            "name": "eta_mu",
-            "schema": "double",
+            "@id": "dtmi:example:tau_yekk;1",
+            "name": "tau_vroo",
+            "schema": "long",
             "@type": "Field"
           }
         }
@@ -359,13 +359,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_rho;1",
+        "@id": "dtmi:example:upsilon_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_pi;1",
+          "@id": "dtmi:example:upsilon_gamma;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:eta_omicron;1",
+            "@id": "dtmi:example:upsilon_beta;1",
             "@type": "Interface"
           }
         }
@@ -380,14 +380,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_upsilon;1",
+        "@id": "dtmi:example:upsilon_eta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:eta_tau;1",
+          "@id": "dtmi:example:upsilon_zeta;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:eta_sigma;1",
+            "@id": "dtmi:example:upsilon_epsilon;1",
             "@type": "Interface"
           }
         }
@@ -402,20 +402,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_yuzz;1",
+        "@id": "dtmi:example:upsilon_mu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_omega;1",
+          "@id": "dtmi:example:upsilon_lambda;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:eta_phi;1",
+            "@id": "dtmi:example:upsilon_theta;1",
             "mapKey": {
-              "name": "eta_chi",
+              "name": "upsilon_iota",
               "schema": "string"
             },
             "mapValue": {
-              "name": "eta_psi",
-              "schema": "duration"
+              "name": "upsilon_kappa",
+              "schema": "string"
             },
             "@type": "Map"
           }
@@ -431,21 +431,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_glikk;1",
+        "@id": "dtmi:example:upsilon_rho;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:eta_fuddle;1",
+          "@id": "dtmi:example:upsilon_pi;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:eta_wum;1",
+            "@id": "dtmi:example:upsilon_nu;1",
             "mapKey": {
-              "name": "eta_um",
+              "name": "upsilon_xi",
               "schema": "string"
             },
             "mapValue": {
-              "name": "eta_humpf",
-              "schema": "float"
+              "name": "upsilon_omicron",
+              "schema": "time"
             },
             "@type": "Map"
           }
@@ -461,14 +461,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_thnad;1",
+        "@id": "dtmi:example:upsilon_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_quan;1",
+          "@id": "dtmi:example:upsilon_upsilon;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:eta_nuh;1",
-            "name": "eta_snee",
+            "@id": "dtmi:example:upsilon_sigma;1",
+            "name": "upsilon_tau",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -484,15 +484,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_jogg;1",
+        "@id": "dtmi:example:upsilon_yuzz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:eta_zatz;1",
+          "@id": "dtmi:example:upsilon_omega;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:eta_spazz;1",
-            "name": "eta_floob",
+            "@id": "dtmi:example:upsilon_chi;1",
+            "name": "upsilon_psi",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -508,15 +508,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_vroo;1",
+        "@id": "dtmi:example:upsilon_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:eta_yekk;1",
+          "@id": "dtmi:example:upsilon_humpf;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:eta_flunn;1",
-            "name": "eta_itch",
-            "schema": "integer",
+            "@id": "dtmi:example:upsilon_wum;1",
+            "name": "upsilon_um",
+            "schema": "boolean",
             "@type": "MapValue"
           }
         }
@@ -531,16 +531,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_gamma;1",
+        "@id": "dtmi:example:upsilon_quan;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:theta_beta;1",
+          "@id": "dtmi:example:upsilon_snee;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:eta_hi;1",
-            "name": "theta_alpha",
-            "schema": "long",
+            "@id": "dtmi:example:upsilon_glikk;1",
+            "name": "upsilon_nuh",
+            "schema": "date",
             "@type": "MapValue"
           }
         }
@@ -555,13 +555,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_zeta;1",
+        "@id": "dtmi:example:upsilon_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_epsilon;1",
+          "@id": "dtmi:example:upsilon_spazz;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:theta_delta;1",
+            "@id": "dtmi:example:upsilon_thnad;1",
             "@type": "Object"
           }
         }
@@ -576,14 +576,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_iota;1",
+        "@id": "dtmi:example:upsilon_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:theta_theta;1",
+          "@id": "dtmi:example:upsilon_jogg;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:theta_eta;1",
+            "@id": "dtmi:example:upsilon_zatz;1",
             "@type": "Object"
           }
         }
@@ -598,15 +598,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_nu;1",
+        "@id": "dtmi:example:upsilon_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_mu;1",
+          "@id": "dtmi:example:upsilon_vroo;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:theta_kappa;1",
-            "name": "theta_lambda",
-            "schema": "string",
+            "@id": "dtmi:example:upsilon_itch;1",
+            "name": "upsilon_yekk",
+            "schema": "dateTime",
             "@type": "Property"
           }
         }
@@ -621,16 +621,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_rho;1",
+        "@id": "dtmi:example:phi_delta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:theta_pi;1",
+          "@id": "dtmi:example:phi_gamma;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:theta_xi;1",
-            "name": "theta_omicron",
-            "schema": "time",
+            "@id": "dtmi:example:phi_alpha;1",
+            "name": "phi_beta",
+            "schema": "double",
             "@type": "Property"
           }
         }
@@ -645,14 +645,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_phi;1",
+        "@id": "dtmi:example:phi_theta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_upsilon;1",
+          "@id": "dtmi:example:phi_eta;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:theta_sigma;1",
-            "name": "theta_tau",
+            "@id": "dtmi:example:phi_epsilon;1",
+            "name": "phi_zeta",
             "@type": "Relationship"
           }
         }
@@ -667,15 +667,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_yuzz;1",
+        "@id": "dtmi:example:phi_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:theta_omega;1",
+          "@id": "dtmi:example:phi_lambda;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:theta_chi;1",
-            "name": "theta_psi",
+            "@id": "dtmi:example:phi_iota;1",
+            "name": "phi_kappa",
             "@type": "Relationship"
           }
         }
@@ -690,15 +690,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_fuddle;1",
+        "@id": "dtmi:example:phi_pi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:theta_humpf;1",
+          "@id": "dtmi:example:phi_omicron;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:theta_wum;1",
-            "name": "theta_um",
-            "schema": "boolean",
+            "@id": "dtmi:example:phi_nu;1",
+            "name": "phi_xi",
+            "schema": "duration",
             "@type": "Telemetry"
           }
         }
@@ -713,16 +713,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_quan;1",
+        "@id": "dtmi:example:phi_upsilon;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:theta_snee;1",
+          "@id": "dtmi:example:phi_tau;1",
           "@type": "Object",
           "fields": {
-            "@id": "dtmi:example:theta_glikk;1",
-            "name": "theta_nuh",
-            "schema": "date",
+            "@id": "dtmi:example:phi_rho;1",
+            "name": "phi_sigma",
+            "schema": "float",
             "@type": "Telemetry"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassObjectPropertyFormallyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Requirement-ClassObjectPropertyFormallyIrrelevantDtmiOrTermV3.json
index 131540e1..fd2c99e6 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectPropertyFormallyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectPropertyFormallyIrrelevantDtmiOrTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_quan;1",
+        "@id": "dtmi:example:chi_upsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_snee;1",
+          "@id": "dtmi:example:chi_tau;1",
           "@type": "Object",
           "dtmi:foo:bar;1": 626
         }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_spazz;1",
+        "@id": "dtmi:example:chi_chi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:iota_thnad;1",
+          "@id": "dtmi:example:chi_phi;1",
           "@type": "Object",
           "dtmi:foo:bar;1": 626
         }
@@ -44,10 +44,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_zatz;1",
+        "@id": "dtmi:example:chi_omega;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_floob;1",
+          "@id": "dtmi:example:chi_psi;1",
           "@type": "Object",
           "boolean": null
         }
@@ -62,11 +62,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_flunn;1",
+        "@id": "dtmi:example:chi_wum;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:iota_jogg;1",
+          "@id": "dtmi:example:chi_yuzz;1",
           "@type": "Object",
           "boolean": null
         }
diff --git a/DTDL/v3/spec/Requirement-ClassObjectPropertyFormallyUndefinedTermV3.json b/DTDL/v3/spec/Requirement-ClassObjectPropertyFormallyUndefinedTermV3.json
index 29c7a5dd..745cee74 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectPropertyFormallyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectPropertyFormallyUndefinedTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_kappa;1",
+        "@id": "dtmi:example:chi_itch;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_iota;1",
+          "@id": "dtmi:example:chi_flunn;1",
           "@type": "Object",
           "foobar": {}
         }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_mu;1",
+        "@id": "dtmi:example:chi_vroo;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:kappa_lambda;1",
+          "@id": "dtmi:example:chi_yekk;1",
           "@type": "Object",
           "foobar": {}
         }
diff --git a/DTDL/v3/spec/Requirement-ClassObjectPropertyInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassObjectPropertyInvalidDtmiV3.json
index b41f6170..3d82a9e9 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectPropertyInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectPropertyInvalidDtmiV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_yekk;1",
+        "@id": "dtmi:example:chi_humpf;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:iota_itch;1",
+          "@id": "dtmi:example:chi_um;1",
           "@type": [
             "Object",
             "Foobar"
@@ -28,11 +28,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_hi;1",
+        "@id": "dtmi:example:chi_glikk;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:iota_vroo;1",
+          "@id": "dtmi:example:chi_fuddle;1",
           "@type": [
             "Object",
             "Foobar"
diff --git a/DTDL/v3/spec/Requirement-ClassObjectPropertyNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassObjectPropertyNotDtmiNorTermV3.json
index a6756d2c..9f4bee5a 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectPropertyNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectPropertyNotDtmiNorTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_beta;1",
+        "@id": "dtmi:example:chi_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:kappa_alpha;1",
+          "@id": "dtmi:example:chi_nuh;1",
           "@type": [
             "Object",
             "Foobar"
@@ -28,11 +28,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_delta;1",
+        "@id": "dtmi:example:chi_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:kappa_gamma;1",
+          "@id": "dtmi:example:chi_quan;1",
           "@type": [
             "Object",
             "Foobar"
diff --git a/DTDL/v3/spec/Requirement-ClassObjectRequiredPropertiesV3.json b/DTDL/v3/spec/Requirement-ClassObjectRequiredPropertiesV3.json
index 9d906f7d..2ac7602a 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectRequiredPropertiesV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectRequiredPropertiesV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_glikk;1",
+        "@id": "dtmi:example:theta_epsilon;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_fuddle;1"
+          "@id": "dtmi:example:theta_delta;1"
         }
       }
     ]
@@ -23,11 +23,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_snee;1",
+        "@id": "dtmi:example:theta_eta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:jogg_nuh;1"
+          "@id": "dtmi:example:theta_zeta;1"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassObjectTypeIncludesInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassObjectTypeIncludesInvalidDtmiV3.json
index 8b0cd70d..a2a3bc56 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectTypeIncludesInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectTypeIncludesInvalidDtmiV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_xi;1",
+        "@id": "dtmi:example:iota_snee;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_nu;1",
+          "@id": "dtmi:example:iota_nuh;1",
           "@type": [
             "Object",
             "dtmi:foo//bar"
@@ -27,11 +27,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_pi;1",
+        "@id": "dtmi:example:iota_thnad;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:itch_omicron;1",
+          "@id": "dtmi:example:iota_quan;1",
           "@type": [
             "Object",
             "dtmi:foo//bar"
diff --git a/DTDL/v3/spec/Requirement-ClassObjectTypeIncludesMaterialV3.json b/DTDL/v3/spec/Requirement-ClassObjectTypeIncludesMaterialV3.json
index e31aada4..4d7bfc7e 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectTypeIncludesMaterialV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectTypeIncludesMaterialV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_psi;1",
+        "@id": "dtmi:example:theta_yekk;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_chi;1",
+          "@id": "dtmi:example:theta_itch;1",
           "@type": "Object"
         }
       }
@@ -24,10 +24,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_yuzz;1",
+        "@id": "dtmi:example:theta_hi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_omega;1",
+          "@id": "dtmi:example:theta_vroo;1",
           "@type": [
             "Object"
           ]
@@ -43,10 +43,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_um;1",
+        "@id": "dtmi:example:iota_beta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_wum;1",
+          "@id": "dtmi:example:iota_alpha;1",
           "@type": "dtmi:dtdl:class:Object;3"
         }
       }
@@ -60,10 +60,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_fuddle;1",
+        "@id": "dtmi:example:iota_delta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_humpf;1",
+          "@id": "dtmi:example:iota_gamma;1",
           "@type": [
             "dtmi:dtdl:class:Object;3"
           ]
@@ -79,10 +79,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_nuh;1",
+        "@id": "dtmi:example:iota_zeta;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_glikk;1",
+          "@id": "dtmi:example:iota_epsilon;1",
           "@type": "Something"
         }
       }
@@ -96,11 +96,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_quan;1",
+        "@id": "dtmi:example:iota_theta;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_snee;1",
+          "@id": "dtmi:example:iota_eta;1",
           "@type": "Something"
         }
       }
@@ -114,10 +114,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_spazz;1",
+        "@id": "dtmi:example:iota_kappa;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_thnad;1",
+          "@id": "dtmi:example:iota_iota;1",
           "@type": [
             "Something"
           ]
@@ -133,11 +133,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_zatz;1",
+        "@id": "dtmi:example:iota_mu;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_floob;1",
+          "@id": "dtmi:example:iota_lambda;1",
           "@type": [
             "Something"
           ]
diff --git a/DTDL/v3/spec/Requirement-ClassObjectTypeIncludesNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassObjectTypeIncludesNotDtmiNorTermV3.json
index 3f2572de..d169879a 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectTypeIncludesNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectTypeIncludesNotDtmiNorTermV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_sigma;1",
+        "@id": "dtmi:example:iota_floob;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:itch_rho;1",
+          "@id": "dtmi:example:iota_spazz;1",
           "@type": [
             "Object",
             "http://foo.com/bar"
@@ -27,11 +27,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_upsilon;1",
+        "@id": "dtmi:example:iota_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:itch_tau;1",
+          "@id": "dtmi:example:iota_zatz;1",
           "@type": [
             "Object",
             "http://foo.com/bar"
diff --git a/DTDL/v3/spec/Requirement-ClassObjectTypeStringOrArrayV3.json b/DTDL/v3/spec/Requirement-ClassObjectTypeStringOrArrayV3.json
index dfd80873..3659c155 100644
--- a/DTDL/v3/spec/Requirement-ClassObjectTypeStringOrArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassObjectTypeStringOrArrayV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_thnad;1",
+        "@id": "dtmi:example:theta_iota;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_quan;1",
+          "@id": "dtmi:example:theta_theta;1",
           "@type": 626
         }
       }
@@ -24,11 +24,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_floob;1",
+        "@id": "dtmi:example:theta_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:jogg_spazz;1",
+          "@id": "dtmi:example:theta_kappa;1",
           "@type": 626
         }
       }
@@ -42,10 +42,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_jogg;1",
+        "@id": "dtmi:example:theta_nu;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_zatz;1",
+          "@id": "dtmi:example:theta_mu;1",
           "@type": null
         }
       }
@@ -59,11 +59,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_itch;1",
+        "@id": "dtmi:example:theta_omicron;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:jogg_flunn;1",
+          "@id": "dtmi:example:theta_xi;1",
           "@type": null
         }
       }
@@ -77,10 +77,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_vroo;1",
+        "@id": "dtmi:example:theta_rho;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:jogg_yekk;1",
+          "@id": "dtmi:example:theta_pi;1",
           "@type": true
         }
       }
@@ -94,11 +94,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_alpha;1",
+        "@id": "dtmi:example:theta_tau;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:jogg_hi;1",
+          "@id": "dtmi:example:theta_sigma;1",
           "@type": true
         }
       }
@@ -112,10 +112,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_gamma;1",
+        "@id": "dtmi:example:theta_phi;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_beta;1",
+          "@id": "dtmi:example:theta_upsilon;1",
           "@type": {}
         }
       }
@@ -129,11 +129,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_epsilon;1",
+        "@id": "dtmi:example:theta_psi;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_delta;1",
+          "@id": "dtmi:example:theta_chi;1",
           "@type": {}
         }
       }
@@ -147,10 +147,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_eta;1",
+        "@id": "dtmi:example:theta_yuzz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_zeta;1",
+          "@id": "dtmi:example:theta_omega;1",
           "@type": [
             626
           ]
@@ -166,11 +166,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_iota;1",
+        "@id": "dtmi:example:theta_um;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_theta;1",
+          "@id": "dtmi:example:theta_wum;1",
           "@type": [
             626
           ]
@@ -186,10 +186,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_lambda;1",
+        "@id": "dtmi:example:theta_fuddle;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_kappa;1",
+          "@id": "dtmi:example:theta_humpf;1",
           "@type": [
             null
           ]
@@ -205,11 +205,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_nu;1",
+        "@id": "dtmi:example:theta_nuh;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_mu;1",
+          "@id": "dtmi:example:theta_glikk;1",
           "@type": [
             null
           ]
@@ -225,10 +225,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_omicron;1",
+        "@id": "dtmi:example:theta_quan;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_xi;1",
+          "@id": "dtmi:example:theta_snee;1",
           "@type": [
             true
           ]
@@ -244,11 +244,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_rho;1",
+        "@id": "dtmi:example:theta_spazz;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_pi;1",
+          "@id": "dtmi:example:theta_thnad;1",
           "@type": [
             true
           ]
@@ -264,10 +264,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_tau;1",
+        "@id": "dtmi:example:theta_zatz;1",
         "@type": "Interface",
         "schemas": {
-          "@id": "dtmi:example:flunn_sigma;1",
+          "@id": "dtmi:example:theta_floob;1",
           "@type": [
             {}
           ]
@@ -283,11 +283,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_phi;1",
+        "@id": "dtmi:example:theta_flunn;1",
         "@type": "Interface",
         "schemas": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "@id": "dtmi:example:flunn_upsilon;1",
+          "@id": "dtmi:example:theta_jogg;1",
           "@type": [
             {}
           ]
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyContextConformsV3.json b/DTDL/v3/spec/Requirement-ClassPropertyContextConformsV3.json
index da39ddce..3303f32a 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyContextConformsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyContextConformsV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_iota;1",
+        "@id": "dtmi:example:snee_delta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_theta;1",
+          "@id": "dtmi:example:snee_gamma;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "tau_eta",
-            "schema": "float",
+            "name": "snee_beta",
+            "schema": "date",
             "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
           }
         }
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_mu;1",
+        "@id": "dtmi:example:snee_eta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_lambda;1",
+          "@id": "dtmi:example:snee_zeta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "tau_kappa",
-            "schema": "integer",
+            "name": "snee_epsilon",
+            "schema": "dateTime",
             "@context": []
           }
         }
@@ -53,15 +53,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_omicron;1",
+        "@id": "dtmi:example:snee_kappa;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_xi;1",
+          "@id": "dtmi:example:snee_iota;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "tau_nu",
-            "schema": "long",
+            "name": "snee_theta",
+            "schema": "double",
             "@context": [
               "dtmi:dtdl:extension:quantitativeTypes;1"
             ]
@@ -78,15 +78,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_sigma;1",
+        "@id": "dtmi:example:snee_nu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_rho;1",
+          "@id": "dtmi:example:snee_mu;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "tau_pi",
-            "schema": "string",
+            "name": "snee_lambda",
+            "schema": "duration",
             "@context": null
           }
         }
@@ -101,15 +101,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_phi;1",
+        "@id": "dtmi:example:snee_pi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_upsilon;1",
+          "@id": "dtmi:example:snee_omicron;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "tau_tau",
-            "schema": "time",
+            "name": "snee_xi",
+            "schema": "float",
             "@context": 626
           }
         }
@@ -124,15 +124,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_omega;1",
+        "@id": "dtmi:example:snee_tau;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_psi;1",
+          "@id": "dtmi:example:snee_sigma;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "tau_chi",
-            "schema": "boolean",
+            "name": "snee_rho",
+            "schema": "integer",
             "@context": true
           }
         }
@@ -147,15 +147,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_um;1",
+        "@id": "dtmi:example:snee_chi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_wum;1",
+          "@id": "dtmi:example:snee_phi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "tau_yuzz",
-            "schema": "date",
+            "name": "snee_upsilon",
+            "schema": "long",
             "@context": [
               null
             ]
@@ -172,15 +172,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_glikk;1",
+        "@id": "dtmi:example:snee_yuzz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_fuddle;1",
+          "@id": "dtmi:example:snee_omega;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "tau_humpf",
-            "schema": "dateTime",
+            "name": "snee_psi",
+            "schema": "string",
             "@context": [
               626
             ]
@@ -197,15 +197,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_quan;1",
+        "@id": "dtmi:example:snee_humpf;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_snee;1",
+          "@id": "dtmi:example:snee_um;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "tau_nuh",
-            "schema": "double",
+            "name": "snee_wum",
+            "schema": "time",
             "@context": [
               true
             ]
@@ -222,16 +222,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_floob;1",
+        "@id": "dtmi:example:snee_nuh;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_spazz;1",
+          "@id": "dtmi:example:snee_glikk;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "tau_thnad",
-            "schema": "duration",
-            "@context": {}
+            "name": "snee_fuddle",
+            "schema": "boolean",
+            "@context": "dtmi:dtdl:extension:quantitativeTypes"
           }
         }
       }
@@ -245,18 +245,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_flunn;1",
+        "@id": "dtmi:example:snee_thnad;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_jogg;1",
+          "@id": "dtmi:example:snee_quan;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "tau_zatz",
-            "schema": "float",
-            "@context": [
-              {}
-            ]
+            "name": "snee_snee",
+            "schema": "date",
+            "@context": "http://dtdl/extension/quantitativeTypes/1"
           }
         }
       }
@@ -270,16 +268,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_vroo;1",
+        "@id": "dtmi:example:snee_zatz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:tau_yekk;1",
+          "@id": "dtmi:example:snee_floob;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "tau_itch",
-            "schema": "integer",
-            "@context": "dtmi:dtdl:extension:quantitativeTypes"
+            "name": "snee_spazz",
+            "schema": "dateTime",
+            "@context": "quantitativeTypes;1"
           }
         }
       }
@@ -293,16 +291,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_beta;1",
+        "@id": "dtmi:example:snee_itch;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:upsilon_alpha;1",
+          "@id": "dtmi:example:snee_flunn;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "tau_hi",
-            "schema": "long",
-            "@context": "http://dtdl/extension/quantitativeTypes/1"
+            "name": "snee_jogg",
+            "schema": "double",
+            "@context": {}
           }
         }
       }
@@ -316,16 +314,70 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_epsilon;1",
+        "@id": "dtmi:example:snee_hi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:upsilon_delta;1",
+          "@id": "dtmi:example:snee_vroo;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "upsilon_gamma",
-            "schema": "string",
-            "@context": "quantitativeTypes;1"
+            "name": "snee_yekk",
+            "schema": "duration",
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:quan_gamma;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:quan_beta;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "quan_alpha",
+            "schema": "float",
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:quan_zeta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:quan_epsilon;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "quan_delta",
+            "schema": "integer",
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyIdDuplicateV3.json b/DTDL/v3/spec/Requirement-ClassPropertyIdDuplicateV3.json
index b10600f7..368008c6 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyIdDuplicateV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyIdDuplicateV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_omicron;1",
+        "@id": "dtmi:example:floob_pi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:psi_omicron;1",
+          "@id": "dtmi:example:floob_pi;1",
           "@type": "Interface",
           "contents": {
-            "@id": "dtmi:example:psi_omicron;1",
+            "@id": "dtmi:example:floob_pi;1",
             "@type": "Property",
-            "name": "psi_pi",
-            "schema": "string"
+            "name": "floob_rho",
+            "schema": "integer"
           }
         }
       }
@@ -30,17 +30,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_rho;1",
+        "@id": "dtmi:example:floob_sigma;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:psi_rho;1",
+          "@id": "dtmi:example:floob_sigma;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "@id": "dtmi:example:psi_rho;1",
+            "@id": "dtmi:example:floob_sigma;1",
             "@type": "Property",
-            "name": "psi_sigma",
-            "schema": "time"
+            "name": "floob_tau",
+            "schema": "long"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyIdIsDtmiV3.json b/DTDL/v3/spec/Requirement-ClassPropertyIdIsDtmiV3.json
index b65c9bfa..3bc8a485 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyIdIsDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyIdIsDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_eta;1",
+        "@id": "dtmi:example:quan_theta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;7",
           "@type": "Property",
-          "name": "upsilon_zeta",
-          "schema": "time"
+          "name": "quan_eta",
+          "schema": "long"
         }
       }
     ]
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_iota;1",
+        "@id": "dtmi:example:quan_kappa;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;108675309",
           "@type": "Property",
-          "name": "upsilon_theta",
-          "schema": "boolean"
+          "name": "quan_iota",
+          "schema": "string"
         }
       }
     ]
@@ -45,13 +45,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_lambda;1",
+        "@id": "dtmi:example:quan_mu;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;999999999",
           "@type": "Property",
-          "name": "upsilon_kappa",
-          "schema": "date"
+          "name": "quan_lambda",
+          "schema": "time"
         }
       }
     ]
@@ -64,13 +64,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_nu;1",
+        "@id": "dtmi:example:quan_xi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo;1",
           "@type": "Property",
-          "name": "upsilon_mu",
-          "schema": "dateTime"
+          "name": "quan_nu",
+          "schema": "boolean"
         }
       }
     ]
@@ -83,13 +83,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_omicron;1",
+        "@id": "dtmi:example:quan_pi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar",
           "@type": "Property",
-          "name": "upsilon_xi",
-          "schema": "double"
+          "name": "quan_omicron",
+          "schema": "date"
         }
       }
     ]
@@ -102,13 +102,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_rho;1",
+        "@id": "dtmi:example:quan_sigma;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.14",
           "@type": "Property",
-          "name": "upsilon_pi",
-          "schema": "duration"
+          "name": "quan_rho",
+          "schema": "dateTime"
         }
       }
     ]
@@ -121,13 +121,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_tau;1",
+        "@id": "dtmi:example:quan_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.141592",
           "@type": "Property",
-          "name": "upsilon_sigma",
-          "schema": "float"
+          "name": "quan_tau",
+          "schema": "double"
         }
       }
     ]
@@ -140,13 +140,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_phi;1",
+        "@id": "dtmi:example:quan_chi;1",
         "@type": "Interface",
         "contents": {
           "@id": null,
           "@type": "Property",
-          "name": "upsilon_upsilon",
-          "schema": "integer"
+          "name": "quan_phi",
+          "schema": "duration"
         }
       }
     ]
@@ -159,14 +159,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_psi;1",
+        "@id": "dtmi:example:quan_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": null,
           "@type": "Property",
-          "name": "upsilon_chi",
-          "schema": "long"
+          "name": "quan_psi",
+          "schema": "float"
         }
       }
     ]
@@ -179,13 +179,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_yuzz;1",
+        "@id": "dtmi:example:quan_wum;1",
         "@type": "Interface",
         "contents": {
           "@id": 626,
           "@type": "Property",
-          "name": "upsilon_omega",
-          "schema": "string"
+          "name": "quan_yuzz",
+          "schema": "integer"
         }
       }
     ]
@@ -198,14 +198,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_um;1",
+        "@id": "dtmi:example:quan_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": 626,
           "@type": "Property",
-          "name": "upsilon_wum",
-          "schema": "time"
+          "name": "quan_um",
+          "schema": "long"
         }
       }
     ]
@@ -218,13 +218,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_fuddle;1",
+        "@id": "dtmi:example:quan_glikk;1",
         "@type": "Interface",
         "contents": {
           "@id": true,
           "@type": "Property",
-          "name": "upsilon_humpf",
-          "schema": "boolean"
+          "name": "quan_fuddle",
+          "schema": "string"
         }
       }
     ]
@@ -237,14 +237,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_nuh;1",
+        "@id": "dtmi:example:quan_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": true,
           "@type": "Property",
-          "name": "upsilon_glikk",
-          "schema": "date"
+          "name": "quan_nuh",
+          "schema": "time"
         }
       }
     ]
@@ -257,15 +257,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_quan;1",
+        "@id": "dtmi:example:quan_thnad;1",
         "@type": "Interface",
         "contents": {
           "@id": {
             "@value": "dtmi:apparently:valid:identifier;3"
           },
           "@type": "Property",
-          "name": "upsilon_snee",
-          "schema": "dateTime"
+          "name": "quan_quan",
+          "schema": "boolean"
         }
       }
     ]
@@ -278,7 +278,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_spazz;1",
+        "@id": "dtmi:example:quan_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -286,8 +286,8 @@
             "@value": "dtmi:apparently:valid:identifier;3"
           },
           "@type": "Property",
-          "name": "upsilon_thnad",
-          "schema": "double"
+          "name": "quan_spazz",
+          "schema": "date"
         }
       }
     ]
@@ -300,13 +300,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_zatz;1",
+        "@id": "dtmi:example:quan_jogg;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0",
           "@type": "Property",
-          "name": "upsilon_floob",
-          "schema": "duration"
+          "name": "quan_zatz",
+          "schema": "dateTime"
         }
       }
     ]
@@ -319,14 +319,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_flunn;1",
+        "@id": "dtmi:example:quan_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0",
           "@type": "Property",
-          "name": "upsilon_jogg",
-          "schema": "float"
+          "name": "quan_flunn",
+          "schema": "double"
         }
       }
     ]
@@ -339,13 +339,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_yekk;1",
+        "@id": "dtmi:example:quan_vroo;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Property",
-          "name": "upsilon_itch",
-          "schema": "integer"
+          "name": "quan_yekk",
+          "schema": "duration"
         }
       }
     ]
@@ -358,14 +358,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_hi;1",
+        "@id": "dtmi:example:thnad_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Property",
-          "name": "upsilon_vroo",
-          "schema": "long"
+          "name": "quan_hi",
+          "schema": "float"
         }
       }
     ]
@@ -378,13 +378,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_beta;1",
+        "@id": "dtmi:example:thnad_gamma;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Property",
-          "name": "phi_alpha",
-          "schema": "string"
+          "name": "thnad_beta",
+          "schema": "integer"
         }
       }
     ]
@@ -397,14 +397,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_delta;1",
+        "@id": "dtmi:example:thnad_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Property",
-          "name": "phi_gamma",
-          "schema": "time"
+          "name": "thnad_delta",
+          "schema": "long"
         }
       }
     ]
@@ -417,13 +417,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_zeta;1",
+        "@id": "dtmi:example:thnad_eta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;1a",
           "@type": "Property",
-          "name": "phi_epsilon",
-          "schema": "boolean"
+          "name": "thnad_zeta",
+          "schema": "string"
         }
       }
     ]
@@ -436,14 +436,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_theta;1",
+        "@id": "dtmi:example:thnad_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1a",
           "@type": "Property",
-          "name": "phi_eta",
-          "schema": "date"
+          "name": "thnad_theta",
+          "schema": "time"
         }
       }
     ]
@@ -456,13 +456,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_kappa;1",
+        "@id": "dtmi:example:thnad_lambda;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Property",
-          "name": "phi_iota",
-          "schema": "dateTime"
+          "name": "thnad_kappa",
+          "schema": "boolean"
         }
       }
     ]
@@ -475,14 +475,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_mu;1",
+        "@id": "dtmi:example:thnad_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Property",
-          "name": "phi_lambda",
-          "schema": "double"
+          "name": "thnad_mu",
+          "schema": "date"
         }
       }
     ]
@@ -495,13 +495,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_xi;1",
+        "@id": "dtmi:example:thnad_omicron;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Property",
-          "name": "phi_nu",
-          "schema": "duration"
+          "name": "thnad_xi",
+          "schema": "dateTime"
         }
       }
     ]
@@ -514,14 +514,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_pi;1",
+        "@id": "dtmi:example:thnad_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Property",
-          "name": "phi_omicron",
-          "schema": "float"
+          "name": "thnad_pi",
+          "schema": "double"
         }
       }
     ]
@@ -534,13 +534,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_sigma;1",
+        "@id": "dtmi:example:thnad_tau;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Property",
-          "name": "phi_rho",
-          "schema": "integer"
+          "name": "thnad_sigma",
+          "schema": "duration"
         }
       }
     ]
@@ -553,14 +553,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_upsilon;1",
+        "@id": "dtmi:example:thnad_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Property",
-          "name": "phi_tau",
-          "schema": "long"
+          "name": "thnad_upsilon",
+          "schema": "float"
         }
       }
     ]
@@ -573,13 +573,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_chi;1",
+        "@id": "dtmi:example:thnad_psi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Property",
-          "name": "phi_phi",
-          "schema": "string"
+          "name": "thnad_chi",
+          "schema": "integer"
         }
       }
     ]
@@ -592,14 +592,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_omega;1",
+        "@id": "dtmi:example:thnad_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Property",
-          "name": "phi_psi",
-          "schema": "time"
+          "name": "thnad_omega",
+          "schema": "long"
         }
       }
     ]
@@ -612,13 +612,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_wum;1",
+        "@id": "dtmi:example:thnad_um;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;01",
           "@type": "Property",
-          "name": "phi_yuzz",
-          "schema": "boolean"
+          "name": "thnad_wum",
+          "schema": "string"
         }
       }
     ]
@@ -631,14 +631,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_humpf;1",
+        "@id": "dtmi:example:thnad_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;01",
           "@type": "Property",
-          "name": "phi_um",
-          "schema": "date"
+          "name": "thnad_humpf",
+          "schema": "time"
         }
       }
     ]
@@ -651,13 +651,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_glikk;1",
+        "@id": "dtmi:example:thnad_nuh;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;",
           "@type": "Property",
-          "name": "phi_fuddle",
-          "schema": "dateTime"
+          "name": "thnad_glikk",
+          "schema": "boolean"
         }
       }
     ]
@@ -670,14 +670,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_snee;1",
+        "@id": "dtmi:example:thnad_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;",
           "@type": "Property",
-          "name": "phi_nuh",
-          "schema": "double"
+          "name": "thnad_snee",
+          "schema": "date"
         }
       }
     ]
@@ -690,13 +690,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_thnad;1",
+        "@id": "dtmi:example:thnad_spazz;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Property",
-          "name": "phi_quan",
-          "schema": "duration"
+          "name": "thnad_thnad",
+          "schema": "dateTime"
         }
       }
     ]
@@ -709,14 +709,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_floob;1",
+        "@id": "dtmi:example:thnad_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Property",
-          "name": "phi_spazz",
-          "schema": "float"
+          "name": "thnad_floob",
+          "schema": "double"
         }
       }
     ]
@@ -729,13 +729,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_jogg;1",
+        "@id": "dtmi:example:thnad_flunn;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Property",
-          "name": "phi_zatz",
-          "schema": "integer"
+          "name": "thnad_jogg",
+          "schema": "duration"
         }
       }
     ]
@@ -748,14 +748,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_itch;1",
+        "@id": "dtmi:example:thnad_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Property",
-          "name": "phi_flunn",
-          "schema": "long"
+          "name": "thnad_itch",
+          "schema": "float"
         }
       }
     ]
@@ -768,13 +768,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_vroo;1",
+        "@id": "dtmi:example:thnad_hi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:1seg;1",
           "@type": "Property",
-          "name": "phi_yekk",
-          "schema": "string"
+          "name": "thnad_vroo",
+          "schema": "integer"
         }
       }
     ]
@@ -787,14 +787,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_alpha;1",
+        "@id": "dtmi:example:spazz_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:1seg;1",
           "@type": "Property",
-          "name": "phi_hi",
-          "schema": "time"
+          "name": "spazz_alpha",
+          "schema": "long"
         }
       }
     ]
@@ -807,13 +807,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_gamma;1",
+        "@id": "dtmi:example:spazz_delta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Property",
-          "name": "chi_beta",
-          "schema": "boolean"
+          "name": "spazz_gamma",
+          "schema": "string"
         }
       }
     ]
@@ -826,14 +826,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_epsilon;1",
+        "@id": "dtmi:example:spazz_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Property",
-          "name": "chi_delta",
-          "schema": "date"
+          "name": "spazz_epsilon",
+          "schema": "time"
         }
       }
     ]
@@ -846,13 +846,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_eta;1",
+        "@id": "dtmi:example:spazz_theta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo::bar;1",
           "@type": "Property",
-          "name": "chi_zeta",
-          "schema": "dateTime"
+          "name": "spazz_eta",
+          "schema": "boolean"
         }
       }
     ]
@@ -865,14 +865,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_iota;1",
+        "@id": "dtmi:example:spazz_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo::bar;1",
           "@type": "Property",
-          "name": "chi_theta",
-          "schema": "double"
+          "name": "spazz_iota",
+          "schema": "date"
         }
       }
     ]
@@ -885,13 +885,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_lambda;1",
+        "@id": "dtmi:example:spazz_mu;1",
         "@type": "Interface",
         "contents": {
           "@id": "urn:foo:bar:1",
           "@type": "Property",
-          "name": "chi_kappa",
-          "schema": "duration"
+          "name": "spazz_lambda",
+          "schema": "dateTime"
         }
       }
     ]
@@ -904,14 +904,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_nu;1",
+        "@id": "dtmi:example:spazz_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "urn:foo:bar:1",
           "@type": "Property",
-          "name": "chi_mu",
-          "schema": "float"
+          "name": "spazz_nu",
+          "schema": "double"
         }
       }
     ]
@@ -924,13 +924,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_omicron;1",
+        "@id": "dtmi:example:spazz_pi;1",
         "@type": "Interface",
         "contents": {
           "@id": "http://foo/bar/baz",
           "@type": "Property",
-          "name": "chi_xi",
-          "schema": "integer"
+          "name": "spazz_omicron",
+          "schema": "duration"
         }
       }
     ]
@@ -943,14 +943,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_rho;1",
+        "@id": "dtmi:example:spazz_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "http://foo/bar/baz",
           "@type": "Property",
-          "name": "chi_pi",
-          "schema": "long"
+          "name": "spazz_rho",
+          "schema": "float"
         }
       }
     ]
@@ -963,13 +963,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_tau;1",
+        "@id": "dtmi:example:spazz_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:;1",
           "@type": "Property",
-          "name": "chi_sigma",
-          "schema": "string"
+          "name": "spazz_tau",
+          "schema": "integer"
         }
       }
     ]
@@ -982,14 +982,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_phi;1",
+        "@id": "dtmi:example:spazz_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:;1",
           "@type": "Property",
-          "name": "chi_upsilon",
-          "schema": "time"
+          "name": "spazz_phi",
+          "schema": "long"
         }
       }
     ]
@@ -1002,13 +1002,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_psi;1",
+        "@id": "dtmi:example:spazz_omega;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:dtdl:example;1",
           "@type": "Property",
-          "name": "chi_chi",
-          "schema": "boolean"
+          "name": "spazz_psi",
+          "schema": "string"
         }
       }
     ]
@@ -1021,14 +1021,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_yuzz;1",
+        "@id": "dtmi:example:spazz_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:dtdl:example;1",
           "@type": "Property",
-          "name": "chi_omega",
-          "schema": "date"
+          "name": "spazz_yuzz",
+          "schema": "time"
         }
       }
     ]
@@ -1041,13 +1041,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_um;1",
+        "@id": "dtmi:example:spazz_humpf;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:standard:example;1",
           "@type": "Property",
-          "name": "chi_wum",
-          "schema": "dateTime"
+          "name": "spazz_um",
+          "schema": "boolean"
         }
       }
     ]
@@ -1060,14 +1060,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_fuddle;1",
+        "@id": "dtmi:example:spazz_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:standard:example;1",
           "@type": "Property",
-          "name": "chi_humpf",
-          "schema": "double"
+          "name": "spazz_fuddle",
+          "schema": "date"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyIdNotArrayV3.json b/DTDL/v3/spec/Requirement-ClassPropertyIdNotArrayV3.json
index b61333b3..477641d4 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyIdNotArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyIdNotArrayV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_nuh;1",
+        "@id": "dtmi:example:spazz_snee;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;7"
           ],
           "@type": "Property",
-          "name": "chi_glikk",
-          "schema": "duration"
+          "name": "spazz_nuh",
+          "schema": "dateTime"
         }
       }
     ]
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_quan;1",
+        "@id": "dtmi:example:spazz_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,8 +36,8 @@
             "dtmi:foo:bar;7"
           ],
           "@type": "Property",
-          "name": "chi_snee",
-          "schema": "float"
+          "name": "spazz_quan",
+          "schema": "double"
         }
       }
     ]
@@ -50,15 +50,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_spazz;1",
+        "@id": "dtmi:example:spazz_floob;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;108675309"
           ],
           "@type": "Property",
-          "name": "chi_thnad",
-          "schema": "integer"
+          "name": "spazz_spazz",
+          "schema": "duration"
         }
       }
     ]
@@ -71,7 +71,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_zatz;1",
+        "@id": "dtmi:example:spazz_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -79,8 +79,8 @@
             "dtmi:foo:bar;108675309"
           ],
           "@type": "Property",
-          "name": "chi_floob",
-          "schema": "long"
+          "name": "spazz_zatz",
+          "schema": "float"
         }
       }
     ]
@@ -93,15 +93,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_flunn;1",
+        "@id": "dtmi:example:spazz_itch;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;999999999"
           ],
           "@type": "Property",
-          "name": "chi_jogg",
-          "schema": "string"
+          "name": "spazz_flunn",
+          "schema": "integer"
         }
       }
     ]
@@ -114,7 +114,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_yekk;1",
+        "@id": "dtmi:example:spazz_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -122,8 +122,8 @@
             "dtmi:foo:bar;999999999"
           ],
           "@type": "Property",
-          "name": "chi_itch",
-          "schema": "time"
+          "name": "spazz_yekk",
+          "schema": "long"
         }
       }
     ]
@@ -136,15 +136,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_hi;1",
+        "@id": "dtmi:example:floob_alpha;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo;1"
           ],
           "@type": "Property",
-          "name": "chi_vroo",
-          "schema": "boolean"
+          "name": "spazz_hi",
+          "schema": "string"
         }
       }
     ]
@@ -157,7 +157,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_beta;1",
+        "@id": "dtmi:example:floob_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -165,8 +165,8 @@
             "dtmi:foo;1"
           ],
           "@type": "Property",
-          "name": "psi_alpha",
-          "schema": "date"
+          "name": "floob_beta",
+          "schema": "time"
         }
       }
     ]
@@ -179,15 +179,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_delta;1",
+        "@id": "dtmi:example:floob_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar"
           ],
           "@type": "Property",
-          "name": "psi_gamma",
-          "schema": "dateTime"
+          "name": "floob_delta",
+          "schema": "boolean"
         }
       }
     ]
@@ -200,7 +200,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_zeta;1",
+        "@id": "dtmi:example:floob_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -208,8 +208,8 @@
             "dtmi:foo:bar"
           ],
           "@type": "Property",
-          "name": "psi_epsilon",
-          "schema": "double"
+          "name": "floob_zeta",
+          "schema": "date"
         }
       }
     ]
@@ -222,15 +222,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_theta;1",
+        "@id": "dtmi:example:floob_iota;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;3.14"
           ],
           "@type": "Property",
-          "name": "psi_eta",
-          "schema": "duration"
+          "name": "floob_theta",
+          "schema": "dateTime"
         }
       }
     ]
@@ -243,7 +243,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_kappa;1",
+        "@id": "dtmi:example:floob_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -251,8 +251,8 @@
             "dtmi:foo:bar;3.14"
           ],
           "@type": "Property",
-          "name": "psi_iota",
-          "schema": "float"
+          "name": "floob_kappa",
+          "schema": "double"
         }
       }
     ]
@@ -265,15 +265,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_mu;1",
+        "@id": "dtmi:example:floob_nu;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;3.141592"
           ],
           "@type": "Property",
-          "name": "psi_lambda",
-          "schema": "integer"
+          "name": "floob_mu",
+          "schema": "duration"
         }
       }
     ]
@@ -286,7 +286,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_xi;1",
+        "@id": "dtmi:example:floob_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -294,8 +294,8 @@
             "dtmi:foo:bar;3.141592"
           ],
           "@type": "Property",
-          "name": "psi_nu",
-          "schema": "long"
+          "name": "floob_xi",
+          "schema": "float"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyInvalidKeywordsV3.json b/DTDL/v3/spec/Requirement-ClassPropertyInvalidKeywordsV3.json
index ede5c638..4bb14a53 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyInvalidKeywordsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyInvalidKeywordsV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_fuddle;1",
+        "@id": "dtmi:example:vroo_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_humpf",
-          "schema": "double",
+          "name": "vroo_fuddle",
+          "schema": "date",
           "@graph": {}
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_nuh;1",
+        "@id": "dtmi:example:vroo_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "fuddle_glikk",
-          "schema": "duration",
+          "name": "vroo_nuh",
+          "schema": "dateTime",
           "@graph": {}
         }
       }
@@ -46,12 +46,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_quan;1",
+        "@id": "dtmi:example:vroo_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_snee",
-          "schema": "float",
+          "name": "vroo_quan",
+          "schema": "double",
           "@value": 626
         }
       }
@@ -65,13 +65,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_spazz;1",
+        "@id": "dtmi:example:vroo_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "fuddle_thnad",
-          "schema": "integer",
+          "name": "vroo_spazz",
+          "schema": "duration",
           "@value": 626
         }
       }
@@ -85,12 +85,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_zatz;1",
+        "@id": "dtmi:example:vroo_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_floob",
-          "schema": "long",
+          "name": "vroo_zatz",
+          "schema": "float",
           "@language": "en"
         }
       }
@@ -104,13 +104,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_flunn;1",
+        "@id": "dtmi:example:vroo_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "fuddle_jogg",
-          "schema": "string",
+          "name": "vroo_flunn",
+          "schema": "integer",
           "@language": "en"
         }
       }
@@ -124,12 +124,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_yekk;1",
+        "@id": "dtmi:example:vroo_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_itch",
-          "schema": "time",
+          "name": "vroo_yekk",
+          "schema": "long",
           "@foobar": true
         }
       }
@@ -143,13 +143,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_hi;1",
+        "@id": "dtmi:example:hi_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "fuddle_vroo",
-          "schema": "boolean",
+          "name": "vroo_hi",
+          "schema": "string",
           "@foobar": true
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyPropertyCommentStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassPropertyPropertyCommentStringLengthV3.json
index 9fa79c57..e320a874 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyPropertyCommentStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyPropertyCommentStringLengthV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_tau;1",
+        "@id": "dtmi:example:zatz_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_sigma",
-          "schema": "date",
+          "name": "zatz_tau",
+          "schema": "time",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_phi;1",
+        "@id": "dtmi:example:zatz_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_upsilon",
-          "schema": "dateTime",
+          "name": "zatz_phi",
+          "schema": "boolean",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -45,13 +45,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_psi;1",
+        "@id": "dtmi:example:zatz_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "omega_chi",
-          "schema": "double",
+          "name": "zatz_psi",
+          "schema": "date",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyPropertyCommentStringV3.json b/DTDL/v3/spec/Requirement-ClassPropertyPropertyCommentStringV3.json
index c35baf55..741843b8 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyPropertyCommentStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyPropertyCommentStringV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_upsilon;1",
+        "@id": "dtmi:example:floob_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_tau",
-          "schema": "boolean",
+          "name": "floob_upsilon",
+          "schema": "string",
           "comment": "hello"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_chi;1",
+        "@id": "dtmi:example:floob_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_phi",
-          "schema": "date",
+          "name": "floob_chi",
+          "schema": "time",
           "comment": [
             "hello"
           ]
@@ -47,12 +47,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_omega;1",
+        "@id": "dtmi:example:floob_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_psi",
-          "schema": "dateTime",
+          "name": "floob_omega",
+          "schema": "boolean",
           "comment": {
             "@value": "hello",
             "@type": "xsd:string"
@@ -69,12 +69,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_wum;1",
+        "@id": "dtmi:example:floob_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_yuzz",
-          "schema": "double",
+          "name": "floob_wum",
+          "schema": "date",
           "comment": [
             {
               "@value": "hello",
@@ -93,12 +93,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_humpf;1",
+        "@id": "dtmi:example:floob_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_um",
-          "schema": "duration",
+          "name": "floob_humpf",
+          "schema": "dateTime",
           "comment": []
         }
       }
@@ -112,12 +112,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_glikk;1",
+        "@id": "dtmi:example:floob_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_fuddle",
-          "schema": "float",
+          "name": "floob_glikk",
+          "schema": "double",
           "comment": null
         }
       }
@@ -131,13 +131,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_snee;1",
+        "@id": "dtmi:example:floob_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "psi_nuh",
-          "schema": "integer",
+          "name": "floob_snee",
+          "schema": "duration",
           "comment": null
         }
       }
@@ -151,12 +151,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_thnad;1",
+        "@id": "dtmi:example:floob_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_quan",
-          "schema": "long",
+          "name": "floob_thnad",
+          "schema": "float",
           "comment": true
         }
       }
@@ -170,13 +170,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_floob;1",
+        "@id": "dtmi:example:floob_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "psi_spazz",
-          "schema": "string",
+          "name": "floob_floob",
+          "schema": "integer",
           "comment": true
         }
       }
@@ -190,12 +190,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_jogg;1",
+        "@id": "dtmi:example:floob_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_zatz",
-          "schema": "time",
+          "name": "floob_jogg",
+          "schema": "long",
           "comment": 626
         }
       }
@@ -209,13 +209,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_itch;1",
+        "@id": "dtmi:example:floob_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "psi_flunn",
-          "schema": "boolean",
+          "name": "floob_itch",
+          "schema": "string",
           "comment": 626
         }
       }
@@ -229,12 +229,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_vroo;1",
+        "@id": "dtmi:example:floob_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "psi_yekk",
-          "schema": "date",
+          "name": "floob_vroo",
+          "schema": "time",
           "comment": [
             null
           ]
@@ -250,13 +250,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_alpha;1",
+        "@id": "dtmi:example:zatz_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "psi_hi",
-          "schema": "dateTime",
+          "name": "zatz_alpha",
+          "schema": "boolean",
           "comment": [
             null
           ]
@@ -272,12 +272,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_gamma;1",
+        "@id": "dtmi:example:zatz_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_beta",
-          "schema": "double",
+          "name": "zatz_gamma",
+          "schema": "date",
           "comment": [
             true
           ]
@@ -293,13 +293,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_epsilon;1",
+        "@id": "dtmi:example:zatz_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "omega_delta",
-          "schema": "duration",
+          "name": "zatz_epsilon",
+          "schema": "dateTime",
           "comment": [
             true
           ]
@@ -315,12 +315,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_eta;1",
+        "@id": "dtmi:example:zatz_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_zeta",
-          "schema": "float",
+          "name": "zatz_eta",
+          "schema": "double",
           "comment": [
             626
           ]
@@ -336,13 +336,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_iota;1",
+        "@id": "dtmi:example:zatz_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "omega_theta",
-          "schema": "integer",
+          "name": "zatz_iota",
+          "schema": "duration",
           "comment": [
             626
           ]
@@ -358,12 +358,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_lambda;1",
+        "@id": "dtmi:example:zatz_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_kappa",
-          "schema": "long",
+          "name": "zatz_lambda",
+          "schema": "float",
           "comment": {}
         }
       }
@@ -377,13 +377,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_nu;1",
+        "@id": "dtmi:example:zatz_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "omega_mu",
-          "schema": "string",
+          "name": "zatz_nu",
+          "schema": "integer",
           "comment": {}
         }
       }
@@ -397,12 +397,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_omicron;1",
+        "@id": "dtmi:example:zatz_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_xi",
-          "schema": "time",
+          "name": "zatz_omicron",
+          "schema": "long",
           "comment": [
             {}
           ]
@@ -418,13 +418,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_rho;1",
+        "@id": "dtmi:example:zatz_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "omega_pi",
-          "schema": "boolean",
+          "name": "zatz_rho",
+          "schema": "string",
           "comment": [
             {}
           ]
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyPropertyCommentTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassPropertyPropertyCommentTermAndDtmiV3.json
index 34900e38..c6890ac9 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyPropertyCommentTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyPropertyCommentTermAndDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_floob;1",
+        "@id": "dtmi:example:zatz_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "comment": "omega_quan",
-          "dtmi:dtdl:property:comment;3": "omega_thnad",
-          "name": "omega_spazz",
-          "schema": "long"
+          "comment": "zatz_thnad",
+          "dtmi:dtdl:property:comment;3": "zatz_spazz",
+          "name": "zatz_floob",
+          "schema": "float"
         }
       }
     ]
@@ -27,15 +27,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_itch;1",
+        "@id": "dtmi:example:zatz_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "comment": "omega_zatz",
-          "dtmi:dtdl:property:comment;3": "omega_jogg",
-          "name": "omega_flunn",
-          "schema": "string"
+          "comment": "zatz_jogg",
+          "dtmi:dtdl:property:comment;3": "zatz_flunn",
+          "name": "zatz_itch",
+          "schema": "integer"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyPropertyDescriptionLangStringV3.json b/DTDL/v3/spec/Requirement-ClassPropertyPropertyDescriptionLangStringV3.json
index cf97abf0..53ab4c57 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyPropertyDescriptionLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyPropertyDescriptionLangStringV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_vroo;1",
+        "@id": "dtmi:example:zatz_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_yekk",
-          "schema": "time",
+          "name": "zatz_vroo",
+          "schema": "long",
           "description": "hello"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_alpha;1",
+        "@id": "dtmi:example:jogg_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omega_hi",
-          "schema": "boolean",
+          "name": "jogg_alpha",
+          "schema": "string",
           "description": [
             "hello"
           ]
@@ -47,12 +47,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_gamma;1",
+        "@id": "dtmi:example:jogg_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yuzz_beta",
-          "schema": "date",
+          "name": "jogg_gamma",
+          "schema": "time",
           "description": {
             "en": "hello"
           }
@@ -68,12 +68,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_epsilon;1",
+        "@id": "dtmi:example:jogg_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yuzz_delta",
-          "schema": "dateTime",
+          "name": "jogg_epsilon",
+          "schema": "boolean",
           "description": [
             {
               "@value": "hello",
@@ -92,12 +92,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_eta;1",
+        "@id": "dtmi:example:jogg_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yuzz_zeta",
-          "schema": "double",
+          "name": "jogg_eta",
+          "schema": "date",
           "description": {}
         }
       }
@@ -111,12 +111,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_iota;1",
+        "@id": "dtmi:example:jogg_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yuzz_theta",
-          "schema": "duration",
+          "name": "jogg_iota",
+          "schema": "dateTime",
           "description": []
         }
       }
@@ -130,12 +130,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_lambda;1",
+        "@id": "dtmi:example:jogg_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yuzz_kappa",
-          "schema": "float",
+          "name": "jogg_lambda",
+          "schema": "double",
           "description": null
         }
       }
@@ -149,13 +149,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_nu;1",
+        "@id": "dtmi:example:jogg_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "yuzz_mu",
-          "schema": "integer",
+          "name": "jogg_nu",
+          "schema": "duration",
           "description": null
         }
       }
@@ -169,12 +169,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_omicron;1",
+        "@id": "dtmi:example:jogg_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yuzz_xi",
-          "schema": "long",
+          "name": "jogg_omicron",
+          "schema": "float",
           "description": true
         }
       }
@@ -188,13 +188,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_rho;1",
+        "@id": "dtmi:example:jogg_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "yuzz_pi",
-          "schema": "string",
+          "name": "jogg_rho",
+          "schema": "integer",
           "description": true
         }
       }
@@ -208,12 +208,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_tau;1",
+        "@id": "dtmi:example:jogg_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yuzz_sigma",
-          "schema": "time",
+          "name": "jogg_tau",
+          "schema": "long",
           "description": 626
         }
       }
@@ -227,13 +227,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_phi;1",
+        "@id": "dtmi:example:jogg_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "yuzz_upsilon",
-          "schema": "boolean",
+          "name": "jogg_phi",
+          "schema": "string",
           "description": 626
         }
       }
@@ -247,12 +247,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_psi;1",
+        "@id": "dtmi:example:jogg_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yuzz_chi",
-          "schema": "date",
+          "name": "jogg_psi",
+          "schema": "time",
           "description": [
             null
           ]
@@ -268,13 +268,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_yuzz;1",
+        "@id": "dtmi:example:jogg_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "yuzz_omega",
-          "schema": "dateTime",
+          "name": "jogg_yuzz",
+          "schema": "boolean",
           "description": [
             null
           ]
@@ -290,12 +290,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_um;1",
+        "@id": "dtmi:example:jogg_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yuzz_wum",
-          "schema": "double",
+          "name": "jogg_um",
+          "schema": "date",
           "description": [
             true
           ]
@@ -311,13 +311,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_fuddle;1",
+        "@id": "dtmi:example:jogg_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "yuzz_humpf",
-          "schema": "duration",
+          "name": "jogg_fuddle",
+          "schema": "dateTime",
           "description": [
             true
           ]
@@ -333,12 +333,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_nuh;1",
+        "@id": "dtmi:example:jogg_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yuzz_glikk",
-          "schema": "float",
+          "name": "jogg_nuh",
+          "schema": "double",
           "description": [
             626
           ]
@@ -354,13 +354,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_quan;1",
+        "@id": "dtmi:example:jogg_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "yuzz_snee",
-          "schema": "integer",
+          "name": "jogg_quan",
+          "schema": "duration",
           "description": [
             626
           ]
@@ -376,12 +376,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_spazz;1",
+        "@id": "dtmi:example:jogg_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yuzz_thnad",
-          "schema": "long",
+          "name": "jogg_spazz",
+          "schema": "float",
           "description": [
             {}
           ]
@@ -397,13 +397,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_zatz;1",
+        "@id": "dtmi:example:jogg_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "yuzz_floob",
-          "schema": "string",
+          "name": "jogg_zatz",
+          "schema": "integer",
           "description": [
             {}
           ]
@@ -419,12 +419,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_flunn;1",
+        "@id": "dtmi:example:jogg_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yuzz_jogg",
-          "schema": "time",
+          "name": "jogg_flunn",
+          "schema": "long",
           "description": {
             "@value": "hello",
             "@language": "en"
@@ -441,13 +441,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_yekk;1",
+        "@id": "dtmi:example:jogg_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "yuzz_itch",
-          "schema": "boolean",
+          "name": "jogg_yekk",
+          "schema": "string",
           "description": {
             "@value": "hello",
             "@language": "en"
@@ -464,12 +464,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_hi;1",
+        "@id": "dtmi:example:flunn_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "yuzz_vroo",
-          "schema": "date",
+          "name": "jogg_hi",
+          "schema": "time",
           "description": [
             {
               "en": "hello"
@@ -487,13 +487,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_beta;1",
+        "@id": "dtmi:example:flunn_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "wum_alpha",
-          "schema": "dateTime",
+          "name": "flunn_beta",
+          "schema": "boolean",
           "description": [
             {
               "en": "hello"
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyPropertyDescriptionStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassPropertyPropertyDescriptionStringLengthV3.json
index 6be4b078..aac738d4 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyPropertyDescriptionStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyPropertyDescriptionStringLengthV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_delta;1",
+        "@id": "dtmi:example:flunn_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_gamma",
-          "schema": "double",
+          "name": "flunn_delta",
+          "schema": "date",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_zeta;1",
+        "@id": "dtmi:example:flunn_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_epsilon",
-          "schema": "duration",
+          "name": "flunn_zeta",
+          "schema": "dateTime",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -45,13 +45,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_theta;1",
+        "@id": "dtmi:example:flunn_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "wum_eta",
-          "schema": "float",
+          "name": "flunn_theta",
+          "schema": "double",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyPropertyDescriptionTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassPropertyPropertyDescriptionTermAndDtmiV3.json
index 41ab99c8..374919fe 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyPropertyDescriptionTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyPropertyDescriptionTermAndDtmiV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_phi;1",
+        "@id": "dtmi:example:flunn_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
           "description": [
-            "wum_sigma"
+            "flunn_tau"
           ],
           "dtmi:dtdl:property:description;3": [
-            "wum_tau"
+            "flunn_upsilon"
           ],
-          "name": "wum_upsilon",
-          "schema": "time"
+          "name": "flunn_phi",
+          "schema": "long"
         }
       }
     ]
@@ -31,19 +31,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_yuzz;1",
+        "@id": "dtmi:example:flunn_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
           "description": [
-            "wum_chi"
+            "flunn_psi"
           ],
           "dtmi:dtdl:property:description;3": [
-            "wum_psi"
+            "flunn_omega"
           ],
-          "name": "wum_omega",
-          "schema": "boolean"
+          "name": "flunn_yuzz",
+          "schema": "string"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyPropertyDisplayNameLangStringV3.json b/DTDL/v3/spec/Requirement-ClassPropertyPropertyDisplayNameLangStringV3.json
index b21884c6..fac507e2 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyPropertyDisplayNameLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyPropertyDisplayNameLangStringV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_um;1",
+        "@id": "dtmi:example:flunn_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_wum",
-          "schema": "date",
+          "name": "flunn_um",
+          "schema": "time",
           "displayName": "hello"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_fuddle;1",
+        "@id": "dtmi:example:flunn_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_humpf",
-          "schema": "dateTime",
+          "name": "flunn_fuddle",
+          "schema": "boolean",
           "displayName": [
             "hello"
           ]
@@ -47,12 +47,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_nuh;1",
+        "@id": "dtmi:example:flunn_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_glikk",
-          "schema": "double",
+          "name": "flunn_nuh",
+          "schema": "date",
           "displayName": {
             "en": "hello"
           }
@@ -68,12 +68,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_quan;1",
+        "@id": "dtmi:example:flunn_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_snee",
-          "schema": "duration",
+          "name": "flunn_quan",
+          "schema": "dateTime",
           "displayName": [
             {
               "@value": "hello",
@@ -92,12 +92,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_spazz;1",
+        "@id": "dtmi:example:flunn_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_thnad",
-          "schema": "float",
+          "name": "flunn_spazz",
+          "schema": "double",
           "displayName": {}
         }
       }
@@ -111,12 +111,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_zatz;1",
+        "@id": "dtmi:example:flunn_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_floob",
-          "schema": "integer",
+          "name": "flunn_zatz",
+          "schema": "duration",
           "displayName": []
         }
       }
@@ -130,12 +130,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_flunn;1",
+        "@id": "dtmi:example:flunn_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_jogg",
-          "schema": "long",
+          "name": "flunn_flunn",
+          "schema": "float",
           "displayName": null
         }
       }
@@ -149,13 +149,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_yekk;1",
+        "@id": "dtmi:example:flunn_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "wum_itch",
-          "schema": "string",
+          "name": "flunn_yekk",
+          "schema": "integer",
           "displayName": null
         }
       }
@@ -169,12 +169,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_hi;1",
+        "@id": "dtmi:example:itch_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "wum_vroo",
-          "schema": "time",
+          "name": "flunn_hi",
+          "schema": "long",
           "displayName": true
         }
       }
@@ -188,13 +188,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_beta;1",
+        "@id": "dtmi:example:itch_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "um_alpha",
-          "schema": "boolean",
+          "name": "itch_beta",
+          "schema": "string",
           "displayName": true
         }
       }
@@ -208,12 +208,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_delta;1",
+        "@id": "dtmi:example:itch_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "um_gamma",
-          "schema": "date",
+          "name": "itch_delta",
+          "schema": "time",
           "displayName": 626
         }
       }
@@ -227,13 +227,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_zeta;1",
+        "@id": "dtmi:example:itch_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "um_epsilon",
-          "schema": "dateTime",
+          "name": "itch_zeta",
+          "schema": "boolean",
           "displayName": 626
         }
       }
@@ -247,12 +247,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_theta;1",
+        "@id": "dtmi:example:itch_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "um_eta",
-          "schema": "double",
+          "name": "itch_theta",
+          "schema": "date",
           "displayName": [
             null
           ]
@@ -268,13 +268,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_kappa;1",
+        "@id": "dtmi:example:itch_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "um_iota",
-          "schema": "duration",
+          "name": "itch_kappa",
+          "schema": "dateTime",
           "displayName": [
             null
           ]
@@ -290,12 +290,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_mu;1",
+        "@id": "dtmi:example:itch_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "um_lambda",
-          "schema": "float",
+          "name": "itch_mu",
+          "schema": "double",
           "displayName": [
             true
           ]
@@ -311,13 +311,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_xi;1",
+        "@id": "dtmi:example:itch_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "um_nu",
-          "schema": "integer",
+          "name": "itch_xi",
+          "schema": "duration",
           "displayName": [
             true
           ]
@@ -333,12 +333,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_pi;1",
+        "@id": "dtmi:example:itch_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "um_omicron",
-          "schema": "long",
+          "name": "itch_pi",
+          "schema": "float",
           "displayName": [
             626
           ]
@@ -354,13 +354,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_sigma;1",
+        "@id": "dtmi:example:itch_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "um_rho",
-          "schema": "string",
+          "name": "itch_sigma",
+          "schema": "integer",
           "displayName": [
             626
           ]
@@ -376,12 +376,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_upsilon;1",
+        "@id": "dtmi:example:itch_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "um_tau",
-          "schema": "time",
+          "name": "itch_upsilon",
+          "schema": "long",
           "displayName": [
             {}
           ]
@@ -397,13 +397,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_chi;1",
+        "@id": "dtmi:example:itch_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "um_phi",
-          "schema": "boolean",
+          "name": "itch_chi",
+          "schema": "string",
           "displayName": [
             {}
           ]
@@ -419,12 +419,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_omega;1",
+        "@id": "dtmi:example:itch_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "um_psi",
-          "schema": "date",
+          "name": "itch_omega",
+          "schema": "time",
           "displayName": {
             "@value": "hello",
             "@language": "en"
@@ -441,13 +441,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_wum;1",
+        "@id": "dtmi:example:itch_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "um_yuzz",
-          "schema": "dateTime",
+          "name": "itch_wum",
+          "schema": "boolean",
           "displayName": {
             "@value": "hello",
             "@language": "en"
@@ -464,12 +464,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_humpf;1",
+        "@id": "dtmi:example:itch_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "um_um",
-          "schema": "double",
+          "name": "itch_humpf",
+          "schema": "date",
           "displayName": [
             {
               "en": "hello"
@@ -487,13 +487,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_glikk;1",
+        "@id": "dtmi:example:itch_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "um_fuddle",
-          "schema": "duration",
+          "name": "itch_glikk",
+          "schema": "dateTime",
           "displayName": [
             {
               "en": "hello"
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyPropertyDisplayNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassPropertyPropertyDisplayNameStringLengthV3.json
index df2be6ad..525a658e 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyPropertyDisplayNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyPropertyDisplayNameStringLengthV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_snee;1",
+        "@id": "dtmi:example:itch_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "um_nuh",
-          "schema": "float",
+          "name": "itch_snee",
+          "schema": "double",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_thnad;1",
+        "@id": "dtmi:example:itch_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "um_quan",
-          "schema": "integer",
+          "name": "itch_thnad",
+          "schema": "duration",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -45,13 +45,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_floob;1",
+        "@id": "dtmi:example:itch_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "um_spazz",
-          "schema": "long",
+          "name": "itch_floob",
+          "schema": "float",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyPropertyDisplayNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassPropertyPropertyDisplayNameTermAndDtmiV3.json
index c500aa34..88ab8313 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyPropertyDisplayNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyPropertyDisplayNameTermAndDtmiV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_zeta;1",
+        "@id": "dtmi:example:yekk_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
           "displayName": [
-            "humpf_gamma"
+            "yekk_delta"
           ],
           "dtmi:dtdl:property:displayName;3": [
-            "humpf_delta"
+            "yekk_epsilon"
           ],
-          "name": "humpf_epsilon",
-          "schema": "date"
+          "name": "yekk_zeta",
+          "schema": "time"
         }
       }
     ]
@@ -31,19 +31,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_kappa;1",
+        "@id": "dtmi:example:yekk_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
           "displayName": [
-            "humpf_eta"
+            "yekk_theta"
           ],
           "dtmi:dtdl:property:displayName;3": [
-            "humpf_theta"
+            "yekk_iota"
           ],
-          "name": "humpf_iota",
-          "schema": "dateTime"
+          "name": "yekk_kappa",
+          "schema": "boolean"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyPropertyFormallyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Requirement-ClassPropertyPropertyFormallyIrrelevantDtmiOrTermV3.json
index ae652c9e..f6350039 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyPropertyFormallyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyPropertyFormallyIrrelevantDtmiOrTermV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_kappa;1",
+        "@id": "dtmi:example:hi_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "glikk_iota",
-          "schema": "float",
+          "name": "hi_kappa",
+          "schema": "double",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_mu;1",
+        "@id": "dtmi:example:hi_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "glikk_lambda",
-          "schema": "integer",
+          "name": "hi_mu",
+          "schema": "duration",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -46,12 +46,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_xi;1",
+        "@id": "dtmi:example:hi_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "glikk_nu",
-          "schema": "long",
+          "name": "hi_xi",
+          "schema": "float",
           "boolean": null
         }
       }
@@ -65,13 +65,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_pi;1",
+        "@id": "dtmi:example:hi_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "glikk_omicron",
-          "schema": "string",
+          "name": "hi_pi",
+          "schema": "integer",
           "boolean": null
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyPropertyFormallyUndefinedTermV3.json b/DTDL/v3/spec/Requirement-ClassPropertyPropertyFormallyUndefinedTermV3.json
index 5b4a37dd..6a641318 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyPropertyFormallyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyPropertyFormallyUndefinedTermV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_glikk;1",
+        "@id": "dtmi:example:hi_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "glikk_fuddle",
-          "schema": "float",
+          "name": "hi_glikk",
+          "schema": "double",
           "foobar": {}
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_snee;1",
+        "@id": "dtmi:example:hi_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "glikk_nuh",
-          "schema": "integer",
+          "name": "hi_snee",
+          "schema": "duration",
           "foobar": {}
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyPropertyInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassPropertyPropertyInvalidDtmiV3.json
index 94204f78..6cc18e8f 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyPropertyInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyPropertyInvalidDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_sigma;1",
+        "@id": "dtmi:example:hi_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Foobar"
           ],
-          "name": "glikk_rho",
-          "schema": "time",
+          "name": "hi_sigma",
+          "schema": "long",
           "dtmi:foo//bar": 626
         }
       }
@@ -29,7 +29,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_upsilon;1",
+        "@id": "dtmi:example:hi_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -37,8 +37,8 @@
             "Property",
             "Foobar"
           ],
-          "name": "glikk_tau",
-          "schema": "boolean",
+          "name": "hi_upsilon",
+          "schema": "string",
           "dtmi:foo//bar": 626
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyPropertyNamePatternV3.json b/DTDL/v3/spec/Requirement-ClassPropertyPropertyNamePatternV3.json
index ad2e58f8..35ba4295 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyPropertyNamePatternV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyPropertyNamePatternV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_itch;1",
+        "@id": "dtmi:example:yuzz_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "long",
+          "schema": "date",
           "name": "EARTH"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_yekk;1",
+        "@id": "dtmi:example:yuzz_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "string",
+          "schema": "dateTime",
           "name": "Air"
         }
       }
@@ -43,11 +43,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_vroo;1",
+        "@id": "dtmi:example:yuzz_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "time",
+          "schema": "double",
           "name": "fire"
         }
       }
@@ -61,11 +61,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_hi;1",
+        "@id": "dtmi:example:yuzz_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "boolean",
+          "schema": "duration",
           "name": "hello_world"
         }
       }
@@ -79,11 +79,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_alpha;1",
+        "@id": "dtmi:example:yuzz_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "date",
+          "schema": "float",
           "name": "Anarchy99"
         }
       }
@@ -97,11 +97,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_beta;1",
+        "@id": "dtmi:example:yuzz_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "dateTime",
+          "schema": "integer",
           "name": "23skidoo"
         }
       }
@@ -115,12 +115,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_gamma;1",
+        "@id": "dtmi:example:yuzz_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "double",
+          "schema": "long",
           "name": "23skidoo"
         }
       }
@@ -134,11 +134,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_delta;1",
+        "@id": "dtmi:example:yuzz_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "duration",
+          "schema": "string",
           "name": "626"
         }
       }
@@ -152,12 +152,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_epsilon;1",
+        "@id": "dtmi:example:yuzz_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "float",
+          "schema": "time",
           "name": "626"
         }
       }
@@ -171,11 +171,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_zeta;1",
+        "@id": "dtmi:example:yuzz_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "integer",
+          "schema": "boolean",
           "name": "goodbye-world"
         }
       }
@@ -189,12 +189,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_eta;1",
+        "@id": "dtmi:example:yuzz_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "long",
+          "schema": "date",
           "name": "goodbye-world"
         }
       }
@@ -208,11 +208,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_theta;1",
+        "@id": "dtmi:example:yuzz_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "string",
+          "schema": "dateTime",
           "name": "_haha"
         }
       }
@@ -226,12 +226,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_iota;1",
+        "@id": "dtmi:example:yuzz_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "time",
+          "schema": "double",
           "name": "_haha"
         }
       }
@@ -245,11 +245,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_kappa;1",
+        "@id": "dtmi:example:yuzz_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "boolean",
+          "schema": "duration",
           "name": "toodaloo_"
         }
       }
@@ -263,12 +263,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_lambda;1",
+        "@id": "dtmi:example:yuzz_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "date",
+          "schema": "float",
           "name": "toodaloo_"
         }
       }
@@ -282,11 +282,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_mu;1",
+        "@id": "dtmi:example:yuzz_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "dateTime",
+          "schema": "integer",
           "name": "pro:con"
         }
       }
@@ -300,12 +300,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_nu;1",
+        "@id": "dtmi:example:yuzz_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "double",
+          "schema": "long",
           "name": "pro:con"
         }
       }
@@ -319,11 +319,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_xi;1",
+        "@id": "dtmi:example:wum_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "duration",
+          "schema": "string",
           "name": "mish/mash"
         }
       }
@@ -337,12 +337,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_omicron;1",
+        "@id": "dtmi:example:wum_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "float",
+          "schema": "time",
           "name": "mish/mash"
         }
       }
@@ -356,11 +356,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_pi;1",
+        "@id": "dtmi:example:wum_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "integer",
+          "schema": "boolean",
           "name": "#tag"
         }
       }
@@ -374,12 +374,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_rho;1",
+        "@id": "dtmi:example:wum_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "long",
+          "schema": "date",
           "name": "#tag"
         }
       }
@@ -393,11 +393,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_sigma;1",
+        "@id": "dtmi:example:wum_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "string",
+          "schema": "dateTime",
           "name": "@tweet"
         }
       }
@@ -411,12 +411,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_tau;1",
+        "@id": "dtmi:example:wum_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "time",
+          "schema": "double",
           "name": "@tweet"
         }
       }
@@ -430,11 +430,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_upsilon;1",
+        "@id": "dtmi:example:wum_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "boolean",
+          "schema": "duration",
           "name": "$money"
         }
       }
@@ -448,12 +448,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_phi;1",
+        "@id": "dtmi:example:wum_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "date",
+          "schema": "float",
           "name": "$money"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyPropertyNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassPropertyPropertyNameStringLengthV3.json
index f6f30665..35cc4ea6 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyPropertyNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyPropertyNameStringLengthV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_zatz;1",
+        "@id": "dtmi:example:yuzz_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "duration",
+          "schema": "string",
           "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_jogg;1",
+        "@id": "dtmi:example:yuzz_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "float",
+          "schema": "time",
           "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_flunn;1",
+        "@id": "dtmi:example:yuzz_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "integer",
+          "schema": "boolean",
           "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyPropertyNameStringV3.json b/DTDL/v3/spec/Requirement-ClassPropertyPropertyNameStringV3.json
index 2a585ba5..47ada463 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyPropertyNameStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyPropertyNameStringV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_omicron;1",
+        "@id": "dtmi:example:yuzz_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "dateTime",
+          "schema": "integer",
           "name": "hello"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_pi;1",
+        "@id": "dtmi:example:yuzz_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "double",
+          "schema": "long",
           "name": [
             "hello"
           ]
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_rho;1",
+        "@id": "dtmi:example:yuzz_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "duration",
+          "schema": "string",
           "name": {
             "@value": "hello",
             "@type": "xsd:string"
@@ -66,11 +66,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_sigma;1",
+        "@id": "dtmi:example:yuzz_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "float",
+          "schema": "time",
           "name": [
             {
               "@value": "hello",
@@ -89,11 +89,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_tau;1",
+        "@id": "dtmi:example:yuzz_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "integer",
+          "schema": "boolean",
           "name": null
         }
       }
@@ -107,12 +107,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_upsilon;1",
+        "@id": "dtmi:example:yuzz_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "long",
+          "schema": "date",
           "name": null
         }
       }
@@ -126,11 +126,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_phi;1",
+        "@id": "dtmi:example:yuzz_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "string",
+          "schema": "dateTime",
           "name": true
         }
       }
@@ -144,12 +144,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_chi;1",
+        "@id": "dtmi:example:yuzz_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "time",
+          "schema": "double",
           "name": true
         }
       }
@@ -163,11 +163,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_psi;1",
+        "@id": "dtmi:example:yuzz_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "boolean",
+          "schema": "duration",
           "name": 626
         }
       }
@@ -181,12 +181,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_omega;1",
+        "@id": "dtmi:example:yuzz_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "date",
+          "schema": "float",
           "name": 626
         }
       }
@@ -200,11 +200,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_yuzz;1",
+        "@id": "dtmi:example:yuzz_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "dateTime",
+          "schema": "integer",
           "name": [
             null
           ]
@@ -220,12 +220,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_wum;1",
+        "@id": "dtmi:example:yuzz_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "double",
+          "schema": "long",
           "name": [
             null
           ]
@@ -241,11 +241,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_um;1",
+        "@id": "dtmi:example:yuzz_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "duration",
+          "schema": "string",
           "name": [
             true
           ]
@@ -261,12 +261,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_humpf;1",
+        "@id": "dtmi:example:yuzz_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "float",
+          "schema": "time",
           "name": [
             true
           ]
@@ -282,11 +282,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_fuddle;1",
+        "@id": "dtmi:example:yuzz_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "integer",
+          "schema": "boolean",
           "name": [
             626
           ]
@@ -302,12 +302,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_glikk;1",
+        "@id": "dtmi:example:yuzz_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "long",
+          "schema": "date",
           "name": [
             626
           ]
@@ -323,11 +323,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_nuh;1",
+        "@id": "dtmi:example:yuzz_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "string",
+          "schema": "dateTime",
           "name": {}
         }
       }
@@ -341,12 +341,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_snee;1",
+        "@id": "dtmi:example:yuzz_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "time",
+          "schema": "double",
           "name": {}
         }
       }
@@ -360,11 +360,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_quan;1",
+        "@id": "dtmi:example:yuzz_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "boolean",
+          "schema": "duration",
           "name": [
             {}
           ]
@@ -380,12 +380,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_thnad;1",
+        "@id": "dtmi:example:yuzz_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "date",
+          "schema": "float",
           "name": [
             {}
           ]
@@ -401,11 +401,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_spazz;1",
+        "@id": "dtmi:example:yuzz_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "dateTime",
+          "schema": "integer",
           "name": []
         }
       }
@@ -419,12 +419,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_floob;1",
+        "@id": "dtmi:example:yuzz_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "double",
+          "schema": "long",
           "name": []
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyPropertyNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassPropertyPropertyNameTermAndDtmiV3.json
index 0852b7e3..20b08964 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyPropertyNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyPropertyNameTermAndDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_flunn;1",
+        "@id": "dtmi:example:wum_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "nu_zatz",
-          "dtmi:dtdl:property:name;3": "nu_jogg",
-          "schema": "long"
+          "name": "wum_omega",
+          "dtmi:dtdl:property:name;3": "wum_yuzz",
+          "schema": "date"
         }
       }
     ]
@@ -26,14 +26,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_vroo;1",
+        "@id": "dtmi:example:wum_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "nu_itch",
-          "dtmi:dtdl:property:name;3": "nu_yekk",
-          "schema": "string"
+          "name": "wum_um",
+          "dtmi:dtdl:property:name;3": "wum_humpf",
+          "schema": "dateTime"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyPropertyNameUniqueAmongInterfaceContentsV3.json b/DTDL/v3/spec/Requirement-ClassPropertyPropertyNameUniqueAmongInterfaceContentsV3.json
index cf65c26d..aa90d150 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyPropertyNameUniqueAmongInterfaceContentsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyPropertyNameUniqueAmongInterfaceContentsV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_chi;1",
+        "@id": "dtmi:example:wum_iota;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Property",
-            "schema": "dateTime",
-            "name": "gamma_yuzz"
+            "schema": "integer",
+            "name": "gamma_glikk"
           },
           {
             "@type": "Property",
-            "schema": "double",
-            "name": "gamma_wum"
+            "schema": "long",
+            "name": "gamma_nuh"
           }
         ]
       }
@@ -32,18 +32,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_psi;1",
+        "@id": "dtmi:example:wum_kappa;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Property",
-            "schema": "duration",
-            "name": "gamma_yuzz"
+            "schema": "string",
+            "name": "gamma_glikk"
           },
           {
             "@type": "Property",
-            "schema": "float",
-            "name": "gamma_yuzz"
+            "schema": "time",
+            "name": "gamma_glikk"
           }
         ]
       }
@@ -60,18 +60,18 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:nu_omega;1",
+        "@id": "dtmi:example:wum_lambda;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Property",
-            "schema": "integer",
-            "name": "gamma_yuzz"
+            "schema": "boolean",
+            "name": "gamma_glikk"
           },
           {
             "@type": "Property",
-            "schema": "long",
-            "name": "gamma_yuzz"
+            "schema": "date",
+            "name": "gamma_glikk"
           }
         ]
       }
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyPropertyNameUniqueAmongRelationshipPropertiesV3.json b/DTDL/v3/spec/Requirement-ClassPropertyPropertyNameUniqueAmongRelationshipPropertiesV3.json
index 3ba2ac3c..3cff5836 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyPropertyNameUniqueAmongRelationshipPropertiesV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyPropertyNameUniqueAmongRelationshipPropertiesV3.json
@@ -7,21 +7,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_wum;1",
+        "@id": "dtmi:example:wum_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "nu_yuzz",
+          "name": "wum_mu",
           "properties": [
             {
               "@type": "Property",
-              "schema": "string",
-              "name": "gamma_um"
+              "schema": "dateTime",
+              "name": "gamma_snee"
             },
             {
               "@type": "Property",
-              "schema": "time",
-              "name": "gamma_humpf"
+              "schema": "double",
+              "name": "gamma_quan"
             }
           ]
         }
@@ -36,21 +36,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_humpf;1",
+        "@id": "dtmi:example:wum_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "nu_um",
+          "name": "wum_xi",
           "properties": [
             {
               "@type": "Property",
-              "schema": "boolean",
-              "name": "gamma_um"
+              "schema": "duration",
+              "name": "gamma_snee"
             },
             {
               "@type": "Property",
-              "schema": "date",
-              "name": "gamma_um"
+              "schema": "float",
+              "name": "gamma_snee"
             }
           ]
         }
@@ -65,22 +65,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_glikk;1",
+        "@id": "dtmi:example:wum_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "nu_fuddle",
+          "name": "wum_pi",
           "properties": [
             {
               "@type": "Property",
-              "schema": "dateTime",
-              "name": "gamma_um"
+              "schema": "integer",
+              "name": "gamma_snee"
             },
             {
               "@type": "Property",
-              "schema": "double",
-              "name": "gamma_um"
+              "schema": "long",
+              "name": "gamma_snee"
             }
           ]
         }
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyPropertyNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassPropertyPropertyNotDtmiNorTermV3.json
index dbf80ae3..b240dcac 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyPropertyNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyPropertyNotDtmiNorTermV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_chi;1",
+        "@id": "dtmi:example:hi_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "Foobar"
           ],
-          "name": "glikk_phi",
-          "schema": "date",
+          "name": "hi_chi",
+          "schema": "time",
           "http://foo.com/bar": true
         }
       }
@@ -29,7 +29,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_omega;1",
+        "@id": "dtmi:example:hi_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -37,8 +37,8 @@
             "Property",
             "Foobar"
           ],
-          "name": "glikk_psi",
-          "schema": "dateTime",
+          "name": "hi_omega",
+          "schema": "boolean",
           "http://foo.com/bar": true
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyPropertySchemaElementV3.json b/DTDL/v3/spec/Requirement-ClassPropertyPropertySchemaElementV3.json
index bbbf1442..cfea2fe9 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyPropertySchemaElementV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyPropertySchemaElementV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_beta;1",
+        "@id": "dtmi:example:wum_snee;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_alpha;1",
+          "@id": "dtmi:example:wum_nuh;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "nu_hi",
+            "name": "wum_glikk",
             "schema": {
               "@type": "Array",
-              "elementSchema": "time"
+              "elementSchema": "double"
             }
           }
         }
@@ -32,18 +32,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_epsilon;1",
+        "@id": "dtmi:example:wum_spazz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_delta;1",
+          "@id": "dtmi:example:wum_thnad;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "xi_gamma",
+            "name": "wum_quan",
             "schema": [
               {
                 "@type": "Array",
-                "elementSchema": "boolean"
+                "elementSchema": "duration"
               }
             ]
           }
@@ -59,16 +59,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_zeta;1",
+        "@id": "dtmi:example:wum_floob;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Array",
-          "elementSchema": "date"
+          "elementSchema": "float"
         },
         "contents": {
           "@type": "Property",
-          "name": "xi_eta",
+          "name": "wum_zatz",
           "schema": "dtmi:ex:dependentRef;1"
         }
       }
@@ -82,16 +82,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_theta;1",
+        "@id": "dtmi:example:wum_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Array",
-          "elementSchema": "dateTime"
+          "elementSchema": "integer"
         },
         "contents": {
           "@type": "Property",
-          "name": "xi_iota",
+          "name": "wum_flunn",
           "schema": [
             "dtmi:ex:dependentRef;1"
           ]
@@ -107,18 +107,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_nu;1",
+        "@id": "dtmi:example:wum_hi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:xi_mu;1",
+          "@id": "dtmi:example:wum_vroo;1",
           "@type": "Interface",
           "contents": {
             "@type": "Property",
-            "name": "xi_lambda",
+            "name": "wum_yekk",
             "schema": {
-              "@id": "dtmi:example:xi_kappa;1",
+              "@id": "dtmi:example:wum_itch;1",
               "@type": "Array",
-              "elementSchema": "double",
+              "elementSchema": "long",
               "@context": "dtmi:dtdl:context;2"
             }
           }
@@ -134,20 +134,75 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_xi;1",
+        "@id": "dtmi:example:um_delta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_gamma;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "um_beta",
+            "schema": {
+              "@id": "dtmi:example:um_alpha;1",
+              "@type": "Array",
+              "elementSchema": "long",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:um_theta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_eta;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Property",
+            "name": "um_zeta",
+            "schema": {
+              "@id": "dtmi:example:um_epsilon;1",
+              "@type": "Array",
+              "elementSchema": "short",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:um_iota;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Array",
-          "elementSchema": "float"
+          "elementSchema": "date"
         },
         "contents": {
           "@type": "Property",
-          "name": "xi_omicron",
+          "name": "um_kappa",
           "schema": [
             {
               "@type": "Array",
-              "elementSchema": "duration"
+              "elementSchema": "boolean"
             },
             "dtmi:ex:dependentRef;1"
           ]
@@ -163,21 +218,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_pi;1",
+        "@id": "dtmi:example:um_lambda;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Array",
-          "elementSchema": "long"
+          "elementSchema": "double"
         },
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "xi_rho",
+          "name": "um_mu",
           "schema": [
             {
               "@type": "Array",
-              "elementSchema": "integer"
+              "elementSchema": "dateTime"
             },
             "dtmi:ex:dependentRef;1"
           ]
@@ -193,11 +248,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_tau;1",
+        "@id": "dtmi:example:um_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "xi_sigma",
+          "name": "um_nu",
           "schema": "boolean"
         }
       }
@@ -211,11 +266,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_phi;1",
+        "@id": "dtmi:example:um_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "xi_upsilon",
+          "name": "um_omicron",
           "schema": [
             "boolean"
           ]
@@ -231,11 +286,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_psi;1",
+        "@id": "dtmi:example:um_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "xi_chi",
+          "name": "um_rho",
           "schema": "dtmi:dtdl:instance:Schema:boolean;3"
         }
       }
@@ -249,11 +304,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_yuzz;1",
+        "@id": "dtmi:example:um_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "xi_omega",
+          "name": "um_tau",
           "schema": [
             "dtmi:dtdl:instance:Schema:boolean;3"
           ]
@@ -269,11 +324,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_um;1",
+        "@id": "dtmi:example:um_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "xi_wum",
+          "name": "um_phi",
           "schema": "point"
         }
       }
@@ -287,11 +342,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_fuddle;1",
+        "@id": "dtmi:example:um_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "xi_humpf",
+          "name": "um_psi",
           "schema": [
             "point"
           ]
@@ -307,11 +362,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_nuh;1",
+        "@id": "dtmi:example:um_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "xi_glikk",
+          "name": "um_yuzz",
           "schema": "dtmi:standard:schema:geospatial:point;3"
         }
       }
@@ -325,11 +380,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_quan;1",
+        "@id": "dtmi:example:um_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "xi_snee",
+          "name": "um_um",
           "schema": [
             "dtmi:standard:schema:geospatial:point;3"
           ]
@@ -345,11 +400,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_spazz;1",
+        "@id": "dtmi:example:um_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "xi_thnad",
+          "name": "um_fuddle",
           "schema": "Foobar"
         }
       }
@@ -363,12 +418,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_zatz;1",
+        "@id": "dtmi:example:um_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "xi_floob",
+          "name": "um_nuh",
           "schema": "Foobar"
         }
       }
@@ -382,11 +437,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_flunn;1",
+        "@id": "dtmi:example:um_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "xi_jogg",
+          "name": "um_quan",
           "schema": null
         }
       }
@@ -400,12 +455,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_yekk;1",
+        "@id": "dtmi:example:um_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "xi_itch",
+          "name": "um_spazz",
           "schema": null
         }
       }
@@ -419,11 +474,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_hi;1",
+        "@id": "dtmi:example:um_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "xi_vroo",
+          "name": "um_zatz",
           "schema": true
         }
       }
@@ -437,12 +492,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_beta;1",
+        "@id": "dtmi:example:um_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "omicron_alpha",
+          "name": "um_flunn",
           "schema": true
         }
       }
@@ -456,11 +511,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_delta;1",
+        "@id": "dtmi:example:um_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omicron_gamma",
+          "name": "um_yekk",
           "schema": 626
         }
       }
@@ -474,12 +529,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_zeta;1",
+        "@id": "dtmi:example:humpf_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "omicron_epsilon",
+          "name": "um_hi",
           "schema": 626
         }
       }
@@ -493,11 +548,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_theta;1",
+        "@id": "dtmi:example:humpf_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omicron_eta",
+          "name": "humpf_beta",
           "schema": [
             null
           ]
@@ -513,12 +568,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_kappa;1",
+        "@id": "dtmi:example:humpf_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "omicron_iota",
+          "name": "humpf_delta",
           "schema": [
             null
           ]
@@ -534,11 +589,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_mu;1",
+        "@id": "dtmi:example:humpf_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omicron_lambda",
+          "name": "humpf_zeta",
           "schema": [
             true
           ]
@@ -554,12 +609,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_xi;1",
+        "@id": "dtmi:example:humpf_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "omicron_nu",
+          "name": "humpf_theta",
           "schema": [
             true
           ]
@@ -575,11 +630,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_pi;1",
+        "@id": "dtmi:example:humpf_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omicron_omicron",
+          "name": "humpf_kappa",
           "schema": [
             626
           ]
@@ -595,12 +650,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_sigma;1",
+        "@id": "dtmi:example:humpf_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "omicron_rho",
+          "name": "humpf_mu",
           "schema": [
             626
           ]
@@ -616,11 +671,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_upsilon;1",
+        "@id": "dtmi:example:humpf_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omicron_tau",
+          "name": "humpf_xi",
           "schema": {}
         }
       }
@@ -634,12 +689,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_chi;1",
+        "@id": "dtmi:example:humpf_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "omicron_phi",
+          "name": "humpf_pi",
           "schema": {}
         }
       }
@@ -653,11 +708,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_omega;1",
+        "@id": "dtmi:example:humpf_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omicron_psi",
+          "name": "humpf_sigma",
           "schema": [
             {}
           ]
@@ -673,12 +728,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_wum;1",
+        "@id": "dtmi:example:humpf_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "omicron_yuzz",
+          "name": "humpf_upsilon",
           "schema": [
             {}
           ]
@@ -694,11 +749,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_humpf;1",
+        "@id": "dtmi:example:humpf_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omicron_um",
+          "name": "humpf_chi",
           "schema": []
         }
       }
@@ -712,12 +767,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_glikk;1",
+        "@id": "dtmi:example:humpf_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "omicron_fuddle",
+          "name": "humpf_omega",
           "schema": []
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyPropertySchemaTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassPropertyPropertySchemaTermAndDtmiV3.json
index cbec24ad..524147ff 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyPropertySchemaTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyPropertySchemaTermAndDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_quan;1",
+        "@id": "dtmi:example:nuh_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "sigma_snee",
-          "schema": "float",
-          "dtmi:dtdl:property:schema;3": "integer"
+          "name": "nuh_um",
+          "schema": "date",
+          "dtmi:dtdl:property:schema;3": "dateTime"
         }
       }
     ]
@@ -26,14 +26,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_spazz;1",
+        "@id": "dtmi:example:nuh_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "sigma_thnad",
-          "schema": "long",
-          "dtmi:dtdl:property:schema;3": "string"
+          "name": "nuh_fuddle",
+          "schema": "double",
+          "dtmi:dtdl:property:schema;3": "duration"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyPropertySchemaTypeConformanceV3.json b/DTDL/v3/spec/Requirement-ClassPropertyPropertySchemaTypeConformanceV3.json
index 509ca70b..e8fba5cb 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyPropertySchemaTypeConformanceV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyPropertySchemaTypeConformanceV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_flunn;1",
+        "@id": "dtmi:example:humpf_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omicron_jogg",
+          "name": "humpf_quan",
           "schema": {
-            "@id": "dtmi:example:omicron_zatz;1",
-            "elementSchema": "string",
+            "@id": "dtmi:example:humpf_snee;1",
+            "elementSchema": "duration",
             "@type": "Array"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_hi;1",
+        "@id": "dtmi:example:humpf_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "omicron_vroo",
+          "name": "humpf_zatz",
           "schema": {
-            "@id": "dtmi:example:omicron_itch;1",
-            "name": "omicron_yekk",
+            "@id": "dtmi:example:humpf_spazz;1",
+            "name": "humpf_floob",
             "@type": "Command"
           }
         }
@@ -51,15 +51,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_delta;1",
+        "@id": "dtmi:example:humpf_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "pi_gamma",
+          "name": "humpf_yekk",
           "schema": {
-            "@id": "dtmi:example:pi_alpha;1",
-            "name": "pi_beta",
+            "@id": "dtmi:example:humpf_flunn;1",
+            "name": "humpf_itch",
             "@type": "Command"
           }
         }
@@ -74,15 +74,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_theta;1",
+        "@id": "dtmi:example:fuddle_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "pi_eta",
+          "name": "fuddle_beta",
           "schema": {
-            "@id": "dtmi:example:pi_epsilon;1",
-            "name": "pi_zeta",
-            "schema": "time",
+            "@id": "dtmi:example:humpf_hi;1",
+            "name": "fuddle_alpha",
+            "schema": "float",
             "@type": "CommandRequest"
           }
         }
@@ -97,16 +97,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_mu;1",
+        "@id": "dtmi:example:fuddle_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "pi_lambda",
+          "name": "fuddle_zeta",
           "schema": {
-            "@id": "dtmi:example:pi_iota;1",
-            "name": "pi_kappa",
-            "schema": "boolean",
+            "@id": "dtmi:example:fuddle_delta;1",
+            "name": "fuddle_epsilon",
+            "schema": "integer",
             "@type": "CommandRequest"
           }
         }
@@ -121,15 +121,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_pi;1",
+        "@id": "dtmi:example:fuddle_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "pi_omicron",
+          "name": "fuddle_kappa",
           "schema": {
-            "@id": "dtmi:example:pi_nu;1",
-            "name": "pi_xi",
-            "schema": "date",
+            "@id": "dtmi:example:fuddle_theta;1",
+            "name": "fuddle_iota",
+            "schema": "long",
             "@type": "CommandResponse"
           }
         }
@@ -144,16 +144,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_upsilon;1",
+        "@id": "dtmi:example:fuddle_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "pi_tau",
+          "name": "fuddle_xi",
           "schema": {
-            "@id": "dtmi:example:pi_rho;1",
-            "name": "pi_sigma",
-            "schema": "dateTime",
+            "@id": "dtmi:example:fuddle_mu;1",
+            "name": "fuddle_nu",
+            "schema": "string",
             "@type": "CommandResponse"
           }
         }
@@ -168,16 +168,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_yuzz;1",
+        "@id": "dtmi:example:fuddle_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "pi_omega",
+          "name": "fuddle_tau",
           "schema": {
-            "@id": "dtmi:example:pi_phi;1",
-            "name": "pi_chi",
+            "@id": "dtmi:example:fuddle_pi;1",
+            "name": "fuddle_rho",
             "schema": {
-              "@id": "dtmi:example:pi_psi;1",
+              "@id": "dtmi:example:fuddle_sigma;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -194,17 +194,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_glikk;1",
+        "@id": "dtmi:example:fuddle_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "pi_fuddle",
+          "name": "fuddle_omega",
           "schema": {
-            "@id": "dtmi:example:pi_wum;1",
-            "name": "pi_um",
+            "@id": "dtmi:example:fuddle_phi;1",
+            "name": "fuddle_chi",
             "schema": {
-              "@id": "dtmi:example:pi_humpf;1",
+              "@id": "dtmi:example:fuddle_psi;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -221,13 +221,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_quan;1",
+        "@id": "dtmi:example:fuddle_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "pi_snee",
+          "name": "fuddle_um",
           "schema": {
-            "@id": "dtmi:example:pi_nuh;1",
+            "@id": "dtmi:example:fuddle_wum;1",
             "valueSchema": "integer",
             "@type": "Enum"
           }
@@ -243,15 +243,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_zatz;1",
+        "@id": "dtmi:example:fuddle_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "pi_floob",
+          "name": "fuddle_nuh",
           "schema": {
-            "@id": "dtmi:example:pi_thnad;1",
-            "enumValue": 1468,
-            "name": "pi_spazz",
+            "@id": "dtmi:example:fuddle_fuddle;1",
+            "enumValue": 1485,
+            "name": "fuddle_glikk",
             "@type": "EnumValue"
           }
         }
@@ -266,16 +266,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_yekk;1",
+        "@id": "dtmi:example:fuddle_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "pi_itch",
+          "name": "fuddle_spazz",
           "schema": {
-            "@id": "dtmi:example:pi_jogg;1",
-            "enumValue": 1469,
-            "name": "pi_flunn",
+            "@id": "dtmi:example:fuddle_quan;1",
+            "enumValue": 1486,
+            "name": "fuddle_thnad",
             "@type": "EnumValue"
           }
         }
@@ -290,15 +290,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_beta;1",
+        "@id": "dtmi:example:fuddle_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "rho_alpha",
+          "name": "fuddle_flunn",
           "schema": {
-            "@id": "dtmi:example:pi_vroo;1",
-            "name": "pi_hi",
-            "schema": "double",
+            "@id": "dtmi:example:fuddle_zatz;1",
+            "name": "fuddle_jogg",
+            "schema": "time",
             "@type": "Field"
           }
         }
@@ -313,16 +313,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_zeta;1",
+        "@id": "dtmi:example:glikk_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "rho_epsilon",
+          "name": "fuddle_hi",
           "schema": {
-            "@id": "dtmi:example:rho_gamma;1",
-            "name": "rho_delta",
-            "schema": "duration",
+            "@id": "dtmi:example:fuddle_yekk;1",
+            "name": "fuddle_vroo",
+            "schema": "boolean",
             "@type": "Field"
           }
         }
@@ -337,13 +337,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_iota;1",
+        "@id": "dtmi:example:glikk_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "rho_theta",
+          "name": "glikk_gamma",
           "schema": {
-            "@id": "dtmi:example:rho_eta;1",
+            "@id": "dtmi:example:glikk_beta;1",
             "@type": "Interface"
           }
         }
@@ -358,14 +358,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_mu;1",
+        "@id": "dtmi:example:glikk_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "rho_lambda",
+          "name": "glikk_zeta",
           "schema": {
-            "@id": "dtmi:example:rho_kappa;1",
+            "@id": "dtmi:example:glikk_epsilon;1",
             "@type": "Interface"
           }
         }
@@ -380,20 +380,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_rho;1",
+        "@id": "dtmi:example:glikk_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "rho_pi",
+          "name": "glikk_lambda",
           "schema": {
-            "@id": "dtmi:example:rho_nu;1",
+            "@id": "dtmi:example:glikk_theta;1",
             "mapKey": {
-              "name": "rho_xi",
+              "name": "glikk_iota",
               "schema": "string"
             },
             "mapValue": {
-              "name": "rho_omicron",
-              "schema": "float"
+              "name": "glikk_kappa",
+              "schema": "date"
             },
             "@type": "Map"
           }
@@ -409,14 +409,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_phi;1",
+        "@id": "dtmi:example:glikk_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "rho_upsilon",
+          "name": "glikk_omicron",
           "schema": {
-            "@id": "dtmi:example:rho_sigma;1",
-            "name": "rho_tau",
+            "@id": "dtmi:example:glikk_nu;1",
+            "name": "glikk_xi",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -432,15 +432,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_yuzz;1",
+        "@id": "dtmi:example:glikk_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "rho_omega",
+          "name": "glikk_tau",
           "schema": {
-            "@id": "dtmi:example:rho_chi;1",
-            "name": "rho_psi",
+            "@id": "dtmi:example:glikk_rho;1",
+            "name": "glikk_sigma",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -456,15 +456,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_fuddle;1",
+        "@id": "dtmi:example:glikk_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "rho_humpf",
+          "name": "glikk_psi",
           "schema": {
-            "@id": "dtmi:example:rho_wum;1",
-            "name": "rho_um",
-            "schema": "integer",
+            "@id": "dtmi:example:glikk_phi;1",
+            "name": "glikk_chi",
+            "schema": "dateTime",
             "@type": "MapValue"
           }
         }
@@ -479,16 +479,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_quan;1",
+        "@id": "dtmi:example:glikk_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "rho_snee",
+          "name": "glikk_um",
           "schema": {
-            "@id": "dtmi:example:rho_glikk;1",
-            "name": "rho_nuh",
-            "schema": "long",
+            "@id": "dtmi:example:glikk_yuzz;1",
+            "name": "glikk_wum",
+            "schema": "double",
             "@type": "MapValue"
           }
         }
@@ -503,13 +503,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_floob;1",
+        "@id": "dtmi:example:glikk_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "rho_spazz",
+          "name": "glikk_glikk",
           "schema": {
-            "@id": "dtmi:example:rho_thnad;1",
+            "@id": "dtmi:example:glikk_fuddle;1",
             "@type": "Object"
           }
         }
@@ -524,15 +524,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_itch;1",
+        "@id": "dtmi:example:glikk_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "rho_flunn",
+          "name": "glikk_thnad",
           "schema": {
-            "@id": "dtmi:example:rho_zatz;1",
-            "name": "rho_jogg",
-            "schema": "string",
+            "@id": "dtmi:example:glikk_snee;1",
+            "name": "glikk_quan",
+            "schema": "duration",
             "@type": "Property"
           }
         }
@@ -547,16 +547,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_alpha;1",
+        "@id": "dtmi:example:glikk_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "rho_hi",
+          "name": "glikk_jogg",
           "schema": {
-            "@id": "dtmi:example:rho_yekk;1",
-            "name": "rho_vroo",
-            "schema": "time",
+            "@id": "dtmi:example:glikk_floob;1",
+            "name": "glikk_zatz",
+            "schema": "float",
             "@type": "Property"
           }
         }
@@ -571,14 +571,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_epsilon;1",
+        "@id": "dtmi:example:glikk_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "sigma_delta",
+          "name": "glikk_vroo",
           "schema": {
-            "@id": "dtmi:example:sigma_beta;1",
-            "name": "sigma_gamma",
+            "@id": "dtmi:example:glikk_itch;1",
+            "name": "glikk_yekk",
             "@type": "Relationship"
           }
         }
@@ -593,15 +593,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_iota;1",
+        "@id": "dtmi:example:nuh_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "sigma_theta",
+          "name": "nuh_gamma",
           "schema": {
-            "@id": "dtmi:example:sigma_zeta;1",
-            "name": "sigma_eta",
+            "@id": "dtmi:example:nuh_alpha;1",
+            "name": "nuh_beta",
             "@type": "Relationship"
           }
         }
@@ -616,15 +616,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_nu;1",
+        "@id": "dtmi:example:nuh_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "sigma_mu",
+          "name": "nuh_eta",
           "schema": {
-            "@id": "dtmi:example:sigma_kappa;1",
-            "name": "sigma_lambda",
-            "schema": "boolean",
+            "@id": "dtmi:example:nuh_epsilon;1",
+            "name": "nuh_zeta",
+            "schema": "integer",
             "@type": "Telemetry"
           }
         }
@@ -639,16 +639,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_rho;1",
+        "@id": "dtmi:example:nuh_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "sigma_pi",
+          "name": "nuh_lambda",
           "schema": {
-            "@id": "dtmi:example:sigma_xi;1",
-            "name": "sigma_omicron",
-            "schema": "date",
+            "@id": "dtmi:example:nuh_iota;1",
+            "name": "nuh_kappa",
+            "schema": "long",
             "@type": "Telemetry"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyPropertyWritableBooleanV3.json b/DTDL/v3/spec/Requirement-ClassPropertyPropertyWritableBooleanV3.json
index 3ee0f2b3..72560780 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyPropertyWritableBooleanV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyPropertyWritableBooleanV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_mu;1",
+        "@id": "dtmi:example:yekk_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_lambda",
-          "schema": "double",
+          "name": "yekk_mu",
+          "schema": "date",
           "writable": true
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_xi;1",
+        "@id": "dtmi:example:yekk_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_nu",
-          "schema": "duration",
+          "name": "yekk_xi",
+          "schema": "dateTime",
           "writable": false
         }
       }
@@ -45,12 +45,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_pi;1",
+        "@id": "dtmi:example:yekk_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_omicron",
-          "schema": "float",
+          "name": "yekk_pi",
+          "schema": "double",
           "writable": [
             true
           ]
@@ -66,12 +66,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_sigma;1",
+        "@id": "dtmi:example:yekk_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_rho",
-          "schema": "integer",
+          "name": "yekk_sigma",
+          "schema": "duration",
           "writable": [
             false
           ]
@@ -87,12 +87,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_upsilon;1",
+        "@id": "dtmi:example:yekk_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_tau",
-          "schema": "long",
+          "name": "yekk_upsilon",
+          "schema": "float",
           "writable": {
             "@value": true,
             "@type": "xsd:boolean"
@@ -109,12 +109,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_chi;1",
+        "@id": "dtmi:example:yekk_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_phi",
-          "schema": "string",
+          "name": "yekk_chi",
+          "schema": "integer",
           "writable": {
             "@value": false,
             "@type": "xsd:boolean"
@@ -131,12 +131,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_omega;1",
+        "@id": "dtmi:example:yekk_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_psi",
-          "schema": "time",
+          "name": "yekk_omega",
+          "schema": "long",
           "writable": [
             {
               "@value": true,
@@ -155,12 +155,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_wum;1",
+        "@id": "dtmi:example:yekk_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_yuzz",
-          "schema": "boolean",
+          "name": "yekk_wum",
+          "schema": "string",
           "writable": [
             {
               "@value": false,
@@ -179,12 +179,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_humpf;1",
+        "@id": "dtmi:example:yekk_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_um",
-          "schema": "date",
+          "name": "yekk_humpf",
+          "schema": "time",
           "writable": []
         }
       }
@@ -198,12 +198,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_glikk;1",
+        "@id": "dtmi:example:yekk_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_fuddle",
-          "schema": "dateTime",
+          "name": "yekk_glikk",
+          "schema": "boolean",
           "writable": null
         }
       }
@@ -217,13 +217,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_snee;1",
+        "@id": "dtmi:example:yekk_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "humpf_nuh",
-          "schema": "double",
+          "name": "yekk_snee",
+          "schema": "date",
           "writable": null
         }
       }
@@ -237,12 +237,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_thnad;1",
+        "@id": "dtmi:example:yekk_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_quan",
-          "schema": "duration",
+          "name": "yekk_thnad",
+          "schema": "dateTime",
           "writable": 626
         }
       }
@@ -256,13 +256,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_floob;1",
+        "@id": "dtmi:example:yekk_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "humpf_spazz",
-          "schema": "float",
+          "name": "yekk_floob",
+          "schema": "double",
           "writable": 626
         }
       }
@@ -276,12 +276,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_jogg;1",
+        "@id": "dtmi:example:yekk_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_zatz",
-          "schema": "integer",
+          "name": "yekk_jogg",
+          "schema": "duration",
           "writable": "hello"
         }
       }
@@ -295,13 +295,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_itch;1",
+        "@id": "dtmi:example:yekk_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "humpf_flunn",
-          "schema": "long",
+          "name": "yekk_itch",
+          "schema": "float",
           "writable": "hello"
         }
       }
@@ -315,12 +315,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_vroo;1",
+        "@id": "dtmi:example:yekk_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "humpf_yekk",
-          "schema": "string",
+          "name": "yekk_vroo",
+          "schema": "integer",
           "writable": [
             null
           ]
@@ -336,13 +336,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_alpha;1",
+        "@id": "dtmi:example:vroo_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "humpf_hi",
-          "schema": "time",
+          "name": "vroo_alpha",
+          "schema": "long",
           "writable": [
             null
           ]
@@ -358,12 +358,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_gamma;1",
+        "@id": "dtmi:example:vroo_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_beta",
-          "schema": "boolean",
+          "name": "vroo_gamma",
+          "schema": "string",
           "writable": [
             626
           ]
@@ -379,13 +379,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_epsilon;1",
+        "@id": "dtmi:example:vroo_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "fuddle_delta",
-          "schema": "date",
+          "name": "vroo_epsilon",
+          "schema": "time",
           "writable": [
             626
           ]
@@ -401,12 +401,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_eta;1",
+        "@id": "dtmi:example:vroo_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_zeta",
-          "schema": "dateTime",
+          "name": "vroo_eta",
+          "schema": "boolean",
           "writable": [
             "hello"
           ]
@@ -422,13 +422,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_iota;1",
+        "@id": "dtmi:example:vroo_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "fuddle_theta",
-          "schema": "double",
+          "name": "vroo_iota",
+          "schema": "date",
           "writable": [
             "hello"
           ]
@@ -444,12 +444,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_lambda;1",
+        "@id": "dtmi:example:vroo_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_kappa",
-          "schema": "duration",
+          "name": "vroo_lambda",
+          "schema": "dateTime",
           "writable": {}
         }
       }
@@ -463,13 +463,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_nu;1",
+        "@id": "dtmi:example:vroo_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "fuddle_mu",
-          "schema": "float",
+          "name": "vroo_nu",
+          "schema": "double",
           "writable": {}
         }
       }
@@ -483,12 +483,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_omicron;1",
+        "@id": "dtmi:example:vroo_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_xi",
-          "schema": "integer",
+          "name": "vroo_omicron",
+          "schema": "duration",
           "writable": [
             {}
           ]
@@ -504,13 +504,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_rho;1",
+        "@id": "dtmi:example:vroo_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "fuddle_pi",
-          "schema": "long",
+          "name": "vroo_rho",
+          "schema": "float",
           "writable": [
             {}
           ]
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyPropertyWritableTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassPropertyPropertyWritableTermAndDtmiV3.json
index 251cb163..6a259d6f 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyPropertyWritableTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyPropertyWritableTermAndDtmiV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_yuzz;1",
+        "@id": "dtmi:example:vroo_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "fuddle_omega",
-          "schema": "date",
+          "name": "vroo_yuzz",
+          "schema": "time",
           "writable": true,
           "dtmi:dtdl:property:writable;3": false
         }
@@ -27,13 +27,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_um;1",
+        "@id": "dtmi:example:vroo_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "fuddle_wum",
-          "schema": "dateTime",
+          "name": "vroo_um",
+          "schema": "boolean",
           "writable": true,
           "dtmi:dtdl:property:writable;3": false
         }
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyRequiredPropertiesV3.json b/DTDL/v3/spec/Requirement-ClassPropertyRequiredPropertiesV3.json
index 63b15ac0..a4c0e795 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyRequiredPropertiesV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyRequiredPropertiesV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_xi;1",
+        "@id": "dtmi:example:psi_alpha;1",
         "@type": "Interface",
         "contents": {
-          "name": "kappa_nu",
-          "schema": "time"
+          "name": "chi_hi",
+          "schema": "double"
         }
       }
     ]
@@ -24,12 +24,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_pi;1",
+        "@id": "dtmi:example:psi_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "kappa_omicron",
-          "schema": "boolean"
+          "name": "psi_beta",
+          "schema": "duration"
         }
       }
     ]
@@ -42,11 +42,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_rho;1",
+        "@id": "dtmi:example:psi_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "schema": "date"
+          "schema": "float"
         }
       }
     ]
@@ -59,12 +59,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_sigma;1",
+        "@id": "dtmi:example:psi_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "schema": "dateTime"
+          "schema": "integer"
         }
       }
     ]
@@ -77,11 +77,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_upsilon;1",
+        "@id": "dtmi:example:psi_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Property",
-          "name": "kappa_tau"
+          "name": "psi_zeta"
         }
       }
     ]
@@ -94,12 +94,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_chi;1",
+        "@id": "dtmi:example:psi_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Property",
-          "name": "kappa_phi"
+          "name": "psi_theta"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyTypeIncludesInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassPropertyTypeIncludesInvalidDtmiV3.json
index b7a5d6b3..c2f17aff 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyTypeIncludesInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyTypeIncludesInvalidDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_delta;1",
+        "@id": "dtmi:example:omega_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "dtmi:foo//bar"
           ],
-          "name": "mu_gamma",
-          "schema": "integer"
+          "name": "omega_quan",
+          "schema": "boolean"
         }
       }
     ]
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_zeta;1",
+        "@id": "dtmi:example:omega_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,8 +36,8 @@
             "Property",
             "dtmi:foo//bar"
           ],
-          "name": "mu_epsilon",
-          "schema": "long"
+          "name": "omega_spazz",
+          "schema": "date"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyTypeIncludesMaterialV3.json b/DTDL/v3/spec/Requirement-ClassPropertyTypeIncludesMaterialV3.json
index 57c11a36..aa388f25 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyTypeIncludesMaterialV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyTypeIncludesMaterialV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_nu;1",
+        "@id": "dtmi:example:psi_hi;1",
         "@type": "Interface",
         "contents": {
-          "name": "lambda_mu",
-          "schema": "time",
+          "name": "psi_vroo",
+          "schema": "double",
           "@type": "Property"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_omicron;1",
+        "@id": "dtmi:example:omega_beta;1",
         "@type": "Interface",
         "contents": {
-          "name": "lambda_xi",
-          "schema": "boolean",
+          "name": "omega_alpha",
+          "schema": "duration",
           "@type": [
             "Property"
           ]
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_rho;1",
+        "@id": "dtmi:example:omega_delta;1",
         "@type": "Interface",
         "contents": {
-          "name": "lambda_pi",
-          "schema": "date",
+          "name": "omega_gamma",
+          "schema": "float",
           "@type": "dtmi:dtdl:class:Property;3"
         }
       }
@@ -63,11 +63,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_tau;1",
+        "@id": "dtmi:example:omega_zeta;1",
         "@type": "Interface",
         "contents": {
-          "name": "lambda_sigma",
-          "schema": "dateTime",
+          "name": "omega_epsilon",
+          "schema": "integer",
           "@type": [
             "dtmi:dtdl:class:Property;3"
           ]
@@ -83,11 +83,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_phi;1",
+        "@id": "dtmi:example:omega_theta;1",
         "@type": "Interface",
         "contents": {
-          "name": "lambda_upsilon",
-          "schema": "double",
+          "name": "omega_eta",
+          "schema": "long",
           "@type": "Something"
         }
       }
@@ -101,12 +101,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_psi;1",
+        "@id": "dtmi:example:omega_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "lambda_chi",
-          "schema": "duration",
+          "name": "omega_iota",
+          "schema": "string",
           "@type": "Something"
         }
       }
@@ -120,11 +120,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_yuzz;1",
+        "@id": "dtmi:example:omega_mu;1",
         "@type": "Interface",
         "contents": {
-          "name": "lambda_omega",
-          "schema": "float",
+          "name": "omega_lambda",
+          "schema": "time",
           "@type": [
             "Something"
           ]
@@ -140,12 +140,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_um;1",
+        "@id": "dtmi:example:omega_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "lambda_wum",
-          "schema": "integer",
+          "name": "omega_nu",
+          "schema": "boolean",
           "@type": [
             "Something"
           ]
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyTypeIncludesNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassPropertyTypeIncludesNotDtmiNorTermV3.json
index 70716e6f..f5ededdd 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyTypeIncludesNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyTypeIncludesNotDtmiNorTermV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_theta;1",
+        "@id": "dtmi:example:omega_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Property",
             "http://foo.com/bar"
           ],
-          "name": "mu_eta",
-          "schema": "string"
+          "name": "omega_zatz",
+          "schema": "dateTime"
         }
       }
     ]
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_kappa;1",
+        "@id": "dtmi:example:omega_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,8 +36,8 @@
             "Property",
             "http://foo.com/bar"
           ],
-          "name": "mu_iota",
-          "schema": "time"
+          "name": "omega_flunn",
+          "schema": "double"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassPropertyTypeStringOrArrayV3.json b/DTDL/v3/spec/Requirement-ClassPropertyTypeStringOrArrayV3.json
index c94664aa..465ea1bb 100644
--- a/DTDL/v3/spec/Requirement-ClassPropertyTypeStringOrArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassPropertyTypeStringOrArrayV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_omega;1",
+        "@id": "dtmi:example:psi_lambda;1",
         "@type": "Interface",
         "contents": {
-          "name": "kappa_psi",
-          "schema": "double",
+          "name": "psi_kappa",
+          "schema": "long",
           "@type": 626
         }
       }
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_wum;1",
+        "@id": "dtmi:example:psi_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "kappa_yuzz",
-          "schema": "duration",
+          "name": "psi_mu",
+          "schema": "string",
           "@type": 626
         }
       }
@@ -44,11 +44,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_humpf;1",
+        "@id": "dtmi:example:psi_omicron;1",
         "@type": "Interface",
         "contents": {
-          "name": "kappa_um",
-          "schema": "float",
+          "name": "psi_xi",
+          "schema": "time",
           "@type": null
         }
       }
@@ -62,12 +62,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_glikk;1",
+        "@id": "dtmi:example:psi_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "kappa_fuddle",
-          "schema": "integer",
+          "name": "psi_pi",
+          "schema": "boolean",
           "@type": null
         }
       }
@@ -81,11 +81,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_snee;1",
+        "@id": "dtmi:example:psi_tau;1",
         "@type": "Interface",
         "contents": {
-          "name": "kappa_nuh",
-          "schema": "long",
+          "name": "psi_sigma",
+          "schema": "date",
           "@type": true
         }
       }
@@ -99,12 +99,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_thnad;1",
+        "@id": "dtmi:example:psi_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "kappa_quan",
-          "schema": "string",
+          "name": "psi_upsilon",
+          "schema": "dateTime",
           "@type": true
         }
       }
@@ -118,11 +118,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_floob;1",
+        "@id": "dtmi:example:psi_psi;1",
         "@type": "Interface",
         "contents": {
-          "name": "kappa_spazz",
-          "schema": "time",
+          "name": "psi_chi",
+          "schema": "double",
           "@type": {}
         }
       }
@@ -136,12 +136,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_jogg;1",
+        "@id": "dtmi:example:psi_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "kappa_zatz",
-          "schema": "boolean",
+          "name": "psi_omega",
+          "schema": "duration",
           "@type": {}
         }
       }
@@ -155,11 +155,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_itch;1",
+        "@id": "dtmi:example:psi_um;1",
         "@type": "Interface",
         "contents": {
-          "name": "kappa_flunn",
-          "schema": "date",
+          "name": "psi_wum",
+          "schema": "float",
           "@type": [
             626
           ]
@@ -175,12 +175,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_vroo;1",
+        "@id": "dtmi:example:psi_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "kappa_yekk",
-          "schema": "dateTime",
+          "name": "psi_humpf",
+          "schema": "integer",
           "@type": [
             626
           ]
@@ -196,11 +196,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_alpha;1",
+        "@id": "dtmi:example:psi_nuh;1",
         "@type": "Interface",
         "contents": {
-          "name": "kappa_hi",
-          "schema": "double",
+          "name": "psi_glikk",
+          "schema": "long",
           "@type": [
             null
           ]
@@ -216,12 +216,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_gamma;1",
+        "@id": "dtmi:example:psi_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "lambda_beta",
-          "schema": "duration",
+          "name": "psi_snee",
+          "schema": "string",
           "@type": [
             null
           ]
@@ -237,11 +237,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_epsilon;1",
+        "@id": "dtmi:example:psi_spazz;1",
         "@type": "Interface",
         "contents": {
-          "name": "lambda_delta",
-          "schema": "float",
+          "name": "psi_thnad",
+          "schema": "time",
           "@type": [
             true
           ]
@@ -257,12 +257,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_eta;1",
+        "@id": "dtmi:example:psi_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "lambda_zeta",
-          "schema": "integer",
+          "name": "psi_floob",
+          "schema": "boolean",
           "@type": [
             true
           ]
@@ -278,11 +278,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_iota;1",
+        "@id": "dtmi:example:psi_flunn;1",
         "@type": "Interface",
         "contents": {
-          "name": "lambda_theta",
-          "schema": "long",
+          "name": "psi_jogg",
+          "schema": "date",
           "@type": [
             {}
           ]
@@ -298,12 +298,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_lambda;1",
+        "@id": "dtmi:example:psi_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "lambda_kappa",
-          "schema": "string",
+          "name": "psi_itch",
+          "schema": "dateTime",
           "@type": [
             {}
           ]
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipContextConformsV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipContextConformsV3.json
index 162fb072..6708908b 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipContextConformsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipContextConformsV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_thnad;1",
+        "@id": "dtmi:example:delta_spazz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:thnad_quan;1",
+          "@id": "dtmi:example:delta_thnad;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "thnad_snee",
+            "name": "delta_quan",
             "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_zatz;1",
+        "@id": "dtmi:example:delta_jogg;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:thnad_floob;1",
+          "@id": "dtmi:example:delta_zatz;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "thnad_spazz",
+            "name": "delta_floob",
             "@context": []
           }
         }
@@ -51,14 +51,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_itch;1",
+        "@id": "dtmi:example:delta_yekk;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:thnad_flunn;1",
+          "@id": "dtmi:example:delta_itch;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "thnad_jogg",
+            "name": "delta_flunn",
             "@context": [
               "dtmi:dtdl:extension:quantitativeTypes;1"
             ]
@@ -75,14 +75,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_hi;1",
+        "@id": "dtmi:example:epsilon_alpha;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:thnad_vroo;1",
+          "@id": "dtmi:example:delta_hi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "thnad_yekk",
+            "name": "delta_vroo",
             "@context": null
           }
         }
@@ -97,14 +97,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_gamma;1",
+        "@id": "dtmi:example:epsilon_delta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:spazz_beta;1",
+          "@id": "dtmi:example:epsilon_gamma;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "spazz_alpha",
+            "name": "epsilon_beta",
             "@context": 626
           }
         }
@@ -119,14 +119,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_zeta;1",
+        "@id": "dtmi:example:epsilon_eta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:spazz_epsilon;1",
+          "@id": "dtmi:example:epsilon_zeta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "spazz_delta",
+            "name": "epsilon_epsilon",
             "@context": true
           }
         }
@@ -141,14 +141,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_iota;1",
+        "@id": "dtmi:example:epsilon_kappa;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:spazz_theta;1",
+          "@id": "dtmi:example:epsilon_iota;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "spazz_eta",
+            "name": "epsilon_theta",
             "@context": [
               null
             ]
@@ -165,14 +165,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_mu;1",
+        "@id": "dtmi:example:epsilon_nu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:spazz_lambda;1",
+          "@id": "dtmi:example:epsilon_mu;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "spazz_kappa",
+            "name": "epsilon_lambda",
             "@context": [
               626
             ]
@@ -189,14 +189,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_omicron;1",
+        "@id": "dtmi:example:epsilon_pi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:spazz_xi;1",
+          "@id": "dtmi:example:epsilon_omicron;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "spazz_nu",
+            "name": "epsilon_xi",
             "@context": [
               true
             ]
@@ -213,15 +213,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_sigma;1",
+        "@id": "dtmi:example:epsilon_tau;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:spazz_rho;1",
+          "@id": "dtmi:example:epsilon_sigma;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "spazz_pi",
-            "@context": {}
+            "name": "epsilon_rho",
+            "@context": "dtmi:dtdl:extension:quantitativeTypes"
           }
         }
       }
@@ -235,17 +235,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_phi;1",
+        "@id": "dtmi:example:epsilon_chi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:spazz_upsilon;1",
+          "@id": "dtmi:example:epsilon_phi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "spazz_tau",
-            "@context": [
-              {}
-            ]
+            "name": "epsilon_upsilon",
+            "@context": "http://dtdl/extension/quantitativeTypes/1"
           }
         }
       }
@@ -259,15 +257,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_omega;1",
+        "@id": "dtmi:example:epsilon_yuzz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:spazz_psi;1",
+          "@id": "dtmi:example:epsilon_omega;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "spazz_chi",
-            "@context": "dtmi:dtdl:extension:quantitativeTypes"
+            "name": "epsilon_psi",
+            "@context": "quantitativeTypes;1"
           }
         }
       }
@@ -281,15 +279,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_um;1",
+        "@id": "dtmi:example:epsilon_humpf;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:spazz_wum;1",
+          "@id": "dtmi:example:epsilon_um;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "spazz_yuzz",
-            "@context": "http://dtdl/extension/quantitativeTypes/1"
+            "name": "epsilon_wum",
+            "@context": {}
           }
         }
       }
@@ -303,15 +301,67 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_glikk;1",
+        "@id": "dtmi:example:epsilon_nuh;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:spazz_fuddle;1",
+          "@id": "dtmi:example:epsilon_glikk;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "spazz_humpf",
-            "@context": "quantitativeTypes;1"
+            "name": "epsilon_fuddle",
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:epsilon_thnad;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:epsilon_quan;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "epsilon_snee",
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:epsilon_zatz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:epsilon_floob;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "epsilon_spazz",
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipIdDuplicateV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipIdDuplicateV3.json
index 291c1027..928fa727 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipIdDuplicateV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipIdDuplicateV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_itch;1",
+        "@id": "dtmi:example:iota_delta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:jogg_itch;1",
+          "@id": "dtmi:example:iota_delta;1",
           "@type": "Interface",
           "contents": {
-            "@id": "dtmi:example:jogg_itch;1",
+            "@id": "dtmi:example:iota_delta;1",
             "@type": "Relationship",
-            "name": "jogg_yekk"
+            "name": "iota_epsilon"
           }
         }
       }
@@ -29,16 +29,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_vroo;1",
+        "@id": "dtmi:example:iota_zeta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:jogg_vroo;1",
+          "@id": "dtmi:example:iota_zeta;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "@id": "dtmi:example:jogg_vroo;1",
+            "@id": "dtmi:example:iota_zeta;1",
             "@type": "Relationship",
-            "name": "jogg_hi"
+            "name": "iota_eta"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipIdIsDtmiV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipIdIsDtmiV3.json
index 0400b841..10f5ef28 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipIdIsDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipIdIsDtmiV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_snee;1",
+        "@id": "dtmi:example:epsilon_flunn;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;7",
           "@type": "Relationship",
-          "name": "spazz_nuh"
+          "name": "epsilon_jogg"
         }
       }
     ]
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_thnad;1",
+        "@id": "dtmi:example:epsilon_yekk;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;108675309",
           "@type": "Relationship",
-          "name": "spazz_quan"
+          "name": "epsilon_itch"
         }
       }
     ]
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_floob;1",
+        "@id": "dtmi:example:epsilon_hi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;999999999",
           "@type": "Relationship",
-          "name": "spazz_spazz"
+          "name": "epsilon_vroo"
         }
       }
     ]
@@ -61,12 +61,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_jogg;1",
+        "@id": "dtmi:example:zeta_beta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo;1",
           "@type": "Relationship",
-          "name": "spazz_zatz"
+          "name": "zeta_alpha"
         }
       }
     ]
@@ -79,12 +79,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_itch;1",
+        "@id": "dtmi:example:zeta_delta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar",
           "@type": "Relationship",
-          "name": "spazz_flunn"
+          "name": "zeta_gamma"
         }
       }
     ]
@@ -97,12 +97,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:spazz_vroo;1",
+        "@id": "dtmi:example:zeta_zeta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.14",
           "@type": "Relationship",
-          "name": "spazz_yekk"
+          "name": "zeta_epsilon"
         }
       }
     ]
@@ -115,12 +115,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_alpha;1",
+        "@id": "dtmi:example:zeta_theta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.141592",
           "@type": "Relationship",
-          "name": "spazz_hi"
+          "name": "zeta_eta"
         }
       }
     ]
@@ -133,12 +133,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_gamma;1",
+        "@id": "dtmi:example:zeta_kappa;1",
         "@type": "Interface",
         "contents": {
           "@id": null,
           "@type": "Relationship",
-          "name": "floob_beta"
+          "name": "zeta_iota"
         }
       }
     ]
@@ -151,13 +151,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_epsilon;1",
+        "@id": "dtmi:example:zeta_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": null,
           "@type": "Relationship",
-          "name": "floob_delta"
+          "name": "zeta_lambda"
         }
       }
     ]
@@ -170,12 +170,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_eta;1",
+        "@id": "dtmi:example:zeta_xi;1",
         "@type": "Interface",
         "contents": {
           "@id": 626,
           "@type": "Relationship",
-          "name": "floob_zeta"
+          "name": "zeta_nu"
         }
       }
     ]
@@ -188,13 +188,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_iota;1",
+        "@id": "dtmi:example:zeta_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": 626,
           "@type": "Relationship",
-          "name": "floob_theta"
+          "name": "zeta_omicron"
         }
       }
     ]
@@ -207,12 +207,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_lambda;1",
+        "@id": "dtmi:example:zeta_sigma;1",
         "@type": "Interface",
         "contents": {
           "@id": true,
           "@type": "Relationship",
-          "name": "floob_kappa"
+          "name": "zeta_rho"
         }
       }
     ]
@@ -225,13 +225,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_nu;1",
+        "@id": "dtmi:example:zeta_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": true,
           "@type": "Relationship",
-          "name": "floob_mu"
+          "name": "zeta_tau"
         }
       }
     ]
@@ -244,14 +244,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_omicron;1",
+        "@id": "dtmi:example:zeta_chi;1",
         "@type": "Interface",
         "contents": {
           "@id": {
             "@value": "dtmi:apparently:valid:identifier;3"
           },
           "@type": "Relationship",
-          "name": "floob_xi"
+          "name": "zeta_phi"
         }
       }
     ]
@@ -264,7 +264,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_rho;1",
+        "@id": "dtmi:example:zeta_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -272,7 +272,7 @@
             "@value": "dtmi:apparently:valid:identifier;3"
           },
           "@type": "Relationship",
-          "name": "floob_pi"
+          "name": "zeta_psi"
         }
       }
     ]
@@ -285,12 +285,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_tau;1",
+        "@id": "dtmi:example:zeta_wum;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0",
           "@type": "Relationship",
-          "name": "floob_sigma"
+          "name": "zeta_yuzz"
         }
       }
     ]
@@ -303,13 +303,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_phi;1",
+        "@id": "dtmi:example:zeta_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0",
           "@type": "Relationship",
-          "name": "floob_upsilon"
+          "name": "zeta_um"
         }
       }
     ]
@@ -322,12 +322,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_psi;1",
+        "@id": "dtmi:example:zeta_glikk;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Relationship",
-          "name": "floob_chi"
+          "name": "zeta_fuddle"
         }
       }
     ]
@@ -340,13 +340,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_yuzz;1",
+        "@id": "dtmi:example:zeta_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Relationship",
-          "name": "floob_omega"
+          "name": "zeta_nuh"
         }
       }
     ]
@@ -359,12 +359,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_um;1",
+        "@id": "dtmi:example:zeta_thnad;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Relationship",
-          "name": "floob_wum"
+          "name": "zeta_quan"
         }
       }
     ]
@@ -377,13 +377,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_fuddle;1",
+        "@id": "dtmi:example:zeta_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Relationship",
-          "name": "floob_humpf"
+          "name": "zeta_spazz"
         }
       }
     ]
@@ -396,12 +396,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_nuh;1",
+        "@id": "dtmi:example:zeta_jogg;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;1a",
           "@type": "Relationship",
-          "name": "floob_glikk"
+          "name": "zeta_zatz"
         }
       }
     ]
@@ -414,13 +414,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_quan;1",
+        "@id": "dtmi:example:zeta_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1a",
           "@type": "Relationship",
-          "name": "floob_snee"
+          "name": "zeta_flunn"
         }
       }
     ]
@@ -433,12 +433,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_spazz;1",
+        "@id": "dtmi:example:zeta_vroo;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Relationship",
-          "name": "floob_thnad"
+          "name": "zeta_yekk"
         }
       }
     ]
@@ -451,13 +451,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_zatz;1",
+        "@id": "dtmi:example:eta_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Relationship",
-          "name": "floob_floob"
+          "name": "zeta_hi"
         }
       }
     ]
@@ -470,12 +470,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_flunn;1",
+        "@id": "dtmi:example:eta_gamma;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Relationship",
-          "name": "floob_jogg"
+          "name": "eta_beta"
         }
       }
     ]
@@ -488,13 +488,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_yekk;1",
+        "@id": "dtmi:example:eta_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Relationship",
-          "name": "floob_itch"
+          "name": "eta_delta"
         }
       }
     ]
@@ -507,12 +507,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:floob_hi;1",
+        "@id": "dtmi:example:eta_eta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Relationship",
-          "name": "floob_vroo"
+          "name": "eta_zeta"
         }
       }
     ]
@@ -525,13 +525,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_beta;1",
+        "@id": "dtmi:example:eta_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Relationship",
-          "name": "zatz_alpha"
+          "name": "eta_theta"
         }
       }
     ]
@@ -544,12 +544,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_delta;1",
+        "@id": "dtmi:example:eta_lambda;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Relationship",
-          "name": "zatz_gamma"
+          "name": "eta_kappa"
         }
       }
     ]
@@ -562,13 +562,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_zeta;1",
+        "@id": "dtmi:example:eta_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Relationship",
-          "name": "zatz_epsilon"
+          "name": "eta_mu"
         }
       }
     ]
@@ -581,12 +581,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_theta;1",
+        "@id": "dtmi:example:eta_omicron;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;01",
           "@type": "Relationship",
-          "name": "zatz_eta"
+          "name": "eta_xi"
         }
       }
     ]
@@ -599,13 +599,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_kappa;1",
+        "@id": "dtmi:example:eta_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;01",
           "@type": "Relationship",
-          "name": "zatz_iota"
+          "name": "eta_pi"
         }
       }
     ]
@@ -618,12 +618,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_mu;1",
+        "@id": "dtmi:example:eta_tau;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;",
           "@type": "Relationship",
-          "name": "zatz_lambda"
+          "name": "eta_sigma"
         }
       }
     ]
@@ -636,13 +636,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_xi;1",
+        "@id": "dtmi:example:eta_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;",
           "@type": "Relationship",
-          "name": "zatz_nu"
+          "name": "eta_upsilon"
         }
       }
     ]
@@ -655,12 +655,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_pi;1",
+        "@id": "dtmi:example:eta_psi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Relationship",
-          "name": "zatz_omicron"
+          "name": "eta_chi"
         }
       }
     ]
@@ -673,13 +673,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_sigma;1",
+        "@id": "dtmi:example:eta_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Relationship",
-          "name": "zatz_rho"
+          "name": "eta_omega"
         }
       }
     ]
@@ -692,12 +692,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_upsilon;1",
+        "@id": "dtmi:example:eta_um;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Relationship",
-          "name": "zatz_tau"
+          "name": "eta_wum"
         }
       }
     ]
@@ -710,13 +710,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_chi;1",
+        "@id": "dtmi:example:eta_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Relationship",
-          "name": "zatz_phi"
+          "name": "eta_humpf"
         }
       }
     ]
@@ -729,12 +729,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_omega;1",
+        "@id": "dtmi:example:eta_nuh;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:1seg;1",
           "@type": "Relationship",
-          "name": "zatz_psi"
+          "name": "eta_glikk"
         }
       }
     ]
@@ -747,13 +747,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_wum;1",
+        "@id": "dtmi:example:eta_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:1seg;1",
           "@type": "Relationship",
-          "name": "zatz_yuzz"
+          "name": "eta_snee"
         }
       }
     ]
@@ -766,12 +766,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_humpf;1",
+        "@id": "dtmi:example:eta_spazz;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Relationship",
-          "name": "zatz_um"
+          "name": "eta_thnad"
         }
       }
     ]
@@ -784,13 +784,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_glikk;1",
+        "@id": "dtmi:example:eta_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Relationship",
-          "name": "zatz_fuddle"
+          "name": "eta_floob"
         }
       }
     ]
@@ -803,12 +803,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_snee;1",
+        "@id": "dtmi:example:eta_flunn;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo::bar;1",
           "@type": "Relationship",
-          "name": "zatz_nuh"
+          "name": "eta_jogg"
         }
       }
     ]
@@ -821,13 +821,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_thnad;1",
+        "@id": "dtmi:example:eta_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo::bar;1",
           "@type": "Relationship",
-          "name": "zatz_quan"
+          "name": "eta_itch"
         }
       }
     ]
@@ -840,12 +840,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_floob;1",
+        "@id": "dtmi:example:eta_hi;1",
         "@type": "Interface",
         "contents": {
           "@id": "urn:foo:bar:1",
           "@type": "Relationship",
-          "name": "zatz_spazz"
+          "name": "eta_vroo"
         }
       }
     ]
@@ -858,13 +858,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_jogg;1",
+        "@id": "dtmi:example:theta_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "urn:foo:bar:1",
           "@type": "Relationship",
-          "name": "zatz_zatz"
+          "name": "theta_alpha"
         }
       }
     ]
@@ -877,12 +877,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_itch;1",
+        "@id": "dtmi:example:theta_delta;1",
         "@type": "Interface",
         "contents": {
           "@id": "http://foo/bar/baz",
           "@type": "Relationship",
-          "name": "zatz_flunn"
+          "name": "theta_gamma"
         }
       }
     ]
@@ -895,13 +895,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zatz_vroo;1",
+        "@id": "dtmi:example:theta_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "http://foo/bar/baz",
           "@type": "Relationship",
-          "name": "zatz_yekk"
+          "name": "theta_epsilon"
         }
       }
     ]
@@ -914,12 +914,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_alpha;1",
+        "@id": "dtmi:example:theta_theta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:;1",
           "@type": "Relationship",
-          "name": "zatz_hi"
+          "name": "theta_eta"
         }
       }
     ]
@@ -932,13 +932,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_gamma;1",
+        "@id": "dtmi:example:theta_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:;1",
           "@type": "Relationship",
-          "name": "jogg_beta"
+          "name": "theta_iota"
         }
       }
     ]
@@ -951,12 +951,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_epsilon;1",
+        "@id": "dtmi:example:theta_mu;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:dtdl:example;1",
           "@type": "Relationship",
-          "name": "jogg_delta"
+          "name": "theta_lambda"
         }
       }
     ]
@@ -969,13 +969,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_eta;1",
+        "@id": "dtmi:example:theta_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:dtdl:example;1",
           "@type": "Relationship",
-          "name": "jogg_zeta"
+          "name": "theta_nu"
         }
       }
     ]
@@ -988,12 +988,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_iota;1",
+        "@id": "dtmi:example:theta_pi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:standard:example;1",
           "@type": "Relationship",
-          "name": "jogg_theta"
+          "name": "theta_omicron"
         }
       }
     ]
@@ -1006,13 +1006,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_lambda;1",
+        "@id": "dtmi:example:theta_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:standard:example;1",
           "@type": "Relationship",
-          "name": "jogg_kappa"
+          "name": "theta_rho"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipIdNotArrayV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipIdNotArrayV3.json
index 0f254acd..f856d1dc 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipIdNotArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipIdNotArrayV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_nu;1",
+        "@id": "dtmi:example:theta_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;7"
           ],
           "@type": "Relationship",
-          "name": "jogg_mu"
+          "name": "theta_tau"
         }
       }
     ]
@@ -27,7 +27,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_omicron;1",
+        "@id": "dtmi:example:theta_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -35,7 +35,7 @@
             "dtmi:foo:bar;7"
           ],
           "@type": "Relationship",
-          "name": "jogg_xi"
+          "name": "theta_phi"
         }
       }
     ]
@@ -48,14 +48,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_rho;1",
+        "@id": "dtmi:example:theta_omega;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;108675309"
           ],
           "@type": "Relationship",
-          "name": "jogg_pi"
+          "name": "theta_psi"
         }
       }
     ]
@@ -68,7 +68,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_tau;1",
+        "@id": "dtmi:example:theta_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -76,7 +76,7 @@
             "dtmi:foo:bar;108675309"
           ],
           "@type": "Relationship",
-          "name": "jogg_sigma"
+          "name": "theta_yuzz"
         }
       }
     ]
@@ -89,14 +89,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_phi;1",
+        "@id": "dtmi:example:theta_humpf;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;999999999"
           ],
           "@type": "Relationship",
-          "name": "jogg_upsilon"
+          "name": "theta_um"
         }
       }
     ]
@@ -109,7 +109,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_psi;1",
+        "@id": "dtmi:example:theta_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -117,7 +117,7 @@
             "dtmi:foo:bar;999999999"
           ],
           "@type": "Relationship",
-          "name": "jogg_chi"
+          "name": "theta_fuddle"
         }
       }
     ]
@@ -130,14 +130,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_yuzz;1",
+        "@id": "dtmi:example:theta_snee;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo;1"
           ],
           "@type": "Relationship",
-          "name": "jogg_omega"
+          "name": "theta_nuh"
         }
       }
     ]
@@ -150,7 +150,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_um;1",
+        "@id": "dtmi:example:theta_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -158,7 +158,7 @@
             "dtmi:foo;1"
           ],
           "@type": "Relationship",
-          "name": "jogg_wum"
+          "name": "theta_quan"
         }
       }
     ]
@@ -171,14 +171,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_fuddle;1",
+        "@id": "dtmi:example:theta_floob;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar"
           ],
           "@type": "Relationship",
-          "name": "jogg_humpf"
+          "name": "theta_spazz"
         }
       }
     ]
@@ -191,7 +191,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_nuh;1",
+        "@id": "dtmi:example:theta_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -199,7 +199,7 @@
             "dtmi:foo:bar"
           ],
           "@type": "Relationship",
-          "name": "jogg_glikk"
+          "name": "theta_zatz"
         }
       }
     ]
@@ -212,14 +212,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_quan;1",
+        "@id": "dtmi:example:theta_itch;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;3.14"
           ],
           "@type": "Relationship",
-          "name": "jogg_snee"
+          "name": "theta_flunn"
         }
       }
     ]
@@ -232,7 +232,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_spazz;1",
+        "@id": "dtmi:example:theta_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -240,7 +240,7 @@
             "dtmi:foo:bar;3.14"
           ],
           "@type": "Relationship",
-          "name": "jogg_thnad"
+          "name": "theta_yekk"
         }
       }
     ]
@@ -253,14 +253,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_zatz;1",
+        "@id": "dtmi:example:iota_alpha;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;3.141592"
           ],
           "@type": "Relationship",
-          "name": "jogg_floob"
+          "name": "theta_hi"
         }
       }
     ]
@@ -273,7 +273,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:jogg_flunn;1",
+        "@id": "dtmi:example:iota_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -281,7 +281,7 @@
             "dtmi:foo:bar;3.141592"
           ],
           "@type": "Relationship",
-          "name": "jogg_jogg"
+          "name": "iota_beta"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipInvalidKeywordsV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipInvalidKeywordsV3.json
index a5b3d9fb..7839ef93 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipInvalidKeywordsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipInvalidKeywordsV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_xi;1",
+        "@id": "dtmi:example:yuzz_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "mu_nu",
+          "name": "yuzz_glikk",
           "@graph": {}
         }
       }
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_pi;1",
+        "@id": "dtmi:example:yuzz_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "mu_omicron",
+          "name": "yuzz_snee",
           "@graph": {}
         }
       }
@@ -44,11 +44,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_sigma;1",
+        "@id": "dtmi:example:yuzz_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "mu_rho",
+          "name": "yuzz_thnad",
           "@value": 626
         }
       }
@@ -62,12 +62,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_upsilon;1",
+        "@id": "dtmi:example:yuzz_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "mu_tau",
+          "name": "yuzz_floob",
           "@value": 626
         }
       }
@@ -81,11 +81,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_chi;1",
+        "@id": "dtmi:example:yuzz_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "mu_phi",
+          "name": "yuzz_jogg",
           "@language": "en"
         }
       }
@@ -99,12 +99,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_omega;1",
+        "@id": "dtmi:example:yuzz_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "mu_psi",
+          "name": "yuzz_itch",
           "@language": "en"
         }
       }
@@ -118,11 +118,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_wum;1",
+        "@id": "dtmi:example:yuzz_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "mu_yuzz",
+          "name": "yuzz_vroo",
           "@foobar": true
         }
       }
@@ -136,12 +136,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_humpf;1",
+        "@id": "dtmi:example:wum_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "mu_um",
+          "name": "wum_alpha",
           "@foobar": true
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyCommentStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyCommentStringLengthV3.json
index 3b443b92..02e6df63 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyCommentStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyCommentStringLengthV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_alpha;1",
+        "@id": "dtmi:example:kappa_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "flunn_hi",
+          "name": "kappa_eta",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_gamma;1",
+        "@id": "dtmi:example:kappa_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "itch_beta",
+          "name": "kappa_iota",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_epsilon;1",
+        "@id": "dtmi:example:kappa_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "itch_delta",
+          "name": "kappa_lambda",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyCommentStringV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyCommentStringV3.json
index e6d200a6..86197e72 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyCommentStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyCommentStringV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_beta;1",
+        "@id": "dtmi:example:iota_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "flunn_alpha",
+          "name": "iota_theta",
           "comment": "hello"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_delta;1",
+        "@id": "dtmi:example:iota_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "flunn_gamma",
+          "name": "iota_kappa",
           "comment": [
             "hello"
           ]
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_zeta;1",
+        "@id": "dtmi:example:iota_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "flunn_epsilon",
+          "name": "iota_mu",
           "comment": {
             "@value": "hello",
             "@type": "xsd:string"
@@ -66,11 +66,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_theta;1",
+        "@id": "dtmi:example:iota_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "flunn_eta",
+          "name": "iota_xi",
           "comment": [
             {
               "@value": "hello",
@@ -89,11 +89,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_kappa;1",
+        "@id": "dtmi:example:iota_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "flunn_iota",
+          "name": "iota_pi",
           "comment": []
         }
       }
@@ -107,11 +107,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_mu;1",
+        "@id": "dtmi:example:iota_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "flunn_lambda",
+          "name": "iota_sigma",
           "comment": null
         }
       }
@@ -125,12 +125,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_xi;1",
+        "@id": "dtmi:example:iota_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "flunn_nu",
+          "name": "iota_upsilon",
           "comment": null
         }
       }
@@ -144,11 +144,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_pi;1",
+        "@id": "dtmi:example:iota_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "flunn_omicron",
+          "name": "iota_chi",
           "comment": true
         }
       }
@@ -162,12 +162,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_sigma;1",
+        "@id": "dtmi:example:iota_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "flunn_rho",
+          "name": "iota_omega",
           "comment": true
         }
       }
@@ -181,11 +181,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_upsilon;1",
+        "@id": "dtmi:example:iota_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "flunn_tau",
+          "name": "iota_wum",
           "comment": 626
         }
       }
@@ -199,12 +199,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_chi;1",
+        "@id": "dtmi:example:iota_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "flunn_phi",
+          "name": "iota_humpf",
           "comment": 626
         }
       }
@@ -218,11 +218,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_omega;1",
+        "@id": "dtmi:example:iota_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "flunn_psi",
+          "name": "iota_glikk",
           "comment": [
             null
           ]
@@ -238,12 +238,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_wum;1",
+        "@id": "dtmi:example:iota_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "flunn_yuzz",
+          "name": "iota_snee",
           "comment": [
             null
           ]
@@ -259,11 +259,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_humpf;1",
+        "@id": "dtmi:example:iota_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "flunn_um",
+          "name": "iota_thnad",
           "comment": [
             true
           ]
@@ -279,12 +279,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_glikk;1",
+        "@id": "dtmi:example:iota_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "flunn_fuddle",
+          "name": "iota_floob",
           "comment": [
             true
           ]
@@ -300,11 +300,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_snee;1",
+        "@id": "dtmi:example:iota_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "flunn_nuh",
+          "name": "iota_jogg",
           "comment": [
             626
           ]
@@ -320,12 +320,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_thnad;1",
+        "@id": "dtmi:example:iota_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "flunn_quan",
+          "name": "iota_itch",
           "comment": [
             626
           ]
@@ -341,11 +341,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_floob;1",
+        "@id": "dtmi:example:iota_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "flunn_spazz",
+          "name": "iota_vroo",
           "comment": {}
         }
       }
@@ -359,12 +359,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_jogg;1",
+        "@id": "dtmi:example:kappa_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "flunn_zatz",
+          "name": "kappa_alpha",
           "comment": {}
         }
       }
@@ -378,11 +378,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_itch;1",
+        "@id": "dtmi:example:kappa_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "flunn_flunn",
+          "name": "kappa_gamma",
           "comment": [
             {}
           ]
@@ -398,12 +398,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:flunn_vroo;1",
+        "@id": "dtmi:example:kappa_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "flunn_yekk",
+          "name": "kappa_epsilon",
           "comment": [
             {}
           ]
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyCommentTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyCommentTermAndDtmiV3.json
index a0161860..3c60f7b5 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyCommentTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyCommentTermAndDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_sigma;1",
+        "@id": "dtmi:example:kappa_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "comment": "itch_omicron",
-          "dtmi:dtdl:property:comment;3": "itch_pi",
-          "name": "itch_rho"
+          "comment": "kappa_chi",
+          "dtmi:dtdl:property:comment;3": "kappa_psi",
+          "name": "kappa_omega"
         }
       }
     ]
@@ -26,14 +26,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_chi;1",
+        "@id": "dtmi:example:kappa_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "comment": "itch_tau",
-          "dtmi:dtdl:property:comment;3": "itch_upsilon",
-          "name": "itch_phi"
+          "comment": "kappa_wum",
+          "dtmi:dtdl:property:comment;3": "kappa_um",
+          "name": "kappa_humpf"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyDescriptionLangStringV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyDescriptionLangStringV3.json
index 5fe49283..b220652f 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyDescriptionLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyDescriptionLangStringV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_omega;1",
+        "@id": "dtmi:example:kappa_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "itch_psi",
+          "name": "kappa_glikk",
           "description": "hello"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_wum;1",
+        "@id": "dtmi:example:kappa_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "itch_yuzz",
+          "name": "kappa_snee",
           "description": [
             "hello"
           ]
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_humpf;1",
+        "@id": "dtmi:example:kappa_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "itch_um",
+          "name": "kappa_thnad",
           "description": {
             "en": "hello"
           }
@@ -65,11 +65,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_glikk;1",
+        "@id": "dtmi:example:kappa_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "itch_fuddle",
+          "name": "kappa_floob",
           "description": [
             {
               "@value": "hello",
@@ -88,11 +88,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_snee;1",
+        "@id": "dtmi:example:kappa_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "itch_nuh",
+          "name": "kappa_jogg",
           "description": {}
         }
       }
@@ -106,11 +106,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_thnad;1",
+        "@id": "dtmi:example:kappa_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "itch_quan",
+          "name": "kappa_itch",
           "description": []
         }
       }
@@ -124,11 +124,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_floob;1",
+        "@id": "dtmi:example:kappa_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "itch_spazz",
+          "name": "kappa_vroo",
           "description": null
         }
       }
@@ -142,12 +142,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_jogg;1",
+        "@id": "dtmi:example:lambda_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "itch_zatz",
+          "name": "lambda_alpha",
           "description": null
         }
       }
@@ -161,11 +161,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_itch;1",
+        "@id": "dtmi:example:lambda_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "itch_flunn",
+          "name": "lambda_gamma",
           "description": true
         }
       }
@@ -179,12 +179,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:itch_vroo;1",
+        "@id": "dtmi:example:lambda_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "itch_yekk",
+          "name": "lambda_epsilon",
           "description": true
         }
       }
@@ -198,11 +198,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_alpha;1",
+        "@id": "dtmi:example:lambda_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "itch_hi",
+          "name": "lambda_eta",
           "description": 626
         }
       }
@@ -216,12 +216,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_gamma;1",
+        "@id": "dtmi:example:lambda_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "yekk_beta",
+          "name": "lambda_iota",
           "description": 626
         }
       }
@@ -235,11 +235,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_epsilon;1",
+        "@id": "dtmi:example:lambda_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "yekk_delta",
+          "name": "lambda_lambda",
           "description": [
             null
           ]
@@ -255,12 +255,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_eta;1",
+        "@id": "dtmi:example:lambda_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "yekk_zeta",
+          "name": "lambda_nu",
           "description": [
             null
           ]
@@ -276,11 +276,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_iota;1",
+        "@id": "dtmi:example:lambda_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "yekk_theta",
+          "name": "lambda_omicron",
           "description": [
             true
           ]
@@ -296,12 +296,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_lambda;1",
+        "@id": "dtmi:example:lambda_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "yekk_kappa",
+          "name": "lambda_rho",
           "description": [
             true
           ]
@@ -317,11 +317,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_nu;1",
+        "@id": "dtmi:example:lambda_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "yekk_mu",
+          "name": "lambda_tau",
           "description": [
             626
           ]
@@ -337,12 +337,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_omicron;1",
+        "@id": "dtmi:example:lambda_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "yekk_xi",
+          "name": "lambda_phi",
           "description": [
             626
           ]
@@ -358,11 +358,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_rho;1",
+        "@id": "dtmi:example:lambda_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "yekk_pi",
+          "name": "lambda_psi",
           "description": [
             {}
           ]
@@ -378,12 +378,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_tau;1",
+        "@id": "dtmi:example:lambda_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "yekk_sigma",
+          "name": "lambda_yuzz",
           "description": [
             {}
           ]
@@ -399,11 +399,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_phi;1",
+        "@id": "dtmi:example:lambda_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "yekk_upsilon",
+          "name": "lambda_um",
           "description": {
             "@value": "hello",
             "@language": "en"
@@ -420,12 +420,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_psi;1",
+        "@id": "dtmi:example:lambda_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "yekk_chi",
+          "name": "lambda_fuddle",
           "description": {
             "@value": "hello",
             "@language": "en"
@@ -442,11 +442,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_yuzz;1",
+        "@id": "dtmi:example:lambda_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "yekk_omega",
+          "name": "lambda_nuh",
           "description": [
             {
               "en": "hello"
@@ -464,12 +464,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_um;1",
+        "@id": "dtmi:example:lambda_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "yekk_wum",
+          "name": "lambda_quan",
           "description": [
             {
               "en": "hello"
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyDescriptionStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyDescriptionStringLengthV3.json
index dfdd778c..5f638547 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyDescriptionStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyDescriptionStringLengthV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_fuddle;1",
+        "@id": "dtmi:example:lambda_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "yekk_humpf",
+          "name": "lambda_spazz",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_nuh;1",
+        "@id": "dtmi:example:lambda_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "yekk_glikk",
+          "name": "lambda_zatz",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yekk_quan;1",
+        "@id": "dtmi:example:lambda_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "yekk_snee",
+          "name": "lambda_flunn",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyDescriptionTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyDescriptionTermAndDtmiV3.json
index 0ea82346..c5f0fa1d 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyDescriptionTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyDescriptionTermAndDtmiV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_gamma;1",
+        "@id": "dtmi:example:mu_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "description": [
-            "yekk_hi"
+            "mu_eta"
           ],
           "dtmi:dtdl:property:description;3": [
-            "vroo_alpha"
+            "mu_theta"
           ],
-          "name": "vroo_beta"
+          "name": "mu_iota"
         }
       }
     ]
@@ -30,18 +30,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_eta;1",
+        "@id": "dtmi:example:mu_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
           "description": [
-            "vroo_delta"
+            "mu_lambda"
           ],
           "dtmi:dtdl:property:description;3": [
-            "vroo_epsilon"
+            "mu_mu"
           ],
-          "name": "vroo_zeta"
+          "name": "mu_nu"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyDisplayNameLangStringV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyDisplayNameLangStringV3.json
index 49262621..35ae8f42 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyDisplayNameLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyDisplayNameLangStringV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_iota;1",
+        "@id": "dtmi:example:mu_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "vroo_theta",
+          "name": "mu_omicron",
           "displayName": "hello"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_lambda;1",
+        "@id": "dtmi:example:mu_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "vroo_kappa",
+          "name": "mu_rho",
           "displayName": [
             "hello"
           ]
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_nu;1",
+        "@id": "dtmi:example:mu_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "vroo_mu",
+          "name": "mu_tau",
           "displayName": {
             "en": "hello"
           }
@@ -65,11 +65,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_omicron;1",
+        "@id": "dtmi:example:mu_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "vroo_xi",
+          "name": "mu_phi",
           "displayName": [
             {
               "@value": "hello",
@@ -88,11 +88,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_rho;1",
+        "@id": "dtmi:example:mu_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "vroo_pi",
+          "name": "mu_psi",
           "displayName": {}
         }
       }
@@ -106,11 +106,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_tau;1",
+        "@id": "dtmi:example:mu_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "vroo_sigma",
+          "name": "mu_yuzz",
           "displayName": []
         }
       }
@@ -124,11 +124,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_phi;1",
+        "@id": "dtmi:example:mu_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "vroo_upsilon",
+          "name": "mu_um",
           "displayName": null
         }
       }
@@ -142,12 +142,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_psi;1",
+        "@id": "dtmi:example:mu_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "vroo_chi",
+          "name": "mu_fuddle",
           "displayName": null
         }
       }
@@ -161,11 +161,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_yuzz;1",
+        "@id": "dtmi:example:mu_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "vroo_omega",
+          "name": "mu_nuh",
           "displayName": true
         }
       }
@@ -179,12 +179,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_um;1",
+        "@id": "dtmi:example:mu_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "vroo_wum",
+          "name": "mu_quan",
           "displayName": true
         }
       }
@@ -198,11 +198,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_fuddle;1",
+        "@id": "dtmi:example:mu_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "vroo_humpf",
+          "name": "mu_spazz",
           "displayName": 626
         }
       }
@@ -216,12 +216,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_nuh;1",
+        "@id": "dtmi:example:mu_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "vroo_glikk",
+          "name": "mu_zatz",
           "displayName": 626
         }
       }
@@ -235,11 +235,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_quan;1",
+        "@id": "dtmi:example:mu_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "vroo_snee",
+          "name": "mu_flunn",
           "displayName": [
             null
           ]
@@ -255,12 +255,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_spazz;1",
+        "@id": "dtmi:example:mu_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "vroo_thnad",
+          "name": "mu_yekk",
           "displayName": [
             null
           ]
@@ -276,11 +276,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_zatz;1",
+        "@id": "dtmi:example:nu_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "vroo_floob",
+          "name": "mu_hi",
           "displayName": [
             true
           ]
@@ -296,12 +296,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_flunn;1",
+        "@id": "dtmi:example:nu_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "vroo_jogg",
+          "name": "nu_beta",
           "displayName": [
             true
           ]
@@ -317,11 +317,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_yekk;1",
+        "@id": "dtmi:example:nu_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "vroo_itch",
+          "name": "nu_delta",
           "displayName": [
             626
           ]
@@ -337,12 +337,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:vroo_hi;1",
+        "@id": "dtmi:example:nu_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "vroo_vroo",
+          "name": "nu_zeta",
           "displayName": [
             626
           ]
@@ -358,11 +358,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_beta;1",
+        "@id": "dtmi:example:nu_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "hi_alpha",
+          "name": "nu_theta",
           "displayName": [
             {}
           ]
@@ -378,12 +378,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_delta;1",
+        "@id": "dtmi:example:nu_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "hi_gamma",
+          "name": "nu_kappa",
           "displayName": [
             {}
           ]
@@ -399,11 +399,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_zeta;1",
+        "@id": "dtmi:example:nu_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "hi_epsilon",
+          "name": "nu_mu",
           "displayName": {
             "@value": "hello",
             "@language": "en"
@@ -420,12 +420,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_theta;1",
+        "@id": "dtmi:example:nu_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "hi_eta",
+          "name": "nu_xi",
           "displayName": {
             "@value": "hello",
             "@language": "en"
@@ -442,11 +442,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_kappa;1",
+        "@id": "dtmi:example:nu_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "hi_iota",
+          "name": "nu_pi",
           "displayName": [
             {
               "en": "hello"
@@ -464,12 +464,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_mu;1",
+        "@id": "dtmi:example:nu_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "hi_lambda",
+          "name": "nu_sigma",
           "displayName": [
             {
               "en": "hello"
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyDisplayNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyDisplayNameStringLengthV3.json
index 5e4d4cdc..a723d986 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyDisplayNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyDisplayNameStringLengthV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_xi;1",
+        "@id": "dtmi:example:nu_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "hi_nu",
+          "name": "nu_upsilon",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_pi;1",
+        "@id": "dtmi:example:nu_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "hi_omicron",
+          "name": "nu_chi",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_sigma;1",
+        "@id": "dtmi:example:nu_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "hi_rho",
+          "name": "nu_omega",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyDisplayNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyDisplayNameTermAndDtmiV3.json
index ec5328e6..553e1147 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyDisplayNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyDisplayNameTermAndDtmiV3.json
@@ -7,17 +7,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_nuh;1",
+        "@id": "dtmi:example:nu_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "displayName": [
-            "hi_humpf"
+            "nu_spazz"
           ],
           "dtmi:dtdl:property:displayName;3": [
-            "hi_fuddle"
+            "nu_floob"
           ],
-          "name": "hi_glikk"
+          "name": "nu_zatz"
         }
       }
     ]
@@ -30,18 +30,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_spazz;1",
+        "@id": "dtmi:example:nu_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
           "displayName": [
-            "hi_snee"
+            "nu_flunn"
           ],
           "dtmi:dtdl:property:displayName;3": [
-            "hi_quan"
+            "nu_itch"
           ],
-          "name": "hi_thnad"
+          "name": "nu_yekk"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyFormallyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyFormallyIrrelevantDtmiOrTermV3.json
index 54a36e65..a4a79a09 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyFormallyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyFormallyIrrelevantDtmiOrTermV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_jogg;1",
+        "@id": "dtmi:example:wum_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "mu_zatz",
+          "name": "wum_lambda",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_itch;1",
+        "@id": "dtmi:example:wum_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "mu_flunn",
+          "name": "wum_nu",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -44,11 +44,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_vroo;1",
+        "@id": "dtmi:example:wum_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "mu_yekk",
+          "name": "wum_omicron",
           "boolean": null
         }
       }
@@ -62,12 +62,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_alpha;1",
+        "@id": "dtmi:example:wum_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "mu_hi",
+          "name": "wum_rho",
           "boolean": null
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyFormallyUndefinedTermV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyFormallyUndefinedTermV3.json
index 0681a66f..49f4eed0 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyFormallyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyFormallyUndefinedTermV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_omicron;1",
+        "@id": "dtmi:example:wum_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "nu_xi",
+          "name": "wum_nuh",
           "foobar": {}
         }
       }
@@ -25,12 +25,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_rho;1",
+        "@id": "dtmi:example:wum_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "nu_pi",
+          "name": "wum_quan",
           "foobar": {}
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyInvalidDtmiV3.json
index 5edc89cb..767e7a40 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyInvalidDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_gamma;1",
+        "@id": "dtmi:example:wum_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Relationship",
             "Foobar"
           ],
-          "name": "nu_beta",
+          "name": "wum_tau",
           "dtmi:foo//bar": 626
         }
       }
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_epsilon;1",
+        "@id": "dtmi:example:wum_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,7 +36,7 @@
             "Relationship",
             "Foobar"
           ],
-          "name": "nu_delta",
+          "name": "wum_phi",
           "dtmi:foo//bar": 626
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityIntegerV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityIntegerV3.json
index ebffa86f..3938bb03 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityIntegerV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityIntegerV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_zatz;1",
+        "@id": "dtmi:example:xi_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "hi_floob",
+          "name": "nu_hi",
           "maxMultiplicity": 15
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_flunn;1",
+        "@id": "dtmi:example:xi_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "hi_jogg",
+          "name": "xi_beta",
           "maxMultiplicity": [
             15
           ]
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_yekk;1",
+        "@id": "dtmi:example:xi_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "hi_itch",
+          "name": "xi_delta",
           "maxMultiplicity": {
             "@value": 15,
             "@type": "xsd:integer"
@@ -66,11 +66,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:hi_hi;1",
+        "@id": "dtmi:example:xi_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "hi_vroo",
+          "name": "xi_zeta",
           "maxMultiplicity": [
             {
               "@value": 15,
@@ -89,11 +89,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_beta;1",
+        "@id": "dtmi:example:xi_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "alpha_alpha",
+          "name": "xi_theta",
           "maxMultiplicity": []
         }
       }
@@ -107,11 +107,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_delta;1",
+        "@id": "dtmi:example:xi_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "alpha_gamma",
+          "name": "xi_kappa",
           "maxMultiplicity": null
         }
       }
@@ -125,12 +125,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_zeta;1",
+        "@id": "dtmi:example:xi_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "alpha_epsilon",
+          "name": "xi_mu",
           "maxMultiplicity": null
         }
       }
@@ -144,11 +144,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_theta;1",
+        "@id": "dtmi:example:xi_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "alpha_eta",
+          "name": "xi_xi",
           "maxMultiplicity": true
         }
       }
@@ -162,12 +162,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_kappa;1",
+        "@id": "dtmi:example:xi_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "alpha_iota",
+          "name": "xi_pi",
           "maxMultiplicity": true
         }
       }
@@ -181,11 +181,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_mu;1",
+        "@id": "dtmi:example:xi_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "alpha_lambda",
+          "name": "xi_sigma",
           "maxMultiplicity": "hello"
         }
       }
@@ -199,12 +199,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_xi;1",
+        "@id": "dtmi:example:xi_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "alpha_nu",
+          "name": "xi_upsilon",
           "maxMultiplicity": "hello"
         }
       }
@@ -218,11 +218,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_pi;1",
+        "@id": "dtmi:example:xi_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "alpha_omicron",
+          "name": "xi_chi",
           "maxMultiplicity": [
             null
           ]
@@ -238,12 +238,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_sigma;1",
+        "@id": "dtmi:example:xi_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "alpha_rho",
+          "name": "xi_omega",
           "maxMultiplicity": [
             null
           ]
@@ -259,11 +259,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_upsilon;1",
+        "@id": "dtmi:example:xi_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "alpha_tau",
+          "name": "xi_wum",
           "maxMultiplicity": [
             true
           ]
@@ -279,12 +279,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_chi;1",
+        "@id": "dtmi:example:xi_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "alpha_phi",
+          "name": "xi_humpf",
           "maxMultiplicity": [
             true
           ]
@@ -300,11 +300,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_omega;1",
+        "@id": "dtmi:example:xi_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "alpha_psi",
+          "name": "xi_glikk",
           "maxMultiplicity": [
             "hello"
           ]
@@ -320,12 +320,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_wum;1",
+        "@id": "dtmi:example:xi_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "alpha_yuzz",
+          "name": "xi_snee",
           "maxMultiplicity": [
             "hello"
           ]
@@ -341,11 +341,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_humpf;1",
+        "@id": "dtmi:example:xi_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "alpha_um",
+          "name": "xi_thnad",
           "maxMultiplicity": {}
         }
       }
@@ -359,12 +359,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_glikk;1",
+        "@id": "dtmi:example:xi_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "alpha_fuddle",
+          "name": "xi_floob",
           "maxMultiplicity": {}
         }
       }
@@ -378,11 +378,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_snee;1",
+        "@id": "dtmi:example:xi_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "alpha_nuh",
+          "name": "xi_jogg",
           "maxMultiplicity": [
             {}
           ]
@@ -398,12 +398,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_thnad;1",
+        "@id": "dtmi:example:xi_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "alpha_quan",
+          "name": "xi_itch",
           "maxMultiplicity": [
             {}
           ]
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityMinValueV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityMinValueV3.json
index 1b9a56c9..524487db 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityMinValueV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityMinValueV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_floob;1",
+        "@id": "dtmi:example:xi_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "alpha_spazz",
+          "name": "xi_vroo",
           "maxMultiplicity": 1
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_jogg;1",
+        "@id": "dtmi:example:omicron_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "alpha_zatz",
+          "name": "omicron_alpha",
           "maxMultiplicity": 0
         }
       }
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:alpha_itch;1",
+        "@id": "dtmi:example:omicron_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "alpha_flunn",
+          "name": "omicron_gamma",
           "maxMultiplicity": 0
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityTermAndDtmiV3.json
index 8068eb1f..25090214 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityTermAndDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_epsilon;1",
+        "@id": "dtmi:example:omicron_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "maxMultiplicity": 1473,
-          "dtmi:dtdl:property:maxMultiplicity;3": 1474,
-          "name": "beta_delta"
+          "maxMultiplicity": 1490,
+          "dtmi:dtdl:property:maxMultiplicity;3": 1491,
+          "name": "omicron_lambda"
         }
       }
     ]
@@ -26,14 +26,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_eta;1",
+        "@id": "dtmi:example:omicron_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "maxMultiplicity": 1475,
-          "dtmi:dtdl:property:maxMultiplicity;3": 1476,
-          "name": "beta_zeta"
+          "maxMultiplicity": 1492,
+          "dtmi:dtdl:property:maxMultiplicity;3": 1493,
+          "name": "omicron_nu"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyMinMultiplicityExactValueV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyMinMultiplicityExactValueV3.json
index f9319bcf..0b5e42c1 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyMinMultiplicityExactValueV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyMinMultiplicityExactValueV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_theta;1",
+        "@id": "dtmi:example:pi_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "gamma_eta",
+          "name": "pi_xi",
           "minMultiplicity": 0
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_kappa;1",
+        "@id": "dtmi:example:pi_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "gamma_iota",
+          "name": "pi_pi",
           "minMultiplicity": -1
         }
       }
@@ -43,12 +43,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_mu;1",
+        "@id": "dtmi:example:pi_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "gamma_lambda",
+          "name": "pi_sigma",
           "minMultiplicity": -1
         }
       }
@@ -62,11 +62,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_xi;1",
+        "@id": "dtmi:example:pi_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "gamma_nu",
+          "name": "pi_upsilon",
           "minMultiplicity": 1
         }
       }
@@ -80,12 +80,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_pi;1",
+        "@id": "dtmi:example:pi_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "gamma_omicron",
+          "name": "pi_chi",
           "minMultiplicity": 1
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyMinMultiplicityIntegerV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyMinMultiplicityIntegerV3.json
index 5d5bb46c..7ebddc26 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyMinMultiplicityIntegerV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyMinMultiplicityIntegerV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_iota;1",
+        "@id": "dtmi:example:omicron_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "beta_theta",
+          "name": "omicron_omicron",
           "minMultiplicity": 0
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_lambda;1",
+        "@id": "dtmi:example:omicron_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "beta_kappa",
+          "name": "omicron_rho",
           "minMultiplicity": [
             0
           ]
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_nu;1",
+        "@id": "dtmi:example:omicron_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "beta_mu",
+          "name": "omicron_tau",
           "minMultiplicity": {
             "@value": 0,
             "@type": "xsd:integer"
@@ -66,11 +66,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_omicron;1",
+        "@id": "dtmi:example:omicron_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "beta_xi",
+          "name": "omicron_phi",
           "minMultiplicity": [
             {
               "@value": 0,
@@ -89,11 +89,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_rho;1",
+        "@id": "dtmi:example:omicron_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "beta_pi",
+          "name": "omicron_psi",
           "minMultiplicity": []
         }
       }
@@ -107,11 +107,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_tau;1",
+        "@id": "dtmi:example:omicron_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "beta_sigma",
+          "name": "omicron_yuzz",
           "minMultiplicity": null
         }
       }
@@ -125,12 +125,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_phi;1",
+        "@id": "dtmi:example:omicron_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "beta_upsilon",
+          "name": "omicron_um",
           "minMultiplicity": null
         }
       }
@@ -144,11 +144,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_psi;1",
+        "@id": "dtmi:example:omicron_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "beta_chi",
+          "name": "omicron_fuddle",
           "minMultiplicity": true
         }
       }
@@ -162,12 +162,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_yuzz;1",
+        "@id": "dtmi:example:omicron_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "beta_omega",
+          "name": "omicron_nuh",
           "minMultiplicity": true
         }
       }
@@ -181,11 +181,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_um;1",
+        "@id": "dtmi:example:omicron_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "beta_wum",
+          "name": "omicron_quan",
           "minMultiplicity": "hello"
         }
       }
@@ -199,12 +199,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_fuddle;1",
+        "@id": "dtmi:example:omicron_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "beta_humpf",
+          "name": "omicron_spazz",
           "minMultiplicity": "hello"
         }
       }
@@ -218,11 +218,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_nuh;1",
+        "@id": "dtmi:example:omicron_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "beta_glikk",
+          "name": "omicron_zatz",
           "minMultiplicity": [
             null
           ]
@@ -238,12 +238,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_quan;1",
+        "@id": "dtmi:example:omicron_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "beta_snee",
+          "name": "omicron_flunn",
           "minMultiplicity": [
             null
           ]
@@ -259,11 +259,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_spazz;1",
+        "@id": "dtmi:example:omicron_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "beta_thnad",
+          "name": "omicron_yekk",
           "minMultiplicity": [
             true
           ]
@@ -279,12 +279,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_zatz;1",
+        "@id": "dtmi:example:pi_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "beta_floob",
+          "name": "omicron_hi",
           "minMultiplicity": [
             true
           ]
@@ -300,11 +300,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_flunn;1",
+        "@id": "dtmi:example:pi_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "beta_jogg",
+          "name": "pi_beta",
           "minMultiplicity": [
             "hello"
           ]
@@ -320,12 +320,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_yekk;1",
+        "@id": "dtmi:example:pi_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "beta_itch",
+          "name": "pi_delta",
           "minMultiplicity": [
             "hello"
           ]
@@ -341,11 +341,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:beta_hi;1",
+        "@id": "dtmi:example:pi_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "beta_vroo",
+          "name": "pi_zeta",
           "minMultiplicity": {}
         }
       }
@@ -359,12 +359,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_beta;1",
+        "@id": "dtmi:example:pi_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "gamma_alpha",
+          "name": "pi_theta",
           "minMultiplicity": {}
         }
       }
@@ -378,11 +378,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_delta;1",
+        "@id": "dtmi:example:pi_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "gamma_gamma",
+          "name": "pi_kappa",
           "minMultiplicity": [
             {}
           ]
@@ -398,12 +398,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_zeta;1",
+        "@id": "dtmi:example:pi_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "gamma_epsilon",
+          "name": "pi_mu",
           "minMultiplicity": [
             {}
           ]
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyMinMultiplicityTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyMinMultiplicityTermAndDtmiV3.json
index 2536aacd..ecc2a588 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyMinMultiplicityTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyMinMultiplicityTermAndDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_omega;1",
+        "@id": "dtmi:example:pi_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
           "minMultiplicity": 0,
           "dtmi:dtdl:property:minMultiplicity;3": 0,
-          "name": "gamma_psi"
+          "name": "pi_glikk"
         }
       }
     ]
@@ -26,14 +26,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_wum;1",
+        "@id": "dtmi:example:pi_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
           "minMultiplicity": 0,
           "dtmi:dtdl:property:minMultiplicity;3": 0,
-          "name": "gamma_yuzz"
+          "name": "pi_snee"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyNamePatternV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyNamePatternV3.json
index e586f567..74d3b178 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyNamePatternV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyNamePatternV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_nu;1",
+        "@id": "dtmi:example:gamma_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -24,7 +24,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_xi;1",
+        "@id": "dtmi:example:gamma_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -41,7 +41,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_omicron;1",
+        "@id": "dtmi:example:gamma_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -58,7 +58,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_pi;1",
+        "@id": "dtmi:example:gamma_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -75,7 +75,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_rho;1",
+        "@id": "dtmi:example:gamma_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -92,7 +92,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_sigma;1",
+        "@id": "dtmi:example:gamma_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -109,7 +109,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_tau;1",
+        "@id": "dtmi:example:gamma_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -127,7 +127,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_upsilon;1",
+        "@id": "dtmi:example:gamma_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -144,7 +144,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_phi;1",
+        "@id": "dtmi:example:gamma_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -162,7 +162,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_chi;1",
+        "@id": "dtmi:example:gamma_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -179,7 +179,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_psi;1",
+        "@id": "dtmi:example:gamma_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -197,7 +197,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_omega;1",
+        "@id": "dtmi:example:gamma_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -214,7 +214,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_yuzz;1",
+        "@id": "dtmi:example:gamma_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -232,7 +232,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_wum;1",
+        "@id": "dtmi:example:gamma_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -249,7 +249,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_um;1",
+        "@id": "dtmi:example:gamma_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -267,7 +267,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_humpf;1",
+        "@id": "dtmi:example:gamma_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -284,7 +284,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_fuddle;1",
+        "@id": "dtmi:example:gamma_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -302,7 +302,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_glikk;1",
+        "@id": "dtmi:example:gamma_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -319,7 +319,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_nuh;1",
+        "@id": "dtmi:example:gamma_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -337,7 +337,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_snee;1",
+        "@id": "dtmi:example:gamma_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -354,7 +354,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_quan;1",
+        "@id": "dtmi:example:gamma_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -372,7 +372,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_thnad;1",
+        "@id": "dtmi:example:gamma_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -389,7 +389,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_spazz;1",
+        "@id": "dtmi:example:gamma_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -407,7 +407,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_floob;1",
+        "@id": "dtmi:example:gamma_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -424,7 +424,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_zatz;1",
+        "@id": "dtmi:example:gamma_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyNameStringLengthV3.json
index 4d3543f7..b4591871 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyNameStringLengthV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_kappa;1",
+        "@id": "dtmi:example:gamma_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -24,7 +24,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_lambda;1",
+        "@id": "dtmi:example:gamma_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -41,7 +41,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_mu;1",
+        "@id": "dtmi:example:gamma_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyNameStringV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyNameStringV3.json
index c63168da..13e1c1bb 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyNameStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyNameStringV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_nuh;1",
+        "@id": "dtmi:example:beta_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -24,7 +24,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_snee;1",
+        "@id": "dtmi:example:beta_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -43,7 +43,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_quan;1",
+        "@id": "dtmi:example:beta_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -63,7 +63,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_thnad;1",
+        "@id": "dtmi:example:beta_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -85,7 +85,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_spazz;1",
+        "@id": "dtmi:example:beta_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -102,7 +102,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_floob;1",
+        "@id": "dtmi:example:beta_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -120,7 +120,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_zatz;1",
+        "@id": "dtmi:example:beta_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -137,7 +137,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_jogg;1",
+        "@id": "dtmi:example:beta_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -155,7 +155,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_flunn;1",
+        "@id": "dtmi:example:beta_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -172,7 +172,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_itch;1",
+        "@id": "dtmi:example:beta_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -190,7 +190,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_yekk;1",
+        "@id": "dtmi:example:beta_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -209,7 +209,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_vroo;1",
+        "@id": "dtmi:example:beta_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -229,7 +229,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_hi;1",
+        "@id": "dtmi:example:gamma_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -248,7 +248,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_alpha;1",
+        "@id": "dtmi:example:gamma_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -268,7 +268,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_beta;1",
+        "@id": "dtmi:example:gamma_gamma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -287,7 +287,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_gamma;1",
+        "@id": "dtmi:example:gamma_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -307,7 +307,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_delta;1",
+        "@id": "dtmi:example:gamma_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -324,7 +324,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_epsilon;1",
+        "@id": "dtmi:example:gamma_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -342,7 +342,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_zeta;1",
+        "@id": "dtmi:example:gamma_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -361,7 +361,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_eta;1",
+        "@id": "dtmi:example:gamma_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -381,7 +381,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_theta;1",
+        "@id": "dtmi:example:gamma_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
@@ -398,7 +398,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_iota;1",
+        "@id": "dtmi:example:gamma_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyNameTermAndDtmiV3.json
index 0809ad20..bbdaddba 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyNameTermAndDtmiV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_zeta;1",
+        "@id": "dtmi:example:delta_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "thnad_delta",
-          "dtmi:dtdl:property:name;3": "thnad_epsilon"
+          "name": "delta_epsilon",
+          "dtmi:dtdl:property:name;3": "delta_zeta"
         }
       }
     ]
@@ -25,13 +25,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:thnad_iota;1",
+        "@id": "dtmi:example:delta_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "thnad_eta",
-          "dtmi:dtdl:property:name;3": "thnad_theta"
+          "name": "delta_theta",
+          "dtmi:dtdl:property:name;3": "delta_iota"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyNameUniqueAmongInterfaceContentsV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyNameUniqueAmongInterfaceContentsV3.json
index ac29cd7f..403e337b 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyNameUniqueAmongInterfaceContentsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyNameUniqueAmongInterfaceContentsV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_jogg;1",
+        "@id": "dtmi:example:gamma_flunn;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Relationship",
-            "name": "gamma_nuh"
+            "name": "gamma_floob"
           },
           {
             "@type": "Relationship",
-            "name": "gamma_snee"
+            "name": "gamma_zatz"
           }
         ]
       }
@@ -30,16 +30,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:quan_flunn;1",
+        "@id": "dtmi:example:gamma_itch;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Relationship",
-            "name": "gamma_nuh"
+            "name": "gamma_floob"
           },
           {
             "@type": "Relationship",
-            "name": "gamma_nuh"
+            "name": "gamma_floob"
           }
         ]
       }
@@ -56,16 +56,16 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:quan_itch;1",
+        "@id": "dtmi:example:gamma_yekk;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Relationship",
-            "name": "gamma_nuh"
+            "name": "gamma_floob"
           },
           {
             "@type": "Relationship",
-            "name": "gamma_nuh"
+            "name": "gamma_floob"
           }
         ]
       }
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyNotDtmiNorTermV3.json
index b223ecf6..0ce52485 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyNotDtmiNorTermV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_eta;1",
+        "@id": "dtmi:example:wum_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Relationship",
             "Foobar"
           ],
-          "name": "nu_zeta",
+          "name": "wum_psi",
           "http://foo.com/bar": true
         }
       }
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_iota;1",
+        "@id": "dtmi:example:wum_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,7 +36,7 @@
             "Relationship",
             "Foobar"
           ],
-          "name": "nu_theta",
+          "name": "wum_yuzz",
           "http://foo.com/bar": true
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyPropertiesElementV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyPropertiesElementV3.json
index 359c221b..dfc72865 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyPropertiesElementV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyPropertiesElementV3.json
@@ -7,19 +7,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_nuh;1",
+        "@id": "dtmi:example:pi_jogg;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:gamma_glikk;1",
+          "@id": "dtmi:example:pi_zatz;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "gamma_fuddle",
+            "name": "pi_floob",
             "properties": {
-              "@id": "dtmi:example:gamma_um;1",
+              "@id": "dtmi:example:pi_thnad;1",
               "@type": "Property",
-              "name": "gamma_humpf",
-              "schema": "long"
+              "name": "pi_spazz",
+              "schema": "float"
             }
           }
         }
@@ -34,20 +34,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_floob;1",
+        "@id": "dtmi:example:pi_hi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:gamma_spazz;1",
+          "@id": "dtmi:example:pi_vroo;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "gamma_thnad",
+            "name": "pi_yekk",
             "properties": [
               {
-                "@id": "dtmi:example:gamma_snee;1",
+                "@id": "dtmi:example:pi_flunn;1",
                 "@type": "Property",
-                "name": "gamma_quan",
-                "schema": "string"
+                "name": "pi_itch",
+                "schema": "integer"
               }
             ]
           }
@@ -63,18 +63,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_jogg;1",
+        "@id": "dtmi:example:rho_beta;1",
         "@type": "Interface",
         "contents": [
           {
             "@id": "dtmi:ex:dependentRef;1",
             "@type": "Property",
-            "name": "gamma_zatz",
-            "schema": "time"
+            "name": "rho_alpha",
+            "schema": "long"
           },
           {
             "@type": "Relationship",
-            "name": "gamma_flunn",
+            "name": "rho_gamma",
             "properties": "dtmi:ex:dependentRef;1"
           }
         ]
@@ -89,18 +89,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:gamma_yekk;1",
+        "@id": "dtmi:example:rho_epsilon;1",
         "@type": "Interface",
         "contents": [
           {
             "@id": "dtmi:ex:dependentRef;1",
             "@type": "Property",
-            "name": "gamma_itch",
-            "schema": "boolean"
+            "name": "rho_delta",
+            "schema": "string"
           },
           {
             "@type": "Relationship",
-            "name": "gamma_vroo",
+            "name": "rho_zeta",
             "properties": [
               "dtmi:ex:dependentRef;1"
             ]
@@ -117,19 +117,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_delta;1",
+        "@id": "dtmi:example:rho_lambda;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:delta_gamma;1",
+          "@id": "dtmi:example:rho_kappa;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "delta_beta",
+            "name": "rho_iota",
             "properties": {
-              "@id": "dtmi:example:gamma_hi;1",
+              "@id": "dtmi:example:rho_eta;1",
               "@type": "Property",
-              "name": "delta_alpha",
-              "schema": "date",
+              "name": "rho_theta",
+              "schema": "time",
               "@context": "dtmi:dtdl:context;2"
             }
           }
@@ -137,6 +137,63 @@
       }
     ]
   },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:rho_pi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:rho_omicron;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "rho_xi",
+            "properties": {
+              "@id": "dtmi:example:rho_mu;1",
+              "@type": "Property",
+              "name": "rho_nu",
+              "schema": "unsignedLong",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:rho_phi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:rho_upsilon;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Relationship",
+            "name": "rho_tau",
+            "properties": {
+              "@id": "dtmi:example:rho_rho;1",
+              "@type": "Property",
+              "name": "rho_sigma",
+              "schema": "unsignedShort",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
   {
     "valid": true,
     "options": [
@@ -145,14 +202,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_eta;1",
+        "@id": "dtmi:example:rho_omega;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:delta_zeta;1",
+          "@id": "dtmi:example:rho_psi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "delta_epsilon",
+            "name": "rho_chi",
             "properties": []
           }
         }
@@ -167,25 +224,25 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_xi;1",
+        "@id": "dtmi:example:rho_nuh;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:delta_nu;1",
+          "@id": "dtmi:example:rho_glikk;1",
           "@type": "Interface",
           "contents": {
             "@type": "Relationship",
-            "name": "delta_mu",
+            "name": "rho_fuddle",
             "properties": [
               {
-                "@id": "dtmi:example:delta_theta;1",
+                "@id": "dtmi:example:rho_yuzz;1",
                 "@type": "Property",
-                "name": "delta_iota",
+                "name": "rho_wum",
                 "schema": "dateTime"
               },
               {
-                "@id": "dtmi:example:delta_kappa;1",
+                "@id": "dtmi:example:rho_um;1",
                 "@type": "Property",
-                "name": "delta_lambda",
+                "name": "rho_humpf",
                 "schema": "double"
               }
             ]
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyPropertiesTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyPropertiesTermAndDtmiV3.json
index 431eada7..077a9a2f 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyPropertiesTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyPropertiesTermAndDtmiV3.json
@@ -7,22 +7,22 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_omega;1",
+        "@id": "dtmi:example:upsilon_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "eta_phi",
+          "name": "upsilon_jogg",
           "properties": [
             {
               "@type": "Property",
-              "name": "eta_chi",
+              "name": "upsilon_flunn",
               "schema": "dateTime"
             }
           ],
           "dtmi:dtdl:property:properties;3": [
             {
               "@type": "Property",
-              "name": "eta_psi",
+              "name": "upsilon_itch",
               "schema": "double"
             }
           ]
@@ -38,23 +38,23 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_humpf;1",
+        "@id": "dtmi:example:phi_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "eta_yuzz",
+          "name": "upsilon_vroo",
           "properties": [
             {
               "@type": "Property",
-              "name": "eta_wum",
+              "name": "upsilon_hi",
               "schema": "duration"
             }
           ],
           "dtmi:dtdl:property:properties;3": [
             {
               "@type": "Property",
-              "name": "eta_um",
+              "name": "phi_alpha",
               "schema": "float"
             }
           ]
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyPropertiesTypeConformanceV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyPropertiesTypeConformanceV3.json
index fbea64ee..e491c51a 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyPropertiesTypeConformanceV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyPropertiesTypeConformanceV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_psi;1",
+        "@id": "dtmi:example:rho_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "delta_chi",
+          "name": "rho_flunn",
           "properties": {
-            "@id": "dtmi:example:delta_phi;1",
+            "@id": "dtmi:example:rho_jogg;1",
             "elementSchema": "duration",
             "@type": "Array"
           }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_wum;1",
+        "@id": "dtmi:example:rho_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "delta_yuzz",
+          "name": "rho_vroo",
           "properties": {
-            "@id": "dtmi:example:delta_omega;1",
+            "@id": "dtmi:example:rho_yekk;1",
             "elementSchema": "float",
             "@type": "Array"
           }
@@ -52,14 +52,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_glikk;1",
+        "@id": "dtmi:example:sigma_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "delta_fuddle",
+          "name": "sigma_gamma",
           "properties": {
-            "@id": "dtmi:example:delta_um;1",
-            "name": "delta_humpf",
+            "@id": "dtmi:example:sigma_alpha;1",
+            "name": "sigma_beta",
             "@type": "Command"
           }
         }
@@ -74,15 +74,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_thnad;1",
+        "@id": "dtmi:example:sigma_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "delta_quan",
+          "name": "sigma_eta",
           "properties": {
-            "@id": "dtmi:example:delta_nuh;1",
-            "name": "delta_snee",
+            "@id": "dtmi:example:sigma_epsilon;1",
+            "name": "sigma_zeta",
             "@type": "Command"
           }
         }
@@ -97,14 +97,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_jogg;1",
+        "@id": "dtmi:example:sigma_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "delta_zatz",
+          "name": "sigma_lambda",
           "properties": {
-            "@id": "dtmi:example:delta_spazz;1",
-            "name": "delta_floob",
+            "@id": "dtmi:example:sigma_iota;1",
+            "name": "sigma_kappa",
             "schema": "integer",
             "@type": "CommandRequest"
           }
@@ -120,15 +120,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:delta_vroo;1",
+        "@id": "dtmi:example:sigma_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "delta_yekk",
+          "name": "sigma_omicron",
           "properties": {
-            "@id": "dtmi:example:delta_flunn;1",
-            "name": "delta_itch",
+            "@id": "dtmi:example:sigma_nu;1",
+            "name": "sigma_xi",
             "schema": "long",
             "@type": "CommandRequest"
           }
@@ -144,14 +144,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_gamma;1",
+        "@id": "dtmi:example:sigma_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "epsilon_beta",
+          "name": "sigma_tau",
           "properties": {
-            "@id": "dtmi:example:delta_hi;1",
-            "name": "epsilon_alpha",
+            "@id": "dtmi:example:sigma_rho;1",
+            "name": "sigma_sigma",
             "schema": "string",
             "@type": "CommandResponse"
           }
@@ -167,15 +167,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_eta;1",
+        "@id": "dtmi:example:sigma_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "epsilon_zeta",
+          "name": "sigma_psi",
           "properties": {
-            "@id": "dtmi:example:epsilon_delta;1",
-            "name": "epsilon_epsilon",
+            "@id": "dtmi:example:sigma_phi;1",
+            "name": "sigma_chi",
             "schema": "time",
             "@type": "CommandResponse"
           }
@@ -191,16 +191,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_mu;1",
+        "@id": "dtmi:example:sigma_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "epsilon_lambda",
+          "name": "sigma_humpf",
           "properties": {
-            "@id": "dtmi:example:epsilon_theta;1",
-            "name": "epsilon_iota",
+            "@id": "dtmi:example:sigma_yuzz;1",
+            "name": "sigma_wum",
             "schema": {
-              "@id": "dtmi:example:epsilon_kappa;1",
+              "@id": "dtmi:example:sigma_um;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -217,17 +217,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_rho;1",
+        "@id": "dtmi:example:sigma_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "epsilon_pi",
+          "name": "sigma_quan",
           "properties": {
-            "@id": "dtmi:example:epsilon_nu;1",
-            "name": "epsilon_xi",
+            "@id": "dtmi:example:sigma_glikk;1",
+            "name": "sigma_nuh",
             "schema": {
-              "@id": "dtmi:example:epsilon_omicron;1",
+              "@id": "dtmi:example:sigma_snee;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -244,13 +244,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_upsilon;1",
+        "@id": "dtmi:example:sigma_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "epsilon_tau",
+          "name": "sigma_floob",
           "properties": {
-            "@id": "dtmi:example:epsilon_sigma;1",
+            "@id": "dtmi:example:sigma_spazz;1",
             "valueSchema": "integer",
             "@type": "Enum"
           }
@@ -266,14 +266,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_psi;1",
+        "@id": "dtmi:example:sigma_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "epsilon_chi",
+          "name": "sigma_flunn",
           "properties": {
-            "@id": "dtmi:example:epsilon_phi;1",
+            "@id": "dtmi:example:sigma_jogg;1",
             "valueSchema": "integer",
             "@type": "Enum"
           }
@@ -289,15 +289,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_um;1",
+        "@id": "dtmi:example:tau_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "epsilon_wum",
+          "name": "sigma_hi",
           "properties": {
-            "@id": "dtmi:example:epsilon_omega;1",
-            "enumValue": 1484,
-            "name": "epsilon_yuzz",
+            "@id": "dtmi:example:sigma_yekk;1",
+            "enumValue": 1501,
+            "name": "sigma_vroo",
             "@type": "EnumValue"
           }
         }
@@ -312,16 +312,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_nuh;1",
+        "@id": "dtmi:example:tau_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "epsilon_glikk",
+          "name": "tau_delta",
           "properties": {
-            "@id": "dtmi:example:epsilon_humpf;1",
-            "enumValue": 1485,
-            "name": "epsilon_fuddle",
+            "@id": "dtmi:example:tau_beta;1",
+            "enumValue": 1502,
+            "name": "tau_gamma",
             "@type": "EnumValue"
           }
         }
@@ -336,14 +336,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_spazz;1",
+        "@id": "dtmi:example:tau_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "epsilon_thnad",
+          "name": "tau_theta",
           "properties": {
-            "@id": "dtmi:example:epsilon_snee;1",
-            "name": "epsilon_quan",
+            "@id": "dtmi:example:tau_zeta;1",
+            "name": "tau_eta",
             "schema": "boolean",
             "@type": "Field"
           }
@@ -359,15 +359,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_flunn;1",
+        "@id": "dtmi:example:tau_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "epsilon_jogg",
+          "name": "tau_mu",
           "properties": {
-            "@id": "dtmi:example:epsilon_floob;1",
-            "name": "epsilon_zatz",
+            "@id": "dtmi:example:tau_kappa;1",
+            "name": "tau_lambda",
             "schema": "date",
             "@type": "Field"
           }
@@ -383,13 +383,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:epsilon_vroo;1",
+        "@id": "dtmi:example:tau_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "epsilon_yekk",
+          "name": "tau_omicron",
           "properties": {
-            "@id": "dtmi:example:epsilon_itch;1",
+            "@id": "dtmi:example:tau_xi;1",
             "@type": "Interface"
           }
         }
@@ -404,14 +404,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_beta;1",
+        "@id": "dtmi:example:tau_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "zeta_alpha",
+          "name": "tau_sigma",
           "properties": {
-            "@id": "dtmi:example:epsilon_hi;1",
+            "@id": "dtmi:example:tau_rho;1",
             "@type": "Interface"
           }
         }
@@ -426,19 +426,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_eta;1",
+        "@id": "dtmi:example:tau_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zeta_zeta",
+          "name": "tau_psi",
           "properties": {
-            "@id": "dtmi:example:zeta_gamma;1",
+            "@id": "dtmi:example:tau_upsilon;1",
             "mapKey": {
-              "name": "zeta_delta",
+              "name": "tau_phi",
               "schema": "string"
             },
             "mapValue": {
-              "name": "zeta_epsilon",
+              "name": "tau_chi",
               "schema": "dateTime"
             },
             "@type": "Map"
@@ -455,20 +455,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_mu;1",
+        "@id": "dtmi:example:tau_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "zeta_lambda",
+          "name": "tau_humpf",
           "properties": {
-            "@id": "dtmi:example:zeta_theta;1",
+            "@id": "dtmi:example:tau_yuzz;1",
             "mapKey": {
-              "name": "zeta_iota",
+              "name": "tau_wum",
               "schema": "string"
             },
             "mapValue": {
-              "name": "zeta_kappa",
+              "name": "tau_um",
               "schema": "double"
             },
             "@type": "Map"
@@ -485,14 +485,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_pi;1",
+        "@id": "dtmi:example:tau_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zeta_omicron",
+          "name": "tau_snee",
           "properties": {
-            "@id": "dtmi:example:zeta_nu;1",
-            "name": "zeta_xi",
+            "@id": "dtmi:example:tau_glikk;1",
+            "name": "tau_nuh",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -508,15 +508,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_upsilon;1",
+        "@id": "dtmi:example:tau_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "zeta_tau",
+          "name": "tau_floob",
           "properties": {
-            "@id": "dtmi:example:zeta_rho;1",
-            "name": "zeta_sigma",
+            "@id": "dtmi:example:tau_thnad;1",
+            "name": "tau_spazz",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -532,14 +532,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_omega;1",
+        "@id": "dtmi:example:tau_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zeta_psi",
+          "name": "tau_itch",
           "properties": {
-            "@id": "dtmi:example:zeta_phi;1",
-            "name": "zeta_chi",
+            "@id": "dtmi:example:tau_jogg;1",
+            "name": "tau_flunn",
             "schema": "duration",
             "@type": "MapValue"
           }
@@ -555,15 +555,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_humpf;1",
+        "@id": "dtmi:example:upsilon_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "zeta_um",
+          "name": "upsilon_alpha",
           "properties": {
-            "@id": "dtmi:example:zeta_yuzz;1",
-            "name": "zeta_wum",
+            "@id": "dtmi:example:tau_vroo;1",
+            "name": "tau_hi",
             "schema": "float",
             "@type": "MapValue"
           }
@@ -579,13 +579,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_nuh;1",
+        "@id": "dtmi:example:upsilon_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zeta_glikk",
+          "name": "upsilon_delta",
           "properties": {
-            "@id": "dtmi:example:zeta_fuddle;1",
+            "@id": "dtmi:example:upsilon_gamma;1",
             "@type": "Object"
           }
         }
@@ -600,14 +600,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_thnad;1",
+        "@id": "dtmi:example:upsilon_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "zeta_quan",
+          "name": "upsilon_eta",
           "properties": {
-            "@id": "dtmi:example:zeta_snee;1",
+            "@id": "dtmi:example:upsilon_zeta;1",
             "@type": "Object"
           }
         }
@@ -622,14 +622,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_jogg;1",
+        "@id": "dtmi:example:upsilon_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zeta_zatz",
+          "name": "upsilon_lambda",
           "properties": {
-            "@id": "dtmi:example:zeta_spazz;1",
-            "name": "zeta_floob",
+            "@id": "dtmi:example:upsilon_iota;1",
+            "name": "upsilon_kappa",
             "schema": "integer",
             "@type": "Property"
           }
@@ -645,14 +645,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:zeta_vroo;1",
+        "@id": "dtmi:example:upsilon_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "zeta_yekk",
+          "name": "upsilon_omicron",
           "properties": {
-            "@id": "dtmi:example:zeta_flunn;1",
-            "name": "zeta_itch",
+            "@id": "dtmi:example:upsilon_nu;1",
+            "name": "upsilon_xi",
             "@type": "Relationship"
           }
         }
@@ -667,15 +667,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_gamma;1",
+        "@id": "dtmi:example:upsilon_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "eta_beta",
+          "name": "upsilon_tau",
           "properties": {
-            "@id": "dtmi:example:zeta_hi;1",
-            "name": "eta_alpha",
+            "@id": "dtmi:example:upsilon_rho;1",
+            "name": "upsilon_sigma",
             "@type": "Relationship"
           }
         }
@@ -690,14 +690,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_eta;1",
+        "@id": "dtmi:example:upsilon_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "eta_zeta",
+          "name": "upsilon_psi",
           "properties": {
-            "@id": "dtmi:example:eta_delta;1",
-            "name": "eta_epsilon",
+            "@id": "dtmi:example:upsilon_phi;1",
+            "name": "upsilon_chi",
             "schema": "long",
             "@type": "Telemetry"
           }
@@ -713,15 +713,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_lambda;1",
+        "@id": "dtmi:example:upsilon_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "eta_kappa",
+          "name": "upsilon_um",
           "properties": {
-            "@id": "dtmi:example:eta_theta;1",
-            "name": "eta_iota",
+            "@id": "dtmi:example:upsilon_yuzz;1",
+            "name": "upsilon_wum",
             "schema": "string",
             "@type": "Telemetry"
           }
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyTargetIsDtmiV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyTargetIsDtmiV3.json
index c3c4ff03..25dbfb2a 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyTargetIsDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyTargetIsDtmiV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_glikk;1",
+        "@id": "dtmi:example:phi_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "eta_fuddle",
+          "name": "phi_gamma",
           "target": "dtmi:foo:bar;7"
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_snee;1",
+        "@id": "dtmi:example:phi_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "eta_nuh",
+          "name": "phi_epsilon",
           "target": [
             "dtmi:foo:bar;7"
           ]
@@ -45,11 +45,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_thnad;1",
+        "@id": "dtmi:example:phi_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "eta_quan",
+          "name": "phi_eta",
           "target": "dtmi:foo:bar;108675309"
         }
       }
@@ -63,11 +63,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_floob;1",
+        "@id": "dtmi:example:phi_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "eta_spazz",
+          "name": "phi_iota",
           "target": [
             "dtmi:foo:bar;108675309"
           ]
@@ -83,11 +83,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_jogg;1",
+        "@id": "dtmi:example:phi_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "eta_zatz",
+          "name": "phi_lambda",
           "target": "dtmi:foo:bar;999999999"
         }
       }
@@ -101,11 +101,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_itch;1",
+        "@id": "dtmi:example:phi_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "eta_flunn",
+          "name": "phi_nu",
           "target": [
             "dtmi:foo:bar;999999999"
           ]
@@ -121,11 +121,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:eta_vroo;1",
+        "@id": "dtmi:example:phi_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "eta_yekk",
+          "name": "phi_omicron",
           "target": "dtmi:foo;1"
         }
       }
@@ -139,11 +139,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_alpha;1",
+        "@id": "dtmi:example:phi_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "eta_hi",
+          "name": "phi_rho",
           "target": [
             "dtmi:foo;1"
           ]
@@ -159,11 +159,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_gamma;1",
+        "@id": "dtmi:example:phi_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "theta_beta",
+          "name": "phi_tau",
           "target": "dtmi:foo:bar"
         }
       }
@@ -177,11 +177,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_epsilon;1",
+        "@id": "dtmi:example:phi_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "theta_delta",
+          "name": "phi_phi",
           "target": [
             "dtmi:foo:bar"
           ]
@@ -197,11 +197,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_eta;1",
+        "@id": "dtmi:example:phi_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "theta_zeta",
+          "name": "phi_psi",
           "target": "dtmi:foo:bar;3.14"
         }
       }
@@ -215,11 +215,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_iota;1",
+        "@id": "dtmi:example:phi_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "theta_theta",
+          "name": "phi_yuzz",
           "target": [
             "dtmi:foo:bar;3.14"
           ]
@@ -235,11 +235,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_lambda;1",
+        "@id": "dtmi:example:phi_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "theta_kappa",
+          "name": "phi_um",
           "target": "dtmi:foo:bar;3.141592"
         }
       }
@@ -253,11 +253,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_nu;1",
+        "@id": "dtmi:example:phi_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "theta_mu",
+          "name": "phi_fuddle",
           "target": [
             "dtmi:foo:bar;3.141592"
           ]
@@ -273,11 +273,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_omicron;1",
+        "@id": "dtmi:example:phi_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "theta_xi",
+          "name": "phi_nuh",
           "target": null
         }
       }
@@ -291,12 +291,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_rho;1",
+        "@id": "dtmi:example:phi_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "theta_pi",
+          "name": "phi_quan",
           "target": null
         }
       }
@@ -310,11 +310,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_tau;1",
+        "@id": "dtmi:example:phi_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "theta_sigma",
+          "name": "phi_spazz",
           "target": 626
         }
       }
@@ -328,12 +328,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_phi;1",
+        "@id": "dtmi:example:phi_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "theta_upsilon",
+          "name": "phi_zatz",
           "target": 626
         }
       }
@@ -347,11 +347,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_psi;1",
+        "@id": "dtmi:example:phi_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "theta_chi",
+          "name": "phi_flunn",
           "target": true
         }
       }
@@ -365,12 +365,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_yuzz;1",
+        "@id": "dtmi:example:phi_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "theta_omega",
+          "name": "phi_yekk",
           "target": true
         }
       }
@@ -384,11 +384,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_um;1",
+        "@id": "dtmi:example:chi_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "theta_wum",
+          "name": "phi_hi",
           "target": {
             "@value": "dtmi:apparently:valid:identifier;3"
           }
@@ -404,12 +404,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_fuddle;1",
+        "@id": "dtmi:example:chi_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "theta_humpf",
+          "name": "chi_beta",
           "target": {
             "@value": "dtmi:apparently:valid:identifier;3"
           }
@@ -425,11 +425,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_nuh;1",
+        "@id": "dtmi:example:chi_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "theta_glikk",
+          "name": "chi_delta",
           "target": "dtmi:foo:bar;0"
         }
       }
@@ -443,12 +443,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_quan;1",
+        "@id": "dtmi:example:chi_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "theta_snee",
+          "name": "chi_zeta",
           "target": "dtmi:foo:bar;0"
         }
       }
@@ -462,11 +462,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_spazz;1",
+        "@id": "dtmi:example:chi_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "theta_thnad",
+          "name": "chi_theta",
           "target": "dtmi:foo:bar;0.0"
         }
       }
@@ -480,12 +480,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_zatz;1",
+        "@id": "dtmi:example:chi_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "theta_floob",
+          "name": "chi_kappa",
           "target": "dtmi:foo:bar;0.0"
         }
       }
@@ -499,11 +499,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_flunn;1",
+        "@id": "dtmi:example:chi_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "theta_jogg",
+          "name": "chi_mu",
           "target": "dtmi:foo:bar;1234567890"
         }
       }
@@ -517,12 +517,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_yekk;1",
+        "@id": "dtmi:example:chi_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "theta_itch",
+          "name": "chi_xi",
           "target": "dtmi:foo:bar;1234567890"
         }
       }
@@ -536,11 +536,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:theta_hi;1",
+        "@id": "dtmi:example:chi_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "theta_vroo",
+          "name": "chi_pi",
           "target": "dtmi:foo:bar;1a"
         }
       }
@@ -554,12 +554,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_beta;1",
+        "@id": "dtmi:example:chi_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "iota_alpha",
+          "name": "chi_sigma",
           "target": "dtmi:foo:bar;1a"
         }
       }
@@ -573,11 +573,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_delta;1",
+        "@id": "dtmi:example:chi_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "iota_gamma",
+          "name": "chi_upsilon",
           "target": "dtmi:foo:bar;3.0"
         }
       }
@@ -591,12 +591,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_zeta;1",
+        "@id": "dtmi:example:chi_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "iota_epsilon",
+          "name": "chi_chi",
           "target": "dtmi:foo:bar;3.0"
         }
       }
@@ -610,11 +610,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_theta;1",
+        "@id": "dtmi:example:chi_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "iota_eta",
+          "name": "chi_omega",
           "target": "dtmi:foo:bar;3.1415926"
         }
       }
@@ -628,12 +628,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_kappa;1",
+        "@id": "dtmi:example:chi_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "iota_iota",
+          "name": "chi_wum",
           "target": "dtmi:foo:bar;3.1415926"
         }
       }
@@ -647,11 +647,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_mu;1",
+        "@id": "dtmi:example:chi_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "iota_lambda",
+          "name": "chi_humpf",
           "target": "dtmi:foo:bar;6.02"
         }
       }
@@ -665,12 +665,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_xi;1",
+        "@id": "dtmi:example:chi_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "iota_nu",
+          "name": "chi_glikk",
           "target": "dtmi:foo:bar;6.02"
         }
       }
@@ -684,11 +684,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_pi;1",
+        "@id": "dtmi:example:chi_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "iota_omicron",
+          "name": "chi_snee",
           "target": "dtmi:foo:bar;0.1"
         }
       }
@@ -702,12 +702,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_sigma;1",
+        "@id": "dtmi:example:chi_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "iota_rho",
+          "name": "chi_thnad",
           "target": "dtmi:foo:bar;0.1"
         }
       }
@@ -721,11 +721,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_upsilon;1",
+        "@id": "dtmi:example:chi_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "iota_tau",
+          "name": "chi_floob",
           "target": "dtmi:foo:bar;01"
         }
       }
@@ -739,12 +739,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_chi;1",
+        "@id": "dtmi:example:chi_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "iota_phi",
+          "name": "chi_jogg",
           "target": "dtmi:foo:bar;01"
         }
       }
@@ -758,11 +758,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_omega;1",
+        "@id": "dtmi:example:chi_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "iota_psi",
+          "name": "chi_itch",
           "target": "dtmi:foo:bar;"
         }
       }
@@ -776,12 +776,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_wum;1",
+        "@id": "dtmi:example:chi_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "iota_yuzz",
+          "name": "chi_vroo",
           "target": "dtmi:foo:bar;"
         }
       }
@@ -795,11 +795,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_humpf;1",
+        "@id": "dtmi:example:psi_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "iota_um",
+          "name": "psi_alpha",
           "target": "dtmi:test:invalidId_;1"
         }
       }
@@ -813,12 +813,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_glikk;1",
+        "@id": "dtmi:example:psi_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "iota_fuddle",
+          "name": "psi_gamma",
           "target": "dtmi:test:invalidId_;1"
         }
       }
@@ -832,11 +832,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_snee;1",
+        "@id": "dtmi:example:psi_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "iota_nuh",
+          "name": "psi_epsilon",
           "target": "dtmi:test:_invalidUserId;1"
         }
       }
@@ -850,12 +850,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_thnad;1",
+        "@id": "dtmi:example:psi_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "iota_quan",
+          "name": "psi_eta",
           "target": "dtmi:test:_invalidUserId;1"
         }
       }
@@ -869,11 +869,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_floob;1",
+        "@id": "dtmi:example:psi_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "iota_spazz",
+          "name": "psi_iota",
           "target": "dtmi:test:1seg;1"
         }
       }
@@ -887,12 +887,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_jogg;1",
+        "@id": "dtmi:example:psi_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "iota_zatz",
+          "name": "psi_lambda",
           "target": "dtmi:test:1seg;1"
         }
       }
@@ -906,11 +906,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_itch;1",
+        "@id": "dtmi:example:psi_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "iota_flunn",
+          "name": "psi_nu",
           "target": "dtmi:foo:bar.baz;1"
         }
       }
@@ -924,12 +924,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:iota_vroo;1",
+        "@id": "dtmi:example:psi_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "iota_yekk",
+          "name": "psi_omicron",
           "target": "dtmi:foo:bar.baz;1"
         }
       }
@@ -943,11 +943,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_alpha;1",
+        "@id": "dtmi:example:psi_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "iota_hi",
+          "name": "psi_rho",
           "target": "dtmi:foo::bar;1"
         }
       }
@@ -961,12 +961,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_gamma;1",
+        "@id": "dtmi:example:psi_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "kappa_beta",
+          "name": "psi_tau",
           "target": "dtmi:foo::bar;1"
         }
       }
@@ -980,11 +980,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_epsilon;1",
+        "@id": "dtmi:example:psi_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "kappa_delta",
+          "name": "psi_phi",
           "target": "urn:foo:bar:1"
         }
       }
@@ -998,12 +998,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_eta;1",
+        "@id": "dtmi:example:psi_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "kappa_zeta",
+          "name": "psi_psi",
           "target": "urn:foo:bar:1"
         }
       }
@@ -1017,11 +1017,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_iota;1",
+        "@id": "dtmi:example:psi_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "kappa_theta",
+          "name": "psi_yuzz",
           "target": "http://foo/bar/baz"
         }
       }
@@ -1035,12 +1035,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_lambda;1",
+        "@id": "dtmi:example:psi_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "kappa_kappa",
+          "name": "psi_um",
           "target": "http://foo/bar/baz"
         }
       }
@@ -1054,11 +1054,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_nu;1",
+        "@id": "dtmi:example:psi_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "kappa_mu",
+          "name": "psi_fuddle",
           "target": "dtmi:;1"
         }
       }
@@ -1072,12 +1072,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_omicron;1",
+        "@id": "dtmi:example:psi_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "kappa_xi",
+          "name": "psi_nuh",
           "target": "dtmi:;1"
         }
       }
@@ -1091,11 +1091,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_rho;1",
+        "@id": "dtmi:example:psi_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "kappa_pi",
+          "name": "psi_quan",
           "target": []
         }
       }
@@ -1109,11 +1109,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_tau;1",
+        "@id": "dtmi:example:psi_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "kappa_sigma",
+          "name": "psi_spazz",
           "target": [
             "dtmi:foo:bar;7",
             "dtmi:foo:bar;108675309"
@@ -1130,12 +1130,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_phi;1",
+        "@id": "dtmi:example:psi_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "kappa_upsilon",
+          "name": "psi_zatz",
           "target": [
             "dtmi:foo:bar;7",
             "dtmi:foo:bar;108675309"
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyTargetTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyTargetTermAndDtmiV3.json
index 3f1f7cce..6ee978c5 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyTargetTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyTargetTermAndDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_thnad;1",
+        "@id": "dtmi:example:omega_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "kappa_nuh",
-          "target": "dtmi:example:kappa_snee;1",
-          "dtmi:dtdl:property:target;3": "dtmi:example:kappa_quan;1"
+          "name": "omega_epsilon",
+          "target": "dtmi:example:omega_zeta;1",
+          "dtmi:dtdl:property:target;3": "dtmi:example:omega_eta;1"
         }
       }
     ]
@@ -26,14 +26,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_jogg;1",
+        "@id": "dtmi:example:omega_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "kappa_spazz",
-          "target": "dtmi:example:kappa_floob;1",
-          "dtmi:dtdl:property:target;3": "dtmi:example:kappa_zatz;1"
+          "name": "omega_iota",
+          "target": "dtmi:example:omega_kappa;1",
+          "dtmi:dtdl:property:target;3": "dtmi:example:omega_lambda;1"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyWritableBooleanV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyWritableBooleanV3.json
index e22f7cb7..47c78d30 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyWritableBooleanV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyWritableBooleanV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_itch;1",
+        "@id": "dtmi:example:omega_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "kappa_flunn",
+          "name": "omega_nu",
           "writable": true
         }
       }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:kappa_vroo;1",
+        "@id": "dtmi:example:omega_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "kappa_yekk",
+          "name": "omega_omicron",
           "writable": false
         }
       }
@@ -43,11 +43,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_alpha;1",
+        "@id": "dtmi:example:omega_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "kappa_hi",
+          "name": "omega_rho",
           "writable": [
             true
           ]
@@ -63,11 +63,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_gamma;1",
+        "@id": "dtmi:example:omega_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "lambda_beta",
+          "name": "omega_tau",
           "writable": [
             false
           ]
@@ -83,11 +83,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_epsilon;1",
+        "@id": "dtmi:example:omega_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "lambda_delta",
+          "name": "omega_phi",
           "writable": {
             "@value": true,
             "@type": "xsd:boolean"
@@ -104,11 +104,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_eta;1",
+        "@id": "dtmi:example:omega_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "lambda_zeta",
+          "name": "omega_psi",
           "writable": {
             "@value": false,
             "@type": "xsd:boolean"
@@ -125,11 +125,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_iota;1",
+        "@id": "dtmi:example:omega_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "lambda_theta",
+          "name": "omega_yuzz",
           "writable": [
             {
               "@value": true,
@@ -148,11 +148,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_lambda;1",
+        "@id": "dtmi:example:omega_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "lambda_kappa",
+          "name": "omega_um",
           "writable": [
             {
               "@value": false,
@@ -171,11 +171,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_nu;1",
+        "@id": "dtmi:example:omega_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "lambda_mu",
+          "name": "omega_fuddle",
           "writable": []
         }
       }
@@ -189,11 +189,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_omicron;1",
+        "@id": "dtmi:example:omega_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "lambda_xi",
+          "name": "omega_nuh",
           "writable": null
         }
       }
@@ -207,12 +207,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_rho;1",
+        "@id": "dtmi:example:omega_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "lambda_pi",
+          "name": "omega_quan",
           "writable": null
         }
       }
@@ -226,11 +226,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_tau;1",
+        "@id": "dtmi:example:omega_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "lambda_sigma",
+          "name": "omega_spazz",
           "writable": 626
         }
       }
@@ -244,12 +244,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_phi;1",
+        "@id": "dtmi:example:omega_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "lambda_upsilon",
+          "name": "omega_zatz",
           "writable": 626
         }
       }
@@ -263,11 +263,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_psi;1",
+        "@id": "dtmi:example:omega_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "lambda_chi",
+          "name": "omega_flunn",
           "writable": "hello"
         }
       }
@@ -281,12 +281,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_yuzz;1",
+        "@id": "dtmi:example:omega_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "lambda_omega",
+          "name": "omega_yekk",
           "writable": "hello"
         }
       }
@@ -300,11 +300,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_um;1",
+        "@id": "dtmi:example:yuzz_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "lambda_wum",
+          "name": "omega_hi",
           "writable": [
             null
           ]
@@ -320,12 +320,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_fuddle;1",
+        "@id": "dtmi:example:yuzz_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "lambda_humpf",
+          "name": "yuzz_beta",
           "writable": [
             null
           ]
@@ -341,11 +341,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_nuh;1",
+        "@id": "dtmi:example:yuzz_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "lambda_glikk",
+          "name": "yuzz_delta",
           "writable": [
             626
           ]
@@ -361,12 +361,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_quan;1",
+        "@id": "dtmi:example:yuzz_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "lambda_snee",
+          "name": "yuzz_zeta",
           "writable": [
             626
           ]
@@ -382,11 +382,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_spazz;1",
+        "@id": "dtmi:example:yuzz_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "lambda_thnad",
+          "name": "yuzz_theta",
           "writable": [
             "hello"
           ]
@@ -402,12 +402,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_zatz;1",
+        "@id": "dtmi:example:yuzz_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "lambda_floob",
+          "name": "yuzz_kappa",
           "writable": [
             "hello"
           ]
@@ -423,11 +423,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_flunn;1",
+        "@id": "dtmi:example:yuzz_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "lambda_jogg",
+          "name": "yuzz_mu",
           "writable": {}
         }
       }
@@ -441,12 +441,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_yekk;1",
+        "@id": "dtmi:example:yuzz_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "lambda_itch",
+          "name": "yuzz_xi",
           "writable": {}
         }
       }
@@ -460,11 +460,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:lambda_hi;1",
+        "@id": "dtmi:example:yuzz_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "lambda_vroo",
+          "name": "yuzz_pi",
           "writable": [
             {}
           ]
@@ -480,12 +480,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_beta;1",
+        "@id": "dtmi:example:yuzz_tau;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "mu_alpha",
+          "name": "yuzz_sigma",
           "writable": [
             {}
           ]
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyWritableTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyWritableTermAndDtmiV3.json
index 6cb883be..ccedd300 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipPropertyWritableTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipPropertyWritableTermAndDtmiV3.json
@@ -7,11 +7,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_kappa;1",
+        "@id": "dtmi:example:yuzz_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship",
-          "name": "mu_iota",
+          "name": "yuzz_wum",
           "writable": false,
           "dtmi:dtdl:property:writable;3": true
         }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:mu_mu;1",
+        "@id": "dtmi:example:yuzz_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Relationship",
-          "name": "mu_lambda",
+          "name": "yuzz_humpf",
           "writable": false,
           "dtmi:dtdl:property:writable;3": true
         }
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipRequiredPropertiesV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipRequiredPropertiesV3.json
index 5fca50bf..7fdeb3d2 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipRequiredPropertiesV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipRequiredPropertiesV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_thnad;1",
+        "@id": "dtmi:example:hi_spazz;1",
         "@type": "Interface",
         "contents": {
-          "name": "glikk_quan"
+          "name": "hi_thnad"
         }
       }
     ]
@@ -23,11 +23,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_floob;1",
+        "@id": "dtmi:example:hi_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "glikk_spazz"
+          "name": "hi_floob"
         }
       }
     ]
@@ -40,7 +40,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_zatz;1",
+        "@id": "dtmi:example:hi_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Relationship"
@@ -56,7 +56,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_jogg;1",
+        "@id": "dtmi:example:hi_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipTypeIncludesInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipTypeIncludesInvalidDtmiV3.json
index 29155c93..f42f03c9 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipTypeIncludesInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipTypeIncludesInvalidDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_upsilon;1",
+        "@id": "dtmi:example:beta_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Relationship",
             "dtmi:foo//bar"
           ],
-          "name": "snee_tau"
+          "name": "beta_upsilon"
         }
       }
     ]
@@ -27,7 +27,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_chi;1",
+        "@id": "dtmi:example:beta_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -35,7 +35,7 @@
             "Relationship",
             "dtmi:foo//bar"
           ],
-          "name": "snee_phi"
+          "name": "beta_chi"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipTypeIncludesMaterialV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipTypeIncludesMaterialV3.json
index d1786f45..f58e0695 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipTypeIncludesMaterialV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipTypeIncludesMaterialV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_fuddle;1",
+        "@id": "dtmi:example:alpha_glikk;1",
         "@type": "Interface",
         "contents": {
-          "name": "nuh_humpf",
+          "name": "alpha_fuddle",
           "@type": "Relationship"
         }
       }
@@ -24,10 +24,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_nuh;1",
+        "@id": "dtmi:example:alpha_snee;1",
         "@type": "Interface",
         "contents": {
-          "name": "nuh_glikk",
+          "name": "alpha_nuh",
           "@type": [
             "Relationship"
           ]
@@ -43,10 +43,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_quan;1",
+        "@id": "dtmi:example:alpha_thnad;1",
         "@type": "Interface",
         "contents": {
-          "name": "nuh_snee",
+          "name": "alpha_quan",
           "@type": "dtmi:dtdl:class:Relationship;3"
         }
       }
@@ -60,10 +60,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_spazz;1",
+        "@id": "dtmi:example:alpha_floob;1",
         "@type": "Interface",
         "contents": {
-          "name": "nuh_thnad",
+          "name": "alpha_spazz",
           "@type": [
             "dtmi:dtdl:class:Relationship;3"
           ]
@@ -79,10 +79,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_zatz;1",
+        "@id": "dtmi:example:alpha_jogg;1",
         "@type": "Interface",
         "contents": {
-          "name": "nuh_floob",
+          "name": "alpha_zatz",
           "@type": "Something"
         }
       }
@@ -96,11 +96,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_flunn;1",
+        "@id": "dtmi:example:alpha_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "nuh_jogg",
+          "name": "alpha_flunn",
           "@type": "Something"
         }
       }
@@ -114,10 +114,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_yekk;1",
+        "@id": "dtmi:example:alpha_vroo;1",
         "@type": "Interface",
         "contents": {
-          "name": "nuh_itch",
+          "name": "alpha_yekk",
           "@type": [
             "Something"
           ]
@@ -133,11 +133,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_hi;1",
+        "@id": "dtmi:example:beta_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "nuh_vroo",
+          "name": "alpha_hi",
           "@type": [
             "Something"
           ]
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipTypeIncludesNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipTypeIncludesNotDtmiNorTermV3.json
index b5324e13..24ffdda5 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipTypeIncludesNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipTypeIncludesNotDtmiNorTermV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_omega;1",
+        "@id": "dtmi:example:beta_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Relationship",
             "http://foo.com/bar"
           ],
-          "name": "snee_psi"
+          "name": "beta_omega"
         }
       }
     ]
@@ -27,7 +27,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_wum;1",
+        "@id": "dtmi:example:beta_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -35,7 +35,7 @@
             "Relationship",
             "http://foo.com/bar"
           ],
-          "name": "snee_yuzz"
+          "name": "beta_wum"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassRelationshipTypeStringOrArrayV3.json b/DTDL/v3/spec/Requirement-ClassRelationshipTypeStringOrArrayV3.json
index bd7282c9..ec06d34d 100644
--- a/DTDL/v3/spec/Requirement-ClassRelationshipTypeStringOrArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassRelationshipTypeStringOrArrayV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_itch;1",
+        "@id": "dtmi:example:hi_yekk;1",
         "@type": "Interface",
         "contents": {
-          "name": "glikk_flunn",
+          "name": "hi_itch",
           "@type": 626
         }
       }
@@ -24,11 +24,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_vroo;1",
+        "@id": "dtmi:example:hi_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "glikk_yekk",
+          "name": "hi_vroo",
           "@type": 626
         }
       }
@@ -42,10 +42,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_alpha;1",
+        "@id": "dtmi:example:alpha_beta;1",
         "@type": "Interface",
         "contents": {
-          "name": "glikk_hi",
+          "name": "alpha_alpha",
           "@type": null
         }
       }
@@ -59,11 +59,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_gamma;1",
+        "@id": "dtmi:example:alpha_delta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "nuh_beta",
+          "name": "alpha_gamma",
           "@type": null
         }
       }
@@ -77,10 +77,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_epsilon;1",
+        "@id": "dtmi:example:alpha_zeta;1",
         "@type": "Interface",
         "contents": {
-          "name": "nuh_delta",
+          "name": "alpha_epsilon",
           "@type": true
         }
       }
@@ -94,11 +94,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_eta;1",
+        "@id": "dtmi:example:alpha_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "nuh_zeta",
+          "name": "alpha_eta",
           "@type": true
         }
       }
@@ -112,10 +112,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_iota;1",
+        "@id": "dtmi:example:alpha_kappa;1",
         "@type": "Interface",
         "contents": {
-          "name": "nuh_theta",
+          "name": "alpha_iota",
           "@type": {}
         }
       }
@@ -129,11 +129,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_lambda;1",
+        "@id": "dtmi:example:alpha_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "nuh_kappa",
+          "name": "alpha_lambda",
           "@type": {}
         }
       }
@@ -147,10 +147,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_nu;1",
+        "@id": "dtmi:example:alpha_xi;1",
         "@type": "Interface",
         "contents": {
-          "name": "nuh_mu",
+          "name": "alpha_nu",
           "@type": [
             626
           ]
@@ -166,11 +166,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_omicron;1",
+        "@id": "dtmi:example:alpha_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "nuh_xi",
+          "name": "alpha_omicron",
           "@type": [
             626
           ]
@@ -186,10 +186,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_rho;1",
+        "@id": "dtmi:example:alpha_sigma;1",
         "@type": "Interface",
         "contents": {
-          "name": "nuh_pi",
+          "name": "alpha_rho",
           "@type": [
             null
           ]
@@ -205,11 +205,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_tau;1",
+        "@id": "dtmi:example:alpha_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "nuh_sigma",
+          "name": "alpha_tau",
           "@type": [
             null
           ]
@@ -225,10 +225,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_phi;1",
+        "@id": "dtmi:example:alpha_chi;1",
         "@type": "Interface",
         "contents": {
-          "name": "nuh_upsilon",
+          "name": "alpha_phi",
           "@type": [
             true
           ]
@@ -244,11 +244,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_psi;1",
+        "@id": "dtmi:example:alpha_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "nuh_chi",
+          "name": "alpha_psi",
           "@type": [
             true
           ]
@@ -264,10 +264,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_yuzz;1",
+        "@id": "dtmi:example:alpha_wum;1",
         "@type": "Interface",
         "contents": {
-          "name": "nuh_omega",
+          "name": "alpha_yuzz",
           "@type": [
             {}
           ]
@@ -283,11 +283,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_um;1",
+        "@id": "dtmi:example:alpha_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "nuh_wum",
+          "name": "alpha_um",
           "@type": [
             {}
           ]
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryContextConformsV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryContextConformsV3.json
index 6a5ef0be..6e83e443 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryContextConformsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryContextConformsV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_zeta;1",
+        "@id": "dtmi:example:spazz_nuh;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:chi_epsilon;1",
+          "@id": "dtmi:example:spazz_glikk;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "chi_delta",
-            "schema": "float",
+            "name": "spazz_fuddle",
+            "schema": "long",
             "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
           }
         }
@@ -30,15 +30,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_iota;1",
+        "@id": "dtmi:example:spazz_thnad;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:chi_theta;1",
+          "@id": "dtmi:example:spazz_quan;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "chi_eta",
-            "schema": "integer",
+            "name": "spazz_snee",
+            "schema": "string",
             "@context": []
           }
         }
@@ -53,15 +53,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_mu;1",
+        "@id": "dtmi:example:spazz_zatz;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:chi_lambda;1",
+          "@id": "dtmi:example:spazz_floob;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "chi_kappa",
-            "schema": "long",
+            "name": "spazz_spazz",
+            "schema": "time",
             "@context": [
               "dtmi:dtdl:extension:quantitativeTypes;1"
             ]
@@ -78,15 +78,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_omicron;1",
+        "@id": "dtmi:example:spazz_itch;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:chi_xi;1",
+          "@id": "dtmi:example:spazz_flunn;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "chi_nu",
-            "schema": "string",
+            "name": "spazz_jogg",
+            "schema": "boolean",
             "@context": null
           }
         }
@@ -101,15 +101,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_sigma;1",
+        "@id": "dtmi:example:spazz_hi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:chi_rho;1",
+          "@id": "dtmi:example:spazz_vroo;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "chi_pi",
-            "schema": "time",
+            "name": "spazz_yekk",
+            "schema": "date",
             "@context": 626
           }
         }
@@ -124,15 +124,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_phi;1",
+        "@id": "dtmi:example:floob_gamma;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:chi_upsilon;1",
+          "@id": "dtmi:example:floob_beta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "chi_tau",
-            "schema": "boolean",
+            "name": "floob_alpha",
+            "schema": "dateTime",
             "@context": true
           }
         }
@@ -147,15 +147,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_omega;1",
+        "@id": "dtmi:example:floob_zeta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:chi_psi;1",
+          "@id": "dtmi:example:floob_epsilon;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "chi_chi",
-            "schema": "date",
+            "name": "floob_delta",
+            "schema": "double",
             "@context": [
               null
             ]
@@ -172,15 +172,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_um;1",
+        "@id": "dtmi:example:floob_iota;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:chi_wum;1",
+          "@id": "dtmi:example:floob_theta;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "chi_yuzz",
-            "schema": "dateTime",
+            "name": "floob_eta",
+            "schema": "duration",
             "@context": [
               626
             ]
@@ -197,15 +197,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_glikk;1",
+        "@id": "dtmi:example:floob_mu;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:chi_fuddle;1",
+          "@id": "dtmi:example:floob_lambda;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "chi_humpf",
-            "schema": "double",
+            "name": "floob_kappa",
+            "schema": "float",
             "@context": [
               true
             ]
@@ -222,16 +222,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_quan;1",
+        "@id": "dtmi:example:floob_omicron;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:chi_snee;1",
+          "@id": "dtmi:example:floob_xi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "chi_nuh",
-            "schema": "duration",
-            "@context": {}
+            "name": "floob_nu",
+            "schema": "integer",
+            "@context": "dtmi:dtdl:extension:quantitativeTypes"
           }
         }
       }
@@ -245,18 +245,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_floob;1",
+        "@id": "dtmi:example:floob_sigma;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:chi_spazz;1",
+          "@id": "dtmi:example:floob_rho;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "chi_thnad",
-            "schema": "float",
-            "@context": [
-              {}
-            ]
+            "name": "floob_pi",
+            "schema": "long",
+            "@context": "http://dtdl/extension/quantitativeTypes/1"
           }
         }
       }
@@ -270,16 +268,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_flunn;1",
+        "@id": "dtmi:example:floob_phi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:chi_jogg;1",
+          "@id": "dtmi:example:floob_upsilon;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "chi_zatz",
-            "schema": "integer",
-            "@context": "dtmi:dtdl:extension:quantitativeTypes"
+            "name": "floob_tau",
+            "schema": "string",
+            "@context": "quantitativeTypes;1"
           }
         }
       }
@@ -293,16 +291,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:chi_vroo;1",
+        "@id": "dtmi:example:floob_omega;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:chi_yekk;1",
+          "@id": "dtmi:example:floob_psi;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "chi_itch",
-            "schema": "long",
-            "@context": "http://dtdl/extension/quantitativeTypes/1"
+            "name": "floob_chi",
+            "schema": "time",
+            "@context": {}
           }
         }
       }
@@ -316,16 +314,70 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_beta;1",
+        "@id": "dtmi:example:floob_um;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:psi_alpha;1",
+          "@id": "dtmi:example:floob_wum;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "chi_hi",
-            "schema": "string",
-            "@context": "quantitativeTypes;1"
+            "name": "floob_yuzz",
+            "schema": "boolean",
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:floob_glikk;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:floob_fuddle;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "floob_humpf",
+            "schema": "date",
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:floob_quan;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:floob_snee;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "floob_nuh",
+            "schema": "dateTime",
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryIdDuplicateV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryIdDuplicateV3.json
index 23da5213..57d0430c 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryIdDuplicateV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryIdDuplicateV3.json
@@ -7,16 +7,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_mu;1",
+        "@id": "dtmi:example:flunn_hi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:wum_mu;1",
+          "@id": "dtmi:example:flunn_hi;1",
           "@type": "Interface",
           "contents": {
-            "@id": "dtmi:example:wum_mu;1",
+            "@id": "dtmi:example:flunn_hi;1",
             "@type": "Telemetry",
-            "name": "wum_nu",
-            "schema": "string"
+            "name": "itch_alpha",
+            "schema": "dateTime"
           }
         }
       }
@@ -30,17 +30,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_xi;1",
+        "@id": "dtmi:example:itch_beta;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:wum_xi;1",
+          "@id": "dtmi:example:itch_beta;1",
           "@type": "Interface",
           "contents": {
             "@context": "dtmi:undefinedExtension:context;1",
-            "@id": "dtmi:example:wum_xi;1",
+            "@id": "dtmi:example:itch_beta;1",
             "@type": "Telemetry",
-            "name": "wum_omicron",
-            "schema": "time"
+            "name": "itch_gamma",
+            "schema": "double"
           }
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryIdIsDtmiV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryIdIsDtmiV3.json
index 94b373d6..e1a732fc 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryIdIsDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryIdIsDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_delta;1",
+        "@id": "dtmi:example:floob_spazz;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;7",
           "@type": "Telemetry",
-          "name": "psi_gamma",
-          "schema": "time"
+          "name": "floob_thnad",
+          "schema": "double"
         }
       }
     ]
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_zeta;1",
+        "@id": "dtmi:example:floob_zatz;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;108675309",
           "@type": "Telemetry",
-          "name": "psi_epsilon",
-          "schema": "boolean"
+          "name": "floob_floob",
+          "schema": "duration"
         }
       }
     ]
@@ -45,13 +45,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_theta;1",
+        "@id": "dtmi:example:floob_flunn;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;999999999",
           "@type": "Telemetry",
-          "name": "psi_eta",
-          "schema": "date"
+          "name": "floob_jogg",
+          "schema": "float"
         }
       }
     ]
@@ -64,13 +64,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_kappa;1",
+        "@id": "dtmi:example:floob_yekk;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo;1",
           "@type": "Telemetry",
-          "name": "psi_iota",
-          "schema": "dateTime"
+          "name": "floob_itch",
+          "schema": "integer"
         }
       }
     ]
@@ -83,13 +83,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_mu;1",
+        "@id": "dtmi:example:floob_hi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar",
           "@type": "Telemetry",
-          "name": "psi_lambda",
-          "schema": "double"
+          "name": "floob_vroo",
+          "schema": "long"
         }
       }
     ]
@@ -102,13 +102,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_xi;1",
+        "@id": "dtmi:example:zatz_beta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.14",
           "@type": "Telemetry",
-          "name": "psi_nu",
-          "schema": "duration"
+          "name": "zatz_alpha",
+          "schema": "string"
         }
       }
     ]
@@ -121,13 +121,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_pi;1",
+        "@id": "dtmi:example:zatz_delta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.141592",
           "@type": "Telemetry",
-          "name": "psi_omicron",
-          "schema": "float"
+          "name": "zatz_gamma",
+          "schema": "time"
         }
       }
     ]
@@ -140,13 +140,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_sigma;1",
+        "@id": "dtmi:example:zatz_zeta;1",
         "@type": "Interface",
         "contents": {
           "@id": null,
           "@type": "Telemetry",
-          "name": "psi_rho",
-          "schema": "integer"
+          "name": "zatz_epsilon",
+          "schema": "boolean"
         }
       }
     ]
@@ -159,14 +159,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_upsilon;1",
+        "@id": "dtmi:example:zatz_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": null,
           "@type": "Telemetry",
-          "name": "psi_tau",
-          "schema": "long"
+          "name": "zatz_eta",
+          "schema": "date"
         }
       }
     ]
@@ -179,13 +179,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_chi;1",
+        "@id": "dtmi:example:zatz_kappa;1",
         "@type": "Interface",
         "contents": {
           "@id": 626,
           "@type": "Telemetry",
-          "name": "psi_phi",
-          "schema": "string"
+          "name": "zatz_iota",
+          "schema": "dateTime"
         }
       }
     ]
@@ -198,14 +198,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_omega;1",
+        "@id": "dtmi:example:zatz_mu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": 626,
           "@type": "Telemetry",
-          "name": "psi_psi",
-          "schema": "time"
+          "name": "zatz_lambda",
+          "schema": "double"
         }
       }
     ]
@@ -218,13 +218,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_wum;1",
+        "@id": "dtmi:example:zatz_xi;1",
         "@type": "Interface",
         "contents": {
           "@id": true,
           "@type": "Telemetry",
-          "name": "psi_yuzz",
-          "schema": "boolean"
+          "name": "zatz_nu",
+          "schema": "duration"
         }
       }
     ]
@@ -237,14 +237,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_humpf;1",
+        "@id": "dtmi:example:zatz_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": true,
           "@type": "Telemetry",
-          "name": "psi_um",
-          "schema": "date"
+          "name": "zatz_omicron",
+          "schema": "float"
         }
       }
     ]
@@ -257,15 +257,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_glikk;1",
+        "@id": "dtmi:example:zatz_sigma;1",
         "@type": "Interface",
         "contents": {
           "@id": {
             "@value": "dtmi:apparently:valid:identifier;3"
           },
           "@type": "Telemetry",
-          "name": "psi_fuddle",
-          "schema": "dateTime"
+          "name": "zatz_rho",
+          "schema": "integer"
         }
       }
     ]
@@ -278,7 +278,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_snee;1",
+        "@id": "dtmi:example:zatz_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -286,8 +286,8 @@
             "@value": "dtmi:apparently:valid:identifier;3"
           },
           "@type": "Telemetry",
-          "name": "psi_nuh",
-          "schema": "double"
+          "name": "zatz_tau",
+          "schema": "long"
         }
       }
     ]
@@ -300,13 +300,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_thnad;1",
+        "@id": "dtmi:example:zatz_chi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0",
           "@type": "Telemetry",
-          "name": "psi_quan",
-          "schema": "duration"
+          "name": "zatz_phi",
+          "schema": "string"
         }
       }
     ]
@@ -319,14 +319,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_floob;1",
+        "@id": "dtmi:example:zatz_omega;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0",
           "@type": "Telemetry",
-          "name": "psi_spazz",
-          "schema": "float"
+          "name": "zatz_psi",
+          "schema": "time"
         }
       }
     ]
@@ -339,13 +339,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_jogg;1",
+        "@id": "dtmi:example:zatz_wum;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Telemetry",
-          "name": "psi_zatz",
-          "schema": "integer"
+          "name": "zatz_yuzz",
+          "schema": "boolean"
         }
       }
     ]
@@ -358,14 +358,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_itch;1",
+        "@id": "dtmi:example:zatz_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.0",
           "@type": "Telemetry",
-          "name": "psi_flunn",
-          "schema": "long"
+          "name": "zatz_um",
+          "schema": "date"
         }
       }
     ]
@@ -378,13 +378,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:psi_vroo;1",
+        "@id": "dtmi:example:zatz_glikk;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Telemetry",
-          "name": "psi_yekk",
-          "schema": "string"
+          "name": "zatz_fuddle",
+          "schema": "dateTime"
         }
       }
     ]
@@ -397,14 +397,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_alpha;1",
+        "@id": "dtmi:example:zatz_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1234567890",
           "@type": "Telemetry",
-          "name": "psi_hi",
-          "schema": "time"
+          "name": "zatz_nuh",
+          "schema": "double"
         }
       }
     ]
@@ -417,13 +417,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_gamma;1",
+        "@id": "dtmi:example:zatz_thnad;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;1a",
           "@type": "Telemetry",
-          "name": "omega_beta",
-          "schema": "boolean"
+          "name": "zatz_quan",
+          "schema": "duration"
         }
       }
     ]
@@ -436,14 +436,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_epsilon;1",
+        "@id": "dtmi:example:zatz_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;1a",
           "@type": "Telemetry",
-          "name": "omega_delta",
-          "schema": "date"
+          "name": "zatz_spazz",
+          "schema": "float"
         }
       }
     ]
@@ -456,13 +456,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_eta;1",
+        "@id": "dtmi:example:zatz_jogg;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Telemetry",
-          "name": "omega_zeta",
-          "schema": "dateTime"
+          "name": "zatz_zatz",
+          "schema": "integer"
         }
       }
     ]
@@ -475,14 +475,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_iota;1",
+        "@id": "dtmi:example:zatz_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.0",
           "@type": "Telemetry",
-          "name": "omega_theta",
-          "schema": "double"
+          "name": "zatz_flunn",
+          "schema": "long"
         }
       }
     ]
@@ -495,13 +495,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_lambda;1",
+        "@id": "dtmi:example:zatz_vroo;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Telemetry",
-          "name": "omega_kappa",
-          "schema": "duration"
+          "name": "zatz_yekk",
+          "schema": "string"
         }
       }
     ]
@@ -514,14 +514,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_nu;1",
+        "@id": "dtmi:example:jogg_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;3.1415926",
           "@type": "Telemetry",
-          "name": "omega_mu",
-          "schema": "float"
+          "name": "zatz_hi",
+          "schema": "time"
         }
       }
     ]
@@ -534,13 +534,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_omicron;1",
+        "@id": "dtmi:example:jogg_gamma;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Telemetry",
-          "name": "omega_xi",
-          "schema": "integer"
+          "name": "jogg_beta",
+          "schema": "boolean"
         }
       }
     ]
@@ -553,14 +553,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_rho;1",
+        "@id": "dtmi:example:jogg_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;6.02",
           "@type": "Telemetry",
-          "name": "omega_pi",
-          "schema": "long"
+          "name": "jogg_delta",
+          "schema": "date"
         }
       }
     ]
@@ -573,13 +573,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_tau;1",
+        "@id": "dtmi:example:jogg_eta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Telemetry",
-          "name": "omega_sigma",
-          "schema": "string"
+          "name": "jogg_zeta",
+          "schema": "dateTime"
         }
       }
     ]
@@ -592,14 +592,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_phi;1",
+        "@id": "dtmi:example:jogg_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;0.1",
           "@type": "Telemetry",
-          "name": "omega_upsilon",
-          "schema": "time"
+          "name": "jogg_theta",
+          "schema": "double"
         }
       }
     ]
@@ -612,13 +612,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_psi;1",
+        "@id": "dtmi:example:jogg_lambda;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;01",
           "@type": "Telemetry",
-          "name": "omega_chi",
-          "schema": "boolean"
+          "name": "jogg_kappa",
+          "schema": "duration"
         }
       }
     ]
@@ -631,14 +631,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_yuzz;1",
+        "@id": "dtmi:example:jogg_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;01",
           "@type": "Telemetry",
-          "name": "omega_omega",
-          "schema": "date"
+          "name": "jogg_mu",
+          "schema": "float"
         }
       }
     ]
@@ -651,13 +651,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_um;1",
+        "@id": "dtmi:example:jogg_omicron;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar;",
           "@type": "Telemetry",
-          "name": "omega_wum",
-          "schema": "dateTime"
+          "name": "jogg_xi",
+          "schema": "integer"
         }
       }
     ]
@@ -670,14 +670,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_fuddle;1",
+        "@id": "dtmi:example:jogg_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar;",
           "@type": "Telemetry",
-          "name": "omega_humpf",
-          "schema": "double"
+          "name": "jogg_pi",
+          "schema": "long"
         }
       }
     ]
@@ -690,13 +690,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_nuh;1",
+        "@id": "dtmi:example:jogg_tau;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Telemetry",
-          "name": "omega_glikk",
-          "schema": "duration"
+          "name": "jogg_sigma",
+          "schema": "string"
         }
       }
     ]
@@ -709,14 +709,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_quan;1",
+        "@id": "dtmi:example:jogg_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:invalidId_;1",
           "@type": "Telemetry",
-          "name": "omega_snee",
-          "schema": "float"
+          "name": "jogg_upsilon",
+          "schema": "time"
         }
       }
     ]
@@ -729,13 +729,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_spazz;1",
+        "@id": "dtmi:example:jogg_psi;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Telemetry",
-          "name": "omega_thnad",
-          "schema": "integer"
+          "name": "jogg_chi",
+          "schema": "boolean"
         }
       }
     ]
@@ -748,14 +748,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_zatz;1",
+        "@id": "dtmi:example:jogg_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:_invalidUserId;1",
           "@type": "Telemetry",
-          "name": "omega_floob",
-          "schema": "long"
+          "name": "jogg_omega",
+          "schema": "date"
         }
       }
     ]
@@ -768,13 +768,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_flunn;1",
+        "@id": "dtmi:example:jogg_um;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:test:1seg;1",
           "@type": "Telemetry",
-          "name": "omega_jogg",
-          "schema": "string"
+          "name": "jogg_wum",
+          "schema": "dateTime"
         }
       }
     ]
@@ -787,14 +787,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_yekk;1",
+        "@id": "dtmi:example:jogg_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:test:1seg;1",
           "@type": "Telemetry",
-          "name": "omega_itch",
-          "schema": "time"
+          "name": "jogg_humpf",
+          "schema": "double"
         }
       }
     ]
@@ -807,13 +807,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omega_hi;1",
+        "@id": "dtmi:example:jogg_nuh;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Telemetry",
-          "name": "omega_vroo",
-          "schema": "boolean"
+          "name": "jogg_glikk",
+          "schema": "duration"
         }
       }
     ]
@@ -826,14 +826,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_beta;1",
+        "@id": "dtmi:example:jogg_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo:bar.baz;1",
           "@type": "Telemetry",
-          "name": "yuzz_alpha",
-          "schema": "date"
+          "name": "jogg_snee",
+          "schema": "float"
         }
       }
     ]
@@ -846,13 +846,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_delta;1",
+        "@id": "dtmi:example:jogg_spazz;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:foo::bar;1",
           "@type": "Telemetry",
-          "name": "yuzz_gamma",
-          "schema": "dateTime"
+          "name": "jogg_thnad",
+          "schema": "integer"
         }
       }
     ]
@@ -865,14 +865,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_zeta;1",
+        "@id": "dtmi:example:jogg_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:foo::bar;1",
           "@type": "Telemetry",
-          "name": "yuzz_epsilon",
-          "schema": "double"
+          "name": "jogg_floob",
+          "schema": "long"
         }
       }
     ]
@@ -885,13 +885,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_theta;1",
+        "@id": "dtmi:example:jogg_flunn;1",
         "@type": "Interface",
         "contents": {
           "@id": "urn:foo:bar:1",
           "@type": "Telemetry",
-          "name": "yuzz_eta",
-          "schema": "duration"
+          "name": "jogg_jogg",
+          "schema": "string"
         }
       }
     ]
@@ -904,14 +904,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_kappa;1",
+        "@id": "dtmi:example:jogg_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "urn:foo:bar:1",
           "@type": "Telemetry",
-          "name": "yuzz_iota",
-          "schema": "float"
+          "name": "jogg_itch",
+          "schema": "time"
         }
       }
     ]
@@ -924,13 +924,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_mu;1",
+        "@id": "dtmi:example:jogg_hi;1",
         "@type": "Interface",
         "contents": {
           "@id": "http://foo/bar/baz",
           "@type": "Telemetry",
-          "name": "yuzz_lambda",
-          "schema": "integer"
+          "name": "jogg_vroo",
+          "schema": "boolean"
         }
       }
     ]
@@ -943,14 +943,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_xi;1",
+        "@id": "dtmi:example:flunn_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "http://foo/bar/baz",
           "@type": "Telemetry",
-          "name": "yuzz_nu",
-          "schema": "long"
+          "name": "flunn_alpha",
+          "schema": "date"
         }
       }
     ]
@@ -963,13 +963,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_pi;1",
+        "@id": "dtmi:example:flunn_delta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:;1",
           "@type": "Telemetry",
-          "name": "yuzz_omicron",
-          "schema": "string"
+          "name": "flunn_gamma",
+          "schema": "dateTime"
         }
       }
     ]
@@ -982,14 +982,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_sigma;1",
+        "@id": "dtmi:example:flunn_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:;1",
           "@type": "Telemetry",
-          "name": "yuzz_rho",
-          "schema": "time"
+          "name": "flunn_epsilon",
+          "schema": "double"
         }
       }
     ]
@@ -1002,13 +1002,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_upsilon;1",
+        "@id": "dtmi:example:flunn_theta;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:dtdl:example;1",
           "@type": "Telemetry",
-          "name": "yuzz_tau",
-          "schema": "boolean"
+          "name": "flunn_eta",
+          "schema": "duration"
         }
       }
     ]
@@ -1021,14 +1021,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_chi;1",
+        "@id": "dtmi:example:flunn_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:dtdl:example;1",
           "@type": "Telemetry",
-          "name": "yuzz_phi",
-          "schema": "date"
+          "name": "flunn_iota",
+          "schema": "float"
         }
       }
     ]
@@ -1041,13 +1041,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_omega;1",
+        "@id": "dtmi:example:flunn_mu;1",
         "@type": "Interface",
         "contents": {
           "@id": "dtmi:standard:example;1",
           "@type": "Telemetry",
-          "name": "yuzz_psi",
-          "schema": "dateTime"
+          "name": "flunn_lambda",
+          "schema": "integer"
         }
       }
     ]
@@ -1060,14 +1060,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_wum;1",
+        "@id": "dtmi:example:flunn_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@id": "dtmi:standard:example;1",
           "@type": "Telemetry",
-          "name": "yuzz_yuzz",
-          "schema": "double"
+          "name": "flunn_nu",
+          "schema": "long"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryIdNotArrayV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryIdNotArrayV3.json
index cbe9fb3f..9d0870b9 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryIdNotArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryIdNotArrayV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_humpf;1",
+        "@id": "dtmi:example:flunn_pi;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;7"
           ],
           "@type": "Telemetry",
-          "name": "yuzz_um",
-          "schema": "duration"
+          "name": "flunn_omicron",
+          "schema": "string"
         }
       }
     ]
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_glikk;1",
+        "@id": "dtmi:example:flunn_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,8 +36,8 @@
             "dtmi:foo:bar;7"
           ],
           "@type": "Telemetry",
-          "name": "yuzz_fuddle",
-          "schema": "float"
+          "name": "flunn_rho",
+          "schema": "time"
         }
       }
     ]
@@ -50,15 +50,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_snee;1",
+        "@id": "dtmi:example:flunn_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;108675309"
           ],
           "@type": "Telemetry",
-          "name": "yuzz_nuh",
-          "schema": "integer"
+          "name": "flunn_tau",
+          "schema": "boolean"
         }
       }
     ]
@@ -71,7 +71,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_thnad;1",
+        "@id": "dtmi:example:flunn_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -79,8 +79,8 @@
             "dtmi:foo:bar;108675309"
           ],
           "@type": "Telemetry",
-          "name": "yuzz_quan",
-          "schema": "long"
+          "name": "flunn_phi",
+          "schema": "date"
         }
       }
     ]
@@ -93,15 +93,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_floob;1",
+        "@id": "dtmi:example:flunn_omega;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;999999999"
           ],
           "@type": "Telemetry",
-          "name": "yuzz_spazz",
-          "schema": "string"
+          "name": "flunn_psi",
+          "schema": "dateTime"
         }
       }
     ]
@@ -114,7 +114,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_jogg;1",
+        "@id": "dtmi:example:flunn_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -122,8 +122,8 @@
             "dtmi:foo:bar;999999999"
           ],
           "@type": "Telemetry",
-          "name": "yuzz_zatz",
-          "schema": "time"
+          "name": "flunn_yuzz",
+          "schema": "double"
         }
       }
     ]
@@ -136,15 +136,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_itch;1",
+        "@id": "dtmi:example:flunn_humpf;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo;1"
           ],
           "@type": "Telemetry",
-          "name": "yuzz_flunn",
-          "schema": "boolean"
+          "name": "flunn_um",
+          "schema": "duration"
         }
       }
     ]
@@ -157,7 +157,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:yuzz_vroo;1",
+        "@id": "dtmi:example:flunn_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -165,8 +165,8 @@
             "dtmi:foo;1"
           ],
           "@type": "Telemetry",
-          "name": "yuzz_yekk",
-          "schema": "date"
+          "name": "flunn_fuddle",
+          "schema": "float"
         }
       }
     ]
@@ -179,15 +179,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_alpha;1",
+        "@id": "dtmi:example:flunn_snee;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar"
           ],
           "@type": "Telemetry",
-          "name": "yuzz_hi",
-          "schema": "dateTime"
+          "name": "flunn_nuh",
+          "schema": "integer"
         }
       }
     ]
@@ -200,7 +200,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_gamma;1",
+        "@id": "dtmi:example:flunn_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -208,8 +208,8 @@
             "dtmi:foo:bar"
           ],
           "@type": "Telemetry",
-          "name": "wum_beta",
-          "schema": "double"
+          "name": "flunn_quan",
+          "schema": "long"
         }
       }
     ]
@@ -222,15 +222,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_epsilon;1",
+        "@id": "dtmi:example:flunn_floob;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;3.14"
           ],
           "@type": "Telemetry",
-          "name": "wum_delta",
-          "schema": "duration"
+          "name": "flunn_spazz",
+          "schema": "string"
         }
       }
     ]
@@ -243,7 +243,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_eta;1",
+        "@id": "dtmi:example:flunn_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -251,8 +251,8 @@
             "dtmi:foo:bar;3.14"
           ],
           "@type": "Telemetry",
-          "name": "wum_zeta",
-          "schema": "float"
+          "name": "flunn_zatz",
+          "schema": "time"
         }
       }
     ]
@@ -265,15 +265,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_iota;1",
+        "@id": "dtmi:example:flunn_itch;1",
         "@type": "Interface",
         "contents": {
           "@id": [
             "dtmi:foo:bar;3.141592"
           ],
           "@type": "Telemetry",
-          "name": "wum_theta",
-          "schema": "integer"
+          "name": "flunn_flunn",
+          "schema": "boolean"
         }
       }
     ]
@@ -286,7 +286,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_lambda;1",
+        "@id": "dtmi:example:flunn_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -294,8 +294,8 @@
             "dtmi:foo:bar;3.141592"
           ],
           "@type": "Telemetry",
-          "name": "wum_kappa",
-          "schema": "long"
+          "name": "flunn_yekk",
+          "schema": "date"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryInvalidKeywordsV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryInvalidKeywordsV3.json
index 1426e567..f46cc528 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryInvalidKeywordsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryInvalidKeywordsV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_iota;1",
+        "@id": "dtmi:example:alpha_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "nuh_theta",
-          "schema": "double",
+          "name": "alpha_flunn",
+          "schema": "long",
           "@graph": {}
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_lambda;1",
+        "@id": "dtmi:example:alpha_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "nuh_kappa",
-          "schema": "duration",
+          "name": "alpha_yekk",
+          "schema": "string",
           "@graph": {}
         }
       }
@@ -46,12 +46,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_nu;1",
+        "@id": "dtmi:example:beta_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "nuh_mu",
-          "schema": "float",
+          "name": "alpha_hi",
+          "schema": "time",
           "@value": 626
         }
       }
@@ -65,13 +65,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_omicron;1",
+        "@id": "dtmi:example:beta_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "nuh_xi",
-          "schema": "integer",
+          "name": "beta_beta",
+          "schema": "boolean",
           "@value": 626
         }
       }
@@ -85,12 +85,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_rho;1",
+        "@id": "dtmi:example:beta_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "nuh_pi",
-          "schema": "long",
+          "name": "beta_delta",
+          "schema": "date",
           "@language": "en"
         }
       }
@@ -104,13 +104,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_tau;1",
+        "@id": "dtmi:example:beta_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "nuh_sigma",
-          "schema": "string",
+          "name": "beta_zeta",
+          "schema": "dateTime",
           "@language": "en"
         }
       }
@@ -124,12 +124,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_phi;1",
+        "@id": "dtmi:example:beta_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "nuh_upsilon",
-          "schema": "time",
+          "name": "beta_theta",
+          "schema": "double",
           "@foobar": true
         }
       }
@@ -143,13 +143,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_psi;1",
+        "@id": "dtmi:example:beta_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "nuh_chi",
-          "schema": "boolean",
+          "name": "beta_kappa",
+          "schema": "duration",
           "@foobar": true
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyCommentStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyCommentStringLengthV3.json
index 08c880b8..e243f393 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyCommentStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyCommentStringLengthV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_pi;1",
+        "@id": "dtmi:example:yekk_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "um_omicron",
-          "schema": "date",
+          "name": "yekk_gamma",
+          "schema": "float",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_sigma;1",
+        "@id": "dtmi:example:yekk_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "um_rho",
-          "schema": "dateTime",
+          "name": "yekk_epsilon",
+          "schema": "integer",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -45,13 +45,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_upsilon;1",
+        "@id": "dtmi:example:yekk_theta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "um_tau",
-          "schema": "double",
+          "name": "yekk_eta",
+          "schema": "long",
           "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyCommentStringV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyCommentStringV3.json
index 2d30c827..befccb93 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyCommentStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyCommentStringV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_rho;1",
+        "@id": "dtmi:example:itch_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "wum_pi",
-          "schema": "boolean",
+          "name": "itch_delta",
+          "schema": "duration",
           "comment": "hello"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_tau;1",
+        "@id": "dtmi:example:itch_eta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "wum_sigma",
-          "schema": "date",
+          "name": "itch_zeta",
+          "schema": "float",
           "comment": [
             "hello"
           ]
@@ -47,12 +47,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_phi;1",
+        "@id": "dtmi:example:itch_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "wum_upsilon",
-          "schema": "dateTime",
+          "name": "itch_theta",
+          "schema": "integer",
           "comment": {
             "@value": "hello",
             "@type": "xsd:string"
@@ -69,12 +69,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_psi;1",
+        "@id": "dtmi:example:itch_lambda;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "wum_chi",
-          "schema": "double",
+          "name": "itch_kappa",
+          "schema": "long",
           "comment": [
             {
               "@value": "hello",
@@ -93,12 +93,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_yuzz;1",
+        "@id": "dtmi:example:itch_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "wum_omega",
-          "schema": "duration",
+          "name": "itch_mu",
+          "schema": "string",
           "comment": []
         }
       }
@@ -112,12 +112,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_um;1",
+        "@id": "dtmi:example:itch_omicron;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "wum_wum",
-          "schema": "float",
+          "name": "itch_xi",
+          "schema": "time",
           "comment": null
         }
       }
@@ -131,13 +131,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_fuddle;1",
+        "@id": "dtmi:example:itch_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "wum_humpf",
-          "schema": "integer",
+          "name": "itch_pi",
+          "schema": "boolean",
           "comment": null
         }
       }
@@ -151,12 +151,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_nuh;1",
+        "@id": "dtmi:example:itch_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "wum_glikk",
-          "schema": "long",
+          "name": "itch_sigma",
+          "schema": "date",
           "comment": true
         }
       }
@@ -170,13 +170,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_quan;1",
+        "@id": "dtmi:example:itch_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "wum_snee",
-          "schema": "string",
+          "name": "itch_upsilon",
+          "schema": "dateTime",
           "comment": true
         }
       }
@@ -190,12 +190,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_spazz;1",
+        "@id": "dtmi:example:itch_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "wum_thnad",
-          "schema": "time",
+          "name": "itch_chi",
+          "schema": "double",
           "comment": 626
         }
       }
@@ -209,13 +209,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_zatz;1",
+        "@id": "dtmi:example:itch_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "wum_floob",
-          "schema": "boolean",
+          "name": "itch_omega",
+          "schema": "duration",
           "comment": 626
         }
       }
@@ -229,12 +229,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_flunn;1",
+        "@id": "dtmi:example:itch_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "wum_jogg",
-          "schema": "date",
+          "name": "itch_wum",
+          "schema": "float",
           "comment": [
             null
           ]
@@ -250,13 +250,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_yekk;1",
+        "@id": "dtmi:example:itch_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "wum_itch",
-          "schema": "dateTime",
+          "name": "itch_humpf",
+          "schema": "integer",
           "comment": [
             null
           ]
@@ -272,12 +272,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:wum_hi;1",
+        "@id": "dtmi:example:itch_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "wum_vroo",
-          "schema": "double",
+          "name": "itch_glikk",
+          "schema": "long",
           "comment": [
             true
           ]
@@ -293,13 +293,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_beta;1",
+        "@id": "dtmi:example:itch_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "um_alpha",
-          "schema": "duration",
+          "name": "itch_snee",
+          "schema": "string",
           "comment": [
             true
           ]
@@ -315,12 +315,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_delta;1",
+        "@id": "dtmi:example:itch_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "um_gamma",
-          "schema": "float",
+          "name": "itch_thnad",
+          "schema": "time",
           "comment": [
             626
           ]
@@ -336,13 +336,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_zeta;1",
+        "@id": "dtmi:example:itch_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "um_epsilon",
-          "schema": "integer",
+          "name": "itch_floob",
+          "schema": "boolean",
           "comment": [
             626
           ]
@@ -358,12 +358,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_theta;1",
+        "@id": "dtmi:example:itch_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "um_eta",
-          "schema": "long",
+          "name": "itch_jogg",
+          "schema": "date",
           "comment": {}
         }
       }
@@ -377,13 +377,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_kappa;1",
+        "@id": "dtmi:example:itch_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "um_iota",
-          "schema": "string",
+          "name": "itch_itch",
+          "schema": "dateTime",
           "comment": {}
         }
       }
@@ -397,12 +397,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_mu;1",
+        "@id": "dtmi:example:itch_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "um_lambda",
-          "schema": "time",
+          "name": "itch_vroo",
+          "schema": "double",
           "comment": [
             {}
           ]
@@ -418,13 +418,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_xi;1",
+        "@id": "dtmi:example:yekk_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "um_nu",
-          "schema": "boolean",
+          "name": "yekk_alpha",
+          "schema": "duration",
           "comment": [
             {}
           ]
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyCommentTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyCommentTermAndDtmiV3.json
index aabfe343..bb131acb 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyCommentTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyCommentTermAndDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_quan;1",
+        "@id": "dtmi:example:yekk_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "comment": "um_glikk",
-          "dtmi:dtdl:property:comment;3": "um_nuh",
-          "name": "um_snee",
-          "schema": "long"
+          "comment": "yekk_sigma",
+          "dtmi:dtdl:property:comment;3": "yekk_tau",
+          "name": "yekk_upsilon",
+          "schema": "date"
         }
       }
     ]
@@ -27,15 +27,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_zatz;1",
+        "@id": "dtmi:example:yekk_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "comment": "um_thnad",
-          "dtmi:dtdl:property:comment;3": "um_spazz",
-          "name": "um_floob",
-          "schema": "string"
+          "comment": "yekk_chi",
+          "dtmi:dtdl:property:comment;3": "yekk_psi",
+          "name": "yekk_omega",
+          "schema": "dateTime"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyDescriptionLangStringV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyDescriptionLangStringV3.json
index 15e0de31..43aa0369 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyDescriptionLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyDescriptionLangStringV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_flunn;1",
+        "@id": "dtmi:example:yekk_um;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "um_jogg",
-          "schema": "time",
+          "name": "yekk_wum",
+          "schema": "double",
           "description": "hello"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_yekk;1",
+        "@id": "dtmi:example:yekk_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "um_itch",
-          "schema": "boolean",
+          "name": "yekk_humpf",
+          "schema": "duration",
           "description": [
             "hello"
           ]
@@ -47,12 +47,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:um_hi;1",
+        "@id": "dtmi:example:yekk_nuh;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "um_vroo",
-          "schema": "date",
+          "name": "yekk_glikk",
+          "schema": "float",
           "description": {
             "en": "hello"
           }
@@ -68,12 +68,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_beta;1",
+        "@id": "dtmi:example:yekk_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "humpf_alpha",
-          "schema": "dateTime",
+          "name": "yekk_snee",
+          "schema": "integer",
           "description": [
             {
               "@value": "hello",
@@ -92,12 +92,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_delta;1",
+        "@id": "dtmi:example:yekk_spazz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "humpf_gamma",
-          "schema": "double",
+          "name": "yekk_thnad",
+          "schema": "long",
           "description": {}
         }
       }
@@ -111,12 +111,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_zeta;1",
+        "@id": "dtmi:example:yekk_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "humpf_epsilon",
-          "schema": "duration",
+          "name": "yekk_floob",
+          "schema": "string",
           "description": []
         }
       }
@@ -130,12 +130,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_theta;1",
+        "@id": "dtmi:example:yekk_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "humpf_eta",
-          "schema": "float",
+          "name": "yekk_jogg",
+          "schema": "time",
           "description": null
         }
       }
@@ -149,13 +149,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_kappa;1",
+        "@id": "dtmi:example:yekk_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "humpf_iota",
-          "schema": "integer",
+          "name": "yekk_itch",
+          "schema": "boolean",
           "description": null
         }
       }
@@ -169,12 +169,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_mu;1",
+        "@id": "dtmi:example:yekk_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "humpf_lambda",
-          "schema": "long",
+          "name": "yekk_vroo",
+          "schema": "date",
           "description": true
         }
       }
@@ -188,13 +188,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_xi;1",
+        "@id": "dtmi:example:vroo_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "humpf_nu",
-          "schema": "string",
+          "name": "vroo_alpha",
+          "schema": "dateTime",
           "description": true
         }
       }
@@ -208,12 +208,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_pi;1",
+        "@id": "dtmi:example:vroo_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "humpf_omicron",
-          "schema": "time",
+          "name": "vroo_gamma",
+          "schema": "double",
           "description": 626
         }
       }
@@ -227,13 +227,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_sigma;1",
+        "@id": "dtmi:example:vroo_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "humpf_rho",
-          "schema": "boolean",
+          "name": "vroo_epsilon",
+          "schema": "duration",
           "description": 626
         }
       }
@@ -247,12 +247,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_upsilon;1",
+        "@id": "dtmi:example:vroo_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "humpf_tau",
-          "schema": "date",
+          "name": "vroo_eta",
+          "schema": "float",
           "description": [
             null
           ]
@@ -268,13 +268,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_chi;1",
+        "@id": "dtmi:example:vroo_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "humpf_phi",
-          "schema": "dateTime",
+          "name": "vroo_iota",
+          "schema": "integer",
           "description": [
             null
           ]
@@ -290,12 +290,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_omega;1",
+        "@id": "dtmi:example:vroo_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "humpf_psi",
-          "schema": "double",
+          "name": "vroo_lambda",
+          "schema": "long",
           "description": [
             true
           ]
@@ -311,13 +311,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_wum;1",
+        "@id": "dtmi:example:vroo_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "humpf_yuzz",
-          "schema": "duration",
+          "name": "vroo_nu",
+          "schema": "string",
           "description": [
             true
           ]
@@ -333,12 +333,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_humpf;1",
+        "@id": "dtmi:example:vroo_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "humpf_um",
-          "schema": "float",
+          "name": "vroo_omicron",
+          "schema": "time",
           "description": [
             626
           ]
@@ -354,13 +354,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_glikk;1",
+        "@id": "dtmi:example:vroo_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "humpf_fuddle",
-          "schema": "integer",
+          "name": "vroo_rho",
+          "schema": "boolean",
           "description": [
             626
           ]
@@ -376,12 +376,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_snee;1",
+        "@id": "dtmi:example:vroo_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "humpf_nuh",
-          "schema": "long",
+          "name": "vroo_tau",
+          "schema": "date",
           "description": [
             {}
           ]
@@ -397,13 +397,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_thnad;1",
+        "@id": "dtmi:example:vroo_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "humpf_quan",
-          "schema": "string",
+          "name": "vroo_phi",
+          "schema": "dateTime",
           "description": [
             {}
           ]
@@ -419,12 +419,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_floob;1",
+        "@id": "dtmi:example:vroo_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "humpf_spazz",
-          "schema": "time",
+          "name": "vroo_psi",
+          "schema": "double",
           "description": {
             "@value": "hello",
             "@language": "en"
@@ -441,13 +441,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_jogg;1",
+        "@id": "dtmi:example:vroo_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "humpf_zatz",
-          "schema": "boolean",
+          "name": "vroo_yuzz",
+          "schema": "duration",
           "description": {
             "@value": "hello",
             "@language": "en"
@@ -464,12 +464,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_itch;1",
+        "@id": "dtmi:example:vroo_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "humpf_flunn",
-          "schema": "date",
+          "name": "vroo_um",
+          "schema": "float",
           "description": [
             {
               "en": "hello"
@@ -487,13 +487,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:humpf_vroo;1",
+        "@id": "dtmi:example:vroo_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "humpf_yekk",
-          "schema": "dateTime",
+          "name": "vroo_fuddle",
+          "schema": "integer",
           "description": [
             {
               "en": "hello"
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyDescriptionStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyDescriptionStringLengthV3.json
index b86cfc3d..9d485e92 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyDescriptionStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyDescriptionStringLengthV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_alpha;1",
+        "@id": "dtmi:example:vroo_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "humpf_hi",
-          "schema": "double",
+          "name": "vroo_nuh",
+          "schema": "long",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_gamma;1",
+        "@id": "dtmi:example:vroo_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "fuddle_beta",
-          "schema": "duration",
+          "name": "vroo_quan",
+          "schema": "string",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -45,13 +45,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_epsilon;1",
+        "@id": "dtmi:example:vroo_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "fuddle_delta",
-          "schema": "float",
+          "name": "vroo_spazz",
+          "schema": "time",
           "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyDescriptionTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyDescriptionTermAndDtmiV3.json
index bfabca90..41ce180f 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyDescriptionTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyDescriptionTermAndDtmiV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_sigma;1",
+        "@id": "dtmi:example:hi_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
           "description": [
-            "fuddle_omicron"
+            "hi_gamma"
           ],
           "dtmi:dtdl:property:description;3": [
-            "fuddle_pi"
+            "hi_delta"
           ],
-          "name": "fuddle_rho",
-          "schema": "time"
+          "name": "hi_epsilon",
+          "schema": "double"
         }
       }
     ]
@@ -31,19 +31,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_chi;1",
+        "@id": "dtmi:example:hi_kappa;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
           "description": [
-            "fuddle_tau"
+            "hi_eta"
           ],
           "dtmi:dtdl:property:description;3": [
-            "fuddle_upsilon"
+            "hi_theta"
           ],
-          "name": "fuddle_phi",
-          "schema": "boolean"
+          "name": "hi_iota",
+          "schema": "duration"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyDisplayNameLangStringV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyDisplayNameLangStringV3.json
index 48bd3e0d..ae2b4a82 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyDisplayNameLangStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyDisplayNameLangStringV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_omega;1",
+        "@id": "dtmi:example:hi_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "fuddle_psi",
-          "schema": "date",
+          "name": "hi_lambda",
+          "schema": "float",
           "displayName": "hello"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_wum;1",
+        "@id": "dtmi:example:hi_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "fuddle_yuzz",
-          "schema": "dateTime",
+          "name": "hi_nu",
+          "schema": "integer",
           "displayName": [
             "hello"
           ]
@@ -47,12 +47,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_humpf;1",
+        "@id": "dtmi:example:hi_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "fuddle_um",
-          "schema": "double",
+          "name": "hi_omicron",
+          "schema": "long",
           "displayName": {
             "en": "hello"
           }
@@ -68,12 +68,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_glikk;1",
+        "@id": "dtmi:example:hi_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "fuddle_fuddle",
-          "schema": "duration",
+          "name": "hi_rho",
+          "schema": "string",
           "displayName": [
             {
               "@value": "hello",
@@ -92,12 +92,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_snee;1",
+        "@id": "dtmi:example:hi_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "fuddle_nuh",
-          "schema": "float",
+          "name": "hi_tau",
+          "schema": "time",
           "displayName": {}
         }
       }
@@ -111,12 +111,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_thnad;1",
+        "@id": "dtmi:example:hi_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "fuddle_quan",
-          "schema": "integer",
+          "name": "hi_phi",
+          "schema": "boolean",
           "displayName": []
         }
       }
@@ -130,12 +130,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_floob;1",
+        "@id": "dtmi:example:hi_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "fuddle_spazz",
-          "schema": "long",
+          "name": "hi_psi",
+          "schema": "date",
           "displayName": null
         }
       }
@@ -149,13 +149,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_jogg;1",
+        "@id": "dtmi:example:hi_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "fuddle_zatz",
-          "schema": "string",
+          "name": "hi_yuzz",
+          "schema": "dateTime",
           "displayName": null
         }
       }
@@ -169,12 +169,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_itch;1",
+        "@id": "dtmi:example:hi_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "fuddle_flunn",
-          "schema": "time",
+          "name": "hi_um",
+          "schema": "double",
           "displayName": true
         }
       }
@@ -188,13 +188,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:fuddle_vroo;1",
+        "@id": "dtmi:example:hi_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "fuddle_yekk",
-          "schema": "boolean",
+          "name": "hi_fuddle",
+          "schema": "duration",
           "displayName": true
         }
       }
@@ -208,12 +208,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_alpha;1",
+        "@id": "dtmi:example:hi_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "fuddle_hi",
-          "schema": "date",
+          "name": "hi_nuh",
+          "schema": "float",
           "displayName": 626
         }
       }
@@ -227,13 +227,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_gamma;1",
+        "@id": "dtmi:example:hi_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "glikk_beta",
-          "schema": "dateTime",
+          "name": "hi_quan",
+          "schema": "integer",
           "displayName": 626
         }
       }
@@ -247,12 +247,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_epsilon;1",
+        "@id": "dtmi:example:hi_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "glikk_delta",
-          "schema": "double",
+          "name": "hi_spazz",
+          "schema": "long",
           "displayName": [
             null
           ]
@@ -268,13 +268,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_eta;1",
+        "@id": "dtmi:example:hi_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "glikk_zeta",
-          "schema": "duration",
+          "name": "hi_zatz",
+          "schema": "string",
           "displayName": [
             null
           ]
@@ -290,12 +290,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_iota;1",
+        "@id": "dtmi:example:hi_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "glikk_theta",
-          "schema": "float",
+          "name": "hi_flunn",
+          "schema": "time",
           "displayName": [
             true
           ]
@@ -311,13 +311,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_lambda;1",
+        "@id": "dtmi:example:hi_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "glikk_kappa",
-          "schema": "integer",
+          "name": "hi_yekk",
+          "schema": "boolean",
           "displayName": [
             true
           ]
@@ -333,12 +333,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_nu;1",
+        "@id": "dtmi:example:alpha_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "glikk_mu",
-          "schema": "long",
+          "name": "hi_hi",
+          "schema": "date",
           "displayName": [
             626
           ]
@@ -354,13 +354,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_omicron;1",
+        "@id": "dtmi:example:alpha_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "glikk_xi",
-          "schema": "string",
+          "name": "alpha_beta",
+          "schema": "dateTime",
           "displayName": [
             626
           ]
@@ -376,12 +376,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_rho;1",
+        "@id": "dtmi:example:alpha_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "glikk_pi",
-          "schema": "time",
+          "name": "alpha_delta",
+          "schema": "double",
           "displayName": [
             {}
           ]
@@ -397,13 +397,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_tau;1",
+        "@id": "dtmi:example:alpha_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "glikk_sigma",
-          "schema": "boolean",
+          "name": "alpha_zeta",
+          "schema": "duration",
           "displayName": [
             {}
           ]
@@ -419,12 +419,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_phi;1",
+        "@id": "dtmi:example:alpha_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "glikk_upsilon",
-          "schema": "date",
+          "name": "alpha_theta",
+          "schema": "float",
           "displayName": {
             "@value": "hello",
             "@language": "en"
@@ -441,13 +441,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_psi;1",
+        "@id": "dtmi:example:alpha_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "glikk_chi",
-          "schema": "dateTime",
+          "name": "alpha_kappa",
+          "schema": "integer",
           "displayName": {
             "@value": "hello",
             "@language": "en"
@@ -464,12 +464,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_yuzz;1",
+        "@id": "dtmi:example:alpha_nu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "glikk_omega",
-          "schema": "double",
+          "name": "alpha_mu",
+          "schema": "long",
           "displayName": [
             {
               "en": "hello"
@@ -487,13 +487,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_um;1",
+        "@id": "dtmi:example:alpha_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "glikk_wum",
-          "schema": "duration",
+          "name": "alpha_xi",
+          "schema": "string",
           "displayName": [
             {
               "en": "hello"
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyDisplayNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyDisplayNameStringLengthV3.json
index f30a7570..84dd4878 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyDisplayNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyDisplayNameStringLengthV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_fuddle;1",
+        "@id": "dtmi:example:alpha_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "glikk_humpf",
-          "schema": "float",
+          "name": "alpha_pi",
+          "schema": "time",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
         }
       }
@@ -26,12 +26,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_nuh;1",
+        "@id": "dtmi:example:alpha_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "glikk_glikk",
-          "schema": "integer",
+          "name": "alpha_sigma",
+          "schema": "boolean",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
@@ -45,13 +45,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:glikk_quan;1",
+        "@id": "dtmi:example:alpha_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "glikk_snee",
-          "schema": "long",
+          "name": "alpha_upsilon",
+          "schema": "date",
           "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyDisplayNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyDisplayNameTermAndDtmiV3.json
index f3385661..718fcfec 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyDisplayNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyDisplayNameTermAndDtmiV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_gamma;1",
+        "@id": "dtmi:example:alpha_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
           "displayName": [
-            "glikk_hi"
+            "alpha_nuh"
           ],
           "dtmi:dtdl:property:displayName;3": [
-            "nuh_alpha"
+            "alpha_snee"
           ],
-          "name": "nuh_beta",
-          "schema": "date"
+          "name": "alpha_quan",
+          "schema": "float"
         }
       }
     ]
@@ -31,19 +31,19 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_eta;1",
+        "@id": "dtmi:example:alpha_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
           "displayName": [
-            "nuh_delta"
+            "alpha_spazz"
           ],
           "dtmi:dtdl:property:displayName;3": [
-            "nuh_epsilon"
+            "alpha_floob"
           ],
-          "name": "nuh_zeta",
-          "schema": "dateTime"
+          "name": "alpha_zatz",
+          "schema": "integer"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyFormallyIrrelevantDtmiOrTermV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyFormallyIrrelevantDtmiOrTermV3.json
index d3ea2fbd..88ed166f 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyFormallyIrrelevantDtmiOrTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyFormallyIrrelevantDtmiOrTermV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_quan;1",
+        "@id": "dtmi:example:beta_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "nuh_snee",
-          "schema": "float",
+          "name": "beta_upsilon",
+          "schema": "time",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_spazz;1",
+        "@id": "dtmi:example:beta_psi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "nuh_thnad",
-          "schema": "integer",
+          "name": "beta_chi",
+          "schema": "boolean",
           "dtmi:foo:bar;1": 626
         }
       }
@@ -46,12 +46,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_zatz;1",
+        "@id": "dtmi:example:beta_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "nuh_floob",
-          "schema": "long",
+          "name": "beta_omega",
+          "schema": "date",
           "boolean": null
         }
       }
@@ -65,13 +65,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_flunn;1",
+        "@id": "dtmi:example:beta_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "nuh_jogg",
-          "schema": "string",
+          "name": "beta_wum",
+          "schema": "dateTime",
           "boolean": null
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyFormallyUndefinedTermV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyFormallyUndefinedTermV3.json
index dafb8590..37eb9b93 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyFormallyUndefinedTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyFormallyUndefinedTermV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_kappa;1",
+        "@id": "dtmi:example:beta_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "snee_iota",
-          "schema": "float",
+          "name": "beta_itch",
+          "schema": "time",
           "foobar": {}
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_mu;1",
+        "@id": "dtmi:example:beta_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "snee_lambda",
-          "schema": "integer",
+          "name": "beta_vroo",
+          "schema": "boolean",
           "foobar": {}
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyInvalidDtmiV3.json
index 8d93ff70..691eb73c 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyInvalidDtmiV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_yekk;1",
+        "@id": "dtmi:example:beta_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Foobar"
           ],
-          "name": "nuh_itch",
-          "schema": "time",
+          "name": "beta_humpf",
+          "schema": "double",
           "dtmi:foo//bar": 626
         }
       }
@@ -29,7 +29,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nuh_hi;1",
+        "@id": "dtmi:example:beta_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -37,8 +37,8 @@
             "Telemetry",
             "Foobar"
           ],
-          "name": "nuh_vroo",
-          "schema": "boolean",
+          "name": "beta_glikk",
+          "schema": "duration",
           "dtmi:foo//bar": 626
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyNamePatternV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyNamePatternV3.json
index 8cc055aa..a4563468 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyNamePatternV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyNamePatternV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_beta;1",
+        "@id": "dtmi:example:fuddle_tau;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -25,7 +25,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_gamma;1",
+        "@id": "dtmi:example:fuddle_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -43,7 +43,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_delta;1",
+        "@id": "dtmi:example:fuddle_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -61,7 +61,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_epsilon;1",
+        "@id": "dtmi:example:fuddle_chi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -79,7 +79,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_zeta;1",
+        "@id": "dtmi:example:fuddle_psi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -97,7 +97,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_eta;1",
+        "@id": "dtmi:example:fuddle_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -115,7 +115,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_theta;1",
+        "@id": "dtmi:example:fuddle_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -134,7 +134,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_iota;1",
+        "@id": "dtmi:example:fuddle_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -152,7 +152,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_kappa;1",
+        "@id": "dtmi:example:fuddle_um;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -171,7 +171,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_lambda;1",
+        "@id": "dtmi:example:fuddle_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -189,7 +189,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_mu;1",
+        "@id": "dtmi:example:fuddle_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -208,7 +208,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_nu;1",
+        "@id": "dtmi:example:fuddle_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -226,7 +226,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_xi;1",
+        "@id": "dtmi:example:fuddle_nuh;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -245,7 +245,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_omicron;1",
+        "@id": "dtmi:example:fuddle_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -263,7 +263,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_pi;1",
+        "@id": "dtmi:example:fuddle_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -282,7 +282,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_rho;1",
+        "@id": "dtmi:example:fuddle_thnad;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -300,7 +300,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_sigma;1",
+        "@id": "dtmi:example:fuddle_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -319,7 +319,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_tau;1",
+        "@id": "dtmi:example:fuddle_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -337,7 +337,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_upsilon;1",
+        "@id": "dtmi:example:fuddle_zatz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -356,7 +356,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_phi;1",
+        "@id": "dtmi:example:fuddle_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -374,7 +374,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_chi;1",
+        "@id": "dtmi:example:fuddle_flunn;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -393,7 +393,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_psi;1",
+        "@id": "dtmi:example:fuddle_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -411,7 +411,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_omega;1",
+        "@id": "dtmi:example:fuddle_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -430,7 +430,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_yuzz;1",
+        "@id": "dtmi:example:fuddle_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -448,7 +448,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_wum;1",
+        "@id": "dtmi:example:fuddle_hi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyNameStringLengthV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyNameStringLengthV3.json
index cb7e7a40..88ed851c 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyNameStringLengthV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyNameStringLengthV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_vroo;1",
+        "@id": "dtmi:example:fuddle_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -25,7 +25,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_hi;1",
+        "@id": "dtmi:example:fuddle_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -43,7 +43,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_alpha;1",
+        "@id": "dtmi:example:fuddle_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyNameStringV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyNameStringV3.json
index f979b00e..11fa5404 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyNameStringV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyNameStringV3.json
@@ -7,7 +7,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_upsilon;1",
+        "@id": "dtmi:example:humpf_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -25,7 +25,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_phi;1",
+        "@id": "dtmi:example:humpf_jogg;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -45,7 +45,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_chi;1",
+        "@id": "dtmi:example:humpf_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -66,7 +66,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_psi;1",
+        "@id": "dtmi:example:humpf_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -89,7 +89,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_omega;1",
+        "@id": "dtmi:example:humpf_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -107,7 +107,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_yuzz;1",
+        "@id": "dtmi:example:humpf_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -126,7 +126,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_wum;1",
+        "@id": "dtmi:example:humpf_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -144,7 +144,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_um;1",
+        "@id": "dtmi:example:fuddle_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -163,7 +163,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_humpf;1",
+        "@id": "dtmi:example:fuddle_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -181,7 +181,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_fuddle;1",
+        "@id": "dtmi:example:fuddle_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -200,7 +200,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_glikk;1",
+        "@id": "dtmi:example:fuddle_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -220,7 +220,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_nuh;1",
+        "@id": "dtmi:example:fuddle_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -241,7 +241,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_snee;1",
+        "@id": "dtmi:example:fuddle_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -261,7 +261,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_quan;1",
+        "@id": "dtmi:example:fuddle_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -282,7 +282,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_thnad;1",
+        "@id": "dtmi:example:fuddle_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -302,7 +302,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_spazz;1",
+        "@id": "dtmi:example:fuddle_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -323,7 +323,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_floob;1",
+        "@id": "dtmi:example:fuddle_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -341,7 +341,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_zatz;1",
+        "@id": "dtmi:example:fuddle_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -360,7 +360,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_jogg;1",
+        "@id": "dtmi:example:fuddle_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -380,7 +380,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_flunn;1",
+        "@id": "dtmi:example:fuddle_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -401,7 +401,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_itch;1",
+        "@id": "dtmi:example:fuddle_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -419,7 +419,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_yekk;1",
+        "@id": "dtmi:example:fuddle_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyNameTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyNameTermAndDtmiV3.json
index 5b0d2068..ef02e400 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyNameTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyNameTermAndDtmiV3.json
@@ -7,12 +7,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_jogg;1",
+        "@id": "dtmi:example:glikk_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "pi_floob",
-          "dtmi:dtdl:property:name;3": "pi_zatz",
+          "name": "glikk_kappa",
+          "dtmi:dtdl:property:name;3": "glikk_lambda",
           "schema": "string"
         }
       }
@@ -26,13 +26,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_yekk;1",
+        "@id": "dtmi:example:glikk_omicron;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "pi_flunn",
-          "dtmi:dtdl:property:name;3": "pi_itch",
+          "name": "glikk_nu",
+          "dtmi:dtdl:property:name;3": "glikk_xi",
           "schema": "time"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyNameUniqueAmongInterfaceContentsV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyNameUniqueAmongInterfaceContentsV3.json
index 9035a4b5..9c626761 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyNameUniqueAmongInterfaceContentsV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyNameUniqueAmongInterfaceContentsV3.json
@@ -7,18 +7,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_um;1",
+        "@id": "dtmi:example:glikk_alpha;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Telemetry",
             "schema": "time",
-            "name": "gamma_spazz"
+            "name": "gamma_itch"
           },
           {
             "@type": "Telemetry",
             "schema": "boolean",
-            "name": "gamma_floob"
+            "name": "gamma_yekk"
           }
         ]
       }
@@ -32,18 +32,18 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:pi_humpf;1",
+        "@id": "dtmi:example:glikk_beta;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Telemetry",
             "schema": "date",
-            "name": "gamma_spazz"
+            "name": "gamma_itch"
           },
           {
             "@type": "Telemetry",
             "schema": "dateTime",
-            "name": "gamma_spazz"
+            "name": "gamma_itch"
           }
         ]
       }
@@ -60,18 +60,18 @@
           "dtmi:dtdl:context;3",
           "dtmi:undefinedExtension:context;1"
         ],
-        "@id": "dtmi:example:pi_fuddle;1",
+        "@id": "dtmi:example:glikk_gamma;1",
         "@type": "Interface",
         "contents": [
           {
             "@type": "Telemetry",
             "schema": "double",
-            "name": "gamma_spazz"
+            "name": "gamma_itch"
           },
           {
             "@type": "Telemetry",
             "schema": "duration",
-            "name": "gamma_spazz"
+            "name": "gamma_itch"
           }
         ]
       }
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyNotDtmiNorTermV3.json
index 720e07dc..a59e6e79 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryPropertyNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryPropertyNotDtmiNorTermV3.json
@@ -7,15 +7,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_beta;1",
+        "@id": "dtmi:example:beta_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "Foobar"
           ],
-          "name": "snee_alpha",
-          "schema": "date",
+          "name": "beta_snee",
+          "schema": "float",
           "http://foo.com/bar": true
         }
       }
@@ -29,7 +29,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:snee_delta;1",
+        "@id": "dtmi:example:beta_spazz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -37,8 +37,8 @@
             "Telemetry",
             "Foobar"
           ],
-          "name": "snee_gamma",
-          "schema": "dateTime",
+          "name": "beta_thnad",
+          "schema": "integer",
           "http://foo.com/bar": true
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryPropertySchemaElementV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryPropertySchemaElementV3.json
index 9dca7ed6..73ef6e66 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryPropertySchemaElementV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryPropertySchemaElementV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_alpha;1",
+        "@id": "dtmi:example:glikk_sigma;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:pi_hi;1",
+          "@id": "dtmi:example:glikk_rho;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "pi_vroo",
+            "name": "glikk_pi",
             "schema": {
               "@type": "Array",
               "elementSchema": "boolean"
@@ -32,14 +32,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_delta;1",
+        "@id": "dtmi:example:glikk_phi;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:rho_gamma;1",
+          "@id": "dtmi:example:glikk_upsilon;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "rho_beta",
+            "name": "glikk_tau",
             "schema": [
               {
                 "@type": "Array",
@@ -59,7 +59,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_epsilon;1",
+        "@id": "dtmi:example:glikk_chi;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
@@ -68,7 +68,7 @@
         },
         "contents": {
           "@type": "Telemetry",
-          "name": "rho_zeta",
+          "name": "glikk_psi",
           "schema": "dtmi:ex:dependentRef;1"
         }
       }
@@ -82,7 +82,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_eta;1",
+        "@id": "dtmi:example:glikk_omega;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
@@ -91,7 +91,7 @@
         },
         "contents": {
           "@type": "Telemetry",
-          "name": "rho_theta",
+          "name": "glikk_yuzz",
           "schema": [
             "dtmi:ex:dependentRef;1"
           ]
@@ -107,16 +107,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_mu;1",
+        "@id": "dtmi:example:glikk_fuddle;1",
         "@type": "Interface",
         "extends": {
-          "@id": "dtmi:example:rho_lambda;1",
+          "@id": "dtmi:example:glikk_humpf;1",
           "@type": "Interface",
           "contents": {
             "@type": "Telemetry",
-            "name": "rho_kappa",
+            "name": "glikk_um",
             "schema": {
-              "@id": "dtmi:example:rho_iota;1",
+              "@id": "dtmi:example:glikk_wum;1",
               "@type": "Array",
               "elementSchema": "duration",
               "@context": "dtmi:dtdl:context;2"
@@ -134,20 +134,75 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_nu;1",
+        "@id": "dtmi:example:glikk_quan;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:glikk_snee;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "glikk_nuh",
+            "schema": {
+              "@id": "dtmi:example:glikk_glikk;1",
+              "@type": "Array",
+              "elementSchema": "uuid",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:glikk_zatz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:glikk_floob;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Telemetry",
+            "name": "glikk_spazz",
+            "schema": {
+              "@id": "dtmi:example:glikk_thnad;1",
+              "@type": "Array",
+              "elementSchema": "boolean",
+              "@context": "dtmi:dtdl:context;4"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;3",
+        "@id": "dtmi:example:glikk_jogg;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Array",
-          "elementSchema": "integer"
+          "elementSchema": "string"
         },
         "contents": {
           "@type": "Telemetry",
-          "name": "rho_xi",
+          "name": "glikk_flunn",
           "schema": [
             {
               "@type": "Array",
-              "elementSchema": "float"
+              "elementSchema": "long"
             },
             "dtmi:ex:dependentRef;1"
           ]
@@ -163,21 +218,21 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_omicron;1",
+        "@id": "dtmi:example:glikk_itch;1",
         "@type": "Interface",
         "schemas": {
           "@id": "dtmi:ex:dependentRef;1",
           "@type": "Array",
-          "elementSchema": "string"
+          "elementSchema": "boolean"
         },
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "rho_pi",
+          "name": "glikk_yekk",
           "schema": [
             {
               "@type": "Array",
-              "elementSchema": "long"
+              "elementSchema": "time"
             },
             "dtmi:ex:dependentRef;1"
           ]
@@ -193,11 +248,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_sigma;1",
+        "@id": "dtmi:example:glikk_hi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "rho_rho",
+          "name": "glikk_vroo",
           "schema": "dateTime"
         }
       }
@@ -211,11 +266,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_upsilon;1",
+        "@id": "dtmi:example:nuh_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "rho_tau",
+          "name": "nuh_alpha",
           "schema": [
             "dateTime"
           ]
@@ -231,11 +286,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_chi;1",
+        "@id": "dtmi:example:nuh_delta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "rho_phi",
+          "name": "nuh_gamma",
           "schema": "dtmi:dtdl:instance:Schema:dateTime;3"
         }
       }
@@ -249,11 +304,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_omega;1",
+        "@id": "dtmi:example:nuh_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "rho_psi",
+          "name": "nuh_epsilon",
           "schema": [
             "dtmi:dtdl:instance:Schema:dateTime;3"
           ]
@@ -269,11 +324,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_wum;1",
+        "@id": "dtmi:example:nuh_theta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "rho_yuzz",
+          "name": "nuh_eta",
           "schema": "point"
         }
       }
@@ -287,11 +342,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_humpf;1",
+        "@id": "dtmi:example:nuh_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "rho_um",
+          "name": "nuh_iota",
           "schema": [
             "point"
           ]
@@ -307,11 +362,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_glikk;1",
+        "@id": "dtmi:example:nuh_mu;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "rho_fuddle",
+          "name": "nuh_lambda",
           "schema": "dtmi:standard:schema:geospatial:point;3"
         }
       }
@@ -325,11 +380,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_snee;1",
+        "@id": "dtmi:example:nuh_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "rho_nuh",
+          "name": "nuh_nu",
           "schema": [
             "dtmi:standard:schema:geospatial:point;3"
           ]
@@ -345,11 +400,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_thnad;1",
+        "@id": "dtmi:example:nuh_pi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "rho_quan",
+          "name": "nuh_omicron",
           "schema": "Foobar"
         }
       }
@@ -363,12 +418,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_floob;1",
+        "@id": "dtmi:example:nuh_sigma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "rho_spazz",
+          "name": "nuh_rho",
           "schema": "Foobar"
         }
       }
@@ -382,11 +437,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_jogg;1",
+        "@id": "dtmi:example:nuh_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "rho_zatz",
+          "name": "nuh_tau",
           "schema": null
         }
       }
@@ -400,12 +455,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_itch;1",
+        "@id": "dtmi:example:nuh_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "rho_flunn",
+          "name": "nuh_phi",
           "schema": null
         }
       }
@@ -419,11 +474,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:rho_vroo;1",
+        "@id": "dtmi:example:nuh_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "rho_yekk",
+          "name": "nuh_psi",
           "schema": true
         }
       }
@@ -437,12 +492,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_alpha;1",
+        "@id": "dtmi:example:nuh_wum;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "rho_hi",
+          "name": "nuh_yuzz",
           "schema": true
         }
       }
@@ -456,11 +511,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_gamma;1",
+        "@id": "dtmi:example:nuh_humpf;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "sigma_beta",
+          "name": "nuh_um",
           "schema": 626
         }
       }
@@ -474,12 +529,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_epsilon;1",
+        "@id": "dtmi:example:nuh_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "sigma_delta",
+          "name": "nuh_fuddle",
           "schema": 626
         }
       }
@@ -493,11 +548,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_eta;1",
+        "@id": "dtmi:example:nuh_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "sigma_zeta",
+          "name": "nuh_nuh",
           "schema": [
             null
           ]
@@ -513,12 +568,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_iota;1",
+        "@id": "dtmi:example:nuh_thnad;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "sigma_theta",
+          "name": "nuh_quan",
           "schema": [
             null
           ]
@@ -534,11 +589,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_lambda;1",
+        "@id": "dtmi:example:nuh_floob;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "sigma_kappa",
+          "name": "nuh_spazz",
           "schema": [
             true
           ]
@@ -554,12 +609,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_nu;1",
+        "@id": "dtmi:example:nuh_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "sigma_mu",
+          "name": "nuh_zatz",
           "schema": [
             true
           ]
@@ -575,11 +630,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_omicron;1",
+        "@id": "dtmi:example:nuh_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "sigma_xi",
+          "name": "nuh_flunn",
           "schema": [
             626
           ]
@@ -595,12 +650,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_rho;1",
+        "@id": "dtmi:example:nuh_vroo;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "sigma_pi",
+          "name": "nuh_yekk",
           "schema": [
             626
           ]
@@ -616,11 +671,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_tau;1",
+        "@id": "dtmi:example:snee_alpha;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "sigma_sigma",
+          "name": "nuh_hi",
           "schema": {}
         }
       }
@@ -634,12 +689,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_phi;1",
+        "@id": "dtmi:example:snee_gamma;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "sigma_upsilon",
+          "name": "snee_beta",
           "schema": {}
         }
       }
@@ -653,11 +708,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_psi;1",
+        "@id": "dtmi:example:snee_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "sigma_chi",
+          "name": "snee_delta",
           "schema": [
             {}
           ]
@@ -673,12 +728,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_yuzz;1",
+        "@id": "dtmi:example:snee_eta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "sigma_omega",
+          "name": "snee_zeta",
           "schema": [
             {}
           ]
@@ -694,11 +749,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_um;1",
+        "@id": "dtmi:example:snee_iota;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "sigma_wum",
+          "name": "snee_theta",
           "schema": []
         }
       }
@@ -712,12 +767,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_fuddle;1",
+        "@id": "dtmi:example:snee_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "sigma_humpf",
+          "name": "snee_kappa",
           "schema": []
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryPropertySchemaTermAndDtmiV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryPropertySchemaTermAndDtmiV3.json
index d8d9ae7a..2bbf721c 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryPropertySchemaTermAndDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryPropertySchemaTermAndDtmiV3.json
@@ -7,13 +7,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_snee;1",
+        "@id": "dtmi:example:spazz_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "phi_nuh",
-          "schema": "integer",
-          "dtmi:dtdl:property:schema;3": "long"
+          "name": "spazz_nu",
+          "schema": "string",
+          "dtmi:dtdl:property:schema;3": "time"
         }
       }
     ]
@@ -26,14 +26,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_thnad;1",
+        "@id": "dtmi:example:spazz_pi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "phi_quan",
-          "schema": "string",
-          "dtmi:dtdl:property:schema;3": "time"
+          "name": "spazz_omicron",
+          "schema": "boolean",
+          "dtmi:dtdl:property:schema;3": "date"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryPropertySchemaTypeConformanceV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryPropertySchemaTypeConformanceV3.json
index 686fc753..bfff129d 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryPropertySchemaTypeConformanceV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryPropertySchemaTypeConformanceV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_jogg;1",
+        "@id": "dtmi:example:snee_upsilon;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "sigma_zatz",
+          "name": "snee_tau",
           "schema": {
-            "@id": "dtmi:example:sigma_floob;1",
-            "elementSchema": "time",
+            "@id": "dtmi:example:snee_sigma;1",
+            "elementSchema": "date",
             "@type": "Array"
           }
         }
@@ -29,14 +29,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:sigma_vroo;1",
+        "@id": "dtmi:example:snee_omega;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "sigma_yekk",
+          "name": "snee_psi",
           "schema": {
-            "@id": "dtmi:example:sigma_flunn;1",
-            "name": "sigma_itch",
+            "@id": "dtmi:example:snee_phi;1",
+            "name": "snee_chi",
             "@type": "Command"
           }
         }
@@ -51,15 +51,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_gamma;1",
+        "@id": "dtmi:example:snee_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "tau_beta",
+          "name": "snee_um",
           "schema": {
-            "@id": "dtmi:example:sigma_hi;1",
-            "name": "tau_alpha",
+            "@id": "dtmi:example:snee_yuzz;1",
+            "name": "snee_wum",
             "@type": "Command"
           }
         }
@@ -74,15 +74,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_eta;1",
+        "@id": "dtmi:example:snee_snee;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "tau_zeta",
+          "name": "snee_nuh",
           "schema": {
-            "@id": "dtmi:example:tau_delta;1",
-            "name": "tau_epsilon",
-            "schema": "boolean",
+            "@id": "dtmi:example:snee_fuddle;1",
+            "name": "snee_glikk",
+            "schema": "dateTime",
             "@type": "CommandRequest"
           }
         }
@@ -97,16 +97,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_lambda;1",
+        "@id": "dtmi:example:snee_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "tau_kappa",
+          "name": "snee_spazz",
           "schema": {
-            "@id": "dtmi:example:tau_theta;1",
-            "name": "tau_iota",
-            "schema": "date",
+            "@id": "dtmi:example:snee_quan;1",
+            "name": "snee_thnad",
+            "schema": "double",
             "@type": "CommandRequest"
           }
         }
@@ -121,15 +121,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_omicron;1",
+        "@id": "dtmi:example:snee_itch;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "tau_xi",
+          "name": "snee_flunn",
           "schema": {
-            "@id": "dtmi:example:tau_mu;1",
-            "name": "tau_nu",
-            "schema": "dateTime",
+            "@id": "dtmi:example:snee_zatz;1",
+            "name": "snee_jogg",
+            "schema": "duration",
             "@type": "CommandResponse"
           }
         }
@@ -144,16 +144,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_tau;1",
+        "@id": "dtmi:example:quan_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "tau_sigma",
+          "name": "snee_hi",
           "schema": {
-            "@id": "dtmi:example:tau_pi;1",
-            "name": "tau_rho",
-            "schema": "double",
+            "@id": "dtmi:example:snee_yekk;1",
+            "name": "snee_vroo",
+            "schema": "float",
             "@type": "CommandResponse"
           }
         }
@@ -168,16 +168,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_omega;1",
+        "@id": "dtmi:example:quan_zeta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "tau_psi",
+          "name": "quan_epsilon",
           "schema": {
-            "@id": "dtmi:example:tau_upsilon;1",
-            "name": "tau_phi",
+            "@id": "dtmi:example:quan_beta;1",
+            "name": "quan_gamma",
             "schema": {
-              "@id": "dtmi:example:tau_chi;1",
+              "@id": "dtmi:example:quan_delta;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -194,17 +194,17 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_fuddle;1",
+        "@id": "dtmi:example:quan_lambda;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "tau_humpf",
+          "name": "quan_kappa",
           "schema": {
-            "@id": "dtmi:example:tau_yuzz;1",
-            "name": "tau_wum",
+            "@id": "dtmi:example:quan_eta;1",
+            "name": "quan_theta",
             "schema": {
-              "@id": "dtmi:example:tau_um;1",
+              "@id": "dtmi:example:quan_iota;1",
               "@type": "Interface"
             },
             "@type": "Component"
@@ -221,13 +221,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_snee;1",
+        "@id": "dtmi:example:quan_xi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "tau_nuh",
+          "name": "quan_nu",
           "schema": {
-            "@id": "dtmi:example:tau_glikk;1",
+            "@id": "dtmi:example:quan_mu;1",
             "valueSchema": "integer",
             "@type": "Enum"
           }
@@ -243,15 +243,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_floob;1",
+        "@id": "dtmi:example:quan_sigma;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "tau_spazz",
+          "name": "quan_rho",
           "schema": {
-            "@id": "dtmi:example:tau_quan;1",
-            "enumValue": 1486,
-            "name": "tau_thnad",
+            "@id": "dtmi:example:quan_omicron;1",
+            "enumValue": 1503,
+            "name": "quan_pi",
             "@type": "EnumValue"
           }
         }
@@ -266,16 +266,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:tau_itch;1",
+        "@id": "dtmi:example:quan_chi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "tau_flunn",
+          "name": "quan_phi",
           "schema": {
-            "@id": "dtmi:example:tau_zatz;1",
-            "enumValue": 1487,
-            "name": "tau_jogg",
+            "@id": "dtmi:example:quan_tau;1",
+            "enumValue": 1504,
+            "name": "quan_upsilon",
             "@type": "EnumValue"
           }
         }
@@ -290,15 +290,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_alpha;1",
+        "@id": "dtmi:example:quan_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "tau_hi",
+          "name": "quan_yuzz",
           "schema": {
-            "@id": "dtmi:example:tau_yekk;1",
-            "name": "tau_vroo",
-            "schema": "duration",
+            "@id": "dtmi:example:quan_psi;1",
+            "name": "quan_omega",
+            "schema": "integer",
             "@type": "Field"
           }
         }
@@ -313,16 +313,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_epsilon;1",
+        "@id": "dtmi:example:quan_glikk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "upsilon_delta",
+          "name": "quan_fuddle",
           "schema": {
-            "@id": "dtmi:example:upsilon_beta;1",
-            "name": "upsilon_gamma",
-            "schema": "float",
+            "@id": "dtmi:example:quan_um;1",
+            "name": "quan_humpf",
+            "schema": "long",
             "@type": "Field"
           }
         }
@@ -337,13 +337,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_theta;1",
+        "@id": "dtmi:example:quan_quan;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "upsilon_eta",
+          "name": "quan_snee",
           "schema": {
-            "@id": "dtmi:example:upsilon_zeta;1",
+            "@id": "dtmi:example:quan_nuh;1",
             "@type": "Interface"
           }
         }
@@ -358,14 +358,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_lambda;1",
+        "@id": "dtmi:example:quan_floob;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "upsilon_kappa",
+          "name": "quan_spazz",
           "schema": {
-            "@id": "dtmi:example:upsilon_iota;1",
+            "@id": "dtmi:example:quan_thnad;1",
             "@type": "Interface"
           }
         }
@@ -380,20 +380,20 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_pi;1",
+        "@id": "dtmi:example:quan_yekk;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "upsilon_omicron",
+          "name": "quan_itch",
           "schema": {
-            "@id": "dtmi:example:upsilon_mu;1",
+            "@id": "dtmi:example:quan_zatz;1",
             "mapKey": {
-              "name": "upsilon_nu",
+              "name": "quan_jogg",
               "schema": "string"
             },
             "mapValue": {
-              "name": "upsilon_xi",
-              "schema": "integer"
+              "name": "quan_flunn",
+              "schema": "string"
             },
             "@type": "Map"
           }
@@ -409,14 +409,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_upsilon;1",
+        "@id": "dtmi:example:thnad_beta;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "upsilon_tau",
+          "name": "thnad_alpha",
           "schema": {
-            "@id": "dtmi:example:upsilon_rho;1",
-            "name": "upsilon_sigma",
+            "@id": "dtmi:example:quan_vroo;1",
+            "name": "quan_hi",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -432,15 +432,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_omega;1",
+        "@id": "dtmi:example:thnad_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "upsilon_psi",
+          "name": "thnad_epsilon",
           "schema": {
-            "@id": "dtmi:example:upsilon_phi;1",
-            "name": "upsilon_chi",
+            "@id": "dtmi:example:thnad_gamma;1",
+            "name": "thnad_delta",
             "schema": "string",
             "@type": "MapKey"
           }
@@ -456,15 +456,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_humpf;1",
+        "@id": "dtmi:example:thnad_kappa;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "upsilon_um",
+          "name": "thnad_iota",
           "schema": {
-            "@id": "dtmi:example:upsilon_yuzz;1",
-            "name": "upsilon_wum",
-            "schema": "long",
+            "@id": "dtmi:example:thnad_eta;1",
+            "name": "thnad_theta",
+            "schema": "time",
             "@type": "MapValue"
           }
         }
@@ -479,16 +479,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_snee;1",
+        "@id": "dtmi:example:thnad_xi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "upsilon_nuh",
+          "name": "thnad_nu",
           "schema": {
-            "@id": "dtmi:example:upsilon_fuddle;1",
-            "name": "upsilon_glikk",
-            "schema": "string",
+            "@id": "dtmi:example:thnad_lambda;1",
+            "name": "thnad_mu",
+            "schema": "boolean",
             "@type": "MapValue"
           }
         }
@@ -503,13 +503,13 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_spazz;1",
+        "@id": "dtmi:example:thnad_rho;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "upsilon_thnad",
+          "name": "thnad_pi",
           "schema": {
-            "@id": "dtmi:example:upsilon_quan;1",
+            "@id": "dtmi:example:thnad_omicron;1",
             "@type": "Object"
           }
         }
@@ -524,15 +524,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_flunn;1",
+        "@id": "dtmi:example:thnad_phi;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "upsilon_jogg",
+          "name": "thnad_upsilon",
           "schema": {
-            "@id": "dtmi:example:upsilon_floob;1",
-            "name": "upsilon_zatz",
-            "schema": "time",
+            "@id": "dtmi:example:thnad_sigma;1",
+            "name": "thnad_tau",
+            "schema": "date",
             "@type": "Property"
           }
         }
@@ -547,16 +547,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:upsilon_hi;1",
+        "@id": "dtmi:example:thnad_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "upsilon_vroo",
+          "name": "thnad_omega",
           "schema": {
-            "@id": "dtmi:example:upsilon_itch;1",
-            "name": "upsilon_yekk",
-            "schema": "boolean",
+            "@id": "dtmi:example:thnad_chi;1",
+            "name": "thnad_psi",
+            "schema": "dateTime",
             "@type": "Property"
           }
         }
@@ -571,14 +571,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_delta;1",
+        "@id": "dtmi:example:thnad_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "phi_gamma",
+          "name": "thnad_humpf",
           "schema": {
-            "@id": "dtmi:example:phi_alpha;1",
-            "name": "phi_beta",
+            "@id": "dtmi:example:thnad_wum;1",
+            "name": "thnad_um",
             "@type": "Relationship"
           }
         }
@@ -593,15 +593,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_theta;1",
+        "@id": "dtmi:example:thnad_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "phi_eta",
+          "name": "thnad_snee",
           "schema": {
-            "@id": "dtmi:example:phi_epsilon;1",
-            "name": "phi_zeta",
+            "@id": "dtmi:example:thnad_glikk;1",
+            "name": "thnad_nuh",
             "@type": "Relationship"
           }
         }
@@ -616,15 +616,15 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_mu;1",
+        "@id": "dtmi:example:thnad_zatz;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "phi_lambda",
+          "name": "thnad_floob",
           "schema": {
-            "@id": "dtmi:example:phi_iota;1",
-            "name": "phi_kappa",
-            "schema": "date",
+            "@id": "dtmi:example:thnad_thnad;1",
+            "name": "thnad_spazz",
+            "schema": "double",
             "@type": "Telemetry"
           }
         }
@@ -639,16 +639,16 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:phi_pi;1",
+        "@id": "dtmi:example:thnad_yekk;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "phi_omicron",
+          "name": "thnad_itch",
           "schema": {
-            "@id": "dtmi:example:phi_nu;1",
-            "name": "phi_xi",
-            "schema": "dateTime",
+            "@id": "dtmi:example:thnad_jogg;1",
+            "name": "thnad_flunn",
+            "schema": "duration",
             "@type": "Telemetry"
           }
         }
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryRequiredPropertiesV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryRequiredPropertiesV3.json
index a83cb06f..11ebb3aa 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryRequiredPropertiesV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryRequiredPropertiesV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_tau;1",
+        "@id": "dtmi:example:wum_floob;1",
         "@type": "Interface",
         "contents": {
-          "name": "nu_sigma",
+          "name": "wum_spazz",
           "schema": "integer"
         }
       }
@@ -24,11 +24,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_phi;1",
+        "@id": "dtmi:example:wum_jogg;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "nu_upsilon",
+          "name": "wum_zatz",
           "schema": "long"
         }
       }
@@ -42,7 +42,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_chi;1",
+        "@id": "dtmi:example:wum_flunn;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
@@ -59,7 +59,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_psi;1",
+        "@id": "dtmi:example:wum_itch;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -77,11 +77,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_yuzz;1",
+        "@id": "dtmi:example:wum_vroo;1",
         "@type": "Interface",
         "contents": {
           "@type": "Telemetry",
-          "name": "nu_omega"
+          "name": "wum_yekk"
         }
       }
     ]
@@ -94,12 +94,12 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_um;1",
+        "@id": "dtmi:example:um_alpha;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
           "@type": "Telemetry",
-          "name": "nu_wum"
+          "name": "wum_hi"
         }
       }
     ]
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryTypeIncludesInvalidDtmiV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryTypeIncludesInvalidDtmiV3.json
index 2913c240..b78399c8 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryTypeIncludesInvalidDtmiV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryTypeIncludesInvalidDtmiV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_iota;1",
+        "@id": "dtmi:example:humpf_wum;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "dtmi:foo//bar"
           ],
-          "name": "omicron_theta",
+          "name": "humpf_yuzz",
           "schema": "double"
         }
       }
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_lambda;1",
+        "@id": "dtmi:example:humpf_humpf;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,7 +36,7 @@
             "Telemetry",
             "dtmi:foo//bar"
           ],
-          "name": "omicron_kappa",
+          "name": "humpf_um",
           "schema": "duration"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryTypeIncludesMaterialV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryTypeIncludesMaterialV3.json
index 8fa14a19..1b899cf5 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryTypeIncludesMaterialV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryTypeIncludesMaterialV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_sigma;1",
+        "@id": "dtmi:example:um_spazz;1",
         "@type": "Interface",
         "contents": {
-          "name": "xi_rho",
+          "name": "um_thnad",
           "schema": "integer",
           "@type": "Telemetry"
         }
@@ -25,10 +25,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_upsilon;1",
+        "@id": "dtmi:example:um_zatz;1",
         "@type": "Interface",
         "contents": {
-          "name": "xi_tau",
+          "name": "um_floob",
           "schema": "long",
           "@type": [
             "Telemetry"
@@ -45,10 +45,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_chi;1",
+        "@id": "dtmi:example:um_flunn;1",
         "@type": "Interface",
         "contents": {
-          "name": "xi_phi",
+          "name": "um_jogg",
           "schema": "string",
           "@type": "dtmi:dtdl:class:Telemetry;3"
         }
@@ -63,10 +63,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_omega;1",
+        "@id": "dtmi:example:um_yekk;1",
         "@type": "Interface",
         "contents": {
-          "name": "xi_psi",
+          "name": "um_itch",
           "schema": "time",
           "@type": [
             "dtmi:dtdl:class:Telemetry;3"
@@ -83,10 +83,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_wum;1",
+        "@id": "dtmi:example:um_hi;1",
         "@type": "Interface",
         "contents": {
-          "name": "xi_yuzz",
+          "name": "um_vroo",
           "schema": "boolean",
           "@type": "Something"
         }
@@ -101,11 +101,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_humpf;1",
+        "@id": "dtmi:example:humpf_beta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "xi_um",
+          "name": "humpf_alpha",
           "schema": "date",
           "@type": "Something"
         }
@@ -120,10 +120,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_glikk;1",
+        "@id": "dtmi:example:humpf_delta;1",
         "@type": "Interface",
         "contents": {
-          "name": "xi_fuddle",
+          "name": "humpf_gamma",
           "schema": "dateTime",
           "@type": [
             "Something"
@@ -140,11 +140,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_snee;1",
+        "@id": "dtmi:example:humpf_zeta;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "xi_nuh",
+          "name": "humpf_epsilon",
           "schema": "double",
           "@type": [
             "Something"
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryTypeIncludesNotDtmiNorTermV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryTypeIncludesNotDtmiNorTermV3.json
index 0c070188..44db9bfc 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryTypeIncludesNotDtmiNorTermV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryTypeIncludesNotDtmiNorTermV3.json
@@ -7,14 +7,14 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_nu;1",
+        "@id": "dtmi:example:humpf_glikk;1",
         "@type": "Interface",
         "contents": {
           "@type": [
             "Telemetry",
             "http://foo.com/bar"
           ],
-          "name": "omicron_mu",
+          "name": "humpf_fuddle",
           "schema": "float"
         }
       }
@@ -28,7 +28,7 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:omicron_omicron;1",
+        "@id": "dtmi:example:humpf_snee;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
@@ -36,7 +36,7 @@
             "Telemetry",
             "http://foo.com/bar"
           ],
-          "name": "omicron_xi",
+          "name": "humpf_nuh",
           "schema": "integer"
         }
       }
diff --git a/DTDL/v3/spec/Requirement-ClassTelemetryTypeStringOrArrayV3.json b/DTDL/v3/spec/Requirement-ClassTelemetryTypeStringOrArrayV3.json
index b1f0c81d..7c2cb488 100644
--- a/DTDL/v3/spec/Requirement-ClassTelemetryTypeStringOrArrayV3.json
+++ b/DTDL/v3/spec/Requirement-ClassTelemetryTypeStringOrArrayV3.json
@@ -7,10 +7,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_fuddle;1",
+        "@id": "dtmi:example:um_gamma;1",
         "@type": "Interface",
         "contents": {
-          "name": "nu_humpf",
+          "name": "um_beta",
           "schema": "boolean",
           "@type": 626
         }
@@ -25,11 +25,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_nuh;1",
+        "@id": "dtmi:example:um_epsilon;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "nu_glikk",
+          "name": "um_delta",
           "schema": "date",
           "@type": 626
         }
@@ -44,10 +44,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_quan;1",
+        "@id": "dtmi:example:um_eta;1",
         "@type": "Interface",
         "contents": {
-          "name": "nu_snee",
+          "name": "um_zeta",
           "schema": "dateTime",
           "@type": null
         }
@@ -62,11 +62,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_spazz;1",
+        "@id": "dtmi:example:um_iota;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "nu_thnad",
+          "name": "um_theta",
           "schema": "double",
           "@type": null
         }
@@ -81,10 +81,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_zatz;1",
+        "@id": "dtmi:example:um_lambda;1",
         "@type": "Interface",
         "contents": {
-          "name": "nu_floob",
+          "name": "um_kappa",
           "schema": "duration",
           "@type": true
         }
@@ -99,11 +99,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_flunn;1",
+        "@id": "dtmi:example:um_nu;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "nu_jogg",
+          "name": "um_mu",
           "schema": "float",
           "@type": true
         }
@@ -118,10 +118,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_yekk;1",
+        "@id": "dtmi:example:um_omicron;1",
         "@type": "Interface",
         "contents": {
-          "name": "nu_itch",
+          "name": "um_xi",
           "schema": "integer",
           "@type": {}
         }
@@ -136,11 +136,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:nu_hi;1",
+        "@id": "dtmi:example:um_rho;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "nu_vroo",
+          "name": "um_pi",
           "schema": "long",
           "@type": {}
         }
@@ -155,10 +155,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_beta;1",
+        "@id": "dtmi:example:um_tau;1",
         "@type": "Interface",
         "contents": {
-          "name": "xi_alpha",
+          "name": "um_sigma",
           "schema": "string",
           "@type": [
             626
@@ -175,11 +175,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_delta;1",
+        "@id": "dtmi:example:um_phi;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "xi_gamma",
+          "name": "um_upsilon",
           "schema": "time",
           "@type": [
             626
@@ -196,10 +196,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_zeta;1",
+        "@id": "dtmi:example:um_psi;1",
         "@type": "Interface",
         "contents": {
-          "name": "xi_epsilon",
+          "name": "um_chi",
           "schema": "boolean",
           "@type": [
             null
@@ -216,11 +216,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_theta;1",
+        "@id": "dtmi:example:um_yuzz;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "xi_eta",
+          "name": "um_omega",
           "schema": "date",
           "@type": [
             null
@@ -237,10 +237,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_kappa;1",
+        "@id": "dtmi:example:um_um;1",
         "@type": "Interface",
         "contents": {
-          "name": "xi_iota",
+          "name": "um_wum",
           "schema": "dateTime",
           "@type": [
             true
@@ -257,11 +257,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_mu;1",
+        "@id": "dtmi:example:um_fuddle;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "xi_lambda",
+          "name": "um_humpf",
           "schema": "double",
           "@type": [
             true
@@ -278,10 +278,10 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_xi;1",
+        "@id": "dtmi:example:um_nuh;1",
         "@type": "Interface",
         "contents": {
-          "name": "xi_nu",
+          "name": "um_glikk",
           "schema": "duration",
           "@type": [
             {}
@@ -298,11 +298,11 @@
     "input": [
       {
         "@context": "dtmi:dtdl:context;3",
-        "@id": "dtmi:example:xi_pi;1",
+        "@id": "dtmi:example:um_quan;1",
         "@type": "Interface",
         "contents": {
           "@context": "dtmi:undefinedExtension:context;1",
-          "name": "xi_omicron",
+          "name": "um_snee",
           "schema": "float",
           "@type": [
             {}
diff --git a/DTDL/v3/spec/Requirement-ContextArrayAllStringsV3.json b/DTDL/v3/spec/Requirement-ContextArrayAllStringsV3.json
new file mode 100644
index 00000000..842d58b6
--- /dev/null
+++ b/DTDL/v3/spec/Requirement-ContextArrayAllStringsV3.json
@@ -0,0 +1,231 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;3"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": [
+              "dtmi:dtdl:extension:quantitativeTypes;1"
+            ],
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;3"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": [
+              626
+            ],
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;3",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": [
+              626
+            ],
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;3"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": [
+              null
+            ],
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;3",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": [
+              null
+            ],
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;3"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": [
+              true
+            ],
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;3",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": [
+              true
+            ],
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;3"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": [
+              {}
+            ],
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;3",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": [
+              {}
+            ],
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v3/spec/Requirement-ContextStringOrArrayQuantV3.json b/DTDL/v3/spec/Requirement-ContextStringOrArrayQuantV3.json
index 036345c8..bcce6b7a 100644
--- a/DTDL/v3/spec/Requirement-ContextStringOrArrayQuantV3.json
+++ b/DTDL/v3/spec/Requirement-ContextStringOrArrayQuantV3.json
@@ -117,57 +117,6 @@
       }
     ]
   },
-  {
-    "valid": false,
-    "options": [
-      "DisallowUndefinedExtensions"
-    ],
-    "input": [
-      {
-        "@context": [
-          "dtmi:dtdl:context;3"
-        ],
-        "@id": "dtmi:ex:id;1",
-        "@type": "Interface",
-        "contents": [
-          {
-            "@context": [
-              626
-            ],
-            "@type": "Telemetry",
-            "name": "thing",
-            "schema": "string"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "valid": false,
-    "options": [
-      "AllowUndefinedExtensions"
-    ],
-    "input": [
-      {
-        "@context": [
-          "dtmi:dtdl:context;3",
-          "dtmi:undefinedExtension:context;1"
-        ],
-        "@id": "dtmi:ex:id;1",
-        "@type": "Interface",
-        "contents": [
-          {
-            "@context": [
-              626
-            ],
-            "@type": "Telemetry",
-            "name": "thing",
-            "schema": "string"
-          }
-        ]
-      }
-    ]
-  },
   {
     "valid": false,
     "options": [
@@ -215,57 +164,6 @@
       }
     ]
   },
-  {
-    "valid": false,
-    "options": [
-      "DisallowUndefinedExtensions"
-    ],
-    "input": [
-      {
-        "@context": [
-          "dtmi:dtdl:context;3"
-        ],
-        "@id": "dtmi:ex:id;1",
-        "@type": "Interface",
-        "contents": [
-          {
-            "@context": [
-              null
-            ],
-            "@type": "Telemetry",
-            "name": "thing",
-            "schema": "string"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "valid": false,
-    "options": [
-      "AllowUndefinedExtensions"
-    ],
-    "input": [
-      {
-        "@context": [
-          "dtmi:dtdl:context;3",
-          "dtmi:undefinedExtension:context;1"
-        ],
-        "@id": "dtmi:ex:id;1",
-        "@type": "Interface",
-        "contents": [
-          {
-            "@context": [
-              null
-            ],
-            "@type": "Telemetry",
-            "name": "thing",
-            "schema": "string"
-          }
-        ]
-      }
-    ]
-  },
   {
     "valid": false,
     "options": [
@@ -313,57 +211,6 @@
       }
     ]
   },
-  {
-    "valid": false,
-    "options": [
-      "DisallowUndefinedExtensions"
-    ],
-    "input": [
-      {
-        "@context": [
-          "dtmi:dtdl:context;3"
-        ],
-        "@id": "dtmi:ex:id;1",
-        "@type": "Interface",
-        "contents": [
-          {
-            "@context": [
-              true
-            ],
-            "@type": "Telemetry",
-            "name": "thing",
-            "schema": "string"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "valid": false,
-    "options": [
-      "AllowUndefinedExtensions"
-    ],
-    "input": [
-      {
-        "@context": [
-          "dtmi:dtdl:context;3",
-          "dtmi:undefinedExtension:context;1"
-        ],
-        "@id": "dtmi:ex:id;1",
-        "@type": "Interface",
-        "contents": [
-          {
-            "@context": [
-              true
-            ],
-            "@type": "Telemetry",
-            "name": "thing",
-            "schema": "string"
-          }
-        ]
-      }
-    ]
-  },
   {
     "valid": false,
     "options": [
@@ -410,56 +257,5 @@
         ]
       }
     ]
-  },
-  {
-    "valid": false,
-    "options": [
-      "DisallowUndefinedExtensions"
-    ],
-    "input": [
-      {
-        "@context": [
-          "dtmi:dtdl:context;3"
-        ],
-        "@id": "dtmi:ex:id;1",
-        "@type": "Interface",
-        "contents": [
-          {
-            "@context": [
-              {}
-            ],
-            "@type": "Telemetry",
-            "name": "thing",
-            "schema": "string"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "valid": false,
-    "options": [
-      "AllowUndefinedExtensions"
-    ],
-    "input": [
-      {
-        "@context": [
-          "dtmi:dtdl:context;3",
-          "dtmi:undefinedExtension:context;1"
-        ],
-        "@id": "dtmi:ex:id;1",
-        "@type": "Interface",
-        "contents": [
-          {
-            "@context": [
-              {}
-            ],
-            "@type": "Telemetry",
-            "name": "thing",
-            "schema": "string"
-          }
-        ]
-      }
-    ]
   }
 ]
diff --git a/DTDL/v3/spec/Requirement-TopLevelDtdlContextV3.json b/DTDL/v3/spec/Requirement-TopLevelDtdlContextV3.json
index 0ffba853..ee9c9266 100644
--- a/DTDL/v3/spec/Requirement-TopLevelDtdlContextV3.json
+++ b/DTDL/v3/spec/Requirement-TopLevelDtdlContextV3.json
@@ -99,5 +99,38 @@
         "@type": "Interface"
       }
     ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;3#limitless",
+          "dtmi:dtdl:context;3#limits"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;3#limitless",
+          "dtmi:dtdl:context;3#limits",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
   }
 ]
diff --git a/DTDL/v4/DTDL.Extensions.md b/DTDL/v4/DTDL.Extensions.md
new file mode 100644
index 00000000..be32ad03
--- /dev/null
+++ b/DTDL/v4/DTDL.Extensions.md
@@ -0,0 +1,166 @@
+# DTDL language extensions
+
+The Digital Twins Definition Language (DTDL) is made up of a set of metamodel classes.
+In addition to its native classes &mdash; Interface, Command, Component, Property, Relationship, and Telemetry &mdash; DTDL supports *language extensions* that define additional metamodel classes.
+There are three categories of language extensions:
+*Partner extensions* add types, properties, and elements that are relevant to a specific cloud service.
+*Feature extensions* add non-core features to the DTDL language in a selectable manner.
+*Limit extensions* increase the value of one or more limits specified by the core DTDL language.
+
+## Partner and feature extensions
+
+Each partner or feature extension commonly includes one or more *adjunct types*, which are types that can be added to the `@type` property of a DTDL element.
+For example, a Property can be co-typed with the adjunct type Historized defined in the [Historization](./DTDL.historization.v2.md) feature extension:
+
+```json
+{
+  "@context": [
+    "dtmi:dtdl:context;4",
+    "dtmi:dtdl:extension:historization;2"
+  ],
+  "@id": "dtmi:com:example:Thermometer;1",
+  "@type": "Interface",
+  "contents": [
+    {
+      "@type": [ "Property", "Historized" ],
+      "name": "currentTemp",
+      "schema": "double"
+    }
+  ]
+}
+```
+
+Each language extension is identifed by a JSON-LD context specifier, which is a [DTMI](../../DTMI/README.md).
+To use a language extension, a model's `@context` property includes the extension's context specifier in addition to the DTDL context specifier, as illustrated in the example above.
+The order of context specifiers is important; different versions of DTDL may have different sets of extensions available, so it is necessary to first declare the DTDL version with a DTDL context specifier before declaring any language extensions via extension context specifiers.
+
+Of particular note is the [QuantitativeTypes](./DTDL.quantitativeTypes.v2.md) extension.
+DTDL v2 provides native support for semantic types and units, so the following example is valid.
+The Telemetry named "currentTemp" is co-typed Temperature, and it has a `unit` property with value *degreeFahrenheit*.
+Note that the only context specifier is the core DTDL v2 context, "dtmi:dtdl:context;2".
+
+```json
+{
+  "@context": "dtmi:dtdl:context;2",
+  "@id": "dtmi:com:example:Sensor;1",
+  "@type": "Interface",
+  "contents": [
+    {
+      "@type": [ "Telemetry", "Temperature" ],
+      "name": "currentTemp",
+      "schema": "double",
+      "unit": "degreeFahrenheit"
+    }
+  ]
+}
+```
+
+Begining with DTDL v3, semantic types and units are no longer included in the core DTDL language.
+Instead, they are included in the [QuantitativeTypes](./DTDL.quantitativeTypes.v2.md) feature extension, enabling them to evolve more rapidly that the core language is expected to evolve.
+The following example is the same as the above except the DTDL context has been upgraded from 2 to 3.
+Conseqently, an additional context for the QuantitativeTypes extension is also specified.
+
+```json
+{
+  "@context": [
+    "dtmi:dtdl:context;3",
+    "dtmi:dtdl:extension:quantitativeTypes;1"
+  ],
+  "@id": "dtmi:com:example:Sensor;1",
+  "@type": "Interface",
+  "contents": [
+    {
+      "@type": [ "Telemetry", "Temperature" ],
+      "name": "currentTemp",
+      "schema": "double",
+      "unit": "degreeFahrenheit"
+    }
+  ]
+}
+```
+
+## Limit extensions
+
+Limit extensions do not add new adjunct types to a DTDL model.
+Instead, a limit extension defines increased values for one or more numerical limits on DTDL property values.
+For example, in [DTDL v4](./DTDL.v4.md), the maximum depth of nested [complex schemas](./DTDL.v4.md#complex-schema) is 8 levels.
+A limit extension could increase this maximum depth to some value greater than 8.
+
+Although extensions can add definitions to the DTDL language, they cannot remove any core language definitions.
+Therefore, for a model to use a limit extension, the model must include only the portion of the core language definitions that do not define any limits.
+This is done by using a DTDL context specifier with a fragment that indicates the "limitless" portion of the DTDL language, followed by the context specifier for the limit extension:
+
+```json
+{
+  "@context": [
+    "dtmi:dtdl:context;4#limitless",
+    "dtmi:dtdl:limits:hypothetical;1"
+  ],
+  "@id": "dtmi:com:example:Sampler;1",
+  "@type": "Interface",
+  "contents": [
+    {
+      "@type": "Property",
+      "name": "samples",
+      "schema": {
+        "@id": "dtmi:ex:very:deep:Object:schema;1",
+        "@type": "Object",
+        "comment": "This is not really deep, just a placeholder for the example.",
+        "fields": []
+      }
+    }
+  ]
+}
+```
+
+When the limitless DTDL context and a limit extension context are specified, a model may validly exceed the core DTDL limits as long as it does not exceed the limits defined in the extension.
+
+## Available partner extensions
+
+The chart below lists the partner extensions that are currently available.
+
+| Extension | Description | DTDL versions |
+| --- | --- | --- |
+| [Iotcentral v2](../v2/DTDL.iotcentral.v2.md) | A set of semantic types and schema types used by IoT Central. | [2](../v2/DTDL.v2.md) |
+
+## Available feature extensions
+
+The chart below lists the feature extensions that are currently available.
+
+| Extension | Description | DTDL versions |
+| --- | --- | --- |
+| [QuantitativeTypes v1](../v3/DTDL.quantitativeTypes.v1.md) | A set of standard semantic types, unit types, and units. | [3](../v3/DTDL.v3.md) |
+| [QuantitativeTypes v2](./DTDL.quantitativeTypes.v2.md) | A set of standard semantic types, unit types, and units. | [4](./DTDL.v4.md) |
+| [Historization v1](../v3/DTDL.historization.v1.md) | Record the historical sequence of values of a Property or Telemetry and the times at which values change. | [3](../v3/DTDL.v3.md) |
+| [Historization v2](./DTDL.historization.v2.md) | Record the historical sequence of values of a Property or Telemetry and the times at which values change. | [3](../v3/DTDL.v3.md), [4](./DTDL.v4.md) |
+| [Annotation v1](../v3/DTDL.annotation.v1.md) | Add custom metadata to a Property or a Telemetry. | [3](../v3/DTDL.v3.md) |
+| [Annotation v2](./DTDL.annotation.v2.md) | Add custom metadata to a Property or a Telemetry. | [3](../v3/DTDL.v3.md), [4](./DTDL.v4.md) |
+| [Overriding v1](../v3/DTDL.overriding.v1.md) | Override a model property with an instance value. | [3](../v3/DTDL.v3.md) |
+| [Overriding v2](./DTDL.overriding.v2.md) | Override a model property with an instance value. | [3](../v3/DTDL.v3.md), [4](./DTDL.v4.md) |
+| [MQTT v1](../v3/DTDL.mqtt.v1.md) | Specify Interface properties to facilitate communication via the MQTT pub/sub protocol. | [3](../v3/DTDL.v3.md) |
+| [MQTT v2](./DTDL.mqtt.v2.md) | Specify Interface properties to facilitate communication via the MQTT pub/sub protocol. | [3](../v3/DTDL.v3.md), [4](./DTDL.v4.md) |
+| [Requirement v1](./DTDL.requirement.v1.md) | Selectively designate one or more fields in an Object as required. | [3](../v3/DTDL.v3.md), [4](./DTDL.v4.md) |
+
+## Available limit extensions
+
+The chart below lists the limit extensions that are currently available.
+
+| Extension | Description | DTDL versions |
+| --- | --- | --- |
+
+## Service and tool support of language extensions
+
+A service or tool is permitted to claim full support of DTDL as long as it understands the core language.
+No service or tool is required to support any given language extension, and lack of extension support does not impinge on the claim of DTDL compatibility.
+If a service or tool does not recognize a partner or feature extension context specifier, it ignores the context definitions and any adjunct types and properties it does not recognize.
+If a model employs a language extension that is understood by a service or tool, the model can be used in a different service or tool that does not understand the extension.
+However, aspects of the model defined by the language extension will not be understood by the latter service or tool.
+
+> Note: A service that does not understand an extension will not be able to determine whether the extension is used in a model correctly.
+When using a language extension, always validate your model against a tool or service that recognizes the extension context; otherwise, errors in your model may go undetected.
+
+All DTDL-compliant services and tools are required to accept models that satisfy the core DTDL limits.
+However, there is no requirement for a service to accept any given limit extension, since the limits defined by the extension could be greater than what the service can support.
+It is recommended to include a limit extension only when a model contains definitions that exceed the core DTDL limits.
+Otherwise, a service or tool might reject a model that it could have accepted if the limit extension had not been specified.
+
diff --git a/DTDL/v4/DTDL.Specification.v4.md b/DTDL/v4/DTDL.Specification.v4.md
new file mode 100644
index 00000000..e68bc917
--- /dev/null
+++ b/DTDL/v4/DTDL.Specification.v4.md
@@ -0,0 +1,2200 @@
+# DTDL Language Specification
+
+**Version 4**
+
+## Table of Contents
+
+* [Introduction](#introduction)
+* [Terminology](#terminology)
+* [Model completeness](#model-completeness)
+* [DTDL element](#dtdl-element)
+* [Limits and exclusions](#limits-and-exclusions)
+* [Representational literal](#representational-literal)
+* [Localizable string](#localizable-string)
+* [Standard schemas](#standard-schemas)
+* [Reserved strings](#reserved-strings)
+* [Context](#context)
+* [Digital Twin Model Identifier](#digital-twin-model-identifier)
+* [Glossary](#glossary)
+
+## Introduction
+
+The document [Digital Twins Definition Language (DTDL)](./DTDL.v4.md) &mdash; herein referred to as the *DTDL Reference* &mdash; is a description of the DTDL language in a manner that is explanatory and illustrative.
+In contrast, the present document is a strict specification of the DTDL language in a manner that is comprehensive and normative.
+The present document is not intended to teach the DTDL language but rather to precisely delineate the language.
+Unlike the DTDL Reference, the present document can be employed to assess whether a given collection of documents constitutes a valid DTDL model.
+However, the format and content of this document are not conducive to learning the language or to understanding how to apply it to a modeling problem.
+
+DTDL is a modeling language.
+It is based on [JSON-LD](https://json-ld.org/spec/FCGS/json-ld/20180607/), which is a means for encoding [RDF](https://www.w3.org/RDF/) statements in [JSON](https://www.json.org/json-en.html) syntax.
+DTDL can be understood and validated without knowing RDF or JSON-LD, and the present document specifies DTDL without reference to either of these other standards.
+DTDL cannot be readily understood without a basic knowledge of JSON; however, JSON syntax is fortunately straightforward, in marked contrast to the size, complexity, and subtlety of JSON-LD.
+
+Within this document, the key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED",  "MAY", and "OPTIONAL" are to be interpreted as described in IETF [RFC 2119](https://www.rfc-editor.org/rfc/rfc2119) as updated by [RFC 8174](https://www.rfc-editor.org/rfc/rfc8174), per [BCP 14](https://www.rfc-editor.org/info/bcp14).
+Although these IETF documents make no distinction between the meaning of "MUST" and "SHALL", in the present document a violation of a "MUST" requirement indicates an **invalid** model, whereas a violation of a "SHALL" requirement indicates an **incomplete** model.
+See [Model completeness](#model-completeness) for a description of this distinction.
+
+## Terminology
+
+This document defines DTDL terms with reference to JSON terminology.
+In some cases, this overlaps with JSON-LD terminology, but there are several significant differences.
+Following is a complete set of JSON terms with concise definitions:
+
+* null &mdash; the literal `null`
+* boolean &mdash; either of the literals `true` or `false`
+* number &mdash; a signed decimal numeric value
+* string &mdash; a double-quoted sequence of [Unicode](https://home.unicode.org/) characters
+* array &mdash; a bracket-enclosed sequence of comma-separated JSON values
+* object &mdash; a brace-enclosed sequence of comma-separated members
+* member &mdash; a colon-separated ordered pair of a string and a JSON value
+* value &mdash; an object OR array OR string OR number OR boolean OR null
+
+For brevity and simplicity, the definitions above &mdash; particularly for number and string &mdash; are succinct to the point of imprecision.
+See IETF [RFC 8259](https://www.rfc-editor.org/rfc/rfc8259) for more details on JSON syntax.
+Note that the term "boolean" is never used in the JSON spec; the paired terms "true" and "false" are always used instead.
+Another term not used in the JSON spec is "integer", which herein will mean an integral number expressible in 4 bytes.
+
+In this document henceforth, each of the following terms &mdash; except when preceded by a qualifier such as "localizable" or "representational" &mdash; refers to the indicated component of JSON syntax: "null", "boolean", "number", "string", "array", "object", and "member".
+The qualifier "JSON" may sometimes precede the term when helpful for clarity.
+
+The term "value" has generic meaning, and so the term "JSON value" is used when it is important to specifically indicate the JSON syntax component in the itemization above.
+With reference to arrays, the term "value" applies to each JSON value in an array.
+
+With reference to members, the term "value" indicates the JSON value that is the second component in a member's ordered pair, and the term "name" indicates the string that is the first component in a member's ordered pair.
+Each member in an object MUST have a name that is unique among all members in the object.
+The phrase "*X* member" or "member *X*" will often be used as shorthand for "the member whose name is *X*".
+
+In reference to a member, another term this document uses is "include".  A member *includes* JSON value *X* if either:
+
+* the member's value is *X*, or
+* the member's value is an array and *X* is a value in the array.
+
+For example, in the following object, members "foo" and "bar" both include the JSON value 3:
+
+```json
+{
+  "foo": 3,
+  "bar": [ 1, 2, 3, 4 ]
+}
+```
+
+Following are DTDL-specific terms used in the current document:
+
+* model &mdash; a collection of zero or more JSON documents
+* top-level object &mdash; an object closest to the root of a JSON document, specifically:
+  * in a JSON document whose root value is an object: the root object
+  * in a JSON document whose root value is an array of objects: each of the object values in the root array
+  * in any other JSON document: undefined
+
+* DTDL element &mdash; a JSON object that conforms to the definition of a [DTDL element](#dtdl-element)
+* representational literal &mdash; a JSON string, number, boolean, or object that conforms to the definition of a [representational literal](#representational-literal)
+* localizable string &mdash; a JSON string, object, or array that conforms to the definition of a [localizable string](#localizable-string)
+* top-level element &mdash; synonym for "top-level object" if the object is a conformant DTDL element
+
+The [DTDL Reference](./DTDL.v4.md) uses JSON-LD terminology, which has some unfortunate differences from the JSON terminology used herein.
+Although the following terms are not used in the present document, the correspondence in this list may be helpful to anyone attempting to work with both DTDL language documents:
+
+* property &mdash; analogous to JSON member
+* node &mdash; analogous to JSON object
+* IRI &mdash; analogous to JSON string with a particular set of constraints
+
+## Model completeness
+
+The rules in the present document can determine that a model is valid only if the model is complete.
+To define model completeness, we must first introduce the concept of a dependent reference.
+A *dependent reference* is a [DTMI](#digital-twin-model-identifier) string included in a member in place of a DTDL element.
+When any DTDL element in a model has a member that includes a dependent reference, the model is *referentially incomplete* if it does not also contain a DTDL element with an "@id" member whose value matches the DTMI of the dependent reference.
+For example, in the following model, DTDL element "dtmi:example:derivedInterface;1" has a dependent reference to "dtmi:example:baseInterface;1", but the model is referentially complete because it also contains a DTDL element with "@id" of "dtmi:example:baseInterface;1":
+
+```json
+[
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:example:derivedInterface;1",
+    "@type": "Interface",
+    "extends": "dtmi:example:baseInterface;1",
+    "contents": [
+      {
+        "@type": "Telemetry",
+        "name": "resolution",
+        "schema": "integer"
+      }
+    ]
+  },
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:example:baseInterface;1",
+    "@type": "Interface",
+    "contents": [
+      {
+        "@type": "Telemetry",
+        "name": "pixels",
+        "schema": {
+          "@id": "dtmi:example:boolArray;1",
+          "@type": "Array",
+          "elementSchema": "boolean"
+        }
+      }
+    ]
+  }
+]
+```
+
+In contrast, a *non-dependent reference* is a [DTMI](#digital-twin-model-identifier) string included in a member that only takes DTMI string values.
+The presence or absence of a non-dependent reference has no impact on model completeness.
+For example, in the following model, DTDL element "dtmi:example:anInterface;1" has a non-dependent reference to "dtmi:foo:bar:baz;1" because DTDL element [Relationship](#relationship) member "target" takes only DTMI string values.
+The model may therefore be complete even though no DTDL element with "@id" of "dtmi:foo:bar:baz;1" is present in the model:
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:example:anInterface;1",
+  "@type": "Interface",
+  "contents": [
+    {
+      "@type": "Relationship",
+      "name": "proximity",
+      "target": "dtmi:foo:bar:baz;1"
+    }
+  ]
+}
+```
+
+Furthermore, the identifiers in the [Context](#context) section of a model refer to DTDL language extensions that define additional types, properties, elements, and constraints beyond those defined in the core DTDL language.
+A model is *contextually incomplete* if it specifies an extension context that has no available definition.
+For example, the following model specfies extension context "dtmi:example:someExtensionContext;1".
+If the definition of this extension is not known, the model is contextually incomplete:
+
+```json
+{
+  "@context": [
+    "dtmi:dtdl:context;4",
+    "dtmi:example:someExtensionContext;1"
+  ],
+  "@id": "dtmi:example:someInterface;1",
+  "@type": "Interface",
+  "contents": [
+    {
+      "@type": [
+        "Property",
+        "Flavor"
+      ],
+      "name": "flavoring",
+      "schema": "string"
+    }
+  ]
+}
+```
+
+A model is *complete* if it is neither referentially incomplete nor contextually incomplete, such that all dependent references and all specified contexts have available definitions.
+Only a complete model can be valid.
+
+
+
+The validity of a referentially incomplete model is contingent on the dependently referenced portions of the model.
+For example, the model above in which Interface "dtmi:example:derivedInterface;1" extends Interface "dtmi:example:baseInterface;1" would be invalid if the Telemetries in both Interfaces had the same name, which would not be apparent without the definition of "dtmi:example:baseInterface;1".
+On the other hand, a referentially incomplete model may be invalid if it contains one or more violations that are apparent without observing the remaining portions of the model.
+
+The validity of a contextually incomplete model depends on whether the model satisfies constraints defined by the specified extension.
+For example, the model above that specfies extension context "dtmi:example:someExtensionContext;1" is invalid if the extension defines Flavor as a type that is not allowed to be co-typed with Property, which would not be apparent without the definition of "dtmi:example:someExtensionContext;1".
+On the other hand, a contextually incomplete model may be invalid if it contains one or more violations that are apparent without assessing the unknown extension constraints.
+
+Consequently, a DTDL model may be in one of four states:
+
+* complete and invalid
+* complete and valid
+* incomplete and invalid
+* incomplete with indeterminate validity
+
+A service, tool, application, or library MAY exercise discretion regarding whether to accept or reject a model that is incomplete with indeterminate validity.
+It might accept all such models, reject all such models, base its acceptance or rejection on specific aspects of a model, or offer configuration options to control this behavior.
+Moreover, there is no obligation for consistency across models or over time.
+However, it is RECOMMENDED that acceptance/rejection decisions should be deterministic, and it is further RECOMMENDED that these decisions not become increasingly strict over time, since this can lead to backward-compatibility issues.
+
+For DTDL version 4 models, in the absence of considerations that motivate a different policy, it is RECOMMENDED that contextually incomplete models be rejected by default.
+
+When a member includes a dependent reference, the DTDL element whose "@id" member has a matching value is said to be *referentially included* in the member that includes the dependent reference.
+If no referentially included DTDL element is present in the model, the model is referentially incomplete.
+
+In the sequel, when stating the requirement for a referentially included element to be present, the key word "SHALL" is used to indicate that this is needed for completeness.
+This contrasts with the key words "MUST" and "REQUIRED", which are used to indicate requirements for validity rather than completeness.
+The key word "SHALL" is also used when stating requirements that may be unverifiable in contextually incomplete models.
+
+## DTDL element
+
+A model is a forest of DTDL elements, each of which is a JSON object.
+The root of each tree is known as a top-level element.
+Each top-level element is a JSON object that is either the root of a JSON document or a value in a JSON array that is the root of a JSON document.
+Every JSON document in a model [MUST](spec/Requirement-RootArrayOrObjV4.json) have a root value that is either an object or an array of objects.
+
+Every DTDL element that is not a top-level element is included in some member of another DTDL element.
+A DTDL element is known as the *structural parent* of every DTDL element that is included in one of its members.
+Without the "structural" qualifier, the term "parent" has the following broader meaning:
+A DTDL element is known as a *parent* of every DTDL element that is included or referentially included in one of its members.
+Note that an element can have multiple parents, although at most one of these is its structural parent.
+
+The inverse relation to "parent" is "child":
+Each DTDL element that is included in a member is known as a *structural child* of the DTDL element that has the member.
+Each DTDL element that is included or referentially included in a member is known as a *child* of a DTDL element that has the member.
+
+The term "structural ancestor" transitively closes the "structural parent" relation: A DTDL element *X* is a *structural ancestor* of DTDL element *Y* if *X* is a structural parent of *Y* or if *X* is a structural ancestor of a structural parent of *Y*.
+The inverse relation to "structural ancestor" is "structural descendant", which transitively closes the "structural child" relation: A DTDL element *Y* is a *structural descendant* of DTDL element *X* if *Y* is a structural child of *X* or if *Y* is a structural child of a structural descendant of *X*.
+
+The term "ancestor" transitively closes the "parent" relation: A DTDL element *X* is an *ancestor* of DTDL element *Y* if *X* is a parent of *Y* or if *X* is an ancestor of a parent of *Y*.
+The inverse relation to "ancestor" is "descendant", which transitively closes the "child" relation: A DTDL element *Y* is a *descendant* of DTDL element *X* if *Y* is a child of *X* or if *Y* is a child of a descendant of *X*.
+
+A sequence of members that can be followed via inclusion or referential inclusion from DTDL element *X* to DTDL element *Y* is known as a *path* from *X* to *Y*.
+In the example of a dependent reference above, there is a path from DTDL element "dtmi:example:derivedInterface;1" to DTDL element "dtmi:example:boolArray;1".
+
+Except as specifically noted otherwise (see [Limits and exclusions](#limits-and-exclusions)), a DTDL element [MUST NOT](spec/Requirement-NoPathToSelfV4.json) have a path to itself, such as the path from "dtmi:example:selfReferencingInterface;1" to "dtmi:example:selfReferencingInterface;1" in the following invalid example:
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:example:selfReferencingInterface;1",
+  "@type": "Interface",
+  "contents": [
+    {
+      "@type": "Component",
+      "name": "me",
+      "schema": "dtmi:example:selfReferencingInterface;1"
+    }
+  ]
+}
+```
+
+Note that this restriction does not apply to non-dependent references because only dependent references result in referential inclusion; a non-dependent reference is not part of a path between DTDL elements.
+Therefore, the model in the following example is valid:
+
+
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:example:anInterface;1",
+  "@type": "Interface",
+  "contents": [
+    {
+      "@type": "Relationship",
+      "name": "sameness",
+      "target": "dtmi:example:anInterface;1"
+    }
+  ]
+}
+```
+
+A DTDL element type can have a member that is specified to expand the set of elements that are referentially included in other members.
+Specifically:
+
+* An element is considered to be referentially included in the "contents" member of Interface *X* if it is included or referentially included in the "contents" member of some Interface *Y* that is included or referentially included in the "extends" member of Interface *X*, and this definition applies transitively.
+
+### Partitions and referenceability
+
+The elements of a DTDL model are subdivided into *partitions*.
+Each partition is a specific collection of DTDL elements, grouped according to the following rules:
+
+* Each top-level element is in a distinct partition from all other top-level elements.
+* Each DTDL [Interface](#interface) element is in a distinct partition from all other Interface elements and top-level elements.
+* A DTDL element that is not top-level and not an Interface is in the same partition as its structural parent element.
+
+Top-level elements are more restrictive than DTDL elements that are nested within other elements.
+A top-level element:
+
+* [MUST](spec/Requirement-TopLevelRootableV4.json) conform to the definition of DTDL element [Interface](#interface).
+* [MUST](spec/Requirement-TopLevelDtdlContextOrLimitlessV4.json) have a "@context" member that includes string value "dtmi:dtdl:context;4" or "dtmi:dtdl:context;4#limitless".
+
+A DTDL element is *referenceable* by another if it is an Interface, a top-level element, or an element in the same partition as the element that references it.
+Stated more precisely:
+
+* Every top-level element is referenceable by every other DTDL element in the model.
+* Every Interface element is referenceable by every other DTDL element in the model.
+* Every element that is not top-level and not an Interface is referenceable only by other DTDL elements in the same partition.
+
+A member of a DTDL element [MUST NOT](spec/Requirement-DependencyReferenceableV4.json) include a dependent reference to any DTDL element that is not referenceable by the element that has the member.
+
+The following subsections define elements that may be present in a DTDL model.
+Each element specifies the members it must/may have and constraints on each member.
+For optional members, the constraints apply only if the member is present in the element.
+
+> Note that some members may be optional in general but required under certain circumstances.
+Such circumstances are indicated in the member's constraints.
+
+[Array](#array) | [Command](#command) | [CommandRequest](#commandrequest) | [CommandResponse](#commandresponse) | [Component](#component) | [Enum](#enum) | [EnumValue](#enumvalue) | [Field](#field) | [Interface](#interface) | [Map](#map) | [MapKey](#mapkey) | [MapValue](#mapvalue) | [Object](#object) | [Property](#property) | [Relationship](#relationship) | [Telemetry](#telemetry)
+
+### Array
+
+Example:
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:example:delta_epsilon;1",
+  "@type": "Interface",
+  "schemas": {
+    "@id": "dtmi:example:delta_delta;1",
+    "@type": "Array",
+    "elementSchema": "boolean"
+  }
+}
+```
+
+The following members are [REQUIRED](spec/Requirement-ClassArrayRequiredPropertiesV4.json):
+
+* @type
+  * Value [MUST](spec/Requirement-ClassArrayTypeStringOrArrayV4.json) be a string or an array of strings.
+  * [MUST](spec/Requirement-ClassArrayTypeIncludesMaterialV4.json) include either string "Array" or string "dtmi:dtdl:class:Array;4".
+  * [SHOULD NOT](spec/Recommendation-ClassArrayTypeIncludesTermAndDtmiV4.json) include both "Array" and "dtmi:dtdl:class:Array;4".
+  * [SHOULD NOT](spec/Recommendation-ClassArrayTypeDuplicatesMaterialV4.json) include more than one instance of either "Array" or "dtmi:dtdl:class:Array;4".
+  * String "Array" is [RECOMMENDED](spec/Recommendation-ClassArrayTypePreferTermToDtmiV4.json) over string "dtmi:dtdl:class:Array;4".
+  * [SHALL NOT](spec/Completion-ClassArrayTypeIncludesIrrelevantDtmiOrTermV4.json) include any string conforming to [DTMI](#digital-twin-model-identifier) syntax rules or listed in the [Reserved strings](#reserved-strings) table other than "Array" or "dtmi:dtdl:class:Array;4", except as explicitly designated by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+  * [MUST NOT](spec/Requirement-ClassArrayTypeIncludesInvalidDtmiV4.json) include a string that starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+  * [MUST NOT](spec/Requirement-ClassArrayTypeIncludesNotDtmiNorTermV4.json) include any string that contains ":" but does not start with "dtmi:".
+  * [SHALL NOT](spec/Completion-ClassArrayTypeIncludesUndefinedTermV4.json) include any string that does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+* elementSchema
+  * Value [MUST](spec/Requirement-ClassArrayPropertyElementSchemaElementV4.json) be a DTDL element, a dependent reference to a DTDL element, a string from one of the rows in a [Standard schemas](#standard-schemas) table, a string defined by an extension referenced in the active context, or an array containing exactly one DTDL element, dependent reference to a DTDL element, string from one of the rows in a Standard schemas table, or string defined by an extension referenced in the active context.
+  * If the value is a dependent reference or an array containing a dependent reference, the model [SHALL](spec/Completion-ClassArrayPropertyElementSchemaDependentReferenceV4.json) contain a DTDL element with an "@id" member whose value matches the DTMI of the dependent reference, which is thereby referentially included.
+  * If present, an included or referentially included DTDL element [MUST](spec/Requirement-ClassArrayPropertyElementSchemaTypeConformanceV4.json) conform to the definition of DTDL element [Array](#array) or [Enum](#enum) or [Map](#map) or [Object](#object) or DTDLv3 element [Array](../v3/DTDL.Specification.v3.md#array) or [Enum](../v3/DTDL.Specification.v3.md#enum) or [Map](../v3/DTDL.Specification.v3.md#map) or [Object](../v3/DTDL.Specification.v3.md#object) or DTDLv2 element [Array](../v2/DTDL.Specification.v2.md#array) or [Enum](../v2/DTDL.Specification.v2.md#enum) or [Map](../v2/DTDL.Specification.v2.md#map) or [Object](../v2/DTDL.Specification.v2.md#object).
+  * If a string from one of the rows in a Standard schemas table is included, a string from column "Term" is [RECOMMENDED](spec/Recommendation-ClassArrayPropertyElementSchemaPreferTermToDtmiV4.json) over a string from column "DTMI".
+  * Considered with other DTDL elements, value is subject to any relevant restrictions in [Limits and exclusions](#limits-and-exclusions).
+  * Member name [MAY](spec/Allowance-ClassArrayPropertyElementSchemaDtmiV4.json) be expressed as "dtmi:dtdl:property:elementSchema;4" instead of "elementSchema", but "elementSchema" is [RECOMMENDED](spec/Recommendation-ClassArrayPropertyElementSchemaTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassArrayPropertyElementSchemaTermAndDtmiV4.json) be expressed as both "elementSchema" and "dtmi:dtdl:property:elementSchema;4".
+
+The following members are [OPTIONAL](spec/Allowance-ClassArrayOptionalPropertiesV4.json) unless otherwise noted:
+
+* @context
+  * [MUST](spec/Requirement-ClassArrayContextConformsV4.json) conform to the specified [context](#context) rules.
+* @id
+  * [REQUIRED](spec/Requirement-ClassArrayIdRequiredV4.json) when the Array element is included in Interface member "schemas".
+  * Value [MUST](spec/Requirement-ClassArrayIdIsDtmiV4.json) be a string that conforms to the specified [DTMI](#digital-twin-model-identifier) rules; value [MUST NOT](spec/Requirement-ClassArrayIdNotArrayV4.json) be an array.
+  * Value [MUST](spec/Requirement-ClassArrayIdDuplicateV4.json) be unique among the values of all "@id" members of all elements in the model.
+* comment
+  * Value [MUST](spec/Requirement-ClassArrayPropertyCommentStringV4.json) be a [representational string](#representational-string) or an array containing no more than one representational string.
+  * If present, string value [MUST NOT](spec/Requirement-ClassArrayPropertyCommentStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassArrayPropertyCommentDtmiV4.json) be expressed as "dtmi:dtdl:property:comment;4" instead of "comment", but "comment" is [RECOMMENDED](spec/Recommendation-ClassArrayPropertyCommentTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassArrayPropertyCommentTermAndDtmiV4.json) be expressed as both "comment" and "dtmi:dtdl:property:comment;4".
+* description
+  * Value [MUST](spec/Requirement-ClassArrayPropertyDescriptionLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassArrayPropertyDescriptionStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassArrayPropertyDescriptionDtmiV4.json) be expressed as "dtmi:dtdl:property:description;4" instead of "description", but "description" is [RECOMMENDED](spec/Recommendation-ClassArrayPropertyDescriptionTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassArrayPropertyDescriptionTermAndDtmiV4.json) be expressed as both "description" and "dtmi:dtdl:property:description;4".
+* displayName
+  * Value [MUST](spec/Requirement-ClassArrayPropertyDisplayNameLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassArrayPropertyDisplayNameStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassArrayPropertyDisplayNameDtmiV4.json) be expressed as "dtmi:dtdl:property:displayName;4" instead of "displayName", but "displayName" is [RECOMMENDED](spec/Recommendation-ClassArrayPropertyDisplayNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassArrayPropertyDisplayNameTermAndDtmiV4.json) be expressed as both "displayName" and "dtmi:dtdl:property:displayName;4".
+
+All members other than those explitly listed above are forbidden or permitted according to the following rules:
+
+* Members with names starting with "@" other than "@context", "@id", and "@type" [MUST NOT](spec/Requirement-ClassArrayInvalidKeywordsV4.json) be present.
+* Except as explicitly designated by an extension referenced in the active context, a member [SHALL NOT](spec/Completion-ClassArrayPropertyIrrelevantDtmiOrTermV4.json) be present if the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "elementSchema", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:elementSchema;4".
+* Except as explicitly designated by an extension referenced in the active context, a member [MUST NOT](spec/Requirement-ClassArrayPropertyFormallyIrrelevantDtmiOrTermV4.json) be present if the element is not informally co-typed and the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "elementSchema", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:elementSchema;4".
+* A member [MUST NOT](spec/Requirement-ClassArrayPropertyInvalidDtmiV4.json) be present if the member's name starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+* A member [MUST NOT](spec/Requirement-ClassArrayPropertyNotDtmiNorTermV4.json) be present if the member's name does not start with "@" and contains ":" but does not start with "dtmi:".
+* A member [SHALL NOT](spec/Completion-ClassArrayPropertyUndefinedTermV4.json) be present if the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+* A member [MUST NOT](spec/Requirement-ClassArrayPropertyFormallyUndefinedTermV4.json) be present if the element is not informally co-typed and the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+
+### Command
+
+Example:
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:example:delta_eta;1",
+  "@type": "Interface",
+  "contents": {
+    "@type": "Command",
+    "name": "delta_zeta"
+  }
+}
+```
+
+The following members are [REQUIRED](spec/Requirement-ClassCommandRequiredPropertiesV4.json):
+
+* @type
+  * Value [MUST](spec/Requirement-ClassCommandTypeStringOrArrayV4.json) be a string or an array of strings.
+  * [MUST](spec/Requirement-ClassCommandTypeIncludesMaterialV4.json) include either string "Command" or string "dtmi:dtdl:class:Command;4".
+  * [SHOULD NOT](spec/Recommendation-ClassCommandTypeIncludesTermAndDtmiV4.json) include both "Command" and "dtmi:dtdl:class:Command;4".
+  * [SHOULD NOT](spec/Recommendation-ClassCommandTypeDuplicatesMaterialV4.json) include more than one instance of either "Command" or "dtmi:dtdl:class:Command;4".
+  * String "Command" is [RECOMMENDED](spec/Recommendation-ClassCommandTypePreferTermToDtmiV4.json) over string "dtmi:dtdl:class:Command;4".
+  * [SHALL NOT](spec/Completion-ClassCommandTypeIncludesIrrelevantDtmiOrTermV4.json) include any string conforming to [DTMI](#digital-twin-model-identifier) syntax rules or listed in the [Reserved strings](#reserved-strings) table other than "Command" or "dtmi:dtdl:class:Command;4", except as explicitly designated by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+  * [MUST NOT](spec/Requirement-ClassCommandTypeIncludesInvalidDtmiV4.json) include a string that starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+  * [MUST NOT](spec/Requirement-ClassCommandTypeIncludesNotDtmiNorTermV4.json) include any string that contains ":" but does not start with "dtmi:".
+  * [SHALL NOT](spec/Completion-ClassCommandTypeIncludesUndefinedTermV4.json) include any string that does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+* name
+  * Value [MUST](spec/Requirement-ClassCommandPropertyNameStringV4.json) be a [representational string](#representational-string) or an array containing exactly one representational string.
+  * String value [MUST NOT](spec/Requirement-ClassCommandPropertyNameStringLengthV4.json) be more than 512 characters in length.
+  * String value [MUST](spec/Requirement-ClassCommandPropertyNamePatternV4.json) match regular expression `^[A-Za-z](?:[A-Za-z0-9_]*[A-Za-z0-9])?$`.
+  * String value [MUST](spec/Requirement-ClassCommandPropertyNameUniqueAmongInterfaceContentsV4.json) be unique among the included values of "name" members of all elements included or referentially included in the "contents" member of any parent [Interface](#interface) element.
+  * Member name [MAY](spec/Allowance-ClassCommandPropertyNameDtmiV4.json) be expressed as "dtmi:dtdl:property:name;4" instead of "name", but "name" is [RECOMMENDED](spec/Recommendation-ClassCommandPropertyNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassCommandPropertyNameTermAndDtmiV4.json) be expressed as both "name" and "dtmi:dtdl:property:name;4".
+
+The following members are [OPTIONAL](spec/Allowance-ClassCommandOptionalPropertiesV4.json):
+
+* @context
+  * [MUST](spec/Requirement-ClassCommandContextConformsV4.json) conform to the specified [context](#context) rules.
+* @id
+  * Value [MUST](spec/Requirement-ClassCommandIdIsDtmiV4.json) be a string that conforms to the specified [DTMI](#digital-twin-model-identifier) rules; value [MUST NOT](spec/Requirement-ClassCommandIdNotArrayV4.json) be an array.
+  * Value [MUST](spec/Requirement-ClassCommandIdDuplicateV4.json) be unique among the values of all "@id" members of all elements in the model.
+* commandType
+  * [SHOULD NOT](spec/Recommendation-ClassCommandPropertyCommandTypeDeprecatedV4.json) be present in the element; this member is deprecated.
+  * Value [MUST](spec/Requirement-ClassCommandPropertyCommandTypeSpecificValuesV4.json) be "asynchronous", "synchronous", "dtmi:dtdl:instance:CommandType:asynchronous;4", "dtmi:dtdl:instance:CommandType:synchronous;4", or an array containing no more than one of these string values.
+  * Member name [MAY](spec/Allowance-ClassCommandPropertyCommandTypeDtmiV4.json) be expressed as "dtmi:dtdl:property:commandType;4" instead of "commandType", but "commandType" is [RECOMMENDED](spec/Recommendation-ClassCommandPropertyCommandTypeTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassCommandPropertyCommandTypeTermAndDtmiV4.json) be expressed as both "commandType" and "dtmi:dtdl:property:commandType;4".
+* comment
+  * Value [MUST](spec/Requirement-ClassCommandPropertyCommentStringV4.json) be a [representational string](#representational-string) or an array containing no more than one representational string.
+  * If present, string value [MUST NOT](spec/Requirement-ClassCommandPropertyCommentStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassCommandPropertyCommentDtmiV4.json) be expressed as "dtmi:dtdl:property:comment;4" instead of "comment", but "comment" is [RECOMMENDED](spec/Recommendation-ClassCommandPropertyCommentTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassCommandPropertyCommentTermAndDtmiV4.json) be expressed as both "comment" and "dtmi:dtdl:property:comment;4".
+* description
+  * Value [MUST](spec/Requirement-ClassCommandPropertyDescriptionLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassCommandPropertyDescriptionStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassCommandPropertyDescriptionDtmiV4.json) be expressed as "dtmi:dtdl:property:description;4" instead of "description", but "description" is [RECOMMENDED](spec/Recommendation-ClassCommandPropertyDescriptionTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassCommandPropertyDescriptionTermAndDtmiV4.json) be expressed as both "description" and "dtmi:dtdl:property:description;4".
+* displayName
+  * Value [MUST](spec/Requirement-ClassCommandPropertyDisplayNameLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassCommandPropertyDisplayNameStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassCommandPropertyDisplayNameDtmiV4.json) be expressed as "dtmi:dtdl:property:displayName;4" instead of "displayName", but "displayName" is [RECOMMENDED](spec/Recommendation-ClassCommandPropertyDisplayNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassCommandPropertyDisplayNameTermAndDtmiV4.json) be expressed as both "displayName" and "dtmi:dtdl:property:displayName;4".
+* request
+  * Value [MUST](spec/Requirement-ClassCommandPropertyRequestElementV4.json) be a DTDL element, a dependent reference to DTDL element, or an array containing no more than one DTDL element or dependent reference to a DTDL element.
+  * If the value is a dependent reference or an array containing a dependent reference, the model [SHALL](spec/Completion-ClassCommandPropertyRequestDependentReferenceV4.json) contain a DTDL element with an "@id" member whose value matches the DTMI of the dependent reference, which is thereby referentially included.
+  * If present, included or referentially included DTDL element [MUST](spec/Requirement-ClassCommandPropertyRequestTypeConformanceV4.json) conform to the definition of DTDL element [CommandRequest](#commandrequest).
+  * Member name [MAY](spec/Allowance-ClassCommandPropertyRequestDtmiV4.json) be expressed as "dtmi:dtdl:property:request;4" instead of "request", but "request" is [RECOMMENDED](spec/Recommendation-ClassCommandPropertyRequestTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassCommandPropertyRequestTermAndDtmiV4.json) be expressed as both "request" and "dtmi:dtdl:property:request;4".
+* response
+  * Value [MUST](spec/Requirement-ClassCommandPropertyResponseElementV4.json) be a DTDL element, a dependent reference to DTDL element, or an array containing no more than one DTDL element or dependent reference to a DTDL element.
+  * If the value is a dependent reference or an array containing a dependent reference, the model [SHALL](spec/Completion-ClassCommandPropertyResponseDependentReferenceV4.json) contain a DTDL element with an "@id" member whose value matches the DTMI of the dependent reference, which is thereby referentially included.
+  * If present, included or referentially included DTDL element [MUST](spec/Requirement-ClassCommandPropertyResponseTypeConformanceV4.json) conform to the definition of DTDL element [CommandResponse](#commandresponse).
+  * Member name [MAY](spec/Allowance-ClassCommandPropertyResponseDtmiV4.json) be expressed as "dtmi:dtdl:property:response;4" instead of "response", but "response" is [RECOMMENDED](spec/Recommendation-ClassCommandPropertyResponseTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassCommandPropertyResponseTermAndDtmiV4.json) be expressed as both "response" and "dtmi:dtdl:property:response;4".
+
+All members other than those explitly listed above are forbidden or permitted according to the following rules:
+
+* Members with names starting with "@" other than "@context", "@id", and "@type" [MUST NOT](spec/Requirement-ClassCommandInvalidKeywordsV4.json) be present.
+* Except as explicitly designated by an extension referenced in the active context, a member [SHALL NOT](spec/Completion-ClassCommandPropertyIrrelevantDtmiOrTermV4.json) be present if the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "commandType", "comment", "description", "displayName", "name", "request", "response", "dtmi:dtdl:property:commandType;4", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:name;4", "dtmi:dtdl:property:request;4", "dtmi:dtdl:property:response;4".
+* Except as explicitly designated by an extension referenced in the active context, a member [MUST NOT](spec/Requirement-ClassCommandPropertyFormallyIrrelevantDtmiOrTermV4.json) be present if the element is not informally co-typed and the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "commandType", "comment", "description", "displayName", "name", "request", "response", "dtmi:dtdl:property:commandType;4", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:name;4", "dtmi:dtdl:property:request;4", "dtmi:dtdl:property:response;4".
+* A member [MUST NOT](spec/Requirement-ClassCommandPropertyInvalidDtmiV4.json) be present if the member's name starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+* A member [MUST NOT](spec/Requirement-ClassCommandPropertyNotDtmiNorTermV4.json) be present if the member's name does not start with "@" and contains ":" but does not start with "dtmi:".
+* A member [SHALL NOT](spec/Completion-ClassCommandPropertyUndefinedTermV4.json) be present if the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+* A member [MUST NOT](spec/Requirement-ClassCommandPropertyFormallyUndefinedTermV4.json) be present if the element is not informally co-typed and the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+
+### CommandRequest
+
+Example:
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:example:delta_mu;1",
+  "@type": "Interface",
+  "contents": {
+    "@type": "Command",
+    "name": "delta_lambda",
+    "request": {
+      "name": "delta_kappa",
+      "schema": "byte"
+    }
+  }
+}
+```
+
+The following members are [REQUIRED](spec/Requirement-ClassCommandRequestRequiredPropertiesV4.json):
+
+* name
+  * Value [MUST](spec/Requirement-ClassCommandRequestPropertyNameStringV4.json) be a [representational string](#representational-string) or an array containing exactly one representational string.
+  * String value [MUST NOT](spec/Requirement-ClassCommandRequestPropertyNameStringLengthV4.json) be more than 512 characters in length.
+  * String value [MUST](spec/Requirement-ClassCommandRequestPropertyNamePatternV4.json) match regular expression `^[A-Za-z](?:[A-Za-z0-9_]*[A-Za-z0-9])?$`.
+  * Member name [MAY](spec/Allowance-ClassCommandRequestPropertyNameDtmiV4.json) be expressed as "dtmi:dtdl:property:name;4" instead of "name", but "name" is [RECOMMENDED](spec/Recommendation-ClassCommandRequestPropertyNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassCommandRequestPropertyNameTermAndDtmiV4.json) be expressed as both "name" and "dtmi:dtdl:property:name;4".
+* schema
+  * Value [MUST](spec/Requirement-ClassCommandRequestPropertySchemaElementV4.json) be a DTDL element, a dependent reference to a DTDL element, a string from one of the rows in a [Standard schemas](#standard-schemas) table, a string defined by an extension referenced in the active context, or an array containing exactly one DTDL element, dependent reference to a DTDL element, string from one of the rows in a Standard schemas table, or string defined by an extension referenced in the active context.
+  * If the value is a dependent reference or an array containing a dependent reference, the model [SHALL](spec/Completion-ClassCommandRequestPropertySchemaDependentReferenceV4.json) contain a DTDL element with an "@id" member whose value matches the DTMI of the dependent reference, which is thereby referentially included.
+  * If present, an included or referentially included DTDL element [MUST](spec/Requirement-ClassCommandRequestPropertySchemaTypeConformanceV4.json) conform to the definition of DTDL element [Array](#array) or [Enum](#enum) or [Map](#map) or [Object](#object) or DTDLv3 element [Array](../v3/DTDL.Specification.v3.md#array) or [Enum](../v3/DTDL.Specification.v3.md#enum) or [Map](../v3/DTDL.Specification.v3.md#map) or [Object](../v3/DTDL.Specification.v3.md#object) or DTDLv2 element [Array](../v2/DTDL.Specification.v2.md#array) or [Enum](../v2/DTDL.Specification.v2.md#enum) or [Map](../v2/DTDL.Specification.v2.md#map) or [Object](../v2/DTDL.Specification.v2.md#object).
+  * If a string from one of the rows in a Standard schemas table is included, a string from column "Term" is [RECOMMENDED](spec/Recommendation-ClassCommandRequestPropertySchemaPreferTermToDtmiV4.json) over a string from column "DTMI".
+  * Member name [MAY](spec/Allowance-ClassCommandRequestPropertySchemaDtmiV4.json) be expressed as "dtmi:dtdl:property:schema;4" instead of "schema", but "schema" is [RECOMMENDED](spec/Recommendation-ClassCommandRequestPropertySchemaTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassCommandRequestPropertySchemaTermAndDtmiV4.json) be expressed as both "schema" and "dtmi:dtdl:property:schema;4".
+
+The following members are [OPTIONAL](spec/Allowance-ClassCommandRequestOptionalPropertiesV4.json):
+
+* @context
+  * [MUST](spec/Requirement-ClassCommandRequestContextConformsV4.json) conform to the specified [context](#context) rules.
+* @type
+  * Value [MUST](spec/Requirement-ClassCommandRequestTypeStringOrArrayV4.json) be a string or an array of strings.
+  * [MUST](spec/Requirement-ClassCommandRequestTypeIncludesMaterialV4.json) include either string "CommandRequest" or string "dtmi:dtdl:class:CommandRequest;4".
+  * [SHOULD NOT](spec/Recommendation-ClassCommandRequestTypeIncludesTermAndDtmiV4.json) include both "CommandRequest" and "dtmi:dtdl:class:CommandRequest;4".
+  * [SHOULD NOT](spec/Recommendation-ClassCommandRequestTypeDuplicatesMaterialV4.json) include more than one instance of either "CommandRequest" or "dtmi:dtdl:class:CommandRequest;4".
+  * String "CommandRequest" is [RECOMMENDED](spec/Recommendation-ClassCommandRequestTypePreferTermToDtmiV4.json) over string "dtmi:dtdl:class:CommandRequest;4".
+  * [SHALL NOT](spec/Completion-ClassCommandRequestTypeIncludesIrrelevantDtmiOrTermV4.json) include any string conforming to [DTMI](#digital-twin-model-identifier) syntax rules or listed in the [Reserved strings](#reserved-strings) table other than "CommandRequest" or "dtmi:dtdl:class:CommandRequest;4", except as explicitly designated by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+  * [MUST NOT](spec/Requirement-ClassCommandRequestTypeIncludesInvalidDtmiV4.json) include a string that starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+  * [MUST NOT](spec/Requirement-ClassCommandRequestTypeIncludesNotDtmiNorTermV4.json) include any string that contains ":" but does not start with "dtmi:".
+  * [SHALL NOT](spec/Completion-ClassCommandRequestTypeIncludesUndefinedTermV4.json) include any string that does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+* @id
+  * Value [MUST](spec/Requirement-ClassCommandRequestIdIsDtmiV4.json) be a string that conforms to the specified [DTMI](#digital-twin-model-identifier) rules; value [MUST NOT](spec/Requirement-ClassCommandRequestIdNotArrayV4.json) be an array.
+  * Value [MUST](spec/Requirement-ClassCommandRequestIdDuplicateV4.json) be unique among the values of all "@id" members of all elements in the model.
+* comment
+  * Value [MUST](spec/Requirement-ClassCommandRequestPropertyCommentStringV4.json) be a [representational string](#representational-string) or an array containing no more than one representational string.
+  * If present, string value [MUST NOT](spec/Requirement-ClassCommandRequestPropertyCommentStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassCommandRequestPropertyCommentDtmiV4.json) be expressed as "dtmi:dtdl:property:comment;4" instead of "comment", but "comment" is [RECOMMENDED](spec/Recommendation-ClassCommandRequestPropertyCommentTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassCommandRequestPropertyCommentTermAndDtmiV4.json) be expressed as both "comment" and "dtmi:dtdl:property:comment;4".
+* description
+  * Value [MUST](spec/Requirement-ClassCommandRequestPropertyDescriptionLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassCommandRequestPropertyDescriptionStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassCommandRequestPropertyDescriptionDtmiV4.json) be expressed as "dtmi:dtdl:property:description;4" instead of "description", but "description" is [RECOMMENDED](spec/Recommendation-ClassCommandRequestPropertyDescriptionTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassCommandRequestPropertyDescriptionTermAndDtmiV4.json) be expressed as both "description" and "dtmi:dtdl:property:description;4".
+* displayName
+  * Value [MUST](spec/Requirement-ClassCommandRequestPropertyDisplayNameLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassCommandRequestPropertyDisplayNameStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassCommandRequestPropertyDisplayNameDtmiV4.json) be expressed as "dtmi:dtdl:property:displayName;4" instead of "displayName", but "displayName" is [RECOMMENDED](spec/Recommendation-ClassCommandRequestPropertyDisplayNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassCommandRequestPropertyDisplayNameTermAndDtmiV4.json) be expressed as both "displayName" and "dtmi:dtdl:property:displayName;4".
+* nullable
+  * Value [MUST](spec/Requirement-ClassCommandRequestPropertyNullableBooleanV4.json) be a [representational boolean](#representational-boolean) or an array containing no more than one representational boolean.
+  * Member name [MAY](spec/Allowance-ClassCommandRequestPropertyNullableDtmiV4.json) be expressed as "dtmi:dtdl:property:nullable;4" instead of "nullable", but "nullable" is [RECOMMENDED](spec/Recommendation-ClassCommandRequestPropertyNullableTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassCommandRequestPropertyNullableTermAndDtmiV4.json) be expressed as both "nullable" and "dtmi:dtdl:property:nullable;4".
+
+All members other than those explitly listed above are forbidden or permitted according to the following rules:
+
+* Members with names starting with "@" other than "@context", "@id", and "@type" [MUST NOT](spec/Requirement-ClassCommandRequestInvalidKeywordsV4.json) be present.
+* Except as explicitly designated by an extension referenced in the active context, a member [SHALL NOT](spec/Completion-ClassCommandRequestPropertyIrrelevantDtmiOrTermV4.json) be present if the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "name", "nullable", "schema", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:name;4", "dtmi:dtdl:property:nullable;4", "dtmi:dtdl:property:schema;4".
+* Except as explicitly designated by an extension referenced in the active context, a member [MUST NOT](spec/Requirement-ClassCommandRequestPropertyFormallyIrrelevantDtmiOrTermV4.json) be present if the element is not informally co-typed and the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "name", "nullable", "schema", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:name;4", "dtmi:dtdl:property:nullable;4", "dtmi:dtdl:property:schema;4".
+* A member [MUST NOT](spec/Requirement-ClassCommandRequestPropertyInvalidDtmiV4.json) be present if the member's name starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+* A member [MUST NOT](spec/Requirement-ClassCommandRequestPropertyNotDtmiNorTermV4.json) be present if the member's name does not start with "@" and contains ":" but does not start with "dtmi:".
+* A member [SHALL NOT](spec/Completion-ClassCommandRequestPropertyUndefinedTermV4.json) be present if the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+* A member [MUST NOT](spec/Requirement-ClassCommandRequestPropertyFormallyUndefinedTermV4.json) be present if the element is not informally co-typed and the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+
+### CommandResponse
+
+Example:
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:example:delta_omicron;1",
+  "@type": "Interface",
+  "contents": {
+    "@type": "Command",
+    "name": "delta_xi",
+    "response": {
+      "name": "delta_nu",
+      "schema": "bytes"
+    }
+  }
+}
+```
+
+The following members are [REQUIRED](spec/Requirement-ClassCommandResponseRequiredPropertiesV4.json):
+
+* name
+  * Value [MUST](spec/Requirement-ClassCommandResponsePropertyNameStringV4.json) be a [representational string](#representational-string) or an array containing exactly one representational string.
+  * String value [MUST NOT](spec/Requirement-ClassCommandResponsePropertyNameStringLengthV4.json) be more than 512 characters in length.
+  * String value [MUST](spec/Requirement-ClassCommandResponsePropertyNamePatternV4.json) match regular expression `^[A-Za-z](?:[A-Za-z0-9_]*[A-Za-z0-9])?$`.
+  * Member name [MAY](spec/Allowance-ClassCommandResponsePropertyNameDtmiV4.json) be expressed as "dtmi:dtdl:property:name;4" instead of "name", but "name" is [RECOMMENDED](spec/Recommendation-ClassCommandResponsePropertyNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassCommandResponsePropertyNameTermAndDtmiV4.json) be expressed as both "name" and "dtmi:dtdl:property:name;4".
+* schema
+  * Value [MUST](spec/Requirement-ClassCommandResponsePropertySchemaElementV4.json) be a DTDL element, a dependent reference to a DTDL element, a string from one of the rows in a [Standard schemas](#standard-schemas) table, a string defined by an extension referenced in the active context, or an array containing exactly one DTDL element, dependent reference to a DTDL element, string from one of the rows in a Standard schemas table, or string defined by an extension referenced in the active context.
+  * If the value is a dependent reference or an array containing a dependent reference, the model [SHALL](spec/Completion-ClassCommandResponsePropertySchemaDependentReferenceV4.json) contain a DTDL element with an "@id" member whose value matches the DTMI of the dependent reference, which is thereby referentially included.
+  * If present, an included or referentially included DTDL element [MUST](spec/Requirement-ClassCommandResponsePropertySchemaTypeConformanceV4.json) conform to the definition of DTDL element [Array](#array) or [Enum](#enum) or [Map](#map) or [Object](#object) or DTDLv3 element [Array](../v3/DTDL.Specification.v3.md#array) or [Enum](../v3/DTDL.Specification.v3.md#enum) or [Map](../v3/DTDL.Specification.v3.md#map) or [Object](../v3/DTDL.Specification.v3.md#object) or DTDLv2 element [Array](../v2/DTDL.Specification.v2.md#array) or [Enum](../v2/DTDL.Specification.v2.md#enum) or [Map](../v2/DTDL.Specification.v2.md#map) or [Object](../v2/DTDL.Specification.v2.md#object).
+  * If a string from one of the rows in a Standard schemas table is included, a string from column "Term" is [RECOMMENDED](spec/Recommendation-ClassCommandResponsePropertySchemaPreferTermToDtmiV4.json) over a string from column "DTMI".
+  * Member name [MAY](spec/Allowance-ClassCommandResponsePropertySchemaDtmiV4.json) be expressed as "dtmi:dtdl:property:schema;4" instead of "schema", but "schema" is [RECOMMENDED](spec/Recommendation-ClassCommandResponsePropertySchemaTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassCommandResponsePropertySchemaTermAndDtmiV4.json) be expressed as both "schema" and "dtmi:dtdl:property:schema;4".
+
+The following members are [OPTIONAL](spec/Allowance-ClassCommandResponseOptionalPropertiesV4.json):
+
+* @context
+  * [MUST](spec/Requirement-ClassCommandResponseContextConformsV4.json) conform to the specified [context](#context) rules.
+* @type
+  * Value [MUST](spec/Requirement-ClassCommandResponseTypeStringOrArrayV4.json) be a string or an array of strings.
+  * [MUST](spec/Requirement-ClassCommandResponseTypeIncludesMaterialV4.json) include either string "CommandResponse" or string "dtmi:dtdl:class:CommandResponse;4".
+  * [SHOULD NOT](spec/Recommendation-ClassCommandResponseTypeIncludesTermAndDtmiV4.json) include both "CommandResponse" and "dtmi:dtdl:class:CommandResponse;4".
+  * [SHOULD NOT](spec/Recommendation-ClassCommandResponseTypeDuplicatesMaterialV4.json) include more than one instance of either "CommandResponse" or "dtmi:dtdl:class:CommandResponse;4".
+  * String "CommandResponse" is [RECOMMENDED](spec/Recommendation-ClassCommandResponseTypePreferTermToDtmiV4.json) over string "dtmi:dtdl:class:CommandResponse;4".
+  * [SHALL NOT](spec/Completion-ClassCommandResponseTypeIncludesIrrelevantDtmiOrTermV4.json) include any string conforming to [DTMI](#digital-twin-model-identifier) syntax rules or listed in the [Reserved strings](#reserved-strings) table other than "CommandResponse" or "dtmi:dtdl:class:CommandResponse;4", except as explicitly designated by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+  * [MUST NOT](spec/Requirement-ClassCommandResponseTypeIncludesInvalidDtmiV4.json) include a string that starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+  * [MUST NOT](spec/Requirement-ClassCommandResponseTypeIncludesNotDtmiNorTermV4.json) include any string that contains ":" but does not start with "dtmi:".
+  * [SHALL NOT](spec/Completion-ClassCommandResponseTypeIncludesUndefinedTermV4.json) include any string that does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+* @id
+  * Value [MUST](spec/Requirement-ClassCommandResponseIdIsDtmiV4.json) be a string that conforms to the specified [DTMI](#digital-twin-model-identifier) rules; value [MUST NOT](spec/Requirement-ClassCommandResponseIdNotArrayV4.json) be an array.
+  * Value [MUST](spec/Requirement-ClassCommandResponseIdDuplicateV4.json) be unique among the values of all "@id" members of all elements in the model.
+* comment
+  * Value [MUST](spec/Requirement-ClassCommandResponsePropertyCommentStringV4.json) be a [representational string](#representational-string) or an array containing no more than one representational string.
+  * If present, string value [MUST NOT](spec/Requirement-ClassCommandResponsePropertyCommentStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassCommandResponsePropertyCommentDtmiV4.json) be expressed as "dtmi:dtdl:property:comment;4" instead of "comment", but "comment" is [RECOMMENDED](spec/Recommendation-ClassCommandResponsePropertyCommentTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassCommandResponsePropertyCommentTermAndDtmiV4.json) be expressed as both "comment" and "dtmi:dtdl:property:comment;4".
+* description
+  * Value [MUST](spec/Requirement-ClassCommandResponsePropertyDescriptionLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassCommandResponsePropertyDescriptionStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassCommandResponsePropertyDescriptionDtmiV4.json) be expressed as "dtmi:dtdl:property:description;4" instead of "description", but "description" is [RECOMMENDED](spec/Recommendation-ClassCommandResponsePropertyDescriptionTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassCommandResponsePropertyDescriptionTermAndDtmiV4.json) be expressed as both "description" and "dtmi:dtdl:property:description;4".
+* displayName
+  * Value [MUST](spec/Requirement-ClassCommandResponsePropertyDisplayNameLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassCommandResponsePropertyDisplayNameStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassCommandResponsePropertyDisplayNameDtmiV4.json) be expressed as "dtmi:dtdl:property:displayName;4" instead of "displayName", but "displayName" is [RECOMMENDED](spec/Recommendation-ClassCommandResponsePropertyDisplayNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassCommandResponsePropertyDisplayNameTermAndDtmiV4.json) be expressed as both "displayName" and "dtmi:dtdl:property:displayName;4".
+* nullable
+  * Value [MUST](spec/Requirement-ClassCommandResponsePropertyNullableBooleanV4.json) be a [representational boolean](#representational-boolean) or an array containing no more than one representational boolean.
+  * Member name [MAY](spec/Allowance-ClassCommandResponsePropertyNullableDtmiV4.json) be expressed as "dtmi:dtdl:property:nullable;4" instead of "nullable", but "nullable" is [RECOMMENDED](spec/Recommendation-ClassCommandResponsePropertyNullableTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassCommandResponsePropertyNullableTermAndDtmiV4.json) be expressed as both "nullable" and "dtmi:dtdl:property:nullable;4".
+
+All members other than those explitly listed above are forbidden or permitted according to the following rules:
+
+* Members with names starting with "@" other than "@context", "@id", and "@type" [MUST NOT](spec/Requirement-ClassCommandResponseInvalidKeywordsV4.json) be present.
+* Except as explicitly designated by an extension referenced in the active context, a member [SHALL NOT](spec/Completion-ClassCommandResponsePropertyIrrelevantDtmiOrTermV4.json) be present if the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "name", "nullable", "schema", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:name;4", "dtmi:dtdl:property:nullable;4", "dtmi:dtdl:property:schema;4".
+* Except as explicitly designated by an extension referenced in the active context, a member [MUST NOT](spec/Requirement-ClassCommandResponsePropertyFormallyIrrelevantDtmiOrTermV4.json) be present if the element is not informally co-typed and the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "name", "nullable", "schema", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:name;4", "dtmi:dtdl:property:nullable;4", "dtmi:dtdl:property:schema;4".
+* A member [MUST NOT](spec/Requirement-ClassCommandResponsePropertyInvalidDtmiV4.json) be present if the member's name starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+* A member [MUST NOT](spec/Requirement-ClassCommandResponsePropertyNotDtmiNorTermV4.json) be present if the member's name does not start with "@" and contains ":" but does not start with "dtmi:".
+* A member [SHALL NOT](spec/Completion-ClassCommandResponsePropertyUndefinedTermV4.json) be present if the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+* A member [MUST NOT](spec/Requirement-ClassCommandResponsePropertyFormallyUndefinedTermV4.json) be present if the element is not informally co-typed and the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+
+### Component
+
+Example:
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:example:delta_sigma;1",
+  "@type": "Interface",
+  "contents": {
+    "@type": "Component",
+    "name": "delta_pi",
+    "schema": {
+      "@id": "dtmi:example:delta_rho;1",
+      "@type": "Interface"
+    }
+  }
+}
+```
+
+The following members are [REQUIRED](spec/Requirement-ClassComponentRequiredPropertiesV4.json):
+
+* @type
+  * Value [MUST](spec/Requirement-ClassComponentTypeStringOrArrayV4.json) be a string or an array of strings.
+  * [MUST](spec/Requirement-ClassComponentTypeIncludesMaterialV4.json) include either string "Component" or string "dtmi:dtdl:class:Component;4".
+  * [SHOULD NOT](spec/Recommendation-ClassComponentTypeIncludesTermAndDtmiV4.json) include both "Component" and "dtmi:dtdl:class:Component;4".
+  * [SHOULD NOT](spec/Recommendation-ClassComponentTypeDuplicatesMaterialV4.json) include more than one instance of either "Component" or "dtmi:dtdl:class:Component;4".
+  * String "Component" is [RECOMMENDED](spec/Recommendation-ClassComponentTypePreferTermToDtmiV4.json) over string "dtmi:dtdl:class:Component;4".
+  * [SHALL NOT](spec/Completion-ClassComponentTypeIncludesIrrelevantDtmiOrTermV4.json) include any string conforming to [DTMI](#digital-twin-model-identifier) syntax rules or listed in the [Reserved strings](#reserved-strings) table other than "Component" or "dtmi:dtdl:class:Component;4", except as explicitly designated by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+  * [MUST NOT](spec/Requirement-ClassComponentTypeIncludesInvalidDtmiV4.json) include a string that starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+  * [MUST NOT](spec/Requirement-ClassComponentTypeIncludesNotDtmiNorTermV4.json) include any string that contains ":" but does not start with "dtmi:".
+  * [SHALL NOT](spec/Completion-ClassComponentTypeIncludesUndefinedTermV4.json) include any string that does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+* name
+  * Value [MUST](spec/Requirement-ClassComponentPropertyNameStringV4.json) be a [representational string](#representational-string) or an array containing exactly one representational string.
+  * String value [MUST NOT](spec/Requirement-ClassComponentPropertyNameStringLengthV4.json) be more than 512 characters in length.
+  * String value [MUST](spec/Requirement-ClassComponentPropertyNamePatternV4.json) match regular expression `^[A-Za-z](?:[A-Za-z0-9_]*[A-Za-z0-9])?$`.
+  * String value [MUST](spec/Requirement-ClassComponentPropertyNameUniqueAmongInterfaceContentsV4.json) be unique among the included values of "name" members of all elements included or referentially included in the "contents" member of any parent [Interface](#interface) element.
+  * Member name [MAY](spec/Allowance-ClassComponentPropertyNameDtmiV4.json) be expressed as "dtmi:dtdl:property:name;4" instead of "name", but "name" is [RECOMMENDED](spec/Recommendation-ClassComponentPropertyNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassComponentPropertyNameTermAndDtmiV4.json) be expressed as both "name" and "dtmi:dtdl:property:name;4".
+* schema
+  * Value [MUST](spec/Requirement-ClassComponentPropertySchemaElementV4.json) be a DTDL element, a dependent reference to DTDL element, or an array containing exactly one DTDL element or dependent reference to a DTDL element.
+  * If the value is a dependent reference or an array containing a dependent reference, the model [SHALL](spec/Completion-ClassComponentPropertySchemaDependentReferenceV4.json) contain a DTDL element with an "@id" member whose value matches the DTMI of the dependent reference, which is thereby referentially included.
+  * The included or referentially included DTDL element [MUST](spec/Requirement-ClassComponentPropertySchemaTypeConformanceV4.json) conform to the definition of DTDL element [Interface](#interface) or DTDLv3 element [Interface](../v3/DTDL.Specification.v3.md#interface) or DTDLv2 element [Interface](../v2/DTDL.Specification.v2.md#interface).
+  * Considered with other DTDL elements, value is subject to any relevant restrictions in [Limits and exclusions](#limits-and-exclusions).
+  * Member name [MAY](spec/Allowance-ClassComponentPropertySchemaDtmiV4.json) be expressed as "dtmi:dtdl:property:schema;4" instead of "schema", but "schema" is [RECOMMENDED](spec/Recommendation-ClassComponentPropertySchemaTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassComponentPropertySchemaTermAndDtmiV4.json) be expressed as both "schema" and "dtmi:dtdl:property:schema;4".
+
+The following members are [OPTIONAL](spec/Allowance-ClassComponentOptionalPropertiesV4.json):
+
+* @context
+  * [MUST](spec/Requirement-ClassComponentContextConformsV4.json) conform to the specified [context](#context) rules.
+* @id
+  * Value [MUST](spec/Requirement-ClassComponentIdIsDtmiV4.json) be a string that conforms to the specified [DTMI](#digital-twin-model-identifier) rules; value [MUST NOT](spec/Requirement-ClassComponentIdNotArrayV4.json) be an array.
+  * Value [MUST](spec/Requirement-ClassComponentIdDuplicateV4.json) be unique among the values of all "@id" members of all elements in the model.
+* comment
+  * Value [MUST](spec/Requirement-ClassComponentPropertyCommentStringV4.json) be a [representational string](#representational-string) or an array containing no more than one representational string.
+  * If present, string value [MUST NOT](spec/Requirement-ClassComponentPropertyCommentStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassComponentPropertyCommentDtmiV4.json) be expressed as "dtmi:dtdl:property:comment;4" instead of "comment", but "comment" is [RECOMMENDED](spec/Recommendation-ClassComponentPropertyCommentTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassComponentPropertyCommentTermAndDtmiV4.json) be expressed as both "comment" and "dtmi:dtdl:property:comment;4".
+* description
+  * Value [MUST](spec/Requirement-ClassComponentPropertyDescriptionLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassComponentPropertyDescriptionStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassComponentPropertyDescriptionDtmiV4.json) be expressed as "dtmi:dtdl:property:description;4" instead of "description", but "description" is [RECOMMENDED](spec/Recommendation-ClassComponentPropertyDescriptionTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassComponentPropertyDescriptionTermAndDtmiV4.json) be expressed as both "description" and "dtmi:dtdl:property:description;4".
+* displayName
+  * Value [MUST](spec/Requirement-ClassComponentPropertyDisplayNameLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassComponentPropertyDisplayNameStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassComponentPropertyDisplayNameDtmiV4.json) be expressed as "dtmi:dtdl:property:displayName;4" instead of "displayName", but "displayName" is [RECOMMENDED](spec/Recommendation-ClassComponentPropertyDisplayNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassComponentPropertyDisplayNameTermAndDtmiV4.json) be expressed as both "displayName" and "dtmi:dtdl:property:displayName;4".
+
+All members other than those explitly listed above are forbidden or permitted according to the following rules:
+
+* Members with names starting with "@" other than "@context", "@id", and "@type" [MUST NOT](spec/Requirement-ClassComponentInvalidKeywordsV4.json) be present.
+* Except as explicitly designated by an extension referenced in the active context, a member [SHALL NOT](spec/Completion-ClassComponentPropertyIrrelevantDtmiOrTermV4.json) be present if the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "name", "schema", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:name;4", "dtmi:dtdl:property:schema;4".
+* Except as explicitly designated by an extension referenced in the active context, a member [MUST NOT](spec/Requirement-ClassComponentPropertyFormallyIrrelevantDtmiOrTermV4.json) be present if the element is not informally co-typed and the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "name", "schema", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:name;4", "dtmi:dtdl:property:schema;4".
+* A member [MUST NOT](spec/Requirement-ClassComponentPropertyInvalidDtmiV4.json) be present if the member's name starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+* A member [MUST NOT](spec/Requirement-ClassComponentPropertyNotDtmiNorTermV4.json) be present if the member's name does not start with "@" and contains ":" but does not start with "dtmi:".
+* A member [SHALL NOT](spec/Completion-ClassComponentPropertyUndefinedTermV4.json) be present if the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+* A member [MUST NOT](spec/Requirement-ClassComponentPropertyFormallyUndefinedTermV4.json) be present if the element is not informally co-typed and the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+
+### Enum
+
+Example:
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:example:delta_chi;1",
+  "@type": "Interface",
+  "schemas": {
+    "@id": "dtmi:example:delta_phi;1",
+    "@type": "Enum",
+    "valueSchema": "integer"
+  }
+}
+```
+
+The following members are [REQUIRED](spec/Requirement-ClassEnumRequiredPropertiesV4.json):
+
+* @type
+  * Value [MUST](spec/Requirement-ClassEnumTypeStringOrArrayV4.json) be a string or an array of strings.
+  * [MUST](spec/Requirement-ClassEnumTypeIncludesMaterialV4.json) include either string "Enum" or string "dtmi:dtdl:class:Enum;4".
+  * [SHOULD NOT](spec/Recommendation-ClassEnumTypeIncludesTermAndDtmiV4.json) include both "Enum" and "dtmi:dtdl:class:Enum;4".
+  * [SHOULD NOT](spec/Recommendation-ClassEnumTypeDuplicatesMaterialV4.json) include more than one instance of either "Enum" or "dtmi:dtdl:class:Enum;4".
+  * String "Enum" is [RECOMMENDED](spec/Recommendation-ClassEnumTypePreferTermToDtmiV4.json) over string "dtmi:dtdl:class:Enum;4".
+  * [SHALL NOT](spec/Completion-ClassEnumTypeIncludesIrrelevantDtmiOrTermV4.json) include any string conforming to [DTMI](#digital-twin-model-identifier) syntax rules or listed in the [Reserved strings](#reserved-strings) table other than "Enum" or "dtmi:dtdl:class:Enum;4", except as explicitly designated by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+  * [MUST NOT](spec/Requirement-ClassEnumTypeIncludesInvalidDtmiV4.json) include a string that starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+  * [MUST NOT](spec/Requirement-ClassEnumTypeIncludesNotDtmiNorTermV4.json) include any string that contains ":" but does not start with "dtmi:".
+  * [SHALL NOT](spec/Completion-ClassEnumTypeIncludesUndefinedTermV4.json) include any string that does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+* valueSchema
+  * Value [MUST](spec/Requirement-ClassEnumPropertyValueSchemaSpecificValuesV4.json) be "integer", "string", "dtmi:dtdl:instance:Schema:integer;4", "dtmi:dtdl:instance:Schema:integer;3", "dtmi:dtdl:instance:Schema:integer;2", "dtmi:dtdl:instance:Schema:string;4", "dtmi:dtdl:instance:Schema:string;3", "dtmi:dtdl:instance:Schema:string;2", or an array containing exactly one of these string values.
+  * Value "integer" is [RECOMMENDED](spec/Recommendation-ClassEnumPropertyValueSchemaValueIntegerPreferToDtmiV4.json) over value dtmi:dtdl:instance:Schema:integer;4.
+  * Value "string" is [RECOMMENDED](spec/Recommendation-ClassEnumPropertyValueSchemaValueStringPreferToDtmiV4.json) over value dtmi:dtdl:instance:Schema:string;4.
+  * Member name [MAY](spec/Allowance-ClassEnumPropertyValueSchemaDtmiV4.json) be expressed as "dtmi:dtdl:property:valueSchema;4" instead of "valueSchema", but "valueSchema" is [RECOMMENDED](spec/Recommendation-ClassEnumPropertyValueSchemaTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassEnumPropertyValueSchemaTermAndDtmiV4.json) be expressed as both "valueSchema" and "dtmi:dtdl:property:valueSchema;4".
+
+The following members are [OPTIONAL](spec/Allowance-ClassEnumOptionalPropertiesV4.json) unless otherwise noted:
+
+* @context
+  * [MUST](spec/Requirement-ClassEnumContextConformsV4.json) conform to the specified [context](#context) rules.
+* @id
+  * [REQUIRED](spec/Requirement-ClassEnumIdRequiredV4.json) when the Enum element is included in Interface member "schemas".
+  * Value [MUST](spec/Requirement-ClassEnumIdIsDtmiV4.json) be a string that conforms to the specified [DTMI](#digital-twin-model-identifier) rules; value [MUST NOT](spec/Requirement-ClassEnumIdNotArrayV4.json) be an array.
+  * Value [MUST](spec/Requirement-ClassEnumIdDuplicateV4.json) be unique among the values of all "@id" members of all elements in the model.
+* comment
+  * Value [MUST](spec/Requirement-ClassEnumPropertyCommentStringV4.json) be a [representational string](#representational-string) or an array containing no more than one representational string.
+  * If present, string value [MUST NOT](spec/Requirement-ClassEnumPropertyCommentStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassEnumPropertyCommentDtmiV4.json) be expressed as "dtmi:dtdl:property:comment;4" instead of "comment", but "comment" is [RECOMMENDED](spec/Recommendation-ClassEnumPropertyCommentTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassEnumPropertyCommentTermAndDtmiV4.json) be expressed as both "comment" and "dtmi:dtdl:property:comment;4".
+* description
+  * Value [MUST](spec/Requirement-ClassEnumPropertyDescriptionLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassEnumPropertyDescriptionStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassEnumPropertyDescriptionDtmiV4.json) be expressed as "dtmi:dtdl:property:description;4" instead of "description", but "description" is [RECOMMENDED](spec/Recommendation-ClassEnumPropertyDescriptionTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassEnumPropertyDescriptionTermAndDtmiV4.json) be expressed as both "description" and "dtmi:dtdl:property:description;4".
+* displayName
+  * Value [MUST](spec/Requirement-ClassEnumPropertyDisplayNameLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassEnumPropertyDisplayNameStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassEnumPropertyDisplayNameDtmiV4.json) be expressed as "dtmi:dtdl:property:displayName;4" instead of "displayName", but "displayName" is [RECOMMENDED](spec/Recommendation-ClassEnumPropertyDisplayNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassEnumPropertyDisplayNameTermAndDtmiV4.json) be expressed as both "displayName" and "dtmi:dtdl:property:displayName;4".
+* enumValues
+  * Value [MUST](spec/Requirement-ClassEnumPropertyEnumValuesElementV4.json) be a DTDL element, a dependent reference to DTDL element, or an array of DTDL elements and dependent references to DTDL elements.
+  * For each included dependent reference, the model [SHALL](spec/Completion-ClassEnumPropertyEnumValuesDependentReferenceV4.json) contain a DTDL element with an "@id" member whose value matches the DTMI of the dependent reference, which is thereby referentially included.
+  * Each included or referentially included DTDL element [MUST](spec/Requirement-ClassEnumPropertyEnumValuesTypeConformanceV4.json) conform to the definition of DTDL element [EnumValue](#enumvalue).
+  * Member name [MAY](spec/Allowance-ClassEnumPropertyEnumValuesDtmiV4.json) be expressed as "dtmi:dtdl:property:enumValues;4" instead of "enumValues", but "enumValues" is [RECOMMENDED](spec/Recommendation-ClassEnumPropertyEnumValuesTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassEnumPropertyEnumValuesTermAndDtmiV4.json) be expressed as both "enumValues" and "dtmi:dtdl:property:enumValues;4".
+
+All members other than those explitly listed above are forbidden or permitted according to the following rules:
+
+* Members with names starting with "@" other than "@context", "@id", and "@type" [MUST NOT](spec/Requirement-ClassEnumInvalidKeywordsV4.json) be present.
+* Except as explicitly designated by an extension referenced in the active context, a member [SHALL NOT](spec/Completion-ClassEnumPropertyIrrelevantDtmiOrTermV4.json) be present if the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "enumValues", "valueSchema", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:enumValues;4", "dtmi:dtdl:property:valueSchema;4".
+* Except as explicitly designated by an extension referenced in the active context, a member [MUST NOT](spec/Requirement-ClassEnumPropertyFormallyIrrelevantDtmiOrTermV4.json) be present if the element is not informally co-typed and the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "enumValues", "valueSchema", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:enumValues;4", "dtmi:dtdl:property:valueSchema;4".
+* A member [MUST NOT](spec/Requirement-ClassEnumPropertyInvalidDtmiV4.json) be present if the member's name starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+* A member [MUST NOT](spec/Requirement-ClassEnumPropertyNotDtmiNorTermV4.json) be present if the member's name does not start with "@" and contains ":" but does not start with "dtmi:".
+* A member [SHALL NOT](spec/Completion-ClassEnumPropertyUndefinedTermV4.json) be present if the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+* A member [MUST NOT](spec/Requirement-ClassEnumPropertyFormallyUndefinedTermV4.json) be present if the element is not informally co-typed and the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+
+### EnumValue
+
+Example:
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:example:delta_wum;1",
+  "@type": "Interface",
+  "schemas": {
+    "@id": "dtmi:example:delta_yuzz;1",
+    "@type": "Enum",
+    "valueSchema": "integer",
+    "enumValues": {
+      "enumValue": 18,
+      "name": "delta_omega"
+    }
+  }
+}
+```
+
+The following members are [REQUIRED](spec/Requirement-ClassEnumValueRequiredPropertiesV4.json):
+
+* enumValue
+  * Value [MUST](spec/Requirement-ClassEnumValuePropertyEnumValueIntegerV4.json) be a [representational integer](#representational-integer) or an array containing exactly one representational integer if any parent [Enum](#enum) element has a "valueSchema" member that includes "integer" or "dtmi:dtdl:instance:Schema:integer;4".
+  * Value [MUST](spec/Requirement-ClassEnumValuePropertyEnumValueStringV4.json) be a [representational string](#representational-string) or an array containing exactly one representational string if any parent [Enum](#enum) element has a "valueSchema" member that includes "string" or "dtmi:dtdl:instance:Schema:string;4".
+  * Literal value [MUST](spec/Requirement-ClassEnumValuePropertyEnumValueUniqueAmongEnumEnumValuesV4.json) be unique among the included values of "enumValue" members of all elements included or referentially included in the "enumValues" member of any parent [Enum](#enum) element.
+  * Member name [MAY](spec/Allowance-ClassEnumValuePropertyEnumValueDtmiV4.json) be expressed as "dtmi:dtdl:property:enumValue;4" instead of "enumValue", but "enumValue" is [RECOMMENDED](spec/Recommendation-ClassEnumValuePropertyEnumValueTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassEnumValuePropertyEnumValueTermAndDtmiV4.json) be expressed as both "enumValue" and "dtmi:dtdl:property:enumValue;4".
+* name
+  * Value [MUST](spec/Requirement-ClassEnumValuePropertyNameStringV4.json) be a [representational string](#representational-string) or an array containing exactly one representational string.
+  * String value [MUST NOT](spec/Requirement-ClassEnumValuePropertyNameStringLengthV4.json) be more than 512 characters in length.
+  * String value [MUST](spec/Requirement-ClassEnumValuePropertyNamePatternV4.json) match regular expression `^[A-Za-z](?:[A-Za-z0-9_]*[A-Za-z0-9])?$`.
+  * String value [MUST](spec/Requirement-ClassEnumValuePropertyNameUniqueAmongEnumEnumValuesV4.json) be unique among the included values of "name" members of all elements included or referentially included in the "enumValues" member of any parent [Enum](#enum) element.
+  * Member name [MAY](spec/Allowance-ClassEnumValuePropertyNameDtmiV4.json) be expressed as "dtmi:dtdl:property:name;4" instead of "name", but "name" is [RECOMMENDED](spec/Recommendation-ClassEnumValuePropertyNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassEnumValuePropertyNameTermAndDtmiV4.json) be expressed as both "name" and "dtmi:dtdl:property:name;4".
+
+The following members are [OPTIONAL](spec/Allowance-ClassEnumValueOptionalPropertiesV4.json):
+
+* @context
+  * [MUST](spec/Requirement-ClassEnumValueContextConformsV4.json) conform to the specified [context](#context) rules.
+* @type
+  * Value [MUST](spec/Requirement-ClassEnumValueTypeStringOrArrayV4.json) be a string or an array of strings.
+  * [MUST](spec/Requirement-ClassEnumValueTypeIncludesMaterialV4.json) include either string "EnumValue" or string "dtmi:dtdl:class:EnumValue;4".
+  * [SHOULD NOT](spec/Recommendation-ClassEnumValueTypeIncludesTermAndDtmiV4.json) include both "EnumValue" and "dtmi:dtdl:class:EnumValue;4".
+  * [SHOULD NOT](spec/Recommendation-ClassEnumValueTypeDuplicatesMaterialV4.json) include more than one instance of either "EnumValue" or "dtmi:dtdl:class:EnumValue;4".
+  * String "EnumValue" is [RECOMMENDED](spec/Recommendation-ClassEnumValueTypePreferTermToDtmiV4.json) over string "dtmi:dtdl:class:EnumValue;4".
+  * [SHALL NOT](spec/Completion-ClassEnumValueTypeIncludesIrrelevantDtmiOrTermV4.json) include any string conforming to [DTMI](#digital-twin-model-identifier) syntax rules or listed in the [Reserved strings](#reserved-strings) table other than "EnumValue" or "dtmi:dtdl:class:EnumValue;4", except as explicitly designated by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+  * [MUST NOT](spec/Requirement-ClassEnumValueTypeIncludesInvalidDtmiV4.json) include a string that starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+  * [MUST NOT](spec/Requirement-ClassEnumValueTypeIncludesNotDtmiNorTermV4.json) include any string that contains ":" but does not start with "dtmi:".
+  * [SHALL NOT](spec/Completion-ClassEnumValueTypeIncludesUndefinedTermV4.json) include any string that does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+* @id
+  * Value [MUST](spec/Requirement-ClassEnumValueIdIsDtmiV4.json) be a string that conforms to the specified [DTMI](#digital-twin-model-identifier) rules; value [MUST NOT](spec/Requirement-ClassEnumValueIdNotArrayV4.json) be an array.
+  * Value [MUST](spec/Requirement-ClassEnumValueIdDuplicateV4.json) be unique among the values of all "@id" members of all elements in the model.
+* comment
+  * Value [MUST](spec/Requirement-ClassEnumValuePropertyCommentStringV4.json) be a [representational string](#representational-string) or an array containing no more than one representational string.
+  * If present, string value [MUST NOT](spec/Requirement-ClassEnumValuePropertyCommentStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassEnumValuePropertyCommentDtmiV4.json) be expressed as "dtmi:dtdl:property:comment;4" instead of "comment", but "comment" is [RECOMMENDED](spec/Recommendation-ClassEnumValuePropertyCommentTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassEnumValuePropertyCommentTermAndDtmiV4.json) be expressed as both "comment" and "dtmi:dtdl:property:comment;4".
+* description
+  * Value [MUST](spec/Requirement-ClassEnumValuePropertyDescriptionLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassEnumValuePropertyDescriptionStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassEnumValuePropertyDescriptionDtmiV4.json) be expressed as "dtmi:dtdl:property:description;4" instead of "description", but "description" is [RECOMMENDED](spec/Recommendation-ClassEnumValuePropertyDescriptionTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassEnumValuePropertyDescriptionTermAndDtmiV4.json) be expressed as both "description" and "dtmi:dtdl:property:description;4".
+* displayName
+  * Value [MUST](spec/Requirement-ClassEnumValuePropertyDisplayNameLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassEnumValuePropertyDisplayNameStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassEnumValuePropertyDisplayNameDtmiV4.json) be expressed as "dtmi:dtdl:property:displayName;4" instead of "displayName", but "displayName" is [RECOMMENDED](spec/Recommendation-ClassEnumValuePropertyDisplayNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassEnumValuePropertyDisplayNameTermAndDtmiV4.json) be expressed as both "displayName" and "dtmi:dtdl:property:displayName;4".
+
+All members other than those explitly listed above are forbidden or permitted according to the following rules:
+
+* Members with names starting with "@" other than "@context", "@id", and "@type" [MUST NOT](spec/Requirement-ClassEnumValueInvalidKeywordsV4.json) be present.
+* Except as explicitly designated by an extension referenced in the active context, a member [SHALL NOT](spec/Completion-ClassEnumValuePropertyIrrelevantDtmiOrTermV4.json) be present if the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "enumValue", "name", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:enumValue;4", "dtmi:dtdl:property:name;4".
+* Except as explicitly designated by an extension referenced in the active context, a member [MUST NOT](spec/Requirement-ClassEnumValuePropertyFormallyIrrelevantDtmiOrTermV4.json) be present if the element is not informally co-typed and the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "enumValue", "name", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:enumValue;4", "dtmi:dtdl:property:name;4".
+* A member [MUST NOT](spec/Requirement-ClassEnumValuePropertyInvalidDtmiV4.json) be present if the member's name starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+* A member [MUST NOT](spec/Requirement-ClassEnumValuePropertyNotDtmiNorTermV4.json) be present if the member's name does not start with "@" and contains ":" but does not start with "dtmi:".
+* A member [SHALL NOT](spec/Completion-ClassEnumValuePropertyUndefinedTermV4.json) be present if the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+* A member [MUST NOT](spec/Requirement-ClassEnumValuePropertyFormallyUndefinedTermV4.json) be present if the element is not informally co-typed and the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+
+### Field
+
+Example:
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:example:delta_quan;1",
+  "@type": "Interface",
+  "schemas": {
+    "@id": "dtmi:example:delta_snee;1",
+    "@type": "Object",
+    "fields": {
+      "name": "delta_nuh",
+      "schema": "date"
+    }
+  }
+}
+```
+
+The following members are [REQUIRED](spec/Requirement-ClassFieldRequiredPropertiesV4.json):
+
+* name
+  * Value [MUST](spec/Requirement-ClassFieldPropertyNameStringV4.json) be a [representational string](#representational-string) or an array containing exactly one representational string.
+  * String value [MUST NOT](spec/Requirement-ClassFieldPropertyNameStringLengthV4.json) be more than 512 characters in length.
+  * String value [MUST](spec/Requirement-ClassFieldPropertyNamePatternV4.json) match regular expression `^[A-Za-z](?:[A-Za-z0-9_]*[A-Za-z0-9])?$`.
+  * String value [MUST](spec/Requirement-ClassFieldPropertyNameUniqueAmongObjectFieldsV4.json) be unique among the included values of "name" members of all elements included or referentially included in the "fields" member of any parent [Object](#object) element.
+  * Member name [MAY](spec/Allowance-ClassFieldPropertyNameDtmiV4.json) be expressed as "dtmi:dtdl:property:name;4" instead of "name", but "name" is [RECOMMENDED](spec/Recommendation-ClassFieldPropertyNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassFieldPropertyNameTermAndDtmiV4.json) be expressed as both "name" and "dtmi:dtdl:property:name;4".
+* schema
+  * Value [MUST](spec/Requirement-ClassFieldPropertySchemaElementV4.json) be a DTDL element, a dependent reference to a DTDL element, a string from one of the rows in a [Standard schemas](#standard-schemas) table, a string defined by an extension referenced in the active context, or an array containing exactly one DTDL element, dependent reference to a DTDL element, string from one of the rows in a Standard schemas table, or string defined by an extension referenced in the active context.
+  * If the value is a dependent reference or an array containing a dependent reference, the model [SHALL](spec/Completion-ClassFieldPropertySchemaDependentReferenceV4.json) contain a DTDL element with an "@id" member whose value matches the DTMI of the dependent reference, which is thereby referentially included.
+  * If present, an included or referentially included DTDL element [MUST](spec/Requirement-ClassFieldPropertySchemaTypeConformanceV4.json) conform to the definition of DTDL element [Array](#array) or [Enum](#enum) or [Map](#map) or [Object](#object) or DTDLv3 element [Array](../v3/DTDL.Specification.v3.md#array) or [Enum](../v3/DTDL.Specification.v3.md#enum) or [Map](../v3/DTDL.Specification.v3.md#map) or [Object](../v3/DTDL.Specification.v3.md#object) or DTDLv2 element [Array](../v2/DTDL.Specification.v2.md#array) or [Enum](../v2/DTDL.Specification.v2.md#enum) or [Map](../v2/DTDL.Specification.v2.md#map) or [Object](../v2/DTDL.Specification.v2.md#object).
+  * If a string from one of the rows in a Standard schemas table is included, a string from column "Term" is [RECOMMENDED](spec/Recommendation-ClassFieldPropertySchemaPreferTermToDtmiV4.json) over a string from column "DTMI".
+  * Considered with other DTDL elements, value is subject to any relevant restrictions in [Limits and exclusions](#limits-and-exclusions).
+  * Member name [MAY](spec/Allowance-ClassFieldPropertySchemaDtmiV4.json) be expressed as "dtmi:dtdl:property:schema;4" instead of "schema", but "schema" is [RECOMMENDED](spec/Recommendation-ClassFieldPropertySchemaTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassFieldPropertySchemaTermAndDtmiV4.json) be expressed as both "schema" and "dtmi:dtdl:property:schema;4".
+
+The following members are [OPTIONAL](spec/Allowance-ClassFieldOptionalPropertiesV4.json):
+
+* @context
+  * [MUST](spec/Requirement-ClassFieldContextConformsV4.json) conform to the specified [context](#context) rules.
+* @type
+  * Value [MUST](spec/Requirement-ClassFieldTypeStringOrArrayV4.json) be a string or an array of strings.
+  * [MUST](spec/Requirement-ClassFieldTypeIncludesMaterialV4.json) include either string "Field" or string "dtmi:dtdl:class:Field;4".
+  * [SHOULD NOT](spec/Recommendation-ClassFieldTypeIncludesTermAndDtmiV4.json) include both "Field" and "dtmi:dtdl:class:Field;4".
+  * [SHOULD NOT](spec/Recommendation-ClassFieldTypeDuplicatesMaterialV4.json) include more than one instance of either "Field" or "dtmi:dtdl:class:Field;4".
+  * String "Field" is [RECOMMENDED](spec/Recommendation-ClassFieldTypePreferTermToDtmiV4.json) over string "dtmi:dtdl:class:Field;4".
+  * [SHALL NOT](spec/Completion-ClassFieldTypeIncludesIrrelevantDtmiOrTermV4.json) include any string conforming to [DTMI](#digital-twin-model-identifier) syntax rules or listed in the [Reserved strings](#reserved-strings) table other than "Field" or "dtmi:dtdl:class:Field;4", except as explicitly designated by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+  * [MUST NOT](spec/Requirement-ClassFieldTypeIncludesInvalidDtmiV4.json) include a string that starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+  * [MUST NOT](spec/Requirement-ClassFieldTypeIncludesNotDtmiNorTermV4.json) include any string that contains ":" but does not start with "dtmi:".
+  * [SHALL NOT](spec/Completion-ClassFieldTypeIncludesUndefinedTermV4.json) include any string that does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+* @id
+  * Value [MUST](spec/Requirement-ClassFieldIdIsDtmiV4.json) be a string that conforms to the specified [DTMI](#digital-twin-model-identifier) rules; value [MUST NOT](spec/Requirement-ClassFieldIdNotArrayV4.json) be an array.
+  * Value [MUST](spec/Requirement-ClassFieldIdDuplicateV4.json) be unique among the values of all "@id" members of all elements in the model.
+* comment
+  * Value [MUST](spec/Requirement-ClassFieldPropertyCommentStringV4.json) be a [representational string](#representational-string) or an array containing no more than one representational string.
+  * If present, string value [MUST NOT](spec/Requirement-ClassFieldPropertyCommentStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassFieldPropertyCommentDtmiV4.json) be expressed as "dtmi:dtdl:property:comment;4" instead of "comment", but "comment" is [RECOMMENDED](spec/Recommendation-ClassFieldPropertyCommentTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassFieldPropertyCommentTermAndDtmiV4.json) be expressed as both "comment" and "dtmi:dtdl:property:comment;4".
+* description
+  * Value [MUST](spec/Requirement-ClassFieldPropertyDescriptionLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassFieldPropertyDescriptionStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassFieldPropertyDescriptionDtmiV4.json) be expressed as "dtmi:dtdl:property:description;4" instead of "description", but "description" is [RECOMMENDED](spec/Recommendation-ClassFieldPropertyDescriptionTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassFieldPropertyDescriptionTermAndDtmiV4.json) be expressed as both "description" and "dtmi:dtdl:property:description;4".
+* displayName
+  * Value [MUST](spec/Requirement-ClassFieldPropertyDisplayNameLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassFieldPropertyDisplayNameStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassFieldPropertyDisplayNameDtmiV4.json) be expressed as "dtmi:dtdl:property:displayName;4" instead of "displayName", but "displayName" is [RECOMMENDED](spec/Recommendation-ClassFieldPropertyDisplayNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassFieldPropertyDisplayNameTermAndDtmiV4.json) be expressed as both "displayName" and "dtmi:dtdl:property:displayName;4".
+
+All members other than those explitly listed above are forbidden or permitted according to the following rules:
+
+* Members with names starting with "@" other than "@context", "@id", and "@type" [MUST NOT](spec/Requirement-ClassFieldInvalidKeywordsV4.json) be present.
+* Except as explicitly designated by an extension referenced in the active context, a member [SHALL NOT](spec/Completion-ClassFieldPropertyIrrelevantDtmiOrTermV4.json) be present if the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "name", "schema", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:name;4", "dtmi:dtdl:property:schema;4".
+* Except as explicitly designated by an extension referenced in the active context, a member [MUST NOT](spec/Requirement-ClassFieldPropertyFormallyIrrelevantDtmiOrTermV4.json) be present if the element is not informally co-typed and the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "name", "schema", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:name;4", "dtmi:dtdl:property:schema;4".
+* A member [MUST NOT](spec/Requirement-ClassFieldPropertyInvalidDtmiV4.json) be present if the member's name starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+* A member [MUST NOT](spec/Requirement-ClassFieldPropertyNotDtmiNorTermV4.json) be present if the member's name does not start with "@" and contains ":" but does not start with "dtmi:".
+* A member [SHALL NOT](spec/Completion-ClassFieldPropertyUndefinedTermV4.json) be present if the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+* A member [MUST NOT](spec/Requirement-ClassFieldPropertyFormallyUndefinedTermV4.json) be present if the element is not informally co-typed and the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+
+### Interface
+
+Example:
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:example:delta_floob;1",
+  "@type": "Interface"
+}
+```
+
+The following members are [REQUIRED](spec/Requirement-ClassInterfaceRequiredPropertiesV4.json):
+
+* @type
+  * Value [MUST](spec/Requirement-ClassInterfaceTypeStringOrArrayV4.json) be a string or an array of strings.
+  * [MUST](spec/Requirement-ClassInterfaceTypeIncludesMaterialV4.json) include either string "Interface" or string "dtmi:dtdl:class:Interface;4".
+  * [SHOULD NOT](spec/Recommendation-ClassInterfaceTypeIncludesTermAndDtmiV4.json) include both "Interface" and "dtmi:dtdl:class:Interface;4".
+  * [SHOULD NOT](spec/Recommendation-ClassInterfaceTypeDuplicatesMaterialV4.json) include more than one instance of either "Interface" or "dtmi:dtdl:class:Interface;4".
+  * String "Interface" is [RECOMMENDED](spec/Recommendation-ClassInterfaceTypePreferTermToDtmiV4.json) over string "dtmi:dtdl:class:Interface;4".
+  * [SHALL NOT](spec/Completion-ClassInterfaceTypeIncludesIrrelevantDtmiOrTermV4.json) include any string conforming to [DTMI](#digital-twin-model-identifier) syntax rules or listed in the [Reserved strings](#reserved-strings) table other than "Interface" or "dtmi:dtdl:class:Interface;4", except as explicitly designated by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+  * [MUST NOT](spec/Requirement-ClassInterfaceTypeIncludesInvalidDtmiV4.json) include a string that starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+  * [MUST NOT](spec/Requirement-ClassInterfaceTypeIncludesNotDtmiNorTermV4.json) include any string that contains ":" but does not start with "dtmi:".
+  * [SHALL NOT](spec/Completion-ClassInterfaceTypeIncludesUndefinedTermV4.json) include any string that does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+* @id
+  * Value [MUST](spec/Requirement-ClassInterfaceIdIsDtmiV4.json) be a string that conforms to the specified [DTMI](#digital-twin-model-identifier) rules; value [MUST NOT](spec/Requirement-ClassInterfaceIdNotArrayV4.json) be an array.
+  * Value [MUST](spec/Requirement-ClassInterfaceIdDuplicateV4.json) be unique among the values of all "@id" members of all elements in the model.
+  * Length of value string [MUST NOT](spec/Requirement-ClassInterfaceIdLongV4.json) exceed 128 characters.
+
+The following members are [OPTIONAL](spec/Allowance-ClassInterfaceOptionalPropertiesV4.json) unless otherwise noted:
+
+* @context
+  * [REQUIRED](spec/Requirement-ClassInterfaceContextAtTopLevelV4.json) when the Interface element is a top-level element.
+  * [MUST](spec/Requirement-ClassInterfaceContextDtdlTopLevelV4.json) include value "dtmi:dtdl:context;4" when the Interface element is a top-level element.
+  * [MUST](spec/Requirement-ClassInterfaceContextConformsV4.json) conform to the specified [context](#context) rules.
+* comment
+  * Value [MUST](spec/Requirement-ClassInterfacePropertyCommentStringV4.json) be a [representational string](#representational-string) or an array containing no more than one representational string.
+  * If present, string value [MUST NOT](spec/Requirement-ClassInterfacePropertyCommentStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassInterfacePropertyCommentDtmiV4.json) be expressed as "dtmi:dtdl:property:comment;4" instead of "comment", but "comment" is [RECOMMENDED](spec/Recommendation-ClassInterfacePropertyCommentTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassInterfacePropertyCommentTermAndDtmiV4.json) be expressed as both "comment" and "dtmi:dtdl:property:comment;4".
+* contents
+  * Value [MUST](spec/Requirement-ClassInterfacePropertyContentsElementV4.json) be a DTDL element, a dependent reference to DTDL element, or an array of DTDL elements and dependent references to DTDL elements.
+  * For each included dependent reference, the model [SHALL](spec/Completion-ClassInterfacePropertyContentsDependentReferenceV4.json) contain a DTDL element with an "@id" member whose value matches the DTMI of the dependent reference, which is thereby referentially included.
+  * Each included or referentially included DTDL element [MUST](spec/Requirement-ClassInterfacePropertyContentsTypeConformanceV4.json) conform to the definition of DTDL element [Command](#command) or [Component](#component) or [Property](#property) or [Relationship](#relationship) or [Telemetry](#telemetry) or DTDLv3 element [Command](../v3/DTDL.Specification.v3.md#command) or [Component](../v3/DTDL.Specification.v3.md#component) or [Property](../v3/DTDL.Specification.v3.md#property) or [Relationship](../v3/DTDL.Specification.v3.md#relationship) or [Telemetry](../v3/DTDL.Specification.v3.md#telemetry) or DTDLv2 element [Command](../v2/DTDL.Specification.v2.md#command) or [Component](../v2/DTDL.Specification.v2.md#component) or [Property](../v2/DTDL.Specification.v2.md#property) or [Relationship](../v2/DTDL.Specification.v2.md#relationship) or [Telemetry](../v2/DTDL.Specification.v2.md#telemetry).
+  * Considered with other DTDL elements, value is subject to any relevant restrictions in [Limits and exclusions](#limits-and-exclusions).
+  * Member name [MAY](spec/Allowance-ClassInterfacePropertyContentsDtmiV4.json) be expressed as "dtmi:dtdl:property:contents;4" instead of "contents", but "contents" is [RECOMMENDED](spec/Recommendation-ClassInterfacePropertyContentsTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassInterfacePropertyContentsTermAndDtmiV4.json) be expressed as both "contents" and "dtmi:dtdl:property:contents;4".
+* description
+  * Value [MUST](spec/Requirement-ClassInterfacePropertyDescriptionLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassInterfacePropertyDescriptionStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassInterfacePropertyDescriptionDtmiV4.json) be expressed as "dtmi:dtdl:property:description;4" instead of "description", but "description" is [RECOMMENDED](spec/Recommendation-ClassInterfacePropertyDescriptionTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassInterfacePropertyDescriptionTermAndDtmiV4.json) be expressed as both "description" and "dtmi:dtdl:property:description;4".
+* displayName
+  * Value [MUST](spec/Requirement-ClassInterfacePropertyDisplayNameLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassInterfacePropertyDisplayNameStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassInterfacePropertyDisplayNameDtmiV4.json) be expressed as "dtmi:dtdl:property:displayName;4" instead of "displayName", but "displayName" is [RECOMMENDED](spec/Recommendation-ClassInterfacePropertyDisplayNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassInterfacePropertyDisplayNameTermAndDtmiV4.json) be expressed as both "displayName" and "dtmi:dtdl:property:displayName;4".
+* extends
+  * Value [MUST](spec/Requirement-ClassInterfacePropertyExtendsElementV4.json) be a DTDL element, a dependent reference to DTDL element, or an array of DTDL elements and dependent references to DTDL elements.
+  * For each included dependent reference, the model [SHALL](spec/Completion-ClassInterfacePropertyExtendsDependentReferenceV4.json) contain a DTDL element with an "@id" member whose value matches the DTMI of the dependent reference, which is thereby referentially included.
+  * Each included or referentially included DTDL element [MUST](spec/Requirement-ClassInterfacePropertyExtendsTypeConformanceV4.json) conform to the definition of DTDL element [Interface](#interface) or DTDLv3 element [Interface](../v3/DTDL.Specification.v3.md#interface) or DTDLv2 element [Interface](../v2/DTDL.Specification.v2.md#interface).
+  * Considered with other DTDL elements, value is subject to any relevant restrictions in [Limits and exclusions](#limits-and-exclusions).
+  * Member name [MAY](spec/Allowance-ClassInterfacePropertyExtendsDtmiV4.json) be expressed as "dtmi:dtdl:property:extends;4" instead of "extends", but "extends" is [RECOMMENDED](spec/Recommendation-ClassInterfacePropertyExtendsTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassInterfacePropertyExtendsTermAndDtmiV4.json) be expressed as both "extends" and "dtmi:dtdl:property:extends;4".
+* schemas
+  * Value [MUST](spec/Requirement-ClassInterfacePropertySchemasElementV4.json) be a DTDL element, a dependent reference to DTDL element, or an array of DTDL elements and dependent references to DTDL elements.
+  * For each included dependent reference, the model [SHALL](spec/Completion-ClassInterfacePropertySchemasDependentReferenceV4.json) contain a DTDL element with an "@id" member whose value matches the DTMI of the dependent reference, which is thereby referentially included.
+  * Each included or referentially included DTDL element [MUST](spec/Requirement-ClassInterfacePropertySchemasTypeConformanceV4.json) conform to the definition of DTDL element [Array](#array) or [Enum](#enum) or [Map](#map) or [Object](#object).
+  * Member name [MAY](spec/Allowance-ClassInterfacePropertySchemasDtmiV4.json) be expressed as "dtmi:dtdl:property:schemas;4" instead of "schemas", but "schemas" is [RECOMMENDED](spec/Recommendation-ClassInterfacePropertySchemasTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassInterfacePropertySchemasTermAndDtmiV4.json) be expressed as both "schemas" and "dtmi:dtdl:property:schemas;4".
+
+All members other than those explitly listed above are forbidden or permitted according to the following rules:
+
+* Members with names starting with "@" other than "@context", "@id", and "@type" [MUST NOT](spec/Requirement-ClassInterfaceInvalidKeywordsV4.json) be present.
+* Except as explicitly designated by an extension referenced in the active context, a member [SHALL NOT](spec/Completion-ClassInterfacePropertyIrrelevantDtmiOrTermV4.json) be present if the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "contents", "description", "displayName", "extends", "schemas", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:contents;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:extends;4", "dtmi:dtdl:property:schemas;4".
+* Except as explicitly designated by an extension referenced in the active context, a member [MUST NOT](spec/Requirement-ClassInterfacePropertyFormallyIrrelevantDtmiOrTermV4.json) be present if the element is not informally co-typed and the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "contents", "description", "displayName", "extends", "schemas", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:contents;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:extends;4", "dtmi:dtdl:property:schemas;4".
+* A member [MUST NOT](spec/Requirement-ClassInterfacePropertyInvalidDtmiV4.json) be present if the member's name starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+* A member [MUST NOT](spec/Requirement-ClassInterfacePropertyNotDtmiNorTermV4.json) be present if the member's name does not start with "@" and contains ":" but does not start with "dtmi:".
+* A member [SHALL NOT](spec/Completion-ClassInterfacePropertyUndefinedTermV4.json) be present if the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+* A member [MUST NOT](spec/Requirement-ClassInterfacePropertyFormallyUndefinedTermV4.json) be present if the element is not informally co-typed and the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+
+### Map
+
+Example:
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:example:delta_itch;1",
+  "@type": "Interface",
+  "schemas": {
+    "@id": "dtmi:example:delta_zatz;1",
+    "@type": "Map",
+    "mapKey": {
+      "name": "delta_jogg",
+      "schema": "string"
+    },
+    "mapValue": {
+      "name": "delta_flunn",
+      "schema": "dateTime"
+    }
+  }
+}
+```
+
+The following members are [REQUIRED](spec/Requirement-ClassMapRequiredPropertiesV4.json):
+
+* @type
+  * Value [MUST](spec/Requirement-ClassMapTypeStringOrArrayV4.json) be a string or an array of strings.
+  * [MUST](spec/Requirement-ClassMapTypeIncludesMaterialV4.json) include either string "Map" or string "dtmi:dtdl:class:Map;4".
+  * [SHOULD NOT](spec/Recommendation-ClassMapTypeIncludesTermAndDtmiV4.json) include both "Map" and "dtmi:dtdl:class:Map;4".
+  * [SHOULD NOT](spec/Recommendation-ClassMapTypeDuplicatesMaterialV4.json) include more than one instance of either "Map" or "dtmi:dtdl:class:Map;4".
+  * String "Map" is [RECOMMENDED](spec/Recommendation-ClassMapTypePreferTermToDtmiV4.json) over string "dtmi:dtdl:class:Map;4".
+  * [SHALL NOT](spec/Completion-ClassMapTypeIncludesIrrelevantDtmiOrTermV4.json) include any string conforming to [DTMI](#digital-twin-model-identifier) syntax rules or listed in the [Reserved strings](#reserved-strings) table other than "Map" or "dtmi:dtdl:class:Map;4", except as explicitly designated by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+  * [MUST NOT](spec/Requirement-ClassMapTypeIncludesInvalidDtmiV4.json) include a string that starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+  * [MUST NOT](spec/Requirement-ClassMapTypeIncludesNotDtmiNorTermV4.json) include any string that contains ":" but does not start with "dtmi:".
+  * [SHALL NOT](spec/Completion-ClassMapTypeIncludesUndefinedTermV4.json) include any string that does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+* mapKey
+  * Value [MUST](spec/Requirement-ClassMapPropertyMapKeyElementV4.json) be a DTDL element, a dependent reference to DTDL element, or an array containing exactly one DTDL element or dependent reference to a DTDL element.
+  * If the value is a dependent reference or an array containing a dependent reference, the model [SHALL](spec/Completion-ClassMapPropertyMapKeyDependentReferenceV4.json) contain a DTDL element with an "@id" member whose value matches the DTMI of the dependent reference, which is thereby referentially included.
+  * The included or referentially included DTDL element [MUST](spec/Requirement-ClassMapPropertyMapKeyTypeConformanceV4.json) conform to the definition of DTDL element [MapKey](#mapkey).
+  * Member name [MAY](spec/Allowance-ClassMapPropertyMapKeyDtmiV4.json) be expressed as "dtmi:dtdl:property:mapKey;4" instead of "mapKey", but "mapKey" is [RECOMMENDED](spec/Recommendation-ClassMapPropertyMapKeyTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassMapPropertyMapKeyTermAndDtmiV4.json) be expressed as both "mapKey" and "dtmi:dtdl:property:mapKey;4".
+* mapValue
+  * Value [MUST](spec/Requirement-ClassMapPropertyMapValueElementV4.json) be a DTDL element, a dependent reference to DTDL element, or an array containing exactly one DTDL element or dependent reference to a DTDL element.
+  * If the value is a dependent reference or an array containing a dependent reference, the model [SHALL](spec/Completion-ClassMapPropertyMapValueDependentReferenceV4.json) contain a DTDL element with an "@id" member whose value matches the DTMI of the dependent reference, which is thereby referentially included.
+  * The included or referentially included DTDL element [MUST](spec/Requirement-ClassMapPropertyMapValueTypeConformanceV4.json) conform to the definition of DTDL element [MapValue](#mapvalue).
+  * Member name [MAY](spec/Allowance-ClassMapPropertyMapValueDtmiV4.json) be expressed as "dtmi:dtdl:property:mapValue;4" instead of "mapValue", but "mapValue" is [RECOMMENDED](spec/Recommendation-ClassMapPropertyMapValueTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassMapPropertyMapValueTermAndDtmiV4.json) be expressed as both "mapValue" and "dtmi:dtdl:property:mapValue;4".
+
+The following members are [OPTIONAL](spec/Allowance-ClassMapOptionalPropertiesV4.json) unless otherwise noted:
+
+* @context
+  * [MUST](spec/Requirement-ClassMapContextConformsV4.json) conform to the specified [context](#context) rules.
+* @id
+  * [REQUIRED](spec/Requirement-ClassMapIdRequiredV4.json) when the Map element is included in Interface member "schemas".
+  * Value [MUST](spec/Requirement-ClassMapIdIsDtmiV4.json) be a string that conforms to the specified [DTMI](#digital-twin-model-identifier) rules; value [MUST NOT](spec/Requirement-ClassMapIdNotArrayV4.json) be an array.
+  * Value [MUST](spec/Requirement-ClassMapIdDuplicateV4.json) be unique among the values of all "@id" members of all elements in the model.
+* comment
+  * Value [MUST](spec/Requirement-ClassMapPropertyCommentStringV4.json) be a [representational string](#representational-string) or an array containing no more than one representational string.
+  * If present, string value [MUST NOT](spec/Requirement-ClassMapPropertyCommentStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassMapPropertyCommentDtmiV4.json) be expressed as "dtmi:dtdl:property:comment;4" instead of "comment", but "comment" is [RECOMMENDED](spec/Recommendation-ClassMapPropertyCommentTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassMapPropertyCommentTermAndDtmiV4.json) be expressed as both "comment" and "dtmi:dtdl:property:comment;4".
+* description
+  * Value [MUST](spec/Requirement-ClassMapPropertyDescriptionLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassMapPropertyDescriptionStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassMapPropertyDescriptionDtmiV4.json) be expressed as "dtmi:dtdl:property:description;4" instead of "description", but "description" is [RECOMMENDED](spec/Recommendation-ClassMapPropertyDescriptionTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassMapPropertyDescriptionTermAndDtmiV4.json) be expressed as both "description" and "dtmi:dtdl:property:description;4".
+* displayName
+  * Value [MUST](spec/Requirement-ClassMapPropertyDisplayNameLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassMapPropertyDisplayNameStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassMapPropertyDisplayNameDtmiV4.json) be expressed as "dtmi:dtdl:property:displayName;4" instead of "displayName", but "displayName" is [RECOMMENDED](spec/Recommendation-ClassMapPropertyDisplayNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassMapPropertyDisplayNameTermAndDtmiV4.json) be expressed as both "displayName" and "dtmi:dtdl:property:displayName;4".
+
+All members other than those explitly listed above are forbidden or permitted according to the following rules:
+
+* Members with names starting with "@" other than "@context", "@id", and "@type" [MUST NOT](spec/Requirement-ClassMapInvalidKeywordsV4.json) be present.
+* Except as explicitly designated by an extension referenced in the active context, a member [SHALL NOT](spec/Completion-ClassMapPropertyIrrelevantDtmiOrTermV4.json) be present if the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "mapKey", "mapValue", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:mapKey;4", "dtmi:dtdl:property:mapValue;4".
+* Except as explicitly designated by an extension referenced in the active context, a member [MUST NOT](spec/Requirement-ClassMapPropertyFormallyIrrelevantDtmiOrTermV4.json) be present if the element is not informally co-typed and the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "mapKey", "mapValue", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:mapKey;4", "dtmi:dtdl:property:mapValue;4".
+* A member [MUST NOT](spec/Requirement-ClassMapPropertyInvalidDtmiV4.json) be present if the member's name starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+* A member [MUST NOT](spec/Requirement-ClassMapPropertyNotDtmiNorTermV4.json) be present if the member's name does not start with "@" and contains ":" but does not start with "dtmi:".
+* A member [SHALL NOT](spec/Completion-ClassMapPropertyUndefinedTermV4.json) be present if the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+* A member [MUST NOT](spec/Requirement-ClassMapPropertyFormallyUndefinedTermV4.json) be present if the element is not informally co-typed and the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+
+### MapKey
+
+Example:
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:example:epsilon_alpha;1",
+  "@type": "Interface",
+  "schemas": {
+    "@id": "dtmi:example:delta_vroo;1",
+    "@type": "Map",
+    "mapValue": {
+      "name": "delta_hi",
+      "schema": "decimal"
+    },
+    "mapKey": {
+      "name": "delta_yekk",
+      "schema": "string"
+    }
+  }
+}
+```
+
+The following members are [REQUIRED](spec/Requirement-ClassMapKeyRequiredPropertiesV4.json):
+
+* name
+  * Value [MUST](spec/Requirement-ClassMapKeyPropertyNameStringV4.json) be a [representational string](#representational-string) or an array containing exactly one representational string.
+  * String value [MUST NOT](spec/Requirement-ClassMapKeyPropertyNameStringLengthV4.json) be more than 512 characters in length.
+  * String value [MUST](spec/Requirement-ClassMapKeyPropertyNamePatternV4.json) match regular expression `^[A-Za-z](?:[A-Za-z0-9_]*[A-Za-z0-9])?$`.
+  * Member name [MAY](spec/Allowance-ClassMapKeyPropertyNameDtmiV4.json) be expressed as "dtmi:dtdl:property:name;4" instead of "name", but "name" is [RECOMMENDED](spec/Recommendation-ClassMapKeyPropertyNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassMapKeyPropertyNameTermAndDtmiV4.json) be expressed as both "name" and "dtmi:dtdl:property:name;4".
+* schema
+  * Value [MUST](spec/Requirement-ClassMapKeyPropertySchemaSpecificValuesV4.json) be "string", "dtmi:dtdl:instance:Schema:string;4", "dtmi:dtdl:instance:Schema:string;3", "dtmi:dtdl:instance:Schema:string;2", or an array containing exactly one of these string values.
+  * Value "string" is [RECOMMENDED](spec/Recommendation-ClassMapKeyPropertySchemaValueStringPreferToDtmiV4.json) over value dtmi:dtdl:instance:Schema:string;4.
+  * Considered with other DTDL elements, value is subject to any relevant restrictions in [Limits and exclusions](#limits-and-exclusions).
+  * Member name [MAY](spec/Allowance-ClassMapKeyPropertySchemaDtmiV4.json) be expressed as "dtmi:dtdl:property:schema;4" instead of "schema", but "schema" is [RECOMMENDED](spec/Recommendation-ClassMapKeyPropertySchemaTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassMapKeyPropertySchemaTermAndDtmiV4.json) be expressed as both "schema" and "dtmi:dtdl:property:schema;4".
+
+The following members are [OPTIONAL](spec/Allowance-ClassMapKeyOptionalPropertiesV4.json):
+
+* @context
+  * [MUST](spec/Requirement-ClassMapKeyContextConformsV4.json) conform to the specified [context](#context) rules.
+* @type
+  * Value [MUST](spec/Requirement-ClassMapKeyTypeStringOrArrayV4.json) be a string or an array of strings.
+  * [MUST](spec/Requirement-ClassMapKeyTypeIncludesMaterialV4.json) include either string "MapKey" or string "dtmi:dtdl:class:MapKey;4".
+  * [SHOULD NOT](spec/Recommendation-ClassMapKeyTypeIncludesTermAndDtmiV4.json) include both "MapKey" and "dtmi:dtdl:class:MapKey;4".
+  * [SHOULD NOT](spec/Recommendation-ClassMapKeyTypeDuplicatesMaterialV4.json) include more than one instance of either "MapKey" or "dtmi:dtdl:class:MapKey;4".
+  * String "MapKey" is [RECOMMENDED](spec/Recommendation-ClassMapKeyTypePreferTermToDtmiV4.json) over string "dtmi:dtdl:class:MapKey;4".
+  * [SHALL NOT](spec/Completion-ClassMapKeyTypeIncludesIrrelevantDtmiOrTermV4.json) include any string conforming to [DTMI](#digital-twin-model-identifier) syntax rules or listed in the [Reserved strings](#reserved-strings) table other than "MapKey" or "dtmi:dtdl:class:MapKey;4", except as explicitly designated by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+  * [MUST NOT](spec/Requirement-ClassMapKeyTypeIncludesInvalidDtmiV4.json) include a string that starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+  * [MUST NOT](spec/Requirement-ClassMapKeyTypeIncludesNotDtmiNorTermV4.json) include any string that contains ":" but does not start with "dtmi:".
+  * [SHALL NOT](spec/Completion-ClassMapKeyTypeIncludesUndefinedTermV4.json) include any string that does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+* @id
+  * Value [MUST](spec/Requirement-ClassMapKeyIdIsDtmiV4.json) be a string that conforms to the specified [DTMI](#digital-twin-model-identifier) rules; value [MUST NOT](spec/Requirement-ClassMapKeyIdNotArrayV4.json) be an array.
+  * Value [MUST](spec/Requirement-ClassMapKeyIdDuplicateV4.json) be unique among the values of all "@id" members of all elements in the model.
+* comment
+  * Value [MUST](spec/Requirement-ClassMapKeyPropertyCommentStringV4.json) be a [representational string](#representational-string) or an array containing no more than one representational string.
+  * If present, string value [MUST NOT](spec/Requirement-ClassMapKeyPropertyCommentStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassMapKeyPropertyCommentDtmiV4.json) be expressed as "dtmi:dtdl:property:comment;4" instead of "comment", but "comment" is [RECOMMENDED](spec/Recommendation-ClassMapKeyPropertyCommentTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassMapKeyPropertyCommentTermAndDtmiV4.json) be expressed as both "comment" and "dtmi:dtdl:property:comment;4".
+* description
+  * Value [MUST](spec/Requirement-ClassMapKeyPropertyDescriptionLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassMapKeyPropertyDescriptionStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassMapKeyPropertyDescriptionDtmiV4.json) be expressed as "dtmi:dtdl:property:description;4" instead of "description", but "description" is [RECOMMENDED](spec/Recommendation-ClassMapKeyPropertyDescriptionTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassMapKeyPropertyDescriptionTermAndDtmiV4.json) be expressed as both "description" and "dtmi:dtdl:property:description;4".
+* displayName
+  * Value [MUST](spec/Requirement-ClassMapKeyPropertyDisplayNameLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassMapKeyPropertyDisplayNameStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassMapKeyPropertyDisplayNameDtmiV4.json) be expressed as "dtmi:dtdl:property:displayName;4" instead of "displayName", but "displayName" is [RECOMMENDED](spec/Recommendation-ClassMapKeyPropertyDisplayNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassMapKeyPropertyDisplayNameTermAndDtmiV4.json) be expressed as both "displayName" and "dtmi:dtdl:property:displayName;4".
+
+All members other than those explitly listed above are forbidden or permitted according to the following rules:
+
+* Members with names starting with "@" other than "@context", "@id", and "@type" [MUST NOT](spec/Requirement-ClassMapKeyInvalidKeywordsV4.json) be present.
+* Except as explicitly designated by an extension referenced in the active context, a member [SHALL NOT](spec/Completion-ClassMapKeyPropertyIrrelevantDtmiOrTermV4.json) be present if the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "name", "schema", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:name;4", "dtmi:dtdl:property:schema;4".
+* Except as explicitly designated by an extension referenced in the active context, a member [MUST NOT](spec/Requirement-ClassMapKeyPropertyFormallyIrrelevantDtmiOrTermV4.json) be present if the element is not informally co-typed and the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "name", "schema", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:name;4", "dtmi:dtdl:property:schema;4".
+* A member [MUST NOT](spec/Requirement-ClassMapKeyPropertyInvalidDtmiV4.json) be present if the member's name starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+* A member [MUST NOT](spec/Requirement-ClassMapKeyPropertyNotDtmiNorTermV4.json) be present if the member's name does not start with "@" and contains ":" but does not start with "dtmi:".
+* A member [SHALL NOT](spec/Completion-ClassMapKeyPropertyUndefinedTermV4.json) be present if the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+* A member [MUST NOT](spec/Requirement-ClassMapKeyPropertyFormallyUndefinedTermV4.json) be present if the element is not informally co-typed and the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+
+### MapValue
+
+Example:
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:example:epsilon_epsilon;1",
+  "@type": "Interface",
+  "schemas": {
+    "@id": "dtmi:example:epsilon_gamma;1",
+    "@type": "Map",
+    "mapKey": {
+      "name": "epsilon_delta",
+      "schema": "string"
+    },
+    "mapValue": {
+      "name": "epsilon_beta",
+      "schema": "double"
+    }
+  }
+}
+```
+
+The following members are [REQUIRED](spec/Requirement-ClassMapValueRequiredPropertiesV4.json):
+
+* name
+  * Value [MUST](spec/Requirement-ClassMapValuePropertyNameStringV4.json) be a [representational string](#representational-string) or an array containing exactly one representational string.
+  * String value [MUST NOT](spec/Requirement-ClassMapValuePropertyNameStringLengthV4.json) be more than 512 characters in length.
+  * String value [MUST](spec/Requirement-ClassMapValuePropertyNamePatternV4.json) match regular expression `^[A-Za-z](?:[A-Za-z0-9_]*[A-Za-z0-9])?$`.
+  * Member name [MAY](spec/Allowance-ClassMapValuePropertyNameDtmiV4.json) be expressed as "dtmi:dtdl:property:name;4" instead of "name", but "name" is [RECOMMENDED](spec/Recommendation-ClassMapValuePropertyNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassMapValuePropertyNameTermAndDtmiV4.json) be expressed as both "name" and "dtmi:dtdl:property:name;4".
+* schema
+  * Value [MUST](spec/Requirement-ClassMapValuePropertySchemaElementV4.json) be a DTDL element, a dependent reference to a DTDL element, a string from one of the rows in a [Standard schemas](#standard-schemas) table, a string defined by an extension referenced in the active context, or an array containing exactly one DTDL element, dependent reference to a DTDL element, string from one of the rows in a Standard schemas table, or string defined by an extension referenced in the active context.
+  * If the value is a dependent reference or an array containing a dependent reference, the model [SHALL](spec/Completion-ClassMapValuePropertySchemaDependentReferenceV4.json) contain a DTDL element with an "@id" member whose value matches the DTMI of the dependent reference, which is thereby referentially included.
+  * If present, an included or referentially included DTDL element [MUST](spec/Requirement-ClassMapValuePropertySchemaTypeConformanceV4.json) conform to the definition of DTDL element [Array](#array) or [Enum](#enum) or [Map](#map) or [Object](#object) or DTDLv3 element [Array](../v3/DTDL.Specification.v3.md#array) or [Enum](../v3/DTDL.Specification.v3.md#enum) or [Map](../v3/DTDL.Specification.v3.md#map) or [Object](../v3/DTDL.Specification.v3.md#object) or DTDLv2 element [Array](../v2/DTDL.Specification.v2.md#array) or [Enum](../v2/DTDL.Specification.v2.md#enum) or [Map](../v2/DTDL.Specification.v2.md#map) or [Object](../v2/DTDL.Specification.v2.md#object).
+  * If a string from one of the rows in a Standard schemas table is included, a string from column "Term" is [RECOMMENDED](spec/Recommendation-ClassMapValuePropertySchemaPreferTermToDtmiV4.json) over a string from column "DTMI".
+  * Considered with other DTDL elements, value is subject to any relevant restrictions in [Limits and exclusions](#limits-and-exclusions).
+  * Member name [MAY](spec/Allowance-ClassMapValuePropertySchemaDtmiV4.json) be expressed as "dtmi:dtdl:property:schema;4" instead of "schema", but "schema" is [RECOMMENDED](spec/Recommendation-ClassMapValuePropertySchemaTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassMapValuePropertySchemaTermAndDtmiV4.json) be expressed as both "schema" and "dtmi:dtdl:property:schema;4".
+
+The following members are [OPTIONAL](spec/Allowance-ClassMapValueOptionalPropertiesV4.json):
+
+* @context
+  * [MUST](spec/Requirement-ClassMapValueContextConformsV4.json) conform to the specified [context](#context) rules.
+* @type
+  * Value [MUST](spec/Requirement-ClassMapValueTypeStringOrArrayV4.json) be a string or an array of strings.
+  * [MUST](spec/Requirement-ClassMapValueTypeIncludesMaterialV4.json) include either string "MapValue" or string "dtmi:dtdl:class:MapValue;4".
+  * [SHOULD NOT](spec/Recommendation-ClassMapValueTypeIncludesTermAndDtmiV4.json) include both "MapValue" and "dtmi:dtdl:class:MapValue;4".
+  * [SHOULD NOT](spec/Recommendation-ClassMapValueTypeDuplicatesMaterialV4.json) include more than one instance of either "MapValue" or "dtmi:dtdl:class:MapValue;4".
+  * String "MapValue" is [RECOMMENDED](spec/Recommendation-ClassMapValueTypePreferTermToDtmiV4.json) over string "dtmi:dtdl:class:MapValue;4".
+  * [SHALL NOT](spec/Completion-ClassMapValueTypeIncludesIrrelevantDtmiOrTermV4.json) include any string conforming to [DTMI](#digital-twin-model-identifier) syntax rules or listed in the [Reserved strings](#reserved-strings) table other than "MapValue" or "dtmi:dtdl:class:MapValue;4", except as explicitly designated by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+  * [MUST NOT](spec/Requirement-ClassMapValueTypeIncludesInvalidDtmiV4.json) include a string that starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+  * [MUST NOT](spec/Requirement-ClassMapValueTypeIncludesNotDtmiNorTermV4.json) include any string that contains ":" but does not start with "dtmi:".
+  * [SHALL NOT](spec/Completion-ClassMapValueTypeIncludesUndefinedTermV4.json) include any string that does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+* @id
+  * Value [MUST](spec/Requirement-ClassMapValueIdIsDtmiV4.json) be a string that conforms to the specified [DTMI](#digital-twin-model-identifier) rules; value [MUST NOT](spec/Requirement-ClassMapValueIdNotArrayV4.json) be an array.
+  * Value [MUST](spec/Requirement-ClassMapValueIdDuplicateV4.json) be unique among the values of all "@id" members of all elements in the model.
+* comment
+  * Value [MUST](spec/Requirement-ClassMapValuePropertyCommentStringV4.json) be a [representational string](#representational-string) or an array containing no more than one representational string.
+  * If present, string value [MUST NOT](spec/Requirement-ClassMapValuePropertyCommentStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassMapValuePropertyCommentDtmiV4.json) be expressed as "dtmi:dtdl:property:comment;4" instead of "comment", but "comment" is [RECOMMENDED](spec/Recommendation-ClassMapValuePropertyCommentTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassMapValuePropertyCommentTermAndDtmiV4.json) be expressed as both "comment" and "dtmi:dtdl:property:comment;4".
+* description
+  * Value [MUST](spec/Requirement-ClassMapValuePropertyDescriptionLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassMapValuePropertyDescriptionStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassMapValuePropertyDescriptionDtmiV4.json) be expressed as "dtmi:dtdl:property:description;4" instead of "description", but "description" is [RECOMMENDED](spec/Recommendation-ClassMapValuePropertyDescriptionTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassMapValuePropertyDescriptionTermAndDtmiV4.json) be expressed as both "description" and "dtmi:dtdl:property:description;4".
+* displayName
+  * Value [MUST](spec/Requirement-ClassMapValuePropertyDisplayNameLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassMapValuePropertyDisplayNameStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassMapValuePropertyDisplayNameDtmiV4.json) be expressed as "dtmi:dtdl:property:displayName;4" instead of "displayName", but "displayName" is [RECOMMENDED](spec/Recommendation-ClassMapValuePropertyDisplayNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassMapValuePropertyDisplayNameTermAndDtmiV4.json) be expressed as both "displayName" and "dtmi:dtdl:property:displayName;4".
+
+All members other than those explitly listed above are forbidden or permitted according to the following rules:
+
+* Members with names starting with "@" other than "@context", "@id", and "@type" [MUST NOT](spec/Requirement-ClassMapValueInvalidKeywordsV4.json) be present.
+* Except as explicitly designated by an extension referenced in the active context, a member [SHALL NOT](spec/Completion-ClassMapValuePropertyIrrelevantDtmiOrTermV4.json) be present if the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "name", "schema", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:name;4", "dtmi:dtdl:property:schema;4".
+* Except as explicitly designated by an extension referenced in the active context, a member [MUST NOT](spec/Requirement-ClassMapValuePropertyFormallyIrrelevantDtmiOrTermV4.json) be present if the element is not informally co-typed and the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "name", "schema", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:name;4", "dtmi:dtdl:property:schema;4".
+* A member [MUST NOT](spec/Requirement-ClassMapValuePropertyInvalidDtmiV4.json) be present if the member's name starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+* A member [MUST NOT](spec/Requirement-ClassMapValuePropertyNotDtmiNorTermV4.json) be present if the member's name does not start with "@" and contains ":" but does not start with "dtmi:".
+* A member [SHALL NOT](spec/Completion-ClassMapValuePropertyUndefinedTermV4.json) be present if the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+* A member [MUST NOT](spec/Requirement-ClassMapValuePropertyFormallyUndefinedTermV4.json) be present if the element is not informally co-typed and the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+
+### Object
+
+Example:
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:example:epsilon_eta;1",
+  "@type": "Interface",
+  "schemas": {
+    "@id": "dtmi:example:epsilon_zeta;1",
+    "@type": "Object"
+  }
+}
+```
+
+The following members are [REQUIRED](spec/Requirement-ClassObjectRequiredPropertiesV4.json):
+
+* @type
+  * Value [MUST](spec/Requirement-ClassObjectTypeStringOrArrayV4.json) be a string or an array of strings.
+  * [MUST](spec/Requirement-ClassObjectTypeIncludesMaterialV4.json) include either string "Object" or string "dtmi:dtdl:class:Object;4".
+  * [SHOULD NOT](spec/Recommendation-ClassObjectTypeIncludesTermAndDtmiV4.json) include both "Object" and "dtmi:dtdl:class:Object;4".
+  * [SHOULD NOT](spec/Recommendation-ClassObjectTypeDuplicatesMaterialV4.json) include more than one instance of either "Object" or "dtmi:dtdl:class:Object;4".
+  * String "Object" is [RECOMMENDED](spec/Recommendation-ClassObjectTypePreferTermToDtmiV4.json) over string "dtmi:dtdl:class:Object;4".
+  * [SHALL NOT](spec/Completion-ClassObjectTypeIncludesIrrelevantDtmiOrTermV4.json) include any string conforming to [DTMI](#digital-twin-model-identifier) syntax rules or listed in the [Reserved strings](#reserved-strings) table other than "Object" or "dtmi:dtdl:class:Object;4", except as explicitly designated by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+  * [MUST NOT](spec/Requirement-ClassObjectTypeIncludesInvalidDtmiV4.json) include a string that starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+  * [MUST NOT](spec/Requirement-ClassObjectTypeIncludesNotDtmiNorTermV4.json) include any string that contains ":" but does not start with "dtmi:".
+  * [SHALL NOT](spec/Completion-ClassObjectTypeIncludesUndefinedTermV4.json) include any string that does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+
+The following members are [OPTIONAL](spec/Allowance-ClassObjectOptionalPropertiesV4.json) unless otherwise noted:
+
+* @context
+  * [MUST](spec/Requirement-ClassObjectContextConformsV4.json) conform to the specified [context](#context) rules.
+* @id
+  * [REQUIRED](spec/Requirement-ClassObjectIdRequiredV4.json) when the Object element is included in Interface member "schemas".
+  * Value [MUST](spec/Requirement-ClassObjectIdIsDtmiV4.json) be a string that conforms to the specified [DTMI](#digital-twin-model-identifier) rules; value [MUST NOT](spec/Requirement-ClassObjectIdNotArrayV4.json) be an array.
+  * Value [MUST](spec/Requirement-ClassObjectIdDuplicateV4.json) be unique among the values of all "@id" members of all elements in the model.
+* comment
+  * Value [MUST](spec/Requirement-ClassObjectPropertyCommentStringV4.json) be a [representational string](#representational-string) or an array containing no more than one representational string.
+  * If present, string value [MUST NOT](spec/Requirement-ClassObjectPropertyCommentStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassObjectPropertyCommentDtmiV4.json) be expressed as "dtmi:dtdl:property:comment;4" instead of "comment", but "comment" is [RECOMMENDED](spec/Recommendation-ClassObjectPropertyCommentTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassObjectPropertyCommentTermAndDtmiV4.json) be expressed as both "comment" and "dtmi:dtdl:property:comment;4".
+* description
+  * Value [MUST](spec/Requirement-ClassObjectPropertyDescriptionLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassObjectPropertyDescriptionStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassObjectPropertyDescriptionDtmiV4.json) be expressed as "dtmi:dtdl:property:description;4" instead of "description", but "description" is [RECOMMENDED](spec/Recommendation-ClassObjectPropertyDescriptionTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassObjectPropertyDescriptionTermAndDtmiV4.json) be expressed as both "description" and "dtmi:dtdl:property:description;4".
+* displayName
+  * Value [MUST](spec/Requirement-ClassObjectPropertyDisplayNameLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassObjectPropertyDisplayNameStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassObjectPropertyDisplayNameDtmiV4.json) be expressed as "dtmi:dtdl:property:displayName;4" instead of "displayName", but "displayName" is [RECOMMENDED](spec/Recommendation-ClassObjectPropertyDisplayNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassObjectPropertyDisplayNameTermAndDtmiV4.json) be expressed as both "displayName" and "dtmi:dtdl:property:displayName;4".
+* fields
+  * Value [MUST](spec/Requirement-ClassObjectPropertyFieldsElementV4.json) be a DTDL element, a dependent reference to DTDL element, or an array of DTDL elements and dependent references to DTDL elements.
+  * For each included dependent reference, the model [SHALL](spec/Completion-ClassObjectPropertyFieldsDependentReferenceV4.json) contain a DTDL element with an "@id" member whose value matches the DTMI of the dependent reference, which is thereby referentially included.
+  * Each included or referentially included DTDL element [MUST](spec/Requirement-ClassObjectPropertyFieldsTypeConformanceV4.json) conform to the definition of DTDL element [Field](#field).
+  * Member name [MAY](spec/Allowance-ClassObjectPropertyFieldsDtmiV4.json) be expressed as "dtmi:dtdl:property:fields;4" instead of "fields", but "fields" is [RECOMMENDED](spec/Recommendation-ClassObjectPropertyFieldsTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassObjectPropertyFieldsTermAndDtmiV4.json) be expressed as both "fields" and "dtmi:dtdl:property:fields;4".
+
+All members other than those explitly listed above are forbidden or permitted according to the following rules:
+
+* Members with names starting with "@" other than "@context", "@id", and "@type" [MUST NOT](spec/Requirement-ClassObjectInvalidKeywordsV4.json) be present.
+* Except as explicitly designated by an extension referenced in the active context, a member [SHALL NOT](spec/Completion-ClassObjectPropertyIrrelevantDtmiOrTermV4.json) be present if the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "fields", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:fields;4".
+* Except as explicitly designated by an extension referenced in the active context, a member [MUST NOT](spec/Requirement-ClassObjectPropertyFormallyIrrelevantDtmiOrTermV4.json) be present if the element is not informally co-typed and the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "fields", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:fields;4".
+* A member [MUST NOT](spec/Requirement-ClassObjectPropertyInvalidDtmiV4.json) be present if the member's name starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+* A member [MUST NOT](spec/Requirement-ClassObjectPropertyNotDtmiNorTermV4.json) be present if the member's name does not start with "@" and contains ":" but does not start with "dtmi:".
+* A member [SHALL NOT](spec/Completion-ClassObjectPropertyUndefinedTermV4.json) be present if the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+* A member [MUST NOT](spec/Requirement-ClassObjectPropertyFormallyUndefinedTermV4.json) be present if the element is not informally co-typed and the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+
+### Property
+
+Example:
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:example:epsilon_iota;1",
+  "@type": "Interface",
+  "contents": {
+    "@type": "Property",
+    "name": "epsilon_theta",
+    "schema": "duration"
+  }
+}
+```
+
+The following members are [REQUIRED](spec/Requirement-ClassPropertyRequiredPropertiesV4.json):
+
+* @type
+  * Value [MUST](spec/Requirement-ClassPropertyTypeStringOrArrayV4.json) be a string or an array of strings.
+  * [MUST](spec/Requirement-ClassPropertyTypeIncludesMaterialV4.json) include either string "Property" or string "dtmi:dtdl:class:Property;4".
+  * [SHOULD NOT](spec/Recommendation-ClassPropertyTypeIncludesTermAndDtmiV4.json) include both "Property" and "dtmi:dtdl:class:Property;4".
+  * [SHOULD NOT](spec/Recommendation-ClassPropertyTypeDuplicatesMaterialV4.json) include more than one instance of either "Property" or "dtmi:dtdl:class:Property;4".
+  * String "Property" is [RECOMMENDED](spec/Recommendation-ClassPropertyTypePreferTermToDtmiV4.json) over string "dtmi:dtdl:class:Property;4".
+  * [SHALL NOT](spec/Completion-ClassPropertyTypeIncludesIrrelevantDtmiOrTermV4.json) include any string conforming to [DTMI](#digital-twin-model-identifier) syntax rules or listed in the [Reserved strings](#reserved-strings) table other than "Property" or "dtmi:dtdl:class:Property;4", except as explicitly designated by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+  * [MUST NOT](spec/Requirement-ClassPropertyTypeIncludesInvalidDtmiV4.json) include a string that starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+  * [MUST NOT](spec/Requirement-ClassPropertyTypeIncludesNotDtmiNorTermV4.json) include any string that contains ":" but does not start with "dtmi:".
+  * [SHALL NOT](spec/Completion-ClassPropertyTypeIncludesUndefinedTermV4.json) include any string that does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+* name
+  * Value [MUST](spec/Requirement-ClassPropertyPropertyNameStringV4.json) be a [representational string](#representational-string) or an array containing exactly one representational string.
+  * String value [MUST NOT](spec/Requirement-ClassPropertyPropertyNameStringLengthV4.json) be more than 512 characters in length.
+  * String value [MUST](spec/Requirement-ClassPropertyPropertyNamePatternV4.json) match regular expression `^[A-Za-z](?:[A-Za-z0-9_]*[A-Za-z0-9])?$`.
+  * String value [MUST](spec/Requirement-ClassPropertyPropertyNameUniqueAmongInterfaceContentsV4.json) be unique among the included values of "name" members of all elements included or referentially included in the "contents" member of any parent [Interface](#interface) element.
+  * String value [MUST](spec/Requirement-ClassPropertyPropertyNameUniqueAmongRelationshipPropertiesV4.json) be unique among the included values of "name" members of all elements included or referentially included in the "properties" member of any parent [Relationship](#relationship) element.
+  * Member name [MAY](spec/Allowance-ClassPropertyPropertyNameDtmiV4.json) be expressed as "dtmi:dtdl:property:name;4" instead of "name", but "name" is [RECOMMENDED](spec/Recommendation-ClassPropertyPropertyNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassPropertyPropertyNameTermAndDtmiV4.json) be expressed as both "name" and "dtmi:dtdl:property:name;4".
+* schema
+  * Value [MUST](spec/Requirement-ClassPropertyPropertySchemaElementV4.json) be a DTDL element, a dependent reference to a DTDL element, a string from one of the rows in a [Standard schemas](#standard-schemas) table, a string defined by an extension referenced in the active context, or an array containing exactly one DTDL element, dependent reference to a DTDL element, string from one of the rows in a Standard schemas table, or string defined by an extension referenced in the active context.
+  * If the value is a dependent reference or an array containing a dependent reference, the model [SHALL](spec/Completion-ClassPropertyPropertySchemaDependentReferenceV4.json) contain a DTDL element with an "@id" member whose value matches the DTMI of the dependent reference, which is thereby referentially included.
+  * If present, an included or referentially included DTDL element [MUST](spec/Requirement-ClassPropertyPropertySchemaTypeConformanceV4.json) conform to the definition of DTDL element [Array](#array) or [Enum](#enum) or [Map](#map) or [Object](#object) or DTDLv3 element [Array](../v3/DTDL.Specification.v3.md#array) or [Enum](../v3/DTDL.Specification.v3.md#enum) or [Map](../v3/DTDL.Specification.v3.md#map) or [Object](../v3/DTDL.Specification.v3.md#object) or DTDLv2 element [Array](../v2/DTDL.Specification.v2.md#array) or [Enum](../v2/DTDL.Specification.v2.md#enum) or [Map](../v2/DTDL.Specification.v2.md#map) or [Object](../v2/DTDL.Specification.v2.md#object).
+  * If a string from one of the rows in a Standard schemas table is included, a string from column "Term" is [RECOMMENDED](spec/Recommendation-ClassPropertyPropertySchemaPreferTermToDtmiV4.json) over a string from column "DTMI".
+  * Member name [MAY](spec/Allowance-ClassPropertyPropertySchemaDtmiV4.json) be expressed as "dtmi:dtdl:property:schema;4" instead of "schema", but "schema" is [RECOMMENDED](spec/Recommendation-ClassPropertyPropertySchemaTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassPropertyPropertySchemaTermAndDtmiV4.json) be expressed as both "schema" and "dtmi:dtdl:property:schema;4".
+
+The following members are [OPTIONAL](spec/Allowance-ClassPropertyOptionalPropertiesV4.json):
+
+* @context
+  * [MUST](spec/Requirement-ClassPropertyContextConformsV4.json) conform to the specified [context](#context) rules.
+* @id
+  * Value [MUST](spec/Requirement-ClassPropertyIdIsDtmiV4.json) be a string that conforms to the specified [DTMI](#digital-twin-model-identifier) rules; value [MUST NOT](spec/Requirement-ClassPropertyIdNotArrayV4.json) be an array.
+  * Value [MUST](spec/Requirement-ClassPropertyIdDuplicateV4.json) be unique among the values of all "@id" members of all elements in the model.
+* comment
+  * Value [MUST](spec/Requirement-ClassPropertyPropertyCommentStringV4.json) be a [representational string](#representational-string) or an array containing no more than one representational string.
+  * If present, string value [MUST NOT](spec/Requirement-ClassPropertyPropertyCommentStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassPropertyPropertyCommentDtmiV4.json) be expressed as "dtmi:dtdl:property:comment;4" instead of "comment", but "comment" is [RECOMMENDED](spec/Recommendation-ClassPropertyPropertyCommentTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassPropertyPropertyCommentTermAndDtmiV4.json) be expressed as both "comment" and "dtmi:dtdl:property:comment;4".
+* description
+  * Value [MUST](spec/Requirement-ClassPropertyPropertyDescriptionLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassPropertyPropertyDescriptionStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassPropertyPropertyDescriptionDtmiV4.json) be expressed as "dtmi:dtdl:property:description;4" instead of "description", but "description" is [RECOMMENDED](spec/Recommendation-ClassPropertyPropertyDescriptionTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassPropertyPropertyDescriptionTermAndDtmiV4.json) be expressed as both "description" and "dtmi:dtdl:property:description;4".
+* displayName
+  * Value [MUST](spec/Requirement-ClassPropertyPropertyDisplayNameLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassPropertyPropertyDisplayNameStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassPropertyPropertyDisplayNameDtmiV4.json) be expressed as "dtmi:dtdl:property:displayName;4" instead of "displayName", but "displayName" is [RECOMMENDED](spec/Recommendation-ClassPropertyPropertyDisplayNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassPropertyPropertyDisplayNameTermAndDtmiV4.json) be expressed as both "displayName" and "dtmi:dtdl:property:displayName;4".
+* writable
+  * Value [MUST](spec/Requirement-ClassPropertyPropertyWritableBooleanV4.json) be a [representational boolean](#representational-boolean) or an array containing no more than one representational boolean.
+  * Member name [MAY](spec/Allowance-ClassPropertyPropertyWritableDtmiV4.json) be expressed as "dtmi:dtdl:property:writable;4" instead of "writable", but "writable" is [RECOMMENDED](spec/Recommendation-ClassPropertyPropertyWritableTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassPropertyPropertyWritableTermAndDtmiV4.json) be expressed as both "writable" and "dtmi:dtdl:property:writable;4".
+
+All members other than those explitly listed above are forbidden or permitted according to the following rules:
+
+* Members with names starting with "@" other than "@context", "@id", and "@type" [MUST NOT](spec/Requirement-ClassPropertyInvalidKeywordsV4.json) be present.
+* Except as explicitly designated by an extension referenced in the active context, a member [SHALL NOT](spec/Completion-ClassPropertyPropertyIrrelevantDtmiOrTermV4.json) be present if the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "name", "schema", "writable", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:name;4", "dtmi:dtdl:property:schema;4", "dtmi:dtdl:property:writable;4".
+* Except as explicitly designated by an extension referenced in the active context, a member [MUST NOT](spec/Requirement-ClassPropertyPropertyFormallyIrrelevantDtmiOrTermV4.json) be present if the element is not informally co-typed and the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "name", "schema", "writable", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:name;4", "dtmi:dtdl:property:schema;4", "dtmi:dtdl:property:writable;4".
+* A member [MUST NOT](spec/Requirement-ClassPropertyPropertyInvalidDtmiV4.json) be present if the member's name starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+* A member [MUST NOT](spec/Requirement-ClassPropertyPropertyNotDtmiNorTermV4.json) be present if the member's name does not start with "@" and contains ":" but does not start with "dtmi:".
+* A member [SHALL NOT](spec/Completion-ClassPropertyPropertyUndefinedTermV4.json) be present if the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+* A member [MUST NOT](spec/Requirement-ClassPropertyPropertyFormallyUndefinedTermV4.json) be present if the element is not informally co-typed and the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+
+### Relationship
+
+Example:
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:example:epsilon_omicron;1",
+  "@type": "Interface",
+  "contents": {
+    "@type": "Relationship",
+    "name": "epsilon_xi"
+  }
+}
+```
+
+The following members are [REQUIRED](spec/Requirement-ClassRelationshipRequiredPropertiesV4.json):
+
+* @type
+  * Value [MUST](spec/Requirement-ClassRelationshipTypeStringOrArrayV4.json) be a string or an array of strings.
+  * [MUST](spec/Requirement-ClassRelationshipTypeIncludesMaterialV4.json) include either string "Relationship" or string "dtmi:dtdl:class:Relationship;4".
+  * [SHOULD NOT](spec/Recommendation-ClassRelationshipTypeIncludesTermAndDtmiV4.json) include both "Relationship" and "dtmi:dtdl:class:Relationship;4".
+  * [SHOULD NOT](spec/Recommendation-ClassRelationshipTypeDuplicatesMaterialV4.json) include more than one instance of either "Relationship" or "dtmi:dtdl:class:Relationship;4".
+  * String "Relationship" is [RECOMMENDED](spec/Recommendation-ClassRelationshipTypePreferTermToDtmiV4.json) over string "dtmi:dtdl:class:Relationship;4".
+  * [SHALL NOT](spec/Completion-ClassRelationshipTypeIncludesIrrelevantDtmiOrTermV4.json) include any string conforming to [DTMI](#digital-twin-model-identifier) syntax rules or listed in the [Reserved strings](#reserved-strings) table other than "Relationship" or "dtmi:dtdl:class:Relationship;4", except as explicitly designated by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+  * [MUST NOT](spec/Requirement-ClassRelationshipTypeIncludesInvalidDtmiV4.json) include a string that starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+  * [MUST NOT](spec/Requirement-ClassRelationshipTypeIncludesNotDtmiNorTermV4.json) include any string that contains ":" but does not start with "dtmi:".
+  * [SHALL NOT](spec/Completion-ClassRelationshipTypeIncludesUndefinedTermV4.json) include any string that does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+* name
+  * Value [MUST](spec/Requirement-ClassRelationshipPropertyNameStringV4.json) be a [representational string](#representational-string) or an array containing exactly one representational string.
+  * String value [MUST NOT](spec/Requirement-ClassRelationshipPropertyNameStringLengthV4.json) be more than 512 characters in length.
+  * String value [MUST](spec/Requirement-ClassRelationshipPropertyNamePatternV4.json) match regular expression `^[A-Za-z](?:[A-Za-z0-9_]*[A-Za-z0-9])?$`.
+  * String value [MUST](spec/Requirement-ClassRelationshipPropertyNameUniqueAmongInterfaceContentsV4.json) be unique among the included values of "name" members of all elements included or referentially included in the "contents" member of any parent [Interface](#interface) element.
+  * Member name [MAY](spec/Allowance-ClassRelationshipPropertyNameDtmiV4.json) be expressed as "dtmi:dtdl:property:name;4" instead of "name", but "name" is [RECOMMENDED](spec/Recommendation-ClassRelationshipPropertyNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassRelationshipPropertyNameTermAndDtmiV4.json) be expressed as both "name" and "dtmi:dtdl:property:name;4".
+
+The following members are [OPTIONAL](spec/Allowance-ClassRelationshipOptionalPropertiesV4.json):
+
+* @context
+  * [MUST](spec/Requirement-ClassRelationshipContextConformsV4.json) conform to the specified [context](#context) rules.
+* @id
+  * Value [MUST](spec/Requirement-ClassRelationshipIdIsDtmiV4.json) be a string that conforms to the specified [DTMI](#digital-twin-model-identifier) rules; value [MUST NOT](spec/Requirement-ClassRelationshipIdNotArrayV4.json) be an array.
+  * Value [MUST](spec/Requirement-ClassRelationshipIdDuplicateV4.json) be unique among the values of all "@id" members of all elements in the model.
+* comment
+  * Value [MUST](spec/Requirement-ClassRelationshipPropertyCommentStringV4.json) be a [representational string](#representational-string) or an array containing no more than one representational string.
+  * If present, string value [MUST NOT](spec/Requirement-ClassRelationshipPropertyCommentStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassRelationshipPropertyCommentDtmiV4.json) be expressed as "dtmi:dtdl:property:comment;4" instead of "comment", but "comment" is [RECOMMENDED](spec/Recommendation-ClassRelationshipPropertyCommentTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassRelationshipPropertyCommentTermAndDtmiV4.json) be expressed as both "comment" and "dtmi:dtdl:property:comment;4".
+* description
+  * Value [MUST](spec/Requirement-ClassRelationshipPropertyDescriptionLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassRelationshipPropertyDescriptionStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassRelationshipPropertyDescriptionDtmiV4.json) be expressed as "dtmi:dtdl:property:description;4" instead of "description", but "description" is [RECOMMENDED](spec/Recommendation-ClassRelationshipPropertyDescriptionTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassRelationshipPropertyDescriptionTermAndDtmiV4.json) be expressed as both "description" and "dtmi:dtdl:property:description;4".
+* displayName
+  * Value [MUST](spec/Requirement-ClassRelationshipPropertyDisplayNameLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassRelationshipPropertyDisplayNameStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassRelationshipPropertyDisplayNameDtmiV4.json) be expressed as "dtmi:dtdl:property:displayName;4" instead of "displayName", but "displayName" is [RECOMMENDED](spec/Recommendation-ClassRelationshipPropertyDisplayNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassRelationshipPropertyDisplayNameTermAndDtmiV4.json) be expressed as both "displayName" and "dtmi:dtdl:property:displayName;4".
+* maxMultiplicity
+  * Value [MUST](spec/Requirement-ClassRelationshipPropertyMaxMultiplicityIntegerV4.json) be a [representational integer](#representational-integer) or an array containing no more than one representational integer.
+  * If present, integer value [MUST NOT](spec/Requirement-ClassRelationshipPropertyMaxMultiplicityMinValueV4.json) be less than 1.
+  * Member name [MAY](spec/Allowance-ClassRelationshipPropertyMaxMultiplicityDtmiV4.json) be expressed as "dtmi:dtdl:property:maxMultiplicity;4" instead of "maxMultiplicity", but "maxMultiplicity" is [RECOMMENDED](spec/Recommendation-ClassRelationshipPropertyMaxMultiplicityTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassRelationshipPropertyMaxMultiplicityTermAndDtmiV4.json) be expressed as both "maxMultiplicity" and "dtmi:dtdl:property:maxMultiplicity;4".
+* minMultiplicity
+  * Value [MUST](spec/Requirement-ClassRelationshipPropertyMinMultiplicityIntegerV4.json) be a [representational integer](#representational-integer) or an array containing no more than one representational integer.
+  * If present, integer value [MUST](spec/Requirement-ClassRelationshipPropertyMinMultiplicityExactValueV4.json) be 0.
+  * Member name [MAY](spec/Allowance-ClassRelationshipPropertyMinMultiplicityDtmiV4.json) be expressed as "dtmi:dtdl:property:minMultiplicity;4" instead of "minMultiplicity", but "minMultiplicity" is [RECOMMENDED](spec/Recommendation-ClassRelationshipPropertyMinMultiplicityTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassRelationshipPropertyMinMultiplicityTermAndDtmiV4.json) be expressed as both "minMultiplicity" and "dtmi:dtdl:property:minMultiplicity;4".
+* properties
+  * Value [MUST](spec/Requirement-ClassRelationshipPropertyPropertiesElementV4.json) be a DTDL element, a dependent reference to DTDL element, or an array of DTDL elements and dependent references to DTDL elements.
+  * For each included dependent reference, the model [SHALL](spec/Completion-ClassRelationshipPropertyPropertiesDependentReferenceV4.json) contain a DTDL element with an "@id" member whose value matches the DTMI of the dependent reference, which is thereby referentially included.
+  * Each included or referentially included DTDL element [MUST](spec/Requirement-ClassRelationshipPropertyPropertiesTypeConformanceV4.json) conform to the definition of DTDL element [Property](#property) or DTDLv3 element [Property](../v3/DTDL.Specification.v3.md#property) or DTDLv2 element [Property](../v2/DTDL.Specification.v2.md#property).
+  * Member name [MAY](spec/Allowance-ClassRelationshipPropertyPropertiesDtmiV4.json) be expressed as "dtmi:dtdl:property:properties;4" instead of "properties", but "properties" is [RECOMMENDED](spec/Recommendation-ClassRelationshipPropertyPropertiesTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassRelationshipPropertyPropertiesTermAndDtmiV4.json) be expressed as both "properties" and "dtmi:dtdl:property:properties;4".
+* target
+  * Value [MUST](spec/Requirement-ClassRelationshipPropertyTargetIsDtmiV4.json) be a DTMI or an array containing no more than one DTMI.
+  * Note that any included DTMI is a non-dependent reference.
+  * Member name [MAY](spec/Allowance-ClassRelationshipPropertyTargetDtmiV4.json) be expressed as "dtmi:dtdl:property:target;4" instead of "target", but "target" is [RECOMMENDED](spec/Recommendation-ClassRelationshipPropertyTargetTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassRelationshipPropertyTargetTermAndDtmiV4.json) be expressed as both "target" and "dtmi:dtdl:property:target;4".
+* writable
+  * Value [MUST](spec/Requirement-ClassRelationshipPropertyWritableBooleanV4.json) be a [representational boolean](#representational-boolean) or an array containing no more than one representational boolean.
+  * Member name [MAY](spec/Allowance-ClassRelationshipPropertyWritableDtmiV4.json) be expressed as "dtmi:dtdl:property:writable;4" instead of "writable", but "writable" is [RECOMMENDED](spec/Recommendation-ClassRelationshipPropertyWritableTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassRelationshipPropertyWritableTermAndDtmiV4.json) be expressed as both "writable" and "dtmi:dtdl:property:writable;4".
+
+All members other than those explitly listed above are forbidden or permitted according to the following rules:
+
+* Members with names starting with "@" other than "@context", "@id", and "@type" [MUST NOT](spec/Requirement-ClassRelationshipInvalidKeywordsV4.json) be present.
+* Except as explicitly designated by an extension referenced in the active context, a member [SHALL NOT](spec/Completion-ClassRelationshipPropertyIrrelevantDtmiOrTermV4.json) be present if the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "maxMultiplicity", "minMultiplicity", "name", "properties", "target", "writable", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:maxMultiplicity;4", "dtmi:dtdl:property:minMultiplicity;4", "dtmi:dtdl:property:name;4", "dtmi:dtdl:property:properties;4", "dtmi:dtdl:property:target;4", "dtmi:dtdl:property:writable;4".
+* Except as explicitly designated by an extension referenced in the active context, a member [MUST NOT](spec/Requirement-ClassRelationshipPropertyFormallyIrrelevantDtmiOrTermV4.json) be present if the element is not informally co-typed and the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "maxMultiplicity", "minMultiplicity", "name", "properties", "target", "writable", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:maxMultiplicity;4", "dtmi:dtdl:property:minMultiplicity;4", "dtmi:dtdl:property:name;4", "dtmi:dtdl:property:properties;4", "dtmi:dtdl:property:target;4", "dtmi:dtdl:property:writable;4".
+* A member [MUST NOT](spec/Requirement-ClassRelationshipPropertyInvalidDtmiV4.json) be present if the member's name starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+* A member [MUST NOT](spec/Requirement-ClassRelationshipPropertyNotDtmiNorTermV4.json) be present if the member's name does not start with "@" and contains ":" but does not start with "dtmi:".
+* A member [SHALL NOT](spec/Completion-ClassRelationshipPropertyUndefinedTermV4.json) be present if the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+* A member [MUST NOT](spec/Requirement-ClassRelationshipPropertyFormallyUndefinedTermV4.json) be present if the element is not informally co-typed and the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+
+### Telemetry
+
+Example:
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:example:epsilon_tau;1",
+  "@type": "Interface",
+  "contents": {
+    "@type": "Telemetry",
+    "name": "epsilon_sigma",
+    "schema": "float"
+  }
+}
+```
+
+The following members are [REQUIRED](spec/Requirement-ClassTelemetryRequiredPropertiesV4.json):
+
+* @type
+  * Value [MUST](spec/Requirement-ClassTelemetryTypeStringOrArrayV4.json) be a string or an array of strings.
+  * [MUST](spec/Requirement-ClassTelemetryTypeIncludesMaterialV4.json) include either string "Telemetry" or string "dtmi:dtdl:class:Telemetry;4".
+  * [SHOULD NOT](spec/Recommendation-ClassTelemetryTypeIncludesTermAndDtmiV4.json) include both "Telemetry" and "dtmi:dtdl:class:Telemetry;4".
+  * [SHOULD NOT](spec/Recommendation-ClassTelemetryTypeDuplicatesMaterialV4.json) include more than one instance of either "Telemetry" or "dtmi:dtdl:class:Telemetry;4".
+  * String "Telemetry" is [RECOMMENDED](spec/Recommendation-ClassTelemetryTypePreferTermToDtmiV4.json) over string "dtmi:dtdl:class:Telemetry;4".
+  * [SHALL NOT](spec/Completion-ClassTelemetryTypeIncludesIrrelevantDtmiOrTermV4.json) include any string conforming to [DTMI](#digital-twin-model-identifier) syntax rules or listed in the [Reserved strings](#reserved-strings) table other than "Telemetry" or "dtmi:dtdl:class:Telemetry;4", except as explicitly designated by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+  * [MUST NOT](spec/Requirement-ClassTelemetryTypeIncludesInvalidDtmiV4.json) include a string that starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+  * [MUST NOT](spec/Requirement-ClassTelemetryTypeIncludesNotDtmiNorTermV4.json) include any string that contains ":" but does not start with "dtmi:".
+  * [SHALL NOT](spec/Completion-ClassTelemetryTypeIncludesUndefinedTermV4.json) include any string that does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context. If the absence of such a string cannot be conclusively verified because the model is contextually incomplete, the element is considered to be *informally co-typed*.
+* name
+  * Value [MUST](spec/Requirement-ClassTelemetryPropertyNameStringV4.json) be a [representational string](#representational-string) or an array containing exactly one representational string.
+  * String value [MUST NOT](spec/Requirement-ClassTelemetryPropertyNameStringLengthV4.json) be more than 512 characters in length.
+  * String value [MUST](spec/Requirement-ClassTelemetryPropertyNamePatternV4.json) match regular expression `^[A-Za-z](?:[A-Za-z0-9_]*[A-Za-z0-9])?$`.
+  * String value [MUST](spec/Requirement-ClassTelemetryPropertyNameUniqueAmongInterfaceContentsV4.json) be unique among the included values of "name" members of all elements included or referentially included in the "contents" member of any parent [Interface](#interface) element.
+  * Member name [MAY](spec/Allowance-ClassTelemetryPropertyNameDtmiV4.json) be expressed as "dtmi:dtdl:property:name;4" instead of "name", but "name" is [RECOMMENDED](spec/Recommendation-ClassTelemetryPropertyNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassTelemetryPropertyNameTermAndDtmiV4.json) be expressed as both "name" and "dtmi:dtdl:property:name;4".
+* schema
+  * Value [MUST](spec/Requirement-ClassTelemetryPropertySchemaElementV4.json) be a DTDL element, a dependent reference to a DTDL element, a string from one of the rows in a [Standard schemas](#standard-schemas) table, a string defined by an extension referenced in the active context, or an array containing exactly one DTDL element, dependent reference to a DTDL element, string from one of the rows in a Standard schemas table, or string defined by an extension referenced in the active context.
+  * If the value is a dependent reference or an array containing a dependent reference, the model [SHALL](spec/Completion-ClassTelemetryPropertySchemaDependentReferenceV4.json) contain a DTDL element with an "@id" member whose value matches the DTMI of the dependent reference, which is thereby referentially included.
+  * If present, an included or referentially included DTDL element [MUST](spec/Requirement-ClassTelemetryPropertySchemaTypeConformanceV4.json) conform to the definition of DTDL element [Array](#array) or [Enum](#enum) or [Map](#map) or [Object](#object) or DTDLv3 element [Array](../v3/DTDL.Specification.v3.md#array) or [Enum](../v3/DTDL.Specification.v3.md#enum) or [Map](../v3/DTDL.Specification.v3.md#map) or [Object](../v3/DTDL.Specification.v3.md#object) or DTDLv2 element [Array](../v2/DTDL.Specification.v2.md#array) or [Enum](../v2/DTDL.Specification.v2.md#enum) or [Map](../v2/DTDL.Specification.v2.md#map) or [Object](../v2/DTDL.Specification.v2.md#object).
+  * If a string from one of the rows in a Standard schemas table is included, a string from column "Term" is [RECOMMENDED](spec/Recommendation-ClassTelemetryPropertySchemaPreferTermToDtmiV4.json) over a string from column "DTMI".
+  * Member name [MAY](spec/Allowance-ClassTelemetryPropertySchemaDtmiV4.json) be expressed as "dtmi:dtdl:property:schema;4" instead of "schema", but "schema" is [RECOMMENDED](spec/Recommendation-ClassTelemetryPropertySchemaTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassTelemetryPropertySchemaTermAndDtmiV4.json) be expressed as both "schema" and "dtmi:dtdl:property:schema;4".
+
+The following members are [OPTIONAL](spec/Allowance-ClassTelemetryOptionalPropertiesV4.json):
+
+* @context
+  * [MUST](spec/Requirement-ClassTelemetryContextConformsV4.json) conform to the specified [context](#context) rules.
+* @id
+  * Value [MUST](spec/Requirement-ClassTelemetryIdIsDtmiV4.json) be a string that conforms to the specified [DTMI](#digital-twin-model-identifier) rules; value [MUST NOT](spec/Requirement-ClassTelemetryIdNotArrayV4.json) be an array.
+  * Value [MUST](spec/Requirement-ClassTelemetryIdDuplicateV4.json) be unique among the values of all "@id" members of all elements in the model.
+* comment
+  * Value [MUST](spec/Requirement-ClassTelemetryPropertyCommentStringV4.json) be a [representational string](#representational-string) or an array containing no more than one representational string.
+  * If present, string value [MUST NOT](spec/Requirement-ClassTelemetryPropertyCommentStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassTelemetryPropertyCommentDtmiV4.json) be expressed as "dtmi:dtdl:property:comment;4" instead of "comment", but "comment" is [RECOMMENDED](spec/Recommendation-ClassTelemetryPropertyCommentTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassTelemetryPropertyCommentTermAndDtmiV4.json) be expressed as both "comment" and "dtmi:dtdl:property:comment;4".
+* description
+  * Value [MUST](spec/Requirement-ClassTelemetryPropertyDescriptionLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassTelemetryPropertyDescriptionStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassTelemetryPropertyDescriptionDtmiV4.json) be expressed as "dtmi:dtdl:property:description;4" instead of "description", but "description" is [RECOMMENDED](spec/Recommendation-ClassTelemetryPropertyDescriptionTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassTelemetryPropertyDescriptionTermAndDtmiV4.json) be expressed as both "description" and "dtmi:dtdl:property:description;4".
+* displayName
+  * Value [MUST](spec/Requirement-ClassTelemetryPropertyDisplayNameLangStringV4.json) be a [localizable string](#localizable-string).
+  * Each string value [MUST NOT](spec/Requirement-ClassTelemetryPropertyDisplayNameStringLengthV4.json) be more than 512 characters in length.
+  * Member name [MAY](spec/Allowance-ClassTelemetryPropertyDisplayNameDtmiV4.json) be expressed as "dtmi:dtdl:property:displayName;4" instead of "displayName", but "displayName" is [RECOMMENDED](spec/Recommendation-ClassTelemetryPropertyDisplayNameTermV4.json).
+  * Member name [MUST NOT](spec/Requirement-ClassTelemetryPropertyDisplayNameTermAndDtmiV4.json) be expressed as both "displayName" and "dtmi:dtdl:property:displayName;4".
+
+All members other than those explitly listed above are forbidden or permitted according to the following rules:
+
+* Members with names starting with "@" other than "@context", "@id", and "@type" [MUST NOT](spec/Requirement-ClassTelemetryInvalidKeywordsV4.json) be present.
+* Except as explicitly designated by an extension referenced in the active context, a member [SHALL NOT](spec/Completion-ClassTelemetryPropertyIrrelevantDtmiOrTermV4.json) be present if the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "name", "schema", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:name;4", "dtmi:dtdl:property:schema;4".
+* Except as explicitly designated by an extension referenced in the active context, a member [MUST NOT](spec/Requirement-ClassTelemetryPropertyFormallyIrrelevantDtmiOrTermV4.json) be present if the element is not informally co-typed and the member's name conforms to [DTMI](#digital-twin-model-identifier) syntax rules or is listed in the [Reserved strings](#reserved-strings) table, unless its name is in the following list: "comment", "description", "displayName", "name", "schema", "dtmi:dtdl:property:comment;4", "dtmi:dtdl:property:description;4", "dtmi:dtdl:property:displayName;4", "dtmi:dtdl:property:name;4", "dtmi:dtdl:property:schema;4".
+* A member [MUST NOT](spec/Requirement-ClassTelemetryPropertyInvalidDtmiV4.json) be present if the member's name starts with "dtmi:" but does not conform to [DTMI](#digital-twin-model-identifier) syntax rules.
+* A member [MUST NOT](spec/Requirement-ClassTelemetryPropertyNotDtmiNorTermV4.json) be present if the member's name does not start with "@" and contains ":" but does not start with "dtmi:".
+* A member [SHALL NOT](spec/Completion-ClassTelemetryPropertyUndefinedTermV4.json) be present if the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+* A member [MUST NOT](spec/Requirement-ClassTelemetryPropertyFormallyUndefinedTermV4.json) be present if the element is not informally co-typed and the member's name does not start with "@" and does not contain ":" and is not listed in the [Reserved strings](#reserved-strings) table and is not defined by an extension referenced in the active context.
+
+## Limits and exclusions
+
+In addition to the direct requirements on members of various [DTDL elements](#dtdl-element), there are restrictions on the element hierarchies formed via inclusion and referential inclusion.
+There are also some exceptions to the rule that a DTDL element must not have a path to itself.
+Specifically:
+
+* There [MUST NOT](spec/Requirement-ClassArrayPropertiesElementSchemaSchemaMaxDepthV4.json) be more than 8 "elementSchema" or "schema" members in any path from a DTDL [Array](#array) element to another DTDL element.
+* There [MAY](spec/Allowance-ClassArrayPropertiesElementSchemaSchemaSelfReferenceV4.json) be a path from a DTDL [Array](#array) element wherein some "elementSchema" or "schema" member referentially includes the DTDL Array element where the path begins.
+* There [MUST NOT](spec/Requirement-ClassComponentPropertiesSchemaContentsExcludeComponentV4.json) be a path of "schema" or "contents" members from any DTDL [Component](#component) element to any DTDL [Component](#component) element.
+* In the union of all paths of "extends" members rooted at a given DTDL [Interface](#interface) element, the total count of all values among all such members [MUST NOT](spec/Requirement-ClassInterfacePropertiesExtendsMaxCountV4.json) exceed 1024 values.
+* There [MUST NOT](spec/Requirement-ClassInterfacePropertiesExtendsMaxDepthV4.json) be more than 12 members in any path of "extends" members from a DTDL [Interface](#interface) element to another DTDL element.
+* There [MUST NOT](spec/Requirement-ClassInterfacePropertiesExtendsSelfReferenceV4.json) be a path of "extends" members from a DTDL [Interface](#interface) element to the DTDL Interface element where the path begins.
+* In the union of all paths of "contents" or "fields" or "enumValues" or "request" or "response" or "properties" or "schema" or "elementSchema" or "mapValue" members rooted at a given DTDL [Interface](#interface) element, including those imported via "extends", the total count of all values among all such members MUST NOT exceed 100000 values.
+* There [MUST NOT](spec/Requirement-ClassMapPropertiesElementSchemaSchemaMaxDepthV4.json) be more than 8 "elementSchema" or "schema" members in any path from a DTDL [Map](#map) element to another DTDL element.
+* There [MAY](spec/Allowance-ClassMapPropertiesElementSchemaSchemaSelfReferenceV4.json) be a path from a DTDL [Map](#map) element wherein some "elementSchema" or "schema" member referentially includes the DTDL Map element where the path begins.
+* There [MUST NOT](spec/Requirement-ClassObjectPropertiesElementSchemaSchemaMaxDepthV4.json) be more than 8 "elementSchema" or "schema" members in any path from a DTDL [Object](#object) element to another DTDL element.
+* There [MAY](spec/Allowance-ClassObjectPropertiesElementSchemaSchemaSelfReferenceV4.json) be a path from a DTDL [Object](#object) element wherein some "elementSchema" or "schema" member referentially includes the DTDL Object element where the path begins.
+
+The JSON text of each Interface definition is limited to 1 MiByte.
+This is the total number of bytes inclusive of the opening and closing curly braces for each Interface definition.
+This limit does not include the text of any descendant Interface.
+
+## Representational literal
+
+A representational literal is a JSON value that represents a literal value.
+The representation can be in the form of a bare literal, an untyped value object, or a typed value object.
+When a member includes a representational literal, the member is also considered to include the literal value itself.
+
+### Representational string
+
+To be a conformant *representational string*, a JSON value [MUST](spec/Requirement-RepresentationalStringOrObjectV4.json) be either a string or an object.
+
+* If the representational string is a string, the string value itself is considered to be the value of the representational string.
+* If the representational string is an object, the following constraints and conditions apply:
+  * Every member in the object [MUST](spec/Requirement-RepresentationalStringOnlyKeywordsV4.json) have a name that starts with "@".
+  * The object [MUST](spec/Requirement-RepresentationalStringHasValueV4.json) have a member with name "@value".
+  * The value of member "@value" [MUST](spec/Requirement-RepresentationalStringValueStringV4.json) be a string.
+  * The object [SHOULD](spec/Recommendation-RepresentationalStringHasTypeV4.json) have a member with name "@type".
+  * If present, member "@type" [MUST](spec/Requirement-RepresentationalStringTypeStringV4.json) have value "xsd:string" or "http://www.w3.org/2001/XMLSchema#string".
+  * The object [MUST NOT](spec/Requirement-RepresentationalStringOnlyValueAndTypeV4.json) have any member with name other than "@value" or "@type".
+  * The string value of member "@value" is considered to be the value of the representational string.
+
+For example, in the following object, members "foo", "bar", and "baz" all have values that are representational strings with string value "hello":
+
+```json
+{
+    "foo": "hello",
+    "bar": {
+        "@value": "hello"
+    },
+    "baz": {
+        "@value": "hello",
+        "@type": "xsd:string"
+    }
+}
+```
+
+### Representational integer
+
+To be a conformant *representational integer*, a JSON value [MUST](spec/Requirement-RepresentationalIntegerOrObjectV4.json) be either an integer or an object.
+
+* If the representational integer is an integer, the integer value itself is considered to be the value of the representational integer.
+* If the representational integer is an object, the following constraints and conditions apply:
+  * Every member in the object [MUST](spec/Requirement-RepresentationalIntegerOnlyKeywordsV4.json) have a name that starts with "@".
+  * The object [MUST](spec/Requirement-RepresentationalIntegerHasValueV4.json) have a member with name "@value".
+  * The value of member "@value" [MUST](spec/Requirement-RepresentationalIntegerValueIntegerV4.json) be an integer.
+  * The object [SHOULD](spec/Recommendation-RepresentationalIntegerHasTypeV4.json) have a member with name "@type".
+  * If present, member "@type" [MUST](spec/Requirement-RepresentationalIntegerTypeIntegerV4.json) have value "xsd:integer" or "http://www.w3.org/2001/XMLSchema#integer".
+  * The object [MUST NOT](spec/Requirement-RepresentationalIntegerOnlyValueAndTypeV4.json) have any member with name other than "@value" or "@type".
+  * The integer value of member "@value" is considered to be the value of the representational integer.
+
+For example, in the following object, members "foo", "bar", and "baz" all have values that are representational integers with integer value 3:
+
+```json
+{
+    "foo": 3,
+    "bar": {
+        "@value": 3
+    },
+    "baz": {
+        "@value": 3,
+        "@type": "xsd:integer"
+    }
+}
+```
+
+### Representational boolean
+
+To be a conformant *representational boolean*, a JSON value [MUST](spec/Requirement-RepresentationalBooleanOrObjectV4.json) be either a boolean or an object.
+
+* If the representational boolean is a boolean, the boolean value itself is considered to be the value of the representational boolean.
+* If the representational boolean is an object, the following constraints and conditions apply:
+  * Every member in the object [MUST](spec/Requirement-RepresentationalBooleanOnlyKeywordsV4.json) have a name that starts with "@".
+  * The object [MUST](spec/Requirement-RepresentationalBooleanHasValueV4.json) have a member with name "@value".
+  * The value of member "@value" [MUST](spec/Requirement-RepresentationalBooleanValueBooleanV4.json) be a boolean.
+  * The object [SHOULD](spec/Recommendation-RepresentationalBooleanHasTypeV4.json) have a member with name "@type".
+  * If present, member "@type" [MUST](spec/Requirement-RepresentationalBooleanTypeBooleanV4.json) have value "xsd:boolean" or "http://www.w3.org/2001/XMLSchema#boolean".
+  * The object [MUST NOT](spec/Requirement-RepresentationalBooleanOnlyValueAndTypeV4.json) have any member with name other than "@value" or "@type".
+  * The boolean value of member "@value" is considered to be the value of the representational boolean.
+
+For example, in the following object, members "foo", "bar", and "baz" all have values that are representational booleans with boolean value true:
+
+```json
+{
+    "foo": true,
+    "bar": {
+        "@value": true
+    },
+    "baz": {
+        "@value": true,
+        "@type": "xsd:boolean"
+    }
+}
+```
+
+## Localizable string
+
+A localizable string is a JSON value that can express a semantic string in multiple languages using one of three structural forms:
+The JSON value can be a string, an array of strings and language-tagged value objects, or a language map object.
+
+To be a conformant *localizable string*, a JSON value [MUST](spec/Requirement-LocalizableStringOrArrayOrObjectV4.json) be a string, an array, or an object.
+
+If the localizable string is an array, the following constraints and conditions apply:
+
+* Each value in the array [MUST](spec/Requirement-LocalizableStringArrayElementStringOrObjectV4.json) be either a string or an object.
+* For each value in the array that is an object, the following constraints and conditions apply:
+  * Every member in the object [MUST](spec/Requirement-LocalizableStringArrayElementOnlyKeywordsV4.json) have a name that starts with "@".
+  * The object [MUST](spec/Requirement-LocalizableStringArrayElementHasValueV4.json) have a member with name "@value".
+  * The value of member "@value" [MUST](spec/Requirement-LocalizableStringArrayElementValueStringV4.json) be a string.
+  * The object [SHOULD](spec/Recommendation-LocalizableStringArrayElementHasLanguageV4.json) have a member with name "@language".
+  * If present, member "@language" [MUST](spec/Requirement-LocalizableStringArrayElementLanguageValueRegexV4.json) have a string value that matches regular expression `^[a-z]{2,4}(-[A-Z][a-z]{3})?(-([A-Z]{2}|[0-9]{3}))?$`.
+  * If present, member "@language" [MUST NOT](spec/Requirement-LocalizableStringArrayElementLanguageValueUniqueV4.json) have a value that matches the value of the "@language" member of any other object in the array.
+  * The object [MUST NOT](spec/Requirement-LocalizableStringArrayElementOnlyValueAndLanguageV4.json) have any member with name other than "@value" or "@language".
+
+* The array [MUST NOT](spec/Requirement-LocalizableStringArrayOnlyOneDefaultV4.json) contain more than one of the following values:
+  * A string value
+  * An object value with no "@language" member
+  * An object value with an "@language" member whose value is "en"
+
+The following example illustrates string and array forms of localizable strings.
+In this object, members "alpha", "beta", "gamma", and "delta" all have values that are localizable strings with value "hello" for language code "en-US":
+
+```json
+{
+    "alpha": "hello",
+    "beta": [
+        "hello"
+    ],
+    "gamma": [
+        {
+            "@value": "hello"
+        }
+    ],
+    "delta": [
+        {
+            "@value": "hello",
+            "@language": "en-US"
+        }
+    ]
+}
+```
+
+If the localizable string is an object, the following constraints and conditions apply:
+
+* The name of each member [MUST](spec/Requirement-LocalizableStringObjectMemberNameRegexV4.json) match regular expression `^[a-z]{2,4}(-[A-Z][a-z]{3})?(-([A-Z]{2}|[0-9]{3}))?$`.
+* Each member in the object [MUST](spec/Requirement-LocalizableStringObjectMemberValueStringV4.json) have a value that is a string.
+
+The following example illustrates object and array forms of localizable strings.
+In this object, members "foo" and "bar" both have values that are localizable strings with value "hello" for language code "en-US" and value "hola" for language code "es-ES":
+
+```json
+{
+  "foo": {
+    "en-US": "hello",
+    "es-ES": "hola"
+  },
+  "bar": [
+    {
+      "@value": "hello",
+      "@language": "en-US"
+    },
+    {
+      "@value": "hola",
+      "@language": "es-ES"
+    }
+  ]
+}
+```
+
+Note that JSON objects are used in two different ways depending on whether the object is nested in an array.
+An object in a localizable string array is a *language-tagged value* object; it has a required "@value" member and an optional "@language" member.
+A localizable string object not in an array is a *language map* object; it has members with names that are language codes.
+
+In the following object, members "wrong" and "bad" both have values that are **invalid** localizable strings:
+
+```json
+{
+  "wrong": [
+    {
+      "en-US": "hello",
+      "es-ES": "hola"
+    }
+  ],
+  "bad": {
+    "@value": "hello",
+    "@language": "en-US"
+  }
+}
+```
+
+* The value of "wrong" is an array, so each object value therein must be a language-tagged value object, not a language map.
+  * The object is missing required member "@value".
+  * The object has members with names that do not start with "@".
+
+* The value of "bad" is not an array, so the object value must be a language map, not a language-tagged value object.
+  * The names of the two members, "@value" and "@language", do not match regular expression `^[a-z]{2,4}(-[A-Z][a-z]{3})?(-([A-Z]{2}|[0-9]{3}))?$`.
+
+## Standard schemas
+
+### Primitive schemas
+
+When a DTDL element member is designated to permit a string from one of the rows in a Standard schemas table, a string value from either column of any row of the following table [MAY](spec/Allowance-ValuePrimitiveSchemaV4.json) be used for a value included by the member, unless a restriction described in [Limits and exclusions](#limits-and-exclusions) precludes a Primitive schemas value.
+When selecting for a DTDL element member a string value from the following table, a string from column "Term" is [RECOMMENDED](spec/Recommendation-ValuePrimitiveSchemaTermV4.json) over a string from column "DTMI".
+
+| Term | DTMI |
+| --- | --- |
+| "boolean" | "dtmi:dtdl:instance:Schema:boolean;4" |
+| "byte" | "dtmi:dtdl:instance:Schema:byte;4" |
+| "bytes" | "dtmi:dtdl:instance:Schema:bytes;4" |
+| "date" | "dtmi:dtdl:instance:Schema:date;4" |
+| "dateTime" | "dtmi:dtdl:instance:Schema:dateTime;4" |
+| "decimal" | "dtmi:dtdl:instance:Schema:decimal;4" |
+| "double" | "dtmi:dtdl:instance:Schema:double;4" |
+| "duration" | "dtmi:dtdl:instance:Schema:duration;4" |
+| "float" | "dtmi:dtdl:instance:Schema:float;4" |
+| "integer" | "dtmi:dtdl:instance:Schema:integer;4" |
+| "long" | "dtmi:dtdl:instance:Schema:long;4" |
+| "short" | "dtmi:dtdl:instance:Schema:short;4" |
+| "string" | "dtmi:dtdl:instance:Schema:string;4" |
+| "time" | "dtmi:dtdl:instance:Schema:time;4" |
+| "unsignedByte" | "dtmi:dtdl:instance:Schema:unsignedByte;4" |
+| "unsignedInteger" | "dtmi:dtdl:instance:Schema:unsignedInteger;4" |
+| "unsignedLong" | "dtmi:dtdl:instance:Schema:unsignedLong;4" |
+| "unsignedShort" | "dtmi:dtdl:instance:Schema:unsignedShort;4" |
+| "uuid" | "dtmi:dtdl:instance:Schema:uuid;4" |
+
+### Geospatial schemas
+
+When a DTDL element member is designated to permit a string from one of the rows in a Standard schemas table, a string value from either column of any row of the following table [MAY](spec/Allowance-ValueGeospatialSchemaV4.json) be used for a value included by the member, unless a restriction described in [Limits and exclusions](#limits-and-exclusions) precludes a Geospatial schemas value.
+When selecting for a DTDL element member a string value from the following table, a string from column "Term" is [RECOMMENDED](spec/Recommendation-ValueGeospatialSchemaTermV4.json) over a string from column "DTMI".
+
+| Term | DTMI |
+| --- | --- |
+| "lineString" | "dtmi:standard:schema:geospatial:lineString;4" |
+| "multiLineString" | "dtmi:standard:schema:geospatial:multiLineString;4" |
+| "multiPoint" | "dtmi:standard:schema:geospatial:multiPoint;4" |
+| "multiPolygon" | "dtmi:standard:schema:geospatial:multiPolygon;4" |
+| "point" | "dtmi:standard:schema:geospatial:point;4" |
+| "polygon" | "dtmi:standard:schema:geospatial:polygon;4" |
+
+## Reserved strings
+
+The following table itemizes strings that must not be used in some circumstances that otherwise permit a wide range of string values.
+The particular circumstances that disallow these strings are explicitly designated with reference to this "Reserved strings" table.
+
+| Term | DTMI |
+| --- | --- |
+| "AdjunctType" | "dtmi:dtdl:class:AdjunctType;4" |
+| "Alias" | "dtmi:dtdl:class:Alias;4" |
+| "aliasFor" | "dtmi:dtdl:property:aliasFor;4" |
+| "Array" | "dtmi:dtdl:class:Array;4" |
+| "asynchronous" | "dtmi:dtdl:instance:CommandType:asynchronous;4" |
+| "boolean" | "dtmi:dtdl:instance:Schema:boolean;4" |
+| "Boolean" | "dtmi:dtdl:class:Boolean;4" |
+| "byte" | "dtmi:dtdl:instance:Schema:byte;4" |
+| "Byte" | "dtmi:dtdl:class:Byte;4" |
+| "bytes" | "dtmi:dtdl:instance:Schema:bytes;4" |
+| "Bytes" | "dtmi:dtdl:class:Bytes;4" |
+| "Command" | "dtmi:dtdl:class:Command;4" |
+| "CommandPayload" | "dtmi:dtdl:class:CommandPayload;4" |
+| "CommandRequest" | "dtmi:dtdl:class:CommandRequest;4" |
+| "CommandResponse" | "dtmi:dtdl:class:CommandResponse;4" |
+| "commandType" | "dtmi:dtdl:property:commandType;4" |
+| "CommandType" | "dtmi:dtdl:class:CommandType;4" |
+| "comment" | "dtmi:dtdl:property:comment;4" |
+| "ComplexSchema" | "dtmi:dtdl:class:ComplexSchema;4" |
+| "Component" | "dtmi:dtdl:class:Component;4" |
+| "Content" | "dtmi:dtdl:class:Content;4" |
+| "contents" | "dtmi:dtdl:property:contents;4" |
+| "date" | "dtmi:dtdl:instance:Schema:date;4" |
+| "Date" | "dtmi:dtdl:class:Date;4" |
+| "dateTime" | "dtmi:dtdl:instance:Schema:dateTime;4" |
+| "DateTime" | "dtmi:dtdl:class:DateTime;4" |
+| "decimal" | "dtmi:dtdl:instance:Schema:decimal;4" |
+| "Decimal" | "dtmi:dtdl:class:Decimal;4" |
+| "description" | "dtmi:dtdl:property:description;4" |
+| "displayName" | "dtmi:dtdl:property:displayName;4" |
+| "double" | "dtmi:dtdl:instance:Schema:double;4" |
+| "Double" | "dtmi:dtdl:class:Double;4" |
+| "DtdlExtension" | "dtmi:dtdl:meta:DtdlExtension;4" |
+| "duration" | "dtmi:dtdl:instance:Schema:duration;4" |
+| "Duration" | "dtmi:dtdl:class:Duration;4" |
+| "elementSchema" | "dtmi:dtdl:property:elementSchema;4" |
+| "Entity" | "dtmi:dtdl:class:Entity;4" |
+| "Enum" | "dtmi:dtdl:class:Enum;4" |
+| "enumValue" | "dtmi:dtdl:property:enumValue;4" |
+| "EnumValue" | "dtmi:dtdl:class:EnumValue;4" |
+| "enumValues" | "dtmi:dtdl:property:enumValues;4" |
+| "exponent" | "dtmi:dtdl:property:exponent;4" |
+| "extends" | "dtmi:dtdl:property:extends;4" |
+| "Field" | "dtmi:dtdl:class:Field;4" |
+| "fields" | "dtmi:dtdl:property:fields;4" |
+| "float" | "dtmi:dtdl:instance:Schema:float;4" |
+| "Float" | "dtmi:dtdl:class:Float;4" |
+| "integer" | "dtmi:dtdl:instance:Schema:integer;4" |
+| "Integer" | "dtmi:dtdl:class:Integer;4" |
+| "Interface" | "dtmi:dtdl:class:Interface;4" |
+| "languageMajorVersion" | "dtmi:dtdl:property:languageMajorVersion;4" |
+| "LatentType" | "dtmi:dtdl:class:LatentType;4" |
+| "lineString" | "dtmi:standard:schema:geospatial:lineString;4" |
+| "long" | "dtmi:dtdl:instance:Schema:long;4" |
+| "Long" | "dtmi:dtdl:class:Long;4" |
+| "Map" | "dtmi:dtdl:class:Map;4" |
+| "mapKey" | "dtmi:dtdl:property:mapKey;4" |
+| "MapKey" | "dtmi:dtdl:class:MapKey;4" |
+| "mapValue" | "dtmi:dtdl:property:mapValue;4" |
+| "MapValue" | "dtmi:dtdl:class:MapValue;4" |
+| "maxMultiplicity" | "dtmi:dtdl:property:maxMultiplicity;4" |
+| "metamodel" | "dtmi:dtdl:meta:metamodel;4" |
+| "minMultiplicity" | "dtmi:dtdl:property:minMultiplicity;4" |
+| "model" | "dtmi:dtdl:meta:model;4" |
+| "multiLineString" | "dtmi:standard:schema:geospatial:multiLineString;4" |
+| "multiPoint" | "dtmi:standard:schema:geospatial:multiPoint;4" |
+| "multiPolygon" | "dtmi:standard:schema:geospatial:multiPolygon;4" |
+| "name" | "dtmi:dtdl:property:name;4" |
+| "NamedEntity" | "dtmi:dtdl:class:NamedEntity;4" |
+| "NamedLatentType" | "dtmi:dtdl:class:NamedLatentType;4" |
+| "nullable" | "dtmi:dtdl:property:nullable;4" |
+| "NumericSchema" | "dtmi:dtdl:class:NumericSchema;4" |
+| "Object" | "dtmi:dtdl:class:Object;4" |
+| "point" | "dtmi:standard:schema:geospatial:point;4" |
+| "polygon" | "dtmi:standard:schema:geospatial:polygon;4" |
+| "PrimitiveSchema" | "dtmi:dtdl:class:PrimitiveSchema;4" |
+| "properties" | "dtmi:dtdl:property:properties;4" |
+| "Property" | "dtmi:dtdl:class:Property;4" |
+| "Relationship" | "dtmi:dtdl:class:Relationship;4" |
+| "request" | "dtmi:dtdl:property:request;4" |
+| "response" | "dtmi:dtdl:property:response;4" |
+| "scaledDecimal" | "dtmi:standard:schema:scaledDecimal;4" |
+| "schema" | "dtmi:dtdl:property:schema;4" |
+| "Schema" | "dtmi:dtdl:class:Schema;4" |
+| "SchemaField" | "dtmi:dtdl:class:SchemaField;4" |
+| "schemas" | "dtmi:dtdl:property:schemas;4" |
+| "SemanticType" | "dtmi:dtdl:class:SemanticType;4" |
+| "SemanticUnit" | "dtmi:dtdl:class:SemanticUnit;4" |
+| "short" | "dtmi:dtdl:instance:Schema:short;4" |
+| "Short" | "dtmi:dtdl:class:Short;4" |
+| "string" | "dtmi:dtdl:instance:Schema:string;4" |
+| "String" | "dtmi:dtdl:class:String;4" |
+| "symbol" | "dtmi:dtdl:property:symbol;4" |
+| "synchronous" | "dtmi:dtdl:instance:CommandType:synchronous;4" |
+| "target" | "dtmi:dtdl:property:target;4" |
+| "Telemetry" | "dtmi:dtdl:class:Telemetry;4" |
+| "TemporalSchema" | "dtmi:dtdl:class:TemporalSchema;4" |
+| "time" | "dtmi:dtdl:instance:Schema:time;4" |
+| "Time" | "dtmi:dtdl:class:Time;4" |
+| "Unit" | "dtmi:dtdl:class:Unit;4" |
+| "UnitAttribute" | "dtmi:dtdl:class:UnitAttribute;4" |
+| "unsignedByte" | "dtmi:dtdl:instance:Schema:unsignedByte;4" |
+| "UnsignedByte" | "dtmi:dtdl:class:UnsignedByte;4" |
+| "unsignedInteger" | "dtmi:dtdl:instance:Schema:unsignedInteger;4" |
+| "UnsignedInteger" | "dtmi:dtdl:class:UnsignedInteger;4" |
+| "unsignedLong" | "dtmi:dtdl:instance:Schema:unsignedLong;4" |
+| "UnsignedLong" | "dtmi:dtdl:class:UnsignedLong;4" |
+| "unsignedShort" | "dtmi:dtdl:instance:Schema:unsignedShort;4" |
+| "UnsignedShort" | "dtmi:dtdl:class:UnsignedShort;4" |
+| "uuid" | "dtmi:dtdl:instance:Schema:uuid;4" |
+| "Uuid" | "dtmi:dtdl:class:Uuid;4" |
+| "valueSchema" | "dtmi:dtdl:property:valueSchema;4" |
+| "writable" | "dtmi:dtdl:property:writable;4" |
+
+## Context
+
+Every [DTDL element](#dtdl-element) may have &mdash; and every top-level element **must** have &mdash; a "@context" member.
+The following constraints and conditions apply to every DTDL v4 "@context" member:
+
+* Member value [MUST](spec/Requirement-ContextStringOrArrayQuantV4.json) be a string or an array.
+* If member value is an array, all elements [MUST](spec/Requirement-ContextArrayAllStringsV4.json) be strings.
+* Each included string value [MUST](spec/Requirement-ContextDtmiWithVersionQuantV4.json) conform to the [Digital Twin Model Identifier](#digital-twin-model-identifier) syntax, and it [MUST](spec/Requirement-ContextDtmiWithVersionQuantV4.json) contain a version number.
+* Each included string value that does not begin with "dtmi:dtdl:context;" [SHALL](spec/Completion-ContextDefinedLanguageExtensionQuantV4.json) refer to a defined DTDL language extension.
+* Member [MUST](spec/Requirement-TopLevelDtdlContextOrLimitlessV4.json) include string value "dtmi:dtdl:context;4" or "dtmi:dtdl:context;4#limitless" if member is in a top-level element.
+* If present, string value "dtmi:dtdl:context;4" [MUST](spec/Requirement-ContextDtdlPrecedesOrOnlyV4.json) be the only value or must precede in the array any values that do not begin with "dtmi:dtdl:context;".
+* If present, string value "dtmi:dtdl:context;4#limitless" [MUST](spec/Requirement-LimitlessContextPrecedesV4.json) precede in the array any values that do not begin with "dtmi:dtdl:context;".
+* If present, string value "dtmi:dtdl:context;4#limitless" [MUST](spec/Requirement-LimitlessContextFollowedByLimitsV4.json) immediately precede in the array either the value "dtmi:dtdl:context;4#limits" or the value "dtmi:dtdl:context;4" or a value that refers to a defined DTDL language extension that specifies modeling limits for DTDL v4.
+* If present, string value "dtmi:dtdl:context;4#limits" [MUST](spec/Requirement-CoreLimitsFollowsLimitlessV4.json) be immediately preceded in the array by the value "dtmi:dtdl:context;4#limitless".
+* If present, an included string value that refers to a defined DTDL language extension that specifies modeling limits [MUST](spec/Requirement-ExtensionLimitsFollowsLimitlessV4.json) be immediately preceded in the array by the value "dtmi:dtdl:context;4#limitless".
+* If present, string value "dtmi:dtdl:context;4" may be preceded in the array by one or more values that also begin with "dtmi:dtdl:context;" but [SHOULD NOT](spec/Recommendation-ContextDtdlOnlyOneV4.json).
+* If present, string value "dtmi:dtdl:context;4#limitless" may be preceded in the array by one or more values that also begin with "dtmi:dtdl:context;" but [SHOULD NOT](spec/Recommendation-ContextDtdlLimitlessOnlyOneV4.json).
+* Member [SHOULD NOT](spec/Recommendation-ContextUniqueValuesV4.json) include more than one instance of any given string value.
+
+The *de-versioned* value of a DTMI is the portion of the string value to the left of the semicolon.
+For example, the de-versioned value of "dtmi:ex:foo;3" is "dtmi:ex:foo".
+
+Given this definition, the following constraint also applies to the values of a "@context" member:
+
+* Member [SHOULD NOT](spec/Recommendation-ContextRepeatsDeversionedValueV4.json) include multiple string values that have the same de-versioned value.
+
+For example, a "@context" member should not include both "dtmi:ex:foo;2" is "dtmi:ex:foo;5", because they both have de-versioned value "dtmi:ex:foo".
+
+Some members of some DTDL elements are permitted to have values that conform to definitions from prior versions of DTDL.
+In the following example, DTDL element "dtmi:example:laterInterface;1" has member "contents" which in turn has member "schema" whose value is a dependent reference to "dtmi:example:earlierInterface;1".
+Each element contains a "@context" member that indicates the version of DTDL in which the element definition is written:
+
+```json
+[
+  {
+    "@context": "dtmi:dtdl:context;3",
+    "@id": "dtmi:example:laterInterface;1",
+    "@type": "Interface",
+    "contents": [
+      {
+        "@type": "Component",
+        "name": "subunit",
+        "schema": "dtmi:example:earlierInterface;1"
+      }
+    ]
+  },
+  {
+    "@context": "dtmi:dtdl:context;2",
+    "@id": "dtmi:example:earlierInterface;1",
+    "@type": "Interface",
+    "contents": [
+      {
+        "@type": "Property",
+        "name": "data",
+        "schema": "integer"
+      }
+    ]
+  }
+]
+```
+
+The following example is equivalent to the previous example, but the DTDL element "dtmi:example:earlierInterface;1" is not defined at the top level.
+Instead, it is defined inline as the value of member "schema" of member "contents" of DTDL element "dtmi:example:laterInterface;1".
+The nested element contains a "@context" member with a DTDL v2 context specifier, indicating that the definitions and rules of DTDL v2 apply:
+
+```json
+{
+  "@context": "dtmi:dtdl:context;3",
+  "@id": "dtmi:example:laterInterface;1",
+  "@type": "Interface",
+  "contents": [
+    {
+      "@type": "Component",
+      "name": "subunit",
+      "schema": {
+        "@context": "dtmi:dtdl:context;2",
+        "@id": "dtmi:example:earlierInterface;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "data",
+            "schema": "integer"
+          }
+        ]
+      }
+    }
+  ]
+}
+```
+
+When a DTDL element contains a "@context" member, the values of this member are combined with the values of "@context" members of DTDL elements higher in the element hierarchy.
+The result of this combination is known as the "active context" for this DTDL element and for any DTDL element that is a structural descendant, down to &mdash; but not including or surpassing &mdash; any element that introduces another "@context" member and thereby generates a new active context.
+In other words, the *active context* of a DTDL element is the combination of included string values from any "@context" members of the DTDL element and every structural ancestor of the DTDL element.
+
+The rules for combining "@context" values into an active context are as follows:
+
+* For any de-versioned value that is represented only once among all "@context" values in the current element and all structural ancestors, the corresponding DTMI value is included in the active context.
+* For any de-versioned value that is represented more than once among all "@context" values in the current element and all structural ancestors, the corresponding DTMI value from the "@context" member lowest in the hierarchy is included in the active context.
+* If any "@context" member includes more than one DTMI with the same de-versioned value, the last of these in the array of member values is used for generating the active context.
+
+For example, in the following model, the active context for the DTDL Inteface and Command elements is the set { "dtmi:dtdl:context;4", "dtmi:ex:foo;2" }.
+The active context of the DTDL Relationship element is the set { "dtmi:dtdl:context;4", "dtmi:ex:foo;1" }, because value "dtmi:ex:foo;1" occurs lower in the hierarchy than value "dtmi:ex:foo;2" and later in the array of strings than value "dtmi:ex:foo;3":
+
+```json
+{
+  "@context": [
+    "dtmi:dtdl:context;4",
+    "dtmi:ex:foo;2"
+  ],
+  "@id": "dtmi:ex:anInterface;1",
+  "@type": "Interface",
+  "contents": [
+    {
+      "@type": "Command",
+      "name": "setDistance"
+    },
+    {
+      "@context": [ "dtmi:ex:foo;3", "dtmi:ex:foo;1" ],
+      "@type": "Relationship",
+      "name": "proximity"
+    }
+  ]
+}
+```
+
+## Digital Twin Model Identifier
+
+A digital twin model identifier (DTMI) is a value that conforms to the following constraints:
+
+* It [MUST](spec/Requirement-DtmiIsStringV4.json) be a string.
+* It [MUST](spec/Requirement-DtmiRegexV4.json) conform to the regular expression `^dtmi:[A-Za-z](?:[A-Za-z0-9_]*[A-Za-z0-9])?(?::[A-Za-z](?:[A-Za-z0-9_]*[A-Za-z0-9])?)*(?:;[1-9][0-9]{0,8}(?:\\.[1-9][0-9]{0,5})?)?$`.
+* When used as the value of an "@id" member, it [MUST NOT](spec/Requirement-DtmiReservedPrefixesV4.json) begin with any of the following prefixes:
+  * "dtmi:dtdl:"
+  * "dtmi:standard:"
+
+> Note:
+In other documents, the format above is referred to as a "user DTMI", and the term "DTMI" is used to mean a more general format that includes both *user* and *system* DTMI formats.
+DTDL models permit only the above format, so the more general format is not defined herein.
+
+## Glossary
+
+* active context &mdash; the combination of included string values from any "@context" members of the DTDL element and every structural ancestor of the DTDL element (see [Context](#context))
+* ancestor &mdash; transitively closes the "parent" relation: A DTDL element *X* is an *ancestor* of DTDL element *Y* if *X* is a parent of *Y* or if *X* is an ancestor of a parent of *Y*. (see [DTDL element](#dtdl-element))
+* ancestor, structural &mdash; see "structural ancestor"
+* array &mdash; a bracket-enclosed sequence of comma-separated JSON values (see [Terminology](#terminology))
+* array value &mdash; each JSON value in an array (see [Terminology](#terminology))
+* boolean &mdash; either of the literals `true` or `false` (see [Terminology](#terminology))
+* child &mdash; Each DTDL element that is included or referentially included in a member is known as a *child* of a DTDL element that has the member. (see [DTDL element](#dtdl-element))
+* child, structural &mdash; see "structural child"
+* co-typed, informally &mdash; see "informally co-typed"
+* complete &mdash; A model is *complete* if it is neither referentially incomplete nor contextually incomplete, such that all dependent references and all specified contexts have available definitions. (see [Model completeness](#model-completeness))
+* context, active &mdash; see "active context"
+* contextually incomplete &mdash; A model is *contextually incomplete* if it specifies an extension context that has no available definition. (see [Model completeness](#model-completeness))
+* de-versioned DTMI &mdash; The *de-versioned* value of a DTMI is the portion of the string value to the left of the semicolon. (see [Context](#context))
+* dependent reference &mdash; a DTMI string included in a member in place of a DTDL element (see [Model completeness](#model-completeness))
+* descendant &mdash; transitively closes the "child" relation: A DTDL element *Y* is a *descendant* of DTDL element *X* if *Y* is a child of *X* or if *Y* is a child of a descendant of *X*. (see [DTDL element](#dtdl-element))
+* descendant, structural &mdash; see "structural descendant"
+* DTDL element &mdash; a JSON object that conforms to the definition of a DTDL element (see [DTDL element](#dtdl-element))
+* DTMI &mdash; digital twin model identifier (see [Digital Twin Model Identifier](#digital-twin-model-identifier))
+* DTMI, de-versioned &mdash; see "de-versioned DTMI"
+* include &mdash; A member *includes* JSON value *X* if either the member's value is *X*, or the member's value is an array and *X* is a value in the array. When a member includes a representational literal, the member is also considered to include the literal value itself. (see [Terminology](#terminology), [Representational literal](#representational-literal))
+* include, referentially &mdash; see "referentially include"
+* incomplete, contextually &mdash; see "contextually incomplete"
+* incomplete, referentially &mdash; see "referentially incomplete"
+* informally co-typed &mdash; An element is considered to be *informally co-typed* if it has an "@type" member that includes a value that is neither required nor defined by an extension referenced in the active context. An element that is informally co-typed is permitted to have additional members beyond those explicitly defined for the element type. (see [DTDL element](#dtdl-element))
+* integer &mdash; an integral number expressible in 4 bytes (see [Terminology](#terminology))
+* JSON value &mdash; an object OR array OR string OR number OR boolean OR null (see [Terminology](#terminology))
+* language map &mdash; A localizable string object not in an array is a *language map* object; it has members with names that are language codes. (see [Localizable string](#localizable-string))
+* language-tagged value &mdash; An object in a localizable string array is a *language-tagged value* object; it has a required "@value" member and an optional "@language" member. (see [Localizable string](#localizable-string))
+* localizable string &mdash; a JSON value that can express a semantic string in multiple languages using one of three structural forms: a string, an array of strings and language-tagged value objects, or a language map object (see [Localizable string](#localizable-string))
+* member &mdash; a colon-separated ordered pair of a string and a JSON value (see [Terminology](#terminology))
+* member name &mdash; the string that is the first component in a member's ordered pair (see [Terminology](#terminology))
+* member value &mdash; the JSON value that is the second component in a member's ordered pair (see [Terminology](#terminology))
+* model &mdash; a collection of zero or more JSON documents (see [Terminology](#terminology))
+* name, member &mdash; see "member name"
+* non-dependent reference &mdash; a DTMI string included in a member that only takes DTMI string values (see [Model completeness](#model-completeness))
+* null &mdash; the literal `null` (see [Terminology](#terminology))
+* number &mdash; a signed decimal numeric value (see [Terminology](#terminology))
+* object &mdash; a brace-enclosed sequence of comma-separated members (see [Terminology](#terminology))
+* parent &mdash; A DTDL element is known as a *parent* of every DTDL element that is included or referentially included in one of its members. (see [DTDL element](#dtdl-element))
+* parent, structural &mdash; see "structural parent"
+* partition &mdash; a specific collection of DTDL elements (see [DTDL element](#dtdl-element))
+* path from X to Y &mdash; sequence of members that can be followed via inclusion or referential inclusion from DTDL element *X* to DTDL element *Y* (see [DTDL element](#dtdl-element))
+* reference, dependent &mdash; see "dependent reference"
+* reference, non-dependent &mdash; see "non-dependent reference"
+* referenceable element &mdash; an Interface, a top-level element, or an element in the same partition as the element that references it (see [DTDL element](#dtdl-element))
+* referentially include &mdash; When a member includes a dependent reference, the DTDL element whose "@id" member has a matching value is said to be *referentially included* in the member that includes the dependent reference. A DTDL element type can have a member that is specified to expand the set of elements that are referentially included in other members. (see [Model completeness](#model-completeness), [DTDL element](#dtdl-element))
+* referentially incomplete &mdash; When any DTDL element in a model has a member that includes a dependent reference, the model is *referentially incomplete* if it does not also contain a DTDL element with an "@id" member whose value matches the DTMI of the dependent reference. (see [Model completeness](#model-completeness))
+* representational literal &mdash; a JSON value that represents a literal value in the form of a bare literal, an untyped value object, or a typed value object (see [Representational literal](#representational-literal))
+* string &mdash; a double-quoted sequence of Unicode characters (see [Terminology](#terminology))
+* string, localizable &mdash; see "localizable string"
+* structural ancestor &mdash; transitively closes the "structural parent" relation: A DTDL element *X* is a *structural ancestor* of DTDL element *Y* if *X* is a structural parent of *Y* or if *X* is a structural ancestor of a structural parent of *Y*. (see [DTDL element](#dtdl-element))
+* structural child &mdash; Each DTDL element that is included in a member is known as a *structural child* of the DTDL element that has the member. (see [DTDL element](#dtdl-element))
+* structural descendant &mdash; transitively closes the "structural child" relation: A DTDL element *Y* is a *structural descendant* of DTDL element *X* if *Y* is a structural child of *X* or if *Y* is a structural child of a structural descendant of *X*. (see [DTDL element](#dtdl-element))
+* structural parent &mdash; A DTDL element is known as the *structural parent* of every DTDL element that is included in one of its members. (see [DTDL element](#dtdl-element))
+* top-level element &mdash; synonym for "top-level object" if the object is a conformant DTDL element (see [Terminology](#terminology))
+* top-level object &mdash; an object closest to the root of a JSON document (see [Terminology](#terminology))
+* value, array &mdash; see "array value"
+* value, language-tagged &mdash; see "language-tagged value"
+* value, member &mdash; see "member value"
+* vaue, JSON &mdash; see "JSON value"
+
diff --git a/DTDL/v4/DTDL.annotation.v2.md b/DTDL/v4/DTDL.annotation.v2.md
new file mode 100644
index 00000000..da25b6e8
--- /dev/null
+++ b/DTDL/v4/DTDL.annotation.v2.md
@@ -0,0 +1,156 @@
+# Annotation extension
+
+**Version 2**
+
+**Usable in DTDL version 3 or 4**
+
+Annotation is a DTDL language feature that enables a model to add custom metadata to a Property or a Telemetry.
+If a service supports the Annotation extension, it recognizes and understands the ValueAnnotation adjunct type and its `annotates` property if the Annotation context is specified.
+
+## Annotation context
+
+The context specifier for version 2 of the Annotation extension is "dtmi:dtdl:extension:annotation;2".
+
+## ValueAnnotation adjunct type
+
+The ValueAnnotation adjunct type can co-type a Property or a Telemetry in DTDL version 3 or 4.
+
+The chart below lists the additional properties that may be part of an element that is co-typed ValueAnnotation.
+
+| Property | Required | Data type | Limits | Description |
+| --- | --- | --- | --- | --- |
+| `annotates` | required | *string* | must match the `name` property of a sibling element | Name of a Property or Telemetry that is annotated. |
+
+When a Property or a Telemetry in a model is co-typed ValueAnnotation, the value of the `annotates` property specifies the `name` of another Property or Telemetry within the `contents` of the same Interface.
+This indicates that the ValueAnnotation should be regarded as metadata for the element referenced by `annotates`.
+
+## ValueAnnotation examples
+
+The following example shows an Interface with three `contents` elements.
+The element named "currentTemp" has type Telemetry and co-type Temperature (from the [QuantitativeTypes](./DTDL.quantitativeTypes.v2.md) feature extension); this element provides a stream of temperature readings from the Sensor.
+
+The element named "currentTempAccuracy" has type Telemetry and co-type ValueAnnotation; this element provides a stream of metadata regarding the accuracy of each temperature reading.
+The adjunct type ValueAnnotation indicates that the Telemetry provides metadata, and the value of property `annotates` indicates that the metadata applies to the element named "currentTemp".
+Because this is a Telemetry, its values can be streamed synchronously with the values of the "currentTemp" Telemetry that it is annotating.
+
+The element named "currentTempLastCalibrated" has type Property and co-type ValueAnnotation; this element provides a metadata date value that indicates the date on which the temperature sensor was most recently calibrated.
+Because this is a Property, its value is not transmitted with every temperature reading, so this is appropriate for annotations that change infrequently.
+Moreover, because Telemetry messages and Property updates are not synchronized, it is generally not possible to precisely correlate a change in Property value with a particular point in the time series of Telemetry values.
+So, for the present example, "currentTemp" Telemetry values reported on the date indicated by the "currentTempLastCalibrated" Property might or might not reflect the most recent calibration.
+
+```json
+{
+  "@context": [
+    "dtmi:dtdl:context;3",
+    "dtmi:dtdl:extension:quantitativeTypes;1",
+    "dtmi:dtdl:extension:annotation;2"
+  ],
+  "@id": "dtmi:com:example:Sensor;1",
+  "@type": "Interface",
+  "contents": [
+    {
+      "@type": [ "Telemetry", "Temperature" ],
+      "name": "currentTemp",
+      "schema": "double",
+      "unit": "degreeFahrenheit"
+    },
+    {
+      "@type": [ "Telemetry", "ValueAnnotation" ],
+      "name": "currentTempAccuracy",
+      "annotates": "currentTemp",
+      "schema": "double"
+    },
+    {
+      "@type": [ "Property", "ValueAnnotation" ],
+      "name": "currentTempLastCalibrated",
+      "annotates": "currentTemp",
+      "schema": "date",
+      "writable": true
+    }
+  ]
+}
+```
+
+Following is an example Telemetry payload for the above model:
+
+```json
+{
+  "currentTemp": 62.6,
+  "currentTempAccuracy": 4.0
+}
+```
+
+When a Telemetry annotates another Telemetry, any given annotation value applies only to the annotated value in the same Telemetry payload.
+In the above message, the "currentTempAccuracy" value 4.0 applies to the "currentTemp" value 62.6, not to any previous or subsequent value.
+If a particular Telemetry message does not include an annotation value, the value in the payload is still valid data; it merely lacks an annotation.
+If a particular message includes only an annotation but not an annotated value, the payload is valid but semantically meaningless.
+Such annotations do not apply to the next value, to the previous value, to the stream of values up until this point, or to any other data values.
+
+When a Property annotates a Telemetry, the annotation applies to the entire stream of Telemetry values:
+When the annotating Property value is updated, the new value applies to all Telemetry values sent after the update occurs and before the Property value is updated again; however, as mentioned above, the temporal correlation between Property updates and Telemetry values is quite loose, so care should be exercised in drawing inferences around the time a Property is changed.
+When a Property annotates another Property, if both Properties are read concurrently, the value of the annotating Property applies to the value of the annotated Property.
+
+A special case of using a Property for annotation is when the [Overriding](./DTDL.overriding.v2.md) feature extension is employed to override a model property with an instance value.
+
+As the following example shows, the Property or Telemetry that is annotated need not be defined directly in the same Interface as the ValueAnnotation.
+When an Interface `extends` another Interface, the former can annotate a `contents` element that is defined in the latter, because the `extends` property imports the Property or Telemetry into the former's `contents`.
+
+```json
+[
+  {
+    "@context": [
+      "dtmi:dtdl:context;3",
+      "dtmi:dtdl:extension:quantitativeTypes;1"
+    ],
+    "@id": "dtmi:com:example:BaseSensor;1",
+    "@type": "Interface",
+    "contents": [
+      {
+        "@type": [ "Telemetry", "Temperature" ],
+        "name": "currentTemp",
+        "schema": "double",
+        "unit": "degreeFahrenheit"
+      }
+    ]
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;3",
+      "dtmi:dtdl:extension:quantitativeTypes;1",
+      "dtmi:dtdl:extension:annotation;2"
+    ],
+    "@id": "dtmi:com:example:Sensor;1",
+    "@type": "Interface",
+    "extends": "dtmi:com:example:BaseSensor;1",
+    "contents": [
+      {
+        "@type": [ "Telemetry", "ValueAnnotation" ],
+        "name": "currentTempAccuracy",
+        "annotates": "currentTemp",
+        "schema": "double"
+      },
+      {
+        "@type": [ "Property", "ValueAnnotation" ],
+        "name": "currentTempLastCalibrated",
+        "annotates": "currentTemp",
+        "schema": "date",
+        "writable": true
+      }
+    ]
+  }
+]
+```
+
+## Changes from Version 1
+
+There are no changes from Version 1 of this extension, other than its compatibility with [DTDL v4](./DTDL.v4.md) in addition to [DTDL v3](../v3/DTDL.v3.md).
+
+## Feature versions
+
+The chart below lists the versions of the Annotation extension that are currently available.
+
+| Extension | Context | DTDL versions |
+| --- | --- | --- |
+| [Annotation v1](../v3/DTDL.annotation.v1.md) | dtmi:dtdl:extension:annotation;1 | [3](../v3/DTDL.v3.md) |
+| [Annotation v2](./DTDL.annotation.v2.md) | dtmi:dtdl:extension:annotation;2 | [3](../v3/DTDL.v3.md), [4](./DTDL.v4.md) |
+
diff --git a/DTDL/v4/DTDL.historization.v2.md b/DTDL/v4/DTDL.historization.v2.md
new file mode 100644
index 00000000..a6b1da95
--- /dev/null
+++ b/DTDL/v4/DTDL.historization.v2.md
@@ -0,0 +1,81 @@
+# Historization extension
+
+**Version 2**
+
+**Usable in DTDL version 3 or 4**
+
+Historization is a DTDL language feature for indicating that the historical sequence of values of a Property or a Telemetry should be recorded, as should the times at which the Property or Telemetry value changes.
+If a service supports the Historization extension, it recognizes and understands the Historized adjunct type if the Historization context is specified.
+
+## Historization context
+
+The context specifier for version 2 of the Historization extension is "dtmi:dtdl:extension:historization;2".
+
+## Historized adjunct type
+
+The Historized adjunct type can co-type a Property or a Telemetry in DTDL version 3 or 4.
+There are no properties associated with the Historized adjunct type.
+
+When a Property or a Telemetry in a model is co-typed Historized, the service will persist the Historized Property or Telemetry values and make them available for querying and analytics.
+The details of how Historized data is stored, indexed, queried, and accessed is beyond the scope of the DTDL language and of the Historization feature extension.
+Within a DTDL model, the Historized adjunct type is merely a designator of which Properties and Telemetries are to be historized by the service.
+
+## Historization examples
+
+The following example shows an Interface with a single `contents` element named "setPointTemp" that has type Property and co-type Historized.
+
+```json
+{
+  "@context": [
+    "dtmi:dtdl:context;3",
+    "dtmi:dtdl:extension:historization;2"
+  ],
+  "@id": "dtmi:com:example:Thermostat;1",
+  "@type": "Interface",
+  "contents": [
+    {
+      "@type": [ "Property", "Historized" ],
+      "name": "setPointTemp",
+      "writable": true,
+      "schema": "double"
+    }
+  ]
+}
+```
+
+Applying the Historized adjunct type does not preclude the application of other co-types, such as the Temperature semantic type, which adds the `unit` property to the Property:
+
+```json
+{
+  "@context": [
+    "dtmi:dtdl:context;3",
+    "dtmi:dtdl:extension:quantitativeTypes;1",
+    "dtmi:dtdl:extension:historization;2"
+  ],
+  "@id": "dtmi:com:example:Thermostat;1",
+  "@type": "Interface",
+  "contents": [
+    {
+      "@type": [ "Property", "Temperature", "Historized" ],
+      "name": "setPointTemp",
+      "writable": true,
+      "schema": "double",
+      "unit": "degreeFahrenheit"
+    }
+  ]
+}
+```
+
+## Changes from Version 1
+
+There are no changes from Version 1 of this extension, other than its compatibility with [DTDL v4](./DTDL.v4.md) in addition to [DTDL v3](../v3/DTDL.v3.md).
+
+## Feature versions
+
+The chart below lists the versions of the Historization extension that are currently available.
+
+| Extension | Context | DTDL versions |
+| --- | --- | --- |
+| [Historization v1](../v3/DTDL.historization.v1.md) | dtmi:dtdl:extension:historization;1 | [3](../v3/DTDL.v3.md) |
+| [Historization v2](./DTDL.historization.v2.md) | dtmi:dtdl:extension:historization;2 | [3](../v3/DTDL.v3.md), [4](./DTDL.v4.md) |
+
diff --git a/DTDL/v4/DTDL.mqtt.v2.md b/DTDL/v4/DTDL.mqtt.v2.md
new file mode 100644
index 00000000..d862e19d
--- /dev/null
+++ b/DTDL/v4/DTDL.mqtt.v2.md
@@ -0,0 +1,344 @@
+# Mqtt extension
+
+**Version 2**
+
+**Usable in DTDL version 3 or 4**
+
+The DTDL Mqtt extension enables a model to specify properties for an Interface that are relevant to communication via the MQTT pub/sub protocol.
+If a service supports the Mqtt extension, it recognizes and understands the Mqtt, Idempotent, Cacheable, Transparent, and Indexed adjunct types and their defined properties if the Mqtt context is specified.
+
+## Mqtt context
+
+The context specifier for version 2 of the Mqtt extension is "dtmi:dtdl:extension:mqtt;2".
+
+## Mqtt adjunct type
+
+The Mqtt adjunct type can co-type an Interface in DTDL version 3 or 4.
+The chart below lists the additional properties that may be part of an element that is co-typed Mqtt.
+
+| Property | Required | Data type | Limits | Description |
+| --- | --- | --- | --- | --- |
+| `commandTopic` | optional | *string* | slash-separated sequence of character-restricted labels and/or brace-enclosed tokens | MQTT topic pattern on which a Command request is published. |
+| `payloadFormat` | required | *string* |  | The format to use when serializing an instance to an MQTT payload. |
+| `serviceGroupId` | optional | *string* | non-empty string of printable ASCII characters not including space, ", +, #, {, }, or / | The service group ID for subscribing to Command topics when shared subscriptions are wanted. |
+| `telemetryTopic` | optional | *string* | slash-separated sequence of character-restricted labels and/or brace-enclosed tokens | MQTT topic pattern on which a Telemetry or a collection of Telemetries is published. |
+
+When an Interface in a model is co-typed Mqtt, values of the above properties indicate the serialization format and MQTT topic pattern used for any instance of Interface contents when conveyed via an MQTT message.
+
+Note that the co-types on an Interface, and the additional properties added by these co-types, are not imported by an Interface that `extends` the Interface.
+Therefore, the properties above apply only to the Interface to which they are directly applied, not to any extending Interfaces.
+
+### Topic Pattern
+
+MQTT topic pattern strings are restricted as follows.
+
+* A topic pattern is a sequence of labels separated by `/`
+* Each label is one of:
+  * A string of printable ASCII characters not including space, `"`, `+`, `#`, `{`, `}`, or `/`, to be copied literally into the MQTT topic.
+  * A string that indicates a replaceable token, to be replaced by an implementation-dependent value:
+    * The string starts with `{`, ends with `}`, and contains an implementation-defined token
+    * The token is a non-empty sequence of ASCII letters, optionally preceded by a prefix
+    * The prefix is a non-empty sequence of ASCII letters followed by a `:`
+
+* The first label must not start with `$`
+
+## Idempotent adjunct type
+
+The Idempotent adjunct type can co-type a Command in DTDL version 3 or 4.
+There are no additional properties conferred on an element that has co-type Idempotent.
+
+When a Command in a model is co-typed Idempotent, a service that implements the Command is permitted to execute the Command multiple times for a single invocation of the Command.
+In the absence of an Idempotent co-type, a service must ensure that each Command invocation results in no more than one execution of the Command, despite possible duplication of Command requests due to failure-induced or delay-induced retries.
+
+## Cacheable adjunct type
+
+The Cacheable adjunct type can co-type a Command in DTDL version 3 or 4.
+
+The chart below lists the additional properties that may be part of an element that is co-typed Cacheable.
+
+| Property | Required | Data type | Description |
+| --- | --- | --- | --- |
+| `ttl` | required | *duration* | Maximum duration for which a response to a Command instance may be reused as a response to other Command instances. |
+
+When a Command in a model is co-typed Cacheable, a service that implements the Command is permitted to store the response value for a Command instance and subsequently to reuse the stored value as a response to another Command instance, as long as the Command request values for the two Command instances are identical, and as long as the specfied `ttl` (time to live) duration is not exceeded.
+
+## Transparent adjunct type
+
+The Transparent adjunct type can co-type a CommandRequest or a CommandResponse in DTDL version 3 or 4, but only when the CommandRequest or CommandResponse has a `schema` property whose value is an Object.
+There are no additional properties conferred on an element that has co-type Transparent.
+
+Some serialization formats are unable to communicate simple scalar or array values directly.
+Such formats require an outer layer of structure with named fields for each value.
+For this reason, Command communication always includes an implied outer level of structure that represents the CommandRequest or CommandResponse containing the specified `schema`.
+
+For the specefic case in which the `schema` of a CommandRequest or a CommandResponse is an Object, the outer layer of structure is redundant.
+To eliminate this redundancy, the adjunct type Transparent can be applied to the CommandRequest or CommandResponse, indicating that the corresponding level of structure will not be represented in communicated instances of the CommandRequest or CommandResponse.
+For example, a CommandRequest named "announcement" whose `schema` is an Object with two string fields might communicate a request as follows when using JSON serialization:
+
+```json
+{
+  "announcement": {
+    "text": "Hello, World!",
+    "color": "green"
+  }
+}
+```
+
+However, when the Transparent adjunct type is applied to the CommandRequest, the outer JSON object and the property name "announcement" are omitted, yielding the following:
+
+```json
+{
+  "text": "Hello, World!",
+  "color": "green"
+}
+```
+
+See [Mqtt examples](#mqtt-examples) below for DTDL models to which the above instances conform.
+
+## Indexed adjunct type
+
+The Indexed adjunct type can co-type an EnumValue, a Field, or a Telemetry in DTDL version 3 or 4.
+
+The chart below lists the additional properties that may be part of an element that is co-typed Indexed.
+
+| Property | Required | Data type | Limits | Description |
+| --- | --- | --- | --- | --- |
+| `index` | required | *integer* | must be >= 1; must be unique across all EnumValues, Fields, or Telemetries that are values of the same property | Index number to uniquely identify the serialized element within its parent container. |
+
+Some serialization formats require index values for string EnumValues, Fields, and Telemetries.
+Although index values can be generated automatically, the Indexed adjunct type is available for setting explicit index values when needed for cross-version compatibility or interoperation across different implementations.
+
+## Mqtt examples
+
+The following example shows an Interface with four `contents` elements, two Telemetries and two Commands.
+The "getSpeed" Command is co-typed Idempotent, so a single invocation of the Command might result in multiple executions due to message duplication in the network.
+By contranst, the "setColor" Command is not co-typed Idempotent, so a single invocation must result in a single execution, despite any message duplication.
+The "getSpeed" Command is also co-typed Cacheable and has a "ttl" property with value "PT15S", which is a duration of 15 seconds expressed in [ISO 8601 Duration](https://en.wikipedia.org/wiki/ISO_8601#Durations) format.
+
+```json
+{
+  "@context": [
+    "dtmi:dtdl:context;3",
+    "dtmi:dtdl:extension:mqtt;2"
+  ],
+  "@id": "dtmi:example:TestVehicle;1",
+  "@type": [ "Interface", "Mqtt" ],
+  "telemetryTopic": "vehicles/{modelId}/{senderId}/telemetry",
+  "commandTopic": "vehicles/{executorId}/command/{commandName}",
+  "payloadFormat": "Avro/1.11.0",
+  "contents": [
+    {
+      "@type": "Telemetry",
+      "name": "distance",
+      "schema": "double",
+      "description": "The total distance from the origin."
+    },
+    {
+      "@type": "Telemetry",
+      "name": "color",
+      "schema": "string",
+      "description": "The color currently being applied."
+    },
+    {
+      "@type": [ "Command", "Idempotent", "Cacheable" ],
+      "name": "getSpeed",
+      "response": {
+        "name": "mph",
+        "schema": "integer"
+      },
+      "ttl": "PT15S"
+    },
+    {
+      "@type": "Command",
+      "name": "setColor",
+      "request": {
+        "name": "newColor",
+        "schema": "string"
+      },
+      "response": {
+        "name": "oldColor",
+        "schema": "string"
+      }
+    }
+  ]
+}
+```
+
+The following example is identical to the previous one except for two changes.
+First, the `payloadFormat` is specified as "Protobuf/3" instead of "Avro/1.11.0".
+Second, each Telemetry element is co-typed Indexed, and it specifies a unique (within the Interface) positive integer value for the `index` property.
+
+The Protobuf format uses field indices instead of names in its on-wire representation.
+These indices can be generated automatically, but the example illustrates how the Indexed adjunct type can be used to set explicit index values if desired.
+
+```json
+{
+  "@context": [
+    "dtmi:dtdl:context;3",
+    "dtmi:dtdl:extension:mqtt;2"
+  ],
+  "@id": "dtmi:example:TestVehicle;1",
+  "@type": [ "Interface", "Mqtt" ],
+  "telemetryTopic": "vehicles/{modelId}/{senderId}/telemetry",
+  "commandTopic": "vehicles/{executorId}/command/{commandName}",
+  "payloadFormat": "Protobuf/3",
+  "contents": [
+    {
+      "@type": [ "Telemetry", "Indexed" ],
+      "name": "distance",
+      "schema": "double",
+      "description": "The total distance from the origin.",
+      "index": 3
+    },
+    {
+      "@type": [ "Telemetry", "Indexed" ],
+      "name": "color",
+      "schema": "string",
+      "description": "The color currently being applied.",
+      "index": 2
+    },
+    {
+      "@type": [ "Command", "Idempotent", "Cacheable" ],
+      "name": "getSpeed",
+      "response": {
+        "name": "mph",
+        "schema": "integer"
+      },
+      "ttl": "PT15S"
+    },
+    {
+      "@type": "Command",
+      "name": "setColor",
+      "request": {
+        "name": "newColor",
+        "schema": "string"
+      },
+      "response": {
+        "name": "oldColor",
+        "schema": "string"
+      }
+    }
+  ]
+}
+```
+
+The following example shows an Interface with a Command whose `request` value has a `schema` value that is an Object, which yields instances like the first one shown [above](#transparent-adjunct-type).
+
+```json
+{
+  "@context": [
+    "dtmi:dtdl:context;3",
+    "dtmi:dtdl:extension:mqtt;2"
+  ],
+  "@id": "dtmi:example:Display;1",
+  "@type": [ "Interface", "Mqtt" ],
+  "payloadFormat": "Json/ecma/404",
+  "commandTopic": "samples/command/{commandName}",
+  "contents": [
+    {
+      "@type": "Command",
+      "name": "display",
+      "request": {
+        "name": "announcement",
+        "schema": {
+          "@type": "Object",
+          "fields": [
+            {
+              "name": "text",
+              "schema": "string"
+            },
+            {
+              "name": "color",
+              "schema": "string"
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
+```
+
+The following example enhances the above example by co-typing the request with the adjunct type Transparent.
+Although the type of the `request` property is always CommandRequest and can therefore be inferred, the presence of an adjunct type requires the material type to be declared explicitly.
+Therefore, the request lists both type CommandRequest and type Transparent.
+
+```json
+{
+  "@context": [
+    "dtmi:dtdl:context;3",
+    "dtmi:dtdl:extension:mqtt;2"
+  ],
+  "@id": "dtmi:example:Display;1",
+  "@type": [ "Interface", "Mqtt" ],
+  "payloadFormat": "Json/ecma/404",
+  "commandTopic": "samples/command/{commandName}",
+  "contents": [
+    {
+      "@type": "Command",
+      "name": "display",
+      "request": {
+        "@type": [ "CommandRequest", "Transparent" ],
+        "name": "announcement",
+        "schema": {
+          "@type": "Object",
+          "fields": [
+            {
+              "name": "text",
+              "schema": "string"
+            },
+            {
+              "name": "color",
+              "schema": "string"
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
+```
+
+An instance of the above request omits the outer layer of structure, such as the second instance shown [above](#transparent-adjunct-type).
+
+The following example is not valid becuse the `schema` of the request is "string", but the adjunct type Transparent can only be applied to a CommandRequest or a CommandResponse whose `schema` is an Object.
+
+```json
+{
+  "@context": [
+    "dtmi:dtdl:context;3",
+    "dtmi:dtdl:extension:mqtt;2"
+  ],
+  "@id": "dtmi:example:Display;1",
+  "@type": [ "Interface", "Mqtt" ],
+  "payloadFormat": "Json/ecma/404",
+  "commandTopic": "samples/command/{commandName}",
+  "contents": [
+    {
+      "@type": "Command",
+      "name": "display",
+      "request": {
+        "@type": [ "CommandRequest", "Transparent" ],
+        "name": "announcement",
+        "schema": "string"
+      }
+    }
+  ]
+}
+```
+
+## Changes from Version 1
+
+* [DTDL v4](./DTDL.v4.md) is now supported.
+* The [Transparent](#transparent-adjunct-type) adjunct type has been added.
+* The "serviceGroupId" property has been added to to the [Mqtt](#mqtt-adjunct-type) adjunct type.
+
+## Feature versions
+
+The chart below lists the versions of the Mqtt extension that are currently available.
+
+| Extension | Context | DTDL versions |
+| --- | --- | --- |
+| [MQTT v1](../v3/DTDL.mqtt.v1.md) | dtmi:dtdl:extension:mqtt;1 | [3](../v3/DTDL.v3.md) |
+| [MQTT v2](./DTDL.mqtt.v2.md) | dtmi:dtdl:extension:mqtt;2 | [3](../v3/DTDL.v3.md), [4](./DTDL.v4.md) |
+
diff --git a/DTDL/v4/DTDL.overriding.v2.md b/DTDL/v4/DTDL.overriding.v2.md
new file mode 100644
index 00000000..b90ca47a
--- /dev/null
+++ b/DTDL/v4/DTDL.overriding.v2.md
@@ -0,0 +1,154 @@
+# Overriding extension
+
+**Version 2**
+
+**Usable in DTDL version 3 or 4**
+
+Overriding is a DTDL language feature that enables a model property of a Property or a Telemetry to be overridden by a value in an instance of the model.
+If a service supports the Overriding extension, it recognizes and understands the Override adjunct type and its `overrides` property if the Overriding context is specified.
+Overriding may be used only in conjunction with the [Annotation](./DTDL.annotation.v2.md) feature extension.
+
+## Overriding context
+
+The context specifier for version 2 of the Overriding extension is "dtmi:dtdl:extension:overriding;2".
+
+## Override adjunct type
+
+The Override adjunct type can co-type a Property in DTDL version 3 or 4, but only if the Property is also co-typed ValueAnnotation.
+
+The chart below lists the additional properties that may be part of an element that is co-typed Override.
+
+| Property | Required | Data type | Limits | Description |
+| --- | --- | --- | --- | --- |
+| `overrides` | required | *IRI* | must match an extension property of the sibling element identified by the `annotates` property | Term or IRI of an extension property that is overridden. |
+
+When a Property in a model is co-typed ValueAnnotation and Override, the value of the `annotates` property specifies the `name` of another Property or Telemetry within the `contents` of the same Interface, and the value of the `overrides` property specifies an extension property on this other Property or Telemetry.
+This indicates that the ValueAnnotation/Override should be regarded as metadata for the element referenced by `annotates`, and further that this metadata overrides the value of the extension property indicated by `overrides`.
+
+## Extension version constraint
+
+The Overriding extension places a constraint on the version of the extension that defines property values that are overridden.
+Specifically, the property-defining extension must be defined using the same version of DTDL that is used for definining the model that uses Overriding.
+Ordinarily, it is acceptable to use a later version of an extension in a model defined in an earlier version of DTDL; however, this freedom is lost when using Overriding.
+
+## Override examples
+
+The following example shows an Interface with two `contents` elements.
+The element named "currentTemp" has type Telemetry and co-type Temperature; this element provides a stream of temperature readings from the Sensor.
+The semantic type Temperature is defined in the [QuantitativeTypes](./DTDL.quantitativeTypes.v2.md) feature extension.
+
+The element named "currentTempUnit" has type Property and co-types ValueAnnotation and Override; this element provides a metadata value that overrides the `unit` property on the element named "currentTemp".
+The adjunct type ValueAnnotation indicates that the Property provides metadata, and the value of property `annotates` indicates that the metadata applies to the element named "currentTemp".
+The adjunct type Override indicates that the Property overrides a value of the annotated element, and the value of property `overrides` indicates that the overridden property is `unit`.
+
+The `schema` of "currentTempUnit" is TemperatureUnit, which &mdash; like the Temperature type &mdash; is defined in the [QuantitativeTypes](./DTDL.quantitativeTypes.v2.md) feature extension.
+Because "currentTempUnit" is overriding the `unit` property of "currentTemp", which has co-type Temperature, the `schema` of "currentTempUnit" must be approriate for the Temperature type.
+The table in the [QuantitativeTypes](./DTDL.quantitativeTypes.v2.md) documentation indicates which unit type (e.g., TemperatureUnit) corresponds to each semantic type (e.g., Temperature).
+This table also indicates the allowed unit values that can be specified in an instance of the model when overriding the `unit` property of the annotated element.
+
+> Note that the Overriding extension is not dependent upon the QuantitativeTypes extension, although all current use cases for Overriding involve QuantitativeTypes.
+The Overriding extension enables **any property** defined by **any extension** to be overridden by a Property.
+The `schema` of the overriding Property must match the schema type of the overridden property, just as the `schema` of "currentTempUnit" matches the schema type of the "currentTemp" `unit` property in the following example.
+
+```json
+{
+  "@context": [
+    "dtmi:dtdl:context;4",
+    "dtmi:dtdl:extension:quantitativeTypes;2",
+    "dtmi:dtdl:extension:annotation;2",
+    "dtmi:dtdl:extension:overriding;2"
+  ],
+  "@id": "dtmi:com:example:Sensor;1",
+  "@type": "Interface",
+  "contents": [
+    {
+      "@type": [ "Telemetry", "Temperature" ],
+      "name": "currentTemp",
+      "schema": "double",
+      "unit": "degreeFahrenheit"
+    },
+    {
+      "@type": [ "Property", "ValueAnnotation", "Override" ],
+      "name": "currentTempUnit",
+      "annotates": "currentTemp",
+      "overrides": "unit",
+      "schema": "TemperatureUnit",
+      "writable": true
+      }
+  ]
+}
+```
+
+To override the "currentTemp" `unit` property, an instance of this model specifies a value for "currentTempUnit".
+The allowed values are indicated by the table in the [QuantitativeTypes](./DTDL.quantitativeTypes.v2.md) documentation.
+The row for semantic type Temperature lists the unit values that may be specified in the instance, which are the same values that may be specified for the `unit` property in the model.
+The instance might, for example, contain the following content:
+
+```json
+{
+  "currentTempUnit": "degreeCelsius"
+}
+```
+
+The presence of a "currentTempUnit" value in the instance indicates that the value "degreeFahrenheit" specified by the model's `unit` property no longer applies.
+Instead, the value for the unit of "currentTemp" is "degreeCelsius" because this is specified in the instance, and the instance value overrides the model value.
+
+As the following example shows, the Property or Telemetry whose property is overridden need not be defined directly in the same Interface as the Override.
+When an Interface `extends` another Interface, the former can override a property of a `contents` element that is defined in the latter, because the `extends` property imports the Property or Telemetry into the former's `contents`.
+
+```json
+[
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2",
+      "dtmi:dtdl:extension:overriding;2"
+    ],
+    "@id": "dtmi:com:example:BaseSensor;1",
+    "@type": "Interface",
+    "contents": [
+      {
+        "@type": [ "Telemetry", "Temperature" ],
+        "name": "currentTemp",
+        "schema": "double",
+        "unit": "degreeFahrenheit"
+      }
+    ]
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2",
+      "dtmi:dtdl:extension:annotation;2",
+      "dtmi:dtdl:extension:overriding;2"
+    ],
+    "@id": "dtmi:com:example:Sensor;1",
+    "@type": "Interface",
+    "extends": "dtmi:com:example:BaseSensor;1",
+    "contents": [
+      {
+        "@type": [ "Property", "ValueAnnotation", "Override" ],
+        "name": "currentTempUnit",
+        "annotates": "currentTemp",
+        "overrides": "unit",
+        "schema": "TemperatureUnit",
+        "writable": true
+      }
+    ]
+  }
+]
+```
+
+## Changes from Version 1
+
+There are no changes from Version 1 of this extension, other than its compatibility with [DTDL v4](./DTDL.v4.md) in addition to [DTDL v3](../v3/DTDL.v3.md).
+
+## Feature versions
+
+The chart below lists the versions of the Overriding extension that are currently available.
+
+| Extension | Context | DTDL versions |
+| --- | --- | --- |
+| [Overriding v1](../v3/DTDL.overriding.v1.md) | dtmi:dtdl:extension:overriding;1 | [3](../v3/DTDL.v3.md) |
+| [Overriding v2](./DTDL.overriding.v2.md) | dtmi:dtdl:extension:overriding;2 | [3](../v3/DTDL.v3.md), [4](./DTDL.v4.md) |
+
diff --git a/DTDL/v4/DTDL.quantitativeTypes.v2.md b/DTDL/v4/DTDL.quantitativeTypes.v2.md
new file mode 100644
index 00000000..7695458d
--- /dev/null
+++ b/DTDL/v4/DTDL.quantitativeTypes.v2.md
@@ -0,0 +1,193 @@
+# QuantitativeTypes extension
+
+**Version 2**
+
+**Usable in DTDL version 4**
+
+The QuantitativeTypes extension provides a set of standard semantic types that can be applied to CommandRequests, CommandResponses, Fields, MapValues, Properties, and Telemetries.
+If a service supports the QuantitativeTypes extension, and if the QuantitativeTypes context is specified, the service recognizes and understands the semantic types, unit types, and units itemized below, as well as the `unit` property on each of the semantic types.
+
+## QuantitativeTypes context
+
+The context specifier for version 2 of the QuantitativeTypes extension is "dtmi:dtdl:extension:quantitativeTypes;2".
+
+## Semantic types and units
+
+The semantic types itemized below can co-type a CommandRequest, a CommandResponse, a Field, a MapValue, a Property, or a Telemetry in DTDL version 4.
+When a CommandRequest, CommandResponse, Field, MapValue, Property, or Telemetry is co-typed with one of these semantic types, the value of the `unit` property must be an instance of the corresponding unit type, and the value of the `schema` property must be a numeric type.
+
+Note that although most semantic types have matching unit types, there is not a strict one-to-one correspondence between semantic types and unit types.
+For example, `Humidity` is expressed using `DensityUnit`, and `Luminosity` is expressed using `PowerUnit`.
+
+The chart below itemizes semantic types, corresponding unit types, and available units for each unit type.
+
+> Note:
+The `TimeSpan` semantic type should not be confused with the `duration` schema type.
+The `duration` schema is in ISO 8601 format; it is intended for calendar durations; and it does not play well with SI units.
+The semantic unit for `TimeSpan` is `TimeUnit`, which gives temporal semantics to a numeric schema type.
+
+| Semantic type | Unit type | Unit |
+| --- | --- | --- |
+| `Acceleration` | `AccelerationUnit` | `centimetrePerSecondSquared` <br> `gForce` <br> `metrePerSecondSquared` |
+| `Angle` | `AngleUnit` | `degreeOfArc` <br> `minuteOfArc` <br> `radian` <br> `secondOfArc` <br> `turn` |
+| `AngularAcceleration` | `AngularAccelerationUnit` | `radianPerSecondSquared` |
+| `AngularVelocity` | `AngularVelocityUnit` | `degreePerSecond` <br> `radianPerSecond` <br> `revolutionPerMinute` <br> `revolutionPerSecond` |
+| `ApparentEnergy` | `ApparentEnergyUnit` | `gigavoltAmpereHour` <br> `kilovoltAmpereHour` <br> `megavoltAmpereHour` <br> `voltAmpereHour` |
+| `ApparentPower` | `ApparentPowerUnit` | `gigavoltAmpere` <br> `kilovoltAmpere` <br> `megavoltAmpere` <br> `millivoltAmpere` <br> `voltAmpere` |
+| `Area` | `AreaUnit` | `acre` <br> `hectare` <br> `squareCentimetre` <br> `squareFoot` <br> `squareInch` <br> `squareKilometre` <br> `squareMetre` <br> `squareMillimetre` |
+| `Capacitance` | `CapacitanceUnit` | `farad` <br> `microfarad` <br> `millifarad` <br> `nanofarad` <br> `picofarad` |
+| `Concentration` | `Unitless` | `partsPerBillion` <br> `partsPerMillion` <br> `partsPerQuadrillion` <br> `partsPerTrillion` <br> `percent` <br> `unity` |
+| `Current` | `CurrentUnit` | `ampere` <br> `kiloampere` <br> `microampere` <br> `milliampere` |
+| `DataRate` | `DataRateUnit` | `bitPerSecond` <br> `bytePerSecond` <br> `exbibitPerSecond` <br> `exbibytePerSecond` <br> `gibibitPerSecond` <br> `gibibytePerSecond` <br> `kibibitPerSecond` <br> `kibibytePerSecond` <br> `mebibitPerSecond` <br> `mebibytePerSecond` <br> `tebibitPerSecond` <br> `tebibytePerSecond` <br> `yobibitPerSecond` <br> `yobibytePerSecond` <br> `zebibitPerSecond` <br> `zebibytePerSecond` |
+| `DataSize` | `DataSizeUnit` | `bit` <br> `byte` <br> `exbibit` <br> `exbibyte` <br> `gibibit` <br> `gibibyte` <br> `kibibit` <br> `kibibyte` <br> `mebibit` <br> `mebibyte` <br> `tebibit` <br> `tebibyte` <br> `yobibit` <br> `yobibyte` <br> `zebibit` <br> `zebibyte` |
+| `Density` | `DensityUnit` | `gramPerCubicMetre` <br> `kilogramPerCubicMetre` <br> `microgramPerCubicMetre` <br> `milligramPerCubicMetre` |
+| `Distance` | `LengthUnit` | `astronomicalUnit` <br> `centimetre` <br> `foot` <br> `inch` <br> `kilometre` <br> `metre` <br> `micrometre` <br> `mile` <br> `millimetre` <br> `nanometre` <br> `nauticalMile` |
+| `ElectricCharge` | `ChargeUnit` | `ampereHour` <br> `coulomb` <br> `milliampereHour` |
+| `Energy` | `EnergyUnit` | `britishThermalUnit` <br> `electronvolt` <br> `gigajoule` <br> `gigawattHour` <br> `joule` <br> `kiloBritishThermalUnit` <br> `kilojoule` <br> `kilowattHour` <br> `megaelectronvolt` <br> `megajoule` <br> `megawattHour` <br> `milliwattHour` <br> `terawattHour` <br> `wattHour` |
+| `EnergyRate` | `PowerUnit` | `britishThermalUnitPerHour` <br> `gigajoulePerHour` <br> `gigawatt` <br> `horsepower` <br> `joulePerHour` <br> `joulePerSecond` <br> `kiloBritishThermalUnitPerHour` <br> `kilojoulePerHour` <br> `kilojoulePerSecond` <br> `kilowatt` <br> `kilowattHourPerYear` <br> `megajoulePerHour` <br> `megawatt` <br> `microwatt` <br> `milliwatt` <br> `tonOfRefrigeration` <br> `watt` |
+| `Force` | `ForceUnit` | `newton` <br> `ounce` <br> `pound` <br> `ton` |
+| `Frequency` | `FrequencyUnit` | `gigahertz` <br> `hertz` <br> `kilohertz` <br> `megahertz` <br> `millihertz` |
+| `Humidity` | `DensityUnit` | `gramPerCubicMetre` <br> `kilogramPerCubicMetre` <br> `microgramPerCubicMetre` <br> `milligramPerCubicMetre` |
+| `Illuminance` | `IlluminanceUnit` | `footcandle` <br> `lux` |
+| `Inductance` | `InductanceUnit` | `henry` <br> `microhenry` <br> `millihenry` |
+| `IonizingRadiationDose` | `IonizingRadiationDoseUnit` | `gray` <br> `microgray` <br> `microsievert` <br> `milligray` <br> `millisievert` <br> `sievert` |
+| `Irradiance` | `IrradianceUnit` | `wattPerSquareMetre` |
+| `Latitude` | `AngleUnit` | `degreeOfArc` <br> `minuteOfArc` <br> `radian` <br> `secondOfArc` <br> `turn` |
+| `Length` | `LengthUnit` | `astronomicalUnit` <br> `centimetre` <br> `foot` <br> `inch` <br> `kilometre` <br> `metre` <br> `micrometre` <br> `mile` <br> `millimetre` <br> `nanometre` <br> `nauticalMile` |
+| `Longitude` | `AngleUnit` | `degreeOfArc` <br> `minuteOfArc` <br> `radian` <br> `secondOfArc` <br> `turn` |
+| `Luminance` | `LuminanceUnit` | `candelaPerSquareMetre` |
+| `Luminosity` | `PowerUnit` | `britishThermalUnitPerHour` <br> `gigajoulePerHour` <br> `gigawatt` <br> `horsepower` <br> `joulePerHour` <br> `joulePerSecond` <br> `kiloBritishThermalUnitPerHour` <br> `kilojoulePerHour` <br> `kilojoulePerSecond` <br> `kilowatt` <br> `kilowattHourPerYear` <br> `megajoulePerHour` <br> `megawatt` <br> `microwatt` <br> `milliwatt` <br> `tonOfRefrigeration` <br> `watt` |
+| `LuminousFlux` | `LuminousFluxUnit` | `lumen` |
+| `LuminousIntensity` | `LuminousIntensityUnit` | `candela` |
+| `MagneticFlux` | `MagneticFluxUnit` | `maxwell` <br> `weber` |
+| `MagneticInduction` | `MagneticInductionUnit` | `gauss` <br> `tesla` |
+| `Mass` | `MassUnit` | `gram` <br> `kilogram` <br> `massPound` <br> `microgram` <br> `milligram` <br> `slug` <br> `tonne` |
+| `MassFlowRate` | `MassFlowRateUnit` | `gramPerHour` <br> `gramPerSecond` <br> `kilogramPerHour` <br> `kilogramPerSecond` <br> `massPoundPerHour` |
+| `Power` | `PowerUnit` | `britishThermalUnitPerHour` <br> `gigajoulePerHour` <br> `gigawatt` <br> `horsepower` <br> `joulePerHour` <br> `joulePerSecond` <br> `kiloBritishThermalUnitPerHour` <br> `kilojoulePerHour` <br> `kilojoulePerSecond` <br> `kilowatt` <br> `kilowattHourPerYear` <br> `megajoulePerHour` <br> `megawatt` <br> `microwatt` <br> `milliwatt` <br> `tonOfRefrigeration` <br> `watt` |
+| `Pressure` | `PressureUnit` | `bar` <br> `decapascal` <br> `hectopascal` <br> `inchesOfMercury` <br> `inchesOfWater` <br> `kilopascal` <br> `millibar` <br> `millimetresOfMercury` <br> `pascal` <br> `poundPerSquareInch` |
+| `Radioactivity` | `RadioactivityUnit` | `becquerel` <br> `gigabecquerel` <br> `kilobecquerel` <br> `megabecquerel` |
+| `ReactiveEnergy` | `ReactiveEnergyUnit` | `gigavoltAmpereReactiveHour` <br> `kilovoltAmpereReactiveHour` <br> `megavoltAmpereReactiveHour` <br> `voltAmpereReactiveHour` |
+| `ReactivePower` | `ReactivePowerUnit` | `gigavoltAmpereReactive` <br> `kilovoltAmpereReactive` <br> `megavoltAmpereReactive` <br> `millivoltAmpereReactive` <br> `voltAmpereReactive` |
+| `RelativeDensity` | `Unitless` | `partsPerBillion` <br> `partsPerMillion` <br> `partsPerQuadrillion` <br> `partsPerTrillion` <br> `percent` <br> `unity` |
+| `RelativeHumidity` | `Unitless` | `partsPerBillion` <br> `partsPerMillion` <br> `partsPerQuadrillion` <br> `partsPerTrillion` <br> `percent` <br> `unity` |
+| `Resistance` | `ResistanceUnit` | `kiloohm` <br> `megaohm` <br> `milliohm` <br> `ohm` |
+| `SoundPressure` | `SoundPressureUnit` | `bel` <br> `decibel` |
+| `Temperature` | `TemperatureUnit` | `degreeCelsius` <br> `degreeFahrenheit` <br> `kelvin` |
+| `Thrust` | `ForceUnit` | `newton` <br> `ounce` <br> `pound` <br> `ton` |
+| `TimeSpan` | `TimeUnit` | `day` <br> `hour` <br> `microsecond` <br> `millisecond` <br> `minute` <br> `nanosecond` <br> `second` <br> `year` |
+| `Torque` | `TorqueUnit` | `newtonMetre` |
+| `Velocity` | `VelocityUnit` | `centimetrePerSecond` <br> `kilometrePerHour` <br> `kilometrePerSecond` <br> `knot` <br> `metrePerHour` <br> `metrePerSecond` <br> `milePerHour` <br> `milePerSecond` |
+| `Voltage` | `VoltageUnit` | `kilovolt` <br> `megavolt` <br> `microvolt` <br> `millivolt` <br> `volt` |
+| `Volume` | `VolumeUnit` | `cubicCentimetre` <br> `cubicFoot` <br> `cubicInch` <br> `cubicMetre` <br> `fluidOunce` <br> `gallon` <br> `litre` <br> `millilitre` |
+| `VolumeFlowRate` | `VolumeFlowRateUnit` | `cubicFootPerMinute` <br> `cubicMetrePerHour` <br> `cubicMetrePerMinute` <br> `cubicMetrePerSecond` <br> `gallonPerHour` <br> `gallonPerMinute` <br> `litrePerHour` <br> `litrePerMinute` <br> `litrePerSecond` <br> `millilitrePerHour` <br> `millilitrePerMinute` <br> `millilitrePerSecond` |
+
+## Semantic type and unit examples
+
+The following example shows an Interface with four `contents` elements that are all of type Telemetry.
+
+* The element named "thermometer" has co-type Temperature and `unit` *degreeCelsius*.
+* The element named "barometer" has co-type Pressure and `unit` *millibar*.
+* The element named "humidityMeter" has co-type RelativeHumidity and `unit` *percent*.
+* The element named "anemometer" has co-type Velocity and `unit` *metrePerSecond*.
+
+One Telemetry has a `schema` value of *integer*, and the other three have `schema` values of *double*, all of which are valid since both *integer* and *double* are numeric schemas.
+
+```json
+{
+  "@context": [
+    "dtmi:dtdl:context;4",
+    "dtmi:dtdl:extension:quantitativeTypes;2"
+  ],
+  "@id": "dtmi:com:example:Sensor;1",
+  "@type": "Interface",
+  "contents": [
+    {
+      "@type": [ "Telemetry", "Temperature" ],
+      "name": "thermometer",
+      "schema": "double",
+      "unit": "degreeCelsius"
+    },
+    {
+      "@type": [ "Telemetry", "Pressure" ],
+      "name": "barometer",
+      "schema": "double",
+      "unit": "millibar"
+    },
+    {
+      "@type": [ "Telemetry", "RelativeHumidity" ],
+      "name": "humidityMeter",
+      "schema": "integer",
+      "unit": "percent"
+    },
+    {
+      "@type": [ "Telemetry", "Velocity" ],
+      "name": "anemometer",
+      "schema": "double",
+      "unit": "metrePerSecond"
+    }
+  ]
+}
+```
+
+The following example reformulates the above Interface to have a single Telemetry whose schema is an Object with four Fields.
+Each field has a name, co-type, and unit that matches one of the separate Telemetries above.
+
+```json
+{
+  "@context": [
+    "dtmi:dtdl:context;4",
+    "dtmi:dtdl:extension:quantitativeTypes;2"
+  ],
+  "@id": "dtmi:com:example:Sensor;1",
+  "@type": "Interface",
+  "contents": [
+    {
+      "@type": "Telemetry",
+      "name": "multimeter",
+      "schema": {
+        "@type": "Object",
+        "fields": [
+          {
+            "@type": [ "Field", "Temperature" ],
+            "name": "thermometer",
+            "schema": "double",
+            "unit": "degreeCelsius"
+          },
+          {
+            "@type": [ "Field", "Pressure" ],
+            "name": "barometer",
+            "schema": "double",
+            "unit": "millibar"
+          },
+          {
+            "@type": [ "Field", "RelativeHumidity" ],
+            "name": "humidityMeter",
+            "schema": "integer",
+            "unit": "percent"
+          },
+          {
+            "@type": [ "Field", "Velocity" ],
+            "name": "anemometer",
+            "schema": "double",
+            "unit": "metrePerSecond"
+          }
+        ]
+      }
+    }
+  ]
+}
+```
+
+## Changes from Version 1
+
+There are no changes from Version 1 of this extension, other than its compatibility with [DTDL v4](./DTDL.v4.md) instead of [DTDL v3](../v3/DTDL.v3.md).
+
+## Feature versions
+
+The chart below lists the versions of the QuantitativeTypes extension that are currently available.
+
+| Extension | Context | DTDL versions |
+| --- | --- | --- |
+| [QuantitativeTypes v1](../v3/DTDL.quantitativeTypes.v1.md) | dtmi:dtdl:extension:quantitativeTypes;1 | [3](../v3/DTDL.v3.md) |
+| [QuantitativeTypes v2](./DTDL.quantitativeTypes.v2.md) | dtmi:dtdl:extension:quantitativeTypes;2 | [4](./DTDL.v4.md) |
+
diff --git a/DTDL/v4/DTDL.requirement.v1.md b/DTDL/v4/DTDL.requirement.v1.md
new file mode 100644
index 00000000..1794a082
--- /dev/null
+++ b/DTDL/v4/DTDL.requirement.v1.md
@@ -0,0 +1,97 @@
+# Requirement extension
+
+**Version 1**
+
+**Usable in DTDL version 3 or 4**
+
+Requirement is a DTDL language feature for indicating that an instance of a Field must have a value.
+If a service supports the Requirement extension, it recognizes and understands the Required adjunct type if the Requirement context is specified.
+
+## Requirement context
+
+The context specifier for version 1 of the Requirement extension is "dtmi:dtdl:extension:requirement;1".
+
+## Required adjunct type
+
+The Required adjunct type can co-type a Field in DTDL version 3 or 4.
+There are no properties associated with the Required adjunct type.
+
+In the absence of a Required co-type, any field in an instance of a DTDL Object may be omitted.
+Therefore, code-generated Object structures must always allow for empty fields in the Object representation.
+Furthermore, code that uses an Object must always verify the presence of a value before reading a field, and &mdash; depending on the representation &mdash; code might require indirection to access the field value.
+
+## Requirement examples
+
+The following example shows an Interface whose `schemas` section defines an Object with two fields.
+The Object represents a two-dimensional point, which semantically requires values for both its "x" and "y" fields.
+However, since Object fields are optional, it would not be invalid for an instance of "dtmi:ex:Point2D;1" to lack values for one or both of its fields.
+
+```json
+{
+  "@context": "dtmi:dtdl:context;3",
+  "@id": "dtmi:com:example:Locator;1",
+  "@type": "Interface",
+  "schemas": [
+    {
+      "@id": "dtmi:ex:Point2D;1",
+      "@type": "Object",
+      "fields": [
+        {
+          "name": "x",
+          "schema": "double"
+        },
+        {
+          "name": "y",
+          "schema": "double"
+        }
+      ]
+    }
+  ]
+}
+```
+
+The following example enhances the above example by co-typing both fields with the adjunct type Required.
+The material type of each field is Field, and this can be inferred from the parent's type (Object) and the property name ("fields").
+However, when an adjunct type is added to an element, DTDL requires that the element also explicitly indicate its material type.
+Therefore, each field lists both type Field and type Required.
+
+```json
+{
+  "@context": [
+    "dtmi:dtdl:context;3",
+    "dtmi:dtdl:extension:requirement;1"
+  ],
+  "@id": "dtmi:com:example:Locator;1",
+  "@type": "Interface",
+  "schemas": [
+    {
+      "@id": "dtmi:ex:Point2D;1",
+      "@type": "Object",
+      "fields": [
+        {
+          "@type": [ "Field", "Required" ],
+          "name": "x",
+          "schema": "double"
+        },
+        {
+          "@type": [ "Field", "Required" ],
+          "name": "y",
+          "schema": "double"
+        }
+      ]
+    }
+  ]
+}
+```
+
+An instance of the above object must have values for both of its fields; otherwise, it would be invalid.
+This requirement appropriatly expresses the semantics of a two-dimensional point.
+
+## Feature versions
+
+The chart below lists the versions of the Requirement extension that are currently available.
+
+| Extension | Context | DTDL versions |
+| --- | --- | --- |
+| [Requirement v1](./DTDL.requirement.v1.md) | dtmi:dtdl:extension:requirement;1 | [3](../v3/DTDL.v3.md), [4](./DTDL.v4.md) |
+
diff --git a/DTDL/v4/DTDL.v4.md b/DTDL/v4/DTDL.v4.md
new file mode 100644
index 00000000..fd228fe7
--- /dev/null
+++ b/DTDL/v4/DTDL.v4.md
@@ -0,0 +1,1054 @@
+# Digital Twins Definition Language (DTDL)
+
+**Version 4**
+
+## Table of Contents
+
+* [Introduction](#introduction)
+* [Digital Twins Definition Language](#digital-twins-definition-language)
+* [Interface](#interface)
+* [Telemetry](#telemetry)
+* [Property](#property)
+* [Command](#command)
+* [Relationship](#relationship)
+* [Component](#component)
+* [Primitive schema](#primitive-schema)
+* [Array](#array)
+* [Enum](#enum)
+* [Map](#map)
+* [Object](#object)
+* [Geospatial Schemas](#geospatial-schemas)
+* [Scaled Decimal Schema](#scaled-decimal-schema)
+* [Interface schemas](#interface-schemas)
+* [Model Versioning](#model-versioning)
+* [Additional concerns](#additional-concerns)
+* [Language extensions](#language-extensions)
+* [Changes from Version 3](#changes-from-version-3)
+
+## Introduction
+
+This document describes the Digital Twins Definition Language (DTDL), a language for describing digital twin models of smart devices, assets, spaces, and environments.
+Broadly, modeling enables digital twin solutions to provision, use, and configure digital twins of all kinds from multiple sources in a single solution.
+Using DTDL to describe any digital twin's abilities enables the platform and solutions to leverage the semantics of each digital twin.
+
+## Digital Twins Definition Language
+
+Digital twins for smart devices, assets, spaces, and environments are described using a variant of JSON called JSON-LD.
+JSON-LD is designed to be usable directly as JSON as well as usable in Resource Description Framework (RDF) systems.
+RDF is a widely adopted standard for describing resources in a distributed, extensible way.
+We chose JSON-LD because it is JSON and because it is an easy-to-use language for RDF.
+Developers can use DTDL with no knowledge of RDF, but equally important, can take advantage of semantic annotations and RDF using the same entity definitions.
+
+The Digital Twins Definition Language (DTDL) is made up of a set of metamodel classes (described in the rest of this document) that are used to define the behavior of all digital twins (including devices).
+The main metamodel classes that describe these behaviors are Interface, Command, Component, Property, Relationship, and Telemetry.
+In addition, because data is a key element in digital twin solutions, DTDL provides a data description language that is compatible with popular serialization formats including JSON.
+When a digital twin is modeled using the DTDL, its behaviors are defined using these metamodel classes (Interface, Command, Component, Property, Relationship, Telemetry, and data types) and it often implements those behaviors using an SDK in terms of these metamodel classes.
+
+When writing a digital twin definition, it's necessary to specify the version of DTDL being used.
+Because DTDL is based on JSON-LD, we use the JSON-LD context (the `@context` statement) to specify the version of DTDL being used.
+For DTDL version 4, the appropriate context specifier is "dtmi:dtdl:context;4".
+See the [Context](#context) section for more details.
+
+## Interface
+
+An Interface describes the contents (Commands, Components, Properties, Relationships, and Telemetries) of any digital twin.
+Interfaces are reusable and can be reused as the schema for Components in another Interface.
+
+The text of each Interface is limited to 1 MiByte.
+This is the total number of bytes inclusive of the opening and closing curly braces for an Interface definition.
+This limit does not include the text of extended Interfaces (even if specified inline) and does not include the text of Component schema definitions (even if specified inline).
+This limit is unrelated to the size of a file in which an Interface is stored.
+A file may contain multiple Interface definitions (either nested or as siblings) and may be arbitrarily large as long as the size of each Interface definition satisfies the size limit.
+
+The chart below lists the properties that may be part of an Interface.
+
+| Property | Required | Data type | Limits | Description |
+| --- | --- | --- | --- | --- |
+| `@context` | required (at least once in the doc) | [IRI](#internationalized-resource-identifier) | max 2048 characters | The context to use when processing this Interface. For this version, it must be set to "dtmi:dtdl:context;4". |
+| `@type` | required | [IRI](#internationalized-resource-identifier) |  | This must be "Interface". |
+| `@id` | required | [DTMI](#digital-twin-model-identifier) | max 128 characters | An identifer for the Interface. |
+| `comment` | optional | *string* | max 512 characters | A comment for model authors. |
+| `contents` | optional | set of [Commands](#command), [Components](#component), [Properties](#property), [Relationships](#relationship), and [Telemetries](#telemetry) | max 100,000 elements in hierarchy, including those imported via `extends` | A set of elements that define the contents of this Interface. |
+| `description` | optional | localizable *string* | max 512 characters | A localizable description for display. |
+| `displayName` | optional | localizable *string* | max 512 characters | A localizable name for display. |
+| `extends` | optional | set of [Interfaces](#interface) | max 1024 Interfaces in hierarchy; max depth of 12 levels | A set of DTMIs that refer to Interfaces from which this Interface inherits contents. Interfaces can inherit from multiple Interfaces. |
+| `schemas` | optional | set of [Arrays](#array), [Enums](#enum), [Maps](#map), and [Objects](#object) |  | A set of complex schema objects that are reusable within this Interface. |
+
+There is a hard limit on the count of elements under the `contents` of an Interface.
+This includes not only the Commands, Components, Properties, Relationships, and Telemetries that are direct values of `contents` but also every element that is indirectly under `contents`, including Command requests and responses, all schemas, Object fields, and Map mapValues.
+The total count of all elements is limited to 100,000 per Interface.
+
+### Interface examples
+
+The following Interface example shows a thermostat device Interface.
+The Interface has one Telemetry that reports the temperature measurement, and one read/write Property that controls the desired temperature.
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:com:example:Thermostat;1",
+  "@type": "Interface",
+  "displayName": "Thermostat",
+  "contents": [
+    {
+      "@type": "Telemetry",
+      "name": "temp",
+      "schema": "double"
+    },
+    {
+      "@type": "Property",
+      "name": "setPointTemp",
+      "writable": true,
+      "schema": "double"
+    }
+  ]
+}
+```
+
+The following Interface example shows a *Phone* device that has two cameras as Components, and the *DeviceInformation* Interface as another Component.
+
+> Note that for this model to be complete and valid, Interface definitions for "dtmi:com:example:Camera;3" and "dtmi:azure:deviceManagement:DeviceInformation;1" must be provided.
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:com:example:Phone;2",
+  "@type": "Interface",
+  "displayName": "Phone",
+  "contents": [
+    {
+      "@type": "Component",
+      "name": "frontCamera",
+      "schema": "dtmi:com:example:Camera;3"
+    },
+    {
+      "@type": "Component",
+      "name": "backCamera",
+      "schema": "dtmi:com:example:Camera;3"
+    },
+    {
+      "@type": "Component",
+      "name": "deviceInfo",
+      "schema": "dtmi:azure:deviceManagement:DeviceInformation;1"
+    }
+  ]
+}
+```
+
+The following Interface example shows a digital twin model of a building that has a *name* Property and a Relationship to rooms contained in the building.
+
+> Note that unlike the example above, no definition is required for "dtmi:com:example:Room;1", because the datatype of the Relationship `target` property is DTMI, not Interface, so it has "by reference" semantics.
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:com:example:Building;1",
+  "@type": "Interface",
+  "displayName": "Building",
+  "contents": [
+    {
+      "@type": "Property",
+      "name": "name",
+      "schema": "string",
+      "writable": true
+    },
+    {
+      "@type": "Relationship",
+      "name": "contains",
+      "target": "dtmi:com:example:Room;1"
+    }
+  ]
+}
+```
+
+The following Interface example shows how Interface inheritance can be used to create specialized Interfaces from more general Interfaces by inheriting the `contents` of the latter.
+In this example, the *ConferenceRoom* Interface inherits `contents` from the *Room* Interface.
+Through inheritance, the *ConferenceRoom* has two Properties: the *occupied* Property (from *Room*) and the *capacity* Property (from *ConferenceRoom*).
+
+```json
+[
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:com:example:Room;1",
+    "@type": "Interface",
+    "contents": [
+      {
+        "@type": "Property",
+        "name": "occupied",
+        "schema": "boolean"
+      }
+    ]
+  },
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:com:example:ConferenceRoom;1",
+    "@type": "Interface",
+    "extends": "dtmi:com:example:Room;1",
+    "contents": [
+      {
+        "@type": "Property",
+        "name": "capacity",
+        "schema": "integer"
+      }
+    ]
+  }
+]
+```
+
+Inheritance designates a subtype/supertype relation between the Interfaces.
+In the example above, Interface "dtmi:com:example:Room;1" is a supertype, and "dtmi:com:example:ConferenceRoom;1" is a subtype.
+Tools and services may look at the value of the "extends" property to determine supertypes of the Interface, which may be used for additional validation or other service-specific purposes.
+
+## Telemetry
+
+Telemetry describes the data emitted by any digital twin, whether the data is a regular stream of sensor readings or a computed stream of data, such as occupancy, or an occasional alert or information message.
+
+The chart below lists the properties that Telemetry may have.
+
+| Property | Required | Data type | Limits | Description |
+| --- | --- | --- | --- | --- |
+| `@type` | required | [IRI](#internationalized-resource-identifier) |  | This must be "Telemetry". |
+| `@id` | optional | [DTMI](#digital-twin-model-identifier) | max 2048 characters | An identifer for the Telemetry. If no @id is provided, one will be assigned automatically. |
+| `comment` | optional | *string* | max 512 characters | A comment for model authors. |
+| `description` | optional | localizable *string* | max 512 characters | A localizable description for display. |
+| `displayName` | optional | localizable *string* | max 512 characters | A localizable name for display. |
+| `name` | required | *string* | max 512 characters; contains only alphanumerics and underscore, starting with a letter, ending with alphanumeric; must be unique for all contents in Interface | The programming name of the element. |
+| `schema` | required | [Schema](#schema) |  | The data type of the Telemetry, which is an instance of Schema. |
+
+### Telemetry examples
+
+The following example shows a simple Telemetry definition of a temperature measurement, with the data type *double*.
+
+```json
+{
+  "@type": "Telemetry",
+  "name": "temp",
+  "schema": "double"
+}
+```
+
+When JSON is used to serialize Telemetry data, this example shows the serialized Telemetry data for the Telemetry model definition above.
+
+```json
+"temp": 42.5
+```
+
+## Property
+
+A Property describes the read-only and read/write state of any digital twin.
+For example, a device serial number may be a read-only Property; the desired temperature on a thermostat may be a read-write Property; and the name of a room may be a read-write Property.
+
+Because digital twins are used in a distributed system, a Property not only describes the state of a digital twin, but also describes the synchronization of that state between different components that make up the distributed system.
+For example, the state of a digital twin might be written to by an application running in the cloud, but the digital twin itself is a device that only goes online once a day, so state information can only be synced and responded to when the device is online.
+Every digital twin Property has synchronization information behind it that facilitates and captures the synchronization state between the digital twin and its backing store (since this synchronization information is the same for all Properties, it is not included in the model definition).
+
+The chart below lists the properties that a DTDL Property may have.
+
+| Property | Required | Data type | Limits | Description |
+| --- | --- | --- | --- | --- |
+| `@type` | required | [IRI](#internationalized-resource-identifier) |  | This must be "Property". |
+| `@id` | optional | [DTMI](#digital-twin-model-identifier) | max 2048 characters | An identifer for the Property. If no @id is provided, one will be assigned automatically. |
+| `comment` | optional | *string* | max 512 characters | A comment for model authors. |
+| `description` | optional | localizable *string* | max 512 characters | A localizable description for display. |
+| `displayName` | optional | localizable *string* | max 512 characters | A localizable name for display. |
+| `name` | required | *string* | max 512 characters; contains only alphanumerics and underscore, starting with a letter, ending with alphanumeric; must be unique for all contents in Interface; must be unique for all properties in Relationship | The programming name of the element. |
+| `schema` | required | [Schema](#schema) |  | The data type of the Property, which is an instance of Schema. |
+| `writable` | optional | *boolean* |  | A boolean value that indicates whether the Property is writable or not. The default value is false, indicating the Property is read-only. |
+
+### Property examples
+
+The following example shows a Property definition of a writable temperature set-point, with the data type *double*.
+
+```json
+{
+  "@type": "Property",
+  "name": "setPointTemp",
+  "schema": "double",
+  "writable": true
+}
+```
+
+## Command
+
+A Command describes a function or operation that can be performed on any digital twin.
+
+The chart below lists the properties that a DTDL Command may have.
+
+| Property | Required | Data type | Limits | Description |
+| --- | --- | --- | --- | --- |
+| `@type` | required | [IRI](#internationalized-resource-identifier) |  | This must be "Command". |
+| `@id` | optional | [DTMI](#digital-twin-model-identifier) | max 2048 characters | An identifer for the Command. If no @id is provided, one will be assigned automatically. |
+| `comment` | optional | *string* | max 512 characters | A comment for model authors. |
+| `description` | optional | localizable *string* | max 512 characters | A localizable description for display. |
+| `displayName` | optional | localizable *string* | max 512 characters | A localizable name for display. |
+| `name` | required | *string* | max 512 characters; contains only alphanumerics and underscore, starting with a letter, ending with alphanumeric; must be unique for all contents in Interface | The programming name of the element. |
+| `request` | optional | [CommandRequest](#commandrequest) |  | A description of the input to the Command. |
+| `response` | optional | [CommandResponse](#commandresponse) |  | A description of the output of the Command. |
+
+### Command examples
+
+```json
+{
+  "@type": "Command",
+  "name": "reboot",
+  "request": {
+    "name": "rebootTime",
+    "displayName": "Reboot Time",
+    "description": "Requested time to reboot the device.",
+    "schema": "dateTime"
+  },
+  "response": {
+    "name": "scheduledTime",
+    "schema": "dateTime"
+  }
+}
+```
+
+### CommandRequest
+
+A CommandRequest describes the inputs to a Command.
+
+The chart below lists the properties that CommandRequest may have.
+
+| Property | Required | Data type | Limits | Description |
+| --- | --- | --- | --- | --- |
+| `@type` | optional | [IRI](#internationalized-resource-identifier) |  | If provided, must be "CommandRequest". |
+| `@id` | optional | [DTMI](#digital-twin-model-identifier) | max 2048 characters | An identifer for the CommandRequest. If no @id is provided, one will be assigned automatically. |
+| `comment` | optional | *string* | max 512 characters | A comment for model authors. |
+| `description` | optional | localizable *string* | max 512 characters | A localizable description for display. |
+| `displayName` | optional | localizable *string* | max 512 characters | A localizable name for display. |
+| `name` | required | *string* | max 512 characters; contains only alphanumerics and underscore, starting with a letter, ending with alphanumeric | The programming name of the element. |
+| `nullable` | optional | *boolean* |  | A boolean value that indicates whether the Command payload may be null. The default value is false, indicating the payload is mandatory. |
+| `schema` | required | [Schema](#schema) |  | The data type of the element, which is an instance of Schema. |
+
+### CommandResponse
+
+A CommandResponse describes the outputs from a Command.
+
+The chart below lists the properties that CommandResponse may have.
+
+| Property | Required | Data type | Limits | Description |
+| --- | --- | --- | --- | --- |
+| `@type` | optional | [IRI](#internationalized-resource-identifier) |  | If provided, must be "CommandResponse". |
+| `@id` | optional | [DTMI](#digital-twin-model-identifier) | max 2048 characters | An identifer for the CommandResponse. If no @id is provided, one will be assigned automatically. |
+| `comment` | optional | *string* | max 512 characters | A comment for model authors. |
+| `description` | optional | localizable *string* | max 512 characters | A localizable description for display. |
+| `displayName` | optional | localizable *string* | max 512 characters | A localizable name for display. |
+| `name` | required | *string* | max 512 characters; contains only alphanumerics and underscore, starting with a letter, ending with alphanumeric | The programming name of the element. |
+| `nullable` | optional | *boolean* |  | A boolean value that indicates whether the Command payload may be null. The default value is false, indicating the payload is mandatory. |
+| `schema` | required | [Schema](#schema) |  | The data type of the element, which is an instance of Schema. |
+
+## Relationship
+
+A Relationship describes a link to another digital twin and enables graphs of digital twins to be created.
+A Relationship is different from a [Component](#component) because it describes a link to a separate digital twin.
+
+The chart below lists the properties that a Relationship may have.
+
+> Note that the datatype of the `target` property is DTMI, in contrast to the datatype of the `schema` property of Component, which is Interface.
+A Component has "by value" semantics, so it is not valid unless its `schema` property identifies a valid Interface.
+A Relationship has "by reference" semantics, so its validity does not depend on the identity of its `target` property (although a Relationship with a non-Interface `target` value will have minimal utility.)
+
+| Property | Required | Data type | Limits | Description |
+| --- | --- | --- | --- | --- |
+| `@type` | required | [IRI](#internationalized-resource-identifier) |  | This must be "Relationship". |
+| `@id` | optional | [DTMI](#digital-twin-model-identifier) | max 2048 characters | An identifer for the Relationship. If no @id is provided, one will be assigned automatically. |
+| `comment` | optional | *string* | max 512 characters | A comment for model authors. |
+| `description` | optional | localizable *string* | max 512 characters | A localizable description for display. |
+| `displayName` | optional | localizable *string* | max 512 characters | A localizable name for display. |
+| `maxMultiplicity` | optional | *integer* | must be >= 1 | The maximum multiplicity for the target of the Relationship; defaults to the maximum allowable value. |
+| `minMultiplicity` | optional | *integer* | must be = 0 | The minimum multiplicity for the target of the Relationship; defaults to the minimum allowable value. |
+| `name` | required | *string* | max 512 characters; contains only alphanumerics and underscore, starting with a letter, ending with alphanumeric; must be unique for all contents in Interface | The programming name of the element. |
+| `properties` | optional | set of [Properties](#property) |  | A set of Properties that define Relationship-specific state. |
+| `target` | optional | [DTMI](#digital-twin-model-identifier) | max 2048 characters; must follow user DTMI syntax | An Interface identifier. If no target is specified, each instance target is permitted to be any Interface. |
+| `writable` | optional | *boolean* |  | A boolean value that indicates whether the Relationship is writable or not. The default value is false, indicating the Relationship is read-only. |
+
+### Relationship examples
+
+The following example defines a Relationship to be had with a *Floor* twin.
+In this example, there must be zero or one Relationship instances of floor.
+
+```json
+{
+  "@type": "Relationship",
+  "name": "floor",
+  "minMultiplicity": 0,
+  "maxMultiplicity": 1,
+  "target": "dtmi:com:example:Floor;1"
+}
+```
+
+The following example defines a general-purpose children Relationship.
+In this example, there may be 0 to unlimited children (because `minMultiplicity` and `maxMultiplicity` are not specified) of any Interface type (because `target` is not specified).
+
+```json
+{
+  "@type": "Relationship",
+  "name": "children"
+}
+```
+
+The following example defines a Relationship with a Property.
+
+```json
+{
+  "@type": "Relationship",
+  "name": "cleanedBy",
+  "target": "dtmi:com:example:Cleaner;1",
+  "properties": [
+    {
+      "@type": "Property",
+      "name": "lastCleaned",
+      "schema": "dateTime"
+    }
+  ]
+}
+```
+
+## Component
+
+Components enable Interfaces to be composed of other Interfaces.
+A Component is different from a [Relationship](#relationship) because it describes contents that are directly part of the Interface, whereas a  Relationship describes a link between two Interfaces.
+
+A Component describes the inclusion of an Interface into an Interface "by value".
+This means that cycles in Components are not allowed because the value of the Component would be infinitely big.
+
+In DTDL v4, a Component cannot contain another Component.
+
+The chart below lists the properties that a Component may have.
+
+| Property | Required | Data type | Limits | Description |
+| --- | --- | --- | --- | --- |
+| `@type` | required | [IRI](#internationalized-resource-identifier) |  | This must be "Component". |
+| `@id` | optional | [DTMI](#digital-twin-model-identifier) | max 2048 characters | An identifer for the Component. If no @id is provided, one will be assigned automatically. |
+| `comment` | optional | *string* | max 512 characters | A comment for model authors. |
+| `description` | optional | localizable *string* | max 512 characters | A localizable description for display. |
+| `displayName` | optional | localizable *string* | max 512 characters | A localizable name for display. |
+| `name` | required | *string* | max 512 characters; contains only alphanumerics and underscore, starting with a letter, ending with alphanumeric; must be unique for all contents in Interface | The programming name of the element. |
+| `schema` | required | [Interface](#interface) | may not contain nested Component in hierarchy | The data type of the Component, which is an instance of Interface. |
+
+### Component examples
+
+```json
+{
+  "@type": "Component",
+  "name": "frontCamera",
+  "schema": "dtmi:com:example:Camera;3"
+}
+```
+
+## Schema
+
+Schemas are used to describe the on-the-wire or serialized format of the data in a Digital Twin Interface.
+A full set of primitive data types are provided, along with support for a variety of complex schemas: Array, Enum, Map, and Object.
+Schemas described through Digital Twin's schema definition language are compatible with popular serialization formats, including JSON, Avro, and Protobuf.
+
+## Primitive schema
+
+A full set of primitive data types are provided and can be specified directly as the value of a schema property in a Digital Twin model.
+
+| Primitive schema | Description |
+| --- | --- |
+| `boolean` | a boolean value |
+| `byte` | a signed integral numeric value that is expressible in 1 byte |
+| `bytes` | an array of bytes |
+| `date` | a date in ISO 8601 format, per [RFC 3339](https://tools.ietf.org/html/rfc3339) |
+| `dateTime` | a date and time in ISO 8601 format, per [RFC 3339](https://tools.ietf.org/html/rfc3339) |
+| `decimal` | a string of decimal digits with an optional decimal point and fractional component, optionally preceded by a sign |
+| `double` | a finite numeric value that is expressible in IEEE 754 double-precision floating point format, conformant with the numeric range of xsd:double |
+| `duration` | a duration in ISO 8601 format |
+| `float` | a finite numeric value that is expressible in IEEE 754 single-precision floating point format, conformant with the numeric range of xsd:float |
+| `integer` | a signed integral numeric value that is expressible in 4 bytes |
+| `long` | a signed integral numeric value that is expressible in 8 bytes |
+| `short` | a signed integral numeric value that is expressible in 2 bytes |
+| `string` | a UTF8 string |
+| `time` | a time in ISO 8601 format, per [RFC 3339](https://tools.ietf.org/html/rfc3339) |
+| `unsignedByte` | an unsigned integral numeric value that is expressible in 1 byte |
+| `unsignedInteger` | an unsigned integral numeric value that is expressible in 4 bytes |
+| `unsignedLong` | an unsigned integral numeric value that is expressible in 8 bytes |
+| `unsignedShort` | an unsigned integral numeric value that is expressible in 2 bytes |
+| `uuid` | a UUID string per RFC 9562 |
+
+## Complex schema
+
+Complex schemas are designed for supporting complex data types made up of primitive data types.
+In DTDL v4, the complex schemas are [Array](#array), [Enum](#enum), [Map](#map), and [Object](#object).
+A complex schema can be specified directly as the value of a schema property or described in the Interface schemas set and referenced in a schema property.
+
+Complex schema definitions are recursive and may be self-referential.
+An Array's elementSchema may be Array, Enum, Map, Object, or any of the [primitive schema](#primitive-schema) types.
+Furthermore, the elementSchema may refer to the Array itself or to another complex schema that refers to the Array.
+The same is true for a Map's mapValue's schema and an Object's field's schema.
+For DTDL v4, the maximum depth of nested complex schemas is 8 levels.
+
+## Array
+
+An Array describes an indexable data type where each element is of the same schema.
+The schema for an Array's element can itself be a primitive or complex schema.
+
+The chart below lists the properties that an Array may have.
+
+| Property | Required | Data type | Limits | Description |
+| --- | --- | --- | --- | --- |
+| `@type` | required | [IRI](#internationalized-resource-identifier) |  | This must be "Array". |
+| `@id` | optional | [DTMI](#digital-twin-model-identifier) | max 2048 characters | An identifer for the Array. If no @id is provided, one will be assigned automatically. |
+| `comment` | optional | *string* | max 512 characters | A comment for model authors. |
+| `description` | optional | localizable *string* | max 512 characters | A localizable description for display. |
+| `displayName` | optional | localizable *string* | max 512 characters | A localizable name for display. |
+| `elementSchema` | required | [Schema](#schema) | max depth of 8 levels | The data type of each element in the Array, which is an instance of Schema. |
+
+### Array examples
+
+```json
+{
+  "@type": "Telemetry",
+  "name": "ledState",
+  "schema": {
+    "@type": "Array",
+    "elementSchema": "boolean"
+  }
+}
+```
+
+When JSON is used to serialize Array data, this example shows the serialized Array data for the Array model definition above.
+
+```json
+"ledState": [ true, true, false, true, false, true, true, false ]
+```
+
+## Enum
+
+An Enum describes a data type with a set of named labels that map to values.
+An Enum has integer or string values, and its labels are strings.
+
+The chart below lists the properties that an Enum may have.
+
+| Property | Required | Data type | Limits | Description |
+| --- | --- | --- | --- | --- |
+| `@type` | required | [IRI](#internationalized-resource-identifier) |  | This must be "Enum". |
+| `@id` | optional | [DTMI](#digital-twin-model-identifier) | max 2048 characters | An identifer for the Enum. If no @id is provided, one will be assigned automatically. |
+| `comment` | optional | *string* | max 512 characters | A comment for model authors. |
+| `description` | optional | localizable *string* | max 512 characters | A localizable description for display. |
+| `displayName` | optional | localizable *string* | max 512 characters | A localizable name for display. |
+| `enumValues` | optional | set of [EnumValues](#enumvalue) |  | A set of name/value mappings for the Enum. |
+| `valueSchema` | required | [primitive schema](#primitive-schema) | must be *integer* or *string* | The data type for the enumValues; all values must be of the same type. |
+
+### Enum examples
+
+```json
+{
+  "@type": "Telemetry",
+  "name": "state",
+  "schema": {
+    "@type": "Enum",
+    "valueSchema": "integer",
+    "enumValues": [
+      {
+        "name": "offline",
+        "displayName": "Offline",
+        "enumValue": 1
+      },
+      {
+        "name": "online",
+        "displayName": "Online",
+        "enumValue": 2
+      }
+    ]
+  }
+}
+```
+
+When JSON is used to serialize Enum data, this example shows the serialized Enum data for the Enum model definition above.
+
+```json
+"state": 2
+```
+
+### EnumValue
+
+An EnumValue describes an element of an Enum.
+
+The chart below lists the properties that an EnumValue may have.
+
+| Property | Required | Data type | Limits | Description |
+| --- | --- | --- | --- | --- |
+| `@type` | optional | [IRI](#internationalized-resource-identifier) |  | If provided, must be "EnumValue". |
+| `@id` | optional | [DTMI](#digital-twin-model-identifier) | max 2048 characters | An identifer for the EnumValue. If no @id is provided, one will be assigned automatically. |
+| `comment` | optional | *string* | max 512 characters | A comment for model authors. |
+| `description` | optional | localizable *string* | max 512 characters | A localizable description for display. |
+| `displayName` | optional | localizable *string* | max 512 characters | A localizable name for display. |
+| `enumValue` | required | literal | must be unique for all enumValues in Enum | The on-the-wire value that maps to the EnumValue, which may be either an integer or a string. |
+| `name` | required | *string* | max 512 characters; contains only alphanumerics and underscore, starting with a letter, ending with alphanumeric; must be unique for all enumValues in Enum | The programming name of the element. |
+
+## Map
+
+A Map describes a data type of key-value pairs where the values share the same schema.
+The key in a Map must be a string.
+The values in a Map can be any schema.
+
+The chart below lists the properties that a Map may have.
+
+| Property | Required | Data type | Limits | Description |
+| --- | --- | --- | --- | --- |
+| `@type` | required | [IRI](#internationalized-resource-identifier) |  | This must be "Map". |
+| `@id` | optional | [DTMI](#digital-twin-model-identifier) | max 2048 characters | An identifer for the Map. If no @id is provided, one will be assigned automatically. |
+| `comment` | optional | *string* | max 512 characters | A comment for model authors. |
+| `description` | optional | localizable *string* | max 512 characters | A localizable description for display. |
+| `displayName` | optional | localizable *string* | max 512 characters | A localizable name for display. |
+| `mapKey` | required | [MapKey](#mapkey) |  | A description of the keys in the Map. |
+| `mapValue` | required | [MapValue](#mapvalue) |  | A description of the values in the Map. |
+
+### Map examples
+
+```json
+{
+  "@type": "Property",
+  "name": "modules",
+  "writable": true,
+  "schema": {
+    "@type": "Map",
+    "mapKey": {
+      "name": "moduleName",
+      "schema": "string"
+    },
+    "mapValue": {
+      "name": "moduleState",
+      "schema": "string"
+    }
+  }
+}
+```
+
+When JSON is used to serialize Map data, this example shows the serialized Map data for the Map model definition above.
+Note that the mapKey name and mapValue name are not serialized; they are metadata.
+
+```json
+"modules": {
+  "moduleA": "running",
+  "moduleB": "stopped"
+}
+```
+
+### MapKey
+
+A MapKey describes the keys in a Map.
+The schema of a MapKey must be *string*.
+
+The chart below lists the properties that a MapKey may have.
+
+| Property | Required | Data type | Limits | Description |
+| --- | --- | --- | --- | --- |
+| `@type` | optional | [IRI](#internationalized-resource-identifier) |  | If provided, must be "MapKey". |
+| `@id` | optional | [DTMI](#digital-twin-model-identifier) | max 2048 characters | An identifer for the MapKey. If no @id is provided, one will be assigned automatically. |
+| `comment` | optional | *string* | max 512 characters | A comment for model authors. |
+| `description` | optional | localizable *string* | max 512 characters | A localizable description for display. |
+| `displayName` | optional | localizable *string* | max 512 characters | A localizable name for display. |
+| `name` | required | *string* | max 512 characters; contains only alphanumerics and underscore, starting with a letter, ending with alphanumeric | The programming name of the element. |
+| `schema` | required | [primitive schema](#primitive-schema) | must be *string* | The data type of the Map's key, which must be string. |
+
+### MapValue
+
+A MapValue describes the values in a Map.
+
+The chart below lists the properties that a MapValue may have.
+
+| Property | Required | Data type | Limits | Description |
+| --- | --- | --- | --- | --- |
+| `@type` | optional | [IRI](#internationalized-resource-identifier) |  | If provided, must be "MapValue". |
+| `@id` | optional | [DTMI](#digital-twin-model-identifier) | max 2048 characters | An identifer for the MapValue. If no @id is provided, one will be assigned automatically. |
+| `comment` | optional | *string* | max 512 characters | A comment for model authors. |
+| `description` | optional | localizable *string* | max 512 characters | A localizable description for display. |
+| `displayName` | optional | localizable *string* | max 512 characters | A localizable name for display. |
+| `name` | required | *string* | max 512 characters; contains only alphanumerics and underscore, starting with a letter, ending with alphanumeric | The programming name of the element. |
+| `schema` | required | [Schema](#schema) | max depth of 8 levels when MapValue is the value of Map `mapValue` | The data type of the element, which is an instance of Schema. |
+
+## Object
+
+An Object describes a data type made up of named fields (like a struct in C).
+The fields in an Object map can be primitive or complex schemas.
+
+The chart below lists the properties that an Object may have.
+
+| Property | Required | Data type | Limits | Description |
+| --- | --- | --- | --- | --- |
+| `@type` | required | [IRI](#internationalized-resource-identifier) |  | This must be "Object". |
+| `@id` | optional | [DTMI](#digital-twin-model-identifier) | max 2048 characters | An identifer for the Object. If no @id is provided, one will be assigned automatically. |
+| `comment` | optional | *string* | max 512 characters | A comment for model authors. |
+| `description` | optional | localizable *string* | max 512 characters | A localizable description for display. |
+| `displayName` | optional | localizable *string* | max 512 characters | A localizable name for display. |
+| `fields` | optional | set of [Fields](#field) |  | A set of field descriptions, one for each field in the Object. |
+
+### Object examples
+
+```json
+{
+  "@type": "Telemetry",
+  "name": "accelerometer",
+  "schema": {
+    "@type": "Object",
+    "fields": [
+      {
+        "name": "x",
+        "schema": "double"
+      },
+      {
+        "name": "y",
+        "schema": "double"
+      },
+      {
+        "name": "z",
+        "schema": "double"
+      }
+    ]
+  }
+}
+```
+
+When JSON is used to serialize Object data, this example shows the serialized Object data for the Object model definition above.
+
+```json
+"accelerometer": {
+  "x": 12.7,
+  "y": 5.5,
+  "z": 19.1
+}
+```
+
+### Field
+
+A Field describes a field in an Object.
+
+The chart below lists the properties that a Field may have.
+
+| Property | Required | Data type | Limits | Description |
+| --- | --- | --- | --- | --- |
+| `@type` | optional | [IRI](#internationalized-resource-identifier) |  | If provided, must be "Field". |
+| `@id` | optional | [DTMI](#digital-twin-model-identifier) | max 2048 characters | An identifer for the Field. If no @id is provided, one will be assigned automatically. |
+| `comment` | optional | *string* | max 512 characters | A comment for model authors. |
+| `description` | optional | localizable *string* | max 512 characters | A localizable description for display. |
+| `displayName` | optional | localizable *string* | max 512 characters | A localizable name for display. |
+| `name` | required | *string* | max 512 characters; contains only alphanumerics and underscore, starting with a letter, ending with alphanumeric; must be unique for all fields in Object | The programming name of the element. |
+| `schema` | required | [Schema](#schema) | max depth of 8 levels when Field is the value of Object `fields` | The data type of the element, which is an instance of Schema. |
+
+## Geospatial Schemas
+
+DTDL provides a set of geospatial schemas, based on [GeoJSON](https://geojson.org/), for modeling a variety of geographic data structures.
+
+| DTDL geospatial schema term | GeoJSON geometry type | DTDL geospatial schema IRI |
+| --- | --- | --- |
+| `lineString` | GeoJSON LineString | dtmi:standard:schema:geospatial:lineString;4 |
+| `multiLineString` | GeoJSON MultiLineString | dtmi:standard:schema:geospatial:multiLineString;4 |
+| `multiPoint` | GeoJSON MultiPoint | dtmi:standard:schema:geospatial:multiPoint;4 |
+| `multiPolygon` | GeoJSON MultiPolygon | dtmi:standard:schema:geospatial:multiPolygon;4 |
+| `point` | GeoJSON Point | dtmi:standard:schema:geospatial:point;4 |
+| `polygon` | GeoJSON Polygon | dtmi:standard:schema:geospatial:polygon;4 |
+
+### Geospatial schema examples
+
+This example shows modeling the location of a device as Telemetry using the geospatial schema `point`.
+
+```json
+{
+  "@type": "Telemetry",
+  "name": "location",
+  "schema": "point"
+}
+```
+
+A Telemetry message sent by a particular device reporting its location would have the following structure in JSON (and equivalent structure in other serializations).
+
+```json
+{
+  "location": {
+    "type": "Point",
+    "coordinates": [ 47.643742, -122.128014 ]
+  }
+}
+```
+
+## Scaled Decimal Schema
+
+The DTDL primitive schema `decimal` is able to express the complete range of arbitrary-precision decimal values, but the representation can be inefficient for very large or small values, since a string of zeros is needed to convey the scale.
+For applications that anticipate decimal values over a wide range, DTDL provides a scaled decimal schema that combines a decimal value with an explicit scale.
+The `scaledDecimal` schema type is a DTDL Object with the following fields.
+
+| Field | Data type | Description |
+| --- | --- | --- |
+| `scale` | *short* | Count of decimal places to shift `value` (positive left, negative right) to yield the scaled value. |
+| `value` | *decimal* | The significand of the scaled decimal value; not required to be integral or normalized. |
+
+### Scaled decimal schema examples
+
+This example shows modeling a measured distance as Telemetry using the `scaledDecimal` schema.
+
+```json
+{
+  "@type": "Telemetry",
+  "name": "distance",
+  "schema": "scaledDecimal"
+}
+```
+
+A Telemetry message would have the following structure in JSON (and equivalent structure in other serializations), which in this example expresses a value of 12345600000.
+
+```json
+{
+  "distance": {
+    "scale": 7,
+    "value": "1234.56"
+  }
+}
+```
+
+Note that the `value` field is a string, because the `decimal` type uses a JSON string to express an arbitrarily long numeric value.
+
+## Interface schemas
+
+Within an Interface definition, complex schemas may be defined for reusability across Telemetry, Properties, and Commands.
+This is designed to promote readability and improved maintenance because schemas that are reused can be defined once (per Interface).
+Interface schemas are defined in the `schemas` property of an Interface.
+
+Note that an inheriting Interface cannot reuse schemas defined in the Interface it `extends`, nor can an Interface in a Component reuse schemas defined in the Interface that holds the Component.
+
+The chart below lists the properties that Interface schemas may have.
+
+| Property | Required | Data type | Limits | Description |
+| --- | --- | --- | --- | --- |
+| `@type` | required | [IRI](#internationalized-resource-identifier) |  | This must be "Array", "Enum", "Map", or "Object". |
+| `@id` | required | [DTMI](#digital-twin-model-identifier) | max 2048 characters | An identifer for the complex schema. |
+| `comment` | optional | *string* | max 512 characters | A comment for model authors. |
+| `description` | optional | localizable *string* | max 512 characters | A localizable description for display. |
+| `displayName` | optional | localizable *string* | max 512 characters | A localizable name for display. |
+
+### Interface schema examples
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:com:example:ReusableTypeExample;1",
+  "@type": "Interface",
+  "contents": [
+    {
+      "@type": "Telemetry",
+      "name": "accelerometer1",
+      "schema": "dtmi:com:example:acceleration;1"
+    },
+    {
+      "@type": "Telemetry",
+      "name": "accelerometer2",
+      "schema": "dtmi:com:example:acceleration;1"
+    }
+  ],
+  "schemas": [
+    {
+      "@id": "dtmi:com:example:acceleration;1",
+      "@type": "Object",
+      "fields": [
+        {
+          "name": "x",
+          "schema": "double"
+        },
+        {
+          "name": "y",
+          "schema": "double"
+        },
+        {
+          "name": "z",
+          "schema": "double"
+        }
+      ]
+    }
+  ]
+}
+```
+
+## Model Versioning
+
+In DTDL, Interfaces are versioned by an optional one- or two-part version number in the last segment of their identifier.
+The first part of a two-part version is the major version number, and the second part is the minor version number.
+The use of the version number is up to the model author; however, it is recommended that when only the minor version is increased, the changes to the model are strictly additive.
+
+In some cases, when the model author is working closely with the code that implements and/or consumes the model, any number of changes from version to version may be acceptable.
+In other cases, when the model author is publishing an Interface to be implemented by multiple devices or digital twins or consumed by multiple consumers, compatible changes may be appropriate.
+
+## Additional concerns
+
+### Conformance with JSON and JSON-LD
+
+Unless stated otherwise in this document, the Digital Twins Definition Language conforms with the JSON and JSON-LD 1.1 specifications.
+This conformance includes things such as keywords, case sensitivity, terminology, etc.
+In particular, the JSON-LD spec states that all keys, keywords, and values in JSON-LD are case-sensitive.
+
+### Digital Twin Model Identifier
+
+All elements in digital twin models must have an identifier that is a **digital twin model identifier (DTMI)**.
+This includes Interfaces, Properties, Telemetries, Commands, Relationships, Components, complex schema objects, etc.
+This does not require that every model element have an explicit identifier, but any identifier assigned to a model element by a digital twin processor must follow this identifier format.
+
+A DTMI has three components: scheme, path, and version.
+Scheme and path are separated by a colon (*:*), while path and version are separated by a semicolon (*;*).
+The format looks like this: `<scheme> : <path> ; <version>`.
+
+The scheme is the string literal "dtmi" in lowercase.
+The path is a sequence of one or more segments, separated by colons.
+The version is a numeric value.
+
+Each path segment is a non-empty string containing only letters, digits, and underscores.
+The first character may not be a digit, and the last character may not be an underscore.
+Segments are thus representable as identifiers in all common programming languages.
+
+Segments are partitioned into user segments and system segments.
+If a segment begins with an underscore, it is a system segment; if it begins with a letter, it is a user segment.
+If a DTMI contains at least one system segment, it is a system DTMI; otherwise, it is a user DTMI.
+System DTMIs are not permitted in DTDL model documents; only user DTMIs are permitted.
+
+The version (and the preceding semicolon) may be omitted entirely.
+If present, the version is either a one-part (integer) value or a two-part (major.minor) value.
+The length of a one-part version or the major part of a two-part version is limited to nine digits, because the number 999,999,999 fits in a 32-bit signed integer value.
+The length of the minor part of a two-part version is limited to six digits, because the number 999,999,999.999,999 fits in a double-precision floating-point value.
+The first digit of a version or any part thereof may not be zero, so there is no ambiguity regarding whether version 1 matches version 01 since the latter is invalid.
+The minor part of a two-part version may not be zero, so there is no ambiguity regarding whether version 1 matches version 1.0 since the latter is invalid.
+
+Here is an example of a valid DTMI: `dtmi:foo_bar:_16:baz33:qux;12`.
+
+The path contains four segments: *foo_bar*, *_16*, *baz33*, and *qux*.
+One of the segments (*_16*) is a system segment, and therefore the identifier is a system DTMI.
+The version is 12.
+
+Equivalence of DTMIs is case-sensitive.
+
+The maximum length of a DTMI is 4096 characters.
+The maximum length of a user DTMI is 2048 characters.
+The maximum length of a DTMI for an Interface is 128 characters.
+
+Developers are encouraged to take reasonable precautions against identifier collisions.
+At a minimum, this means not using DTMIs with very short lengths or only common terms, such as `dtmi:myDevice;1`.
+
+Such identifiers are perfectly acceptable in sample documents but should never be used in definitions that are deployed in any fashion.
+
+For any definition that is the property of an organization with a registered domain name, a suggested approach to generating identifiers is to use the reversed order of domain segments as initial path segments, followed by further segments that are expected to be collectively unique among definitions within the domain.
+For example, `dtmi:com:fabrikam:industrialProducts:airQualitySensor;1`.
+
+It is also suggested that any identifers within an Interface (e.g. identifers for reusable schemas) should use a prefix from the identifier of the Interface.
+For example, an identifier for an Array of double values defined within `dtmi:com:fabrikam:industrialProducts:airQualitySensor;1` might be `dtmi:com:fabrikam:industrialProducts:airQualitySensor:doubleArray;1`.
+
+This practice will not eliminate the possibility of collisions, but it will limit accidental collisions to developers who are organizationally proximate.
+It will also simplify the process of identifying malicious definitions when there is a clear mismatch between the identifier and the account that uploaded the definition.
+
+Identifiers with the following prefixes are reserved by the DTDL language:
+
+* `dtmi:dtdl:`
+* `dtmi:standard:`
+
+For a full definition of DTMI, please see the [DTMI spec](../../DTMI/README.md).
+
+### Automatic Identifier Assignment
+
+Every element in a DTDL model is identified by a DTMI.
+If a DTMI is not indicated directly in the model via an "@id" property, an identifier is assigned automatically.
+For reference in the subseqent description, consider the following model:
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:com:example:anInterface;1",
+  "@type": "Interface",
+  "contents": [
+    {
+      "@id": "dtmi:com:example:aTelemetry;1",
+      "@type": "Telemetry",
+      "name": "currentDistance",
+      "schema": {
+        "@id": "dtmi:com:example:doubleArray;1",
+        "@type": "Array",
+        "elementSchema": "double"
+      }
+    }
+  ]
+}
+```
+
+The algorithm for determining ID values is as follows:
+
+* If a model element has an "@id" property, this value is the ID of the element. For example, the ID of the Telemetry is "dtmi:com:example:aTelemetry;1", and the ID of the Array is "dtmi:com:example:doubleArray;1".
+* If a model element does not have an "@id" property, its ID is generated from (a) its parent's ID, (b) the property connecting it to its parent, and optionally (c) its name.
+* For properties that are singular, the algorithm takes the parent's DTMI and adds one segment before the version number (or at the end if there is no version) which is the name of the property preceded by an underscore. So, if the Array above did not have the "@id" property, its ID would be "dtmi:com:example:aTelemetry:_schema;1".
+* For properties that are plural, the algorithm takes the parent's DTMI and adds two segments before the version number (or at the end if there is no version). The first added segment is the name of the property preceded by an underscore; the second added segment is the value of the "name" property preceded by two underscores. So, if the Telemetry above did not have the "@id" property, its ID would be "dtmi:com:example:anInterface:_contents:__currentDistance;1".
+* These rules apply recursively, so if neither the Telemetry nor the Array had an "@id" property, the ID of the Array would be "dtmi:com:example:anInterface:_contents:__currentDistance:_schema;1"
+
+### Internationalized Resource Identifier
+
+DTDL uses Internationalized Resource Identifiers (IRIs) to refer to DTDL language elements (such as type names) as well as model-defined elements (such as schemas).
+IRIs in DTDL are [JSON-LD IRIs](https://w3c.github.io/json-ld-syntax/#iris) and may be relative or absolute.
+
+### Display string localization
+
+Some string properties in models are meant for display and, therefore, support localization.
+Digital twin models use JSON-LD's string internationalization support for localization.
+Each localizable property (e.g. `displayName` and `description`) is defined to be a JSON-LD language map (`"@container": "@language"`).
+The keys of the language map must be language tag strings (see [BCP 47](https://www.rfc-editor.org/info/bcp47)).
+[ISO 639](https://www.loc.gov/standards/iso639-2/php/code_list.php) provides a list of language tags.
+The default language for DTDL documents is English.
+
+#### Localization examples
+
+In the following example, no language code is used for the localizable `displayName` property, so the default language English is used.
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:com:example:Thermostat;1",
+  "@type": "Interface",
+  "displayName": "Thermostat"
+}
+```
+
+In the following example, the localizable `displayName` property is localized into multiple languages.
+
+```json
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@id": "dtmi:com:example:Thermostat;1",
+  "@type": "Interface",
+  "displayName": {
+    "en": "Thermostat",
+    "it": "Termostato"
+  }
+}
+```
+
+### Context
+
+When writing a digital twin definition, it is necessary to specify the version of DTDL being used.
+Because DTDL is based on JSON-LD, you use the JSON-LD context (the `@context` statement) to specify the version of DTDL being used.
+
+For this version of DTDL, the context is exactly *dtmi:dtdl:context;4*, unless a limits context is also used.
+When a limits context is included in the context array, the appropriate DTDL context identifier is *dtmi:dtdl:context;4#limitless*, as detailed in the documentation on [limit extensions](./DTDL.Extensions.md#limit-extensions).
+
+Additional context specifiers may also be included, in particular to import definitions for [language extensions](#language-extensions) into the model.
+However, the DTDL context must always be first in the ordered list of context specifiers, with any other contexts listed subsequently.
+
+## Language extensions
+
+DTDL also supports a selection of [language extensions](./DTDL.Extensions.md), which offer additional functionality beyond what is provided by the core DTDL language.
+The chart below lists the language extensions that are currently available for use with DTDL version 4.
+
+| Extension | Category | Description |
+| --- | --- | --- |
+| [QuantitativeTypes v2](./DTDL.quantitativeTypes.v2.md) | feature | A set of standard semantic types, unit types, and units. |
+| [Historization v2](./DTDL.historization.v2.md) | feature | Record the historical sequence of values of a Property or Telemetry and the times at which values change. |
+| [Annotation v2](./DTDL.annotation.v2.md) | feature | Add custom metadata to a Property or a Telemetry. |
+| [Overriding v2](./DTDL.overriding.v2.md) | feature | Override a model property with an instance value. |
+| [MQTT v2](./DTDL.mqtt.v2.md) | feature | Specify Interface properties to facilitate communication via the MQTT pub/sub protocol. |
+| [Requirement v1](./DTDL.requirement.v1.md) | feature | Selectively designate one or more fields in an Object as required. |
+
+## Changes from Version 3
+
+* The following new [primitive schema](#primitive-schema) types have been added: byte, bytes, decimal, short, unsignedByte, unsignedInteger, unsignedLong, unsignedShort, and uuid.
+* The [scaledDecimal](#scaled-decimal-schema) schema type has been added.
+* [Complex schema](#complex-schema) definitions may now be self-referential.
+* The maximum depth of nested [complex schema](#complex-schema) definitions has increased from 5 to 8 levels
+* The maximum depth of [Interface](#interface) inheritance via a chain of `extends` properties has increased from 10 to 12 levels.
+* [CommandRequest](#commandrequest) and [CommandResponse](#commandresponse) definitions may use the new `nullable` property to indicate that a null or missing value is valid for a request or response.
+* [Limit extensions](./DTDL.Extensions.md#limit-extensions) may now be employed to increase values for one or more numerical limits on DTDL property values.
+
diff --git a/DTDL/v4/context/DTDL.FeatureExtension.annotation.v2.context.json b/DTDL/v4/context/DTDL.FeatureExtension.annotation.v2.context.json
new file mode 100644
index 00000000..b5010b52
--- /dev/null
+++ b/DTDL/v4/context/DTDL.FeatureExtension.annotation.v2.context.json
@@ -0,0 +1,4 @@
+{
+  "ValueAnnotation": { "@id": "dtmi:dtdl:extension:annotation:v2:ValueAnnotation" },
+  "annotates": { "@id": "dtmi:dtdl:extension:annotation:v2:ValueAnnotation:annotates" }
+}
diff --git a/DTDL/v4/context/DTDL.FeatureExtension.historization.v2.context.json b/DTDL/v4/context/DTDL.FeatureExtension.historization.v2.context.json
new file mode 100644
index 00000000..624b5a8e
--- /dev/null
+++ b/DTDL/v4/context/DTDL.FeatureExtension.historization.v2.context.json
@@ -0,0 +1,3 @@
+{
+  "Historized": { "@id": "dtmi:dtdl:extension:historization:v2:Historized" }
+}
diff --git a/DTDL/v4/context/DTDL.FeatureExtension.mqtt.v2.context.json b/DTDL/v4/context/DTDL.FeatureExtension.mqtt.v2.context.json
new file mode 100644
index 00000000..8da6186a
--- /dev/null
+++ b/DTDL/v4/context/DTDL.FeatureExtension.mqtt.v2.context.json
@@ -0,0 +1,16 @@
+{
+  "Mqtt": { "@id": "dtmi:dtdl:extension:mqtt:v2:Mqtt" },
+  "Idempotent": { "@id": "dtmi:dtdl:extension:mqtt:v2:Idempotent" },
+  "Transparent": { "@id": "dtmi:dtdl:extension:mqtt:v2:Transparent" },
+  "Cacheable": { "@id": "dtmi:dtdl:extension:mqtt:v2:Cacheable" },
+  "Indexed": { "@id": "dtmi:dtdl:extension:mqtt:v2:Indexed" },
+
+  "telemetryTopic": { "@id": "dtmi:dtdl:extension:mqtt:v2:Mqtt:telemetryTopic" },
+  "commandTopic": { "@id": "dtmi:dtdl:extension:mqtt:v2:Mqtt:commandTopic" },
+  "payloadFormat": { "@id": "dtmi:dtdl:extension:mqtt:v2:Mqtt:payloadFormat" },
+  "serviceGroupId": { "@id": "dtmi:dtdl:extension:mqtt:v2:Mqtt:serviceGroupId" },
+
+  "ttl": { "@id": "dtmi:dtdl:extension:mqtt:v2:Cacheable:ttl" },
+
+  "index": { "@id": "dtmi:dtdl:extension:mqtt:v2:Indexed:index" }
+}
diff --git a/DTDL/v4/context/DTDL.FeatureExtension.overriding.v2.context.json b/DTDL/v4/context/DTDL.FeatureExtension.overriding.v2.context.json
new file mode 100644
index 00000000..2dd62d8a
--- /dev/null
+++ b/DTDL/v4/context/DTDL.FeatureExtension.overriding.v2.context.json
@@ -0,0 +1,4 @@
+{
+  "Override": { "@id": "dtmi:dtdl:extension:overriding:v2:Override" },
+  "overrides": { "@id": "dtmi:dtdl:extension:overriding:v2:Override:overrides" }
+}
diff --git a/DTDL/v4/context/DTDL.FeatureExtension.quantitativeTypes.v2.context.json b/DTDL/v4/context/DTDL.FeatureExtension.quantitativeTypes.v2.context.json
new file mode 100644
index 00000000..2f2a0a32
--- /dev/null
+++ b/DTDL/v4/context/DTDL.FeatureExtension.quantitativeTypes.v2.context.json
@@ -0,0 +1,400 @@
+{
+  "RatioUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:RatioUnit" },
+  "UnitPrefix": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:UnitPrefix" },
+  "DecimalUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:DecimalUnit" },
+  "BinaryUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:BinaryUnit" },
+  "SymbolicUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:SymbolicUnit" },
+  "QuantitativeType": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:QuantitativeType" },
+
+  "DecimalPrefix": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:DecimalPrefix" },
+  "BinaryPrefix": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:BinaryPrefix" },
+
+  "Acceleration": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Acceleration" },
+  "Angle": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Angle" },
+  "AngularAcceleration": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:AngularAcceleration" },
+  "AngularVelocity": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:AngularVelocity" },
+  "ApparentEnergy": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:ApparentEnergy" },
+  "ApparentPower": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:ApparentPower" },
+  "Area": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Area" },
+  "Capacitance": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Capacitance" },
+  "Concentration": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Concentration" },
+  "Current": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Current" },
+  "DataRate": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:DataRate" },
+  "DataSize": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:DataSize" },
+  "Density": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Density" },
+  "Distance": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Distance" },
+  "ElectricCharge": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:ElectricCharge" },
+  "Energy": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Energy" },
+  "EnergyRate": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:EnergyRate" },
+  "Force": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Force" },
+  "Frequency": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Frequency" },
+  "Humidity": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Humidity" },
+  "Illuminance": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Illuminance" },
+  "Inductance": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Inductance" },
+  "IonizingRadiationDose": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:IonizingRadiationDose" },
+  "Irradiance": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Irradiance" },
+  "Latitude": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Latitude" },
+  "Longitude": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Longitude" },
+  "Length": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Length" },
+  "Luminance": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Luminance" },
+  "Luminosity": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Luminosity" },
+  "LuminousFlux": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:LuminousFlux" },
+  "LuminousIntensity": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:LuminousIntensity" },
+  "MagneticFlux": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:MagneticFlux" },
+  "MagneticInduction": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:MagneticInduction" },
+  "Mass": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Mass" },
+  "MassFlowRate": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:MassFlowRate" },
+  "Power": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Power" },
+  "Pressure": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Pressure" },
+  "Radioactivity": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Radioactivity" },
+  "ReactiveEnergy": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:ReactiveEnergy" },
+  "ReactivePower": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:ReactivePower" },
+  "RelativeDensity": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:RelativeDensity" },
+  "RelativeHumidity": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:RelativeHumidity" },
+  "Resistance": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Resistance" },
+  "SoundPressure": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:SoundPressure" },
+  "Temperature": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Temperature" },
+  "Thrust": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Thrust" },
+  "TimeSpan": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:TimeSpan" },
+  "Torque": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Torque" },
+  "Velocity": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Velocity" },
+  "Voltage": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Voltage" },
+  "Volume": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Volume" },
+  "VolumeFlowRate": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:VolumeFlowRate" },
+
+  "AccelerationUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:AccelerationUnit" },
+  "AngleUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:AngleUnit" },
+  "AngularAccelerationUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:AngularAccelerationUnit" },
+  "AngularVelocityUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:AngularVelocityUnit" },
+  "ApparentEnergyUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:ApparentEnergyUnit" },
+  "ApparentPowerUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:ApparentPowerUnit" },
+  "AreaUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:AreaUnit" },
+  "CapacitanceUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:CapacitanceUnit" },
+  "ChargeUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:ChargeUnit" },
+  "CurrentUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:CurrentUnit" },
+  "DataRateUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:DataRateUnit" },
+  "DataSizeUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:DataSizeUnit" },
+  "DensityUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:DensityUnit" },
+  "EnergyUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:EnergyUnit" },
+  "ForceUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:ForceUnit" },
+  "FrequencyUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:FrequencyUnit" },
+  "IlluminanceUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:IlluminanceUnit" },
+  "InductanceUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:InductanceUnit" },
+  "IonizingRadiationDoseUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:IonizingRadiationDoseUnit" },
+  "IrradianceUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:IrradianceUnit" },
+  "LengthUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:LengthUnit" },
+  "LuminanceUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:LuminanceUnit" },
+  "LuminousFluxUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:LuminousFluxUnit" },
+  "LuminousIntensityUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:LuminousIntensityUnit" },
+  "MagneticFluxUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:MagneticFluxUnit" },
+  "MagneticInductionUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:MagneticInductionUnit" },
+  "MassUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:MassUnit" },
+  "MassFlowRateUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:MassFlowRateUnit" },
+  "PowerUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:PowerUnit" },
+  "EnergyRateUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:PowerUnit" },
+  "PressureUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:PressureUnit" },
+  "RadioactivityUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:RadioactivityUnit" },
+  "ReactiveEnergyUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:ReactiveEnergyUnit" },
+  "ReactivePowerUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:ReactivePowerUnit" },
+  "ResistanceUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:ResistanceUnit" },
+  "SoundPressureUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:SoundPressureUnit" },
+  "TemperatureUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:TemperatureUnit" },
+  "TimeUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:TimeUnit" },
+  "TorqueUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:TorqueUnit" },
+  "Unitless": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:Unitless" },
+  "VelocityUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:VelocityUnit" },
+  "VoltageUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:VoltageUnit" },
+  "VolumeUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:VolumeUnit" },
+  "VolumeFlowRateUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:VolumeFlowRateUnit" },
+
+  "unit": {
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:property:unit",
+    "@type": "@vocab"
+  },
+  "topUnit": {
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:property:topUnit",
+    "@type": "@vocab"
+  },
+  "bottomUnit": {
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:property:bottomUnit",
+    "@type": "@vocab"
+  },
+  "baseUnit": {
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:property:baseUnit",
+    "@type": "@vocab"
+  },
+  "prefix": {
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:property:prefix",
+    "@type": "@vocab"
+  },
+
+  "deci": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:deci" },
+  "centi": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:centi" },
+  "milli": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:milli" },
+  "micro": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:micro" },
+  "nano": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:nano" },
+  "pico": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:pico" },
+  "femto": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:femto" },
+  "atto": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:atto" },
+  "zepto": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:zepto" },
+  "yocto": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:yocto" },
+  "deca": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:deca" },
+  "hecto": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:hecto" },
+  "kilo": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:kilo" },
+  "mega": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:mega" },
+  "giga": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:giga" },
+  "tera": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:tera" },
+  "peta": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:peta" },
+  "exa": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:exa" },
+  "zetta": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:zetta" },
+  "yotta": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:yotta" },
+  "kibi": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:kibi" },
+  "mebi": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:mebi" },
+  "gibi": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:gibi" },
+  "tebi": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:tebi" },
+  "pebi": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:pebi" },
+  "exbi": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:exbi" },
+  "zebi": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:zebi" },
+  "yobi": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:yobi" },
+
+  "metrePerSecondSquared": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:metrePerSecondSquared" },
+  "centimetrePerSecondSquared": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:centimetrePerSecondSquared" },
+  "gForce": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gForce" },
+  "radian": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:radian" },
+  "degreeOfArc": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:degreeOfArc" },
+  "minuteOfArc": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:minuteOfArc" },
+  "secondOfArc": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:secondOfArc" },
+  "turn": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:turn" },
+  "radianPerSecondSquared": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:radianPerSecondSquared" },
+  "radianPerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:radianPerSecond" },
+  "degreePerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:degreePerSecond" },
+  "revolutionPerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:revolutionPerSecond" },
+  "revolutionPerMinute": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:revolutionPerMinute" },
+  "voltAmpereHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:voltAmpereHour" },
+  "kilovoltAmpereHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilovoltAmpereHour" },
+  "megavoltAmpereHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megavoltAmpereHour" },
+  "gigavoltAmpereHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gigavoltAmpereHour" },
+  "voltAmpere": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:voltAmpere" },
+  "millivoltAmpere": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millivoltAmpere" },
+  "kilovoltAmpere": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilovoltAmpere" },
+  "megavoltAmpere": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megavoltAmpere" },
+  "gigavoltAmpere": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gigavoltAmpere" },
+  "squareMetre": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:squareMetre" },
+  "squareCentimetre": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:squareCentimetre" },
+  "squareMillimetre": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:squareMillimetre" },
+  "squareKilometre": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:squareKilometre" },
+  "hectare": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:hectare" },
+  "squareFoot": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:squareFoot" },
+  "squareInch": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:squareInch" },
+  "acre": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:acre" },
+  "farad": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:farad" },
+  "millifarad": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millifarad" },
+  "microfarad": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:microfarad" },
+  "nanofarad": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:nanofarad" },
+  "picofarad": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:picofarad" },
+  "coulomb": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:coulomb" },
+  "ampereHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:ampereHour" },
+  "milliampereHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:milliampereHour" },
+  "ampere": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:ampere" },
+  "microampere": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:microampere" },
+  "milliampere": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:milliampere" },
+  "kiloampere": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kiloampere" },
+  "bitPerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:bitPerSecond" },
+  "kibibitPerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kibibitPerSecond" },
+  "mebibitPerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:mebibitPerSecond" },
+  "gibibitPerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gibibitPerSecond" },
+  "tebibitPerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:tebibitPerSecond" },
+  "exbibitPerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:exbibitPerSecond" },
+  "zebibitPerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:zebibitPerSecond" },
+  "yobibitPerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:yobibitPerSecond" },
+  "bytePerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:bytePerSecond" },
+  "kibibytePerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kibibytePerSecond" },
+  "mebibytePerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:mebibytePerSecond" },
+  "gibibytePerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gibibytePerSecond" },
+  "tebibytePerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:tebibytePerSecond" },
+  "exbibytePerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:exbibytePerSecond" },
+  "zebibytePerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:zebibytePerSecond" },
+  "yobibytePerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:yobibytePerSecond" },
+  "bit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:bit" },
+  "kibibit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kibibit" },
+  "mebibit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:mebibit" },
+  "gibibit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gibibit" },
+  "tebibit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:tebibit" },
+  "exbibit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:exbibit" },
+  "zebibit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:zebibit" },
+  "yobibit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:yobibit" },
+  "byte": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:byte" },
+  "kibibyte": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kibibyte" },
+  "mebibyte": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:mebibyte" },
+  "gibibyte": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gibibyte" },
+  "tebibyte": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:tebibyte" },
+  "exbibyte": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:exbibyte" },
+  "zebibyte": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:zebibyte" },
+  "yobibyte": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:yobibyte" },
+  "kilogramPerCubicMetre": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilogramPerCubicMetre" },
+  "gramPerCubicMetre": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gramPerCubicMetre" },
+  "milligramPerCubicMetre": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:milligramPerCubicMetre" },
+  "microgramPerCubicMetre": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:microgramPerCubicMetre" },
+  "joule": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:joule" },
+  "kilojoule": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilojoule" },
+  "megajoule": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megajoule" },
+  "gigajoule": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gigajoule" },
+  "electronvolt": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:electronvolt" },
+  "megaelectronvolt": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megaelectronvolt" },
+  "wattHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:wattHour" },
+  "milliwattHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:milliwattHour" },
+  "kilowattHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilowattHour" },
+  "megawattHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megawattHour" },
+  "gigawattHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gigawattHour" },
+  "terawattHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:terawattHour" },
+  "britishThermalUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:britishThermalUnit" },
+  "kiloBritishThermalUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kiloBritishThermalUnit" },
+  "joulePerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:joulePerSecond" },
+  "kilojoulePerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilojoulePerSecond" },
+  "joulePerHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:joulePerHour" },
+  "kilojoulePerHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilojoulePerHour" },
+  "megajoulePerHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megajoulePerHour" },
+  "gigajoulePerHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gigajoulePerHour" },
+  "britishThermalUnitPerHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:britishThermalUnitPerHour" },
+  "kiloBritishThermalUnitPerHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kiloBritishThermalUnitPerHour" },
+  "newton": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:newton" },
+  "pound": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:pound" },
+  "ounce": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:ounce" },
+  "ton": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:ton" },
+  "hertz": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:hertz" },
+  "millihertz": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millihertz" },
+  "kilohertz": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilohertz" },
+  "megahertz": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megahertz" },
+  "gigahertz": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gigahertz" },
+  "lux": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:lux" },
+  "footcandle": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:footcandle" },
+  "henry": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:henry" },
+  "millihenry": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millihenry" },
+  "microhenry": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:microhenry" },
+  "gray": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gray" },
+  "milligray": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:milligray" },
+  "microgray": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:microgray" },
+  "sievert": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:sievert" },
+  "millisievert": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millisievert" },
+  "microsievert": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:microsievert" },
+  "wattPerSquareMetre": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:wattPerSquareMetre" },
+  "metre": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:metre" },
+  "centimetre": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:centimetre" },
+  "millimetre": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millimetre" },
+  "micrometre": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:micrometre" },
+  "nanometre": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:nanometre" },
+  "kilometre": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilometre" },
+  "foot": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:foot" },
+  "inch": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:inch" },
+  "mile": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:mile" },
+  "nauticalMile": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:nauticalMile" },
+  "astronomicalUnit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:astronomicalUnit" },
+  "candelaPerSquareMetre": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:candelaPerSquareMetre" },
+  "lumen": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:lumen" },
+  "candela": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:candela" },
+  "weber": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:weber" },
+  "maxwell": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:maxwell" },
+  "tesla": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:tesla" },
+  "gauss": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gauss" },
+  "kilogram": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilogram" },
+  "gram": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gram" },
+  "milligram": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:milligram" },
+  "microgram": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:microgram" },
+  "tonne": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:tonne" },
+  "slug": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:slug" },
+  "massPound": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:massPound" },
+  "gramPerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gramPerSecond" },
+  "kilogramPerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilogramPerSecond" },
+  "gramPerHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gramPerHour" },
+  "kilogramPerHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilogramPerHour" },
+  "massPoundPerHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:massPoundPerHour" },
+  "watt": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:watt" },
+  "microwatt": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:microwatt" },
+  "milliwatt": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:milliwatt" },
+  "kilowatt": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilowatt" },
+  "megawatt": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megawatt" },
+  "gigawatt": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gigawatt" },
+  "horsepower": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:horsepower" },
+  "kilowattHourPerYear": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilowattHourPerYear" },
+  "tonOfRefrigeration": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:tonOfRefrigeration" },
+  "pascal": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:pascal" },
+  "decapascal": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:decapascal" },
+  "hectopascal": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:hectopascal" },
+  "kilopascal": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilopascal" },
+  "bar": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:bar" },
+  "millibar": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millibar" },
+  "millimetresOfMercury": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millimetresOfMercury" },
+  "poundPerSquareInch": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:poundPerSquareInch" },
+  "inchesOfMercury": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:inchesOfMercury" },
+  "inchesOfWater": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:inchesOfWater" },
+  "becquerel": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:becquerel" },
+  "kilobecquerel": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilobecquerel" },
+  "megabecquerel": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megabecquerel" },
+  "gigabecquerel": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gigabecquerel" },
+  "voltAmpereReactiveHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:voltAmpereReactiveHour" },
+  "kilovoltAmpereReactiveHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilovoltAmpereReactiveHour" },
+  "megavoltAmpereReactiveHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megavoltAmpereReactiveHour" },
+  "gigavoltAmpereReactiveHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gigavoltAmpereReactiveHour" },
+  "voltAmpereReactive": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:voltAmpereReactive" },
+  "millivoltAmpereReactive": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millivoltAmpereReactive" },
+  "kilovoltAmpereReactive": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilovoltAmpereReactive" },
+  "megavoltAmpereReactive": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megavoltAmpereReactive" },
+  "gigavoltAmpereReactive": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gigavoltAmpereReactive" },
+  "ohm": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:ohm" },
+  "milliohm": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:milliohm" },
+  "kiloohm": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kiloohm" },
+  "megaohm": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megaohm" },
+  "decibel": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:decibel" },
+  "bel": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:bel" },
+  "kelvin": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kelvin" },
+  "degreeCelsius": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:degreeCelsius" },
+  "degreeFahrenheit": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:degreeFahrenheit" },
+  "second": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:second" },
+  "millisecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millisecond" },
+  "microsecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:microsecond" },
+  "nanosecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:nanosecond" },
+  "minute": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:minute" },
+  "hour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:hour" },
+  "day": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:day" },
+  "year": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:year" },
+  "unity": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:unity" },
+  "percent": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:percent" },
+  "partsPerMillion": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:partsPerMillion" },
+  "partsPerBillion": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:partsPerBillion" },
+  "partsPerTrillion": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:partsPerTrillion" },
+  "partsPerQuadrillion": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:partsPerQuadrillion" },
+  "newtonMetre": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:newtonMetre" },
+  "metrePerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:metrePerSecond" },
+  "centimetrePerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:centimetrePerSecond" },
+  "kilometrePerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilometrePerSecond" },
+  "metrePerHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:metrePerHour" },
+  "kilometrePerHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilometrePerHour" },
+  "milePerHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:milePerHour" },
+  "milePerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:milePerSecond" },
+  "knot": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:knot" },
+  "volt": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:volt" },
+  "millivolt": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millivolt" },
+  "microvolt": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:microvolt" },
+  "kilovolt": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilovolt" },
+  "megavolt": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megavolt" },
+  "cubicMetre": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:cubicMetre" },
+  "cubicCentimetre": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:cubicCentimetre" },
+  "litre": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:litre" },
+  "millilitre": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millilitre" },
+  "cubicFoot": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:cubicFoot" },
+  "cubicInch": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:cubicInch" },
+  "fluidOunce": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:fluidOunce" },
+  "gallon": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gallon" },
+  "litrePerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:litrePerSecond" },
+  "millilitrePerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millilitrePerSecond" },
+  "litrePerMinute": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:litrePerMinute" },
+  "millilitrePerMinute": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millilitrePerMinute" },
+  "litrePerHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:litrePerHour" },
+  "millilitrePerHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millilitrePerHour" },
+  "gallonPerMinute": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gallonPerMinute" },
+  "gallonPerHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gallonPerHour" },
+  "cubicFootPerMinute": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:cubicFootPerMinute" },
+  "cubicMetrePerHour": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:cubicMetrePerHour" },
+  "cubicMetrePerMinute": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:cubicMetrePerMinute" },
+  "cubicMetrePerSecond": { "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:cubicMetrePerSecond" }
+}
diff --git a/DTDL/v4/context/DTDL.FeatureExtension.requirement.v1.context.json b/DTDL/v4/context/DTDL.FeatureExtension.requirement.v1.context.json
new file mode 100644
index 00000000..777c29bc
--- /dev/null
+++ b/DTDL/v4/context/DTDL.FeatureExtension.requirement.v1.context.json
@@ -0,0 +1,3 @@
+{
+  "Required": { "@id": "dtmi:dtdl:extension:requirement:v1:Required" }
+}
diff --git a/DTDL/v4/context/DTDL.v4.context.json b/DTDL/v4/context/DTDL.v4.context.json
new file mode 100644
index 00000000..3ec3fe83
--- /dev/null
+++ b/DTDL/v4/context/DTDL.v4.context.json
@@ -0,0 +1,265 @@
+{
+  "@vocab": "http://azure.com/DigitalTwins/MetaModel/undefinedTerm/",
+  "dtmm": "http://azure.com/DigitalTwins/MetaModel/",
+  "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+  "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
+  "xsd": "http://www.w3.org/2001/XMLSchema#",
+  "sh": "http://www.w3.org/ns/shacl#",
+  "rdfs:Class": { "@type": "@vocab" },
+  "rdfs:subClassOf": { "@type": "@vocab" },
+  "rdfs:domain": { "@type": "@vocab" },
+  "sh:targetClass": { "@type": "@vocab" },
+  "sh:datatype": { "@type": "@vocab" },
+  "sh:lessThan": { "@type": "@vocab" },
+  "sh:lessThanOrEquals": { "@type": "@vocab" },
+  "sh:class": { "@type": "@vocab" },
+  "sh:nodeKind": { "@type": "@vocab" },
+  "sh:path": {
+    "@type": "@vocab",
+    "@container": "@list"
+  },
+  "sh:in": {
+    "@type": "@vocab",
+    "@container": "@list"
+  },
+  "sh:and": { "@container": "@list" },
+  "sh:or": { "@container": "@list" },
+  "sh:not": { "@type": "@vocab" },
+  "sh:alternativePath": {
+    "@type": "@vocab",
+    "@container": "@list"
+  },
+  "sh:inversePath": { "@type": "@vocab" },
+  "sh:zeroOrMorePath": { "@type": "@vocab" },
+  "sh:oneOrMorePath": { "@type": "@vocab" },
+  "sh:zeroOrOnePath": { "@type": "@vocab" },
+  "sh:ignoredProperties": {
+    "@type": "@vocab",
+    "@container": "@list"
+  },
+  "dtmm:aka": { "@type": "@vocab" },
+  "dtmm:asCotype": { "@type": "@vocab" },
+  "dtmm:asProperty": { "@type": "@vocab" },
+  "dtmm:breakoutSubtypes": {
+    "@type": "@vocab",
+    "@container": "@list"
+  },
+  "dtmm:childOf": { "@type": "@vocab" },
+  "dtmm:childProperties": {
+    "@type": "@vocab",
+    "@container": "@list"
+  },
+  "dtmm:classOfProperty": { "@type": "@vocab" },
+  "dtmm:datatypeProperty": { "@type": "@vocab" },
+  "dtmm:description": {
+    "@container": "@language",
+    "@language": "en-US"
+  },
+  "dtmm:dictionaryKey": { "@type": "@vocab" },
+  "dtmm:dtmiSegment": { "@type": "@vocab" },
+  "dtmm:excludeType": { "@type": "@vocab" },
+  "dtmm:hasValue": { "@type": "@vocab" },
+  "dtmm:importProperties": {
+    "@type": "@vocab",
+    "@container": "@list"
+  },
+  "dtmm:instanceProperty": {
+    "@type": "@vocab",
+    "@container": "@list"
+  },
+  "dtmm:jsonType": { "@type": "@vocab" },
+  "dtmm:keyProperty": { "@type": "@vocab" },
+  "dtmm:keyrefProperty": { "@type": "@vocab" },
+  "dtmm:path": { "@type": "@vocab" },
+  "dtmm:refersToProperty": { "@type": "@vocab" },
+  "dtmm:parentOfProperty": { "@type": "@vocab" },
+  "dtmm:patternDesc": {
+    "@container": "@language",
+    "@language": "en-US"
+  },
+  "dtmm:properties": {
+    "@type": "@vocab",
+    "@container": "@list"
+  },
+  "dtmm:relation": { "@type": "@vocab" },
+  "dtmm:reservedPrefix": { "@container": "@list" },
+  "dtmm:uniqueProperties": {
+    "@type": "@vocab",
+    "@container": "@list"
+  },
+
+  "DtdlExtension": { "@id": "dtmi:dtdl:meta:DtdlExtension;4" },
+  "metamodel": { "@id": "dtmi:dtdl:meta:metamodel;4" },
+  "model": { "@id": "dtmi:dtdl:meta:model;4" },
+
+  "AdjunctType": { "@id": "dtmi:dtdl:class:AdjunctType;4" },
+  "Alias": { "@id": "dtmi:dtdl:class:Alias;4" },
+  "Array": { "@id": "dtmi:dtdl:class:Array;4" },
+  "Boolean": { "@id": "dtmi:dtdl:class:Boolean;4" },
+  "Byte": { "@id": "dtmi:dtdl:class:Byte;4" },
+  "Bytes": { "@id": "dtmi:dtdl:class:Bytes;4" },
+  "ComplexSchema": { "@id": "dtmi:dtdl:class:ComplexSchema;4" },
+  "Command": { "@id": "dtmi:dtdl:class:Command;4" },
+  "CommandPayload": { "@id": "dtmi:dtdl:class:CommandPayload;4" },
+  "CommandRequest": { "@id": "dtmi:dtdl:class:CommandRequest;4" },
+  "CommandResponse": { "@id": "dtmi:dtdl:class:CommandResponse;4" },
+  "CommandType": { "@id": "dtmi:dtdl:class:CommandType;4" },
+  "Component": { "@id": "dtmi:dtdl:class:Component;4" },
+  "Content": { "@id": "dtmi:dtdl:class:Content;4" },
+  "Date": { "@id": "dtmi:dtdl:class:Date;4" },
+  "DateTime": { "@id": "dtmi:dtdl:class:DateTime;4" },
+  "Decimal": { "@id": "dtmi:dtdl:class:Decimal;4" },
+  "Double": { "@id": "dtmi:dtdl:class:Double;4" },
+  "Duration": { "@id": "dtmi:dtdl:class:Duration;4" },
+  "Entity": { "@id": "dtmi:dtdl:class:Entity;4" },
+  "Enum": { "@id": "dtmi:dtdl:class:Enum;4" },
+  "EnumValue": { "@id": "dtmi:dtdl:class:EnumValue;4" },
+  "Field": { "@id": "dtmi:dtdl:class:Field;4" },
+  "Float": { "@id": "dtmi:dtdl:class:Float;4" },
+  "Integer": { "@id": "dtmi:dtdl:class:Integer;4" },
+  "Interface": { "@id": "dtmi:dtdl:class:Interface;4" },
+  "LatentType": { "@id": "dtmi:dtdl:class:LatentType;4" },
+  "Long": { "@id": "dtmi:dtdl:class:Long;4" },
+  "Map": { "@id": "dtmi:dtdl:class:Map;4" },
+  "MapKey": { "@id": "dtmi:dtdl:class:MapKey;4" },
+  "MapValue": { "@id": "dtmi:dtdl:class:MapValue;4" },
+  "NamedEntity": { "@id": "dtmi:dtdl:class:NamedEntity;4" },
+  "NamedLatentType": { "@id": "dtmi:dtdl:class:NamedLatentType;4" },
+  "NumericSchema": { "@id": "dtmi:dtdl:class:NumericSchema;4" },
+  "Object": { "@id": "dtmi:dtdl:class:Object;4" },
+  "PrimitiveSchema": { "@id": "dtmi:dtdl:class:PrimitiveSchema;4" },
+  "Property": { "@id": "dtmi:dtdl:class:Property;4" },
+  "Relationship": { "@id": "dtmi:dtdl:class:Relationship;4" },
+  "Schema": { "@id": "dtmi:dtdl:class:Schema;4" },
+  "SchemaField": { "@id": "dtmi:dtdl:class:SchemaField;4" },
+  "SemanticType": { "@id": "dtmi:dtdl:class:SemanticType;4" },
+  "SemanticUnit": { "@id": "dtmi:dtdl:class:SemanticUnit;4" },
+  "Short": { "@id": "dtmi:dtdl:class:Short;4" },
+  "String": { "@id": "dtmi:dtdl:class:String;4" },
+  "Telemetry": { "@id": "dtmi:dtdl:class:Telemetry;4" },
+  "TemporalSchema": { "@id": "dtmi:dtdl:class:TemporalSchema;4" },
+  "Time": { "@id": "dtmi:dtdl:class:Time;4" },
+  "Unit": { "@id": "dtmi:dtdl:class:Unit;4" },
+  "UnsignedByte": { "@id": "dtmi:dtdl:class:UnsignedByte;4" },
+  "UnsignedInteger": { "@id": "dtmi:dtdl:class:UnsignedInteger;4" },
+  "UnsignedLong": { "@id": "dtmi:dtdl:class:UnsignedLong;4" },
+  "UnsignedShort": { "@id": "dtmi:dtdl:class:UnsignedShort;4" },
+  "UnitAttribute": { "@id": "dtmi:dtdl:class:UnitAttribute;4" },
+  "Uuid": { "@id": "dtmi:dtdl:class:Uuid;4" },
+
+  "aliasFor": {
+    "@id": "dtmi:dtdl:property:aliasFor;4",
+    "@type": "@vocab"
+  },
+  "commandType": {
+    "@id": "dtmi:dtdl:property:commandType;4",
+    "@type": "@vocab"
+  },
+  "comment": { "@id": "dtmi:dtdl:property:comment;4" },
+  "contents": {
+    "@id": "dtmi:dtdl:property:contents;4",
+    "@type": "@vocab"
+  },
+  "description": {
+    "@id": "dtmi:dtdl:property:description;4",
+    "@container": "@language",
+    "@language": "en"
+  },
+  "displayName": {
+    "@id": "dtmi:dtdl:property:displayName;4",
+    "@container": "@language",
+    "@language": "en"
+  },
+  "elementSchema": {
+    "@id": "dtmi:dtdl:property:elementSchema;4",
+    "@type": "@vocab"
+  },
+  "enumValue": { "@id": "dtmi:dtdl:property:enumValue;4" },
+  "enumValues": {
+    "@id": "dtmi:dtdl:property:enumValues;4",
+    "@type": "@vocab"
+  },
+  "exponent": { "@id": "dtmi:dtdl:property:exponent;4" },
+  "extends": {
+    "@id": "dtmi:dtdl:property:extends;4",
+    "@type": "@vocab"
+  },
+  "fields": {
+    "@id": "dtmi:dtdl:property:fields;4",
+    "@type": "@vocab"
+  },
+  "languageMajorVersion": { "@id": "dtmi:dtdl:property:languageMajorVersion;4" },
+  "mapKey": {
+    "@id": "dtmi:dtdl:property:mapKey;4",
+    "@type": "@vocab"
+  },
+  "mapValue": {
+    "@id": "dtmi:dtdl:property:mapValue;4",
+    "@type": "@vocab"
+  },
+  "maxMultiplicity": { "@id": "dtmi:dtdl:property:maxMultiplicity;4" },
+  "minMultiplicity": { "@id": "dtmi:dtdl:property:minMultiplicity;4" },
+  "name": { "@id": "dtmi:dtdl:property:name;4" },
+  "nullable": { "@id": "dtmi:dtdl:property:nullable;4" },
+  "properties": {
+    "@id": "dtmi:dtdl:property:properties;4",
+    "@type": "@vocab"
+  },
+  "request": {
+    "@id": "dtmi:dtdl:property:request;4",
+    "@type": "@vocab"
+  },
+  "response": {
+    "@id": "dtmi:dtdl:property:response;4",
+    "@type": "@vocab"
+  },
+  "schema": {
+    "@id": "dtmi:dtdl:property:schema;4",
+    "@type": "@vocab"
+  },
+  "schemas": {
+    "@id": "dtmi:dtdl:property:schemas;4",
+    "@type": "@vocab"
+  },
+  "symbol": { "@id": "dtmi:dtdl:property:symbol;4" },
+  "target": {
+    "@id": "dtmi:dtdl:property:target;4",
+    "@type": "@vocab"
+  },
+  "valueSchema": {
+    "@id": "dtmi:dtdl:property:valueSchema;4",
+    "@type": "@vocab"
+  },
+  "writable": { "@id": "dtmi:dtdl:property:writable;4" },
+
+  "asynchronous": { "@id": "dtmi:dtdl:instance:CommandType:asynchronous;4" },
+  "synchronous": { "@id": "dtmi:dtdl:instance:CommandType:synchronous;4" },
+  "boolean": { "@id": "dtmi:dtdl:instance:Schema:boolean;4" },
+  "byte": { "@id": "dtmi:dtdl:instance:Schema:byte;4" },
+  "bytes": { "@id": "dtmi:dtdl:instance:Schema:bytes;4" },
+  "date": { "@id": "dtmi:dtdl:instance:Schema:date;4" },
+  "dateTime": { "@id": "dtmi:dtdl:instance:Schema:dateTime;4" },
+  "decimal": { "@id": "dtmi:dtdl:instance:Schema:decimal;4" },
+  "double": { "@id": "dtmi:dtdl:instance:Schema:double;4" },
+  "duration": { "@id": "dtmi:dtdl:instance:Schema:duration;4" },
+  "float": { "@id": "dtmi:dtdl:instance:Schema:float;4" },
+  "integer": { "@id": "dtmi:dtdl:instance:Schema:integer;4" },
+  "long": { "@id": "dtmi:dtdl:instance:Schema:long;4" },
+  "short": { "@id": "dtmi:dtdl:instance:Schema:short;4" },
+  "string": { "@id": "dtmi:dtdl:instance:Schema:string;4" },
+  "time": { "@id": "dtmi:dtdl:instance:Schema:time;4" },
+  "unsignedByte": { "@id": "dtmi:dtdl:instance:Schema:unsignedByte;4" },
+  "unsignedInteger": { "@id": "dtmi:dtdl:instance:Schema:unsignedInteger;4" },
+  "unsignedLong": { "@id": "dtmi:dtdl:instance:Schema:unsignedLong;4" },
+  "unsignedShort": { "@id": "dtmi:dtdl:instance:Schema:unsignedShort;4" },
+  "uuid": { "@id": "dtmi:dtdl:instance:Schema:uuid;4" },
+
+  "point": { "@id": "dtmi:standard:schema:geospatial:point;4" },
+  "multiPoint": { "@id": "dtmi:standard:schema:geospatial:multiPoint;4" },
+  "lineString": { "@id": "dtmi:standard:schema:geospatial:lineString;4" },
+  "multiLineString": { "@id": "dtmi:standard:schema:geospatial:multiLineString;4" },
+  "polygon": { "@id": "dtmi:standard:schema:geospatial:polygon;4" },
+  "multiPolygon": { "@id": "dtmi:standard:schema:geospatial:multiPolygon;4" },
+
+  "scaledDecimal": { "@id": "dtmi:standard:schema:scaledDecimal;4" }
+}
diff --git a/DTDL/v4/metamodel/DTDL.FeatureExtension.annotation.v2.RDF-SHACL.json b/DTDL/v4/metamodel/DTDL.FeatureExtension.annotation.v2.RDF-SHACL.json
new file mode 100644
index 00000000..96e6041b
--- /dev/null
+++ b/DTDL/v4/metamodel/DTDL.FeatureExtension.annotation.v2.RDF-SHACL.json
@@ -0,0 +1,58 @@
+{
+  "@context": [
+    "dtmi:dtdl:context;4",
+    "dtmi:dtdl:extension:annotation;2"
+  ],
+  "@graph": [
+    {
+      "@id": "dtmi:dtdl:extension:annotation:v2:documentation",
+      "@type": [ "dtmm:Documentation" ],
+      "dtmm:description": {
+        "en-US": "Add custom metadata to a Property or a Telemetry."
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:extension:annotation:v2:ValueAnnotation",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "AdjunctType",
+      "sh:or": [
+        { "sh:class": "dtmi:dtdl:class:Property;3" },
+        { "sh:class": "dtmi:dtdl:class:Property;4" },
+        { "sh:class": "dtmi:dtdl:class:Telemetry;3" },
+        { "sh:class": "dtmi:dtdl:class:Telemetry;4" }
+      ],
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:extension:annotation:v2:ValueAnnotation:annotates",
+          "@type": "rdf:Property",
+          "rdfs:domain": "ValueAnnotation"
+        }
+      ],
+      "sh:property": [
+        {
+          "sh:path": "annotates",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:datatype": "xsd:string",
+          "sh:nodeKind": "sh:Literal",
+          "dtmm:description": {
+            "en-US": "Name of a Property or Telemetry that is annotated."
+          }
+        }
+      ],
+      "dtmm:siblings": [
+        {
+          "dtmm:keyProperty": "name",
+          "dtmm:keyrefProperty": "annotates",
+          "sh:or": [
+            { "sh:class": "dtmi:dtdl:class:Property;3" },
+            { "sh:class": "dtmi:dtdl:class:Property;4" },
+            { "sh:class": "dtmi:dtdl:class:Telemetry;3" },
+            { "sh:class": "dtmi:dtdl:class:Telemetry;4" }
+          ],
+          "sh:not": { "sh:class": "ValueAnnotation" }
+        }
+      ]
+    }
+  ]
+}
diff --git a/DTDL/v4/metamodel/DTDL.FeatureExtension.historization.v2.RDF-SHACL.json b/DTDL/v4/metamodel/DTDL.FeatureExtension.historization.v2.RDF-SHACL.json
new file mode 100644
index 00000000..ab8821a4
--- /dev/null
+++ b/DTDL/v4/metamodel/DTDL.FeatureExtension.historization.v2.RDF-SHACL.json
@@ -0,0 +1,26 @@
+{
+  "@context": [
+    "dtmi:dtdl:context;4",
+    "dtmi:dtdl:extension:historization;2"
+  ],
+  "@graph": [
+    {
+      "@id": "dtmi:dtdl:extension:historization:v2:documentation",
+      "@type": [ "dtmm:Documentation" ],
+      "dtmm:description": {
+        "en-US": "Record the historical sequence of values of a Property or Telemetry and the times at which values change."
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:extension:historization:v2:Historized",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "AdjunctType",
+      "sh:or": [
+        { "sh:class": "dtmi:dtdl:class:Property;3" },
+        { "sh:class": "dtmi:dtdl:class:Property;4" },
+        { "sh:class": "dtmi:dtdl:class:Telemetry;3" },
+        { "sh:class": "dtmi:dtdl:class:Telemetry;4" }
+      ]
+    }
+  ]
+}
diff --git a/DTDL/v4/metamodel/DTDL.FeatureExtension.mqtt.v2.RDF-SHACL.json b/DTDL/v4/metamodel/DTDL.FeatureExtension.mqtt.v2.RDF-SHACL.json
new file mode 100644
index 00000000..bf02e4da
--- /dev/null
+++ b/DTDL/v4/metamodel/DTDL.FeatureExtension.mqtt.v2.RDF-SHACL.json
@@ -0,0 +1,189 @@
+{
+  "@context": [
+    "dtmi:dtdl:context;4",
+    "dtmi:dtdl:extension:mqtt;2"
+  ],
+  "@graph": [
+    {
+      "@id": "dtmi:dtdl:extension:mqtt:v2:documentation",
+      "@type": [ "dtmm:Documentation" ],
+      "dtmm:description": {
+        "en-US": "Specify Interface properties to facilitate communication via the MQTT pub/sub protocol."
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:extension:mqtt:v2:Mqtt",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "AdjunctType",
+      "sh:or": [
+        { "sh:class": "dtmi:dtdl:class:Interface;3" },
+        { "sh:class": "dtmi:dtdl:class:Interface;4" }
+      ],
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:extension:mqtt:v2:Mqtt:telemetryTopic",
+          "@type": "rdf:Property",
+          "rdfs:domain": "Mqtt"
+        },
+        {
+          "@id": "dtmi:dtdl:extension:mqtt:v2:Mqtt:commandTopic",
+          "@type": "rdf:Property",
+          "rdfs:domain": "Mqtt"
+        },
+        {
+          "@id": "dtmi:dtdl:extension:mqtt:v2:Mqtt:payloadFormat",
+          "@type": "rdf:Property",
+          "rdfs:domain": "Mqtt"
+        },
+        {
+          "@id": "dtmi:dtdl:extension:mqtt:v2:Mqtt:serviceGroupId",
+          "@type": "rdf:Property",
+          "rdfs:domain": "Mqtt"
+        }
+      ],
+      "sh:property": [
+        {
+          "sh:path": "telemetryTopic",
+          "sh:maxCount": 1,
+          "sh:datatype": "xsd:string",
+          "sh:nodeKind": "sh:Literal",
+          "sh:pattern": "^(?:(?:[!%-*,-.0-z|~][!$-*,-.0-z|~]*)|(?:{(?:[A-Za-z]+:)?[A-Za-z]+}))(?:\\/(?:(?:[!$-*,-.0-z|~]+)|(?:{(?:[A-Za-z]+:)?[A-Za-z]+})))*$",
+          "dtmm:patternDesc": {
+            "en-US": "slash-separated sequence of character-restricted labels and/or brace-enclosed tokens"
+          },
+          "dtmm:description": {
+            "en-US": "MQTT topic pattern on which a Telemetry or a collection of Telemetries is published."
+          }
+        },
+        {
+          "sh:path": "commandTopic",
+          "sh:maxCount": 1,
+          "sh:datatype": "xsd:string",
+          "sh:nodeKind": "sh:Literal",
+          "sh:pattern": "^(?:(?:[!%-*,-.0-z|~][!$-*,-.0-z|~]*)|(?:{(?:[A-Za-z]+:)?[A-Za-z]+}))(?:\\/(?:(?:[!$-*,-.0-z|~]+)|(?:{(?:[A-Za-z]+:)?[A-Za-z]+})))*$",
+          "dtmm:patternDesc": {
+            "en-US": "slash-separated sequence of character-restricted labels and/or brace-enclosed tokens"
+          },
+          "dtmm:description": {
+            "en-US": "MQTT topic pattern on which a Command request is published."
+          }
+        },
+        {
+          "sh:path": "payloadFormat",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:datatype": "xsd:string",
+          "sh:nodeKind": "sh:Literal",
+          "dtmm:description": {
+            "en-US": "The format to use when serializing an instance to an MQTT payload."
+          }
+        },
+        {
+          "sh:path": "serviceGroupId",
+          "sh:maxCount": 1,
+          "sh:datatype": "xsd:string",
+          "sh:nodeKind": "sh:Literal",
+          "sh:pattern": "^[!$-*,-.0-z|~]+$",
+          "dtmm:patternDesc": {
+            "en-US": "non-empty string of printable ASCII characters not including space, \", +, #, {, }, or /"
+          },
+          "dtmm:description": {
+            "en-US": "The service group ID for subscribing to Command topics when shared subscriptions are wanted."
+          }
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:mqtt:v2:Transparent",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "AdjunctType",
+      "sh:or": [
+        { "sh:class": "dtmi:dtdl:class:CommandPayload;3" },
+        { "sh:class": "dtmi:dtdl:class:CommandPayload;4" }
+      ],
+      "sh:property": [
+        {
+          "sh:path": "schema",
+          "sh:or": [
+            { "sh:class": "dtmi:dtdl:class:Object;3" },
+            { "sh:class": "dtmi:dtdl:class:Object;4" }
+          ]
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:mqtt:v2:Idempotent",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "AdjunctType",
+      "sh:or": [
+        { "sh:class": "dtmi:dtdl:class:Command;3" },
+        { "sh:class": "dtmi:dtdl:class:Command;4" }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:mqtt:v2:Cacheable",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "AdjunctType",
+      "sh:or": [
+        { "sh:class": "dtmi:dtdl:class:Command;3" },
+        { "sh:class": "dtmi:dtdl:class:Command;4" }
+      ],
+      "sh:and": [
+        { "sh:class": "Idempotent" }
+      ],
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:extension:mqtt:v2:Cacheable:ttl",
+          "@type": "rdf:Property",
+          "rdfs:domain": "Cacheable"
+        }
+      ],
+      "sh:property": [
+        {
+          "sh:path": "ttl",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:datatype": "xsd:duration",
+          "sh:nodeKind": "sh:Literal",
+          "dtmm:description": {
+            "en-US": "Maximum duration for which a response to a Command instance may be reused as a response to other Command instances."
+          }
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:mqtt:v2:Indexed",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "AdjunctType",
+      "sh:or": [
+        { "sh:class": "dtmi:dtdl:class:Telemetry;3" },
+        { "sh:class": "dtmi:dtdl:class:Telemetry;4" },
+        { "sh:class": "dtmi:dtdl:class:Field;3" },
+        { "sh:class": "dtmi:dtdl:class:Field;4" },
+        { "sh:class": "dtmi:dtdl:class:EnumValue;3" },
+        { "sh:class": "dtmi:dtdl:class:EnumValue;4" }
+      ],
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:extension:mqtt:v2:Indexed:index",
+          "@type": "rdf:Property",
+          "rdfs:domain": "Indexed"
+        }
+      ],
+      "sh:property": [
+        {
+          "sh:path": "index",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:datatype": "xsd:integer",
+          "sh:nodeKind": "sh:Literal",
+          "sh:minInclusive": 1,
+          "dtmm:uniqueValue": true,
+          "dtmm:description": {
+            "en-US": "Index number to uniquely identify the serialized element within its parent container."
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/DTDL/v4/metamodel/DTDL.FeatureExtension.overriding.v2.RDF-SHACL.json b/DTDL/v4/metamodel/DTDL.FeatureExtension.overriding.v2.RDF-SHACL.json
new file mode 100644
index 00000000..072147df
--- /dev/null
+++ b/DTDL/v4/metamodel/DTDL.FeatureExtension.overriding.v2.RDF-SHACL.json
@@ -0,0 +1,76 @@
+{
+  "@context": [
+    "dtmi:dtdl:context;4",
+    "dtmi:dtdl:extension:annotation;2",
+    "dtmi:dtdl:extension:overriding;2"
+  ],
+  "@graph": [
+    {
+      "@id": "dtmi:dtdl:extension:overriding:v2:documentation",
+      "@type": [ "dtmm:Documentation" ],
+      "dtmm:description": {
+        "en-US": "Override a model property with an instance value."
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:extension:overriding:v2:Override",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "AdjunctType",
+      "sh:or": [
+        { "sh:class": "dtmi:dtdl:class:Property;3" },
+        { "sh:class": "dtmi:dtdl:class:Property;4" }
+      ],
+      "sh:and": [
+        { "sh:class": "ValueAnnotation" }
+      ],
+      "sh:not": [
+        { "sh:class": "dtmi:dtdl:extension:initialization:v2:Initialized" }
+      ],
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:extension:overriding:v2:Override:overrides",
+          "@type": "rdf:Property",
+          "rdfs:domain": "Override"
+        }
+      ],
+      "sh:property": [
+        {
+          "sh:path": "overrides",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:nodeKind": "sh:IRI",
+          "dtmm:description": {
+            "en-US": "Term or IRI of an extension property that is overridden."
+          }
+        }
+      ],
+      "dtmm:siblings": [
+        {
+          "dtmm:keyProperty": "name",
+          "dtmm:keyrefProperty": "annotates",
+          "sh:or": [
+            { "sh:class": "dtmi:dtdl:class:Property;3" },
+            { "sh:class": "dtmi:dtdl:class:Property;4" },
+            { "sh:class": "dtmi:dtdl:class:Telemetry;3" },
+            { "sh:class": "dtmi:dtdl:class:Telemetry;4" }
+          ]
+        },
+        {
+          "dtmm:keyProperty": "name",
+          "dtmm:keyrefProperty": "annotates",
+          "dtmm:path": "overrides",
+          "dtmm:uniqueReference": true,
+          "dtmm:refersToProperty": {
+            "dtmm:isMaterial": false
+          }
+        },
+        {
+          "dtmm:keyProperty": "name",
+          "dtmm:keyrefProperty": "annotates",
+          "dtmm:path": "schema",
+          "dtmm:parentOfProperty": "overrides"
+        }
+      ]
+    }
+  ]
+}
diff --git a/DTDL/v4/metamodel/DTDL.FeatureExtension.quantitativeTypes.v2.Elements.json b/DTDL/v4/metamodel/DTDL.FeatureExtension.quantitativeTypes.v2.Elements.json
new file mode 100644
index 00000000..5c06533e
--- /dev/null
+++ b/DTDL/v4/metamodel/DTDL.FeatureExtension.quantitativeTypes.v2.Elements.json
@@ -0,0 +1,3098 @@
+[
+  {
+    "@context": [ "dtmi:dtdl:context;4", "dtmi:dtdl:extension:quantitativeTypes;2" ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:DecimalPrefix",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:deci",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "deci",
+        "enumValue": "deci",
+        "symbol": "d",
+        "exponent": -1
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:centi",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "centi",
+        "enumValue": "centi",
+        "symbol": "c",
+        "exponent": -2
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:milli",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "milli",
+        "enumValue": "milli",
+        "symbol": "m",
+        "exponent": -3
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:micro",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "micro",
+        "enumValue": "micro",
+        "symbol": "µ",
+        "exponent": -6
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:nano",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "nano",
+        "enumValue": "nano",
+        "symbol": "n",
+        "exponent": -9
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:pico",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "pico",
+        "enumValue": "pico",
+        "symbol": "p",
+        "exponent": -12
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:femto",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "femto",
+        "enumValue": "femto",
+        "symbol": "f",
+        "exponent": -15
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:atto",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "atto",
+        "enumValue": "atto",
+        "symbol": "a",
+        "exponent": -18
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:zepto",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "zepto",
+        "enumValue": "zepto",
+        "symbol": "z",
+        "exponent": -21
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:yocto",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "yocto",
+        "enumValue": "yocto",
+        "symbol": "y",
+        "exponent": -24
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:deca",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "deca",
+        "enumValue": "deca",
+        "symbol": "da",
+        "exponent": 1
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:hecto",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "hecto",
+        "enumValue": "hecto",
+        "symbol": "h",
+        "exponent": 2
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:kilo",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "kilo",
+        "enumValue": "kilo",
+        "symbol": "k",
+        "exponent": 3
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:mega",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "mega",
+        "enumValue": "mega",
+        "symbol": "M",
+        "exponent": 6
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:giga",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "giga",
+        "enumValue": "giga",
+        "symbol": "G",
+        "exponent": 9
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:tera",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "tera",
+        "enumValue": "tera",
+        "symbol": "T",
+        "exponent": 12
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:peta",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "peta",
+        "enumValue": "peta",
+        "symbol": "P",
+        "exponent": 15
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:exa",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "exa",
+        "enumValue": "exa",
+        "symbol": "E",
+        "exponent": 18
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:zetta",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "zetta",
+        "enumValue": "zetta",
+        "symbol": "Z",
+        "exponent": 21
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:yotta",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "yotta",
+        "enumValue": "yotta",
+        "symbol": "Y",
+        "exponent": 24
+      }
+    ],
+    "displayName": "DecimalPrefix"
+  },
+  {
+    "@context": [ "dtmi:dtdl:context;4", "dtmi:dtdl:extension:quantitativeTypes;2" ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:BinaryPrefix",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:kibi",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "kibi",
+        "enumValue": "kibi",
+        "symbol": "Ki",
+        "exponent": 10
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:mebi",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "mebi",
+        "enumValue": "mebi",
+        "symbol": "Mi",
+        "exponent": 20
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:gibi",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "gibi",
+        "enumValue": "gibi",
+        "symbol": "Gi",
+        "exponent": 30
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:tebi",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "tebi",
+        "enumValue": "tebi",
+        "symbol": "Ti",
+        "exponent": 40
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:pebi",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "pebi",
+        "enumValue": "pebi",
+        "symbol": "Pi",
+        "exponent": 50
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:exbi",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "exbi",
+        "enumValue": "exbi",
+        "symbol": "Ei",
+        "exponent": 60
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:zebi",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "zebi",
+        "enumValue": "zebi",
+        "symbol": "Zi",
+        "exponent": 70
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unitprefix:yobi",
+        "@type": [ "EnumValue", "UnitPrefix" ],
+        "name": "yobi",
+        "enumValue": "yobi",
+        "symbol": "Yi",
+        "exponent": 80
+      }
+    ],
+    "displayName": "BinaryPrefix"
+  },
+
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:AccelerationUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:metrePerSecondSquared",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "metrePerSecondSquared",
+        "enumValue": "metrePerSecondSquared",
+        "displayName": "metre per second squared",
+        "symbol": "m/s²",
+        "baseUnit": "metrePerSecondSquared",
+        "topUnit": "metrePerSecond",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:centimetrePerSecondSquared",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "centimetrePerSecondSquared",
+        "enumValue": "centimetrePerSecondSquared",
+        "displayName": "centimetre per second squared",
+        "symbol": "cm/s²",
+        "baseUnit": "metrePerSecondSquared",
+        "prefix": "centi",
+        "topUnit": "centimetrePerSecond",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gForce",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "gForce",
+        "enumValue": "gForce",
+        "displayName": "g-force",
+        "symbol": "g"
+      }
+    ],
+    "displayName": "AccelerationUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:AngleUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:radian",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "radian",
+        "enumValue": "radian",
+        "displayName": "radian",
+        "symbol": "rad"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:degreeOfArc",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "degreeOfArc",
+        "enumValue": "degreeOfArc",
+        "displayName": "degree of arc",
+        "symbol": "°"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:minuteOfArc",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "minuteOfArc",
+        "enumValue": "minuteOfArc",
+        "displayName": "minute of arc",
+        "symbol": "'"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:secondOfArc",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "secondOfArc",
+        "enumValue": "secondOfArc",
+        "displayName": "second of arc",
+        "symbol": "\""
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:turn",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "turn",
+        "enumValue": "turn",
+        "displayName": "turn",
+        "symbol": "turn"
+      }
+    ],
+    "displayName": "AngleUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:AngularAccelerationUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:radianPerSecondSquared",
+        "@type": [ "EnumValue", "SymbolicUnit", "RatioUnit" ],
+        "name": "radianPerSecondSquared",
+        "enumValue": "radianPerSecondSquared",
+        "displayName": "radian per second squared",
+        "symbol": "rad/s²",
+        "topUnit": "radianPerSecond",
+        "bottomUnit": "second"
+      }
+    ],
+    "displayName": "AngularAccelerationUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:AngularVelocityUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:radianPerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "RatioUnit" ],
+        "name": "radianPerSecond",
+        "enumValue": "radianPerSecond",
+        "displayName": "radian per second",
+        "symbol": "rad/s",
+        "topUnit": "radian",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:degreePerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "RatioUnit" ],
+        "name": "degreePerSecond",
+        "enumValue": "degreePerSecond",
+        "displayName": "degree per second",
+        "symbol": "°/s",
+        "topUnit": "degreeOfArc",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:revolutionPerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "RatioUnit" ],
+        "name": "revolutionPerSecond",
+        "enumValue": "revolutionPerSecond",
+        "displayName": "revolution per second",
+        "symbol": "rps",
+        "topUnit": "turn",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:revolutionPerMinute",
+        "@type": [ "EnumValue", "SymbolicUnit", "RatioUnit" ],
+        "name": "revolutionPerMinute",
+        "enumValue": "revolutionPerMinute",
+        "displayName": "revolution per minute",
+        "symbol": "rpm",
+        "topUnit": "turn",
+        "bottomUnit": "minute"
+      }
+    ],
+    "displayName": "AngularVelocityUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:ApparentEnergyUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:voltAmpereHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "voltAmpereHour",
+        "enumValue": "voltAmpereHour",
+        "displayName": "volt-ampere-hour",
+        "symbol": "VAh",
+        "baseUnit": "voltAmpereHour"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilovoltAmpereHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "kilovoltAmpereHour",
+        "enumValue": "kilovoltAmpereHour",
+        "displayName": "kilovolt-ampere-hour",
+        "symbol": "kVAh",
+        "baseUnit": "voltAmpereHour",
+        "prefix": "kilo"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megavoltAmpereHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "megavoltAmpereHour",
+        "enumValue": "megavoltAmpereHour",
+        "displayName": "megavolt-ampere-hour",
+        "symbol": "MVAh",
+        "baseUnit": "voltAmpereHour",
+        "prefix": "mega"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gigavoltAmpereHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "gigavoltAmpereHour",
+        "enumValue": "gigavoltAmpereHour",
+        "displayName": "gigavolt-ampere-hour",
+        "symbol": "GVAh",
+        "baseUnit": "voltAmpereHour",
+        "prefix": "giga"
+      }
+    ],
+    "displayName": "ApparentEnergyUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:ApparentPowerUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:voltAmpere",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "voltAmpere",
+        "enumValue": "voltAmpere",
+        "displayName": "volt-ampere",
+        "symbol": "VA",
+        "baseUnit": "voltAmpere"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millivoltAmpere",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "millivoltAmpere",
+        "enumValue": "millivoltAmpere",
+        "displayName": "millivolt-ampere",
+        "symbol": "mVA",
+        "baseUnit": "voltAmpere",
+        "prefix": "milli"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilovoltAmpere",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "kilovoltAmpere",
+        "enumValue": "kilovoltAmpere",
+        "displayName": "kilovolt-ampere",
+        "symbol": "kVA",
+        "baseUnit": "voltAmpere",
+        "prefix": "kilo"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megavoltAmpere",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "megavoltAmpere",
+        "enumValue": "megavoltAmpere",
+        "displayName": "megavolt-ampere",
+        "symbol": "MVA",
+        "baseUnit": "voltAmpere",
+        "prefix": "mega"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gigavoltAmpere",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "gigavoltAmpere",
+        "enumValue": "gigavoltAmpere",
+        "displayName": "gigavolt-ampere",
+        "symbol": "GVA",
+        "baseUnit": "voltAmpere",
+        "prefix": "giga"
+      }
+    ],
+    "displayName": "ApparentPowerUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:AreaUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:squareMetre",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "squareMetre",
+        "enumValue": "squareMetre",
+        "displayName": "square metre",
+        "symbol": "m²"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:squareCentimetre",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "squareCentimetre",
+        "enumValue": "squareCentimetre",
+        "displayName": "square centimetre",
+        "symbol": "cm²"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:squareMillimetre",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "squareMillimetre",
+        "enumValue": "squareMillimetre",
+        "displayName": "square millimetre",
+        "symbol": "mm²"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:squareKilometre",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "squareKilometre",
+        "enumValue": "squareKilometre",
+        "displayName": "square kilometre",
+        "symbol": "km²"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:hectare",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "hectare",
+        "enumValue": "hectare",
+        "displayName": "hectare",
+        "symbol": "ha"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:squareFoot",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "squareFoot",
+        "enumValue": "squareFoot",
+        "displayName": "square foot",
+        "symbol": "ft²"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:squareInch",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "squareInch",
+        "enumValue": "squareInch",
+        "displayName": "square inch",
+        "symbol": "in²"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:acre",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "acre",
+        "enumValue": "acre",
+        "displayName": "acre",
+        "symbol": "ac"
+      }
+    ],
+    "displayName": "AreaUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:CapacitanceUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:farad",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "farad",
+        "enumValue": "farad",
+        "displayName": "farad",
+        "symbol": "F",
+        "baseUnit": "farad"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millifarad",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "millifarad",
+        "enumValue": "millifarad",
+        "displayName": "millifarad",
+        "symbol": "mF",
+        "baseUnit": "farad",
+        "prefix": "milli"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:microfarad",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "microfarad",
+        "enumValue": "microfarad",
+        "displayName": "microfarad",
+        "symbol": "µF",
+        "baseUnit": "farad",
+        "prefix": "micro"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:nanofarad",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "nanofarad",
+        "enumValue": "nanofarad",
+        "displayName": "nanofarad",
+        "symbol": "nF",
+        "baseUnit": "farad",
+        "prefix": "nano"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:picofarad",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "picofarad",
+        "enumValue": "picofarad",
+        "displayName": "picofarad",
+        "symbol": "pF",
+        "baseUnit": "farad",
+        "prefix": "pico"
+      }
+    ],
+    "displayName": "CapacitanceUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:ChargeUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:coulomb",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "coulomb",
+        "enumValue": "coulomb",
+        "displayName": "coulomb",
+        "symbol": "C",
+        "baseUnit": "coulomb"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:ampereHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "ampereHour",
+        "enumValue": "ampereHour",
+        "displayName": "ampere hour",
+        "symbol": "Ah",
+        "baseUnit": "ampereHour"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:milliampereHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "milliampereHour",
+        "enumValue": "milliampereHour",
+        "displayName": "milliampere hour",
+        "symbol": "mAh",
+        "baseUnit": "ampereHour",
+        "prefix": "milli"
+      }
+    ],
+    "displayName": "ChargeUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:CurrentUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:ampere",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "ampere",
+        "enumValue": "ampere",
+        "displayName": "ampere",
+        "symbol": "A",
+        "baseUnit": "ampere"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:microampere",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "microampere",
+        "enumValue": "microampere",
+        "displayName": "microampere",
+        "symbol": "µA",
+        "baseUnit": "ampere",
+        "prefix": "micro"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:milliampere",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "milliampere",
+        "enumValue": "milliampere",
+        "displayName": "milliampere",
+        "symbol": "mA",
+        "baseUnit": "ampere",
+        "prefix": "milli"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kiloampere",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "kiloampere",
+        "enumValue": "kiloampere",
+        "displayName": "kiloampere",
+        "symbol": "kA",
+        "baseUnit": "ampere",
+        "prefix": "kilo"
+      }
+    ],
+    "displayName": "CurrentUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:DataRateUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:bitPerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit", "RatioUnit" ],
+        "name": "bitPerSecond",
+        "enumValue": "bitPerSecond",
+        "displayName": "bit per second",
+        "symbol": "bps",
+        "baseUnit": "bitPerSecond",
+        "topUnit": "bit",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kibibitPerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit", "RatioUnit" ],
+        "name": "kibibitPerSecond",
+        "enumValue": "kibibitPerSecond",
+        "displayName": "kibibit per second",
+        "symbol": "Kibps",
+        "baseUnit": "bitPerSecond",
+        "prefix": "kibi",
+        "topUnit": "kibibit",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:mebibitPerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit", "RatioUnit" ],
+        "name": "mebibitPerSecond",
+        "enumValue": "mebibitPerSecond",
+        "displayName": "mebibit per second",
+        "symbol": "Mibps",
+        "baseUnit": "bitPerSecond",
+        "prefix": "mebi",
+        "topUnit": "mebibit",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gibibitPerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit", "RatioUnit" ],
+        "name": "gibibitPerSecond",
+        "enumValue": "gibibitPerSecond",
+        "displayName": "gibibit per second",
+        "symbol": "Gibps",
+        "baseUnit": "bitPerSecond",
+        "prefix": "gibi",
+        "topUnit": "gibibit",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:tebibitPerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit", "RatioUnit" ],
+        "name": "tebibitPerSecond",
+        "enumValue": "tebibitPerSecond",
+        "displayName": "tebibit per second",
+        "symbol": "Tibps",
+        "baseUnit": "bitPerSecond",
+        "prefix": "tebi",
+        "topUnit": "tebibit",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:exbibitPerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit", "RatioUnit" ],
+        "name": "exbibitPerSecond",
+        "enumValue": "exbibitPerSecond",
+        "displayName": "exbibit per second",
+        "symbol": "Eibps",
+        "baseUnit": "bitPerSecond",
+        "prefix": "exbi",
+        "topUnit": "exbibit",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:zebibitPerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit", "RatioUnit" ],
+        "name": "zebibitPerSecond",
+        "enumValue": "zebibitPerSecond",
+        "displayName": "zebibit per second",
+        "symbol": "Zibps",
+        "baseUnit": "bitPerSecond",
+        "prefix": "zebi",
+        "topUnit": "zebibit",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:yobibitPerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit", "RatioUnit" ],
+        "name": "yobibitPerSecond",
+        "enumValue": "yobibitPerSecond",
+        "displayName": "yobibit per second",
+        "symbol": "Yibps",
+        "baseUnit": "bitPerSecond",
+        "prefix": "yobi",
+        "topUnit": "yobibit",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:bytePerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit", "RatioUnit" ],
+        "name": "bytePerSecond",
+        "enumValue": "bytePerSecond",
+        "displayName": "byte per second",
+        "symbol": "Bps",
+        "baseUnit": "bytePerSecond",
+        "topUnit": "byte",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kibibytePerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit", "RatioUnit" ],
+        "name": "kibibytePerSecond",
+        "enumValue": "kibibytePerSecond",
+        "displayName": "kibibyte per second",
+        "symbol": "KiBps",
+        "baseUnit": "bytePerSecond",
+        "prefix": "kibi",
+        "topUnit": "kibibyte",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:mebibytePerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit", "RatioUnit" ],
+        "name": "mebibytePerSecond",
+        "enumValue": "mebibytePerSecond",
+        "displayName": "mebibyte per second",
+        "symbol": "MiBps",
+        "baseUnit": "bytePerSecond",
+        "prefix": "mebi",
+        "topUnit": "mebibyte",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gibibytePerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit", "RatioUnit" ],
+        "name": "gibibytePerSecond",
+        "enumValue": "gibibytePerSecond",
+        "displayName": "gibibyte per second",
+        "symbol": "GiBps",
+        "baseUnit": "bytePerSecond",
+        "prefix": "gibi",
+        "topUnit": "gibibyte",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:tebibytePerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit", "RatioUnit" ],
+        "name": "tebibytePerSecond",
+        "enumValue": "tebibytePerSecond",
+        "displayName": "tebibyte per second",
+        "symbol": "TiBps",
+        "baseUnit": "bytePerSecond",
+        "prefix": "tebi",
+        "topUnit": "tebibyte",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:exbibytePerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit", "RatioUnit" ],
+        "name": "exbibytePerSecond",
+        "enumValue": "exbibytePerSecond",
+        "displayName": "exbibyte per second",
+        "symbol": "EiBps",
+        "baseUnit": "bytePerSecond",
+        "prefix": "exbi",
+        "topUnit": "exbibyte",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:zebibytePerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit", "RatioUnit" ],
+        "name": "zebibytePerSecond",
+        "enumValue": "zebibytePerSecond",
+        "displayName": "zebibyte per second",
+        "symbol": "ZiBps",
+        "baseUnit": "bytePerSecond",
+        "prefix": "zebi",
+        "topUnit": "zebibyte",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:yobibytePerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit", "RatioUnit" ],
+        "name": "yobibytePerSecond",
+        "enumValue": "yobibytePerSecond",
+        "displayName": "yobibyte per second",
+        "symbol": "YiBps",
+        "baseUnit": "bytePerSecond",
+        "prefix": "yobi",
+        "topUnit": "yobibyte",
+        "bottomUnit": "second"
+      }
+    ],
+    "displayName": "DataRateUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:DataSizeUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:bit",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit" ],
+        "name": "bit",
+        "enumValue": "bit",
+        "displayName": "bit",
+        "symbol": "bit",
+        "baseUnit": "bit"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kibibit",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit" ],
+        "name": "kibibit",
+        "enumValue": "kibibit",
+        "displayName": "kibibit",
+        "symbol": "Kibit",
+        "baseUnit": "bit",
+        "prefix": "kibi"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:mebibit",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit" ],
+        "name": "mebibit",
+        "enumValue": "mebibit",
+        "displayName": "mebibit",
+        "symbol": "Mibit",
+        "baseUnit": "bit",
+        "prefix": "mebi"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gibibit",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit" ],
+        "name": "gibibit",
+        "enumValue": "gibibit",
+        "displayName": "gibibit",
+        "symbol": "Gibit",
+        "baseUnit": "bit",
+        "prefix": "gibi"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:tebibit",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit" ],
+        "name": "tebibit",
+        "enumValue": "tebibit",
+        "displayName": "tebibit",
+        "symbol": "Tibit",
+        "baseUnit": "bit",
+        "prefix": "tebi"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:exbibit",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit" ],
+        "name": "exbibit",
+        "enumValue": "exbibit",
+        "displayName": "exbibit",
+        "symbol": "Eibit",
+        "baseUnit": "bit",
+        "prefix": "exbi"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:zebibit",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit" ],
+        "name": "zebibit",
+        "enumValue": "zebibit",
+        "displayName": "zebibit",
+        "symbol": "Zibit",
+        "baseUnit": "bit",
+        "prefix": "zebi"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:yobibit",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit" ],
+        "name": "yobibit",
+        "enumValue": "yobibit",
+        "displayName": "yobibit",
+        "symbol": "Yibit",
+        "baseUnit": "bit",
+        "prefix": "yobi"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:byte",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit" ],
+        "name": "byte",
+        "enumValue": "byte",
+        "displayName": "byte",
+        "symbol": "B",
+        "baseUnit": "byte"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kibibyte",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit" ],
+        "name": "kibibyte",
+        "enumValue": "kibibyte",
+        "displayName": "kibibyte",
+        "symbol": "KiB",
+        "baseUnit": "byte",
+        "prefix": "kibi"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:mebibyte",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit" ],
+        "name": "mebibyte",
+        "enumValue": "mebibyte",
+        "displayName": "mebibyte",
+        "symbol": "MiB",
+        "baseUnit": "byte",
+        "prefix": "mebi"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gibibyte",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit" ],
+        "name": "gibibyte",
+        "enumValue": "gibibyte",
+        "displayName": "gibibyte",
+        "symbol": "GiB",
+        "baseUnit": "byte",
+        "prefix": "gibi"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:tebibyte",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit" ],
+        "name": "tebibyte",
+        "enumValue": "tebibyte",
+        "displayName": "tebibyte",
+        "symbol": "TiB",
+        "baseUnit": "byte",
+        "prefix": "tebi"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:exbibyte",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit" ],
+        "name": "exbibyte",
+        "enumValue": "exbibyte",
+        "displayName": "exbibyte",
+        "symbol": "EiB",
+        "baseUnit": "byte",
+        "prefix": "exbi"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:zebibyte",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit" ],
+        "name": "zebibyte",
+        "enumValue": "zebibyte",
+        "displayName": "zebibyte",
+        "symbol": "ZiB",
+        "baseUnit": "byte",
+        "prefix": "zebi"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:yobibyte",
+        "@type": [ "EnumValue", "SymbolicUnit", "BinaryUnit" ],
+        "name": "yobibyte",
+        "enumValue": "yobibyte",
+        "displayName": "yobibyte",
+        "symbol": "YiB",
+        "baseUnit": "byte",
+        "prefix": "yobi"
+      }
+    ],
+    "displayName": "DataSizeUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:DensityUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilogramPerCubicMetre",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "kilogramPerCubicMetre",
+        "enumValue": "kilogramPerCubicMetre",
+        "displayName": "kilogram per cubic metre",
+        "symbol": "kg/m³",
+        "baseUnit": "gramPerCubicMetre",
+        "prefix": "kilo",
+        "topUnit": "kilogram",
+        "bottomUnit": "cubicMetre"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gramPerCubicMetre",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "gramPerCubicMetre",
+        "enumValue": "gramPerCubicMetre",
+        "displayName": "gram per cubic metre",
+        "symbol": "g/m³",
+        "baseUnit": "gramPerCubicMetre",
+        "topUnit": "gram",
+        "bottomUnit": "cubicMetre"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:milligramPerCubicMetre",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "milligramPerCubicMetre",
+        "enumValue": "milligramPerCubicMetre",
+        "displayName": "milligram per cubic metre",
+        "symbol": "mg/m³",
+        "baseUnit": "gramPerCubicMetre",
+        "prefix": "milli",
+        "topUnit": "milligram",
+        "bottomUnit": "cubicMetre"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:microgramPerCubicMetre",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "microgramPerCubicMetre",
+        "enumValue": "microgramPerCubicMetre",
+        "displayName": "microgram per cubic metre",
+        "symbol": "µg/m³",
+        "baseUnit": "gramPerCubicMetre",
+        "prefix": "micro",
+        "topUnit": "microgram",
+        "bottomUnit": "cubicMetre"
+      }
+    ],
+    "displayName": "DensityUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:EnergyUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:joule",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "joule",
+        "enumValue": "joule",
+        "displayName": "joule",
+        "symbol": "J",
+        "baseUnit": "joule"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilojoule",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "kilojoule",
+        "enumValue": "kilojoule",
+        "displayName": "kilojoule",
+        "symbol": "kJ",
+        "baseUnit": "joule",
+        "prefix": "kilo"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megajoule",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "megajoule",
+        "enumValue": "megajoule",
+        "displayName": "megajoule",
+        "symbol": "MJ",
+        "baseUnit": "joule",
+        "prefix": "mega"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gigajoule",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "gigajoule",
+        "enumValue": "gigajoule",
+        "displayName": "gigajoule",
+        "symbol": "GJ",
+        "baseUnit": "joule",
+        "prefix": "giga"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:electronvolt",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "electronvolt",
+        "enumValue": "electronvolt",
+        "displayName": "electronvolt",
+        "symbol": "eV",
+        "baseUnit": "electronvolt"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megaelectronvolt",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "megaelectronvolt",
+        "enumValue": "megaelectronvolt",
+        "displayName": "megaelectronvolt",
+        "symbol": "MeV",
+        "baseUnit": "electronvolt",
+        "prefix": "mega"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:wattHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "wattHour",
+        "enumValue": "wattHour",
+        "displayName": "watt-hour",
+        "symbol": "Wh",
+        "baseUnit": "wattHour"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:milliwattHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "milliwattHour",
+        "enumValue": "milliwattHour",
+        "displayName": "milliwatt-hour",
+        "symbol": "mWh",
+        "baseUnit": "wattHour",
+        "prefix": "milli"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilowattHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "kilowattHour",
+        "enumValue": "kilowattHour",
+        "displayName": "kilowatt-hour",
+        "symbol": "kWh",
+        "baseUnit": "wattHour",
+        "prefix": "kilo"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megawattHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "megawattHour",
+        "enumValue": "megawattHour",
+        "displayName": "megawatt-hour",
+        "symbol": "MWh",
+        "baseUnit": "wattHour",
+        "prefix": "mega"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gigawattHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "gigawattHour",
+        "enumValue": "gigawattHour",
+        "displayName": "gigawatt-hour",
+        "symbol": "GWh",
+        "baseUnit": "wattHour",
+        "prefix": "giga"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:terawattHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "terawattHour",
+        "enumValue": "terawattHour",
+        "displayName": "terawatt-hour",
+        "symbol": "TWh",
+        "baseUnit": "wattHour",
+        "prefix": "tera"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:britishThermalUnit",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "britishThermalUnit",
+        "enumValue": "britishThermalUnit",
+        "displayName": "British thermal unit",
+        "symbol": "BTU",
+        "baseUnit": "britishThermalUnit"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kiloBritishThermalUnit",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "kiloBritishThermalUnit",
+        "enumValue": "kiloBritishThermalUnit",
+        "displayName": "kilo-British thermal unit",
+        "symbol": "kBTU",
+        "baseUnit": "britishThermalUnit",
+        "prefix": "kilo"
+      }
+    ],
+    "displayName": "EnergyUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:ForceUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:newton",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "newton",
+        "enumValue": "newton",
+        "displayName": "newton",
+        "symbol": "N",
+        "baseUnit": "newton"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:pound",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "pound",
+        "enumValue": "pound",
+        "displayName": "pound",
+        "symbol": "lb"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:ounce",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "ounce",
+        "enumValue": "ounce",
+        "displayName": "ounce",
+        "symbol": "oz"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:ton",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "ton",
+        "enumValue": "ton",
+        "displayName": "ton",
+        "symbol": "T"
+      }
+    ],
+    "displayName": "ForceUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:FrequencyUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:hertz",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "hertz",
+        "enumValue": "hertz",
+        "displayName": "hertz",
+        "symbol": "Hz",
+        "baseUnit": "hertz"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millihertz",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "millihertz",
+        "enumValue": "millihertz",
+        "displayName": "millihertz",
+        "symbol": "mHz",
+        "baseUnit": "hertz",
+        "prefix": "milli"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilohertz",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "kilohertz",
+        "enumValue": "kilohertz",
+        "displayName": "kilohertz",
+        "symbol": "kHz",
+        "baseUnit": "hertz",
+        "prefix": "kilo"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megahertz",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "megahertz",
+        "enumValue": "megahertz",
+        "displayName": "megahertz",
+        "symbol": "MHz",
+        "baseUnit": "hertz",
+        "prefix": "mega"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gigahertz",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "gigahertz",
+        "enumValue": "gigahertz",
+        "displayName": "gigahertz",
+        "symbol": "GHz",
+        "baseUnit": "hertz",
+        "prefix": "giga"
+      }
+    ],
+    "displayName": "FrequencyUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:IlluminanceUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:lux",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "lux",
+        "enumValue": "lux",
+        "displayName": "lux",
+        "symbol": "lx",
+        "baseUnit": "lux"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:footcandle",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "footcandle",
+        "enumValue": "footcandle",
+        "displayName": "footcandle",
+        "symbol": "fc"
+      }
+    ],
+    "displayName": "IlluminanceUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:InductanceUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:henry",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "henry",
+        "enumValue": "henry",
+        "displayName": "henry",
+        "symbol": "H",
+        "baseUnit": "henry"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millihenry",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "millihenry",
+        "enumValue": "millihenry",
+        "displayName": "millihenry",
+        "symbol": "mH",
+        "baseUnit": "henry",
+        "prefix": "milli"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:microhenry",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "microhenry",
+        "enumValue": "microhenry",
+        "displayName": "microhenry",
+        "symbol": "µH",
+        "baseUnit": "henry",
+        "prefix": "micro"
+      }
+    ],
+    "displayName": "InductanceUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:IonizingRadiationDoseUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gray",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "gray",
+        "enumValue": "gray",
+        "displayName": "gray",
+        "symbol": "Gy",
+        "baseUnit": "gray"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:milligray",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "milligray",
+        "enumValue": "milligray",
+        "displayName": "milligray",
+        "symbol": "mGy",
+        "baseUnit": "gray",
+        "prefix": "milli"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:microgray",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "microgray",
+        "enumValue": "microgray",
+        "displayName": "microgray",
+        "symbol": "µGy",
+        "baseUnit": "gray",
+        "prefix": "micro"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:sievert",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "sievert",
+        "enumValue": "sievert",
+        "displayName": "sievert",
+        "symbol": "Sv",
+        "baseUnit": "sievert"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millisievert",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "millisievert",
+        "enumValue": "millisievert",
+        "displayName": "millisievert",
+        "symbol": "mSv",
+        "baseUnit": "sievert",
+        "prefix": "milli"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:microsievert",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "microsievert",
+        "enumValue": "microsievert",
+        "displayName": "microsievert",
+        "symbol": "µSv",
+        "baseUnit": "sievert",
+        "prefix": "micro"
+      }
+    ],
+    "displayName": "IonizingRadiationDoseUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:IrradianceUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:wattPerSquareMetre",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "wattPerSquareMetre",
+        "enumValue": "wattPerSquareMetre",
+        "displayName": "watt per square metre",
+        "symbol": "W/m²",
+        "baseUnit": "wattPerSquareMetre",
+        "topUnit": "watt",
+        "bottomUnit": "squareMetre"
+      }
+    ],
+    "displayName": "IrradianceUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:LengthUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:metre",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "metre",
+        "enumValue": "metre",
+        "displayName": "metre",
+        "symbol": "m",
+        "baseUnit": "metre"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:centimetre",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "centimetre",
+        "enumValue": "centimetre",
+        "displayName": "centimetre",
+        "symbol": "cm",
+        "baseUnit": "metre",
+        "prefix": "centi"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millimetre",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "millimetre",
+        "enumValue": "millimetre",
+        "displayName": "millimetre",
+        "symbol": "mm",
+        "baseUnit": "metre",
+        "prefix": "milli"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:micrometre",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "micrometre",
+        "enumValue": "micrometre",
+        "displayName": "micrometre",
+        "symbol": "µm",
+        "baseUnit": "metre",
+        "prefix": "micro"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:nanometre",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "nanometre",
+        "enumValue": "nanometre",
+        "displayName": "nanometre",
+        "symbol": "nm",
+        "baseUnit": "metre",
+        "prefix": "nano"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilometre",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "kilometre",
+        "enumValue": "kilometre",
+        "displayName": "kilometre",
+        "symbol": "km",
+        "baseUnit": "metre",
+        "prefix": "kilo"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:foot",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "foot",
+        "enumValue": "foot",
+        "displayName": "foot",
+        "symbol": "ft"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:inch",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "inch",
+        "enumValue": "inch",
+        "displayName": "inch",
+        "symbol": "in"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:mile",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "mile",
+        "enumValue": "mile",
+        "displayName": "mile",
+        "symbol": "mi"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:nauticalMile",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "nauticalMile",
+        "enumValue": "nauticalMile",
+        "displayName": "nautical mile",
+        "symbol": "M"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:astronomicalUnit",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "astronomicalUnit",
+        "enumValue": "astronomicalUnit",
+        "displayName": "astronomical unit",
+        "symbol": "AU"
+      }
+    ],
+    "displayName": "LengthUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:LuminanceUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:candelaPerSquareMetre",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "candelaPerSquareMetre",
+        "enumValue": "candelaPerSquareMetre",
+        "displayName": "candela per square metre",
+        "symbol": "cd/m²",
+        "baseUnit": "candelaPerSquareMetre",
+        "topUnit": "candela",
+        "bottomUnit": "squareMetre"
+      }
+    ],
+    "displayName": "LuminanceUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:LuminousFluxUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:lumen",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "lumen",
+        "enumValue": "lumen",
+        "displayName": "lumen",
+        "symbol": "lm",
+        "baseUnit": "lumen"
+      }
+    ],
+    "displayName": "LuminousFluxUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:LuminousIntensityUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:candela",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "candela",
+        "enumValue": "candela",
+        "displayName": "candela",
+        "symbol": "cd",
+        "baseUnit": "candela"
+      }
+    ],
+    "displayName": "LuminousIntensityUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:MagneticFluxUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:weber",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "weber",
+        "enumValue": "weber",
+        "displayName": "weber",
+        "symbol": "Wb",
+        "baseUnit": "weber"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:maxwell",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "maxwell",
+        "enumValue": "maxwell",
+        "displayName": "maxwell",
+        "symbol": "Mx"
+      }
+    ],
+    "displayName": "MagneticFluxUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:MagneticInductionUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:tesla",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "tesla",
+        "enumValue": "tesla",
+        "displayName": "tesla",
+        "symbol": "T",
+        "baseUnit": "tesla"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gauss",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "gauss",
+        "enumValue": "gauss",
+        "displayName": "gauss",
+        "symbol": "G",
+        "baseUnit": "gauss"
+      }
+    ],
+    "displayName": "MagneticInductionUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:MassUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilogram",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "kilogram",
+        "enumValue": "kilogram",
+        "displayName": "kilogram",
+        "symbol": "kg",
+        "baseUnit": "gram",
+        "prefix": "kilo"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gram",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "gram",
+        "enumValue": "gram",
+        "displayName": "gram",
+        "symbol": "g",
+        "baseUnit": "gram"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:milligram",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "milligram",
+        "enumValue": "milligram",
+        "displayName": "milligram",
+        "symbol": "mg",
+        "baseUnit": "gram",
+        "prefix": "milli"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:microgram",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "microgram",
+        "enumValue": "microgram",
+        "displayName": "microgram",
+        "symbol": "µg",
+        "baseUnit": "gram",
+        "prefix": "micro"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:tonne",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "tonne",
+        "enumValue": "tonne",
+        "displayName": "tonne",
+        "symbol": "t"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:slug",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "slug",
+        "enumValue": "slug",
+        "displayName": "slug",
+        "symbol": "slug"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:massPound",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "massPound",
+        "enumValue": "massPound",
+        "displayName": "pound",
+        "symbol": "lb"
+      }
+    ],
+    "displayName": "MassUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:MassFlowRateUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gramPerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "gramPerSecond",
+        "enumValue": "gramPerSecond",
+        "displayName": "gram per second",
+        "symbol": "g/s",
+        "baseUnit": "gramPerSecond",
+        "topUnit": "gram",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilogramPerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "kilogramPerSecond",
+        "enumValue": "kilogramPerSecond",
+        "displayName": "kilogram per second",
+        "symbol": "kg/s",
+        "baseUnit": "gramPerSecond",
+        "prefix": "kilo",
+        "topUnit": "kilogram",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gramPerHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "gramPerHour",
+        "enumValue": "gramPerHour",
+        "displayName": "gram per hour",
+        "symbol": "g/h",
+        "baseUnit": "gramPerHour",
+        "topUnit": "gram",
+        "bottomUnit": "hour"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilogramPerHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "kilogramPerHour",
+        "enumValue": "kilogramPerHour",
+        "displayName": "kilogram per hour",
+        "symbol": "kg/h",
+        "baseUnit": "gramPerHour",
+        "prefix": "kilo",
+        "topUnit": "kilogram",
+        "bottomUnit": "hour"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:massPoundPerHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "RatioUnit" ],
+        "name": "massPoundPerHour",
+        "enumValue": "massPoundPerHour",
+        "displayName": "pound per hour",
+        "symbol": "lb/h",
+        "topUnit": "massPound",
+        "bottomUnit": "hour"
+      }
+    ],
+    "displayName": "MassFlowRateUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:PowerUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:watt",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "watt",
+        "enumValue": "watt",
+        "displayName": "watt",
+        "symbol": "W",
+        "baseUnit": "watt"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:microwatt",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "microwatt",
+        "enumValue": "microwatt",
+        "displayName": "microwatt",
+        "symbol": "µW",
+        "baseUnit": "watt",
+        "prefix": "micro"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:milliwatt",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "milliwatt",
+        "enumValue": "milliwatt",
+        "displayName": "milliwatt",
+        "symbol": "mW",
+        "baseUnit": "watt",
+        "prefix": "milli"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilowatt",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "kilowatt",
+        "enumValue": "kilowatt",
+        "displayName": "kilowatt",
+        "symbol": "kW",
+        "baseUnit": "watt",
+        "prefix": "kilo"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megawatt",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "megawatt",
+        "enumValue": "megawatt",
+        "displayName": "megawatt",
+        "symbol": "MW",
+        "baseUnit": "watt",
+        "prefix": "mega"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gigawatt",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "gigawatt",
+        "enumValue": "gigawatt",
+        "displayName": "gigawatt",
+        "symbol": "GW",
+        "baseUnit": "watt",
+        "prefix": "giga"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:horsepower",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "horsepower",
+        "enumValue": "horsepower",
+        "displayName": "horsepower",
+        "symbol": "hp"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:joulePerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "joulePerSecond",
+        "enumValue": "joulePerSecond",
+        "displayName": "joulePerSecond",
+        "symbol": "J/s",
+        "baseUnit": "joule",
+        "topUnit": "joule",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilojoulePerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "kilojoulePerSecond",
+        "enumValue": "kilojoulePerSecond",
+        "displayName": "kilojoulePerSecond",
+        "symbol": "kJ/s",
+        "baseUnit": "joulePerSecond",
+        "prefix": "kilo",
+        "topUnit": "kilojoule",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:joulePerHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "joulePerHour",
+        "enumValue": "joulePerHour",
+        "displayName": "joulePerHour",
+        "symbol": "J/h",
+        "baseUnit": "joule",
+        "topUnit": "joule",
+        "bottomUnit": "hour"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilojoulePerHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "kilojoulePerHour",
+        "enumValue": "kilojoulePerHour",
+        "displayName": "kilojoulePerHour",
+        "symbol": "kJ/h",
+        "baseUnit": "joulePerHour",
+        "prefix": "kilo",
+        "topUnit": "kilojoule",
+        "bottomUnit": "hour"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megajoulePerHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "megajoulePerHour",
+        "enumValue": "megajoulePerHour",
+        "displayName": "megajoulePerHour",
+        "symbol": "MJ/h",
+        "baseUnit": "joulePerHour",
+        "prefix": "mega",
+        "topUnit": "megajoule",
+        "bottomUnit": "hour"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gigajoulePerHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "gigajoulePerHour",
+        "enumValue": "gigajoulePerHour",
+        "displayName": "gigajoulePerHour",
+        "symbol": "GJ/h",
+        "baseUnit": "joulePerHour",
+        "prefix": "giga",
+        "topUnit": "gigajoule",
+        "bottomUnit": "hour"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:britishThermalUnitPerHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "britishThermalUnitPerHour",
+        "enumValue": "britishThermalUnitPerHour",
+        "displayName": "British thermal unitPerHour",
+        "symbol": "BTU/h",
+        "baseUnit": "britishThermalUnit",
+        "topUnit": "britishThermalUnit",
+        "bottomUnit": "hour"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kiloBritishThermalUnitPerHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "kiloBritishThermalUnitPerHour",
+        "enumValue": "kiloBritishThermalUnitPerHour",
+        "displayName": "kilo-British thermal unitPerHour",
+        "symbol": "kBTU/h",
+        "baseUnit": "britishThermalUnitPerHour",
+        "prefix": "kilo",
+        "topUnit": "kiloBritishThermalUnit",
+        "bottomUnit": "hour"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilowattHourPerYear",
+        "@type": [ "EnumValue", "SymbolicUnit", "RatioUnit" ],
+        "name": "kilowattHourPerYear",
+        "enumValue": "kilowattHourPerYear",
+        "displayName": "kilowatt-hour per year",
+        "symbol": "kWh/yr",
+        "topUnit": "kilowattHour",
+        "bottomUnit": "year"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:tonOfRefrigeration",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "tonOfRefrigeration",
+        "enumValue": "tonOfRefrigeration",
+        "displayName": "ton of refrigeration",
+        "symbol": "TR"
+      }
+    ],
+    "displayName": "PowerUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:PressureUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:pascal",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "pascal",
+        "enumValue": "pascal",
+        "displayName": "pascal",
+        "symbol": "Pa",
+        "baseUnit": "pascal"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:decapascal",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "decapascal",
+        "enumValue": "decapascal",
+        "displayName": "decapascal",
+        "symbol": "daPa",
+        "baseUnit": "pascal",
+        "prefix": "deca"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:hectopascal",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "hectopascal",
+        "enumValue": "hectopascal",
+        "displayName": "hectopascal",
+        "symbol": "hPa",
+        "baseUnit": "pascal",
+        "prefix": "hecto"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilopascal",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "kilopascal",
+        "enumValue": "kilopascal",
+        "displayName": "kilopascal",
+        "symbol": "kPa",
+        "baseUnit": "pascal",
+        "prefix": "kilo"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:bar",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "bar",
+        "enumValue": "bar",
+        "displayName": "bar",
+        "symbol": "bar",
+        "baseUnit": "bar"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millibar",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "millibar",
+        "enumValue": "millibar",
+        "displayName": "millibar",
+        "symbol": "mbar",
+        "baseUnit": "bar",
+        "prefix": "milli"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millimetresOfMercury",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "millimetresOfMercury",
+        "enumValue": "millimetresOfMercury",
+        "displayName": "millimetres of mercury",
+        "symbol": "mmHg"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:poundPerSquareInch",
+        "@type": [ "EnumValue", "SymbolicUnit", "RatioUnit" ],
+        "name": "poundPerSquareInch",
+        "enumValue": "poundPerSquareInch",
+        "displayName": "pound per square inch",
+        "symbol": "psi",
+        "topUnit": "pound",
+        "bottomUnit": "squareInch"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:inchesOfMercury",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "inchesOfMercury",
+        "enumValue": "inchesOfMercury",
+        "displayName": "inches of mercury",
+        "symbol": "inHg"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:inchesOfWater",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "inchesOfWater",
+        "enumValue": "inchesOfWater",
+        "displayName": "inches of water",
+        "symbol": "inH2O"
+      }
+    ],
+    "displayName": "PressureUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:RadioactivityUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:becquerel",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "becquerel",
+        "enumValue": "becquerel",
+        "displayName": "becquerel",
+        "symbol": "Bq",
+        "baseUnit": "becquerel"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilobecquerel",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "kilobecquerel",
+        "enumValue": "kilobecquerel",
+        "displayName": "kilobecquerel",
+        "symbol": "kBq",
+        "baseUnit": "becquerel",
+        "prefix": "kilo"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megabecquerel",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "megabecquerel",
+        "enumValue": "megabecquerel",
+        "displayName": "megabecquerel",
+        "symbol": "MBq",
+        "baseUnit": "becquerel",
+        "prefix": "mega"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gigabecquerel",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "gigabecquerel",
+        "enumValue": "gigabecquerel",
+        "displayName": "gigabecquerel",
+        "symbol": "GBq",
+        "baseUnit": "becquerel",
+        "prefix": "giga"
+      }
+    ],
+    "displayName": "RadioactivityUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:ReactiveEnergyUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:voltAmpereReactiveHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "voltAmpereReactiveHour",
+        "enumValue": "voltAmpereReactiveHour",
+        "displayName": "volt-ampere-reactive-hour",
+        "symbol": "varh",
+        "baseUnit": "voltAmpereReactiveHour"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilovoltAmpereReactiveHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "kilovoltAmpereReactiveHour",
+        "enumValue": "kilovoltAmpereReactiveHour",
+        "displayName": "kilovolt-ampere-reactive-hour",
+        "symbol": "kvarh",
+        "baseUnit": "voltAmpereReactiveHour",
+        "prefix": "kilo"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megavoltAmpereReactiveHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "megavoltAmpereReactiveHour",
+        "enumValue": "megavoltAmpereReactiveHour",
+        "displayName": "megavolt-ampere-reactive-hour",
+        "symbol": "Mvarh",
+        "baseUnit": "voltAmpereReactiveHour",
+        "prefix": "mega"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gigavoltAmpereReactiveHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "gigavoltAmpereReactiveHour",
+        "enumValue": "gigavoltAmpereReactiveHour",
+        "displayName": "gigavolt-ampere-reactive-hour",
+        "symbol": "Gvarh",
+        "baseUnit": "voltAmpereReactiveHour",
+        "prefix": "giga"
+      }
+    ],
+    "displayName": "ReactiveEnergyUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:ReactivePowerUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:voltAmpereReactive",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "voltAmpereReactive",
+        "enumValue": "voltAmpereReactive",
+        "displayName": "volt-ampere reactive",
+        "symbol": "var",
+        "baseUnit": "voltAmpereReactive"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millivoltAmpereReactive",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "millivoltAmpereReactive",
+        "enumValue": "millivoltAmpereReactive",
+        "displayName": "millivolt-ampere reactive",
+        "symbol": "mvar",
+        "baseUnit": "voltAmpereReactive",
+        "prefix": "milli"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilovoltAmpereReactive",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "kilovoltAmpereReactive",
+        "enumValue": "kilovoltAmpereReactive",
+        "displayName": "kilovolt-ampere reactive",
+        "symbol": "kvar",
+        "baseUnit": "voltAmpereReactive",
+        "prefix": "kilo"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megavoltAmpereReactive",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "megavoltAmpereReactive",
+        "enumValue": "megavoltAmpereReactive",
+        "displayName": "megavolt-ampere reactive",
+        "symbol": "Mvar",
+        "baseUnit": "voltAmpereReactive",
+        "prefix": "mega"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gigavoltAmpereReactive",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "gigavoltAmpereReactive",
+        "enumValue": "gigavoltAmpereReactive",
+        "displayName": "gigavolt-ampere reactive",
+        "symbol": "Gvar",
+        "baseUnit": "voltAmpereReactive",
+        "prefix": "giga"
+      }
+    ],
+    "displayName": "ReactivePowerUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:ResistanceUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:ohm",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "ohm",
+        "enumValue": "ohm",
+        "displayName": "ohm",
+        "symbol": "Ω",
+        "baseUnit": "ohm"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:milliohm",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "milliohm",
+        "enumValue": "milliohm",
+        "displayName": "milliohm",
+        "symbol": "mΩ",
+        "baseUnit": "ohm",
+        "prefix": "milli"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kiloohm",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "kiloohm",
+        "enumValue": "kiloohm",
+        "displayName": "kiloohm",
+        "symbol": "kΩ",
+        "baseUnit": "ohm",
+        "prefix": "kilo"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megaohm",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "megaohm",
+        "enumValue": "megaohm",
+        "displayName": "megaohm",
+        "symbol": "MΩ",
+        "baseUnit": "ohm",
+        "prefix": "mega"
+      }
+    ],
+    "displayName": "ResistanceUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:SoundPressureUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:decibel",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "decibel",
+        "enumValue": "decibel",
+        "displayName": "decibel",
+        "symbol": "dB",
+        "baseUnit": "bel",
+        "prefix": "deci"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:bel",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "bel",
+        "enumValue": "bel",
+        "displayName": "bel",
+        "symbol": "B",
+        "baseUnit": "bel"
+      }
+    ],
+    "displayName": "SoundPressureUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:TemperatureUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kelvin",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "kelvin",
+        "enumValue": "kelvin",
+        "displayName": "kelvin",
+        "symbol": "K"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:degreeCelsius",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "degreeCelsius",
+        "enumValue": "degreeCelsius",
+        "displayName": "degree celsius",
+        "symbol": "°C"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:degreeFahrenheit",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "degreeFahrenheit",
+        "enumValue": "degreeFahrenheit",
+        "displayName": "degree fahrenheit",
+        "symbol": "°F"
+      }
+    ],
+    "displayName": "TemperatureUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:TimeUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:second",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "second",
+        "enumValue": "second",
+        "displayName": "second",
+        "symbol": "s",
+        "baseUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millisecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "millisecond",
+        "enumValue": "millisecond",
+        "displayName": "millisecond",
+        "symbol": "ms",
+        "baseUnit": "second",
+        "prefix": "milli"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:microsecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "microsecond",
+        "enumValue": "microsecond",
+        "displayName": "microsecond",
+        "symbol": "µs",
+        "baseUnit": "second",
+        "prefix": "micro"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:nanosecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "nanosecond",
+        "enumValue": "nanosecond",
+        "displayName": "nanosecond",
+        "symbol": "ns",
+        "baseUnit": "second",
+        "prefix": "nano"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:minute",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "minute",
+        "enumValue": "minute",
+        "displayName": "minute",
+        "symbol": "m"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:hour",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "hour",
+        "enumValue": "hour",
+        "displayName": "hour",
+        "symbol": "h"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:day",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "day",
+        "enumValue": "day",
+        "displayName": "day",
+        "symbol": "d"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:year",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "year",
+        "enumValue": "year",
+        "displayName": "year",
+        "symbol": "yr"
+      }
+    ],
+    "displayName": "TimeUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:TorqueUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:newtonMetre",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "newtonMetre",
+        "enumValue": "newtonMetre",
+        "displayName": "newton-metre",
+        "symbol": "N m",
+        "baseUnit": "newtonMetre"
+      }
+    ],
+    "displayName": "TorqueUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:Unitless",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:unity",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "unity",
+        "enumValue": "unity",
+        "displayName": "",
+        "symbol": ""
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:percent",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "percent",
+        "enumValue": "percent",
+        "displayName": "percent",
+        "symbol": "%"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:partsPerMillion",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "partsPerMillion",
+        "enumValue": "partsPerMillion",
+        "displayName": "partsPerMillion",
+        "symbol": "ppm"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:partsPerBillion",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "partsPerBillion",
+        "enumValue": "partsPerBillion",
+        "displayName": "partsPerBillion",
+        "symbol": "ppb"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:partsPerTrillion",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "partsPerTrillion",
+        "enumValue": "partsPerTrillion",
+        "displayName": "partsPerTrillion",
+        "symbol": "ppt"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:partsPerQuadrillion",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "partsPerQuadrillion",
+        "enumValue": "partsPerQuadrillion",
+        "displayName": "partsPerQuadrillion",
+        "symbol": "ppq"
+      }
+    ],
+    "displayName": "Unitless"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:VelocityUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:metrePerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "metrePerSecond",
+        "enumValue": "metrePerSecond",
+        "displayName": "metre per second",
+        "symbol": "m/s",
+        "baseUnit": "metrePerSecond",
+        "topUnit": "metre",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:centimetrePerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "centimetrePerSecond",
+        "enumValue": "centimetrePerSecond",
+        "displayName": "centimetre per second",
+        "symbol": "cm/s",
+        "baseUnit": "metrePerSecond",
+        "prefix": "centi",
+        "topUnit": "centimetre",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilometrePerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "kilometrePerSecond",
+        "enumValue": "kilometrePerSecond",
+        "displayName": "kilometre per second",
+        "symbol": "km/s",
+        "baseUnit": "metrePerSecond",
+        "prefix": "kilo",
+        "topUnit": "kilometre",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:metrePerHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "metrePerHour",
+        "enumValue": "metrePerHour",
+        "displayName": "metre per hour",
+        "symbol": "m/h",
+        "baseUnit": "metrePerHour",
+        "topUnit": "metre",
+        "bottomUnit": "hour"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilometrePerHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "kilometrePerHour",
+        "enumValue": "kilometrePerHour",
+        "displayName": "kilometre per hour",
+        "symbol": "km/h",
+        "baseUnit": "metrePerHour",
+        "prefix": "kilo",
+        "topUnit": "kilometre",
+        "bottomUnit": "hour"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:milePerHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "RatioUnit" ],
+        "name": "milePerHour",
+        "enumValue": "milePerHour",
+        "displayName": "mile per hour",
+        "symbol": "mph",
+        "topUnit": "mile",
+        "bottomUnit": "hour"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:milePerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "RatioUnit" ],
+        "name": "milePerSecond",
+        "enumValue": "milePerSecond",
+        "displayName": "mile per second",
+        "symbol": "mi/s",
+        "topUnit": "mile",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:knot",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "knot",
+        "enumValue": "knot",
+        "displayName": "knot",
+        "symbol": "kn"
+      }
+    ],
+    "displayName": "VelocityUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:VoltageUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:volt",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "volt",
+        "enumValue": "volt",
+        "displayName": "volt",
+        "symbol": "V",
+        "baseUnit": "volt"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millivolt",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "millivolt",
+        "enumValue": "millivolt",
+        "displayName": "millivolt",
+        "symbol": "mV",
+        "baseUnit": "volt",
+        "prefix": "milli"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:microvolt",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "microvolt",
+        "enumValue": "microvolt",
+        "displayName": "microvolt",
+        "symbol": "µV",
+        "baseUnit": "volt",
+        "prefix": "micro"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:kilovolt",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "kilovolt",
+        "enumValue": "kilovolt",
+        "displayName": "kilovolt",
+        "symbol": "kV",
+        "baseUnit": "volt",
+        "prefix": "kilo"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:megavolt",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "megavolt",
+        "enumValue": "megavolt",
+        "displayName": "megavolt",
+        "symbol": "MV",
+        "baseUnit": "volt",
+        "prefix": "mega"
+      }
+    ],
+    "displayName": "VoltageUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:VolumeUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:cubicMetre",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "cubicMetre",
+        "enumValue": "cubicMetre",
+        "displayName": "cubic metre",
+        "symbol": "m³"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:cubicCentimetre",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "cubicCentimetre",
+        "enumValue": "cubicCentimetre",
+        "displayName": "cubic centimetre",
+        "symbol": "cm³"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:litre",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "litre",
+        "enumValue": "litre",
+        "displayName": "litre",
+        "symbol": "l",
+        "baseUnit": "litre"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millilitre",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit" ],
+        "name": "millilitre",
+        "enumValue": "millilitre",
+        "displayName": "millilitre",
+        "symbol": "ml",
+        "baseUnit": "litre",
+        "prefix": "milli"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:cubicFoot",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "cubicFoot",
+        "enumValue": "cubicFoot",
+        "displayName": "cubic foot",
+        "symbol": "ft³"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:cubicInch",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "cubicInch",
+        "enumValue": "cubicInch",
+        "displayName": "cubic inch",
+        "symbol": "in³"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:fluidOunce",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "fluidOunce",
+        "enumValue": "fluidOunce",
+        "displayName": "fluid ounce",
+        "symbol": "fl oz"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gallon",
+        "@type": [ "EnumValue", "SymbolicUnit" ],
+        "name": "gallon",
+        "enumValue": "gallon",
+        "displayName": "gallon",
+        "symbol": "gal"
+      }
+    ],
+    "displayName": "VolumeUnit"
+  },
+  {
+    "@context": [
+      "dtmi:dtdl:context;4",
+      "dtmi:dtdl:extension:quantitativeTypes;2"
+    ],
+    "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:enum:VolumeFlowRateUnit",
+    "@type": "Enum",
+    "valueSchema": "string",
+    "enumValues": [
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:litrePerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "litrePerSecond",
+        "enumValue": "litrePerSecond",
+        "displayName": "litre per second",
+        "symbol": "l/s",
+        "baseUnit": "litrePerSecond",
+        "topUnit": "litre",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millilitrePerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "millilitrePerSecond",
+        "enumValue": "millilitrePerSecond",
+        "displayName": "millilitre per second",
+        "symbol": "ml/s",
+        "baseUnit": "litrePerSecond",
+        "prefix": "milli",
+        "topUnit": "millilitre",
+        "bottomUnit": "second"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:litrePerMinute",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "litrePerMinute",
+        "enumValue": "litrePerMinute",
+        "displayName": "litre per minute",
+        "symbol": "l/min",
+        "baseUnit": "litrePerMinute",
+        "topUnit": "litre",
+        "bottomUnit": "minute"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millilitrePerMinute",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "millilitrePerMinute",
+        "enumValue": "millilitrePerMinute",
+        "displayName": "millilitre per minute",
+        "symbol": "ml/min",
+        "baseUnit": "litrePerMinute",
+        "prefix": "milli",
+        "topUnit": "millilitre",
+        "bottomUnit": "minute"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:litrePerHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "litrePerHour",
+        "enumValue": "litrePerHour",
+        "displayName": "litre per hour",
+        "symbol": "l/h",
+        "baseUnit": "litrePerHour",
+        "topUnit": "litre",
+        "bottomUnit": "hour"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:millilitrePerHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "DecimalUnit", "RatioUnit" ],
+        "name": "millilitrePerHour",
+        "enumValue": "millilitrePerHour",
+        "displayName": "millilitre per hour",
+        "symbol": "ml/h",
+        "baseUnit": "litrePerHour",
+        "prefix": "milli",
+        "topUnit": "millilitre",
+        "bottomUnit": "hour"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gallonPerMinute",
+        "@type": [ "EnumValue", "SymbolicUnit", "RatioUnit" ],
+        "name": "gallonPerMinute",
+        "enumValue": "gallonPerMinute",
+        "displayName": "gallon per minute",
+        "symbol": "gal/min",
+        "topUnit": "gallon",
+        "bottomUnit": "minute"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:gallonPerHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "RatioUnit" ],
+        "name": "gallonPerHour",
+        "enumValue": "gallonPerHour",
+        "displayName": "gallon per hour",
+        "symbol": "gal/h",
+        "topUnit": "gallon",
+        "bottomUnit": "hour"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:cubicFootPerMinute",
+        "@type": [ "EnumValue", "SymbolicUnit", "RatioUnit" ],
+        "name": "cubicFootPerMinute",
+        "enumValue": "cubicFootPerMinute",
+        "displayName": "cubic foot per minute",
+        "symbol": "ft³/min",
+        "topUnit": "cubicFoot",
+        "bottomUnit": "minute"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:cubicMetrePerHour",
+        "@type": [ "EnumValue", "SymbolicUnit", "RatioUnit" ],
+        "name": "cubicMetrePerHour",
+        "enumValue": "cubicMetrePerHour",
+        "displayName": "cubic metre per hour",
+        "symbol": "ft³/h",
+        "topUnit": "cubicMetre",
+        "bottomUnit": "hour"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:cubicMetrePerMinute",
+        "@type": [ "EnumValue", "SymbolicUnit", "RatioUnit" ],
+        "name": "cubicMetrePerMinute",
+        "enumValue": "cubicMetrePerMinute",
+        "displayName": "cubic metre per minute",
+        "symbol": "ft³/min",
+        "topUnit": "cubicMetre",
+        "bottomUnit": "minute"
+      },
+      {
+        "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:unit:cubicMetrePerSecond",
+        "@type": [ "EnumValue", "SymbolicUnit", "RatioUnit" ],
+        "name": "cubicMetrePerSecond",
+        "enumValue": "cubicMetrePerSecond",
+        "displayName": "cubic metre per second",
+        "symbol": "ft³/s",
+        "topUnit": "cubicMetre",
+        "bottomUnit": "second"
+      }
+    ],
+    "displayName": "VolumeFlowRateUnit"
+  }
+]
diff --git a/DTDL/v4/metamodel/DTDL.FeatureExtension.quantitativeTypes.v2.RDF-SHACL.json b/DTDL/v4/metamodel/DTDL.FeatureExtension.quantitativeTypes.v2.RDF-SHACL.json
new file mode 100644
index 00000000..68f164af
--- /dev/null
+++ b/DTDL/v4/metamodel/DTDL.FeatureExtension.quantitativeTypes.v2.RDF-SHACL.json
@@ -0,0 +1,794 @@
+{
+  "@context": [
+    "dtmi:dtdl:context;4",
+    "dtmi:dtdl:extension:quantitativeTypes;2"
+  ],
+  "@graph": [
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:documentation",
+      "@type": [ "dtmm:Documentation" ],
+      "dtmm:description": {
+        "en-US": "A set of standard semantic types, unit types, and units."
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:RatioUnit",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "AdjunctType",
+      "sh:or": [
+        { "sh:class": "EnumValue" }
+      ],
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:property:topUnit",
+          "@type": "rdf:Property",
+          "rdfs:domain": "RatioUnit"
+        },
+        {
+          "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:property:bottomUnit",
+          "@type": "rdf:Property",
+          "rdfs:domain": "RatioUnit"
+        }
+      ],
+      "sh:property": [
+        {
+          "sh:path": "topUnit",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:class": "EnumValue",
+          "sh:nodeKind": "sh:BlankNodeOrIRI"
+        },
+        {
+          "sh:path": "bottomUnit",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:class": "EnumValue",
+          "sh:nodeKind": "sh:BlankNodeOrIRI"
+        }
+      ]
+    },
+
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:UnitPrefix",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "AdjunctType",
+      "sh:or": [
+        { "sh:class": "EnumValue" }
+      ],
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:property:symbol;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "UnitPrefix"
+        },
+        {
+          "@id": "dtmi:dtdl:property:exponent;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "UnitPrefix"
+        }
+      ],
+      "sh:property": [
+        {
+          "sh:path": "symbol",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:datatype": "xsd:string",
+          "sh:nodeKind": "sh:Literal"
+        },
+        {
+          "sh:path": "exponent",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:datatype": "xsd:integer",
+          "sh:nodeKind": "sh:Literal"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:DecimalUnit",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "AdjunctType",
+      "sh:or": [
+        { "sh:class": "EnumValue" }
+      ],
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:property:baseUnit",
+          "@type": "rdf:Property",
+          "rdfs:domain": "DecimalUnit"
+        },
+        {
+          "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:property:prefix",
+          "@type": "rdf:Property",
+          "rdfs:domain": "DecimalUnit"
+        }
+      ],
+      "sh:property": [
+        {
+          "sh:path": "baseUnit",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:class": "EnumValue",
+          "sh:nodeKind": "sh:BlankNodeOrIRI"
+        },
+        {
+          "sh:path": "prefix",
+          "sh:maxCount": 1,
+          "sh:class": "EnumValue",
+          "sh:nodeKind": "sh:BlankNodeOrIRI"
+        }
+      ]
+    },
+
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:BinaryUnit",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "AdjunctType",
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:property:baseUnit",
+          "@type": "rdf:Property",
+          "rdfs:domain": "BinaryUnit"
+        },
+        {
+          "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:property:prefix",
+          "@type": "rdf:Property",
+          "rdfs:domain": "BinaryUnit"
+        }
+      ],
+      "sh:property": [
+        {
+          "sh:path": "baseUnit",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:class": "EnumValue",
+          "sh:nodeKind": "sh:BlankNodeOrIRI"
+        },
+        {
+          "sh:path": "prefix",
+          "sh:maxCount": 1,
+          "sh:class": "EnumValue",
+          "sh:nodeKind": "sh:BlankNodeOrIRI"
+        }
+      ]
+    },
+
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:SymbolicUnit",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "AdjunctType",
+      "sh:or": [
+        { "sh:class": "EnumValue" }
+      ],
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:property:symbol;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "SymbolicUnit"
+        }
+      ],
+      "sh:property": [
+        {
+          "sh:path": "symbol",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:datatype": "xsd:string",
+          "sh:nodeKind": "sh:Literal"
+        }
+      ]
+    },
+
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:QuantitativeType",
+      "@type": [ "rdfs:Class", "dtmm:Abstract", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "SemanticType",
+      "sh:or": [
+        { "sh:class": "dtmi:dtdl:class:Property;4" },
+        { "sh:class": "dtmi:dtdl:class:Telemetry;4" },
+        { "sh:class": "dtmi:dtdl:class:SchemaField;4" }
+      ],
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:property:unit",
+          "@type": "rdf:Property",
+          "rdfs:domain": "QuantitativeType"
+        }
+      ],
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:class": "EnumValue",
+          "sh:nodeKind": "sh:BlankNodeOrIRI",
+          "dtmm:description": {
+            "en-US": "The unit type for data associated with the element."
+          }
+        },
+        {
+          "sh:path": "schema",
+          "sh:class": "NumericSchema"
+        }
+      ]
+    },
+
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Acceleration",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "AccelerationUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Angle",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "AngleUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:AngularAcceleration",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "AngularAccelerationUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:AngularVelocity",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "AngularVelocityUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:ApparentEnergy",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "ApparentEnergyUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:ApparentPower",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "ApparentPowerUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Area",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "AreaUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Capacitance",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "CapacitanceUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Concentration",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "Unitless"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Current",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "CurrentUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:DataRate",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "DataRateUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:DataSize",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "DataSizeUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Density",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "DensityUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Distance",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "LengthUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:ElectricCharge",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "ChargeUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Energy",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "EnergyUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:EnergyRate",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "PowerUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Force",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "ForceUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Frequency",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "FrequencyUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Humidity",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "DensityUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Illuminance",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "IlluminanceUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Inductance",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "InductanceUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:IonizingRadiationDose",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "IonizingRadiationDoseUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Irradiance",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "IrradianceUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Latitude",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "AngleUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Longitude",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "AngleUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Length",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "LengthUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Luminance",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "LuminanceUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Luminosity",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "PowerUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:LuminousFlux",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "LuminousFluxUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:LuminousIntensity",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "LuminousIntensityUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:MagneticFlux",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "MagneticFluxUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:MagneticInduction",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "MagneticInductionUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Mass",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "MassUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:MassFlowRate",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "MassFlowRateUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Power",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "PowerUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Pressure",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "PressureUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Radioactivity",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "RadioactivityUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:ReactiveEnergy",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "ReactiveEnergyUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:ReactivePower",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "ReactivePowerUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:RelativeDensity",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "Unitless"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:RelativeHumidity",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "Unitless"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Resistance",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "ResistanceUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:SoundPressure",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "SoundPressureUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Temperature",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "TemperatureUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Thrust",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "ForceUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:TimeSpan",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "TimeUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Torque",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "TorqueUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Velocity",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "VelocityUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Voltage",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "VoltageUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:Volume",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "VolumeUnit"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:extension:quantitativeTypes:v2:class:VolumeFlowRate",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "QuantitativeType",
+      "sh:property": [
+        {
+          "sh:path": "unit",
+          "dtmm:childOf": "VolumeFlowRateUnit"
+        }
+      ]
+    }
+  ]
+}
diff --git a/DTDL/v4/metamodel/DTDL.FeatureExtension.requirement.v1.RDF-SHACL.json b/DTDL/v4/metamodel/DTDL.FeatureExtension.requirement.v1.RDF-SHACL.json
new file mode 100644
index 00000000..6142ca19
--- /dev/null
+++ b/DTDL/v4/metamodel/DTDL.FeatureExtension.requirement.v1.RDF-SHACL.json
@@ -0,0 +1,24 @@
+{
+  "@context": [
+    "dtmi:dtdl:context;4",
+    "dtmi:dtdl:extension:requirement;1"
+  ],
+  "@graph": [
+    {
+      "@id": "dtmi:dtdl:extension:requirement:v1:documentation",
+      "@type": [ "dtmm:Documentation" ],
+      "dtmm:description": {
+        "en-US": "Selectively designate one or more fields in an Object as required."
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:extension:requirement:v1:Required",
+      "@type": [ "rdfs:Class", "sh:NodeShape" ],
+      "rdfs:subClassOf": "AdjunctType",
+      "sh:or": [
+        { "sh:class": "dtmi:dtdl:class:Field;4" },
+        { "sh:class": "dtmi:dtdl:class:Field;3" }
+      ]
+    }
+  ]
+}
diff --git a/DTDL/v4/metamodel/DTDL.v4.ModelElements.json b/DTDL/v4/metamodel/DTDL.v4.ModelElements.json
new file mode 100644
index 00000000..ca01ef26
--- /dev/null
+++ b/DTDL/v4/metamodel/DTDL.v4.ModelElements.json
@@ -0,0 +1,201 @@
+[
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:dtdl:instance:Schema:boolean;4",
+    "@type": [ "Boolean", "Alias" ],
+    "aliasFor": "dtmi:dtdl:instance:Schema:boolean;3",
+    "displayName": "boolean",
+    "description": {
+      "en-US": "a boolean value"
+    }
+  },
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:dtdl:instance:Schema:byte;4",
+    "@type": [ "Byte" ],
+    "displayName": "byte",
+    "description": {
+      "en-US": "a signed integral numeric value that is expressible in 1 byte"
+    }
+  },
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:dtdl:instance:Schema:double;4",
+    "@type": [ "Double", "Alias" ],
+    "aliasFor": "dtmi:dtdl:instance:Schema:double;3",
+    "displayName": "double",
+    "description": {
+      "en-US": "a finite numeric value that is expressible in IEEE 754 double-precision floating point format, conformant with the numeric range of xsd:double"
+    }
+  },
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:dtdl:instance:Schema:float;4",
+    "@type": [ "Float", "Alias" ],
+    "aliasFor": "dtmi:dtdl:instance:Schema:float;3",
+    "displayName": "float",
+    "description": {
+      "en-US": "a finite numeric value that is expressible in IEEE 754 single-precision floating point format, conformant with the numeric range of xsd:float"
+    }
+  },
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:dtdl:instance:Schema:integer;4",
+    "@type": [ "Integer", "Alias" ],
+    "aliasFor": "dtmi:dtdl:instance:Schema:integer;3",
+    "displayName": "integer",
+    "description": {
+      "en-US": "a signed integral numeric value that is expressible in 4 bytes"
+    }
+  },
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:dtdl:instance:Schema:long;4",
+    "@type": [ "Long", "Alias" ],
+    "aliasFor": "dtmi:dtdl:instance:Schema:long;3",
+    "displayName": "long",
+    "description": {
+      "en-US": "a signed integral numeric value that is expressible in 8 bytes"
+    }
+  },
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:dtdl:instance:Schema:short;4",
+    "@type": [ "Short" ],
+    "displayName": "short",
+    "description": {
+      "en-US": "a signed integral numeric value that is expressible in 2 bytes"
+    }
+  },
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:dtdl:instance:Schema:unsignedByte;4",
+    "@type": [ "UnsignedByte" ],
+    "displayName": "unsignedByte",
+    "description": {
+      "en-US": "an unsigned integral numeric value that is expressible in 1 byte"
+    }
+  },
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:dtdl:instance:Schema:unsignedInteger;4",
+    "@type": [ "UnsignedInteger" ],
+    "displayName": "unsignedInteger",
+    "description": {
+      "en-US": "an unsigned integral numeric value that is expressible in 4 bytes"
+    }
+  },
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:dtdl:instance:Schema:unsignedLong;4",
+    "@type": [ "UnsignedLong" ],
+    "displayName": "unsignedLong",
+    "description": {
+      "en-US": "an unsigned integral numeric value that is expressible in 8 bytes"
+    }
+  },
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:dtdl:instance:Schema:unsignedShort;4",
+    "@type": [ "UnsignedShort" ],
+    "displayName": "unsignedShort",
+    "description": {
+      "en-US": "an unsigned integral numeric value that is expressible in 2 bytes"
+    }
+  },
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:dtdl:instance:Schema:decimal;4",
+    "@type": [ "Decimal" ],
+    "displayName": "decimal",
+    "description": {
+      "en-US": "a string of decimal digits with an optional decimal point and fractional component, optionally preceded by a sign"
+    }
+  },
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:dtdl:instance:Schema:date;4",
+    "@type": [ "Date", "Alias" ],
+    "aliasFor": "dtmi:dtdl:instance:Schema:date;3",
+    "displayName": "date",
+    "description": {
+      "en-US": "a date in ISO 8601 format, per [RFC 3339](https://tools.ietf.org/html/rfc3339)"
+    }
+  },
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:dtdl:instance:Schema:dateTime;4",
+    "@type": [ "DateTime", "Alias" ],
+    "aliasFor": "dtmi:dtdl:instance:Schema:dateTime;3",
+    "displayName": "dateTime",
+    "description": {
+      "en-US": "a date and time in ISO 8601 format, per [RFC 3339](https://tools.ietf.org/html/rfc3339)"
+    }
+  },
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:dtdl:instance:Schema:duration;4",
+    "@type": [ "Duration", "Alias" ],
+    "aliasFor": "dtmi:dtdl:instance:Schema:duration;3",
+    "displayName": "duration",
+    "description": {
+      "en-US": "a duration in ISO 8601 format"
+    }
+  },
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:dtdl:instance:Schema:time;4",
+    "@type": [ "Time", "Alias" ],
+    "aliasFor": "dtmi:dtdl:instance:Schema:time;3",
+    "displayName": "time",
+    "description": {
+      "en-US": "a time in ISO 8601 format, per [RFC 3339](https://tools.ietf.org/html/rfc3339)"
+    }
+  },
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:dtdl:instance:Schema:string;4",
+    "@type": [ "String", "Alias" ],
+    "aliasFor": "dtmi:dtdl:instance:Schema:string;3",
+    "displayName": "string",
+    "description": {
+      "en-US": "a UTF8 string"
+    }
+  },
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:dtdl:instance:Schema:bytes;4",
+    "@type": [ "Bytes" ],
+    "displayName": "bytes",
+    "description": {
+      "en-US": "an array of bytes"
+    }
+  },
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:dtdl:instance:Schema:uuid;4",
+    "@type": [ "Uuid" ],
+    "displayName": "uuid",
+    "description": {
+      "en-US": "a UUID string per RFC 9562"
+    }
+  },
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:dtdl:instance:CommandType:asynchronous;4",
+    "@type": "CommandType",
+    "displayName": "asynchronous",
+    "description": {
+      "en-US": "The command will complete sometime after control returns to the caller. After the command completes, the result and any outputs are available."
+    }
+  },
+  {
+    "@context": "dtmi:dtdl:context;4",
+    "@id": "dtmi:dtdl:instance:CommandType:synchronous;4",
+    "@type": "CommandType",
+    "displayName": "synchronous",
+    "description": {
+      "en-US": "The command will be complete when control returns to the caller. The result and any outputs are available immediately."
+    }
+  }
+]
diff --git a/DTDL/v4/metamodel/DTDL.v4.ModelRDF-SHACL.json b/DTDL/v4/metamodel/DTDL.v4.ModelRDF-SHACL.json
new file mode 100644
index 00000000..7d2eb4eb
--- /dev/null
+++ b/DTDL/v4/metamodel/DTDL.v4.ModelRDF-SHACL.json
@@ -0,0 +1,1276 @@
+{
+  "@context": "dtmi:dtdl:context;4",
+  "@graph": [
+    {
+      "@id": "dtmi:dtdl:documentation:support;4",
+      "@type": [ "dtmm:Documentation" ],
+      "dtmm:childProperties": [
+        "dtmi:dtdl:property:enumValues;4"
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:restriction:global;4",
+      "@type": [ "dtmm:Global" ],
+      "dtmm:dtdlVersion": 4,
+      "dtmm:identifier": {
+        "@id": "dtmi:dtdl:restriction:global:identifier;4",
+        "@type": [ "dtmm:Supersedable" ],
+        "sh:pattern": "^dtmi:[A-Za-z](?:[A-Za-z0-9_]*[A-Za-z0-9])?(?::[A-Za-z](?:[A-Za-z0-9_]*[A-Za-z0-9])?)*(?:;[1-9][0-9]{0,8}(?:\\.[1-9][0-9]{0,5})?)?$",
+        "sh:maxLength": 2048,
+        "dtmm:reservedPrefix": [ "dtmi:dtdl:", "dtmi:standard:" ]
+      },
+      "dtmm:partition": {
+        "@type": [ "dtmm:Supersedable" ],
+        "dtmm:maxBytes": 1048576
+      },
+      "dtmm:allowUndefinedExtensionsByDefault": false,
+      "dtmm:localTerms": false,
+      "dtmm:dynamicExtensions": false,
+      "dtmm:restrictKeywords": true,
+      "dtmm:apocrypha": {
+        "dtmm:propertyNeedsCotype": true,
+        "dtmm:neverAllow": {
+          "dtmm:asCotype": [
+            "dtmm:notDtmiNorTerm",
+            "dtmm:invalidDtmi"
+          ],
+          "dtmm:asProperty": [
+            "dtmm:notDtmiNorTerm",
+            "dtmm:invalidDtmi"
+          ]
+        }
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:Entity;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "dtmm:Abstract", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:property:displayName;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Entity;4"
+        },
+        {
+          "@id": "dtmi:dtdl:property:description;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Entity;4"
+        },
+        {
+          "@id": "dtmi:dtdl:property:comment;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Entity;4"
+        },
+        {
+          "@id": "dtmi:dtdl:property:languageMajorVersion;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Entity;4"
+        }
+      ],
+      "sh:property": [
+        {
+          "@id": "dtmi:dtdl:constraint:Entity:displayName;4",
+          "@type": [ "dtmm:Supersedable" ],
+          "sh:path": "dtmi:dtdl:property:displayName;4",
+          "sh:uniqueLang": true,
+          "sh:datatype": "rdf:langString",
+          "sh:nodeKind": "sh:Literal",
+          "sh:maxLength": 512,
+          "dtmm:description": {
+            "en-US": "A localizable name for display."
+          }
+        },
+        {
+          "@id": "dtmi:dtdl:constraint:Entity:description;4",
+          "@type": [ "dtmm:Supersedable" ],
+          "sh:path": "dtmi:dtdl:property:description;4",
+          "sh:uniqueLang": true,
+          "sh:datatype": "rdf:langString",
+          "sh:nodeKind": "sh:Literal",
+          "sh:maxLength": 512,
+          "dtmm:description": {
+            "en-US": "A localizable description for display."
+          }
+        },
+        {
+          "@id": "dtmi:dtdl:constraint:Entity:comment;4",
+          "@type": [ "dtmm:Supersedable" ],
+          "sh:path": "dtmi:dtdl:property:comment;4",
+          "sh:maxCount": 1,
+          "sh:datatype": "xsd:string",
+          "sh:nodeKind": "sh:Literal",
+          "sh:maxLength": 512,
+          "dtmm:description": {
+            "en-US": "A comment for model authors."
+          }
+        },
+        {
+          "@id": "dtmi:dtdl:constraint:Entity:languageMajorVersion;4",
+          "sh:path": "dtmi:dtdl:property:languageMajorVersion;4",
+          "sh:minCount": 0,
+          "sh:maxCount": 0,
+          "sh:datatype": "xsd:integer",
+          "sh:nodeKind": "sh:Literal",
+          "dtmm:value": 4,
+          "dtmm:description": {
+            "en-US": "The major version of DTDL used to author this element."
+          }
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:class:Interface;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "dtmm:Partition", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:Entity;4",
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:property:contents;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Interface;4"
+        },
+        {
+          "@id": "dtmi:dtdl:property:extends;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Interface;4"
+        },
+        {
+          "@id": "dtmi:dtdl:property:schemas;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Interface;4"
+        }
+      ],
+      "sh:property": [
+        {
+          "@id": "dtmi:dtdl:constraint:Interface:contents;4",
+          "sh:path": "dtmi:dtdl:property:contents;4",
+          "sh:or": [
+            { "sh:class": "dtmi:dtdl:class:Content;4" },
+            { "sh:class": "dtmi:dtdl:class:Content;3" },
+            { "sh:class": "dtmi:dtdl:class:Content;2" }
+          ],
+          "sh:nodeKind": "sh:BlankNodeOrIRI",
+          "dtmm:uniqueProperties": [ "dtmi:dtdl:property:name;4" ],
+          "dtmm:dtmiSegment": "dtmi:dtdl:property:name;4",
+          "dtmm:dictionaryKey": "dtmi:dtdl:property:name;4",
+          "dtmm:synthesize": [
+            {
+              "dtmm:syntheticProp": "components",
+              "dtmm:breakoutSubtypes": [ "dtmi:dtdl:class:Component;2", "dtmi:dtdl:class:Component;3", "dtmi:dtdl:class:Component;4" ]
+            },
+            {
+              "dtmm:syntheticProp": "properties",
+              "dtmm:breakoutSubtypes": [ "dtmi:dtdl:class:Property;2", "dtmi:dtdl:class:Property;3", "dtmi:dtdl:class:Property;4" ]
+            },
+            {
+              "dtmm:syntheticProp": "telemetries",
+              "dtmm:breakoutSubtypes": [ "dtmi:dtdl:class:Telemetry;2", "dtmi:dtdl:class:Telemetry;3", "dtmi:dtdl:class:Telemetry;4" ]
+            },
+            {
+              "dtmm:syntheticProp": "commands",
+              "dtmm:breakoutSubtypes": [ "dtmi:dtdl:class:Command;2", "dtmi:dtdl:class:Command;3", "dtmi:dtdl:class:Command;4" ]
+            },
+            {
+              "dtmm:syntheticProp": "relationships",
+              "dtmm:breakoutSubtypes": [ "dtmi:dtdl:class:Relationship;2", "dtmi:dtdl:class:Relationship;3", "dtmi:dtdl:class:Relationship;4" ]
+            }
+          ],
+          "dtmm:description": {
+            "en-US": "A set of elements that define the contents of this Interface."
+          }
+        },
+        {
+          "@id": "dtmi:dtdl:constraint:Interface:extends;4",
+          "sh:path": "dtmi:dtdl:property:extends;4",
+          "sh:or": [
+            { "sh:class": "dtmi:dtdl:class:Interface;4" },
+            { "sh:class": "dtmi:dtdl:class:Interface;3" },
+            { "sh:class": "dtmi:dtdl:class:Interface;2" }
+          ],
+          "sh:nodeKind": "sh:IRI",
+          "dtmm:synthesize": [
+            {
+              "dtmm:syntheticProp": "extendedBy",
+              "dtmm:reverseDirection": true
+            }
+          ],
+          "dtmm:description": {
+            "en-US": "A set of DTMIs that refer to Interfaces from which this Interface inherits contents. Interfaces can inherit from multiple Interfaces."
+          }
+        },
+        {
+          "@id": "dtmi:dtdl:constraint:Interface:schemas;4",
+          "sh:path": "dtmi:dtdl:property:schemas;4",
+          "sh:class": "ComplexSchema",
+          "sh:nodeKind": "sh:IRI",
+          "dtmm:description": {
+            "en-US": "A set of complex schema objects that are reusable within this Interface."
+          }
+        }
+      ],
+      "dtmm:identifier": {
+        "@id": "dtmi:dtdl:restriction:Interface:identifier;4",
+        "@type": [ "dtmm:Supersedable" ],
+        "sh:maxLength": 128
+      },
+      "dtmm:descendants": [
+        {
+          "@id": "dtmi:dtdl:descendants:Interface:extends;4",
+          "@type": [ "dtmm:Supersedable" ],
+          "dtmm:properties": [ "dtmi:dtdl:property:extends;4" ],
+          "dtmm:narrow": true,
+          "dtmm:importProperties": [ "dtmi:dtdl:property:contents;4" ],
+          "dtmm:maxCount": 1024,
+          "dtmm:maxDepth": 12
+        },
+        {
+          "@id": "dtmi:dtdl:descendants:Interface:contents;4",
+          "@type": [ "dtmm:Supersedable" ],
+          "dtmm:properties": [
+            "dtmi:dtdl:property:contents;4",
+            "dtmi:dtdl:property:fields;4",
+            "dtmi:dtdl:property:enumValues;4",
+            "dtmi:dtdl:property:request;4",
+            "dtmi:dtdl:property:response;4",
+            "dtmi:dtdl:property:properties;4",
+            "dtmi:dtdl:property:schema;4",
+            "dtmi:dtdl:property:elementSchema;4",
+            "dtmi:dtdl:property:mapValue;4"
+          ],
+          "dtmm:narrow": true,
+          "dtmm:maxCount": 100000,
+          "dtmm:allowSelf": true
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:class:NamedEntity;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "dtmm:Abstract", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:Entity;4",
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:property:name;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:NamedEntity;4"
+        }
+      ],
+      "sh:property": [
+        {
+          "@id": "dtmi:dtdl:constraint:NamedEntity:name;4",
+          "sh:path": "dtmi:dtdl:property:name;4",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:datatype": "xsd:string",
+          "sh:nodeKind": "sh:Literal",
+          "sh:pattern": "^[A-Za-z](?:[A-Za-z0-9_]*[A-Za-z0-9])?$",
+          "dtmm:patternDesc": {
+            "en-US": "contains only alphanumerics and underscore, starting with a letter, ending with alphanumeric"
+          },
+          "sh:maxLength": 512,
+          "dtmm:description": {
+            "en-US": "The programming name of the element."
+          }
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:class:SchemaField;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "dtmm:Abstract", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:NamedEntity;4",
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:property:schema;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:SchemaField;4"
+        }
+      ],
+      "sh:property": [
+        {
+          "@id": "dtmi:dtdl:constraint:SchemaField:schema;4",
+          "sh:path": "dtmi:dtdl:property:schema;4",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:or": [
+            { "sh:class": "dtmi:dtdl:class:Schema;4" },
+            { "sh:class": "dtmi:dtdl:class:Schema;3" },
+            { "sh:class": "dtmi:dtdl:class:Schema;2" }
+          ],
+          "sh:nodeKind": "sh:BlankNodeOrIRI",
+          "dtmm:description": {
+            "en-US": "The data type of the element, which is an instance of Schema."
+          }
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:class:Schema;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "dtmm:Abstract", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:Entity;4"
+    },
+    {
+      "@id": "dtmi:dtdl:class:PrimitiveSchema;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "dtmm:Abstract", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:Schema;4"
+    },
+    {
+      "@id": "dtmi:dtdl:class:Boolean;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:PrimitiveSchema;4",
+      "dtmm:instance": {
+        "dtmm:jsonType": "dtmm:jsonBool",
+        "dtmm:authority": "JSON"
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:NumericSchema;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "dtmm:Abstract", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:PrimitiveSchema;4"
+    },
+    {
+      "@id": "dtmi:dtdl:class:Byte;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:NumericSchema;4",
+      "dtmm:instance": {
+        "dtmm:jsonType": "dtmm:jsonNumber",
+        "sh:datatype": "xsd:byte"
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:Double;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:NumericSchema;4",
+      "dtmm:instance": {
+        "dtmm:jsonType": "dtmm:jsonNumber",
+        "sh:datatype": "xsd:double"
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:Float;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:NumericSchema;4",
+      "dtmm:instance": {
+        "dtmm:jsonType": "dtmm:jsonNumber",
+        "sh:datatype": "xsd:float"
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:Integer;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:NumericSchema;4",
+      "dtmm:instance": {
+        "dtmm:jsonType": "dtmm:jsonNumber",
+        "sh:datatype": "xsd:int"
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:Long;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:NumericSchema;4",
+      "dtmm:instance": {
+        "dtmm:jsonType": "dtmm:jsonNumber",
+        "sh:datatype": "xsd:long"
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:Short;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:NumericSchema;4",
+      "dtmm:instance": {
+        "dtmm:jsonType": "dtmm:jsonNumber",
+        "sh:datatype": "xsd:short"
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:UnsignedByte;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:NumericSchema;4",
+      "dtmm:instance": {
+        "dtmm:jsonType": "dtmm:jsonNumber",
+        "sh:datatype": "xsd:unsignedByte",
+        "sh:pattern": "^[0-9]+$"
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:UnsignedInteger;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:NumericSchema;4",
+      "dtmm:instance": {
+        "dtmm:jsonType": "dtmm:jsonNumber",
+        "sh:datatype": "xsd:unsignedInt",
+        "sh:pattern": "^[0-9]+$"
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:UnsignedLong;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:NumericSchema;4",
+      "dtmm:instance": {
+        "dtmm:jsonType": "dtmm:jsonNumber",
+        "sh:datatype": "xsd:unsignedLong",
+        "sh:pattern": "^[0-9]+$"
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:UnsignedShort;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:NumericSchema;4",
+      "dtmm:instance": {
+        "dtmm:jsonType": "dtmm:jsonNumber",
+        "sh:datatype": "xsd:unsignedShort",
+        "sh:pattern": "^[0-9]+$"
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:Decimal;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:NumericSchema;4",
+      "dtmm:instance": {
+        "dtmm:jsonType": "dtmm:jsonString",
+        "sh:datatype": "xsd:decimal",
+        "sh:pattern": "^(?:\\+|-)?(?:[1-9][0-9]*|0)(?:\\.[0-9]*)?$"
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:TemporalSchema;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "dtmm:Abstract", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:PrimitiveSchema;4"
+    },
+    {
+      "@id": "dtmi:dtdl:class:Date;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:TemporalSchema;4",
+      "dtmm:instance": {
+        "dtmm:jsonType": "dtmm:jsonString",
+        "sh:datatype": "xsd:date",
+        "sh:pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}$",
+        "dtmm:authority": "RFC 3339"
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:DateTime;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:TemporalSchema;4",
+      "dtmm:instance": {
+        "dtmm:jsonType": "dtmm:jsonString",
+        "sh:datatype": "xsd:dateTime",
+        "sh:pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(?:\\.[0-9]+)?(?:Z|(?:\\+|\\-)[0-9]{2}:[0-9]{2})$",
+        "dtmm:authority": "RFC 3339"
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:Duration;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:TemporalSchema;4",
+      "dtmm:instance": {
+        "dtmm:jsonType": "dtmm:jsonString",
+        "sh:datatype": "xsd:duration",
+        "sh:pattern": "^P(?!$)(?:(?:(?:(?:\\d+Y)|(?:\\d+\\.\\d+Y$))?(?:(?:\\d+M)|(?:\\d+\\.\\d+M$))?)|(?:(?:(?:\\d+W)|(?:\\d+\\.\\d+W$))?))(?:(?:\\d+D)|(?:\\d+\\.\\d+D$))?(?:T(?!$)(?:(?:\\d+H)|(?:\\d+\\.\\d+H$))?(?:(?:\\d+M)|(?:\\d+\\.\\d+M$))?(?:\\d+(?:\\.\\d+)?S)?)?$",
+        "dtmm:authority": "ISO 8601"
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:Time;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:TemporalSchema;4",
+      "dtmm:instance": {
+        "dtmm:jsonType": "dtmm:jsonString",
+        "sh:datatype": "xsd:time",
+        "sh:pattern": "^[0-9]{2}:[0-9]{2}:[0-9]{2}(?:\\.[0-9]+)?(?:Z|(?:\\+|\\-)[0-9]{2}:[0-9]{2})$",
+        "dtmm:authority": "RFC 3339"
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:String;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:PrimitiveSchema;4",
+      "dtmm:instance": {
+        "dtmm:jsonType": "dtmm:jsonString",
+        "dtmm:authority": "JSON"
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:Bytes;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:PrimitiveSchema;4",
+      "dtmm:instance": {
+        "dtmm:jsonType": "dtmm:jsonString",
+        "sh:datatype": "xsd:base64Binary",
+        "sh:pattern": "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$",
+        "dtmm:authority": "RFC 4648"
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:Uuid;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:PrimitiveSchema;4",
+      "dtmm:instance": {
+        "dtmm:jsonType": "dtmm:jsonString",
+        "sh:pattern": "^[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}$",
+        "dtmm:authority": "RFC 9562",
+        "dtmm:moniker": "UUID"
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:ComplexSchema;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "dtmm:Abstract", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:Schema;4",
+      "dtmm:descendants": [
+        {
+          "@id": "dtmi:dtdl:restriction:ComplexSchema:depth;4",
+          "@type": [ "dtmm:Supersedable" ],
+          "dtmm:properties": [ "dtmi:dtdl:property:elementSchema;4", "dtmi:dtdl:property:schema;4" ],
+          "dtmm:maxDepth": 8,
+          "dtmm:allowSelf": true
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:class:Array;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:ComplexSchema;4",
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:property:elementSchema;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Array;4"
+        }
+      ],
+      "sh:property": [
+        {
+          "@id": "dtmi:dtdl:constraint:Array:elementSchema;4",
+          "sh:path": "dtmi:dtdl:property:elementSchema;4",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:or": [
+            { "sh:class": "dtmi:dtdl:class:Schema;4" },
+            { "sh:class": "dtmi:dtdl:class:Schema;3" },
+            { "sh:class": "dtmi:dtdl:class:Schema;2" }
+          ],
+          "sh:nodeKind": "sh:BlankNodeOrIRI",
+          "dtmm:description": {
+            "en-US": "The data type of each element in the Array, which is an instance of Schema."
+          }
+        }
+      ],
+      "dtmm:instance": {
+        "dtmm:jsonType": "dtmm:jsonArray",
+        "dtmm:eachChild": {
+          "dtmm:instanceProperty": "dtmi:dtdl:property:elementSchema;4"
+        }
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:Enum;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:ComplexSchema;4",
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:property:valueSchema;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Enum;4"
+        },
+        {
+          "@id": "dtmi:dtdl:property:enumValues;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Enum;4"
+        }
+      ],
+      "sh:property": [
+        {
+          "@id": "dtmi:dtdl:constraint:Enum:valueSchema;4",
+          "sh:path": "dtmi:dtdl:property:valueSchema;4",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:or": [
+            { "sh:class": "dtmi:dtdl:class:PrimitiveSchema;4" },
+            { "sh:class": "dtmi:dtdl:class:PrimitiveSchema;3" },
+            { "sh:class": "dtmi:dtdl:class:PrimitiveSchema;2" }
+          ],
+          "sh:in": [
+            "dtmi:dtdl:instance:Schema:integer;4",
+            "dtmi:dtdl:instance:Schema:integer;3",
+            "dtmi:dtdl:instance:Schema:integer;2",
+            "dtmi:dtdl:instance:Schema:string;4",
+            "dtmi:dtdl:instance:Schema:string;3",
+            "dtmi:dtdl:instance:Schema:string;2"
+          ],
+          "sh:nodeKind": "sh:IRI",
+          "dtmm:description": {
+            "en-US": "The data type for the enumValues; all values must be of the same type."
+          }
+        },
+        {
+          "@id": "dtmi:dtdl:constraint:Enum:enumValues;4",
+          "sh:path": "dtmi:dtdl:property:enumValues;4",
+          "sh:class": "EnumValue",
+          "sh:nodeKind": "sh:BlankNodeOrIRI",
+          "dtmm:typeInferable": true,
+          "dtmm:uniqueProperties": [ "dtmi:dtdl:property:name;4", "dtmi:dtdl:property:enumValue;4" ],
+          "dtmm:dtmiSegment": "dtmi:dtdl:property:name;4",
+          "dtmm:description": {
+            "en-US": "A set of name/value mappings for the Enum."
+          }
+        }
+      ],
+      "dtmm:descendants": [
+        {
+          "@id": "dtmi:dtdl:restriction:Enum:enumValue:datatype;4",
+          "dtmm:properties": [ "dtmi:dtdl:property:enumValue;4" ],
+          "dtmm:datatypeProperty": "dtmi:dtdl:property:valueSchema;4"
+        }
+      ],
+      "dtmm:instance": {
+        "dtmm:instanceProperty": [
+          "dtmi:dtdl:property:valueSchema;4",
+          "dtmi:dtdl:property:enumValues;4"
+        ]
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:EnumValue;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:NamedEntity;4",
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:property:enumValue;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:EnumValue;4"
+        }
+      ],
+      "sh:property": [
+        {
+          "@id": "dtmi:dtdl:constraint:EnumValue:enumValue;4",
+          "sh:path": "dtmi:dtdl:property:enumValue;4",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:nodeKind": "sh:Literal",
+          "dtmm:description": {
+            "en-US": "The on-the-wire value that maps to the EnumValue, which may be either an integer or a string."
+          }
+        }
+      ],
+      "dtmm:instance": {
+        "dtmm:hasValue": "dtmi:dtdl:property:enumValue;4"
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:Map;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:ComplexSchema;4",
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:property:mapKey;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Map;4"
+        },
+        {
+          "@id": "dtmi:dtdl:property:mapValue;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Map;4"
+        }
+      ],
+      "sh:property": [
+        {
+          "@id": "dtmi:dtdl:constraint:Map:mapKey;4",
+          "sh:path": "dtmi:dtdl:property:mapKey;4",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:class": "MapKey",
+          "sh:nodeKind": "sh:BlankNodeOrIRI",
+          "dtmm:typeInferable": true,
+          "dtmm:description": {
+            "en-US": "A description of the keys in the Map."
+          }
+        },
+        {
+          "@id": "dtmi:dtdl:constraint:Map:mapValue;4",
+          "sh:path": "dtmi:dtdl:property:mapValue;4",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:class": "MapValue",
+          "sh:nodeKind": "sh:BlankNodeOrIRI",
+          "dtmm:typeInferable": true,
+          "dtmm:description": {
+            "en-US": "A description of the values in the Map."
+          }
+        }
+      ],
+      "dtmm:instance": {
+        "dtmm:jsonType": "dtmm:jsonObject",
+        "dtmm:eachChild": {
+          "dtmm:instanceProperty": "dtmi:dtdl:property:mapValue;4"
+        }
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:MapKey;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:NamedEntity;4",
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:property:schema;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:MapKey;4"
+        }
+      ],
+      "sh:property": [
+        {
+          "@id": "dtmi:dtdl:constraint:MapKey:schema;4",
+          "sh:path": "dtmi:dtdl:property:schema;4",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:or": [
+            { "sh:class": "dtmi:dtdl:class:String;4" },
+            { "sh:class": "dtmi:dtdl:class:String;3" },
+            { "sh:class": "dtmi:dtdl:class:String;2" }
+          ],
+          "sh:in": [ "dtmi:dtdl:instance:Schema:string;4", "dtmi:dtdl:instance:Schema:string;3", "dtmi:dtdl:instance:Schema:string;2" ],
+          "sh:nodeKind": "sh:IRI",
+          "dtmm:description": {
+            "en-US": "The data type of the Map's key, which must be string."
+          }
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:class:MapValue;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:SchemaField;4",
+      "dtmm:instance": {
+        "dtmm:jsonType": "dtmm:jsonProperty",
+        "dtmm:propertyValue": {
+          "dtmm:instanceProperty": "dtmi:dtdl:property:schema;4"
+        }
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:Object;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:ComplexSchema;4",
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:property:fields;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Object;4"
+        }
+      ],
+      "sh:property": [
+        {
+          "@id": "dtmi:dtdl:constraint:Object:fields;4",
+          "sh:path": "dtmi:dtdl:property:fields;4",
+          "sh:class": "Field",
+          "sh:nodeKind": "sh:BlankNodeOrIRI",
+          "dtmm:typeInferable": true,
+          "dtmm:uniqueProperties": [ "dtmi:dtdl:property:name;4" ],
+          "dtmm:dtmiSegment": "dtmi:dtdl:property:name;4",
+          "dtmm:description": {
+            "en-US": "A set of field descriptions, one for each field in the Object."
+          }
+        }
+      ],
+      "dtmm:instance": {
+        "dtmm:jsonType": "dtmm:jsonObject",
+        "dtmm:eachChild": {
+          "dtmm:instanceProperty": "dtmi:dtdl:property:fields;4"
+        }
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:Field;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:SchemaField;4",
+      "dtmm:instance": {
+        "dtmm:jsonType": "dtmm:jsonProperty",
+        "dtmm:propertyName": {
+          "dtmm:hasValue": "dtmi:dtdl:property:name;4"
+        },
+        "dtmm:propertyValue": {
+          "dtmm:instanceProperty": "dtmi:dtdl:property:schema;4"
+        }
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:Content;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "dtmm:Abstract", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:NamedEntity;4"
+    },
+    {
+      "@id": "dtmi:dtdl:class:Component;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:Content;4",
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:property:schema;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Component;4"
+        }
+      ],
+      "sh:property": [
+        {
+          "@id": "dtmi:dtdl:constraint:Component:schema;4",
+          "sh:path": "dtmi:dtdl:property:schema;4",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:or": [
+            { "sh:class": "dtmi:dtdl:class:Interface;4" },
+            { "sh:class": "dtmi:dtdl:class:Interface;3" },
+            { "sh:class": "dtmi:dtdl:class:Interface;2" }
+          ],
+          "sh:nodeKind": "sh:IRI",
+          "dtmm:description": {
+            "en-US": "The data type of the Component, which is an instance of Interface."
+          }
+        }
+      ],
+      "dtmm:descendants": [
+        {
+          "@id": "dtmi:dtdl:restriction:Component:contents:excludeComponent;4",
+          "dtmm:properties": [ "dtmi:dtdl:property:schema;4", "dtmi:dtdl:property:contents;4" ],
+          "dtmm:narrow": true,
+          "dtmm:excludeType": "Component"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:class:Property;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:Content;4",
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:property:schema;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Property;4"
+        },
+        {
+          "@id": "dtmi:dtdl:property:writable;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Property;4"
+        }
+      ],
+      "sh:property": [
+        {
+          "@id": "dtmi:dtdl:constraint:Property:schema;4",
+          "sh:path": "dtmi:dtdl:property:schema;4",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:or": [
+            { "sh:class": "dtmi:dtdl:class:Schema;4" },
+            { "sh:class": "dtmi:dtdl:class:Schema;3" },
+            { "sh:class": "dtmi:dtdl:class:Schema;2" }
+          ],
+          "sh:nodeKind": "sh:BlankNodeOrIRI",
+          "dtmm:description": {
+            "en-US": "The data type of the Property, which is an instance of Schema."
+          }
+        },
+        {
+          "@id": "dtmi:dtdl:constraint:Property:writable;4",
+          "sh:path": "dtmi:dtdl:property:writable;4",
+          "sh:maxCount": 1,
+          "sh:datatype": "xsd:boolean",
+          "sh:nodeKind": "sh:Literal",
+          "dtmm:description": {
+            "en-US": "A boolean value that indicates whether the Property is writable or not. The default value is false, indicating the Property is read-only."
+          }
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:class:Telemetry;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:Content;4",
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:property:schema;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Telemetry;4"
+        }
+      ],
+      "sh:property": [
+        {
+          "@id": "dtmi:dtdl:constraint:Telemetry:schema;4",
+          "sh:path": "dtmi:dtdl:property:schema;4",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:or": [
+            { "sh:class": "dtmi:dtdl:class:Schema;4" },
+            { "sh:class": "dtmi:dtdl:class:Schema;3" },
+            { "sh:class": "dtmi:dtdl:class:Schema;2" }
+          ],
+          "sh:nodeKind": "sh:BlankNodeOrIRI",
+          "dtmm:description": {
+            "en-US": "The data type of the Telemetry, which is an instance of Schema."
+          }
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:class:Command;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:Content;4",
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:property:request;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Command;4"
+        },
+        {
+          "@id": "dtmi:dtdl:property:response;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Command;4"
+        },
+        {
+          "@id": "dtmi:dtdl:property:commandType;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Command;4"
+        }
+      ],
+      "sh:property": [
+        {
+          "@id": "dtmi:dtdl:constraint:Command:request;4",
+          "sh:path": "dtmi:dtdl:property:request;4",
+          "sh:maxCount": 1,
+          "sh:class": "CommandRequest",
+          "sh:nodeKind": "sh:BlankNodeOrIRI",
+          "dtmm:typeInferable": true,
+          "dtmm:description": {
+            "en-US": "A description of the input to the Command."
+          }
+        },
+        {
+          "@id": "dtmi:dtdl:constraint:Command:response;4",
+          "sh:path": "dtmi:dtdl:property:response;4",
+          "sh:maxCount": 1,
+          "sh:class": "CommandResponse",
+          "sh:nodeKind": "sh:BlankNodeOrIRI",
+          "dtmm:typeInferable": true,
+          "dtmm:description": {
+            "en-US": "A description of the output of the Command."
+          }
+        },
+        {
+          "@id": "dtmi:dtdl:constraint:Command:commandType;4",
+          "sh:path": "dtmi:dtdl:property:commandType;4",
+          "sh:maxCount": 1,
+          "sh:class": "CommandType",
+          "sh:in": [ "dtmi:dtdl:instance:CommandType:asynchronous;4", "dtmi:dtdl:instance:CommandType:synchronous;4" ],
+          "sh:nodeKind": "sh:IRI",
+          "dtmm:description": {
+            "en-US": "This property is deprecated. Either value, synchronous or asynchronous, has the same meaning: a command that starts execution within a configurable time and that completes execution within a configurable time."
+          },
+          "dtmm:deprecated": true,
+          "dtmm:hidden": true
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:class:CommandPayload;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "dtmm:Abstract", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:SchemaField;4",
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:property:nullable;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:CommandPayload;4"
+        }
+      ],
+      "sh:property": [
+        {
+          "@id": "dtmi:dtdl:constraint:CommandPayload:nullable;4",
+          "sh:path": "dtmi:dtdl:property:nullable;4",
+          "sh:maxCount": 1,
+          "sh:datatype": "xsd:boolean",
+          "sh:nodeKind": "sh:Literal",
+          "dtmm:description": {
+            "en-US": "A boolean value that indicates whether the Command payload may be null. The default value is false, indicating the payload is mandatory."
+          }
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:class:CommandRequest;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:CommandPayload;4"
+    },
+    {
+      "@id": "dtmi:dtdl:class:CommandResponse;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:CommandPayload;4"
+    },
+    {
+      "@id": "dtmi:dtdl:class:CommandType;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:Entity;4"
+    },
+    {
+      "@id": "dtmi:dtdl:class:Relationship;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:Content;4",
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:property:maxMultiplicity;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Relationship;4"
+        },
+        {
+          "@id": "dtmi:dtdl:property:minMultiplicity;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Relationship;4"
+        },
+        {
+          "@id": "dtmi:dtdl:property:target;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Relationship;4"
+        },
+        {
+          "@id": "dtmi:dtdl:property:properties;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Relationship;4"
+        },
+        {
+          "@id": "dtmi:dtdl:property:writable;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Relationship;4"
+        }
+      ],
+      "sh:property": [
+        {
+          "@id": "dtmi:dtdl:constraint:Relationship:maxMultiplicity;4",
+          "sh:path": "dtmi:dtdl:property:maxMultiplicity;4",
+          "sh:maxCount": 1,
+          "sh:datatype": "xsd:integer",
+          "sh:nodeKind": "sh:Literal",
+          "sh:minInclusive": 1,
+          "dtmm:description": {
+            "en-US": "The maximum multiplicity for the target of the Relationship; defaults to the maximum allowable value."
+          }
+        },
+        {
+          "@id": "dtmi:dtdl:constraint:Relationship:minMultiplicity;4",
+          "sh:path": "dtmi:dtdl:property:minMultiplicity;4",
+          "sh:maxCount": 1,
+          "sh:datatype": "xsd:integer",
+          "sh:nodeKind": "sh:Literal",
+          "sh:minInclusive": 0,
+          "sh:maxInclusive": 0,
+          "dtmm:description": {
+            "en-US": "The minimum multiplicity for the target of the Relationship; defaults to the minimum allowable value."
+          }
+        },
+        {
+          "@id": "dtmi:dtdl:constraint:Relationship:target;4",
+          "sh:path": "dtmi:dtdl:property:target;4",
+          "sh:maxCount": 1,
+          "sh:nodeKind": "sh:IRI",
+          "sh:pattern": "^dtmi:[A-Za-z](?:[A-Za-z0-9_]*[A-Za-z0-9])?(?::[A-Za-z](?:[A-Za-z0-9_]*[A-Za-z0-9])?)*(?:;[1-9][0-9]{0,8}(?:\\.[1-9][0-9]{0,5})?)?$",
+          "dtmm:patternDesc": {
+            "en-US": "must follow user DTMI syntax"
+          },
+          "sh:maxLength": 2048,
+          "dtmm:description": {
+            "en-US": "An Interface identifier. If no target is specified, each instance target is permitted to be any Interface."
+          }
+        },
+        {
+          "@id": "dtmi:dtdl:constraint:Relationship:properties;4",
+          "sh:path": "dtmi:dtdl:property:properties;4",
+          "sh:or": [
+            { "sh:class": "dtmi:dtdl:class:Property;4" },
+            { "sh:class": "dtmi:dtdl:class:Property;3" },
+            { "sh:class": "dtmi:dtdl:class:Property;2" }
+          ],
+          "sh:nodeKind": "sh:BlankNodeOrIRI",
+          "dtmm:uniqueProperties": [ "dtmi:dtdl:property:name;4" ],
+          "dtmm:dtmiSegment": "dtmi:dtdl:property:name;4",
+          "dtmm:description": {
+            "en-US": "A set of Properties that define Relationship-specific state."
+          }
+        },
+        {
+          "@id": "dtmi:dtdl:constraint:Relationship:writable;4",
+          "sh:path": "dtmi:dtdl:property:writable;4",
+          "sh:maxCount": 1,
+          "sh:datatype": "xsd:boolean",
+          "sh:nodeKind": "sh:Literal",
+          "dtmm:description": {
+            "en-US": "A boolean value that indicates whether the Relationship is writable or not. The default value is false, indicating the Relationship is read-only."
+          }
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:class:Alias;4",
+      "@type": [ "rdfs:Class", "dtmm:Alias", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "sh:or": [
+        { "sh:class": "Entity" }
+      ],
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:property:aliasFor;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "Alias"
+        }
+      ],
+      "sh:property": [
+        {
+          "@id": "dtmi:standard:constraint:Alias:aliasFor;4",
+          "sh:path": "aliasFor",
+          "sh:minCount": 1,
+          "sh:maxCount": 1,
+          "sh:class": "Entity",
+          "sh:nodeKind": "sh:BlankNodeOrIRI",
+          "dtmm:aliasFor": true
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:class:AdjunctType;4",
+      "@type": [ "rdfs:Class", "dtmm:Abstract", "dtmm:Extensible", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "sh:or": [
+        { "sh:class": "dtmi:dtdl:class:Entity;4" },
+        { "sh:class": "dtmi:dtdl:class:Entity;3" },
+        { "sh:class": "dtmi:dtdl:class:Entity;2" }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:class:LatentType;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "dtmm:Abstract", "dtmm:Extensible", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:Entity;4"
+    },
+    {
+      "@id": "dtmi:dtdl:class:NamedLatentType;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "dtmm:Abstract", "dtmm:Extensible", "sh:NodeShape" ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:NamedEntity;4"
+    },
+    {
+      "@id": "dtmi:dtdl:class:SemanticType;4",
+      "@type": [ "rdfs:Class", "dtmm:Abstract", "dtmm:Extensible", "sh:NodeShape" ],
+      "dtmm:remarks": [
+        "Intuitively, SemanticType should be a subclass of AdjunctType; however, there are implementation challenges with making it so.",
+        "In particular, both AdjunctType and SemanticType are dtmm:Extensible, so subclassing would create a hierarichal relationship between two extensible classes in the metamodel.",
+        "Theoretically, the dtmm:Extensible type could be removed from SemanticType;4, but since it is present on SemanticType;2, extensibility would differ across language versions.",
+        "Future versions of the metaparser might support either hierarchically related extensible classes or extensibility differences across language versions, but the DTDL v3 parser does not.",
+        "As a practical matter, usage of the extensible classes is not affected by this lack of hierarchical relationship:",
+        "Extension types that are semantic inherit from SemanticType; extension types that are not semantic inherit from other types."
+      ],
+      "dtmm:dtdlVersion": 4,
+      "sh:or": [
+        { "sh:class": "dtmi:dtdl:class:Relationship;4" },
+        { "sh:class": "dtmi:dtdl:class:Relationship;3" },
+        { "sh:class": "dtmi:dtdl:class:Relationship;2" },
+        { "sh:class": "dtmi:dtdl:class:Property;4" },
+        { "sh:class": "dtmi:dtdl:class:Property;3" },
+        { "sh:class": "dtmi:dtdl:class:Property;2" },
+        { "sh:class": "dtmi:dtdl:class:Telemetry;4" },
+        { "sh:class": "dtmi:dtdl:class:Telemetry;3" },
+        { "sh:class": "dtmi:dtdl:class:Telemetry;2" },
+        { "sh:class": "dtmi:dtdl:class:SchemaField;4" },
+        { "sh:class": "dtmi:dtdl:class:SchemaField;3" },
+        { "sh:class": "dtmi:dtdl:class:SchemaField;2" }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:class:Unit;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "dtmm:Abstract", "dtmm:Extensible", "sh:NodeShape" ],
+      "dtmm:remarks": [
+        "Intuitively, Unit should be a subclass of LatentType, not of Entity; however, there are implementation challenges with making it so.",
+        "In particular, both LatentType and Unit are dtmm:Extensible, so subclassing would create a hierarichal relationship between two extensible classes in the metamodel.",
+        "Theoretically, the dtmm:Extensible type could be removed from Unit;4, but since it is present on Unit;2, extensibility would differ across language versions.",
+        "Future versions of the metaparser might support either hierarchically related extensible classes or extensibility differences across language versions, but the DTDL v3 parser does not.",
+        "As a practical matter, usage of the extensible classes is not affected by this lack of hierarchical relationship:",
+        "Latent types that are units inherit from Unit; latent types that are not units inherit from other types."
+      ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:Entity;4",
+      "dtmm:property": [
+        {
+          "@id": "dtmi:dtdl:property:symbol;4",
+          "@type": "rdf:Property",
+          "rdfs:domain": "dtmi:dtdl:class:Unit;4"
+        }
+      ],
+      "sh:property": [
+        {
+          "@id": "dtmi:dtdl:constraint:Unit:symbol;4",
+          "sh:path": "dtmi:dtdl:property:symbol;4",
+          "sh:maxCount": 1,
+          "sh:datatype": "xsd:string",
+          "sh:nodeKind": "sh:Literal",
+          "dtmm:description": {
+            "en-US": "The symbol for the unit."
+          }
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:class:SemanticUnit;4",
+      "@type": [ "rdfs:Class", "dtmm:Abstract", "dtmm:Extensible", "sh:NodeShape" ],
+      "dtmm:remarks": [
+        "Intuitively, SemanticUnit should be a subclass of AdjunctType; however, there are implementation challenges with making it so.",
+        "See remarks above regarding SemanticType."
+      ],
+      "dtmm:dtdlVersion": 4,
+      "sh:or": [
+        { "sh:class": "Unit" }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:class:UnitAttribute;4",
+      "@type": [ "rdfs:Class", "dtmm:Material", "dtmm:Abstract", "dtmm:Extensible", "sh:NodeShape" ],
+      "dtmm:remarks": [
+        "Intuitively, UnitAttribute should be a subclass of NamedLatentType, not of NamedEntity; however, there are implementation challenges with making it so.",
+        "See remarks above regarding Unit."
+      ],
+      "dtmm:dtdlVersion": 4,
+      "rdfs:subClassOf": "dtmi:dtdl:class:NamedEntity;4"
+    }
+  ]
+}
diff --git a/DTDL/v4/spec/Allowance-ClassArrayOptionalPropertiesV4.json b/DTDL/v4/spec/Allowance-ClassArrayOptionalPropertiesV4.json
new file mode 100644
index 00000000..c931210a
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassArrayOptionalPropertiesV4.json
@@ -0,0 +1,99 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "yekk_omega",
+          "schema": {
+            "@context": [],
+            "@type": "Array",
+            "elementSchema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "yekk_wum",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_humpf;1",
+          "@type": "Array",
+          "elementSchema": "unsignedLong"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_glikk;1",
+          "@type": "Array",
+          "elementSchema": "unsignedShort"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_snee;1",
+          "@type": "Array",
+          "elementSchema": "uuid"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassArrayPropertiesElementSchemaSchemaSelfReferenceV4.json b/DTDL/v4/spec/Allowance-ClassArrayPropertiesElementSchemaSchemaSelfReferenceV4.json
new file mode 100644
index 00000000..3540f03b
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassArrayPropertiesElementSchemaSchemaSelfReferenceV4.json
@@ -0,0 +1,24 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "pi_theta",
+          "schema": {
+            "@id": "dtmi:foo:epsilon_chi;1",
+            "@type": "Array",
+            "elementSchema": "dtmi:foo:epsilon_chi;1"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassArrayPropertyCommentDtmiV4.json b/DTDL/v4/spec/Allowance-ClassArrayPropertyCommentDtmiV4.json
new file mode 100644
index 00000000..1dd57d4c
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassArrayPropertyCommentDtmiV4.json
@@ -0,0 +1,21 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_phi;1",
+          "@type": "Array",
+          "dtmi:dtdl:property:comment;4": "beta_chi",
+          "elementSchema": "byte"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassArrayPropertyDescriptionDtmiV4.json b/DTDL/v4/spec/Allowance-ClassArrayPropertyDescriptionDtmiV4.json
new file mode 100644
index 00000000..c0ff47c5
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassArrayPropertyDescriptionDtmiV4.json
@@ -0,0 +1,23 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_zeta;1",
+          "@type": "Array",
+          "dtmi:dtdl:property:description;4": [
+            "delta_eta"
+          ],
+          "elementSchema": "unsignedByte"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassArrayPropertyDisplayNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassArrayPropertyDisplayNameDtmiV4.json
new file mode 100644
index 00000000..bb66ef29
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassArrayPropertyDisplayNameDtmiV4.json
@@ -0,0 +1,23 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_thnad;1",
+          "@type": "Array",
+          "dtmi:dtdl:property:displayName;4": [
+            "epsilon_spazz"
+          ],
+          "elementSchema": "float"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassArrayPropertyElementSchemaDtmiV4.json b/DTDL/v4/spec/Allowance-ClassArrayPropertyElementSchemaDtmiV4.json
new file mode 100644
index 00000000..b46fe691
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassArrayPropertyElementSchemaDtmiV4.json
@@ -0,0 +1,20 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_xi;1",
+          "@type": "Array",
+          "dtmi:dtdl:property:elementSchema;4": "duration"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassCommandOptionalPropertiesV4.json b/DTDL/v4/spec/Allowance-ClassCommandOptionalPropertiesV4.json
new file mode 100644
index 00000000..bf5bf38a
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassCommandOptionalPropertiesV4.json
@@ -0,0 +1,147 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_spazz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:kappa_thnad;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": [],
+            "@type": "Command",
+            "name": "kappa_quan"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_jogg;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:kappa_zatz;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "kappa_floob"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_flunn"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_yekk"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_hi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "lambda_beta"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "lambda_delta"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "lambda_zeta"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassCommandPropertyCommandTypeDtmiV4.json b/DTDL/v4/spec/Allowance-ClassCommandPropertyCommandTypeDtmiV4.json
new file mode 100644
index 00000000..05dff693
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassCommandPropertyCommandTypeDtmiV4.json
@@ -0,0 +1,20 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "dtmi:dtdl:property:commandType;4": "asynchronous",
+          "name": "phi_floob"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassCommandPropertyCommentDtmiV4.json b/DTDL/v4/spec/Allowance-ClassCommandPropertyCommentDtmiV4.json
new file mode 100644
index 00000000..644ffb61
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassCommandPropertyCommentDtmiV4.json
@@ -0,0 +1,20 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "dtmi:dtdl:property:comment;4": "psi_theta",
+          "name": "psi_iota"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassCommandPropertyDescriptionDtmiV4.json b/DTDL/v4/spec/Allowance-ClassCommandPropertyDescriptionDtmiV4.json
new file mode 100644
index 00000000..ffa49d29
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassCommandPropertyDescriptionDtmiV4.json
@@ -0,0 +1,22 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "dtmi:dtdl:property:description;4": [
+            "omega_floob"
+          ],
+          "name": "omega_zatz"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassCommandPropertyDisplayNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassCommandPropertyDisplayNameDtmiV4.json
new file mode 100644
index 00000000..0afaa882
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassCommandPropertyDisplayNameDtmiV4.json
@@ -0,0 +1,22 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "dtmi:dtdl:property:displayName;4": [
+            "wum_phi"
+          ],
+          "name": "wum_chi"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassCommandPropertyNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassCommandPropertyNameDtmiV4.json
new file mode 100644
index 00000000..2dd57532
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassCommandPropertyNameDtmiV4.json
@@ -0,0 +1,19 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "dtmi:dtdl:property:name;4": "kappa_phi"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassCommandPropertyRequestDtmiV4.json b/DTDL/v4/spec/Allowance-ClassCommandPropertyRequestDtmiV4.json
new file mode 100644
index 00000000..2573469a
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassCommandPropertyRequestDtmiV4.json
@@ -0,0 +1,23 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nuh_beta",
+          "dtmi:dtdl:property:request;4": {
+            "name": "nuh_gamma",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassCommandPropertyResponseDtmiV4.json b/DTDL/v4/spec/Allowance-ClassCommandPropertyResponseDtmiV4.json
new file mode 100644
index 00000000..624d3d86
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassCommandPropertyResponseDtmiV4.json
@@ -0,0 +1,23 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "spazz_wum",
+          "dtmi:dtdl:property:response;4": {
+            "name": "spazz_um",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassCommandRequestOptionalPropertiesV4.json b/DTDL/v4/spec/Allowance-ClassCommandRequestOptionalPropertiesV4.json
new file mode 100644
index 00000000..ebebf257
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassCommandRequestOptionalPropertiesV4.json
@@ -0,0 +1,158 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_spazz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:gamma_thnad;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "gamma_quan",
+            "request": {
+              "@context": [],
+              "name": "gamma_snee",
+              "schema": "uuid"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_zatz",
+          "request": {
+            "name": "gamma_floob",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_vroo;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:gamma_yekk;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "gamma_itch",
+            "request": {
+              "name": "gamma_flunn",
+              "schema": "byte"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "delta_alpha",
+          "request": {
+            "name": "gamma_hi",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "delta_delta",
+          "request": {
+            "name": "delta_gamma",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "delta_eta",
+          "request": {
+            "name": "delta_zeta",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "delta_kappa",
+          "request": {
+            "name": "delta_iota",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassCommandRequestPropertyCommentDtmiV4.json b/DTDL/v4/spec/Allowance-ClassCommandRequestPropertyCommentDtmiV4.json
new file mode 100644
index 00000000..c46de94a
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassCommandRequestPropertyCommentDtmiV4.json
@@ -0,0 +1,24 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omicron_eta",
+          "request": {
+            "dtmi:dtdl:property:comment;4": "omicron_epsilon",
+            "name": "omicron_zeta",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassCommandRequestPropertyDescriptionDtmiV4.json b/DTDL/v4/spec/Allowance-ClassCommandRequestPropertyDescriptionDtmiV4.json
new file mode 100644
index 00000000..2bf821da
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassCommandRequestPropertyDescriptionDtmiV4.json
@@ -0,0 +1,26 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "rho_omega",
+          "request": {
+            "dtmi:dtdl:property:description;4": [
+              "rho_chi"
+            ],
+            "name": "rho_psi",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassCommandRequestPropertyDisplayNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassCommandRequestPropertyDisplayNameDtmiV4.json
new file mode 100644
index 00000000..5623dfc6
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassCommandRequestPropertyDisplayNameDtmiV4.json
@@ -0,0 +1,26 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_yekk",
+          "request": {
+            "dtmi:dtdl:property:displayName;4": [
+              "tau_flunn"
+            ],
+            "name": "tau_itch",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassCommandRequestPropertyNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassCommandRequestPropertyNameDtmiV4.json
new file mode 100644
index 00000000..3502e64b
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassCommandRequestPropertyNameDtmiV4.json
@@ -0,0 +1,23 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_glikk",
+          "request": {
+            "dtmi:dtdl:property:name;4": "flunn_fuddle",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassCommandRequestPropertyNullableDtmiV4.json b/DTDL/v4/spec/Allowance-ClassCommandRequestPropertyNullableDtmiV4.json
new file mode 100644
index 00000000..a737d8d2
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassCommandRequestPropertyNullableDtmiV4.json
@@ -0,0 +1,24 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_theta",
+          "request": {
+            "name": "chi_eta",
+            "dtmi:dtdl:property:nullable;4": false,
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassCommandRequestPropertySchemaDtmiV4.json b/DTDL/v4/spec/Allowance-ClassCommandRequestPropertySchemaDtmiV4.json
new file mode 100644
index 00000000..091ac682
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassCommandRequestPropertySchemaDtmiV4.json
@@ -0,0 +1,23 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_sigma",
+          "request": {
+            "name": "gamma_rho",
+            "dtmi:dtdl:property:schema;4": "short"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassCommandResponseOptionalPropertiesV4.json b/DTDL/v4/spec/Allowance-ClassCommandResponseOptionalPropertiesV4.json
new file mode 100644
index 00000000..172cd777
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassCommandResponseOptionalPropertiesV4.json
@@ -0,0 +1,158 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_jogg;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:quan_zatz;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "quan_floob",
+            "response": {
+              "@context": [],
+              "name": "quan_spazz",
+              "schema": "double"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "quan_itch",
+          "response": {
+            "name": "quan_flunn",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_beta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:thnad_alpha;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "quan_hi",
+            "response": {
+              "name": "quan_vroo",
+              "schema": "float"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "thnad_delta",
+          "response": {
+            "name": "thnad_gamma",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "thnad_eta",
+          "response": {
+            "name": "thnad_zeta",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "thnad_kappa",
+          "response": {
+            "name": "thnad_iota",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "thnad_nu",
+          "response": {
+            "name": "thnad_mu",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassCommandResponsePropertyCommentDtmiV4.json b/DTDL/v4/spec/Allowance-ClassCommandResponsePropertyCommentDtmiV4.json
new file mode 100644
index 00000000..1121addb
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassCommandResponsePropertyCommentDtmiV4.json
@@ -0,0 +1,24 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "beta_kappa",
+          "response": {
+            "dtmi:dtdl:property:comment;4": "beta_theta",
+            "name": "beta_iota",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassCommandResponsePropertyDescriptionDtmiV4.json b/DTDL/v4/spec/Allowance-ClassCommandResponsePropertyDescriptionDtmiV4.json
new file mode 100644
index 00000000..43eac59f
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassCommandResponsePropertyDescriptionDtmiV4.json
@@ -0,0 +1,26 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "delta_um",
+          "response": {
+            "dtmi:dtdl:property:description;4": [
+              "delta_yuzz"
+            ],
+            "name": "delta_wum",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassCommandResponsePropertyDisplayNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassCommandResponsePropertyDisplayNameDtmiV4.json
new file mode 100644
index 00000000..80b1001f
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassCommandResponsePropertyDisplayNameDtmiV4.json
@@ -0,0 +1,26 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_alpha",
+          "response": {
+            "dtmi:dtdl:property:displayName;4": [
+              "zeta_vroo"
+            ],
+            "name": "zeta_hi",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassCommandResponsePropertyNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassCommandResponsePropertyNameDtmiV4.json
new file mode 100644
index 00000000..a7cd3b7b
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassCommandResponsePropertyNameDtmiV4.json
@@ -0,0 +1,23 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "wum_quan",
+          "response": {
+            "dtmi:dtdl:property:name;4": "wum_snee",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassCommandResponsePropertyNullableDtmiV4.json b/DTDL/v4/spec/Allowance-ClassCommandResponsePropertyNullableDtmiV4.json
new file mode 100644
index 00000000..9c78cb59
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassCommandResponsePropertyNullableDtmiV4.json
@@ -0,0 +1,24 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_lambda",
+          "response": {
+            "name": "iota_kappa",
+            "dtmi:dtdl:property:nullable;4": true,
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassCommandResponsePropertySchemaDtmiV4.json b/DTDL/v4/spec/Allowance-ClassCommandResponsePropertySchemaDtmiV4.json
new file mode 100644
index 00000000..79a1f1c7
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassCommandResponsePropertySchemaDtmiV4.json
@@ -0,0 +1,23 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "quan_phi",
+          "response": {
+            "name": "quan_upsilon",
+            "dtmi:dtdl:property:schema;4": "uuid"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassComponentOptionalPropertiesV4.json b/DTDL/v4/spec/Allowance-ClassComponentOptionalPropertiesV4.json
new file mode 100644
index 00000000..b9c6ae5f
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassComponentOptionalPropertiesV4.json
@@ -0,0 +1,116 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_psi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:phi_chi;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": [],
+            "@type": "Component",
+            "name": "phi_upsilon",
+            "schema": {
+              "@id": "dtmi:example:phi_phi;1",
+              "@type": "Interface"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_um;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:phi_wum;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "phi_omega",
+            "schema": {
+              "@id": "dtmi:example:phi_yuzz;1",
+              "@type": "Interface"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "phi_humpf",
+          "schema": {
+            "@id": "dtmi:example:phi_fuddle;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "phi_nuh",
+          "schema": {
+            "@id": "dtmi:example:phi_snee;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "phi_thnad",
+          "schema": {
+            "@id": "dtmi:example:phi_spazz;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassComponentPropertyCommentDtmiV4.json b/DTDL/v4/spec/Allowance-ClassComponentPropertyCommentDtmiV4.json
new file mode 100644
index 00000000..eea719b2
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassComponentPropertyCommentDtmiV4.json
@@ -0,0 +1,24 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "dtmi:dtdl:property:comment;4": "fuddle_vroo",
+          "name": "fuddle_hi",
+          "schema": {
+            "@id": "dtmi:example:glikk_alpha;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassComponentPropertyDescriptionDtmiV4.json b/DTDL/v4/spec/Allowance-ClassComponentPropertyDescriptionDtmiV4.json
new file mode 100644
index 00000000..75681fa6
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassComponentPropertyDescriptionDtmiV4.json
@@ -0,0 +1,26 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "dtmi:dtdl:property:description;4": [
+            "snee_pi"
+          ],
+          "name": "snee_rho",
+          "schema": {
+            "@id": "dtmi:example:snee_sigma;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassComponentPropertyDisplayNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassComponentPropertyDisplayNameDtmiV4.json
new file mode 100644
index 00000000..735692c5
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassComponentPropertyDisplayNameDtmiV4.json
@@ -0,0 +1,26 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "dtmi:dtdl:property:displayName;4": [
+            "thnad_quan"
+          ],
+          "name": "thnad_thnad",
+          "schema": {
+            "@id": "dtmi:example:thnad_spazz;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassComponentPropertyNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassComponentPropertyNameDtmiV4.json
new file mode 100644
index 00000000..260dbb9d
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassComponentPropertyNameDtmiV4.json
@@ -0,0 +1,23 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "dtmi:dtdl:property:name;4": "pi_floob",
+          "schema": {
+            "@id": "dtmi:example:pi_zatz;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassComponentPropertySchemaDtmiV4.json b/DTDL/v4/spec/Allowance-ClassComponentPropertySchemaDtmiV4.json
new file mode 100644
index 00000000..e431f40a
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassComponentPropertySchemaDtmiV4.json
@@ -0,0 +1,23 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "phi_gamma",
+          "dtmi:dtdl:property:schema;4": {
+            "@id": "dtmi:example:phi_delta;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassEnumOptionalPropertiesV4.json b/DTDL/v4/spec/Allowance-ClassEnumOptionalPropertiesV4.json
new file mode 100644
index 00000000..7daf41b5
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassEnumOptionalPropertiesV4.json
@@ -0,0 +1,117 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "beta_vroo",
+          "schema": {
+            "@context": [],
+            "@type": "Enum",
+            "valueSchema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_alpha",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_gamma;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_epsilon;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_eta;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_iota;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassEnumPropertyCommentDtmiV4.json b/DTDL/v4/spec/Allowance-ClassEnumPropertyCommentDtmiV4.json
new file mode 100644
index 00000000..393ee551
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassEnumPropertyCommentDtmiV4.json
@@ -0,0 +1,21 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_yekk;1",
+          "@type": "Enum",
+          "dtmi:dtdl:property:comment;4": "zeta_vroo",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassEnumPropertyDescriptionDtmiV4.json b/DTDL/v4/spec/Allowance-ClassEnumPropertyDescriptionDtmiV4.json
new file mode 100644
index 00000000..1515097b
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassEnumPropertyDescriptionDtmiV4.json
@@ -0,0 +1,23 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_wum;1",
+          "@type": "Enum",
+          "dtmi:dtdl:property:description;4": [
+            "theta_um"
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassEnumPropertyDisplayNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassEnumPropertyDisplayNameDtmiV4.json
new file mode 100644
index 00000000..cd205b91
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassEnumPropertyDisplayNameDtmiV4.json
@@ -0,0 +1,23 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_lambda;1",
+          "@type": "Enum",
+          "dtmi:dtdl:property:displayName;4": [
+            "kappa_mu"
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassEnumPropertyEnumValuesDtmiV4.json b/DTDL/v4/spec/Allowance-ClassEnumPropertyEnumValuesDtmiV4.json
new file mode 100644
index 00000000..6ec3388b
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassEnumPropertyEnumValuesDtmiV4.json
@@ -0,0 +1,26 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_upsilon;1",
+          "@type": "Enum",
+          "dtmi:dtdl:property:enumValues;4": [
+            {
+              "enumValue": 1529,
+              "name": "xi_phi"
+            }
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassEnumPropertyValueSchemaDtmiV4.json b/DTDL/v4/spec/Allowance-ClassEnumPropertyValueSchemaDtmiV4.json
new file mode 100644
index 00000000..e37eb7ad
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassEnumPropertyValueSchemaDtmiV4.json
@@ -0,0 +1,20 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_snee;1",
+          "@type": "Enum",
+          "dtmi:dtdl:property:valueSchema;4": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassEnumValueOptionalPropertiesV4.json b/DTDL/v4/spec/Allowance-ClassEnumValueOptionalPropertiesV4.json
new file mode 100644
index 00000000..326bed94
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassEnumValueOptionalPropertiesV4.json
@@ -0,0 +1,141 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "psi_gamma",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "@context": [],
+              "enumValue": 1606,
+              "name": "psi_beta"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_zeta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1607,
+            "name": "psi_epsilon"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "psi_iota",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "enumValue": 1608,
+              "name": "psi_theta"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_mu;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1609,
+            "name": "psi_lambda"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_omicron;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1610,
+            "name": "psi_xi"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_sigma;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1611,
+            "name": "psi_rho"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassEnumValuePropertyCommentDtmiV4.json b/DTDL/v4/spec/Allowance-ClassEnumValuePropertyCommentDtmiV4.json
new file mode 100644
index 00000000..5c4dcc4e
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassEnumValuePropertyCommentDtmiV4.json
@@ -0,0 +1,25 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_vroo;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "dtmi:dtdl:property:comment;4": "quan_itch",
+            "enumValue": 1762,
+            "name": "quan_yekk"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassEnumValuePropertyDescriptionDtmiV4.json b/DTDL/v4/spec/Allowance-ClassEnumValuePropertyDescriptionDtmiV4.json
new file mode 100644
index 00000000..9edb8824
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassEnumValuePropertyDescriptionDtmiV4.json
@@ -0,0 +1,27 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_pi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "dtmi:dtdl:property:description;4": [
+              "floob_xi"
+            ],
+            "enumValue": 1794,
+            "name": "floob_omicron"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassEnumValuePropertyDisplayNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassEnumValuePropertyDisplayNameDtmiV4.json
new file mode 100644
index 00000000..f3cebbd0
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassEnumValuePropertyDisplayNameDtmiV4.json
@@ -0,0 +1,27 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_quan;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "dtmi:dtdl:property:displayName;4": [
+              "jogg_nuh"
+            ],
+            "enumValue": 1826,
+            "name": "jogg_snee"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassEnumValuePropertyEnumValueDtmiV4.json b/DTDL/v4/spec/Allowance-ClassEnumValuePropertyEnumValueDtmiV4.json
new file mode 100644
index 00000000..066e4370
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassEnumValuePropertyEnumValueDtmiV4.json
@@ -0,0 +1,24 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_zatz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "dtmi:dtdl:property:enumValue;4": 1538,
+            "name": "tau_floob"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassEnumValuePropertyNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassEnumValuePropertyNameDtmiV4.json
new file mode 100644
index 00000000..6b4ab63e
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassEnumValuePropertyNameDtmiV4.json
@@ -0,0 +1,24 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_fuddle;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1601,
+            "dtmi:dtdl:property:name;4": "chi_humpf"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassFieldOptionalPropertiesV4.json b/DTDL/v4/spec/Allowance-ClassFieldOptionalPropertiesV4.json
new file mode 100644
index 00000000..b31f7be1
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassFieldOptionalPropertiesV4.json
@@ -0,0 +1,135 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "eta_omega",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "@context": [],
+              "name": "eta_psi",
+              "schema": "time"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_um;1",
+          "@type": "Object",
+          "fields": {
+            "name": "eta_wum",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "eta_glikk",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "eta_fuddle",
+              "schema": "unsignedInteger"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_quan;1",
+          "@type": "Object",
+          "fields": {
+            "name": "eta_snee",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_floob;1",
+          "@type": "Object",
+          "fields": {
+            "name": "eta_spazz",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_flunn;1",
+          "@type": "Object",
+          "fields": {
+            "name": "eta_jogg",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassFieldPropertyCommentDtmiV4.json b/DTDL/v4/spec/Allowance-ClassFieldPropertyCommentDtmiV4.json
new file mode 100644
index 00000000..b77ba7d9
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassFieldPropertyCommentDtmiV4.json
@@ -0,0 +1,24 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_upsilon;1",
+          "@type": "Object",
+          "fields": {
+            "dtmi:dtdl:property:comment;4": "sigma_sigma",
+            "name": "sigma_tau",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassFieldPropertyDescriptionDtmiV4.json b/DTDL/v4/spec/Allowance-ClassFieldPropertyDescriptionDtmiV4.json
new file mode 100644
index 00000000..d0a9126c
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassFieldPropertyDescriptionDtmiV4.json
@@ -0,0 +1,26 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_zatz;1",
+          "@type": "Object",
+          "fields": {
+            "dtmi:dtdl:property:description;4": [
+              "upsilon_spazz"
+            ],
+            "name": "upsilon_floob",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassFieldPropertyDisplayNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassFieldPropertyDisplayNameDtmiV4.json
new file mode 100644
index 00000000..a4f85955
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassFieldPropertyDisplayNameDtmiV4.json
@@ -0,0 +1,26 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_lambda;1",
+          "@type": "Object",
+          "fields": {
+            "dtmi:dtdl:property:displayName;4": [
+              "psi_iota"
+            ],
+            "name": "psi_kappa",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassFieldPropertyNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassFieldPropertyNameDtmiV4.json
new file mode 100644
index 00000000..d4843225
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassFieldPropertyNameDtmiV4.json
@@ -0,0 +1,23 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_um;1",
+          "@type": "Object",
+          "fields": {
+            "dtmi:dtdl:property:name;4": "hi_wum",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassFieldPropertySchemaDtmiV4.json b/DTDL/v4/spec/Allowance-ClassFieldPropertySchemaDtmiV4.json
new file mode 100644
index 00000000..dfc04974
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassFieldPropertySchemaDtmiV4.json
@@ -0,0 +1,23 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_iota;1",
+          "@type": "Object",
+          "fields": {
+            "name": "eta_theta",
+            "dtmi:dtdl:property:schema;4": "double"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassInterfaceOptionalPropertiesV4.json b/DTDL/v4/spec/Allowance-ClassInterfaceOptionalPropertiesV4.json
new file mode 100644
index 00000000..df0d42b3
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassInterfaceOptionalPropertiesV4.json
@@ -0,0 +1,98 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_upsilon;1",
+        "@type": "Interface",
+        "extends": {
+          "@context": [],
+          "@id": "dtmi:example:wum_tau;1",
+          "@type": "Interface"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_phi;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_chi;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_psi;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_omega;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_yuzz;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_wum;1",
+        "@type": "Interface"
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassInterfacePropertyCommentDtmiV4.json b/DTDL/v4/spec/Allowance-ClassInterfacePropertyCommentDtmiV4.json
new file mode 100644
index 00000000..46cd76a6
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassInterfacePropertyCommentDtmiV4.json
@@ -0,0 +1,16 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_epsilon;1",
+        "@type": "Interface",
+        "dtmi:dtdl:property:comment;4": "humpf_zeta"
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassInterfacePropertyContentsDtmiV4.json b/DTDL/v4/spec/Allowance-ClassInterfacePropertyContentsDtmiV4.json
new file mode 100644
index 00000000..0ee2fd4c
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassInterfacePropertyContentsDtmiV4.json
@@ -0,0 +1,21 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_floob;1",
+        "@type": "Interface",
+        "dtmi:dtdl:property:contents;4": [
+          {
+            "@type": "Command",
+            "name": "glikk_zatz"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassInterfacePropertyDescriptionDtmiV4.json b/DTDL/v4/spec/Allowance-ClassInterfacePropertyDescriptionDtmiV4.json
new file mode 100644
index 00000000..e90be25d
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassInterfacePropertyDescriptionDtmiV4.json
@@ -0,0 +1,18 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_snee;1",
+        "@type": "Interface",
+        "dtmi:dtdl:property:description;4": [
+          "nuh_quan"
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassInterfacePropertyDisplayNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassInterfacePropertyDisplayNameDtmiV4.json
new file mode 100644
index 00000000..e23f2806
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassInterfacePropertyDisplayNameDtmiV4.json
@@ -0,0 +1,18 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_humpf;1",
+        "@type": "Interface",
+        "dtmi:dtdl:property:displayName;4": [
+          "snee_fuddle"
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassInterfacePropertyExtendsDtmiV4.json b/DTDL/v4/spec/Allowance-ClassInterfacePropertyExtendsDtmiV4.json
new file mode 100644
index 00000000..d8921847
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassInterfacePropertyExtendsDtmiV4.json
@@ -0,0 +1,21 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_um;1",
+        "@type": "Interface",
+        "dtmi:dtdl:property:extends;4": [
+          {
+            "@id": "dtmi:example:spazz_humpf;1",
+            "@type": "Interface"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassInterfacePropertySchemasDtmiV4.json b/DTDL/v4/spec/Allowance-ClassInterfacePropertySchemasDtmiV4.json
new file mode 100644
index 00000000..97c34434
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassInterfacePropertySchemasDtmiV4.json
@@ -0,0 +1,22 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_upsilon;1",
+        "@type": "Interface",
+        "dtmi:dtdl:property:schemas;4": [
+          {
+            "@id": "dtmi:example:jogg_phi;1",
+            "@type": "Array",
+            "elementSchema": "integer"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassMapKeyOptionalPropertiesV4.json b/DTDL/v4/spec/Allowance-ClassMapKeyOptionalPropertiesV4.json
new file mode 100644
index 00000000..42b9d524
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassMapKeyOptionalPropertiesV4.json
@@ -0,0 +1,159 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "delta_omega",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "delta_psi",
+              "schema": "bytes"
+            },
+            "mapKey": {
+              "@context": [],
+              "name": "delta_chi",
+              "schema": "string"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_um;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "delta_humpf",
+            "schema": "date"
+          },
+          "mapKey": {
+            "name": "delta_wum",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "delta_snee",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "delta_nuh",
+              "schema": "dateTime"
+            },
+            "mapKey": {
+              "name": "delta_glikk",
+              "schema": "string"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_spazz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "delta_floob",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "name": "delta_thnad",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_flunn;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "delta_itch",
+            "schema": "double"
+          },
+          "mapKey": {
+            "name": "delta_jogg",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_hi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "epsilon_alpha",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "name": "delta_vroo",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassMapKeyPropertyCommentDtmiV4.json b/DTDL/v4/spec/Allowance-ClassMapKeyPropertyCommentDtmiV4.json
new file mode 100644
index 00000000..909288a2
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassMapKeyPropertyCommentDtmiV4.json
@@ -0,0 +1,28 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_gamma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "tau_delta",
+            "schema": "double"
+          },
+          "mapKey": {
+            "dtmi:dtdl:property:comment;4": "tau_alpha",
+            "name": "tau_beta",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassMapKeyPropertyDescriptionDtmiV4.json b/DTDL/v4/spec/Allowance-ClassMapKeyPropertyDescriptionDtmiV4.json
new file mode 100644
index 00000000..d39836d7
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassMapKeyPropertyDescriptionDtmiV4.json
@@ -0,0 +1,30 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_iota;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "chi_kappa",
+            "schema": "boolean"
+          },
+          "mapKey": {
+            "dtmi:dtdl:property:description;4": [
+              "chi_eta"
+            ],
+            "name": "chi_theta",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassMapKeyPropertyDisplayNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassMapKeyPropertyDisplayNameDtmiV4.json
new file mode 100644
index 00000000..3d7f369a
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassMapKeyPropertyDisplayNameDtmiV4.json
@@ -0,0 +1,30 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_omicron;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "yuzz_pi",
+            "schema": "time"
+          },
+          "mapKey": {
+            "dtmi:dtdl:property:displayName;4": [
+              "yuzz_nu"
+            ],
+            "name": "yuzz_xi",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassMapKeyPropertyNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassMapKeyPropertyNameDtmiV4.json
new file mode 100644
index 00000000..54cf0909
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassMapKeyPropertyNameDtmiV4.json
@@ -0,0 +1,27 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_delta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "thnad_epsilon",
+            "schema": "long"
+          },
+          "mapKey": {
+            "dtmi:dtdl:property:name;4": "thnad_gamma",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassMapKeyPropertySchemaDtmiV4.json b/DTDL/v4/spec/Allowance-ClassMapKeyPropertySchemaDtmiV4.json
new file mode 100644
index 00000000..6aa2cc0a
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassMapKeyPropertySchemaDtmiV4.json
@@ -0,0 +1,27 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_gamma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "delta_delta",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "name": "delta_beta",
+            "dtmi:dtdl:property:schema;4": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassMapOptionalPropertiesV4.json b/DTDL/v4/spec/Allowance-ClassMapOptionalPropertiesV4.json
new file mode 100644
index 00000000..a787bbc2
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassMapOptionalPropertiesV4.json
@@ -0,0 +1,134 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "lambda_humpf",
+          "schema": {
+            "@context": [],
+            "@type": "Map",
+            "mapKey": {
+              "name": "lambda_wum",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "lambda_um",
+              "schema": "integer"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "lambda_snee",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "lambda_glikk",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "lambda_nuh",
+              "schema": "long"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_thnad;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "lambda_spazz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "lambda_floob",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_jogg;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "lambda_flunn",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "lambda_itch",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_vroo;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "lambda_hi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "mu_alpha",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassMapPropertiesElementSchemaSchemaSelfReferenceV4.json b/DTDL/v4/spec/Allowance-ClassMapPropertiesElementSchemaSchemaSelfReferenceV4.json
new file mode 100644
index 00000000..0b072757
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassMapPropertiesElementSchemaSchemaSelfReferenceV4.json
@@ -0,0 +1,31 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "delta_upsilon",
+          "schema": {
+            "@id": "dtmi:foo:epsilon_yuzz;1",
+            "@type": "Map",
+            "mapKey": {
+              "name": "delta_tau",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "delta_sigma",
+              "schema": "dtmi:foo:epsilon_yuzz;1"
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassMapPropertyCommentDtmiV4.json b/DTDL/v4/spec/Allowance-ClassMapPropertyCommentDtmiV4.json
new file mode 100644
index 00000000..33c79ab2
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassMapPropertyCommentDtmiV4.json
@@ -0,0 +1,28 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_epsilon;1",
+          "@type": "Map",
+          "dtmi:dtdl:property:comment;4": "phi_zeta",
+          "mapKey": {
+            "name": "phi_eta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "phi_theta",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassMapPropertyDescriptionDtmiV4.json b/DTDL/v4/spec/Allowance-ClassMapPropertyDescriptionDtmiV4.json
new file mode 100644
index 00000000..46fefe5b
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassMapPropertyDescriptionDtmiV4.json
@@ -0,0 +1,30 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_lambda;1",
+          "@type": "Map",
+          "dtmi:dtdl:property:description;4": [
+            "omega_mu"
+          ],
+          "mapKey": {
+            "name": "omega_nu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omega_xi",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassMapPropertyDisplayNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassMapPropertyDisplayNameDtmiV4.json
new file mode 100644
index 00000000..e3db9255
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassMapPropertyDisplayNameDtmiV4.json
@@ -0,0 +1,30 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_rho;1",
+          "@type": "Map",
+          "dtmi:dtdl:property:displayName;4": [
+            "um_sigma"
+          ],
+          "mapKey": {
+            "name": "um_tau",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "um_upsilon",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassMapPropertyMapKeyDtmiV4.json b/DTDL/v4/spec/Allowance-ClassMapPropertyMapKeyDtmiV4.json
new file mode 100644
index 00000000..ce230fe9
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassMapPropertyMapKeyDtmiV4.json
@@ -0,0 +1,27 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_phi;1",
+          "@type": "Map",
+          "dtmi:dtdl:property:mapKey;4": {
+            "name": "epsilon_chi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "epsilon_psi",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassMapPropertyMapValueDtmiV4.json b/DTDL/v4/spec/Allowance-ClassMapPropertyMapValueDtmiV4.json
new file mode 100644
index 00000000..c7077f56
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassMapPropertyMapValueDtmiV4.json
@@ -0,0 +1,27 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_delta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "lambda_epsilon",
+            "schema": "string"
+          },
+          "dtmi:dtdl:property:mapValue;4": {
+            "name": "lambda_zeta",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassMapValueOptionalPropertiesV4.json b/DTDL/v4/spec/Allowance-ClassMapValueOptionalPropertiesV4.json
new file mode 100644
index 00000000..8f4ca0e3
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassMapValueOptionalPropertiesV4.json
@@ -0,0 +1,159 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "itch_spazz",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "itch_thnad",
+              "schema": "string"
+            },
+            "mapValue": {
+              "@context": [],
+              "name": "itch_quan",
+              "schema": "unsignedLong"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_jogg;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "itch_flunn",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "itch_zatz",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "itch_hi",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "itch_vroo",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "itch_yekk",
+              "schema": "uuid"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_gamma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "yekk_delta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yekk_beta",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_eta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "yekk_theta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yekk_zeta",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_lambda;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "yekk_mu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yekk_kappa",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassMapValuePropertyCommentDtmiV4.json b/DTDL/v4/spec/Allowance-ClassMapValuePropertyCommentDtmiV4.json
new file mode 100644
index 00000000..c5e74441
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassMapValuePropertyCommentDtmiV4.json
@@ -0,0 +1,28 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_xi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "mu_omicron",
+            "schema": "string"
+          },
+          "mapValue": {
+            "dtmi:dtdl:property:comment;4": "mu_mu",
+            "name": "mu_nu",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassMapValuePropertyDescriptionDtmiV4.json b/DTDL/v4/spec/Allowance-ClassMapValuePropertyDescriptionDtmiV4.json
new file mode 100644
index 00000000..7a18d6c1
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassMapValuePropertyDescriptionDtmiV4.json
@@ -0,0 +1,30 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_upsilon;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omicron_phi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "dtmi:dtdl:property:description;4": [
+              "omicron_sigma"
+            ],
+            "name": "omicron_tau",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassMapValuePropertyDisplayNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassMapValuePropertyDisplayNameDtmiV4.json
new file mode 100644
index 00000000..30299d6b
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassMapValuePropertyDisplayNameDtmiV4.json
@@ -0,0 +1,30 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_wum;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "sigma_um",
+            "schema": "string"
+          },
+          "mapValue": {
+            "dtmi:dtdl:property:displayName;4": [
+              "sigma_omega"
+            ],
+            "name": "sigma_yuzz",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassMapValuePropertyNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassMapValuePropertyNameDtmiV4.json
new file mode 100644
index 00000000..6d93b32c
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassMapValuePropertyNameDtmiV4.json
@@ -0,0 +1,27 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_hi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "snee_alpha",
+            "schema": "string"
+          },
+          "mapValue": {
+            "dtmi:dtdl:property:name;4": "nuh_vroo",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassMapValuePropertySchemaDtmiV4.json b/DTDL/v4/spec/Allowance-ClassMapValuePropertySchemaDtmiV4.json
new file mode 100644
index 00000000..787f46f6
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassMapValuePropertySchemaDtmiV4.json
@@ -0,0 +1,27 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_xi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "itch_omicron",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "itch_nu",
+            "dtmi:dtdl:property:schema;4": "integer"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassObjectOptionalPropertiesV4.json b/DTDL/v4/spec/Allowance-ClassObjectOptionalPropertiesV4.json
new file mode 100644
index 00000000..2b6dec3c
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassObjectOptionalPropertiesV4.json
@@ -0,0 +1,111 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "psi_xi",
+          "schema": {
+            "@context": [],
+            "@type": "Object"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "psi_pi",
+          "schema": {
+            "@type": "Object"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_sigma;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_upsilon;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_chi;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_omega;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassObjectPropertiesElementSchemaSchemaSelfReferenceV4.json b/DTDL/v4/spec/Allowance-ClassObjectPropertiesElementSchemaSchemaSelfReferenceV4.json
new file mode 100644
index 00000000..59328c51
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassObjectPropertiesElementSchemaSchemaSelfReferenceV4.json
@@ -0,0 +1,27 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "epsilon_mu",
+          "schema": {
+            "@id": "dtmi:foo:epsilon_wum;1",
+            "@type": "Object",
+            "fields": {
+              "name": "epsilon_lambda",
+              "schema": "dtmi:foo:epsilon_wum;1"
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassObjectPropertyCommentDtmiV4.json b/DTDL/v4/spec/Allowance-ClassObjectPropertyCommentDtmiV4.json
new file mode 100644
index 00000000..213bee73
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassObjectPropertyCommentDtmiV4.json
@@ -0,0 +1,20 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_nu;1",
+          "@type": "Object",
+          "dtmi:dtdl:property:comment;4": "um_xi"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassObjectPropertyDescriptionDtmiV4.json b/DTDL/v4/spec/Allowance-ClassObjectPropertyDescriptionDtmiV4.json
new file mode 100644
index 00000000..0b73e1b3
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassObjectPropertyDescriptionDtmiV4.json
@@ -0,0 +1,22 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_yekk;1",
+          "@type": "Object",
+          "dtmi:dtdl:property:description;4": [
+            "humpf_vroo"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassObjectPropertyDisplayNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassObjectPropertyDisplayNameDtmiV4.json
new file mode 100644
index 00000000..b7708f9d
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassObjectPropertyDisplayNameDtmiV4.json
@@ -0,0 +1,22 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_wum;1",
+          "@type": "Object",
+          "dtmi:dtdl:property:displayName;4": [
+            "glikk_um"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassObjectPropertyFieldsDtmiV4.json b/DTDL/v4/spec/Allowance-ClassObjectPropertyFieldsDtmiV4.json
new file mode 100644
index 00000000..d1b53ef8
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassObjectPropertyFieldsDtmiV4.json
@@ -0,0 +1,25 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_spazz;1",
+          "@type": "Object",
+          "dtmi:dtdl:property:fields;4": [
+            {
+              "name": "thnad_floob",
+              "schema": "decimal"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassPropertyOptionalPropertiesV4.json b/DTDL/v4/spec/Allowance-ClassPropertyOptionalPropertiesV4.json
new file mode 100644
index 00000000..250319bd
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassPropertyOptionalPropertiesV4.json
@@ -0,0 +1,119 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_hi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:alpha_vroo;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": [],
+            "@type": "Property",
+            "name": "alpha_yekk",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_gamma;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:beta_beta;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "beta_alpha",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "beta_delta",
+          "schema": "date"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "beta_zeta",
+          "schema": "dateTime"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "beta_theta",
+          "schema": "decimal"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "beta_kappa",
+          "schema": "double"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassPropertyPropertyCommentDtmiV4.json b/DTDL/v4/spec/Allowance-ClassPropertyPropertyCommentDtmiV4.json
new file mode 100644
index 00000000..a0d1fba8
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassPropertyPropertyCommentDtmiV4.json
@@ -0,0 +1,21 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "dtmi:dtdl:property:comment;4": "eta_spazz",
+          "name": "eta_floob",
+          "schema": "dateTime"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassPropertyPropertyDescriptionDtmiV4.json b/DTDL/v4/spec/Allowance-ClassPropertyPropertyDescriptionDtmiV4.json
new file mode 100644
index 00000000..98ce1880
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassPropertyPropertyDescriptionDtmiV4.json
@@ -0,0 +1,23 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "dtmi:dtdl:property:description;4": [
+            "iota_upsilon"
+          ],
+          "name": "iota_phi",
+          "schema": "unsignedShort"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassPropertyPropertyDisplayNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassPropertyPropertyDisplayNameDtmiV4.json
new file mode 100644
index 00000000..93a66bfc
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassPropertyPropertyDisplayNameDtmiV4.json
@@ -0,0 +1,23 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "dtmi:dtdl:property:displayName;4": [
+            "lambda_epsilon"
+          ],
+          "name": "lambda_zeta",
+          "schema": "short"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassPropertyPropertyNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassPropertyPropertyNameDtmiV4.json
new file mode 100644
index 00000000..dd327776
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassPropertyPropertyNameDtmiV4.json
@@ -0,0 +1,20 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "dtmi:dtdl:property:name;4": "flunn_snee",
+          "schema": "date"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassPropertyPropertySchemaDtmiV4.json b/DTDL/v4/spec/Allowance-ClassPropertyPropertySchemaDtmiV4.json
new file mode 100644
index 00000000..34bbd50c
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassPropertyPropertySchemaDtmiV4.json
@@ -0,0 +1,20 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_nuh",
+          "dtmi:dtdl:property:schema;4": "time"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassPropertyPropertyWritableDtmiV4.json b/DTDL/v4/spec/Allowance-ClassPropertyPropertyWritableDtmiV4.json
new file mode 100644
index 00000000..7fcaa424
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassPropertyPropertyWritableDtmiV4.json
@@ -0,0 +1,21 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "mu_fuddle",
+          "schema": "date",
+          "dtmi:dtdl:property:writable;4": false
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassRelationshipOptionalPropertiesV4.json b/DTDL/v4/spec/Allowance-ClassRelationshipOptionalPropertiesV4.json
new file mode 100644
index 00000000..5e78a12a
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassRelationshipOptionalPropertiesV4.json
@@ -0,0 +1,181 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_psi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:rho_chi;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": [],
+            "@type": "Relationship",
+            "name": "rho_phi"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_wum;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:rho_yuzz;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "rho_omega"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "rho_um"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "rho_fuddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "rho_nuh"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "rho_quan"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "rho_spazz"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "rho_zatz"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "rho_flunn"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "rho_yekk"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassRelationshipPropertyCommentDtmiV4.json b/DTDL/v4/spec/Allowance-ClassRelationshipPropertyCommentDtmiV4.json
new file mode 100644
index 00000000..a9932bf9
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassRelationshipPropertyCommentDtmiV4.json
@@ -0,0 +1,20 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "dtmi:dtdl:property:comment;4": "psi_psi",
+          "name": "psi_omega"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassRelationshipPropertyDescriptionDtmiV4.json b/DTDL/v4/spec/Allowance-ClassRelationshipPropertyDescriptionDtmiV4.json
new file mode 100644
index 00000000..c456ca56
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassRelationshipPropertyDescriptionDtmiV4.json
@@ -0,0 +1,22 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "dtmi:dtdl:property:description;4": [
+            "yuzz_theta"
+          ],
+          "name": "yuzz_iota"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassRelationshipPropertyDisplayNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassRelationshipPropertyDisplayNameDtmiV4.json
new file mode 100644
index 00000000..592d30db
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassRelationshipPropertyDisplayNameDtmiV4.json
@@ -0,0 +1,22 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "dtmi:dtdl:property:displayName;4": [
+            "wum_floob"
+          ],
+          "name": "wum_zatz"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassRelationshipPropertyMaxMultiplicityDtmiV4.json b/DTDL/v4/spec/Allowance-ClassRelationshipPropertyMaxMultiplicityDtmiV4.json
new file mode 100644
index 00000000..4b5c8d87
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassRelationshipPropertyMaxMultiplicityDtmiV4.json
@@ -0,0 +1,20 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "dtmi:dtdl:property:maxMultiplicity;4": 1873,
+          "name": "humpf_omicron"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassRelationshipPropertyMinMultiplicityDtmiV4.json b/DTDL/v4/spec/Allowance-ClassRelationshipPropertyMinMultiplicityDtmiV4.json
new file mode 100644
index 00000000..aeaf9ff2
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassRelationshipPropertyMinMultiplicityDtmiV4.json
@@ -0,0 +1,20 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "dtmi:dtdl:property:minMultiplicity;4": 0,
+          "name": "fuddle_thnad"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassRelationshipPropertyNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassRelationshipPropertyNameDtmiV4.json
new file mode 100644
index 00000000..7dcab3b2
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassRelationshipPropertyNameDtmiV4.json
@@ -0,0 +1,19 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "dtmi:dtdl:property:name;4": "rho_iota"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassRelationshipPropertyPropertiesDtmiV4.json b/DTDL/v4/spec/Allowance-ClassRelationshipPropertyPropertiesDtmiV4.json
new file mode 100644
index 00000000..5025beee
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassRelationshipPropertyPropertiesDtmiV4.json
@@ -0,0 +1,26 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "quan_thnad",
+          "dtmi:dtdl:property:properties;4": [
+            {
+              "@type": "Property",
+              "name": "quan_spazz",
+              "schema": "unsignedShort"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassRelationshipPropertyTargetDtmiV4.json b/DTDL/v4/spec/Allowance-ClassRelationshipPropertyTargetDtmiV4.json
new file mode 100644
index 00000000..5dbcab1c
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassRelationshipPropertyTargetDtmiV4.json
@@ -0,0 +1,20 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "zatz_alpha",
+          "dtmi:dtdl:property:target;4": "dtmi:example:zatz_beta;1"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassRelationshipPropertyWritableDtmiV4.json b/DTDL/v4/spec/Allowance-ClassRelationshipPropertyWritableDtmiV4.json
new file mode 100644
index 00000000..b0bd9330
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassRelationshipPropertyWritableDtmiV4.json
@@ -0,0 +1,20 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "jogg_yuzz",
+          "dtmi:dtdl:property:writable;4": true
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassTelemetryOptionalPropertiesV4.json b/DTDL/v4/spec/Allowance-ClassTelemetryOptionalPropertiesV4.json
new file mode 100644
index 00000000..e9262539
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassTelemetryOptionalPropertiesV4.json
@@ -0,0 +1,101 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_upsilon;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:epsilon_tau;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": [],
+            "@type": "Telemetry",
+            "name": "epsilon_sigma",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_psi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:epsilon_chi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "epsilon_phi",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "epsilon_omega",
+          "schema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "epsilon_wum",
+          "schema": "long"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "epsilon_humpf",
+          "schema": "short"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassTelemetryPropertyCommentDtmiV4.json b/DTDL/v4/spec/Allowance-ClassTelemetryPropertyCommentDtmiV4.json
new file mode 100644
index 00000000..29dbec7b
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassTelemetryPropertyCommentDtmiV4.json
@@ -0,0 +1,21 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "dtmi:dtdl:property:comment;4": "lambda_kappa",
+          "name": "lambda_lambda",
+          "schema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassTelemetryPropertyDescriptionDtmiV4.json b/DTDL/v4/spec/Allowance-ClassTelemetryPropertyDescriptionDtmiV4.json
new file mode 100644
index 00000000..dcaa873f
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassTelemetryPropertyDescriptionDtmiV4.json
@@ -0,0 +1,23 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "dtmi:dtdl:property:description;4": [
+            "mu_jogg"
+          ],
+          "name": "mu_flunn",
+          "schema": "date"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassTelemetryPropertyDisplayNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassTelemetryPropertyDisplayNameDtmiV4.json
new file mode 100644
index 00000000..359c41db
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassTelemetryPropertyDisplayNameDtmiV4.json
@@ -0,0 +1,23 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "dtmi:dtdl:property:displayName;4": [
+            "xi_psi"
+          ],
+          "name": "xi_omega",
+          "schema": "unsignedLong"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassTelemetryPropertyNameDtmiV4.json b/DTDL/v4/spec/Allowance-ClassTelemetryPropertyNameDtmiV4.json
new file mode 100644
index 00000000..cf0326d5
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassTelemetryPropertyNameDtmiV4.json
@@ -0,0 +1,20 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "dtmi:dtdl:property:name;4": "hi_iota",
+          "schema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ClassTelemetryPropertySchemaDtmiV4.json b/DTDL/v4/spec/Allowance-ClassTelemetryPropertySchemaDtmiV4.json
new file mode 100644
index 00000000..dafdc63c
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ClassTelemetryPropertySchemaDtmiV4.json
@@ -0,0 +1,20 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "epsilon_theta",
+          "dtmi:dtdl:property:schema;4": "boolean"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ValueGeospatialSchemaV4.json b/DTDL/v4/spec/Allowance-ValueGeospatialSchemaV4.json
new file mode 100644
index 00000000..c109ca34
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ValueGeospatialSchemaV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Telemetry",
+            "name": "border",
+            "schema": "lineString"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Telemetry",
+            "name": "border",
+            "schema": "dtmi:standard:schema:geospatial:lineString;4"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Allowance-ValuePrimitiveSchemaV4.json b/DTDL/v4/spec/Allowance-ValuePrimitiveSchemaV4.json
new file mode 100644
index 00000000..21c0e141
--- /dev/null
+++ b/DTDL/v4/spec/Allowance-ValuePrimitiveSchemaV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Telemetry",
+            "name": "switchState",
+            "schema": "boolean"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Telemetry",
+            "name": "switchState",
+            "schema": "dtmi:dtdl:instance:Schema:boolean;4"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassArrayPropertyElementSchemaDependentReferenceV4.json b/DTDL/v4/spec/Completion-ClassArrayPropertyElementSchemaDependentReferenceV4.json
new file mode 100644
index 00000000..85fa4b87
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassArrayPropertyElementSchemaDependentReferenceV4.json
@@ -0,0 +1,56 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "jogg_phi",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "dtmi:ex:dependentRef;1"
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "jogg_psi",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": [
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassArrayPropertyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassArrayPropertyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..ce30aac1
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassArrayPropertyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,92 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_omega;1",
+          "@type": [
+            "Array",
+            "Foobar"
+          ],
+          "elementSchema": "bytes",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zeta_wum;1",
+          "@type": [
+            "Array",
+            "Foobar"
+          ],
+          "elementSchema": "date",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_humpf;1",
+          "@type": [
+            "Array",
+            "Foobar"
+          ],
+          "elementSchema": "dateTime",
+          "boolean": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zeta_glikk;1",
+          "@type": [
+            "Array",
+            "Foobar"
+          ],
+          "elementSchema": "decimal",
+          "boolean": null
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassArrayPropertyUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassArrayPropertyUndefinedTermV4.json
new file mode 100644
index 00000000..ccb4ac55
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassArrayPropertyUndefinedTermV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_epsilon;1",
+          "@type": [
+            "Array",
+            "Foobar"
+          ],
+          "elementSchema": "unsignedByte",
+          "foobar": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:eta_eta;1",
+          "@type": [
+            "Array",
+            "Foobar"
+          ],
+          "elementSchema": "unsignedInteger",
+          "foobar": {}
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassArrayTypeIncludesIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassArrayTypeIncludesIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..4870ba27
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassArrayTypeIncludesIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,88 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_mu;1",
+          "@type": [
+            "Array",
+            "dtmi:foo:bar;1"
+          ],
+          "elementSchema": "bytes"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:floob_xi;1",
+          "@type": [
+            "Array",
+            "dtmi:foo:bar;1"
+          ],
+          "elementSchema": "date"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_pi;1",
+          "@type": [
+            "Array",
+            "boolean"
+          ],
+          "elementSchema": "dateTime"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:floob_sigma;1",
+          "@type": [
+            "Array",
+            "boolean"
+          ],
+          "elementSchema": "decimal"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassArrayTypeIncludesUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassArrayTypeIncludesUndefinedTermV4.json
new file mode 100644
index 00000000..9aeb706e
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassArrayTypeIncludesUndefinedTermV4.json
@@ -0,0 +1,45 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_humpf;1",
+          "@type": [
+            "Array",
+            "Foobar"
+          ],
+          "elementSchema": "long"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:floob_glikk;1",
+          "@type": [
+            "Array",
+            "Foobar"
+          ],
+          "elementSchema": "short"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassCommandPropertyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassCommandPropertyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..b8af482f
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassCommandPropertyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,88 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Command",
+            "Foobar"
+          ],
+          "name": "floob_pi",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Command",
+            "Foobar"
+          ],
+          "name": "floob_sigma",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Command",
+            "Foobar"
+          ],
+          "name": "floob_upsilon",
+          "boolean": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Command",
+            "Foobar"
+          ],
+          "name": "floob_chi",
+          "boolean": null
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassCommandPropertyRequestDependentReferenceV4.json b/DTDL/v4/spec/Completion-ClassCommandPropertyRequestDependentReferenceV4.json
new file mode 100644
index 00000000..fcc18ccc
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassCommandPropertyRequestDependentReferenceV4.json
@@ -0,0 +1,58 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_eta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:humpf_zeta;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "humpf_epsilon",
+            "request": "dtmi:ex:dependentRef;1"
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_kappa;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:humpf_iota;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "humpf_theta",
+            "request": [
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassCommandPropertyResponseDependentReferenceV4.json b/DTDL/v4/spec/Completion-ClassCommandPropertyResponseDependentReferenceV4.json
new file mode 100644
index 00000000..4b35a6e7
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassCommandPropertyResponseDependentReferenceV4.json
@@ -0,0 +1,58 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_nuh;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:snee_glikk;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "snee_fuddle",
+            "response": "dtmi:ex:dependentRef;1"
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_thnad;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:snee_quan;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "snee_snee",
+            "response": [
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassCommandPropertyUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassCommandPropertyUndefinedTermV4.json
new file mode 100644
index 00000000..9970ca51
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassCommandPropertyUndefinedTermV4.json
@@ -0,0 +1,45 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Command",
+            "Foobar"
+          ],
+          "name": "floob_itch",
+          "foobar": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Command",
+            "Foobar"
+          ],
+          "name": "floob_vroo",
+          "foobar": {}
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassCommandRequestPropertyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassCommandRequestPropertyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..0dd0db5b
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassCommandRequestPropertyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,108 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_delta",
+          "request": {
+            "@type": [
+              "CommandRequest",
+              "Foobar"
+            ],
+            "name": "psi_gamma",
+            "schema": "unsignedLong",
+            "dtmi:foo:bar;1": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_eta",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "CommandRequest",
+              "Foobar"
+            ],
+            "name": "psi_zeta",
+            "schema": "unsignedShort",
+            "dtmi:foo:bar;1": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_kappa",
+          "request": {
+            "@type": [
+              "CommandRequest",
+              "Foobar"
+            ],
+            "name": "psi_iota",
+            "schema": "uuid",
+            "boolean": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_nu",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "CommandRequest",
+              "Foobar"
+            ],
+            "name": "psi_mu",
+            "schema": "boolean",
+            "boolean": null
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassCommandRequestPropertySchemaDependentReferenceV4.json b/DTDL/v4/spec/Completion-ClassCommandRequestPropertySchemaDependentReferenceV4.json
new file mode 100644
index 00000000..2c4eaa2e
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassCommandRequestPropertySchemaDependentReferenceV4.json
@@ -0,0 +1,64 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_thnad;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:vroo_quan;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "vroo_snee",
+            "request": {
+              "name": "vroo_nuh",
+              "schema": "dtmi:ex:dependentRef;1"
+            }
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_jogg;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:vroo_zatz;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "vroo_floob",
+            "request": {
+              "name": "vroo_spazz",
+              "schema": [
+                "dtmi:ex:dependentRef;1"
+              ]
+            }
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassCommandRequestPropertyUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassCommandRequestPropertyUndefinedTermV4.json
new file mode 100644
index 00000000..a9e3badd
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassCommandRequestPropertyUndefinedTermV4.json
@@ -0,0 +1,55 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_itch",
+          "request": {
+            "@type": [
+              "CommandRequest",
+              "Foobar"
+            ],
+            "name": "psi_flunn",
+            "schema": "integer",
+            "foobar": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_hi",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "CommandRequest",
+              "Foobar"
+            ],
+            "name": "psi_vroo",
+            "schema": "long",
+            "foobar": {}
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassCommandRequestTypeIncludesIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassCommandRequestTypeIncludesIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..d154f5d7
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassCommandRequestTypeIncludesIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,104 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_spazz",
+          "request": {
+            "@type": [
+              "CommandRequest",
+              "dtmi:foo:bar;1"
+            ],
+            "name": "eta_thnad",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_jogg",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "CommandRequest",
+              "dtmi:foo:bar;1"
+            ],
+            "name": "eta_zatz",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_yekk",
+          "request": {
+            "@type": [
+              "CommandRequest",
+              "boolean"
+            ],
+            "name": "eta_itch",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_alpha",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "CommandRequest",
+              "boolean"
+            ],
+            "name": "eta_hi",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassCommandRequestTypeIncludesUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassCommandRequestTypeIncludesUndefinedTermV4.json
new file mode 100644
index 00000000..a0943466
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassCommandRequestTypeIncludesUndefinedTermV4.json
@@ -0,0 +1,53 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_pi",
+          "request": {
+            "@type": [
+              "CommandRequest",
+              "Foobar"
+            ],
+            "name": "theta_omicron",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_tau",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "CommandRequest",
+              "Foobar"
+            ],
+            "name": "theta_sigma",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassCommandResponsePropertyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassCommandResponsePropertyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..313fc781
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassCommandResponsePropertyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,108 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_eta",
+          "response": {
+            "@type": [
+              "CommandResponse",
+              "Foobar"
+            ],
+            "name": "kappa_zeta",
+            "schema": "dateTime",
+            "dtmi:foo:bar;1": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_kappa",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "CommandResponse",
+              "Foobar"
+            ],
+            "name": "kappa_iota",
+            "schema": "decimal",
+            "dtmi:foo:bar;1": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_nu",
+          "response": {
+            "@type": [
+              "CommandResponse",
+              "Foobar"
+            ],
+            "name": "kappa_mu",
+            "schema": "double",
+            "boolean": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_pi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "CommandResponse",
+              "Foobar"
+            ],
+            "name": "kappa_omicron",
+            "schema": "duration",
+            "boolean": null
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassCommandResponsePropertySchemaDependentReferenceV4.json b/DTDL/v4/spec/Completion-ClassCommandResponsePropertySchemaDependentReferenceV4.json
new file mode 100644
index 00000000..23ddec04
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassCommandResponsePropertySchemaDependentReferenceV4.json
@@ -0,0 +1,64 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_zatz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:fuddle_floob;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "fuddle_spazz",
+            "response": {
+              "name": "fuddle_thnad",
+              "schema": "dtmi:ex:dependentRef;1"
+            }
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_yekk;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:fuddle_itch;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "fuddle_flunn",
+            "response": {
+              "name": "fuddle_jogg",
+              "schema": [
+                "dtmi:ex:dependentRef;1"
+              ]
+            }
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassCommandResponsePropertyUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassCommandResponsePropertyUndefinedTermV4.json
new file mode 100644
index 00000000..e3e1ffaa
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassCommandResponsePropertyUndefinedTermV4.json
@@ -0,0 +1,55 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_hi",
+          "response": {
+            "@type": [
+              "CommandResponse",
+              "Foobar"
+            ],
+            "name": "kappa_vroo",
+            "schema": "unsignedLong",
+            "foobar": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "lambda_gamma",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "CommandResponse",
+              "Foobar"
+            ],
+            "name": "lambda_beta",
+            "schema": "unsignedShort",
+            "foobar": {}
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassCommandResponseTypeIncludesIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassCommandResponseTypeIncludesIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..63dac64c
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassCommandResponseTypeIncludesIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,104 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_jogg",
+          "response": {
+            "@type": [
+              "CommandResponse",
+              "dtmi:foo:bar;1"
+            ],
+            "name": "zatz_zatz",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_yekk",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "CommandResponse",
+              "dtmi:foo:bar;1"
+            ],
+            "name": "zatz_itch",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_alpha",
+          "response": {
+            "@type": [
+              "CommandResponse",
+              "boolean"
+            ],
+            "name": "zatz_hi",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_delta",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "CommandResponse",
+              "boolean"
+            ],
+            "name": "jogg_gamma",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassCommandResponseTypeIncludesUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassCommandResponseTypeIncludesUndefinedTermV4.json
new file mode 100644
index 00000000..fa66fd31
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassCommandResponseTypeIncludesUndefinedTermV4.json
@@ -0,0 +1,53 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_tau",
+          "response": {
+            "@type": [
+              "CommandResponse",
+              "Foobar"
+            ],
+            "name": "jogg_sigma",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_chi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "CommandResponse",
+              "Foobar"
+            ],
+            "name": "jogg_phi",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassCommandTypeIncludesIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassCommandTypeIncludesIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..a44d5a1e
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassCommandTypeIncludesIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,84 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Command",
+            "dtmi:foo:bar;1"
+          ],
+          "name": "theta_thnad"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Command",
+            "dtmi:foo:bar;1"
+          ],
+          "name": "theta_floob"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Command",
+            "boolean"
+          ],
+          "name": "theta_jogg"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Command",
+            "boolean"
+          ],
+          "name": "theta_itch"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassCommandTypeIncludesUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassCommandTypeIncludesUndefinedTermV4.json
new file mode 100644
index 00000000..534a5c60
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassCommandTypeIncludesUndefinedTermV4.json
@@ -0,0 +1,43 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Command",
+            "Foobar"
+          ],
+          "name": "iota_eta"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Command",
+            "Foobar"
+          ],
+          "name": "iota_iota"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassComponentPropertyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassComponentPropertyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..4b565463
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassComponentPropertyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,104 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Component",
+            "Foobar"
+          ],
+          "name": "spazz_floob",
+          "schema": {
+            "@id": "dtmi:example:spazz_zatz;1",
+            "@type": "Interface"
+          },
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Component",
+            "Foobar"
+          ],
+          "name": "spazz_flunn",
+          "schema": {
+            "@id": "dtmi:example:spazz_itch;1",
+            "@type": "Interface"
+          },
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Component",
+            "Foobar"
+          ],
+          "name": "spazz_vroo",
+          "schema": {
+            "@id": "dtmi:example:spazz_hi;1",
+            "@type": "Interface"
+          },
+          "boolean": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Component",
+            "Foobar"
+          ],
+          "name": "floob_beta",
+          "schema": {
+            "@id": "dtmi:example:floob_gamma;1",
+            "@type": "Interface"
+          },
+          "boolean": null
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassComponentPropertySchemaDependentReferenceV4.json b/DTDL/v4/spec/Completion-ClassComponentPropertySchemaDependentReferenceV4.json
new file mode 100644
index 00000000..26805411
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassComponentPropertySchemaDependentReferenceV4.json
@@ -0,0 +1,58 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_eta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:sigma_zeta;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "sigma_epsilon",
+            "schema": "dtmi:ex:dependentRef;1"
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_kappa;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:sigma_iota;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "sigma_theta",
+            "schema": [
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassComponentPropertyUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassComponentPropertyUndefinedTermV4.json
new file mode 100644
index 00000000..ecaa86c7
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassComponentPropertyUndefinedTermV4.json
@@ -0,0 +1,53 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Component",
+            "Foobar"
+          ],
+          "name": "floob_fuddle",
+          "schema": {
+            "@id": "dtmi:example:floob_glikk;1",
+            "@type": "Interface"
+          },
+          "foobar": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Component",
+            "Foobar"
+          ],
+          "name": "floob_snee",
+          "schema": {
+            "@id": "dtmi:example:floob_quan;1",
+            "@type": "Interface"
+          },
+          "foobar": {}
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassComponentTypeIncludesIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassComponentTypeIncludesIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..60d7d30a
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassComponentTypeIncludesIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,100 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Component",
+            "dtmi:foo:bar;1"
+          ],
+          "name": "nu_wum",
+          "schema": {
+            "@id": "dtmi:example:nu_um;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Component",
+            "dtmi:foo:bar;1"
+          ],
+          "name": "nu_fuddle",
+          "schema": {
+            "@id": "dtmi:example:nu_glikk;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Component",
+            "boolean"
+          ],
+          "name": "nu_snee",
+          "schema": {
+            "@id": "dtmi:example:nu_quan;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Component",
+            "boolean"
+          ],
+          "name": "nu_spazz",
+          "schema": {
+            "@id": "dtmi:example:nu_floob;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassComponentTypeIncludesUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassComponentTypeIncludesUndefinedTermV4.json
new file mode 100644
index 00000000..21332405
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassComponentTypeIncludesUndefinedTermV4.json
@@ -0,0 +1,51 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Component",
+            "Foobar"
+          ],
+          "name": "xi_eta",
+          "schema": {
+            "@id": "dtmi:example:xi_theta;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Component",
+            "Foobar"
+          ],
+          "name": "xi_kappa",
+          "schema": {
+            "@id": "dtmi:example:xi_lambda;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassEnumPropertyEnumValuesDependentReferenceV4.json b/DTDL/v4/spec/Completion-ClassEnumPropertyEnumValuesDependentReferenceV4.json
new file mode 100644
index 00000000..2dc39a2a
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassEnumPropertyEnumValuesDependentReferenceV4.json
@@ -0,0 +1,58 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "lambda_yuzz",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": "dtmi:ex:dependentRef;1"
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "lambda_um",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": [
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassEnumPropertyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassEnumPropertyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..6dac33fd
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassEnumPropertyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,92 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_kappa;1",
+          "@type": [
+            "Enum",
+            "Foobar"
+          ],
+          "valueSchema": "integer",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:omicron_mu;1",
+          "@type": [
+            "Enum",
+            "Foobar"
+          ],
+          "valueSchema": "integer",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_xi;1",
+          "@type": [
+            "Enum",
+            "Foobar"
+          ],
+          "valueSchema": "integer",
+          "boolean": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:omicron_pi;1",
+          "@type": [
+            "Enum",
+            "Foobar"
+          ],
+          "valueSchema": "integer",
+          "boolean": null
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassEnumPropertyUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassEnumPropertyUndefinedTermV4.json
new file mode 100644
index 00000000..2a0798af
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassEnumPropertyUndefinedTermV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_thnad;1",
+          "@type": [
+            "Enum",
+            "Foobar"
+          ],
+          "valueSchema": "integer",
+          "foobar": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:omicron_floob;1",
+          "@type": [
+            "Enum",
+            "Foobar"
+          ],
+          "valueSchema": "integer",
+          "foobar": {}
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassEnumTypeIncludesIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassEnumTypeIncludesIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..1e935f9e
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassEnumTypeIncludesIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,88 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_phi;1",
+          "@type": [
+            "Enum",
+            "dtmi:foo:bar;1"
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:jogg_psi;1",
+          "@type": [
+            "Enum",
+            "dtmi:foo:bar;1"
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_yuzz;1",
+          "@type": [
+            "Enum",
+            "boolean"
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:jogg_um;1",
+          "@type": [
+            "Enum",
+            "boolean"
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassEnumTypeIncludesUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassEnumTypeIncludesUndefinedTermV4.json
new file mode 100644
index 00000000..b5c39c54
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassEnumTypeIncludesUndefinedTermV4.json
@@ -0,0 +1,45 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_zatz;1",
+          "@type": [
+            "Enum",
+            "Foobar"
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:jogg_flunn;1",
+          "@type": [
+            "Enum",
+            "Foobar"
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassEnumValuePropertyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassEnumValuePropertyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..d6e77749
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassEnumValuePropertyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,112 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_spazz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@type": [
+              "EnumValue",
+              "Foobar"
+            ],
+            "enumValue": 1839,
+            "name": "flunn_thnad",
+            "dtmi:foo:bar;1": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_jogg;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "EnumValue",
+              "Foobar"
+            ],
+            "enumValue": 1840,
+            "name": "flunn_zatz",
+            "dtmi:foo:bar;1": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_yekk;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@type": [
+              "EnumValue",
+              "Foobar"
+            ],
+            "enumValue": 1841,
+            "name": "flunn_itch",
+            "boolean": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_alpha;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "EnumValue",
+              "Foobar"
+            ],
+            "enumValue": 1842,
+            "name": "flunn_hi",
+            "boolean": null
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassEnumValuePropertyUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassEnumValuePropertyUndefinedTermV4.json
new file mode 100644
index 00000000..d7a47598
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassEnumValuePropertyUndefinedTermV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_humpf;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@type": [
+              "EnumValue",
+              "Foobar"
+            ],
+            "enumValue": 1851,
+            "name": "itch_um",
+            "foobar": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_nuh;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "EnumValue",
+              "Foobar"
+            ],
+            "enumValue": 1852,
+            "name": "itch_glikk",
+            "foobar": {}
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassEnumValueTypeIncludesIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassEnumValueTypeIncludesIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..4d60fe36
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassEnumValueTypeIncludesIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,108 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_um;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@type": [
+              "EnumValue",
+              "dtmi:foo:bar;1"
+            ],
+            "enumValue": 1657,
+            "name": "wum_wum"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_glikk;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "EnumValue",
+              "dtmi:foo:bar;1"
+            ],
+            "enumValue": 1658,
+            "name": "wum_fuddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_quan;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@type": [
+              "EnumValue",
+              "boolean"
+            ],
+            "enumValue": 1659,
+            "name": "wum_snee"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_floob;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "EnumValue",
+              "boolean"
+            ],
+            "enumValue": 1660,
+            "name": "wum_spazz"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassEnumValueTypeIncludesUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassEnumValueTypeIncludesUndefinedTermV4.json
new file mode 100644
index 00000000..8a2224fe
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassEnumValueTypeIncludesUndefinedTermV4.json
@@ -0,0 +1,55 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_theta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@type": [
+              "EnumValue",
+              "Foobar"
+            ],
+            "enumValue": 1665,
+            "name": "um_eta"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_lambda;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "EnumValue",
+              "Foobar"
+            ],
+            "enumValue": 1666,
+            "name": "um_kappa"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassFieldPropertyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassFieldPropertyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..daab83bc
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassFieldPropertyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,108 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_nu;1",
+          "@type": "Object",
+          "fields": {
+            "@type": [
+              "Field",
+              "Foobar"
+            ],
+            "name": "omega_mu",
+            "schema": "uuid",
+            "dtmi:foo:bar;1": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_pi;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "Field",
+              "Foobar"
+            ],
+            "name": "omega_omicron",
+            "schema": "boolean",
+            "dtmi:foo:bar;1": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_tau;1",
+          "@type": "Object",
+          "fields": {
+            "@type": [
+              "Field",
+              "Foobar"
+            ],
+            "name": "omega_sigma",
+            "schema": "byte",
+            "boolean": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_chi;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "Field",
+              "Foobar"
+            ],
+            "name": "omega_phi",
+            "schema": "bytes",
+            "boolean": null
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassFieldPropertySchemaDependentReferenceV4.json b/DTDL/v4/spec/Completion-ClassFieldPropertySchemaDependentReferenceV4.json
new file mode 100644
index 00000000..d65f0bd1
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassFieldPropertySchemaDependentReferenceV4.json
@@ -0,0 +1,62 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_yuzz",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "gamma_omega",
+              "schema": "dtmi:ex:dependentRef;1"
+            }
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_humpf",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "gamma_um",
+              "schema": [
+                "dtmi:ex:dependentRef;1"
+              ]
+            }
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassFieldPropertyUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassFieldPropertyUndefinedTermV4.json
new file mode 100644
index 00000000..45c0fbd4
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassFieldPropertyUndefinedTermV4.json
@@ -0,0 +1,55 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_zeta;1",
+          "@type": "Object",
+          "fields": {
+            "@type": [
+              "Field",
+              "Foobar"
+            ],
+            "name": "yuzz_epsilon",
+            "schema": "short",
+            "foobar": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_iota;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "Field",
+              "Foobar"
+            ],
+            "name": "yuzz_theta",
+            "schema": "string",
+            "foobar": {}
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassFieldTypeIncludesIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassFieldTypeIncludesIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..93c6c548
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassFieldTypeIncludesIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,104 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_epsilon;1",
+          "@type": "Object",
+          "fields": {
+            "@type": [
+              "Field",
+              "dtmi:foo:bar;1"
+            ],
+            "name": "lambda_delta",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_theta;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "Field",
+              "dtmi:foo:bar;1"
+            ],
+            "name": "lambda_eta",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_lambda;1",
+          "@type": "Object",
+          "fields": {
+            "@type": [
+              "Field",
+              "boolean"
+            ],
+            "name": "lambda_kappa",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_xi;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "Field",
+              "boolean"
+            ],
+            "name": "lambda_nu",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassFieldTypeIncludesUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassFieldTypeIncludesUndefinedTermV4.json
new file mode 100644
index 00000000..b1601f99
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassFieldTypeIncludesUndefinedTermV4.json
@@ -0,0 +1,53 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_fuddle;1",
+          "@type": "Object",
+          "fields": {
+            "@type": [
+              "Field",
+              "Foobar"
+            ],
+            "name": "lambda_humpf",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_snee;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "Field",
+              "Foobar"
+            ],
+            "name": "lambda_nuh",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassInterfacePropertyContentsDependentReferenceV4.json b/DTDL/v4/spec/Completion-ClassInterfacePropertyContentsDependentReferenceV4.json
new file mode 100644
index 00000000..128a3df3
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassInterfacePropertyContentsDependentReferenceV4.json
@@ -0,0 +1,50 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_hi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:humpf_vroo;1",
+          "@type": "Interface",
+          "contents": "dtmi:ex:dependentRef;1"
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_beta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:fuddle_alpha;1",
+          "@type": "Interface",
+          "contents": [
+            "dtmi:ex:dependentRef;1"
+          ]
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassInterfacePropertyExtendsDependentReferenceV4.json b/DTDL/v4/spec/Completion-ClassInterfacePropertyExtendsDependentReferenceV4.json
new file mode 100644
index 00000000..52093340
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassInterfacePropertyExtendsDependentReferenceV4.json
@@ -0,0 +1,50 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_upsilon;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:quan_tau;1",
+          "@type": "Interface",
+          "extends": "dtmi:ex:dependentRef;1"
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_chi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:quan_phi;1",
+          "@type": "Interface",
+          "extends": [
+            "dtmi:ex:dependentRef;1"
+          ]
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassInterfacePropertyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassInterfacePropertyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..bbd519d9
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassInterfacePropertyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,76 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_itch;1",
+        "@type": [
+          "Interface",
+          "Foobar"
+        ],
+        "dtmi:foo:bar;1": 626
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:jogg_yekk;1",
+        "@type": [
+          "Interface",
+          "Foobar"
+        ],
+        "dtmi:foo:bar;1": 626
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_vroo;1",
+        "@type": [
+          "Interface",
+          "Foobar"
+        ],
+        "boolean": null
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:jogg_hi;1",
+        "@type": [
+          "Interface",
+          "Foobar"
+        ],
+        "boolean": null
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassInterfacePropertySchemasDependentReferenceV4.json b/DTDL/v4/spec/Completion-ClassInterfacePropertySchemasDependentReferenceV4.json
new file mode 100644
index 00000000..a49a53a2
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassInterfacePropertySchemasDependentReferenceV4.json
@@ -0,0 +1,50 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_phi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:floob_upsilon;1",
+          "@type": "Interface",
+          "schemas": "dtmi:ex:dependentRef;1"
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_psi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:floob_chi;1",
+          "@type": "Interface",
+          "schemas": [
+            "dtmi:ex:dependentRef;1"
+          ]
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassInterfacePropertyUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassInterfacePropertyUndefinedTermV4.json
new file mode 100644
index 00000000..11bff9a4
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassInterfacePropertyUndefinedTermV4.json
@@ -0,0 +1,39 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_iota;1",
+        "@type": [
+          "Interface",
+          "Foobar"
+        ],
+        "foobar": {}
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:flunn_kappa;1",
+        "@type": [
+          "Interface",
+          "Foobar"
+        ],
+        "foobar": {}
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassInterfaceTypeIncludesIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassInterfaceTypeIncludesIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..aca412f2
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassInterfaceTypeIncludesIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,72 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_eta;1",
+        "@type": [
+          "Interface",
+          "dtmi:foo:bar;1"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:wum_theta;1",
+        "@type": [
+          "Interface",
+          "dtmi:foo:bar;1"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_iota;1",
+        "@type": [
+          "Interface",
+          "boolean"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:wum_kappa;1",
+        "@type": [
+          "Interface",
+          "boolean"
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassInterfaceTypeIncludesUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassInterfaceTypeIncludesUndefinedTermV4.json
new file mode 100644
index 00000000..b526f68a
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassInterfaceTypeIncludesUndefinedTermV4.json
@@ -0,0 +1,37 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_omicron;1",
+        "@type": [
+          "Interface",
+          "Foobar"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:wum_pi;1",
+        "@type": [
+          "Interface",
+          "Foobar"
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassMapKeyPropertyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassMapKeyPropertyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..f657677b
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassMapKeyPropertyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,124 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_glikk;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "wum_nuh",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "@type": [
+              "MapKey",
+              "Foobar"
+            ],
+            "name": "wum_fuddle",
+            "schema": "string",
+            "dtmi:foo:bar;1": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_thnad;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "wum_spazz",
+            "schema": "float"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "MapKey",
+              "Foobar"
+            ],
+            "name": "wum_quan",
+            "schema": "string",
+            "dtmi:foo:bar;1": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_jogg;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "wum_flunn",
+            "schema": "integer"
+          },
+          "mapKey": {
+            "@type": [
+              "MapKey",
+              "Foobar"
+            ],
+            "name": "wum_zatz",
+            "schema": "string",
+            "boolean": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_vroo;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "wum_hi",
+            "schema": "long"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "MapKey",
+              "Foobar"
+            ],
+            "name": "wum_yekk",
+            "schema": "string",
+            "boolean": null
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassMapKeyPropertyUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassMapKeyPropertyUndefinedTermV4.json
new file mode 100644
index 00000000..7f7fcc1d
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassMapKeyPropertyUndefinedTermV4.json
@@ -0,0 +1,63 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_spazz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "um_floob",
+            "schema": "boolean"
+          },
+          "mapKey": {
+            "@type": [
+              "MapKey",
+              "Foobar"
+            ],
+            "name": "um_thnad",
+            "schema": "string",
+            "foobar": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_flunn;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "um_itch",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "MapKey",
+              "Foobar"
+            ],
+            "name": "um_jogg",
+            "schema": "string",
+            "foobar": {}
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassMapKeyTypeIncludesIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassMapKeyTypeIncludesIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..dfb230ec
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassMapKeyTypeIncludesIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,120 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_mu;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "iota_nu",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "@type": [
+              "MapKey",
+              "dtmi:foo:bar;1"
+            ],
+            "name": "iota_lambda",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_pi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "iota_rho",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "MapKey",
+              "dtmi:foo:bar;1"
+            ],
+            "name": "iota_omicron",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_upsilon;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "iota_phi",
+            "schema": "unsignedShort"
+          },
+          "mapKey": {
+            "@type": [
+              "MapKey",
+              "boolean"
+            ],
+            "name": "iota_tau",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_omega;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "iota_yuzz",
+            "schema": "uuid"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "MapKey",
+              "boolean"
+            ],
+            "name": "iota_psi",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassMapKeyTypeIncludesUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassMapKeyTypeIncludesUndefinedTermV4.json
new file mode 100644
index 00000000..82655af3
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassMapKeyTypeIncludesUndefinedTermV4.json
@@ -0,0 +1,61 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_alpha;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "kappa_beta",
+            "schema": "dateTime"
+          },
+          "mapKey": {
+            "@type": [
+              "MapKey",
+              "Foobar"
+            ],
+            "name": "iota_hi",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_epsilon;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "kappa_zeta",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "MapKey",
+              "Foobar"
+            ],
+            "name": "kappa_delta",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassMapPropertyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassMapPropertyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..a48bdfd0
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassMapPropertyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,120 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_quan;1",
+          "@type": [
+            "Map",
+            "Foobar"
+          ],
+          "mapKey": {
+            "name": "humpf_thnad",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "humpf_spazz",
+            "schema": "unsignedLong"
+          },
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:humpf_zatz;1",
+          "@type": [
+            "Map",
+            "Foobar"
+          ],
+          "mapKey": {
+            "name": "humpf_jogg",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "humpf_flunn",
+            "schema": "unsignedShort"
+          },
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_yekk;1",
+          "@type": [
+            "Map",
+            "Foobar"
+          ],
+          "mapKey": {
+            "name": "humpf_vroo",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "humpf_hi",
+            "schema": "uuid"
+          },
+          "boolean": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:fuddle_beta;1",
+          "@type": [
+            "Map",
+            "Foobar"
+          ],
+          "mapKey": {
+            "name": "fuddle_gamma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "fuddle_delta",
+            "schema": "boolean"
+          },
+          "boolean": null
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassMapPropertyMapKeyDependentReferenceV4.json b/DTDL/v4/spec/Completion-ClassMapPropertyMapKeyDependentReferenceV4.json
new file mode 100644
index 00000000..54987611
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassMapPropertyMapKeyDependentReferenceV4.json
@@ -0,0 +1,64 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_zatz",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "alpha_floob",
+              "schema": "unsignedLong"
+            },
+            "mapKey": "dtmi:ex:dependentRef;1"
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_itch",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "alpha_flunn",
+              "schema": "unsignedShort"
+            },
+            "mapKey": [
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassMapPropertyMapValueDependentReferenceV4.json b/DTDL/v4/spec/Completion-ClassMapPropertyMapValueDependentReferenceV4.json
new file mode 100644
index 00000000..d91deb69
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassMapPropertyMapValueDependentReferenceV4.json
@@ -0,0 +1,64 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "eta_upsilon",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "eta_tau",
+              "schema": "string"
+            },
+            "mapValue": "dtmi:ex:dependentRef;1"
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "eta_psi",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "eta_chi",
+              "schema": "string"
+            },
+            "mapValue": [
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassMapPropertyUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassMapPropertyUndefinedTermV4.json
new file mode 100644
index 00000000..ddb4ccdd
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassMapPropertyUndefinedTermV4.json
@@ -0,0 +1,61 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_jogg;1",
+          "@type": [
+            "Map",
+            "Foobar"
+          ],
+          "mapKey": {
+            "name": "fuddle_flunn",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "fuddle_itch",
+            "schema": "integer"
+          },
+          "foobar": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:fuddle_vroo;1",
+          "@type": [
+            "Map",
+            "Foobar"
+          ],
+          "mapKey": {
+            "name": "fuddle_hi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "glikk_alpha",
+            "schema": "long"
+          },
+          "foobar": {}
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassMapTypeIncludesIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassMapTypeIncludesIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..3741af79
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassMapTypeIncludesIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,116 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_upsilon;1",
+          "@type": [
+            "Map",
+            "dtmi:foo:bar;1"
+          ],
+          "mapKey": {
+            "name": "vroo_phi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "vroo_chi",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:vroo_omega;1",
+          "@type": [
+            "Map",
+            "dtmi:foo:bar;1"
+          ],
+          "mapKey": {
+            "name": "vroo_yuzz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "vroo_wum",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_humpf;1",
+          "@type": [
+            "Map",
+            "boolean"
+          ],
+          "mapKey": {
+            "name": "vroo_fuddle",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "vroo_glikk",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:vroo_snee;1",
+          "@type": [
+            "Map",
+            "boolean"
+          ],
+          "mapKey": {
+            "name": "vroo_quan",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "vroo_thnad",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassMapTypeIncludesUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassMapTypeIncludesUndefinedTermV4.json
new file mode 100644
index 00000000..43fb9097
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassMapTypeIncludesUndefinedTermV4.json
@@ -0,0 +1,59 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_iota;1",
+          "@type": [
+            "Map",
+            "Foobar"
+          ],
+          "mapKey": {
+            "name": "hi_kappa",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "hi_lambda",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:hi_nu;1",
+          "@type": [
+            "Map",
+            "Foobar"
+          ],
+          "mapKey": {
+            "name": "hi_xi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "hi_omicron",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassMapValuePropertyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassMapValuePropertyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..f6c8c19b
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassMapValuePropertyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,124 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_yekk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "tau_vroo",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@type": [
+              "MapValue",
+              "Foobar"
+            ],
+            "name": "tau_itch",
+            "schema": "bytes",
+            "dtmi:foo:bar;1": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_beta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "upsilon_gamma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "MapValue",
+              "Foobar"
+            ],
+            "name": "upsilon_alpha",
+            "schema": "date",
+            "dtmi:foo:bar;1": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_zeta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "upsilon_eta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@type": [
+              "MapValue",
+              "Foobar"
+            ],
+            "name": "upsilon_epsilon",
+            "schema": "dateTime",
+            "boolean": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_kappa;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "upsilon_lambda",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "MapValue",
+              "Foobar"
+            ],
+            "name": "upsilon_iota",
+            "schema": "decimal",
+            "boolean": null
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassMapValuePropertySchemaDependentReferenceV4.json b/DTDL/v4/spec/Completion-ClassMapValuePropertySchemaDependentReferenceV4.json
new file mode 100644
index 00000000..a21f18d6
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassMapValuePropertySchemaDependentReferenceV4.json
@@ -0,0 +1,70 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "spazz_itch",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "spazz_flunn",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "spazz_jogg",
+              "schema": "dtmi:ex:dependentRef;1"
+            }
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "floob_alpha",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "spazz_hi",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "spazz_vroo",
+              "schema": [
+                "dtmi:ex:dependentRef;1"
+              ]
+            }
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassMapValuePropertyUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassMapValuePropertyUndefinedTermV4.json
new file mode 100644
index 00000000..32205a34
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassMapValuePropertyUndefinedTermV4.json
@@ -0,0 +1,63 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_gamma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "phi_delta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@type": [
+              "MapValue",
+              "Foobar"
+            ],
+            "name": "phi_beta",
+            "schema": "unsignedByte",
+            "foobar": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_eta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "phi_theta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "MapValue",
+              "Foobar"
+            ],
+            "name": "phi_zeta",
+            "schema": "unsignedInteger",
+            "foobar": {}
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassMapValueTypeIncludesIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassMapValueTypeIncludesIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..538a28cf
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassMapValueTypeIncludesIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,120 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_psi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "beta_omega",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@type": [
+              "MapValue",
+              "dtmi:foo:bar;1"
+            ],
+            "name": "beta_chi",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_um;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "beta_humpf",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "MapValue",
+              "dtmi:foo:bar;1"
+            ],
+            "name": "beta_wum",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_nuh;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "beta_snee",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@type": [
+              "MapValue",
+              "boolean"
+            ],
+            "name": "beta_glikk",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_spazz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "beta_floob",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "MapValue",
+              "boolean"
+            ],
+            "name": "beta_thnad",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassMapValueTypeIncludesUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassMapValueTypeIncludesUndefinedTermV4.json
new file mode 100644
index 00000000..bb3f3432
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassMapValueTypeIncludesUndefinedTermV4.json
@@ -0,0 +1,61 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_mu;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "gamma_nu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@type": [
+              "MapValue",
+              "Foobar"
+            ],
+            "name": "gamma_lambda",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_pi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "gamma_rho",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "MapValue",
+              "Foobar"
+            ],
+            "name": "gamma_omicron",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassObjectPropertyFieldsDependentReferenceV4.json b/DTDL/v4/spec/Completion-ClassObjectPropertyFieldsDependentReferenceV4.json
new file mode 100644
index 00000000..33fbb9a4
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassObjectPropertyFieldsDependentReferenceV4.json
@@ -0,0 +1,56 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "nuh_itch",
+          "schema": {
+            "@type": "Object",
+            "fields": "dtmi:ex:dependentRef;1"
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "nuh_vroo",
+          "schema": {
+            "@type": "Object",
+            "fields": [
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassObjectPropertyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassObjectPropertyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..e61c2784
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassObjectPropertyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,88 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_yuzz;1",
+          "@type": [
+            "Object",
+            "Foobar"
+          ],
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:spazz_um;1",
+          "@type": [
+            "Object",
+            "Foobar"
+          ],
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_fuddle;1",
+          "@type": [
+            "Object",
+            "Foobar"
+          ],
+          "boolean": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:spazz_nuh;1",
+          "@type": [
+            "Object",
+            "Foobar"
+          ],
+          "boolean": null
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassObjectPropertyUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassObjectPropertyUndefinedTermV4.json
new file mode 100644
index 00000000..0ab8ad29
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassObjectPropertyUndefinedTermV4.json
@@ -0,0 +1,45 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_zeta;1",
+          "@type": [
+            "Object",
+            "Foobar"
+          ],
+          "foobar": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:floob_theta;1",
+          "@type": [
+            "Object",
+            "Foobar"
+          ],
+          "foobar": {}
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassObjectTypeIncludesIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassObjectTypeIncludesIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..bc6364a1
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassObjectTypeIncludesIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,84 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_zatz;1",
+          "@type": [
+            "Object",
+            "dtmi:foo:bar;1"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:chi_flunn;1",
+          "@type": [
+            "Object",
+            "dtmi:foo:bar;1"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_yekk;1",
+          "@type": [
+            "Object",
+            "boolean"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:chi_hi;1",
+          "@type": [
+            "Object",
+            "boolean"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassObjectTypeIncludesUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassObjectTypeIncludesUndefinedTermV4.json
new file mode 100644
index 00000000..065527a8
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassObjectTypeIncludesUndefinedTermV4.json
@@ -0,0 +1,43 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_kappa;1",
+          "@type": [
+            "Object",
+            "Foobar"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:psi_mu;1",
+          "@type": [
+            "Object",
+            "Foobar"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassPropertyPropertyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassPropertyPropertyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..07808cae
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassPropertyPropertyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,92 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Property",
+            "Foobar"
+          ],
+          "name": "nu_mu",
+          "schema": "unsignedLong",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Property",
+            "Foobar"
+          ],
+          "name": "nu_xi",
+          "schema": "unsignedShort",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Property",
+            "Foobar"
+          ],
+          "name": "nu_pi",
+          "schema": "uuid",
+          "boolean": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Property",
+            "Foobar"
+          ],
+          "name": "nu_sigma",
+          "schema": "boolean",
+          "boolean": null
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassPropertyPropertySchemaDependentReferenceV4.json b/DTDL/v4/spec/Completion-ClassPropertyPropertySchemaDependentReferenceV4.json
new file mode 100644
index 00000000..8200cc72
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassPropertyPropertySchemaDependentReferenceV4.json
@@ -0,0 +1,58 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_jogg;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:yekk_zatz;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "yekk_floob",
+            "schema": "dtmi:ex:dependentRef;1"
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_yekk;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:yekk_itch;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "yekk_flunn",
+            "schema": [
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassPropertyPropertyUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassPropertyPropertyUndefinedTermV4.json
new file mode 100644
index 00000000..b15d8ab9
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassPropertyPropertyUndefinedTermV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Property",
+            "Foobar"
+          ],
+          "name": "nu_floob",
+          "schema": "integer",
+          "foobar": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Property",
+            "Foobar"
+          ],
+          "name": "nu_jogg",
+          "schema": "long",
+          "foobar": {}
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassPropertyTypeIncludesIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassPropertyTypeIncludesIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..6e154d1f
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassPropertyTypeIncludesIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,88 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Property",
+            "dtmi:foo:bar;1"
+          ],
+          "name": "zatz_flunn",
+          "schema": "duration"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Property",
+            "dtmi:foo:bar;1"
+          ],
+          "name": "zatz_yekk",
+          "schema": "float"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Property",
+            "boolean"
+          ],
+          "name": "zatz_hi",
+          "schema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Property",
+            "boolean"
+          ],
+          "name": "jogg_beta",
+          "schema": "long"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassPropertyTypeIncludesUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassPropertyTypeIncludesUndefinedTermV4.json
new file mode 100644
index 00000000..6784b095
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassPropertyTypeIncludesUndefinedTermV4.json
@@ -0,0 +1,45 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Property",
+            "Foobar"
+          ],
+          "name": "jogg_mu",
+          "schema": "unsignedInteger"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Property",
+            "Foobar"
+          ],
+          "name": "jogg_xi",
+          "schema": "unsignedLong"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassRelationshipPropertyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassRelationshipPropertyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..4a12a871
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassRelationshipPropertyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,88 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Relationship",
+            "Foobar"
+          ],
+          "name": "flunn_theta",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Relationship",
+            "Foobar"
+          ],
+          "name": "flunn_kappa",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Relationship",
+            "Foobar"
+          ],
+          "name": "flunn_mu",
+          "boolean": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Relationship",
+            "Foobar"
+          ],
+          "name": "flunn_xi",
+          "boolean": null
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassRelationshipPropertyPropertiesDependentReferenceV4.json b/DTDL/v4/spec/Completion-ClassRelationshipPropertyPropertiesDependentReferenceV4.json
new file mode 100644
index 00000000..6085be5d
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassRelationshipPropertyPropertiesDependentReferenceV4.json
@@ -0,0 +1,58 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_flunn;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:glikk_jogg;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "glikk_zatz",
+            "properties": "dtmi:ex:dependentRef;1"
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_vroo;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:glikk_yekk;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "glikk_itch",
+            "properties": [
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassRelationshipPropertyUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassRelationshipPropertyUndefinedTermV4.json
new file mode 100644
index 00000000..7f78048e
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassRelationshipPropertyUndefinedTermV4.json
@@ -0,0 +1,45 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Relationship",
+            "Foobar"
+          ],
+          "name": "flunn_snee",
+          "foobar": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Relationship",
+            "Foobar"
+          ],
+          "name": "flunn_thnad",
+          "foobar": {}
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassRelationshipTypeIncludesIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassRelationshipTypeIncludesIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..da6dc446
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassRelationshipTypeIncludesIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,84 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Relationship",
+            "dtmi:foo:bar;1"
+          ],
+          "name": "omicron_chi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Relationship",
+            "dtmi:foo:bar;1"
+          ],
+          "name": "omicron_omega"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Relationship",
+            "boolean"
+          ],
+          "name": "omicron_wum"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Relationship",
+            "boolean"
+          ],
+          "name": "omicron_humpf"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassRelationshipTypeIncludesUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassRelationshipTypeIncludesUndefinedTermV4.json
new file mode 100644
index 00000000..68343b90
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassRelationshipTypeIncludesUndefinedTermV4.json
@@ -0,0 +1,43 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Relationship",
+            "Foobar"
+          ],
+          "name": "omicron_jogg"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Relationship",
+            "Foobar"
+          ],
+          "name": "omicron_itch"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassTelemetryPropertyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassTelemetryPropertyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..6065c601
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassTelemetryPropertyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,92 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Telemetry",
+            "Foobar"
+          ],
+          "name": "omicron_nu",
+          "schema": "long",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Telemetry",
+            "Foobar"
+          ],
+          "name": "omicron_omicron",
+          "schema": "short",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Telemetry",
+            "Foobar"
+          ],
+          "name": "omicron_rho",
+          "schema": "string",
+          "boolean": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Telemetry",
+            "Foobar"
+          ],
+          "name": "omicron_tau",
+          "schema": "time",
+          "boolean": null
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassTelemetryPropertySchemaDependentReferenceV4.json b/DTDL/v4/spec/Completion-ClassTelemetryPropertySchemaDependentReferenceV4.json
new file mode 100644
index 00000000..54439ee2
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassTelemetryPropertySchemaDependentReferenceV4.json
@@ -0,0 +1,58 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_omicron;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:beta_xi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "beta_nu",
+            "schema": "dtmi:ex:dependentRef;1"
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_sigma;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:beta_rho;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "beta_pi",
+            "schema": [
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        }
+      }
+    ],
+    "expect": {
+      "unresolvedIdentifiers": [
+        "dtmi:ex:dependentRef;1"
+      ]
+    }
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassTelemetryPropertyUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassTelemetryPropertyUndefinedTermV4.json
new file mode 100644
index 00000000..1846dd2d
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassTelemetryPropertyUndefinedTermV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Telemetry",
+            "Foobar"
+          ],
+          "name": "omicron_zatz",
+          "schema": "date",
+          "foobar": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Telemetry",
+            "Foobar"
+          ],
+          "name": "omicron_flunn",
+          "schema": "dateTime",
+          "foobar": {}
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassTelemetryTypeIncludesIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Completion-ClassTelemetryTypeIncludesIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..fa85a3bd
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassTelemetryTypeIncludesIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,88 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Telemetry",
+            "dtmi:foo:bar;1"
+          ],
+          "name": "yekk_chi",
+          "schema": "boolean"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Telemetry",
+            "dtmi:foo:bar;1"
+          ],
+          "name": "yekk_omega",
+          "schema": "byte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Telemetry",
+            "boolean"
+          ],
+          "name": "yekk_wum",
+          "schema": "bytes"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Telemetry",
+            "boolean"
+          ],
+          "name": "yekk_humpf",
+          "schema": "date"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ClassTelemetryTypeIncludesUndefinedTermV4.json b/DTDL/v4/spec/Completion-ClassTelemetryTypeIncludesUndefinedTermV4.json
new file mode 100644
index 00000000..fd9edb49
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ClassTelemetryTypeIncludesUndefinedTermV4.json
@@ -0,0 +1,45 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Telemetry",
+            "Foobar"
+          ],
+          "name": "yekk_jogg",
+          "schema": "float"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Telemetry",
+            "Foobar"
+          ],
+          "name": "yekk_itch",
+          "schema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Completion-ContextDefinedLanguageExtensionQuantV4.json b/DTDL/v4/spec/Completion-ContextDefinedLanguageExtensionQuantV4.json
new file mode 100644
index 00000000..e53f4548
--- /dev/null
+++ b/DTDL/v4/spec/Completion-ContextDefinedLanguageExtensionQuantV4.json
@@ -0,0 +1,71 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": "dtmi:dtdl:extension:quantitativeTypes;1",
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": "dtmi:arbitrary:context;1",
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": "dtmi:arbitrary:context;1",
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassArrayPropertyCommentTermV4.json b/DTDL/v4/spec/Recommendation-ClassArrayPropertyCommentTermV4.json
new file mode 100644
index 00000000..a07f18f5
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassArrayPropertyCommentTermV4.json
@@ -0,0 +1,42 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_omega;1",
+          "@type": "Array",
+          "comment": "beta_yuzz",
+          "elementSchema": "bytes"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_um;1",
+          "@type": "Array",
+          "dtmi:dtdl:property:comment;4": "beta_humpf",
+          "elementSchema": "date"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassArrayPropertyDescriptionTermV4.json b/DTDL/v4/spec/Recommendation-ClassArrayPropertyDescriptionTermV4.json
new file mode 100644
index 00000000..f482309a
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassArrayPropertyDescriptionTermV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_iota;1",
+          "@type": "Array",
+          "description": [
+            "delta_kappa"
+          ],
+          "elementSchema": "unsignedInteger"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_mu;1",
+          "@type": "Array",
+          "dtmi:dtdl:property:description;4": [
+            "delta_nu"
+          ],
+          "elementSchema": "unsignedLong"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassArrayPropertyDisplayNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassArrayPropertyDisplayNameTermV4.json
new file mode 100644
index 00000000..f278e69e
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassArrayPropertyDisplayNameTermV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_zatz;1",
+          "@type": "Array",
+          "displayName": [
+            "epsilon_jogg"
+          ],
+          "elementSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_itch;1",
+          "@type": "Array",
+          "dtmi:dtdl:property:displayName;4": [
+            "epsilon_yekk"
+          ],
+          "elementSchema": "long"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassArrayPropertyElementSchemaPreferTermToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassArrayPropertyElementSchemaPreferTermToDtmiV4.json
new file mode 100644
index 00000000..397c1c2d
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassArrayPropertyElementSchemaPreferTermToDtmiV4.json
@@ -0,0 +1,78 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_zeta;1",
+          "@type": "Array",
+          "elementSchema": "byte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_theta;1",
+          "@type": "Array",
+          "elementSchema": "dtmi:dtdl:instance:Schema:byte;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_kappa;1",
+          "@type": "Array",
+          "elementSchema": "point"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_mu;1",
+          "@type": "Array",
+          "elementSchema": "dtmi:standard:schema:geospatial:point;4"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassArrayPropertyElementSchemaTermV4.json b/DTDL/v4/spec/Recommendation-ClassArrayPropertyElementSchemaTermV4.json
new file mode 100644
index 00000000..212bcfd5
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassArrayPropertyElementSchemaTermV4.json
@@ -0,0 +1,40 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_pi;1",
+          "@type": "Array",
+          "elementSchema": "float"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_sigma;1",
+          "@type": "Array",
+          "dtmi:dtdl:property:elementSchema;4": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassArrayTypeDuplicatesMaterialV4.json b/DTDL/v4/spec/Recommendation-ClassArrayTypeDuplicatesMaterialV4.json
new file mode 100644
index 00000000..1546510b
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassArrayTypeDuplicatesMaterialV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_delta;1",
+          "elementSchema": "unsignedShort",
+          "@type": [
+            "Array",
+            "Array"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_zeta;1",
+          "elementSchema": "uuid",
+          "@type": [
+            "dtmi:dtdl:class:Array;4",
+            "dtmi:dtdl:class:Array;4"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassArrayTypeIncludesTermAndDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassArrayTypeIncludesTermAndDtmiV4.json
new file mode 100644
index 00000000..946140b4
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassArrayTypeIncludesTermAndDtmiV4.json
@@ -0,0 +1,24 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_beta;1",
+          "elementSchema": "unsignedLong",
+          "@type": [
+            "Array",
+            "dtmi:dtdl:class:Array;4"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassArrayTypePreferTermToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassArrayTypePreferTermToDtmiV4.json
new file mode 100644
index 00000000..5aa280a1
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassArrayTypePreferTermToDtmiV4.json
@@ -0,0 +1,40 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_theta;1",
+          "elementSchema": "boolean",
+          "@type": "Array"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_kappa;1",
+          "elementSchema": "byte",
+          "@type": "dtmi:dtdl:class:Array;4"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandPropertyCommandTypeDeprecatedV4.json b/DTDL/v4/spec/Recommendation-ClassCommandPropertyCommandTypeDeprecatedV4.json
new file mode 100644
index 00000000..345ffe84
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandPropertyCommandTypeDeprecatedV4.json
@@ -0,0 +1,21 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "commandType": "asynchronous",
+          "name": "omicron_wum"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandPropertyCommandTypeTermV4.json b/DTDL/v4/spec/Recommendation-ClassCommandPropertyCommandTypeTermV4.json
new file mode 100644
index 00000000..4d2dae4f
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandPropertyCommandTypeTermV4.json
@@ -0,0 +1,40 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "commandType": "asynchronous",
+          "name": "phi_jogg"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "dtmi:dtdl:property:commandType;4": "asynchronous",
+          "name": "phi_itch"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandPropertyCommentTermV4.json b/DTDL/v4/spec/Recommendation-ClassCommandPropertyCommentTermV4.json
new file mode 100644
index 00000000..f6fa4cd2
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandPropertyCommentTermV4.json
@@ -0,0 +1,40 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "comment": "psi_lambda",
+          "name": "psi_mu"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "dtmi:dtdl:property:comment;4": "psi_xi",
+          "name": "psi_omicron"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandPropertyDescriptionTermV4.json b/DTDL/v4/spec/Recommendation-ClassCommandPropertyDescriptionTermV4.json
new file mode 100644
index 00000000..92b7bb8e
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandPropertyDescriptionTermV4.json
@@ -0,0 +1,44 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "description": [
+            "omega_flunn"
+          ],
+          "name": "omega_itch"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "dtmi:dtdl:property:description;4": [
+            "omega_vroo"
+          ],
+          "name": "omega_hi"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandPropertyDisplayNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassCommandPropertyDisplayNameTermV4.json
new file mode 100644
index 00000000..3c09ac8b
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandPropertyDisplayNameTermV4.json
@@ -0,0 +1,44 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "displayName": [
+            "wum_omega"
+          ],
+          "name": "wum_yuzz"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "dtmi:dtdl:property:displayName;4": [
+            "wum_um"
+          ],
+          "name": "wum_humpf"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandPropertyNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassCommandPropertyNameTermV4.json
new file mode 100644
index 00000000..5cc62f2e
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandPropertyNameTermV4.json
@@ -0,0 +1,38 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_psi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "dtmi:dtdl:property:name;4": "kappa_yuzz"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandPropertyRequestTermV4.json b/DTDL/v4/spec/Recommendation-ClassCommandPropertyRequestTermV4.json
new file mode 100644
index 00000000..8db6ee62
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandPropertyRequestTermV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nuh_epsilon",
+          "request": {
+            "name": "nuh_zeta",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nuh_theta",
+          "dtmi:dtdl:property:request;4": {
+            "name": "nuh_iota",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandPropertyResponseTermV4.json b/DTDL/v4/spec/Recommendation-ClassCommandPropertyResponseTermV4.json
new file mode 100644
index 00000000..aa3db0a4
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandPropertyResponseTermV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "spazz_fuddle",
+          "response": {
+            "name": "spazz_glikk",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "spazz_snee",
+          "dtmi:dtdl:property:response;4": {
+            "name": "spazz_quan",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandRequestPropertyCommentTermV4.json b/DTDL/v4/spec/Recommendation-ClassCommandRequestPropertyCommentTermV4.json
new file mode 100644
index 00000000..1e111f93
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandRequestPropertyCommentTermV4.json
@@ -0,0 +1,48 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omicron_lambda",
+          "request": {
+            "comment": "omicron_iota",
+            "name": "omicron_kappa",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omicron_omicron",
+          "request": {
+            "dtmi:dtdl:property:comment;4": "omicron_nu",
+            "name": "omicron_xi",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandRequestPropertyDescriptionTermV4.json b/DTDL/v4/spec/Recommendation-ClassCommandRequestPropertyDescriptionTermV4.json
new file mode 100644
index 00000000..8c05c059
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandRequestPropertyDescriptionTermV4.json
@@ -0,0 +1,52 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "rho_humpf",
+          "request": {
+            "description": [
+              "rho_wum"
+            ],
+            "name": "rho_um",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "rho_snee",
+          "request": {
+            "dtmi:dtdl:property:description;4": [
+              "rho_glikk"
+            ],
+            "name": "rho_nuh",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandRequestPropertyDisplayNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassCommandRequestPropertyDisplayNameTermV4.json
new file mode 100644
index 00000000..2eeb28c6
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandRequestPropertyDisplayNameTermV4.json
@@ -0,0 +1,52 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "upsilon_beta",
+          "request": {
+            "displayName": [
+              "tau_hi"
+            ],
+            "name": "upsilon_alpha",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "upsilon_zeta",
+          "request": {
+            "dtmi:dtdl:property:displayName;4": [
+              "upsilon_delta"
+            ],
+            "name": "upsilon_epsilon",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandRequestPropertyNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassCommandRequestPropertyNameTermV4.json
new file mode 100644
index 00000000..acc504da
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandRequestPropertyNameTermV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_quan",
+          "request": {
+            "name": "flunn_snee",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_floob",
+          "request": {
+            "dtmi:dtdl:property:name;4": "flunn_spazz",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandRequestPropertyNullableTermV4.json b/DTDL/v4/spec/Recommendation-ClassCommandRequestPropertyNullableTermV4.json
new file mode 100644
index 00000000..c0d6c1d8
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandRequestPropertyNullableTermV4.json
@@ -0,0 +1,48 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_lambda",
+          "request": {
+            "name": "chi_kappa",
+            "nullable": true,
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_xi",
+          "request": {
+            "name": "chi_nu",
+            "dtmi:dtdl:property:nullable;4": false,
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandRequestPropertySchemaPreferTermToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassCommandRequestPropertySchemaPreferTermToDtmiV4.json
new file mode 100644
index 00000000..ebc2235e
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandRequestPropertySchemaPreferTermToDtmiV4.json
@@ -0,0 +1,90 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_zeta",
+          "request": {
+            "name": "gamma_epsilon",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_iota",
+          "request": {
+            "name": "gamma_theta",
+            "schema": "dtmi:dtdl:instance:Schema:date;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_mu",
+          "request": {
+            "name": "gamma_lambda",
+            "schema": "point"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_omicron",
+          "request": {
+            "name": "gamma_xi",
+            "schema": "dtmi:standard:schema:geospatial:point;4"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandRequestPropertySchemaTermV4.json b/DTDL/v4/spec/Recommendation-ClassCommandRequestPropertySchemaTermV4.json
new file mode 100644
index 00000000..31274751
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandRequestPropertySchemaTermV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_phi",
+          "request": {
+            "name": "gamma_upsilon",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_omega",
+          "request": {
+            "name": "gamma_psi",
+            "dtmi:dtdl:property:schema;4": "time"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandRequestTypeDuplicatesMaterialV4.json b/DTDL/v4/spec/Recommendation-ClassCommandRequestTypeDuplicatesMaterialV4.json
new file mode 100644
index 00000000..c5013ab7
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandRequestTypeDuplicatesMaterialV4.json
@@ -0,0 +1,54 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_psi",
+          "request": {
+            "name": "eta_chi",
+            "schema": "integer",
+            "@type": [
+              "CommandRequest",
+              "CommandRequest"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_wum",
+          "request": {
+            "name": "eta_yuzz",
+            "schema": "long",
+            "@type": [
+              "dtmi:dtdl:class:CommandRequest;4",
+              "dtmi:dtdl:class:CommandRequest;4"
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandRequestTypeIncludesTermAndDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassCommandRequestTypeIncludesTermAndDtmiV4.json
new file mode 100644
index 00000000..a081d529
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandRequestTypeIncludesTermAndDtmiV4.json
@@ -0,0 +1,28 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_upsilon",
+          "request": {
+            "name": "eta_tau",
+            "schema": "float",
+            "@type": [
+              "CommandRequest",
+              "dtmi:dtdl:class:CommandRequest;4"
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandRequestTypePreferTermToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassCommandRequestTypePreferTermToDtmiV4.json
new file mode 100644
index 00000000..510d3356
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandRequestTypePreferTermToDtmiV4.json
@@ -0,0 +1,48 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_fuddle",
+          "request": {
+            "name": "eta_humpf",
+            "schema": "short",
+            "@type": "CommandRequest"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_snee",
+          "request": {
+            "name": "eta_nuh",
+            "schema": "string",
+            "@type": "dtmi:dtdl:class:CommandRequest;4"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandResponsePropertyCommentTermV4.json b/DTDL/v4/spec/Recommendation-ClassCommandResponsePropertyCommentTermV4.json
new file mode 100644
index 00000000..f97d37a5
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandResponsePropertyCommentTermV4.json
@@ -0,0 +1,48 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "beta_xi",
+          "response": {
+            "comment": "beta_mu",
+            "name": "beta_nu",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "beta_sigma",
+          "response": {
+            "dtmi:dtdl:property:comment;4": "beta_pi",
+            "name": "beta_rho",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandResponsePropertyDescriptionTermV4.json b/DTDL/v4/spec/Recommendation-ClassCommandResponsePropertyDescriptionTermV4.json
new file mode 100644
index 00000000..21824e94
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandResponsePropertyDescriptionTermV4.json
@@ -0,0 +1,52 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "delta_nuh",
+          "response": {
+            "description": [
+              "delta_fuddle"
+            ],
+            "name": "delta_glikk",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "delta_spazz",
+          "response": {
+            "dtmi:dtdl:property:description;4": [
+              "delta_quan"
+            ],
+            "name": "delta_thnad",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandResponsePropertyDisplayNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassCommandResponsePropertyDisplayNameTermV4.json
new file mode 100644
index 00000000..2b0f2b49
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandResponsePropertyDisplayNameTermV4.json
@@ -0,0 +1,52 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_epsilon",
+          "response": {
+            "displayName": [
+              "eta_gamma"
+            ],
+            "name": "eta_delta",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_iota",
+          "response": {
+            "dtmi:dtdl:property:displayName;4": [
+              "eta_eta"
+            ],
+            "name": "eta_theta",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandResponsePropertyNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassCommandResponsePropertyNameTermV4.json
new file mode 100644
index 00000000..a73cc84f
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandResponsePropertyNameTermV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "wum_floob",
+          "response": {
+            "name": "wum_spazz",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "wum_flunn",
+          "response": {
+            "dtmi:dtdl:property:name;4": "wum_jogg",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandResponsePropertyNullableTermV4.json b/DTDL/v4/spec/Recommendation-ClassCommandResponsePropertyNullableTermV4.json
new file mode 100644
index 00000000..51b72387
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandResponsePropertyNullableTermV4.json
@@ -0,0 +1,48 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_xi",
+          "response": {
+            "name": "iota_nu",
+            "nullable": false,
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_rho",
+          "response": {
+            "name": "iota_pi",
+            "dtmi:dtdl:property:nullable;4": true,
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandResponsePropertySchemaPreferTermToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassCommandResponsePropertySchemaPreferTermToDtmiV4.json
new file mode 100644
index 00000000..c6e2cbf6
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandResponsePropertySchemaPreferTermToDtmiV4.json
@@ -0,0 +1,90 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "quan_iota",
+          "response": {
+            "name": "quan_theta",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "quan_mu",
+          "response": {
+            "name": "quan_lambda",
+            "schema": "dtmi:dtdl:instance:Schema:decimal;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "quan_omicron",
+          "response": {
+            "name": "quan_xi",
+            "schema": "point"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "quan_sigma",
+          "response": {
+            "name": "quan_rho",
+            "schema": "dtmi:standard:schema:geospatial:point;4"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandResponsePropertySchemaTermV4.json b/DTDL/v4/spec/Recommendation-ClassCommandResponsePropertySchemaTermV4.json
new file mode 100644
index 00000000..3a15506a
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandResponsePropertySchemaTermV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "quan_omega",
+          "response": {
+            "name": "quan_psi",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "quan_um",
+          "response": {
+            "name": "quan_wum",
+            "dtmi:dtdl:property:schema;4": "byte"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandResponseTypeDuplicatesMaterialV4.json b/DTDL/v4/spec/Recommendation-ClassCommandResponseTypeDuplicatesMaterialV4.json
new file mode 100644
index 00000000..d701151a
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandResponseTypeDuplicatesMaterialV4.json
@@ -0,0 +1,54 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_wum",
+          "response": {
+            "name": "zatz_yuzz",
+            "schema": "unsignedLong",
+            "@type": [
+              "CommandResponse",
+              "CommandResponse"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_fuddle",
+          "response": {
+            "name": "zatz_humpf",
+            "schema": "unsignedShort",
+            "@type": [
+              "dtmi:dtdl:class:CommandResponse;4",
+              "dtmi:dtdl:class:CommandResponse;4"
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandResponseTypeIncludesTermAndDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassCommandResponseTypeIncludesTermAndDtmiV4.json
new file mode 100644
index 00000000..fc9cb7a5
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandResponseTypeIncludesTermAndDtmiV4.json
@@ -0,0 +1,28 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_psi",
+          "response": {
+            "name": "zatz_chi",
+            "schema": "unsignedInteger",
+            "@type": [
+              "CommandResponse",
+              "dtmi:dtdl:class:CommandResponse;4"
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandResponseTypePreferTermToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassCommandResponseTypePreferTermToDtmiV4.json
new file mode 100644
index 00000000..e9dc78ee
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandResponseTypePreferTermToDtmiV4.json
@@ -0,0 +1,48 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_snee",
+          "response": {
+            "name": "zatz_nuh",
+            "schema": "uuid",
+            "@type": "CommandResponse"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_spazz",
+          "response": {
+            "name": "zatz_thnad",
+            "schema": "boolean",
+            "@type": "dtmi:dtdl:class:CommandResponse;4"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandTypeDuplicatesMaterialV4.json b/DTDL/v4/spec/Recommendation-ClassCommandTypeDuplicatesMaterialV4.json
new file mode 100644
index 00000000..4b7ebe82
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandTypeDuplicatesMaterialV4.json
@@ -0,0 +1,44 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_um;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "theta_wum",
+          "@type": [
+            "Command",
+            "Command"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "theta_humpf",
+          "@type": [
+            "dtmi:dtdl:class:Command;4",
+            "dtmi:dtdl:class:Command;4"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandTypeIncludesTermAndDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassCommandTypeIncludesTermAndDtmiV4.json
new file mode 100644
index 00000000..b24a2883
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandTypeIncludesTermAndDtmiV4.json
@@ -0,0 +1,23 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "theta_omega",
+          "@type": [
+            "Command",
+            "dtmi:dtdl:class:Command;4"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassCommandTypePreferTermToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassCommandTypePreferTermToDtmiV4.json
new file mode 100644
index 00000000..7dd184ca
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassCommandTypePreferTermToDtmiV4.json
@@ -0,0 +1,38 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "theta_glikk",
+          "@type": "Command"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "theta_snee",
+          "@type": "dtmi:dtdl:class:Command;4"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassComponentPropertyCommentTermV4.json b/DTDL/v4/spec/Recommendation-ClassComponentPropertyCommentTermV4.json
new file mode 100644
index 00000000..8c057564
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassComponentPropertyCommentTermV4.json
@@ -0,0 +1,48 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "comment": "glikk_gamma",
+          "name": "glikk_delta",
+          "schema": {
+            "@id": "dtmi:example:glikk_epsilon;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "dtmi:dtdl:property:comment;4": "glikk_eta",
+          "name": "glikk_theta",
+          "schema": {
+            "@id": "dtmi:example:glikk_iota;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassComponentPropertyDescriptionTermV4.json b/DTDL/v4/spec/Recommendation-ClassComponentPropertyDescriptionTermV4.json
new file mode 100644
index 00000000..cdb9fb98
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassComponentPropertyDescriptionTermV4.json
@@ -0,0 +1,52 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "description": [
+            "snee_upsilon"
+          ],
+          "name": "snee_phi",
+          "schema": {
+            "@id": "dtmi:example:snee_chi;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "dtmi:dtdl:property:description;4": [
+            "snee_omega"
+          ],
+          "name": "snee_yuzz",
+          "schema": {
+            "@id": "dtmi:example:snee_wum;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassComponentPropertyDisplayNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassComponentPropertyDisplayNameTermV4.json
new file mode 100644
index 00000000..1fae3023
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassComponentPropertyDisplayNameTermV4.json
@@ -0,0 +1,52 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "displayName": [
+            "thnad_zatz"
+          ],
+          "name": "thnad_jogg",
+          "schema": {
+            "@id": "dtmi:example:thnad_flunn;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "dtmi:dtdl:property:displayName;4": [
+            "thnad_yekk"
+          ],
+          "name": "thnad_vroo",
+          "schema": {
+            "@id": "dtmi:example:thnad_hi;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassComponentPropertyNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassComponentPropertyNameTermV4.json
new file mode 100644
index 00000000..0911139f
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassComponentPropertyNameTermV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "pi_flunn",
+          "schema": {
+            "@id": "dtmi:example:pi_itch;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "dtmi:dtdl:property:name;4": "pi_vroo",
+          "schema": {
+            "@id": "dtmi:example:pi_hi;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassComponentPropertySchemaTermV4.json b/DTDL/v4/spec/Recommendation-ClassComponentPropertySchemaTermV4.json
new file mode 100644
index 00000000..a7f9f16c
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassComponentPropertySchemaTermV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "phi_zeta",
+          "schema": {
+            "@id": "dtmi:example:phi_eta;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "phi_iota",
+          "dtmi:dtdl:property:schema;4": {
+            "@id": "dtmi:example:phi_kappa;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassComponentTypeDuplicatesMaterialV4.json b/DTDL/v4/spec/Recommendation-ClassComponentTypeDuplicatesMaterialV4.json
new file mode 100644
index 00000000..23830b7b
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassComponentTypeDuplicatesMaterialV4.json
@@ -0,0 +1,52 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "nu_xi",
+          "schema": {
+            "@id": "dtmi:example:nu_omicron;1",
+            "@type": "Interface"
+          },
+          "@type": [
+            "Component",
+            "Component"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "nu_rho",
+          "schema": {
+            "@id": "dtmi:example:nu_sigma;1",
+            "@type": "Interface"
+          },
+          "@type": [
+            "dtmi:dtdl:class:Component;4",
+            "dtmi:dtdl:class:Component;4"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassComponentTypeIncludesTermAndDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassComponentTypeIncludesTermAndDtmiV4.json
new file mode 100644
index 00000000..ca3f9c70
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassComponentTypeIncludesTermAndDtmiV4.json
@@ -0,0 +1,27 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "nu_lambda",
+          "schema": {
+            "@id": "dtmi:example:nu_mu;1",
+            "@type": "Interface"
+          },
+          "@type": [
+            "Component",
+            "dtmi:dtdl:class:Component;4"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassComponentTypePreferTermToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassComponentTypePreferTermToDtmiV4.json
new file mode 100644
index 00000000..20aad9c0
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassComponentTypePreferTermToDtmiV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "nu_upsilon",
+          "schema": {
+            "@id": "dtmi:example:nu_phi;1",
+            "@type": "Interface"
+          },
+          "@type": "Component"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "nu_psi",
+          "schema": {
+            "@id": "dtmi:example:nu_omega;1",
+            "@type": "Interface"
+          },
+          "@type": "dtmi:dtdl:class:Component;4"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassEnumPropertyCommentTermV4.json b/DTDL/v4/spec/Recommendation-ClassEnumPropertyCommentTermV4.json
new file mode 100644
index 00000000..00e2c8e1
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassEnumPropertyCommentTermV4.json
@@ -0,0 +1,42 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_alpha;1",
+          "@type": "Enum",
+          "comment": "eta_beta",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_delta;1",
+          "@type": "Enum",
+          "dtmi:dtdl:property:comment;4": "eta_epsilon",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassEnumPropertyDescriptionTermV4.json b/DTDL/v4/spec/Recommendation-ClassEnumPropertyDescriptionTermV4.json
new file mode 100644
index 00000000..8c148a85
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassEnumPropertyDescriptionTermV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_fuddle;1",
+          "@type": "Enum",
+          "description": [
+            "theta_glikk"
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_snee;1",
+          "@type": "Enum",
+          "dtmi:dtdl:property:description;4": [
+            "theta_quan"
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassEnumPropertyDisplayNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassEnumPropertyDisplayNameTermV4.json
new file mode 100644
index 00000000..cf409dcf
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassEnumPropertyDisplayNameTermV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_xi;1",
+          "@type": "Enum",
+          "displayName": [
+            "kappa_omicron"
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_rho;1",
+          "@type": "Enum",
+          "dtmi:dtdl:property:displayName;4": [
+            "kappa_sigma"
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassEnumPropertyEnumValuesTermV4.json b/DTDL/v4/spec/Recommendation-ClassEnumPropertyEnumValuesTermV4.json
new file mode 100644
index 00000000..d1f28887
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassEnumPropertyEnumValuesTermV4.json
@@ -0,0 +1,52 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_psi;1",
+          "@type": "Enum",
+          "enumValues": [
+            {
+              "enumValue": 1530,
+              "name": "xi_omega"
+            }
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_wum;1",
+          "@type": "Enum",
+          "dtmi:dtdl:property:enumValues;4": [
+            {
+              "enumValue": 1531,
+              "name": "xi_um"
+            }
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassEnumPropertyValueSchemaTermV4.json b/DTDL/v4/spec/Recommendation-ClassEnumPropertyValueSchemaTermV4.json
new file mode 100644
index 00000000..66e1e9a9
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassEnumPropertyValueSchemaTermV4.json
@@ -0,0 +1,40 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_thnad;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_floob;1",
+          "@type": "Enum",
+          "dtmi:dtdl:property:valueSchema;4": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassEnumPropertyValueSchemaValueIntegerPreferToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassEnumPropertyValueSchemaValueIntegerPreferToDtmiV4.json
new file mode 100644
index 00000000..8dff2fdb
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassEnumPropertyValueSchemaValueIntegerPreferToDtmiV4.json
@@ -0,0 +1,48 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_phi;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "beta_upsilon",
+            "enumValue": 17
+          },
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_omega;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "beta_psi",
+            "enumValue": 17
+          },
+          "valueSchema": "dtmi:dtdl:instance:Schema:integer;4"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassEnumPropertyValueSchemaValueStringPreferToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassEnumPropertyValueSchemaValueStringPreferToDtmiV4.json
new file mode 100644
index 00000000..bd216fe8
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassEnumPropertyValueSchemaValueStringPreferToDtmiV4.json
@@ -0,0 +1,48 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_um;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "beta_wum",
+            "enumValue": "delta_psi"
+          },
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_glikk;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "beta_fuddle",
+            "enumValue": "delta_psi"
+          },
+          "valueSchema": "dtmi:dtdl:instance:Schema:string;4"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassEnumTypeDuplicatesMaterialV4.json b/DTDL/v4/spec/Recommendation-ClassEnumTypeDuplicatesMaterialV4.json
new file mode 100644
index 00000000..7906c1fb
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassEnumTypeDuplicatesMaterialV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_nu;1",
+          "valueSchema": "integer",
+          "@type": [
+            "Enum",
+            "Enum"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_omicron;1",
+          "valueSchema": "integer",
+          "@type": [
+            "dtmi:dtdl:class:Enum;4",
+            "dtmi:dtdl:class:Enum;4"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassEnumTypeIncludesTermAndDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassEnumTypeIncludesTermAndDtmiV4.json
new file mode 100644
index 00000000..751042e5
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassEnumTypeIncludesTermAndDtmiV4.json
@@ -0,0 +1,24 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_lambda;1",
+          "valueSchema": "integer",
+          "@type": [
+            "Enum",
+            "dtmi:dtdl:class:Enum;4"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassEnumTypePreferTermToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassEnumTypePreferTermToDtmiV4.json
new file mode 100644
index 00000000..25f91f85
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassEnumTypePreferTermToDtmiV4.json
@@ -0,0 +1,40 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_rho;1",
+          "valueSchema": "integer",
+          "@type": "Enum"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_tau;1",
+          "valueSchema": "integer",
+          "@type": "dtmi:dtdl:class:Enum;4"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassEnumValuePropertyCommentTermV4.json b/DTDL/v4/spec/Recommendation-ClassEnumValuePropertyCommentTermV4.json
new file mode 100644
index 00000000..e2fcdc41
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassEnumValuePropertyCommentTermV4.json
@@ -0,0 +1,50 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_gamma;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "comment": "thnad_alpha",
+            "enumValue": 1763,
+            "name": "thnad_beta"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_eta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "dtmi:dtdl:property:comment;4": "thnad_epsilon",
+            "enumValue": 1764,
+            "name": "thnad_zeta"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassEnumValuePropertyDescriptionTermV4.json b/DTDL/v4/spec/Recommendation-ClassEnumValuePropertyDescriptionTermV4.json
new file mode 100644
index 00000000..223600fe
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassEnumValuePropertyDescriptionTermV4.json
@@ -0,0 +1,54 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_upsilon;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "description": [
+              "floob_sigma"
+            ],
+            "enumValue": 1795,
+            "name": "floob_tau"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_omega;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "dtmi:dtdl:property:description;4": [
+              "floob_chi"
+            ],
+            "enumValue": 1796,
+            "name": "floob_psi"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassEnumValuePropertyDisplayNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassEnumValuePropertyDisplayNameTermV4.json
new file mode 100644
index 00000000..a5acfee5
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassEnumValuePropertyDisplayNameTermV4.json
@@ -0,0 +1,54 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_zatz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "displayName": [
+              "jogg_spazz"
+            ],
+            "enumValue": 1827,
+            "name": "jogg_floob"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_yekk;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "dtmi:dtdl:property:displayName;4": [
+              "jogg_flunn"
+            ],
+            "enumValue": 1828,
+            "name": "jogg_itch"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassEnumValuePropertyEnumValueTermV4.json b/DTDL/v4/spec/Recommendation-ClassEnumValuePropertyEnumValueTermV4.json
new file mode 100644
index 00000000..9115c22a
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassEnumValuePropertyEnumValueTermV4.json
@@ -0,0 +1,48 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_itch;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1539,
+            "name": "tau_flunn"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_hi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "dtmi:dtdl:property:enumValue;4": 1540,
+            "name": "tau_vroo"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassEnumValuePropertyNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassEnumValuePropertyNameTermV4.json
new file mode 100644
index 00000000..c747b6dd
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassEnumValuePropertyNameTermV4.json
@@ -0,0 +1,48 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_snee;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1602,
+            "name": "chi_nuh"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_spazz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1603,
+            "dtmi:dtdl:property:name;4": "chi_thnad"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassEnumValueTypeDuplicatesMaterialV4.json b/DTDL/v4/spec/Recommendation-ClassEnumValueTypeDuplicatesMaterialV4.json
new file mode 100644
index 00000000..c150d0d2
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassEnumValueTypeDuplicatesMaterialV4.json
@@ -0,0 +1,56 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_omicron;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1653,
+            "name": "wum_xi",
+            "@type": [
+              "EnumValue",
+              "EnumValue"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_sigma;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1654,
+            "name": "wum_rho",
+            "@type": [
+              "dtmi:dtdl:class:EnumValue;4",
+              "dtmi:dtdl:class:EnumValue;4"
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassEnumValueTypeIncludesTermAndDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassEnumValueTypeIncludesTermAndDtmiV4.json
new file mode 100644
index 00000000..5ea932ac
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassEnumValueTypeIncludesTermAndDtmiV4.json
@@ -0,0 +1,29 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_mu;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1652,
+            "name": "wum_lambda",
+            "@type": [
+              "EnumValue",
+              "dtmi:dtdl:class:EnumValue;4"
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassEnumValueTypePreferTermToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassEnumValueTypePreferTermToDtmiV4.json
new file mode 100644
index 00000000..414d0d19
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassEnumValueTypePreferTermToDtmiV4.json
@@ -0,0 +1,50 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_phi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1655,
+            "name": "wum_upsilon",
+            "@type": "EnumValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_omega;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1656,
+            "name": "wum_psi",
+            "@type": "dtmi:dtdl:class:EnumValue;4"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassFieldPropertyCommentTermV4.json b/DTDL/v4/spec/Recommendation-ClassFieldPropertyCommentTermV4.json
new file mode 100644
index 00000000..3b669605
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassFieldPropertyCommentTermV4.json
@@ -0,0 +1,48 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_omega;1",
+          "@type": "Object",
+          "fields": {
+            "comment": "sigma_chi",
+            "name": "sigma_psi",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_humpf;1",
+          "@type": "Object",
+          "fields": {
+            "dtmi:dtdl:property:comment;4": "sigma_wum",
+            "name": "sigma_um",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassFieldPropertyDescriptionTermV4.json b/DTDL/v4/spec/Recommendation-ClassFieldPropertyDescriptionTermV4.json
new file mode 100644
index 00000000..e9a650d1
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassFieldPropertyDescriptionTermV4.json
@@ -0,0 +1,52 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_yekk;1",
+          "@type": "Object",
+          "fields": {
+            "description": [
+              "upsilon_flunn"
+            ],
+            "name": "upsilon_itch",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_beta;1",
+          "@type": "Object",
+          "fields": {
+            "dtmi:dtdl:property:description;4": [
+              "upsilon_hi"
+            ],
+            "name": "phi_alpha",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassFieldPropertyDisplayNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassFieldPropertyDisplayNameTermV4.json
new file mode 100644
index 00000000..9e85951b
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassFieldPropertyDisplayNameTermV4.json
@@ -0,0 +1,52 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_omicron;1",
+          "@type": "Object",
+          "fields": {
+            "displayName": [
+              "psi_nu"
+            ],
+            "name": "psi_xi",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_tau;1",
+          "@type": "Object",
+          "fields": {
+            "dtmi:dtdl:property:displayName;4": [
+              "psi_rho"
+            ],
+            "name": "psi_sigma",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassFieldPropertyNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassFieldPropertyNameTermV4.json
new file mode 100644
index 00000000..1e4077e1
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassFieldPropertyNameTermV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_glikk;1",
+          "@type": "Object",
+          "fields": {
+            "name": "hi_fuddle",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_quan;1",
+          "@type": "Object",
+          "fields": {
+            "dtmi:dtdl:property:name;4": "hi_snee",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassFieldPropertySchemaPreferTermToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassFieldPropertySchemaPreferTermToDtmiV4.json
new file mode 100644
index 00000000..c57f01e9
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassFieldPropertySchemaPreferTermToDtmiV4.json
@@ -0,0 +1,90 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_itch;1",
+          "@type": "Object",
+          "fields": {
+            "name": "zeta_flunn",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_hi;1",
+          "@type": "Object",
+          "fields": {
+            "name": "zeta_vroo",
+            "schema": "dtmi:dtdl:instance:Schema:duration;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_gamma;1",
+          "@type": "Object",
+          "fields": {
+            "name": "eta_beta",
+            "schema": "point"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_zeta;1",
+          "@type": "Object",
+          "fields": {
+            "name": "eta_epsilon",
+            "schema": "dtmi:standard:schema:geospatial:point;4"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassFieldPropertySchemaTermV4.json b/DTDL/v4/spec/Recommendation-ClassFieldPropertySchemaTermV4.json
new file mode 100644
index 00000000..3f46f363
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassFieldPropertySchemaTermV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_mu;1",
+          "@type": "Object",
+          "fields": {
+            "name": "eta_lambda",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_omicron;1",
+          "@type": "Object",
+          "fields": {
+            "name": "eta_xi",
+            "dtmi:dtdl:property:schema;4": "float"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassFieldTypeDuplicatesMaterialV4.json b/DTDL/v4/spec/Recommendation-ClassFieldTypeDuplicatesMaterialV4.json
new file mode 100644
index 00000000..61159354
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassFieldTypeDuplicatesMaterialV4.json
@@ -0,0 +1,54 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_floob;1",
+          "@type": "Object",
+          "fields": {
+            "name": "kappa_spazz",
+            "schema": "date",
+            "@type": [
+              "Field",
+              "Field"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_flunn;1",
+          "@type": "Object",
+          "fields": {
+            "name": "kappa_jogg",
+            "schema": "dateTime",
+            "@type": [
+              "dtmi:dtdl:class:Field;4",
+              "dtmi:dtdl:class:Field;4"
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassFieldTypeIncludesTermAndDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassFieldTypeIncludesTermAndDtmiV4.json
new file mode 100644
index 00000000..697ce333
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassFieldTypeIncludesTermAndDtmiV4.json
@@ -0,0 +1,28 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_quan;1",
+          "@type": "Object",
+          "fields": {
+            "name": "kappa_snee",
+            "schema": "bytes",
+            "@type": [
+              "Field",
+              "dtmi:dtdl:class:Field;4"
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassFieldTypePreferTermToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassFieldTypePreferTermToDtmiV4.json
new file mode 100644
index 00000000..66fe6872
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassFieldTypePreferTermToDtmiV4.json
@@ -0,0 +1,48 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_vroo;1",
+          "@type": "Object",
+          "fields": {
+            "name": "kappa_yekk",
+            "schema": "decimal",
+            "@type": "Field"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_beta;1",
+          "@type": "Object",
+          "fields": {
+            "name": "lambda_alpha",
+            "schema": "double",
+            "@type": "dtmi:dtdl:class:Field;4"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassInterfacePropertyCommentTermV4.json b/DTDL/v4/spec/Recommendation-ClassInterfacePropertyCommentTermV4.json
new file mode 100644
index 00000000..f2ca2989
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassInterfacePropertyCommentTermV4.json
@@ -0,0 +1,32 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_eta;1",
+        "@type": "Interface",
+        "comment": "humpf_theta"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_iota;1",
+        "@type": "Interface",
+        "dtmi:dtdl:property:comment;4": "humpf_kappa"
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassInterfacePropertyContentsTermV4.json b/DTDL/v4/spec/Recommendation-ClassInterfacePropertyContentsTermV4.json
new file mode 100644
index 00000000..c08979ee
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassInterfacePropertyContentsTermV4.json
@@ -0,0 +1,42 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_jogg;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Command",
+            "name": "glikk_flunn"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_itch;1",
+        "@type": "Interface",
+        "dtmi:dtdl:property:contents;4": [
+          {
+            "@type": "Command",
+            "name": "glikk_yekk"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassInterfacePropertyDescriptionTermV4.json b/DTDL/v4/spec/Recommendation-ClassInterfacePropertyDescriptionTermV4.json
new file mode 100644
index 00000000..b1990d95
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassInterfacePropertyDescriptionTermV4.json
@@ -0,0 +1,36 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_thnad;1",
+        "@type": "Interface",
+        "description": [
+          "nuh_spazz"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_floob;1",
+        "@type": "Interface",
+        "dtmi:dtdl:property:description;4": [
+          "nuh_zatz"
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassInterfacePropertyDisplayNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassInterfacePropertyDisplayNameTermV4.json
new file mode 100644
index 00000000..555b7d1c
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassInterfacePropertyDisplayNameTermV4.json
@@ -0,0 +1,36 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_glikk;1",
+        "@type": "Interface",
+        "displayName": [
+          "snee_nuh"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_snee;1",
+        "@type": "Interface",
+        "dtmi:dtdl:property:displayName;4": [
+          "snee_quan"
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassInterfacePropertyExtendsTermV4.json b/DTDL/v4/spec/Recommendation-ClassInterfacePropertyExtendsTermV4.json
new file mode 100644
index 00000000..28c50da9
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassInterfacePropertyExtendsTermV4.json
@@ -0,0 +1,42 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_fuddle;1",
+        "@type": "Interface",
+        "extends": [
+          {
+            "@id": "dtmi:example:spazz_glikk;1",
+            "@type": "Interface"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_nuh;1",
+        "@type": "Interface",
+        "dtmi:dtdl:property:extends;4": [
+          {
+            "@id": "dtmi:example:spazz_snee;1",
+            "@type": "Interface"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassInterfacePropertySchemasTermV4.json b/DTDL/v4/spec/Recommendation-ClassInterfacePropertySchemasTermV4.json
new file mode 100644
index 00000000..fe60c662
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassInterfacePropertySchemasTermV4.json
@@ -0,0 +1,44 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_chi;1",
+        "@type": "Interface",
+        "schemas": [
+          {
+            "@id": "dtmi:example:jogg_psi;1",
+            "@type": "Array",
+            "elementSchema": "long"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_omega;1",
+        "@type": "Interface",
+        "dtmi:dtdl:property:schemas;4": [
+          {
+            "@id": "dtmi:example:jogg_yuzz;1",
+            "@type": "Array",
+            "elementSchema": "short"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassInterfaceTypeDuplicatesMaterialV4.json b/DTDL/v4/spec/Recommendation-ClassInterfaceTypeDuplicatesMaterialV4.json
new file mode 100644
index 00000000..603cdf1d
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassInterfaceTypeDuplicatesMaterialV4.json
@@ -0,0 +1,36 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_gamma;1",
+        "@type": [
+          "Interface",
+          "Interface"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_delta;1",
+        "@type": [
+          "dtmi:dtdl:class:Interface;4",
+          "dtmi:dtdl:class:Interface;4"
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassInterfaceTypeIncludesTermAndDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassInterfaceTypeIncludesTermAndDtmiV4.json
new file mode 100644
index 00000000..19b35b3a
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassInterfaceTypeIncludesTermAndDtmiV4.json
@@ -0,0 +1,19 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_beta;1",
+        "@type": [
+          "Interface",
+          "dtmi:dtdl:class:Interface;4"
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassInterfaceTypePreferTermToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassInterfaceTypePreferTermToDtmiV4.json
new file mode 100644
index 00000000..f6d51987
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassInterfaceTypePreferTermToDtmiV4.json
@@ -0,0 +1,30 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_epsilon;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_zeta;1",
+        "@type": "dtmi:dtdl:class:Interface;4"
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapKeyPropertyCommentTermV4.json b/DTDL/v4/spec/Recommendation-ClassMapKeyPropertyCommentTermV4.json
new file mode 100644
index 00000000..2fafe12d
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapKeyPropertyCommentTermV4.json
@@ -0,0 +1,56 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_theta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "tau_iota",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "comment": "tau_zeta",
+            "name": "tau_eta",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_nu;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "tau_xi",
+            "schema": "float"
+          },
+          "mapKey": {
+            "dtmi:dtdl:property:comment;4": "tau_lambda",
+            "name": "tau_mu",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapKeyPropertyDescriptionTermV4.json b/DTDL/v4/spec/Recommendation-ClassMapKeyPropertyDescriptionTermV4.json
new file mode 100644
index 00000000..6621b3ab
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapKeyPropertyDescriptionTermV4.json
@@ -0,0 +1,60 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_xi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "chi_omicron",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "description": [
+              "chi_mu"
+            ],
+            "name": "chi_nu",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_tau;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "chi_upsilon",
+            "schema": "bytes"
+          },
+          "mapKey": {
+            "dtmi:dtdl:property:description;4": [
+              "chi_rho"
+            ],
+            "name": "chi_sigma",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapKeyPropertyDisplayNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassMapKeyPropertyDisplayNameTermV4.json
new file mode 100644
index 00000000..1756e1ab
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapKeyPropertyDisplayNameTermV4.json
@@ -0,0 +1,60 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_upsilon;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "yuzz_phi",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "displayName": [
+              "yuzz_sigma"
+            ],
+            "name": "yuzz_tau",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_yuzz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "yuzz_wum",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "dtmi:dtdl:property:displayName;4": [
+              "yuzz_psi"
+            ],
+            "name": "yuzz_omega",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapKeyPropertyNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassMapKeyPropertyNameTermV4.json
new file mode 100644
index 00000000..1db8e93d
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapKeyPropertyNameTermV4.json
@@ -0,0 +1,54 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_theta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "thnad_iota",
+            "schema": "short"
+          },
+          "mapKey": {
+            "name": "thnad_eta",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_mu;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "thnad_nu",
+            "schema": "string"
+          },
+          "mapKey": {
+            "dtmi:dtdl:property:name;4": "thnad_lambda",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapKeyPropertySchemaTermV4.json b/DTDL/v4/spec/Recommendation-ClassMapKeyPropertySchemaTermV4.json
new file mode 100644
index 00000000..1c6baff8
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapKeyPropertySchemaTermV4.json
@@ -0,0 +1,54 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_eta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "delta_theta",
+            "schema": "unsignedShort"
+          },
+          "mapKey": {
+            "name": "delta_zeta",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_lambda;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "delta_mu",
+            "schema": "uuid"
+          },
+          "mapKey": {
+            "name": "delta_kappa",
+            "dtmi:dtdl:property:schema;4": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapKeyPropertySchemaValueStringPreferToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassMapKeyPropertySchemaValueStringPreferToDtmiV4.json
new file mode 100644
index 00000000..bb896486
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapKeyPropertySchemaValueStringPreferToDtmiV4.json
@@ -0,0 +1,54 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_jogg;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "gamma_flunn",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "name": "gamma_zatz",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_vroo;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "gamma_hi",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "name": "gamma_yekk",
+            "schema": "dtmi:dtdl:instance:Schema:string;4"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapKeyTypeDuplicatesMaterialV4.json b/DTDL/v4/spec/Recommendation-ClassMapKeyTypeDuplicatesMaterialV4.json
new file mode 100644
index 00000000..1292e7c2
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapKeyTypeDuplicatesMaterialV4.json
@@ -0,0 +1,62 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_flunn;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "theta_itch",
+            "schema": "short"
+          },
+          "mapKey": {
+            "name": "theta_jogg",
+            "schema": "string",
+            "@type": [
+              "MapKey",
+              "MapKey"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_hi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "iota_alpha",
+            "schema": "string"
+          },
+          "mapKey": {
+            "name": "theta_vroo",
+            "schema": "string",
+            "@type": [
+              "dtmi:dtdl:class:MapKey;4",
+              "dtmi:dtdl:class:MapKey;4"
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapKeyTypeIncludesTermAndDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassMapKeyTypeIncludesTermAndDtmiV4.json
new file mode 100644
index 00000000..4b0a6644
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapKeyTypeIncludesTermAndDtmiV4.json
@@ -0,0 +1,32 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_spazz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "theta_floob",
+            "schema": "long"
+          },
+          "mapKey": {
+            "name": "theta_thnad",
+            "schema": "string",
+            "@type": [
+              "MapKey",
+              "dtmi:dtdl:class:MapKey;4"
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapKeyTypePreferTermToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassMapKeyTypePreferTermToDtmiV4.json
new file mode 100644
index 00000000..f84f203a
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapKeyTypePreferTermToDtmiV4.json
@@ -0,0 +1,56 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_delta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "iota_epsilon",
+            "schema": "time"
+          },
+          "mapKey": {
+            "name": "iota_gamma",
+            "schema": "string",
+            "@type": "MapKey"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_theta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "iota_iota",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "name": "iota_eta",
+            "schema": "string",
+            "@type": "dtmi:dtdl:class:MapKey;4"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapPropertyCommentTermV4.json b/DTDL/v4/spec/Recommendation-ClassMapPropertyCommentTermV4.json
new file mode 100644
index 00000000..306139eb
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapPropertyCommentTermV4.json
@@ -0,0 +1,56 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_kappa;1",
+          "@type": "Map",
+          "comment": "phi_lambda",
+          "mapKey": {
+            "name": "phi_mu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "phi_nu",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_omicron;1",
+          "@type": "Map",
+          "dtmi:dtdl:property:comment;4": "phi_pi",
+          "mapKey": {
+            "name": "phi_rho",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "phi_sigma",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapPropertyDescriptionTermV4.json b/DTDL/v4/spec/Recommendation-ClassMapPropertyDescriptionTermV4.json
new file mode 100644
index 00000000..0538204f
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapPropertyDescriptionTermV4.json
@@ -0,0 +1,60 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_pi;1",
+          "@type": "Map",
+          "description": [
+            "omega_rho"
+          ],
+          "mapKey": {
+            "name": "omega_sigma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omega_tau",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_phi;1",
+          "@type": "Map",
+          "dtmi:dtdl:property:description;4": [
+            "omega_chi"
+          ],
+          "mapKey": {
+            "name": "omega_psi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omega_omega",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapPropertyDisplayNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassMapPropertyDisplayNameTermV4.json
new file mode 100644
index 00000000..399c4817
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapPropertyDisplayNameTermV4.json
@@ -0,0 +1,60 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_chi;1",
+          "@type": "Map",
+          "displayName": [
+            "um_psi"
+          ],
+          "mapKey": {
+            "name": "um_omega",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "um_yuzz",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_um;1",
+          "@type": "Map",
+          "dtmi:dtdl:property:displayName;4": [
+            "um_humpf"
+          ],
+          "mapKey": {
+            "name": "um_fuddle",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "um_glikk",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapPropertyMapKeyTermV4.json b/DTDL/v4/spec/Recommendation-ClassMapPropertyMapKeyTermV4.json
new file mode 100644
index 00000000..74b819e6
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapPropertyMapKeyTermV4.json
@@ -0,0 +1,54 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_yuzz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "epsilon_wum",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "epsilon_um",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_fuddle;1",
+          "@type": "Map",
+          "dtmi:dtdl:property:mapKey;4": {
+            "name": "epsilon_glikk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "epsilon_nuh",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapPropertyMapValueTermV4.json b/DTDL/v4/spec/Recommendation-ClassMapPropertyMapValueTermV4.json
new file mode 100644
index 00000000..16c2096c
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapPropertyMapValueTermV4.json
@@ -0,0 +1,54 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_theta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "lambda_iota",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "lambda_kappa",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_mu;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "lambda_nu",
+            "schema": "string"
+          },
+          "dtmi:dtdl:property:mapValue;4": {
+            "name": "lambda_xi",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapTypeDuplicatesMaterialV4.json b/DTDL/v4/spec/Recommendation-ClassMapTypeDuplicatesMaterialV4.json
new file mode 100644
index 00000000..27b427d0
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapTypeDuplicatesMaterialV4.json
@@ -0,0 +1,60 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_delta;1",
+          "mapKey": {
+            "name": "vroo_epsilon",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "vroo_zeta",
+            "schema": "duration"
+          },
+          "@type": [
+            "Map",
+            "Map"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_theta;1",
+          "mapKey": {
+            "name": "vroo_iota",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "vroo_kappa",
+            "schema": "float"
+          },
+          "@type": [
+            "dtmi:dtdl:class:Map;4",
+            "dtmi:dtdl:class:Map;4"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapTypeIncludesTermAndDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassMapTypeIncludesTermAndDtmiV4.json
new file mode 100644
index 00000000..4efbd3ca
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapTypeIncludesTermAndDtmiV4.json
@@ -0,0 +1,31 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_hi;1",
+          "mapKey": {
+            "name": "vroo_alpha",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "vroo_beta",
+            "schema": "double"
+          },
+          "@type": [
+            "Map",
+            "dtmi:dtdl:class:Map;4"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapTypePreferTermToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassMapTypePreferTermToDtmiV4.json
new file mode 100644
index 00000000..bd429682
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapTypePreferTermToDtmiV4.json
@@ -0,0 +1,54 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_mu;1",
+          "mapKey": {
+            "name": "vroo_nu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "vroo_xi",
+            "schema": "integer"
+          },
+          "@type": "Map"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_pi;1",
+          "mapKey": {
+            "name": "vroo_rho",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "vroo_sigma",
+            "schema": "long"
+          },
+          "@type": "dtmi:dtdl:class:Map;4"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapValuePropertyCommentTermV4.json b/DTDL/v4/spec/Recommendation-ClassMapValuePropertyCommentTermV4.json
new file mode 100644
index 00000000..bbca8088
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapValuePropertyCommentTermV4.json
@@ -0,0 +1,56 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_tau;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "mu_upsilon",
+            "schema": "string"
+          },
+          "mapValue": {
+            "comment": "mu_rho",
+            "name": "mu_sigma",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_omega;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "mu_yuzz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "dtmi:dtdl:property:comment;4": "mu_chi",
+            "name": "mu_psi",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapValuePropertyDescriptionTermV4.json b/DTDL/v4/spec/Recommendation-ClassMapValuePropertyDescriptionTermV4.json
new file mode 100644
index 00000000..ac95e000
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapValuePropertyDescriptionTermV4.json
@@ -0,0 +1,60 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_yuzz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omicron_wum",
+            "schema": "string"
+          },
+          "mapValue": {
+            "description": [
+              "omicron_psi"
+            ],
+            "name": "omicron_omega",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_glikk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omicron_nuh",
+            "schema": "string"
+          },
+          "mapValue": {
+            "dtmi:dtdl:property:description;4": [
+              "omicron_humpf"
+            ],
+            "name": "omicron_fuddle",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapValuePropertyDisplayNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassMapValuePropertyDisplayNameTermV4.json
new file mode 100644
index 00000000..5259b7a6
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapValuePropertyDisplayNameTermV4.json
@@ -0,0 +1,60 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_nuh;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "sigma_snee",
+            "schema": "string"
+          },
+          "mapValue": {
+            "displayName": [
+              "sigma_fuddle"
+            ],
+            "name": "sigma_glikk",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_floob;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "sigma_zatz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "dtmi:dtdl:property:displayName;4": [
+              "sigma_thnad"
+            ],
+            "name": "sigma_spazz",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapValuePropertyNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassMapValuePropertyNameTermV4.json
new file mode 100644
index 00000000..2ca62ee4
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapValuePropertyNameTermV4.json
@@ -0,0 +1,54 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_delta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "snee_epsilon",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "snee_gamma",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_theta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "snee_iota",
+            "schema": "string"
+          },
+          "mapValue": {
+            "dtmi:dtdl:property:name;4": "snee_eta",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapValuePropertySchemaPreferTermToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassMapValuePropertySchemaPreferTermToDtmiV4.json
new file mode 100644
index 00000000..ed006513
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapValuePropertySchemaPreferTermToDtmiV4.json
@@ -0,0 +1,106 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_yekk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "flunn_vroo",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "flunn_itch",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_beta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "itch_gamma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "itch_alpha",
+            "schema": "dtmi:dtdl:instance:Schema:integer;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_zeta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "itch_eta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "itch_epsilon",
+            "schema": "point"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_kappa;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "itch_lambda",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "itch_iota",
+            "schema": "dtmi:standard:schema:geospatial:point;4"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapValuePropertySchemaTermV4.json b/DTDL/v4/spec/Recommendation-ClassMapValuePropertySchemaTermV4.json
new file mode 100644
index 00000000..757d8a1e
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapValuePropertySchemaTermV4.json
@@ -0,0 +1,54 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_sigma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "itch_tau",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "itch_rho",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_chi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "itch_psi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "itch_phi",
+            "dtmi:dtdl:property:schema;4": "short"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapValueTypeDuplicatesMaterialV4.json b/DTDL/v4/spec/Recommendation-ClassMapValueTypeDuplicatesMaterialV4.json
new file mode 100644
index 00000000..54f62a0d
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapValueTypeDuplicatesMaterialV4.json
@@ -0,0 +1,62 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_eta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "beta_theta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "beta_zeta",
+            "schema": "double",
+            "@type": [
+              "MapValue",
+              "MapValue"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_lambda;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "beta_mu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "beta_kappa",
+            "schema": "duration",
+            "@type": [
+              "dtmi:dtdl:class:MapValue;4",
+              "dtmi:dtdl:class:MapValue;4"
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapValueTypeIncludesTermAndDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassMapValueTypeIncludesTermAndDtmiV4.json
new file mode 100644
index 00000000..08789348
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapValueTypeIncludesTermAndDtmiV4.json
@@ -0,0 +1,32 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_gamma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "beta_delta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "beta_beta",
+            "schema": "decimal",
+            "@type": [
+              "MapValue",
+              "dtmi:dtdl:class:MapValue;4"
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassMapValueTypePreferTermToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassMapValueTypePreferTermToDtmiV4.json
new file mode 100644
index 00000000..374bccfd
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassMapValueTypePreferTermToDtmiV4.json
@@ -0,0 +1,56 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_omicron;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "beta_pi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "beta_xi",
+            "schema": "float",
+            "@type": "MapValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_tau;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "beta_upsilon",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "beta_sigma",
+            "schema": "integer",
+            "@type": "dtmi:dtdl:class:MapValue;4"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassObjectPropertyCommentTermV4.json b/DTDL/v4/spec/Recommendation-ClassObjectPropertyCommentTermV4.json
new file mode 100644
index 00000000..41dcdb8c
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassObjectPropertyCommentTermV4.json
@@ -0,0 +1,40 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_pi;1",
+          "@type": "Object",
+          "comment": "um_rho"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_tau;1",
+          "@type": "Object",
+          "dtmi:dtdl:property:comment;4": "um_upsilon"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassObjectPropertyDescriptionTermV4.json b/DTDL/v4/spec/Recommendation-ClassObjectPropertyDescriptionTermV4.json
new file mode 100644
index 00000000..c67cbe7a
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassObjectPropertyDescriptionTermV4.json
@@ -0,0 +1,44 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_alpha;1",
+          "@type": "Object",
+          "description": [
+            "fuddle_beta"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_delta;1",
+          "@type": "Object",
+          "dtmi:dtdl:property:description;4": [
+            "fuddle_epsilon"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassObjectPropertyDisplayNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassObjectPropertyDisplayNameTermV4.json
new file mode 100644
index 00000000..38d1f612
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassObjectPropertyDisplayNameTermV4.json
@@ -0,0 +1,44 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_fuddle;1",
+          "@type": "Object",
+          "displayName": [
+            "glikk_glikk"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_snee;1",
+          "@type": "Object",
+          "dtmi:dtdl:property:displayName;4": [
+            "glikk_quan"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassObjectPropertyFieldsTermV4.json b/DTDL/v4/spec/Recommendation-ClassObjectPropertyFieldsTermV4.json
new file mode 100644
index 00000000..bdcc3c0c
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassObjectPropertyFieldsTermV4.json
@@ -0,0 +1,50 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_jogg;1",
+          "@type": "Object",
+          "fields": [
+            {
+              "name": "thnad_flunn",
+              "schema": "double"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_yekk;1",
+          "@type": "Object",
+          "dtmi:dtdl:property:fields;4": [
+            {
+              "name": "thnad_vroo",
+              "schema": "duration"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassObjectTypeDuplicatesMaterialV4.json b/DTDL/v4/spec/Recommendation-ClassObjectTypeDuplicatesMaterialV4.json
new file mode 100644
index 00000000..e6d77afe
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassObjectTypeDuplicatesMaterialV4.json
@@ -0,0 +1,44 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_fuddle;1",
+          "@type": [
+            "Object",
+            "Object"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_nuh;1",
+          "@type": [
+            "dtmi:dtdl:class:Object;4",
+            "dtmi:dtdl:class:Object;4"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassObjectTypeIncludesTermAndDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassObjectTypeIncludesTermAndDtmiV4.json
new file mode 100644
index 00000000..5ad78756
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassObjectTypeIncludesTermAndDtmiV4.json
@@ -0,0 +1,23 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_um;1",
+          "@type": [
+            "Object",
+            "dtmi:dtdl:class:Object;4"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassObjectTypePreferTermToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassObjectTypePreferTermToDtmiV4.json
new file mode 100644
index 00000000..40b331c5
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassObjectTypePreferTermToDtmiV4.json
@@ -0,0 +1,38 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_quan;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_spazz;1",
+          "@type": "dtmi:dtdl:class:Object;4"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassPropertyPropertyCommentTermV4.json b/DTDL/v4/spec/Recommendation-ClassPropertyPropertyCommentTermV4.json
new file mode 100644
index 00000000..ddfe7c60
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassPropertyPropertyCommentTermV4.json
@@ -0,0 +1,42 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "comment": "eta_jogg",
+          "name": "eta_flunn",
+          "schema": "decimal"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "dtmi:dtdl:property:comment;4": "eta_yekk",
+          "name": "eta_vroo",
+          "schema": "double"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassPropertyPropertyDescriptionTermV4.json b/DTDL/v4/spec/Recommendation-ClassPropertyPropertyDescriptionTermV4.json
new file mode 100644
index 00000000..af010959
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassPropertyPropertyDescriptionTermV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "description": [
+            "iota_psi"
+          ],
+          "name": "iota_omega",
+          "schema": "uuid"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "dtmi:dtdl:property:description;4": [
+            "iota_wum"
+          ],
+          "name": "iota_um",
+          "schema": "boolean"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassPropertyPropertyDisplayNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassPropertyPropertyDisplayNameTermV4.json
new file mode 100644
index 00000000..460bcde2
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassPropertyPropertyDisplayNameTermV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "displayName": [
+            "lambda_theta"
+          ],
+          "name": "lambda_iota",
+          "schema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "dtmi:dtdl:property:displayName;4": [
+            "lambda_lambda"
+          ],
+          "name": "lambda_mu",
+          "schema": "time"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassPropertyPropertyNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassPropertyPropertyNameTermV4.json
new file mode 100644
index 00000000..9f70f13c
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassPropertyPropertyNameTermV4.json
@@ -0,0 +1,40 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "flunn_thnad",
+          "schema": "dateTime"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "dtmi:dtdl:property:name;4": "flunn_floob",
+          "schema": "decimal"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassPropertyPropertySchemaPreferTermToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassPropertyPropertySchemaPreferTermToDtmiV4.json
new file mode 100644
index 00000000..9c03adf3
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassPropertyPropertySchemaPreferTermToDtmiV4.json
@@ -0,0 +1,78 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_psi",
+          "schema": "short"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_yuzz",
+          "schema": "dtmi:dtdl:instance:Schema:short;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_um",
+          "schema": "point"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_fuddle",
+          "schema": "dtmi:standard:schema:geospatial:point;4"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassPropertyPropertySchemaTermV4.json b/DTDL/v4/spec/Recommendation-ClassPropertyPropertySchemaTermV4.json
new file mode 100644
index 00000000..1f0d6395
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassPropertyPropertySchemaTermV4.json
@@ -0,0 +1,40 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_quan",
+          "schema": "unsignedByte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_spazz",
+          "dtmi:dtdl:property:schema;4": "unsignedInteger"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassPropertyPropertyWritableTermV4.json b/DTDL/v4/spec/Recommendation-ClassPropertyPropertyWritableTermV4.json
new file mode 100644
index 00000000..e2d33edc
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassPropertyPropertyWritableTermV4.json
@@ -0,0 +1,42 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "mu_nuh",
+          "schema": "dateTime",
+          "writable": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "mu_quan",
+          "schema": "decimal",
+          "dtmi:dtdl:property:writable;4": false
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassPropertyTypeDuplicatesMaterialV4.json b/DTDL/v4/spec/Recommendation-ClassPropertyTypeDuplicatesMaterialV4.json
new file mode 100644
index 00000000..b33bb4d9
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassPropertyTypeDuplicatesMaterialV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "zatz_nuh",
+          "schema": "date",
+          "@type": [
+            "Property",
+            "Property"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "zatz_quan",
+          "schema": "dateTime",
+          "@type": [
+            "dtmi:dtdl:class:Property;4",
+            "dtmi:dtdl:class:Property;4"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassPropertyTypeIncludesTermAndDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassPropertyTypeIncludesTermAndDtmiV4.json
new file mode 100644
index 00000000..2005f51d
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassPropertyTypeIncludesTermAndDtmiV4.json
@@ -0,0 +1,24 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "zatz_fuddle",
+          "schema": "bytes",
+          "@type": [
+            "Property",
+            "dtmi:dtdl:class:Property;4"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassPropertyTypePreferTermToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassPropertyTypePreferTermToDtmiV4.json
new file mode 100644
index 00000000..b8fa765a
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassPropertyTypePreferTermToDtmiV4.json
@@ -0,0 +1,40 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "zatz_spazz",
+          "schema": "decimal",
+          "@type": "Property"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "zatz_zatz",
+          "schema": "double",
+          "@type": "dtmi:dtdl:class:Property;4"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyCommentTermV4.json b/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyCommentTermV4.json
new file mode 100644
index 00000000..439740b5
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyCommentTermV4.json
@@ -0,0 +1,40 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "comment": "psi_wum",
+          "name": "psi_um"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "dtmi:dtdl:property:comment;4": "psi_fuddle",
+          "name": "psi_glikk"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyDescriptionTermV4.json b/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyDescriptionTermV4.json
new file mode 100644
index 00000000..f57db386
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyDescriptionTermV4.json
@@ -0,0 +1,44 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "description": [
+            "yuzz_lambda"
+          ],
+          "name": "yuzz_mu"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "dtmi:dtdl:property:description;4": [
+            "yuzz_xi"
+          ],
+          "name": "yuzz_omicron"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyDisplayNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyDisplayNameTermV4.json
new file mode 100644
index 00000000..cae3a01a
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyDisplayNameTermV4.json
@@ -0,0 +1,44 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "displayName": [
+            "wum_flunn"
+          ],
+          "name": "wum_itch"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "dtmi:dtdl:property:displayName;4": [
+            "wum_vroo"
+          ],
+          "name": "wum_hi"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyMaxMultiplicityTermV4.json b/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyMaxMultiplicityTermV4.json
new file mode 100644
index 00000000..9b098ead
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyMaxMultiplicityTermV4.json
@@ -0,0 +1,40 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "maxMultiplicity": 1874,
+          "name": "humpf_rho"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "dtmi:dtdl:property:maxMultiplicity;4": 1875,
+          "name": "humpf_tau"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyMinMultiplicityTermV4.json b/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyMinMultiplicityTermV4.json
new file mode 100644
index 00000000..a111a4db
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyMinMultiplicityTermV4.json
@@ -0,0 +1,40 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "minMultiplicity": 0,
+          "name": "fuddle_floob"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "dtmi:dtdl:property:minMultiplicity;4": 0,
+          "name": "fuddle_jogg"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyNameTermV4.json
new file mode 100644
index 00000000..b0128e88
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyNameTermV4.json
@@ -0,0 +1,38 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "rho_lambda"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "dtmi:dtdl:property:name;4": "rho_nu"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyPropertiesTermV4.json b/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyPropertiesTermV4.json
new file mode 100644
index 00000000..715ce0c7
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyPropertiesTermV4.json
@@ -0,0 +1,52 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "quan_zatz",
+          "properties": [
+            {
+              "@type": "Property",
+              "name": "quan_jogg",
+              "schema": "uuid"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "quan_itch",
+          "dtmi:dtdl:property:properties;4": [
+            {
+              "@type": "Property",
+              "name": "quan_yekk",
+              "schema": "boolean"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyTargetTermV4.json b/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyTargetTermV4.json
new file mode 100644
index 00000000..6a658d3c
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyTargetTermV4.json
@@ -0,0 +1,40 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "zatz_delta",
+          "target": "dtmi:example:zatz_epsilon;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "zatz_eta",
+          "dtmi:dtdl:property:target;4": "dtmi:example:zatz_theta;1"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyWritableTermV4.json b/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyWritableTermV4.json
new file mode 100644
index 00000000..de0e3d7b
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassRelationshipPropertyWritableTermV4.json
@@ -0,0 +1,40 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "jogg_um",
+          "writable": false
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "jogg_fuddle",
+          "dtmi:dtdl:property:writable;4": true
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassRelationshipTypeDuplicatesMaterialV4.json b/DTDL/v4/spec/Recommendation-ClassRelationshipTypeDuplicatesMaterialV4.json
new file mode 100644
index 00000000..b1d0d063
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassRelationshipTypeDuplicatesMaterialV4.json
@@ -0,0 +1,44 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "omicron_xi",
+          "@type": [
+            "Relationship",
+            "Relationship"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "omicron_pi",
+          "@type": [
+            "dtmi:dtdl:class:Relationship;4",
+            "dtmi:dtdl:class:Relationship;4"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassRelationshipTypeIncludesTermAndDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassRelationshipTypeIncludesTermAndDtmiV4.json
new file mode 100644
index 00000000..a04c3c7b
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassRelationshipTypeIncludesTermAndDtmiV4.json
@@ -0,0 +1,23 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "omicron_mu",
+          "@type": [
+            "Relationship",
+            "dtmi:dtdl:class:Relationship;4"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassRelationshipTypePreferTermToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassRelationshipTypePreferTermToDtmiV4.json
new file mode 100644
index 00000000..9e946b62
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassRelationshipTypePreferTermToDtmiV4.json
@@ -0,0 +1,38 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "omicron_sigma",
+          "@type": "Relationship"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "omicron_upsilon",
+          "@type": "dtmi:dtdl:class:Relationship;4"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassTelemetryPropertyCommentTermV4.json b/DTDL/v4/spec/Recommendation-ClassTelemetryPropertyCommentTermV4.json
new file mode 100644
index 00000000..0dab2616
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassTelemetryPropertyCommentTermV4.json
@@ -0,0 +1,42 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "comment": "lambda_nu",
+          "name": "lambda_xi",
+          "schema": "long"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "dtmi:dtdl:property:comment;4": "lambda_pi",
+          "name": "lambda_rho",
+          "schema": "short"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassTelemetryPropertyDescriptionTermV4.json b/DTDL/v4/spec/Recommendation-ClassTelemetryPropertyDescriptionTermV4.json
new file mode 100644
index 00000000..64745cd8
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassTelemetryPropertyDescriptionTermV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "description": [
+            "mu_yekk"
+          ],
+          "name": "mu_vroo",
+          "schema": "dateTime"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "dtmi:dtdl:property:description;4": [
+            "nu_alpha"
+          ],
+          "name": "nu_beta",
+          "schema": "decimal"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassTelemetryPropertyDisplayNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassTelemetryPropertyDisplayNameTermV4.json
new file mode 100644
index 00000000..51b43792
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassTelemetryPropertyDisplayNameTermV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "displayName": [
+            "xi_wum"
+          ],
+          "name": "xi_um",
+          "schema": "unsignedShort"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "dtmi:dtdl:property:displayName;4": [
+            "xi_fuddle"
+          ],
+          "name": "xi_glikk",
+          "schema": "uuid"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassTelemetryPropertyNameTermV4.json b/DTDL/v4/spec/Recommendation-ClassTelemetryPropertyNameTermV4.json
new file mode 100644
index 00000000..2605d5d8
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassTelemetryPropertyNameTermV4.json
@@ -0,0 +1,40 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "hi_lambda",
+          "schema": "long"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "dtmi:dtdl:property:name;4": "hi_nu",
+          "schema": "short"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassTelemetryPropertySchemaPreferTermToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassTelemetryPropertySchemaPreferTermToDtmiV4.json
new file mode 100644
index 00000000..34f459e3
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassTelemetryPropertySchemaPreferTermToDtmiV4.json
@@ -0,0 +1,78 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "delta_hi",
+          "schema": "time"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "epsilon_beta",
+          "schema": "dtmi:dtdl:instance:Schema:time;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "epsilon_delta",
+          "schema": "point"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "epsilon_zeta",
+          "schema": "dtmi:standard:schema:geospatial:point;4"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassTelemetryPropertySchemaTermV4.json b/DTDL/v4/spec/Recommendation-ClassTelemetryPropertySchemaTermV4.json
new file mode 100644
index 00000000..225f5246
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassTelemetryPropertySchemaTermV4.json
@@ -0,0 +1,40 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "epsilon_kappa",
+          "schema": "byte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "epsilon_mu",
+          "dtmi:dtdl:property:schema;4": "bytes"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassTelemetryTypeDuplicatesMaterialV4.json b/DTDL/v4/spec/Recommendation-ClassTelemetryTypeDuplicatesMaterialV4.json
new file mode 100644
index 00000000..656479e6
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassTelemetryTypeDuplicatesMaterialV4.json
@@ -0,0 +1,46 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "yekk_xi",
+          "schema": "unsignedInteger",
+          "@type": [
+            "Telemetry",
+            "Telemetry"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "yekk_pi",
+          "schema": "unsignedLong",
+          "@type": [
+            "dtmi:dtdl:class:Telemetry;4",
+            "dtmi:dtdl:class:Telemetry;4"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassTelemetryTypeIncludesTermAndDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassTelemetryTypeIncludesTermAndDtmiV4.json
new file mode 100644
index 00000000..b82960cd
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassTelemetryTypeIncludesTermAndDtmiV4.json
@@ -0,0 +1,24 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "yekk_mu",
+          "schema": "unsignedByte",
+          "@type": [
+            "Telemetry",
+            "dtmi:dtdl:class:Telemetry;4"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ClassTelemetryTypePreferTermToDtmiV4.json b/DTDL/v4/spec/Recommendation-ClassTelemetryTypePreferTermToDtmiV4.json
new file mode 100644
index 00000000..52bf8fb3
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ClassTelemetryTypePreferTermToDtmiV4.json
@@ -0,0 +1,40 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "yekk_sigma",
+          "schema": "unsignedShort",
+          "@type": "Telemetry"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "yekk_upsilon",
+          "schema": "uuid",
+          "@type": "dtmi:dtdl:class:Telemetry;4"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ContextDtdlLimitlessOnlyOneV4.json b/DTDL/v4/spec/Recommendation-ContextDtdlLimitlessOnlyOneV4.json
new file mode 100644
index 00000000..9bad0bbf
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ContextDtdlLimitlessOnlyOneV4.json
@@ -0,0 +1,55 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4#limitless",
+          "dtmi:dtdl:context;4#limits"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;2",
+          "dtmi:dtdl:context;4#limitless",
+          "dtmi:dtdl:context;4#limits"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:dtdl:context;4#limitless",
+          "dtmi:dtdl:context;4#limits"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ContextDtdlOnlyOneV4.json b/DTDL/v4/spec/Recommendation-ContextDtdlOnlyOneV4.json
new file mode 100644
index 00000000..096aaf16
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ContextDtdlOnlyOneV4.json
@@ -0,0 +1,69 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;2",
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;3",
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ContextRepeatsDeversionedValueV4.json b/DTDL/v4/spec/Recommendation-ContextRepeatsDeversionedValueV4.json
new file mode 100644
index 00000000..fde5a180
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ContextRepeatsDeversionedValueV4.json
@@ -0,0 +1,19 @@
+[
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;2",
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ContextUniqueValuesV4.json b/DTDL/v4/spec/Recommendation-ContextUniqueValuesV4.json
new file mode 100644
index 00000000..b98c7ec8
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ContextUniqueValuesV4.json
@@ -0,0 +1,35 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-LocalizableStringArrayElementHasLanguageV4.json b/DTDL/v4/spec/Recommendation-LocalizableStringArrayElementHasLanguageV4.json
new file mode 100644
index 00000000..d9032733
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-LocalizableStringArrayElementHasLanguageV4.json
@@ -0,0 +1,45 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello",
+            "@language": "en"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": [
+          {
+            "@value": "hello"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-RepresentationalBooleanHasTypeV4.json b/DTDL/v4/spec/Recommendation-RepresentationalBooleanHasTypeV4.json
new file mode 100644
index 00000000..19057447
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-RepresentationalBooleanHasTypeV4.json
@@ -0,0 +1,55 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": "xsd:boolean"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true
+            }
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-RepresentationalIntegerHasTypeV4.json b/DTDL/v4/spec/Recommendation-RepresentationalIntegerHasTypeV4.json
new file mode 100644
index 00000000..5406f2d0
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-RepresentationalIntegerHasTypeV4.json
@@ -0,0 +1,53 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": "xsd:integer"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3
+            }
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-RepresentationalStringHasTypeV4.json b/DTDL/v4/spec/Recommendation-RepresentationalStringHasTypeV4.json
new file mode 100644
index 00000000..fa18390e
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-RepresentationalStringHasTypeV4.json
@@ -0,0 +1,41 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": "xsd:string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ValueGeospatialSchemaTermV4.json b/DTDL/v4/spec/Recommendation-ValueGeospatialSchemaTermV4.json
new file mode 100644
index 00000000..0dbe051b
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ValueGeospatialSchemaTermV4.json
@@ -0,0 +1,48 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Telemetry",
+            "name": "border",
+            "schema": "lineString"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Telemetry",
+            "name": "border",
+            "schema": "dtmi:standard:schema:geospatial:lineString;4"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Recommendation-ValuePrimitiveSchemaTermV4.json b/DTDL/v4/spec/Recommendation-ValuePrimitiveSchemaTermV4.json
new file mode 100644
index 00000000..c815ffb7
--- /dev/null
+++ b/DTDL/v4/spec/Recommendation-ValuePrimitiveSchemaTermV4.json
@@ -0,0 +1,48 @@
+[
+  {
+    "valid": true,
+    "desirable": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Telemetry",
+            "name": "switchState",
+            "schema": "boolean"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "desirable": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Telemetry",
+            "name": "switchState",
+            "schema": "dtmi:dtdl:instance:Schema:boolean;4"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayContextConformsV4.json b/DTDL/v4/spec/Requirement-ClassArrayContextConformsV4.json
new file mode 100644
index 00000000..f4ad8151
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayContextConformsV4.json
@@ -0,0 +1,370 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "yekk_thnad",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "boolean",
+            "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "yekk_floob",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "byte",
+            "@context": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "yekk_jogg",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "bytes",
+            "@context": [
+              "dtmi:dtdl:extension:quantitativeTypes;1"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "yekk_itch",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "date",
+            "@context": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "yekk_vroo",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "dateTime",
+            "@context": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_alpha",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "decimal",
+            "@context": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_gamma",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "double",
+            "@context": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_epsilon",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "duration",
+            "@context": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_eta",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "float",
+            "@context": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_iota",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "integer",
+            "@context": "dtmi:dtdl:extension:quantitativeTypes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_lambda",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "long",
+            "@context": "http://dtdl/extension/quantitativeTypes/1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_nu",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "short",
+            "@context": "quantitativeTypes;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_omicron",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "string",
+            "@context": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_rho",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "time",
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_tau",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "unsignedByte",
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_phi",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "unsignedInteger",
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayIdDuplicateV4.json b/DTDL/v4/spec/Requirement-ClassArrayIdDuplicateV4.json
new file mode 100644
index 00000000..39372a21
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayIdDuplicateV4.json
@@ -0,0 +1,49 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:alpha_mu;1",
+          "@type": "Property",
+          "name": "alpha_nu",
+          "schema": {
+            "@id": "dtmi:example:alpha_mu;1",
+            "@type": "Array",
+            "elementSchema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:alpha_xi;1",
+          "@type": "Property",
+          "name": "alpha_omicron",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:example:alpha_xi;1",
+            "@type": "Array",
+            "elementSchema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayIdIsDtmiV4.json b/DTDL/v4/spec/Requirement-ClassArrayIdIsDtmiV4.json
new file mode 100644
index 00000000..4e9dc94b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayIdIsDtmiV4.json
@@ -0,0 +1,1020 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;7",
+          "@type": "Array",
+          "elementSchema": "byte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;108675309",
+          "@type": "Array",
+          "elementSchema": "bytes"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;999999999",
+          "@type": "Array",
+          "elementSchema": "date"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo;1",
+          "@type": "Array",
+          "elementSchema": "dateTime"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar",
+          "@type": "Array",
+          "elementSchema": "decimal"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;3.14",
+          "@type": "Array",
+          "elementSchema": "double"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;3.141592",
+          "@type": "Array",
+          "elementSchema": "duration"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": null,
+          "@type": "Array",
+          "elementSchema": "float"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": null,
+          "@type": "Array",
+          "elementSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": 626,
+          "@type": "Array",
+          "elementSchema": "long"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": 626,
+          "@type": "Array",
+          "elementSchema": "short"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": true,
+          "@type": "Array",
+          "elementSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": true,
+          "@type": "Array",
+          "elementSchema": "time"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": {
+            "@value": "dtmi:apparently:valid:identifier;3"
+          },
+          "@type": "Array",
+          "elementSchema": "unsignedByte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": {
+            "@value": "dtmi:apparently:valid:identifier;3"
+          },
+          "@type": "Array",
+          "elementSchema": "unsignedInteger"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;0",
+          "@type": "Array",
+          "elementSchema": "unsignedLong"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0",
+          "@type": "Array",
+          "elementSchema": "unsignedShort"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;0.0",
+          "@type": "Array",
+          "elementSchema": "uuid"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0.0",
+          "@type": "Array",
+          "elementSchema": "boolean"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;1234567890",
+          "@type": "Array",
+          "elementSchema": "byte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;1234567890",
+          "@type": "Array",
+          "elementSchema": "bytes"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;1a",
+          "@type": "Array",
+          "elementSchema": "date"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;1a",
+          "@type": "Array",
+          "elementSchema": "dateTime"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;3.0",
+          "@type": "Array",
+          "elementSchema": "decimal"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;3.0",
+          "@type": "Array",
+          "elementSchema": "double"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;3.1415926",
+          "@type": "Array",
+          "elementSchema": "duration"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;3.1415926",
+          "@type": "Array",
+          "elementSchema": "float"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;6.02",
+          "@type": "Array",
+          "elementSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;6.02",
+          "@type": "Array",
+          "elementSchema": "long"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;0.1",
+          "@type": "Array",
+          "elementSchema": "short"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0.1",
+          "@type": "Array",
+          "elementSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;01",
+          "@type": "Array",
+          "elementSchema": "time"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;01",
+          "@type": "Array",
+          "elementSchema": "unsignedByte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;",
+          "@type": "Array",
+          "elementSchema": "unsignedInteger"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;",
+          "@type": "Array",
+          "elementSchema": "unsignedLong"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:test:invalidId_;1",
+          "@type": "Array",
+          "elementSchema": "unsignedShort"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:invalidId_;1",
+          "@type": "Array",
+          "elementSchema": "uuid"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:test:_invalidUserId;1",
+          "@type": "Array",
+          "elementSchema": "boolean"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:_invalidUserId;1",
+          "@type": "Array",
+          "elementSchema": "byte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:test:1seg;1",
+          "@type": "Array",
+          "elementSchema": "bytes"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:1seg;1",
+          "@type": "Array",
+          "elementSchema": "date"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar.baz;1",
+          "@type": "Array",
+          "elementSchema": "dateTime"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar.baz;1",
+          "@type": "Array",
+          "elementSchema": "decimal"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo::bar;1",
+          "@type": "Array",
+          "elementSchema": "double"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo::bar;1",
+          "@type": "Array",
+          "elementSchema": "duration"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "urn:foo:bar:1",
+          "@type": "Array",
+          "elementSchema": "float"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "urn:foo:bar:1",
+          "@type": "Array",
+          "elementSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "http://foo/bar/baz",
+          "@type": "Array",
+          "elementSchema": "long"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "http://foo/bar/baz",
+          "@type": "Array",
+          "elementSchema": "short"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:;1",
+          "@type": "Array",
+          "elementSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:;1",
+          "@type": "Array",
+          "elementSchema": "time"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:dtdl:example;1",
+          "@type": "Array",
+          "elementSchema": "unsignedByte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:dtdl:example;1",
+          "@type": "Array",
+          "elementSchema": "unsignedInteger"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:standard:example;1",
+          "@type": "Array",
+          "elementSchema": "unsignedLong"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:standard:example;1",
+          "@type": "Array",
+          "elementSchema": "unsignedShort"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayIdNotArrayV4.json b/DTDL/v4/spec/Requirement-ClassArrayIdNotArrayV4.json
new file mode 100644
index 00000000..ee4fdd15
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayIdNotArrayV4.json
@@ -0,0 +1,289 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo:bar;7"
+          ],
+          "@type": "Array",
+          "elementSchema": "uuid"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;7"
+          ],
+          "@type": "Array",
+          "elementSchema": "boolean"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo:bar;108675309"
+          ],
+          "@type": "Array",
+          "elementSchema": "byte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;108675309"
+          ],
+          "@type": "Array",
+          "elementSchema": "bytes"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo:bar;999999999"
+          ],
+          "@type": "Array",
+          "elementSchema": "date"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;999999999"
+          ],
+          "@type": "Array",
+          "elementSchema": "dateTime"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo;1"
+          ],
+          "@type": "Array",
+          "elementSchema": "decimal"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo;1"
+          ],
+          "@type": "Array",
+          "elementSchema": "double"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo:bar"
+          ],
+          "@type": "Array",
+          "elementSchema": "duration"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar"
+          ],
+          "@type": "Array",
+          "elementSchema": "float"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo:bar;3.14"
+          ],
+          "@type": "Array",
+          "elementSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;3.14"
+          ],
+          "@type": "Array",
+          "elementSchema": "long"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo:bar;3.141592"
+          ],
+          "@type": "Array",
+          "elementSchema": "short"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;3.141592"
+          ],
+          "@type": "Array",
+          "elementSchema": "string"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayIdRequiredV4.json b/DTDL/v4/spec/Requirement-ClassArrayIdRequiredV4.json
new file mode 100644
index 00000000..381241d3
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayIdRequiredV4.json
@@ -0,0 +1,76 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_psi",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_yuzz;1",
+          "@type": "Array",
+          "elementSchema": "unsignedShort"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@type": "Array",
+          "elementSchema": "uuid"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Array",
+          "elementSchema": "boolean"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayInvalidKeywordsV4.json b/DTDL/v4/spec/Requirement-ClassArrayInvalidKeywordsV4.json
new file mode 100644
index 00000000..600ff24e
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayInvalidKeywordsV4.json
@@ -0,0 +1,158 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_theta;1",
+          "@type": "Array",
+          "elementSchema": "time",
+          "@graph": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zeta_kappa;1",
+          "@type": "Array",
+          "elementSchema": "unsignedByte",
+          "@graph": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_mu;1",
+          "@type": "Array",
+          "elementSchema": "unsignedInteger",
+          "@value": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zeta_xi;1",
+          "@type": "Array",
+          "elementSchema": "unsignedLong",
+          "@value": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_pi;1",
+          "@type": "Array",
+          "elementSchema": "unsignedShort",
+          "@language": "en"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zeta_sigma;1",
+          "@type": "Array",
+          "elementSchema": "uuid",
+          "@language": "en"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_upsilon;1",
+          "@type": "Array",
+          "elementSchema": "boolean",
+          "@foobar": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zeta_chi;1",
+          "@type": "Array",
+          "elementSchema": "byte",
+          "@foobar": true
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayPropertiesElementSchemaSchemaMaxDepthV4.json b/DTDL/v4/spec/Requirement-ClassArrayPropertiesElementSchemaSchemaMaxDepthV4.json
new file mode 100644
index 00000000..dce57391
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayPropertiesElementSchemaSchemaMaxDepthV4.json
@@ -0,0 +1,135 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "pi_beta",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": {
+              "@type": "Array",
+              "elementSchema": {
+                "@type": "Array",
+                "elementSchema": {
+                  "@type": "Array",
+                  "elementSchema": {
+                    "@type": "Array",
+                    "elementSchema": {
+                      "@type": "Array",
+                      "elementSchema": {
+                        "@type": "Array",
+                        "elementSchema": {
+                          "@type": "Array",
+                          "elementSchema": "boolean"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "pi_delta",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": {
+              "@type": "Array",
+              "elementSchema": {
+                "@type": "Array",
+                "elementSchema": {
+                  "@type": "Array",
+                  "elementSchema": {
+                    "@type": "Array",
+                    "elementSchema": {
+                      "@type": "Array",
+                      "elementSchema": {
+                        "@type": "Array",
+                        "elementSchema": {
+                          "@type": "Array",
+                          "elementSchema": {
+                            "@type": "Array",
+                            "elementSchema": "byte"
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "pi_zeta",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Array",
+            "elementSchema": {
+              "@type": "Array",
+              "elementSchema": {
+                "@type": "Array",
+                "elementSchema": {
+                  "@type": "Array",
+                  "elementSchema": {
+                    "@type": "Array",
+                    "elementSchema": {
+                      "@type": "Array",
+                      "elementSchema": {
+                        "@type": "Array",
+                        "elementSchema": {
+                          "@type": "Array",
+                          "elementSchema": {
+                            "@type": "Array",
+                            "elementSchema": "bytes"
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayPropertyCommentStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassArrayPropertyCommentStringLengthV4.json
new file mode 100644
index 00000000..701bb54d
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayPropertyCommentStringLengthV4.json
@@ -0,0 +1,60 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_omicron;1",
+          "@type": "Array",
+          "elementSchema": "unsignedShort",
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_rho;1",
+          "@type": "Array",
+          "elementSchema": "uuid",
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:beta_tau;1",
+          "@type": "Array",
+          "elementSchema": "boolean",
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayPropertyCommentStringV4.json b/DTDL/v4/spec/Requirement-ClassArrayPropertyCommentStringV4.json
new file mode 100644
index 00000000..76876392
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayPropertyCommentStringV4.json
@@ -0,0 +1,435 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_pi;1",
+          "@type": "Array",
+          "elementSchema": "unsignedInteger",
+          "comment": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_sigma;1",
+          "@type": "Array",
+          "elementSchema": "unsignedLong",
+          "comment": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_upsilon;1",
+          "@type": "Array",
+          "elementSchema": "unsignedShort",
+          "comment": {
+            "@value": "hello",
+            "@type": "xsd:string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_chi;1",
+          "@type": "Array",
+          "elementSchema": "uuid",
+          "comment": [
+            {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_omega;1",
+          "@type": "Array",
+          "elementSchema": "boolean",
+          "comment": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_wum;1",
+          "@type": "Array",
+          "elementSchema": "byte",
+          "comment": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:alpha_humpf;1",
+          "@type": "Array",
+          "elementSchema": "bytes",
+          "comment": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_glikk;1",
+          "@type": "Array",
+          "elementSchema": "date",
+          "comment": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:alpha_snee;1",
+          "@type": "Array",
+          "elementSchema": "dateTime",
+          "comment": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_thnad;1",
+          "@type": "Array",
+          "elementSchema": "decimal",
+          "comment": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:alpha_floob;1",
+          "@type": "Array",
+          "elementSchema": "double",
+          "comment": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_jogg;1",
+          "@type": "Array",
+          "elementSchema": "duration",
+          "comment": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:alpha_itch;1",
+          "@type": "Array",
+          "elementSchema": "float",
+          "comment": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_vroo;1",
+          "@type": "Array",
+          "elementSchema": "integer",
+          "comment": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:beta_alpha;1",
+          "@type": "Array",
+          "elementSchema": "long",
+          "comment": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_gamma;1",
+          "@type": "Array",
+          "elementSchema": "short",
+          "comment": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:beta_epsilon;1",
+          "@type": "Array",
+          "elementSchema": "string",
+          "comment": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_eta;1",
+          "@type": "Array",
+          "elementSchema": "time",
+          "comment": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:beta_iota;1",
+          "@type": "Array",
+          "elementSchema": "unsignedByte",
+          "comment": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_lambda;1",
+          "@type": "Array",
+          "elementSchema": "unsignedInteger",
+          "comment": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:beta_nu;1",
+          "@type": "Array",
+          "elementSchema": "unsignedLong",
+          "comment": [
+            {}
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayPropertyCommentTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassArrayPropertyCommentTermAndDtmiV4.json
new file mode 100644
index 00000000..5bd0345d
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayPropertyCommentTermAndDtmiV4.json
@@ -0,0 +1,43 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_glikk;1",
+          "@type": "Array",
+          "comment": "beta_nuh",
+          "dtmi:dtdl:property:comment;4": "beta_snee",
+          "elementSchema": "dateTime"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:beta_thnad;1",
+          "@type": "Array",
+          "comment": "beta_spazz",
+          "dtmi:dtdl:property:comment;4": "beta_floob",
+          "elementSchema": "decimal"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayPropertyDescriptionLangStringV4.json b/DTDL/v4/spec/Requirement-ClassArrayPropertyDescriptionLangStringV4.json
new file mode 100644
index 00000000..122cda0e
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayPropertyDescriptionLangStringV4.json
@@ -0,0 +1,506 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_jogg;1",
+          "@type": "Array",
+          "elementSchema": "double",
+          "description": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_itch;1",
+          "@type": "Array",
+          "elementSchema": "duration",
+          "description": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_vroo;1",
+          "@type": "Array",
+          "elementSchema": "float",
+          "description": {
+            "en": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_alpha;1",
+          "@type": "Array",
+          "elementSchema": "integer",
+          "description": [
+            {
+              "@value": "hello",
+              "@language": "en"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_gamma;1",
+          "@type": "Array",
+          "elementSchema": "long",
+          "description": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_epsilon;1",
+          "@type": "Array",
+          "elementSchema": "short",
+          "description": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_eta;1",
+          "@type": "Array",
+          "elementSchema": "string",
+          "description": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:gamma_iota;1",
+          "@type": "Array",
+          "elementSchema": "time",
+          "description": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_lambda;1",
+          "@type": "Array",
+          "elementSchema": "unsignedByte",
+          "description": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:gamma_nu;1",
+          "@type": "Array",
+          "elementSchema": "unsignedInteger",
+          "description": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_omicron;1",
+          "@type": "Array",
+          "elementSchema": "unsignedLong",
+          "description": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:gamma_rho;1",
+          "@type": "Array",
+          "elementSchema": "unsignedShort",
+          "description": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_tau;1",
+          "@type": "Array",
+          "elementSchema": "uuid",
+          "description": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:gamma_phi;1",
+          "@type": "Array",
+          "elementSchema": "boolean",
+          "description": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_psi;1",
+          "@type": "Array",
+          "elementSchema": "byte",
+          "description": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:gamma_yuzz;1",
+          "@type": "Array",
+          "elementSchema": "bytes",
+          "description": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_um;1",
+          "@type": "Array",
+          "elementSchema": "date",
+          "description": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:gamma_fuddle;1",
+          "@type": "Array",
+          "elementSchema": "dateTime",
+          "description": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_nuh;1",
+          "@type": "Array",
+          "elementSchema": "decimal",
+          "description": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:gamma_quan;1",
+          "@type": "Array",
+          "elementSchema": "double",
+          "description": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_spazz;1",
+          "@type": "Array",
+          "elementSchema": "duration",
+          "description": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:gamma_zatz;1",
+          "@type": "Array",
+          "elementSchema": "float",
+          "description": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_flunn;1",
+          "@type": "Array",
+          "elementSchema": "integer",
+          "description": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:gamma_yekk;1",
+          "@type": "Array",
+          "elementSchema": "long",
+          "description": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayPropertyDescriptionStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassArrayPropertyDescriptionStringLengthV4.json
new file mode 100644
index 00000000..d35f3f9a
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayPropertyDescriptionStringLengthV4.json
@@ -0,0 +1,60 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_hi;1",
+          "@type": "Array",
+          "elementSchema": "short",
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_beta;1",
+          "@type": "Array",
+          "elementSchema": "string",
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:delta_delta;1",
+          "@type": "Array",
+          "elementSchema": "time",
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayPropertyDescriptionTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassArrayPropertyDescriptionTermAndDtmiV4.json
new file mode 100644
index 00000000..763950ac
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayPropertyDescriptionTermAndDtmiV4.json
@@ -0,0 +1,51 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_omicron;1",
+          "@type": "Array",
+          "description": [
+            "delta_pi"
+          ],
+          "dtmi:dtdl:property:description;4": [
+            "delta_rho"
+          ],
+          "elementSchema": "unsignedShort"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:delta_tau;1",
+          "@type": "Array",
+          "description": [
+            "delta_upsilon"
+          ],
+          "dtmi:dtdl:property:description;4": [
+            "delta_phi"
+          ],
+          "elementSchema": "uuid"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayPropertyDisplayNameLangStringV4.json b/DTDL/v4/spec/Requirement-ClassArrayPropertyDisplayNameLangStringV4.json
new file mode 100644
index 00000000..7cb21515
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayPropertyDisplayNameLangStringV4.json
@@ -0,0 +1,506 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_psi;1",
+          "@type": "Array",
+          "elementSchema": "boolean",
+          "displayName": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_yuzz;1",
+          "@type": "Array",
+          "elementSchema": "byte",
+          "displayName": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_um;1",
+          "@type": "Array",
+          "elementSchema": "bytes",
+          "displayName": {
+            "en": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_fuddle;1",
+          "@type": "Array",
+          "elementSchema": "date",
+          "displayName": [
+            {
+              "@value": "hello",
+              "@language": "en"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_nuh;1",
+          "@type": "Array",
+          "elementSchema": "dateTime",
+          "displayName": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_quan;1",
+          "@type": "Array",
+          "elementSchema": "decimal",
+          "displayName": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_spazz;1",
+          "@type": "Array",
+          "elementSchema": "double",
+          "displayName": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:delta_zatz;1",
+          "@type": "Array",
+          "elementSchema": "duration",
+          "displayName": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_flunn;1",
+          "@type": "Array",
+          "elementSchema": "float",
+          "displayName": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:delta_yekk;1",
+          "@type": "Array",
+          "elementSchema": "integer",
+          "displayName": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_hi;1",
+          "@type": "Array",
+          "elementSchema": "long",
+          "displayName": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:epsilon_beta;1",
+          "@type": "Array",
+          "elementSchema": "short",
+          "displayName": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_delta;1",
+          "@type": "Array",
+          "elementSchema": "string",
+          "displayName": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:epsilon_zeta;1",
+          "@type": "Array",
+          "elementSchema": "time",
+          "displayName": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_theta;1",
+          "@type": "Array",
+          "elementSchema": "unsignedByte",
+          "displayName": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:epsilon_kappa;1",
+          "@type": "Array",
+          "elementSchema": "unsignedInteger",
+          "displayName": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_mu;1",
+          "@type": "Array",
+          "elementSchema": "unsignedLong",
+          "displayName": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:epsilon_xi;1",
+          "@type": "Array",
+          "elementSchema": "unsignedShort",
+          "displayName": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_pi;1",
+          "@type": "Array",
+          "elementSchema": "uuid",
+          "displayName": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:epsilon_sigma;1",
+          "@type": "Array",
+          "elementSchema": "boolean",
+          "displayName": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_upsilon;1",
+          "@type": "Array",
+          "elementSchema": "byte",
+          "displayName": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:epsilon_chi;1",
+          "@type": "Array",
+          "elementSchema": "bytes",
+          "displayName": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_omega;1",
+          "@type": "Array",
+          "elementSchema": "date",
+          "displayName": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:epsilon_wum;1",
+          "@type": "Array",
+          "elementSchema": "dateTime",
+          "displayName": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayPropertyDisplayNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassArrayPropertyDisplayNameStringLengthV4.json
new file mode 100644
index 00000000..0b755faa
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayPropertyDisplayNameStringLengthV4.json
@@ -0,0 +1,60 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_humpf;1",
+          "@type": "Array",
+          "elementSchema": "decimal",
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_glikk;1",
+          "@type": "Array",
+          "elementSchema": "double",
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:epsilon_snee;1",
+          "@type": "Array",
+          "elementSchema": "duration",
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayPropertyDisplayNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassArrayPropertyDisplayNameTermAndDtmiV4.json
new file mode 100644
index 00000000..12629b38
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayPropertyDisplayNameTermAndDtmiV4.json
@@ -0,0 +1,51 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_hi;1",
+          "@type": "Array",
+          "displayName": [
+            "zeta_alpha"
+          ],
+          "dtmi:dtdl:property:displayName;4": [
+            "zeta_beta"
+          ],
+          "elementSchema": "short"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zeta_delta;1",
+          "@type": "Array",
+          "displayName": [
+            "zeta_epsilon"
+          ],
+          "dtmi:dtdl:property:displayName;4": [
+            "zeta_zeta"
+          ],
+          "elementSchema": "string"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayPropertyElementSchemaElementV4.json b/DTDL/v4/spec/Requirement-ClassArrayPropertyElementSchemaElementV4.json
new file mode 100644
index 00000000..53f2fa97
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayPropertyElementSchemaElementV4.json
@@ -0,0 +1,767 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "floob_snee",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": {
+              "@type": "Enum",
+              "valueSchema": "integer"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "floob_thnad",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": [
+              {
+                "@type": "Enum",
+                "valueSchema": "integer"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        },
+        "contents": {
+          "@type": "Property",
+          "name": "floob_zatz",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "dtmi:ex:dependentRef;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        },
+        "contents": {
+          "@type": "Property",
+          "name": "floob_flunn",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": [
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "floob_vroo",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": {
+              "@id": "dtmi:example:floob_itch;1",
+              "@type": "Enum",
+              "enumValues": [
+                {
+                  "enumValue": 1505,
+                  "name": "floob_yekk"
+                }
+              ],
+              "valueSchema": "integer",
+              "@context": "dtmi:dtdl:context;2"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "zatz_beta",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": {
+              "@id": "dtmi:example:zatz_alpha;1",
+              "@type": "Enum",
+              "valueSchema": "integer",
+              "@context": "dtmi:dtdl:context;3"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        },
+        "contents": {
+          "@type": "Property",
+          "name": "zatz_epsilon",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": [
+              {
+                "@type": "Enum",
+                "valueSchema": "integer"
+              },
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        },
+        "contents": {
+          "@type": "Property",
+          "name": "zatz_eta",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Array",
+            "elementSchema": [
+              {
+                "@type": "Enum",
+                "valueSchema": "integer"
+              },
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_theta;1",
+          "@type": "Array",
+          "elementSchema": "boolean"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_kappa;1",
+          "@type": "Array",
+          "elementSchema": [
+            "boolean"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_mu;1",
+          "@type": "Array",
+          "elementSchema": "dtmi:dtdl:instance:Schema:boolean;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_xi;1",
+          "@type": "Array",
+          "elementSchema": [
+            "dtmi:dtdl:instance:Schema:boolean;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_pi;1",
+          "@type": "Array",
+          "elementSchema": "point"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_sigma;1",
+          "@type": "Array",
+          "elementSchema": [
+            "point"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_upsilon;1",
+          "@type": "Array",
+          "elementSchema": "dtmi:standard:schema:geospatial:point;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_chi;1",
+          "@type": "Array",
+          "elementSchema": [
+            "dtmi:standard:schema:geospatial:point;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_omega;1",
+          "@type": "Array",
+          "elementSchema": "Foobar"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zatz_wum;1",
+          "@type": "Array",
+          "elementSchema": "Foobar"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_humpf;1",
+          "@type": "Array",
+          "elementSchema": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zatz_glikk;1",
+          "@type": "Array",
+          "elementSchema": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_snee;1",
+          "@type": "Array",
+          "elementSchema": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zatz_thnad;1",
+          "@type": "Array",
+          "elementSchema": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_floob;1",
+          "@type": "Array",
+          "elementSchema": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zatz_jogg;1",
+          "@type": "Array",
+          "elementSchema": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_itch;1",
+          "@type": "Array",
+          "elementSchema": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zatz_vroo;1",
+          "@type": "Array",
+          "elementSchema": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_alpha;1",
+          "@type": "Array",
+          "elementSchema": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:jogg_gamma;1",
+          "@type": "Array",
+          "elementSchema": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_epsilon;1",
+          "@type": "Array",
+          "elementSchema": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:jogg_eta;1",
+          "@type": "Array",
+          "elementSchema": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_iota;1",
+          "@type": "Array",
+          "elementSchema": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:jogg_lambda;1",
+          "@type": "Array",
+          "elementSchema": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_nu;1",
+          "@type": "Array",
+          "elementSchema": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:jogg_omicron;1",
+          "@type": "Array",
+          "elementSchema": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_rho;1",
+          "@type": "Array",
+          "elementSchema": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:jogg_tau;1",
+          "@type": "Array",
+          "elementSchema": []
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayPropertyElementSchemaTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassArrayPropertyElementSchemaTermAndDtmiV4.json
new file mode 100644
index 00000000..150e25d4
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayPropertyElementSchemaTermAndDtmiV4.json
@@ -0,0 +1,41 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_upsilon;1",
+          "@type": "Array",
+          "elementSchema": "long",
+          "dtmi:dtdl:property:elementSchema;4": "short"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:yekk_chi;1",
+          "@type": "Array",
+          "elementSchema": "string",
+          "dtmi:dtdl:property:elementSchema;4": "time"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayPropertyElementSchemaTypeConformanceV4.json b/DTDL/v4/spec/Requirement-ClassArrayPropertyElementSchemaTypeConformanceV4.json
new file mode 100644
index 00000000..01deb6b6
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayPropertyElementSchemaTypeConformanceV4.json
@@ -0,0 +1,658 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_wum;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:jogg_yuzz;1",
+            "elementSchema": "string",
+            "@type": "Array"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_glikk;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:jogg_humpf;1",
+            "name": "jogg_fuddle",
+            "@type": "Command"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:jogg_thnad;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:jogg_snee;1",
+            "name": "jogg_quan",
+            "@type": "Command"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_jogg;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:jogg_floob;1",
+            "name": "jogg_zatz",
+            "schema": "time",
+            "@type": "CommandRequest"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:jogg_vroo;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:jogg_itch;1",
+            "name": "jogg_yekk",
+            "schema": "unsignedByte",
+            "@type": "CommandRequest"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_gamma;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:flunn_alpha;1",
+            "name": "flunn_beta",
+            "schema": "unsignedInteger",
+            "@type": "CommandResponse"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:flunn_eta;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:flunn_epsilon;1",
+            "name": "flunn_zeta",
+            "schema": "unsignedLong",
+            "@type": "CommandResponse"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_mu;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:flunn_iota;1",
+            "name": "flunn_kappa",
+            "schema": {
+              "@id": "dtmi:example:flunn_lambda;1",
+              "@type": "Interface"
+            },
+            "@type": "Component"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:flunn_rho;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:flunn_xi;1",
+            "name": "flunn_omicron",
+            "schema": {
+              "@id": "dtmi:example:flunn_pi;1",
+              "@type": "Interface"
+            },
+            "@type": "Component"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_upsilon;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:flunn_tau;1",
+            "valueSchema": "integer",
+            "@type": "Enum"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_omega;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:flunn_chi;1",
+            "enumValue": 1506,
+            "name": "flunn_psi",
+            "@type": "EnumValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:flunn_humpf;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:flunn_wum;1",
+            "enumValue": 1507,
+            "name": "flunn_um",
+            "@type": "EnumValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_snee;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:flunn_glikk;1",
+            "name": "flunn_nuh",
+            "schema": "unsignedShort",
+            "@type": "Field"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:flunn_floob;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:flunn_thnad;1",
+            "name": "flunn_spazz",
+            "schema": "uuid",
+            "@type": "Field"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_flunn;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:flunn_jogg;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:flunn_vroo;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:flunn_yekk;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_delta;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:itch_alpha;1",
+            "mapKey": {
+              "name": "itch_beta",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "itch_gamma",
+              "schema": "boolean"
+            },
+            "@type": "Map"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_theta;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:itch_zeta;1",
+            "name": "itch_eta",
+            "schema": "string",
+            "@type": "MapKey"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:itch_mu;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:itch_kappa;1",
+            "name": "itch_lambda",
+            "schema": "string",
+            "@type": "MapKey"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_pi;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:itch_xi;1",
+            "name": "itch_omicron",
+            "schema": "byte",
+            "@type": "MapValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:itch_upsilon;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:itch_sigma;1",
+            "name": "itch_tau",
+            "schema": "bytes",
+            "@type": "MapValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_psi;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:itch_chi;1",
+            "@type": "Object"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_um;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:itch_yuzz;1",
+            "name": "itch_wum",
+            "schema": "date",
+            "@type": "Property"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:itch_nuh;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:itch_fuddle;1",
+            "name": "itch_glikk",
+            "schema": "dateTime",
+            "@type": "Property"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_spazz;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:itch_quan;1",
+            "name": "itch_thnad",
+            "@type": "Relationship"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:itch_flunn;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:itch_zatz;1",
+            "name": "itch_jogg",
+            "@type": "Relationship"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_hi;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:itch_yekk;1",
+            "name": "itch_vroo",
+            "schema": "decimal",
+            "@type": "Telemetry"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:yekk_delta;1",
+          "@type": "Array",
+          "elementSchema": {
+            "@id": "dtmi:example:yekk_beta;1",
+            "name": "yekk_gamma",
+            "schema": "double",
+            "@type": "Telemetry"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayPropertyFormallyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Requirement-ClassArrayPropertyFormallyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..00a0737f
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayPropertyFormallyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,80 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_snee;1",
+          "@type": "Array",
+          "elementSchema": "double",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zeta_thnad;1",
+          "@type": "Array",
+          "elementSchema": "duration",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_floob;1",
+          "@type": "Array",
+          "elementSchema": "float",
+          "boolean": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zeta_jogg;1",
+          "@type": "Array",
+          "elementSchema": "integer",
+          "boolean": null
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayPropertyFormallyUndefinedTermV4.json b/DTDL/v4/spec/Requirement-ClassArrayPropertyFormallyUndefinedTermV4.json
new file mode 100644
index 00000000..063b2df5
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayPropertyFormallyUndefinedTermV4.json
@@ -0,0 +1,41 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_iota;1",
+          "@type": "Array",
+          "elementSchema": "unsignedLong",
+          "foobar": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:eta_lambda;1",
+          "@type": "Array",
+          "elementSchema": "unsignedShort",
+          "foobar": {}
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayPropertyInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassArrayPropertyInvalidDtmiV4.json
new file mode 100644
index 00000000..46176854
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayPropertyInvalidDtmiV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_itch;1",
+          "@type": [
+            "Array",
+            "Foobar"
+          ],
+          "elementSchema": "long",
+          "dtmi:foo//bar": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zeta_vroo;1",
+          "@type": [
+            "Array",
+            "Foobar"
+          ],
+          "elementSchema": "short",
+          "dtmi:foo//bar": 626
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayPropertyNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassArrayPropertyNotDtmiNorTermV4.json
new file mode 100644
index 00000000..65ef6167
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayPropertyNotDtmiNorTermV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_alpha;1",
+          "@type": [
+            "Array",
+            "Foobar"
+          ],
+          "elementSchema": "string",
+          "http://foo.com/bar": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:eta_gamma;1",
+          "@type": [
+            "Array",
+            "Foobar"
+          ],
+          "elementSchema": "time",
+          "http://foo.com/bar": true
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayRequiredPropertiesV4.json b/DTDL/v4/spec/Requirement-ClassArrayRequiredPropertiesV4.json
new file mode 100644
index 00000000..794b962b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayRequiredPropertiesV4.json
@@ -0,0 +1,72 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_snee;1",
+          "elementSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:thnad_thnad;1",
+          "elementSchema": "long"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_floob;1",
+          "@type": "Array"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:thnad_jogg;1",
+          "@type": "Array"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayTypeIncludesInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassArrayTypeIncludesInvalidDtmiV4.json
new file mode 100644
index 00000000..72c36573
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayTypeIncludesInvalidDtmiV4.json
@@ -0,0 +1,45 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_upsilon;1",
+          "@type": [
+            "Array",
+            "dtmi:foo//bar"
+          ],
+          "elementSchema": "double"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:floob_chi;1",
+          "@type": [
+            "Array",
+            "dtmi:foo//bar"
+          ],
+          "elementSchema": "duration"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayTypeIncludesMaterialV4.json b/DTDL/v4/spec/Requirement-ClassArrayTypeIncludesMaterialV4.json
new file mode 100644
index 00000000..d4bec6f5
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayTypeIncludesMaterialV4.json
@@ -0,0 +1,156 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_fuddle;1",
+          "elementSchema": "float",
+          "@type": "Array"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_nuh;1",
+          "elementSchema": "integer",
+          "@type": [
+            "Array"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_quan;1",
+          "elementSchema": "long",
+          "@type": "dtmi:dtdl:class:Array;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_spazz;1",
+          "elementSchema": "short",
+          "@type": [
+            "dtmi:dtdl:class:Array;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_zatz;1",
+          "elementSchema": "string",
+          "@type": "Something"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:spazz_flunn;1",
+          "elementSchema": "time",
+          "@type": "Something"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_yekk;1",
+          "elementSchema": "unsignedByte",
+          "@type": [
+            "Something"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:spazz_hi;1",
+          "elementSchema": "unsignedInteger",
+          "@type": [
+            "Something"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayTypeIncludesNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassArrayTypeIncludesNotDtmiNorTermV4.json
new file mode 100644
index 00000000..8e20a535
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayTypeIncludesNotDtmiNorTermV4.json
@@ -0,0 +1,45 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_omega;1",
+          "@type": [
+            "Array",
+            "http://foo.com/bar"
+          ],
+          "elementSchema": "float"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:floob_wum;1",
+          "@type": [
+            "Array",
+            "http://foo.com/bar"
+          ],
+          "elementSchema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassArrayTypeStringOrArrayV4.json b/DTDL/v4/spec/Requirement-ClassArrayTypeStringOrArrayV4.json
new file mode 100644
index 00000000..1ffca1ae
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassArrayTypeStringOrArrayV4.json
@@ -0,0 +1,314 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_itch;1",
+          "elementSchema": "short",
+          "@type": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:thnad_vroo;1",
+          "elementSchema": "string",
+          "@type": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_alpha;1",
+          "elementSchema": "time",
+          "@type": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:spazz_gamma;1",
+          "elementSchema": "unsignedByte",
+          "@type": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_epsilon;1",
+          "elementSchema": "unsignedInteger",
+          "@type": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:spazz_eta;1",
+          "elementSchema": "unsignedLong",
+          "@type": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_iota;1",
+          "elementSchema": "unsignedShort",
+          "@type": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:spazz_lambda;1",
+          "elementSchema": "uuid",
+          "@type": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_nu;1",
+          "elementSchema": "boolean",
+          "@type": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:spazz_omicron;1",
+          "elementSchema": "byte",
+          "@type": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_rho;1",
+          "elementSchema": "bytes",
+          "@type": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:spazz_tau;1",
+          "elementSchema": "date",
+          "@type": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_phi;1",
+          "elementSchema": "dateTime",
+          "@type": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:spazz_psi;1",
+          "elementSchema": "decimal",
+          "@type": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_yuzz;1",
+          "elementSchema": "double",
+          "@type": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:spazz_um;1",
+          "elementSchema": "duration",
+          "@type": [
+            {}
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandContextConformsV4.json b/DTDL/v4/spec/Requirement-ClassCommandContextConformsV4.json
new file mode 100644
index 00000000..b35446a6
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandContextConformsV4.json
@@ -0,0 +1,370 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_kappa;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:lambda_iota;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "lambda_theta",
+            "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_nu;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:lambda_mu;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "lambda_lambda",
+            "@context": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_pi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:lambda_omicron;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "lambda_xi",
+            "@context": [
+              "dtmi:dtdl:extension:quantitativeTypes;1"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_tau;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:lambda_sigma;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "lambda_rho",
+            "@context": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_chi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:lambda_phi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "lambda_upsilon",
+            "@context": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_yuzz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:lambda_omega;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "lambda_psi",
+            "@context": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_humpf;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:lambda_um;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "lambda_wum",
+            "@context": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_nuh;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:lambda_glikk;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "lambda_fuddle",
+            "@context": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_thnad;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:lambda_quan;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "lambda_snee",
+            "@context": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_zatz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:lambda_floob;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "lambda_spazz",
+            "@context": "dtmi:dtdl:extension:quantitativeTypes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_itch;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:lambda_flunn;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "lambda_jogg",
+            "@context": "http://dtdl/extension/quantitativeTypes/1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_hi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:lambda_vroo;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "lambda_yekk",
+            "@context": "quantitativeTypes;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_gamma;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:mu_beta;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "mu_alpha",
+            "@context": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_zeta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:mu_epsilon;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "mu_delta",
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_iota;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:mu_theta;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "mu_eta",
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_mu;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:mu_lambda;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "mu_kappa",
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandIdDuplicateV4.json b/DTDL/v4/spec/Requirement-ClassCommandIdDuplicateV4.json
new file mode 100644
index 00000000..aa5bac00
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandIdDuplicateV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_chi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:omicron_chi;1",
+          "@type": "Interface",
+          "contents": {
+            "@id": "dtmi:example:omicron_chi;1",
+            "@type": "Command",
+            "name": "omicron_psi"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_omega;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:omicron_omega;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:example:omicron_omega;1",
+            "@type": "Command",
+            "name": "omicron_yuzz"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandIdIsDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandIdIsDtmiV4.json
new file mode 100644
index 00000000..70b9a5d8
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandIdIsDtmiV4.json
@@ -0,0 +1,1020 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;7",
+          "@type": "Command",
+          "name": "mu_nu"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;108675309",
+          "@type": "Command",
+          "name": "mu_omicron"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;999999999",
+          "@type": "Command",
+          "name": "mu_rho"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo;1",
+          "@type": "Command",
+          "name": "mu_tau"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar",
+          "@type": "Command",
+          "name": "mu_phi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;3.14",
+          "@type": "Command",
+          "name": "mu_psi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;3.141592",
+          "@type": "Command",
+          "name": "mu_yuzz"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": null,
+          "@type": "Command",
+          "name": "mu_um"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": null,
+          "@type": "Command",
+          "name": "mu_fuddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": 626,
+          "@type": "Command",
+          "name": "mu_nuh"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": 626,
+          "@type": "Command",
+          "name": "mu_quan"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": true,
+          "@type": "Command",
+          "name": "mu_spazz"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": true,
+          "@type": "Command",
+          "name": "mu_zatz"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": {
+            "@value": "dtmi:apparently:valid:identifier;3"
+          },
+          "@type": "Command",
+          "name": "mu_flunn"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": {
+            "@value": "dtmi:apparently:valid:identifier;3"
+          },
+          "@type": "Command",
+          "name": "mu_yekk"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;0",
+          "@type": "Command",
+          "name": "mu_hi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0",
+          "@type": "Command",
+          "name": "nu_beta"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;0.0",
+          "@type": "Command",
+          "name": "nu_delta"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0.0",
+          "@type": "Command",
+          "name": "nu_zeta"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;1234567890",
+          "@type": "Command",
+          "name": "nu_theta"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;1234567890",
+          "@type": "Command",
+          "name": "nu_kappa"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;1a",
+          "@type": "Command",
+          "name": "nu_mu"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;1a",
+          "@type": "Command",
+          "name": "nu_xi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;3.0",
+          "@type": "Command",
+          "name": "nu_pi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;3.0",
+          "@type": "Command",
+          "name": "nu_sigma"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;3.1415926",
+          "@type": "Command",
+          "name": "nu_upsilon"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;3.1415926",
+          "@type": "Command",
+          "name": "nu_chi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;6.02",
+          "@type": "Command",
+          "name": "nu_omega"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;6.02",
+          "@type": "Command",
+          "name": "nu_wum"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;0.1",
+          "@type": "Command",
+          "name": "nu_humpf"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0.1",
+          "@type": "Command",
+          "name": "nu_glikk"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;01",
+          "@type": "Command",
+          "name": "nu_snee"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;01",
+          "@type": "Command",
+          "name": "nu_thnad"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;",
+          "@type": "Command",
+          "name": "nu_floob"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;",
+          "@type": "Command",
+          "name": "nu_jogg"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:test:invalidId_;1",
+          "@type": "Command",
+          "name": "nu_itch"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:invalidId_;1",
+          "@type": "Command",
+          "name": "nu_vroo"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:test:_invalidUserId;1",
+          "@type": "Command",
+          "name": "xi_alpha"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:_invalidUserId;1",
+          "@type": "Command",
+          "name": "xi_gamma"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:test:1seg;1",
+          "@type": "Command",
+          "name": "xi_epsilon"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:1seg;1",
+          "@type": "Command",
+          "name": "xi_eta"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar.baz;1",
+          "@type": "Command",
+          "name": "xi_iota"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar.baz;1",
+          "@type": "Command",
+          "name": "xi_lambda"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo::bar;1",
+          "@type": "Command",
+          "name": "xi_nu"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo::bar;1",
+          "@type": "Command",
+          "name": "xi_omicron"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "urn:foo:bar:1",
+          "@type": "Command",
+          "name": "xi_rho"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "urn:foo:bar:1",
+          "@type": "Command",
+          "name": "xi_tau"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "http://foo/bar/baz",
+          "@type": "Command",
+          "name": "xi_phi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "http://foo/bar/baz",
+          "@type": "Command",
+          "name": "xi_psi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:;1",
+          "@type": "Command",
+          "name": "xi_yuzz"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:;1",
+          "@type": "Command",
+          "name": "xi_um"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:dtdl:example;1",
+          "@type": "Command",
+          "name": "xi_fuddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:dtdl:example;1",
+          "@type": "Command",
+          "name": "xi_nuh"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:standard:example;1",
+          "@type": "Command",
+          "name": "xi_quan"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:standard:example;1",
+          "@type": "Command",
+          "name": "xi_spazz"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandIdNotArrayV4.json b/DTDL/v4/spec/Requirement-ClassCommandIdNotArrayV4.json
new file mode 100644
index 00000000..e25bdbe7
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandIdNotArrayV4.json
@@ -0,0 +1,289 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;7"
+          ],
+          "@type": "Command",
+          "name": "xi_zatz"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;7"
+          ],
+          "@type": "Command",
+          "name": "xi_flunn"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;108675309"
+          ],
+          "@type": "Command",
+          "name": "xi_yekk"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;108675309"
+          ],
+          "@type": "Command",
+          "name": "xi_hi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;999999999"
+          ],
+          "@type": "Command",
+          "name": "omicron_beta"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;999999999"
+          ],
+          "@type": "Command",
+          "name": "omicron_delta"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo;1"
+          ],
+          "@type": "Command",
+          "name": "omicron_zeta"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo;1"
+          ],
+          "@type": "Command",
+          "name": "omicron_theta"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar"
+          ],
+          "@type": "Command",
+          "name": "omicron_kappa"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar"
+          ],
+          "@type": "Command",
+          "name": "omicron_mu"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;3.14"
+          ],
+          "@type": "Command",
+          "name": "omicron_xi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;3.14"
+          ],
+          "@type": "Command",
+          "name": "omicron_pi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;3.141592"
+          ],
+          "@type": "Command",
+          "name": "omicron_sigma"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;3.141592"
+          ],
+          "@type": "Command",
+          "name": "omicron_upsilon"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandInvalidKeywordsV4.json b/DTDL/v4/spec/Requirement-ClassCommandInvalidKeywordsV4.json
new file mode 100644
index 00000000..e39d2147
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandInvalidKeywordsV4.json
@@ -0,0 +1,150 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "spazz_hi",
+          "@graph": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "floob_beta",
+          "@graph": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "floob_delta",
+          "@value": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "floob_zeta",
+          "@value": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "floob_theta",
+          "@language": "en"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "floob_kappa",
+          "@language": "en"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "floob_mu",
+          "@foobar": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "floob_xi",
+          "@foobar": true
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyCommandTypeSpecificValuesV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyCommandTypeSpecificValuesV4.json
new file mode 100644
index 00000000..962ebbb1
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyCommandTypeSpecificValuesV4.json
@@ -0,0 +1,2494 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omicron_humpf",
+          "commandType": "asynchronous"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omicron_glikk",
+          "commandType": [
+            "asynchronous"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omicron_snee",
+          "commandType": "dtmi:dtdl:instance:CommandType:asynchronous;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omicron_thnad",
+          "commandType": [
+            "dtmi:dtdl:instance:CommandType:asynchronous;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omicron_floob",
+          "commandType": [
+            "asynchronous",
+            "dtmi:dtdl:instance:CommandType:asynchronous;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "omicron_jogg",
+          "commandType": [
+            "asynchronous",
+            "dtmi:dtdl:instance:CommandType:asynchronous;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omicron_itch",
+          "commandType": "synchronous"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omicron_vroo",
+          "commandType": [
+            "synchronous"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_alpha",
+          "commandType": "dtmi:dtdl:instance:CommandType:synchronous;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_gamma",
+          "commandType": [
+            "dtmi:dtdl:instance:CommandType:synchronous;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_epsilon",
+          "commandType": [
+            "synchronous",
+            "dtmi:dtdl:instance:CommandType:synchronous;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "pi_eta",
+          "commandType": [
+            "synchronous",
+            "dtmi:dtdl:instance:CommandType:synchronous;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_iota",
+          "commandType": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_lambda",
+          "commandType": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "pi_nu",
+          "commandType": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_omicron",
+          "commandType": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "pi_rho",
+          "commandType": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_tau",
+          "commandType": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "pi_phi",
+          "commandType": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_psi",
+          "commandType": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "pi_yuzz",
+          "commandType": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_um",
+          "commandType": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "pi_fuddle",
+          "commandType": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_nuh",
+          "commandType": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "pi_quan",
+          "commandType": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_spazz",
+          "commandType": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "pi_zatz",
+          "commandType": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_flunn",
+          "commandType": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "pi_yekk",
+          "commandType": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_hi",
+          "commandType": "boolean"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "rho_beta",
+          "commandType": "boolean"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "rho_delta",
+          "commandType": "dtmi:dtdl:instance:Schema:boolean;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "rho_zeta",
+          "commandType": "dtmi:dtdl:instance:Schema:boolean;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "rho_theta",
+          "commandType": "byte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "rho_kappa",
+          "commandType": "byte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "rho_mu",
+          "commandType": "dtmi:dtdl:instance:Schema:byte;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "rho_xi",
+          "commandType": "dtmi:dtdl:instance:Schema:byte;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "rho_pi",
+          "commandType": "bytes"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "rho_sigma",
+          "commandType": "bytes"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "rho_upsilon",
+          "commandType": "dtmi:dtdl:instance:Schema:bytes;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "rho_chi",
+          "commandType": "dtmi:dtdl:instance:Schema:bytes;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "rho_omega",
+          "commandType": "date"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "rho_wum",
+          "commandType": "date"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "rho_humpf",
+          "commandType": "dtmi:dtdl:instance:Schema:date;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "rho_glikk",
+          "commandType": "dtmi:dtdl:instance:Schema:date;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "rho_snee",
+          "commandType": "dateTime"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "rho_thnad",
+          "commandType": "dateTime"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "rho_floob",
+          "commandType": "dtmi:dtdl:instance:Schema:dateTime;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "rho_jogg",
+          "commandType": "dtmi:dtdl:instance:Schema:dateTime;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "rho_itch",
+          "commandType": "decimal"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "rho_vroo",
+          "commandType": "decimal"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_alpha",
+          "commandType": "dtmi:dtdl:instance:Schema:decimal;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "sigma_gamma",
+          "commandType": "dtmi:dtdl:instance:Schema:decimal;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_epsilon",
+          "commandType": "double"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "sigma_eta",
+          "commandType": "double"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_iota",
+          "commandType": "dtmi:dtdl:instance:Schema:double;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "sigma_lambda",
+          "commandType": "dtmi:dtdl:instance:Schema:double;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_nu",
+          "commandType": "duration"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "sigma_omicron",
+          "commandType": "duration"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_rho",
+          "commandType": "dtmi:dtdl:instance:Schema:duration;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "sigma_tau",
+          "commandType": "dtmi:dtdl:instance:Schema:duration;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_phi",
+          "commandType": "float"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "sigma_psi",
+          "commandType": "float"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_yuzz",
+          "commandType": "dtmi:dtdl:instance:Schema:float;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "sigma_um",
+          "commandType": "dtmi:dtdl:instance:Schema:float;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_fuddle",
+          "commandType": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "sigma_nuh",
+          "commandType": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_quan",
+          "commandType": "dtmi:dtdl:instance:Schema:integer;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "sigma_spazz",
+          "commandType": "dtmi:dtdl:instance:Schema:integer;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_zatz",
+          "commandType": "long"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "sigma_flunn",
+          "commandType": "long"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_yekk",
+          "commandType": "dtmi:dtdl:instance:Schema:long;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "sigma_hi",
+          "commandType": "dtmi:dtdl:instance:Schema:long;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_beta",
+          "commandType": "short"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "tau_delta",
+          "commandType": "short"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_zeta",
+          "commandType": "dtmi:dtdl:instance:Schema:short;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "tau_theta",
+          "commandType": "dtmi:dtdl:instance:Schema:short;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_kappa",
+          "commandType": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "tau_mu",
+          "commandType": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_xi",
+          "commandType": "dtmi:dtdl:instance:Schema:string;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "tau_pi",
+          "commandType": "dtmi:dtdl:instance:Schema:string;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_sigma",
+          "commandType": "time"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "tau_upsilon",
+          "commandType": "time"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_chi",
+          "commandType": "dtmi:dtdl:instance:Schema:time;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "tau_omega",
+          "commandType": "dtmi:dtdl:instance:Schema:time;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_wum",
+          "commandType": "unsignedByte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "tau_humpf",
+          "commandType": "unsignedByte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_glikk",
+          "commandType": "dtmi:dtdl:instance:Schema:unsignedByte;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "tau_snee",
+          "commandType": "dtmi:dtdl:instance:Schema:unsignedByte;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_thnad",
+          "commandType": "unsignedInteger"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "tau_floob",
+          "commandType": "unsignedInteger"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_jogg",
+          "commandType": "dtmi:dtdl:instance:Schema:unsignedInteger;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "tau_itch",
+          "commandType": "dtmi:dtdl:instance:Schema:unsignedInteger;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_vroo",
+          "commandType": "unsignedLong"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "upsilon_alpha",
+          "commandType": "unsignedLong"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "upsilon_gamma",
+          "commandType": "dtmi:dtdl:instance:Schema:unsignedLong;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "upsilon_epsilon",
+          "commandType": "dtmi:dtdl:instance:Schema:unsignedLong;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "upsilon_eta",
+          "commandType": "unsignedShort"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "upsilon_iota",
+          "commandType": "unsignedShort"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "upsilon_lambda",
+          "commandType": "dtmi:dtdl:instance:Schema:unsignedShort;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "upsilon_nu",
+          "commandType": "dtmi:dtdl:instance:Schema:unsignedShort;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "upsilon_omicron",
+          "commandType": "uuid"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "upsilon_rho",
+          "commandType": "uuid"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "upsilon_tau",
+          "commandType": "dtmi:dtdl:instance:Schema:uuid;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "upsilon_phi",
+          "commandType": "dtmi:dtdl:instance:Schema:uuid;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "upsilon_psi",
+          "commandType": "lineString"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "upsilon_yuzz",
+          "commandType": "lineString"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "upsilon_um",
+          "commandType": "dtmi:standard:schema:geospatial:lineString;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "upsilon_fuddle",
+          "commandType": "dtmi:standard:schema:geospatial:lineString;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "upsilon_nuh",
+          "commandType": "multiLineString"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "upsilon_quan",
+          "commandType": "multiLineString"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "upsilon_spazz",
+          "commandType": "dtmi:standard:schema:geospatial:multiLineString;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "upsilon_zatz",
+          "commandType": "dtmi:standard:schema:geospatial:multiLineString;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "upsilon_flunn",
+          "commandType": "multiPoint"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "upsilon_yekk",
+          "commandType": "multiPoint"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "upsilon_hi",
+          "commandType": "dtmi:standard:schema:geospatial:multiPoint;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "phi_beta",
+          "commandType": "dtmi:standard:schema:geospatial:multiPoint;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "phi_delta",
+          "commandType": "multiPolygon"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "phi_zeta",
+          "commandType": "multiPolygon"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "phi_theta",
+          "commandType": "dtmi:standard:schema:geospatial:multiPolygon;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "phi_kappa",
+          "commandType": "dtmi:standard:schema:geospatial:multiPolygon;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "phi_mu",
+          "commandType": "point"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "phi_xi",
+          "commandType": "point"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "phi_pi",
+          "commandType": "dtmi:standard:schema:geospatial:point;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "phi_sigma",
+          "commandType": "dtmi:standard:schema:geospatial:point;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "phi_upsilon",
+          "commandType": "polygon"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "phi_chi",
+          "commandType": "polygon"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "phi_omega",
+          "commandType": "dtmi:standard:schema:geospatial:polygon;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "phi_wum",
+          "commandType": "dtmi:standard:schema:geospatial:polygon;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "phi_humpf",
+          "commandType": "scaledDecimal"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "phi_glikk",
+          "commandType": "scaledDecimal"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "phi_snee",
+          "commandType": "dtmi:standard:schema:scaledDecimal;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "phi_thnad",
+          "commandType": "dtmi:standard:schema:scaledDecimal;4"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyCommandTypeTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyCommandTypeTermAndDtmiV4.json
new file mode 100644
index 00000000..961a6816
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyCommandTypeTermAndDtmiV4.json
@@ -0,0 +1,41 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "commandType": "asynchronous",
+          "dtmi:dtdl:property:commandType;4": "asynchronous",
+          "name": "phi_vroo"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "commandType": "asynchronous",
+          "dtmi:dtdl:property:commandType;4": "asynchronous",
+          "name": "chi_alpha"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyCommentStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyCommentStringLengthV4.json
new file mode 100644
index 00000000..5e39e666
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyCommentStringLengthV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_beta",
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_delta",
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "psi_zeta",
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyCommentStringV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyCommentStringV4.json
new file mode 100644
index 00000000..8d9dab9c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyCommentStringV4.json
@@ -0,0 +1,414 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_gamma",
+          "comment": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_epsilon",
+          "comment": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_eta",
+          "comment": {
+            "@value": "hello",
+            "@type": "xsd:string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_iota",
+          "comment": [
+            {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_lambda",
+          "comment": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_nu",
+          "comment": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "chi_omicron",
+          "comment": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_rho",
+          "comment": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "chi_tau",
+          "comment": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_phi",
+          "comment": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "chi_psi",
+          "comment": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_yuzz",
+          "comment": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "chi_um",
+          "comment": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_fuddle",
+          "comment": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "chi_nuh",
+          "comment": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_quan",
+          "comment": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "chi_spazz",
+          "comment": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_zatz",
+          "comment": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "chi_flunn",
+          "comment": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_yekk",
+          "comment": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "chi_hi",
+          "comment": [
+            {}
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyCommentTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyCommentTermAndDtmiV4.json
new file mode 100644
index 00000000..40a84462
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyCommentTermAndDtmiV4.json
@@ -0,0 +1,41 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "comment": "psi_rho",
+          "dtmi:dtdl:property:comment;4": "psi_sigma",
+          "name": "psi_tau"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "comment": "psi_phi",
+          "dtmi:dtdl:property:comment;4": "psi_chi",
+          "name": "psi_psi"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyDescriptionLangStringV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyDescriptionLangStringV4.json
new file mode 100644
index 00000000..cc60cc7f
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyDescriptionLangStringV4.json
@@ -0,0 +1,482 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_yuzz",
+          "description": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_um",
+          "description": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_fuddle",
+          "description": {
+            "en": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_nuh",
+          "description": [
+            {
+              "@value": "hello",
+              "@language": "en"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_quan",
+          "description": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_spazz",
+          "description": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_zatz",
+          "description": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "psi_flunn",
+          "description": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_yekk",
+          "description": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "psi_hi",
+          "description": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_beta",
+          "description": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "omega_delta",
+          "description": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_zeta",
+          "description": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "omega_theta",
+          "description": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_kappa",
+          "description": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "omega_mu",
+          "description": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_xi",
+          "description": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "omega_pi",
+          "description": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_sigma",
+          "description": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "omega_upsilon",
+          "description": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_chi",
+          "description": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "omega_omega",
+          "description": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_wum",
+          "description": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "omega_humpf",
+          "description": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyDescriptionStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyDescriptionStringLengthV4.json
new file mode 100644
index 00000000..c21c8d85
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyDescriptionStringLengthV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_glikk",
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_snee",
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "omega_thnad",
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyDescriptionTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyDescriptionTermAndDtmiV4.json
new file mode 100644
index 00000000..c18d9198
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyDescriptionTermAndDtmiV4.json
@@ -0,0 +1,49 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "description": [
+            "yuzz_beta"
+          ],
+          "dtmi:dtdl:property:description;4": [
+            "yuzz_gamma"
+          ],
+          "name": "yuzz_delta"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "description": [
+            "yuzz_zeta"
+          ],
+          "dtmi:dtdl:property:description;4": [
+            "yuzz_eta"
+          ],
+          "name": "yuzz_theta"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyDisplayNameLangStringV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyDisplayNameLangStringV4.json
new file mode 100644
index 00000000..8b91d23d
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyDisplayNameLangStringV4.json
@@ -0,0 +1,482 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_kappa",
+          "displayName": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_mu",
+          "displayName": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_xi",
+          "displayName": {
+            "en": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_pi",
+          "displayName": [
+            {
+              "@value": "hello",
+              "@language": "en"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_sigma",
+          "displayName": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_upsilon",
+          "displayName": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_chi",
+          "displayName": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "yuzz_omega",
+          "displayName": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_wum",
+          "displayName": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "yuzz_humpf",
+          "displayName": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_glikk",
+          "displayName": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "yuzz_snee",
+          "displayName": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_thnad",
+          "displayName": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "yuzz_floob",
+          "displayName": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_jogg",
+          "displayName": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "yuzz_itch",
+          "displayName": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_vroo",
+          "displayName": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "wum_alpha",
+          "displayName": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "wum_gamma",
+          "displayName": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "wum_epsilon",
+          "displayName": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "wum_eta",
+          "displayName": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "wum_iota",
+          "displayName": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "wum_lambda",
+          "displayName": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "wum_nu",
+          "displayName": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyDisplayNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyDisplayNameStringLengthV4.json
new file mode 100644
index 00000000..ccd3aad0
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyDisplayNameStringLengthV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "wum_omicron",
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "wum_rho",
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "wum_tau",
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyDisplayNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyDisplayNameTermAndDtmiV4.json
new file mode 100644
index 00000000..3445364e
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyDisplayNameTermAndDtmiV4.json
@@ -0,0 +1,49 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "displayName": [
+            "wum_glikk"
+          ],
+          "dtmi:dtdl:property:displayName;4": [
+            "wum_nuh"
+          ],
+          "name": "wum_snee"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "displayName": [
+            "wum_thnad"
+          ],
+          "dtmi:dtdl:property:displayName;4": [
+            "wum_spazz"
+          ],
+          "name": "wum_floob"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyFormallyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyFormallyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..debd5e08
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyFormallyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,76 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "floob_omega",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "floob_wum",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "floob_humpf",
+          "boolean": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "floob_glikk",
+          "boolean": null
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyFormallyUndefinedTermV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyFormallyUndefinedTermV4.json
new file mode 100644
index 00000000..eb1c3383
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyFormallyUndefinedTermV4.json
@@ -0,0 +1,39 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_alpha",
+          "foobar": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "zatz_gamma",
+          "foobar": {}
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyInvalidDtmiV4.json
new file mode 100644
index 00000000..2b4ddfa5
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyInvalidDtmiV4.json
@@ -0,0 +1,45 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Command",
+            "Foobar"
+          ],
+          "name": "floob_snee",
+          "dtmi:foo//bar": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Command",
+            "Foobar"
+          ],
+          "name": "floob_thnad",
+          "dtmi:foo//bar": 626
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyNamePatternV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyNamePatternV4.json
new file mode 100644
index 00000000..029dde72
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyNamePatternV4.json
@@ -0,0 +1,437 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "EARTH"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "Air"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "fire"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "hello_world"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "Anarchy99"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "23skidoo"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "23skidoo"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "626"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "626"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "goodbye-world"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "goodbye-world"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "_haha"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "_haha"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "toodaloo_"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "toodaloo_"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pro:con"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "pro:con"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "mish/mash"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "mish/mash"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "#tag"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "#tag"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "@tweet"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "@tweet"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "$money"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "$money"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyNameStringLengthV4.json
new file mode 100644
index 00000000..fa506f5c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyNameStringLengthV4.json
@@ -0,0 +1,54 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyNameStringV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyNameStringV4.json
new file mode 100644
index 00000000..618a8888
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyNameStringV4.json
@@ -0,0 +1,411 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": {
+            "@value": "hello",
+            "@type": "xsd:string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": [
+            {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": []
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyNameTermAndDtmiV4.json
new file mode 100644
index 00000000..a446067d
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyNameTermAndDtmiV4.json
@@ -0,0 +1,39 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_um",
+          "dtmi:dtdl:property:name;4": "kappa_humpf"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "kappa_glikk",
+          "dtmi:dtdl:property:name;4": "kappa_nuh"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyNameUniqueAmongInterfaceContentsV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyNameUniqueAmongInterfaceContentsV4.json
new file mode 100644
index 00000000..a13b558a
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyNameUniqueAmongInterfaceContentsV4.json
@@ -0,0 +1,74 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_sigma;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Command",
+            "name": "delta_theta"
+          },
+          {
+            "@type": "Command",
+            "name": "delta_iota"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_tau;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Command",
+            "name": "delta_theta"
+          },
+          {
+            "@type": "Command",
+            "name": "delta_theta"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:kappa_upsilon;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Command",
+            "name": "delta_theta"
+          },
+          {
+            "@type": "Command",
+            "name": "delta_theta"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyNotDtmiNorTermV4.json
new file mode 100644
index 00000000..dd4af334
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyNotDtmiNorTermV4.json
@@ -0,0 +1,45 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Command",
+            "Foobar"
+          ],
+          "name": "floob_floob",
+          "http://foo.com/bar": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Command",
+            "Foobar"
+          ],
+          "name": "floob_jogg",
+          "http://foo.com/bar": true
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyRequestElementV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyRequestElementV4.json
new file mode 100644
index 00000000..a351563d
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyRequestElementV4.json
@@ -0,0 +1,313 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_vroo;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:wum_yekk;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "wum_itch",
+            "request": {
+              "@id": "dtmi:example:wum_jogg;1",
+              "name": "wum_flunn",
+              "schema": "uuid"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_delta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_gamma;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "um_beta",
+            "request": [
+              {
+                "@id": "dtmi:example:wum_hi;1",
+                "name": "um_alpha",
+                "schema": "boolean"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_eta;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Command",
+            "name": "um_zeta",
+            "request": {
+              "@id": "dtmi:ex:dependentRef;1",
+              "name": "um_epsilon",
+              "schema": "byte"
+            }
+          },
+          {
+            "@type": "Command",
+            "name": "um_theta",
+            "request": "dtmi:ex:dependentRef;1"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_lambda;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Command",
+            "name": "um_kappa",
+            "request": {
+              "@id": "dtmi:ex:dependentRef;1",
+              "name": "um_iota",
+              "schema": "bytes"
+            }
+          },
+          {
+            "@type": "Command",
+            "name": "um_mu",
+            "request": [
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_pi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_omicron;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "um_xi",
+            "request": {
+              "@id": "dtmi:example:um_nu;1",
+              "@type": "CommandRequest",
+              "@context": "dtmi:dtdl:context;2"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_upsilon;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_tau;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Command",
+            "name": "um_sigma",
+            "request": {
+              "@id": "dtmi:example:um_rho;1",
+              "@type": "CommandRequest",
+              "@context": "dtmi:dtdl:context;2"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_yuzz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_omega;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "um_psi",
+            "request": {
+              "@id": "dtmi:example:um_phi;1",
+              "name": "um_chi",
+              "schema": "string",
+              "@context": "dtmi:dtdl:context;3"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_glikk;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_fuddle;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Command",
+            "name": "um_humpf",
+            "request": {
+              "@id": "dtmi:example:um_wum;1",
+              "name": "um_um",
+              "schema": "time",
+              "@context": "dtmi:dtdl:context;3"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_quan;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_snee;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "um_nuh",
+            "request": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_itch;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_flunn;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "um_jogg",
+            "request": [
+              {
+                "@id": "dtmi:example:um_thnad;1",
+                "name": "um_spazz",
+                "schema": "decimal"
+              },
+              {
+                "@id": "dtmi:example:um_floob;1",
+                "name": "um_zatz",
+                "schema": "double"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_delta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:humpf_gamma;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Command",
+            "name": "humpf_beta",
+            "request": [
+              {
+                "@id": "dtmi:example:um_yekk;1",
+                "name": "um_vroo",
+                "schema": "duration"
+              },
+              {
+                "@id": "dtmi:example:um_hi;1",
+                "name": "humpf_alpha",
+                "schema": "float"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyRequestTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyRequestTermAndDtmiV4.json
new file mode 100644
index 00000000..03b0db0a
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyRequestTermAndDtmiV4.json
@@ -0,0 +1,53 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nuh_lambda",
+          "request": {
+            "name": "nuh_mu",
+            "schema": "float"
+          },
+          "dtmi:dtdl:property:request;4": {
+            "name": "nuh_nu",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "nuh_omicron",
+          "request": {
+            "name": "nuh_pi",
+            "schema": "long"
+          },
+          "dtmi:dtdl:property:request;4": {
+            "name": "nuh_rho",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyRequestTypeConformanceV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyRequestTypeConformanceV4.json
new file mode 100644
index 00000000..0df18928
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyRequestTypeConformanceV4.json
@@ -0,0 +1,732 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "humpf_mu",
+          "request": {
+            "@id": "dtmi:example:humpf_lambda;1",
+            "elementSchema": "integer",
+            "@type": "Array"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "humpf_omicron",
+          "request": {
+            "@id": "dtmi:example:humpf_xi;1",
+            "elementSchema": "long",
+            "@type": "Array"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "humpf_tau",
+          "request": {
+            "@id": "dtmi:example:humpf_rho;1",
+            "name": "humpf_sigma",
+            "@type": "Command"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "humpf_psi",
+          "request": {
+            "@id": "dtmi:example:humpf_phi;1",
+            "name": "humpf_chi",
+            "@type": "Command"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "humpf_um",
+          "request": {
+            "@id": "dtmi:example:humpf_yuzz;1",
+            "name": "humpf_wum",
+            "schema": "short",
+            "@type": "CommandRequest"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "humpf_nuh",
+          "request": {
+            "@id": "dtmi:example:humpf_fuddle;1",
+            "name": "humpf_glikk",
+            "schema": "string",
+            "@type": "CommandResponse"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "humpf_spazz",
+          "request": {
+            "@id": "dtmi:example:humpf_quan;1",
+            "name": "humpf_thnad",
+            "schema": "time",
+            "@type": "CommandResponse"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "humpf_itch",
+          "request": {
+            "@id": "dtmi:example:humpf_zatz;1",
+            "name": "humpf_jogg",
+            "schema": {
+              "@id": "dtmi:example:humpf_flunn;1",
+              "@type": "Interface"
+            },
+            "@type": "Component"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "fuddle_beta",
+          "request": {
+            "@id": "dtmi:example:humpf_vroo;1",
+            "name": "humpf_hi",
+            "schema": {
+              "@id": "dtmi:example:fuddle_alpha;1",
+              "@type": "Interface"
+            },
+            "@type": "Component"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "fuddle_epsilon",
+          "request": {
+            "@id": "dtmi:example:fuddle_delta;1",
+            "valueSchema": "integer",
+            "@type": "Enum"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "fuddle_theta",
+          "request": {
+            "@id": "dtmi:example:fuddle_eta;1",
+            "valueSchema": "integer",
+            "@type": "Enum"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "fuddle_mu",
+          "request": {
+            "@id": "dtmi:example:fuddle_kappa;1",
+            "enumValue": 1508,
+            "name": "fuddle_lambda",
+            "@type": "EnumValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "fuddle_pi",
+          "request": {
+            "@id": "dtmi:example:fuddle_xi;1",
+            "enumValue": 1509,
+            "name": "fuddle_omicron",
+            "@type": "EnumValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "fuddle_upsilon",
+          "request": {
+            "@id": "dtmi:example:fuddle_sigma;1",
+            "name": "fuddle_tau",
+            "schema": "unsignedByte",
+            "@type": "Field"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "fuddle_omega",
+          "request": {
+            "@id": "dtmi:example:fuddle_chi;1",
+            "name": "fuddle_psi",
+            "schema": "unsignedInteger",
+            "@type": "Field"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "fuddle_um",
+          "request": {
+            "@id": "dtmi:example:fuddle_wum;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "fuddle_glikk",
+          "request": {
+            "@id": "dtmi:example:fuddle_fuddle;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "fuddle_spazz",
+          "request": {
+            "@id": "dtmi:example:fuddle_snee;1",
+            "mapKey": {
+              "name": "fuddle_quan",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "fuddle_thnad",
+              "schema": "unsignedLong"
+            },
+            "@type": "Map"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "fuddle_itch",
+          "request": {
+            "@id": "dtmi:example:fuddle_zatz;1",
+            "mapKey": {
+              "name": "fuddle_jogg",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "fuddle_flunn",
+              "schema": "unsignedShort"
+            },
+            "@type": "Map"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "glikk_alpha",
+          "request": {
+            "@id": "dtmi:example:fuddle_vroo;1",
+            "name": "fuddle_hi",
+            "schema": "string",
+            "@type": "MapKey"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "glikk_epsilon",
+          "request": {
+            "@id": "dtmi:example:glikk_gamma;1",
+            "name": "glikk_delta",
+            "schema": "string",
+            "@type": "MapKey"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "glikk_iota",
+          "request": {
+            "@id": "dtmi:example:glikk_eta;1",
+            "name": "glikk_theta",
+            "schema": "uuid",
+            "@type": "MapValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "glikk_nu",
+          "request": {
+            "@id": "dtmi:example:glikk_lambda;1",
+            "name": "glikk_mu",
+            "schema": "boolean",
+            "@type": "MapValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "glikk_pi",
+          "request": {
+            "@id": "dtmi:example:glikk_omicron;1",
+            "@type": "Object"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "glikk_tau",
+          "request": {
+            "@id": "dtmi:example:glikk_sigma;1",
+            "@type": "Object"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "glikk_psi",
+          "request": {
+            "@id": "dtmi:example:glikk_phi;1",
+            "name": "glikk_chi",
+            "schema": "byte",
+            "@type": "Property"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "glikk_um",
+          "request": {
+            "@id": "dtmi:example:glikk_yuzz;1",
+            "name": "glikk_wum",
+            "schema": "bytes",
+            "@type": "Property"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "glikk_nuh",
+          "request": {
+            "@id": "dtmi:example:glikk_fuddle;1",
+            "name": "glikk_glikk",
+            "@type": "Relationship"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "glikk_spazz",
+          "request": {
+            "@id": "dtmi:example:glikk_quan;1",
+            "name": "glikk_thnad",
+            "@type": "Relationship"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "glikk_flunn",
+          "request": {
+            "@id": "dtmi:example:glikk_zatz;1",
+            "name": "glikk_jogg",
+            "schema": "date",
+            "@type": "Telemetry"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "glikk_hi",
+          "request": {
+            "@id": "dtmi:example:glikk_yekk;1",
+            "name": "glikk_vroo",
+            "schema": "dateTime",
+            "@type": "Telemetry"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyResponseElementV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyResponseElementV4.json
new file mode 100644
index 00000000..6dd20386
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyResponseElementV4.json
@@ -0,0 +1,313 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_psi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:nuh_chi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "nuh_phi",
+            "response": {
+              "@id": "dtmi:example:nuh_tau;1",
+              "name": "nuh_upsilon",
+              "schema": "string"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_humpf;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:nuh_um;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "nuh_wum",
+            "response": [
+              {
+                "@id": "dtmi:example:nuh_omega;1",
+                "name": "nuh_yuzz",
+                "schema": "time"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_nuh;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Command",
+            "name": "nuh_glikk",
+            "response": {
+              "@id": "dtmi:ex:dependentRef;1",
+              "name": "nuh_fuddle",
+              "schema": "unsignedByte"
+            }
+          },
+          {
+            "@type": "Command",
+            "name": "nuh_snee",
+            "response": "dtmi:ex:dependentRef;1"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_spazz;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Command",
+            "name": "nuh_thnad",
+            "response": {
+              "@id": "dtmi:ex:dependentRef;1",
+              "name": "nuh_quan",
+              "schema": "unsignedInteger"
+            }
+          },
+          {
+            "@type": "Command",
+            "name": "nuh_floob",
+            "response": [
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_itch;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:nuh_flunn;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "nuh_jogg",
+            "response": {
+              "@id": "dtmi:example:nuh_zatz;1",
+              "@type": "CommandResponse",
+              "@context": "dtmi:dtdl:context;2"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_alpha;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:nuh_hi;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Command",
+            "name": "nuh_vroo",
+            "response": {
+              "@id": "dtmi:example:nuh_yekk;1",
+              "@type": "CommandResponse",
+              "@context": "dtmi:dtdl:context;2"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_zeta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:snee_epsilon;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "snee_delta",
+            "response": {
+              "@id": "dtmi:example:snee_beta;1",
+              "name": "snee_gamma",
+              "schema": "boolean",
+              "@context": "dtmi:dtdl:context;3"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_lambda;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:snee_kappa;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Command",
+            "name": "snee_iota",
+            "response": {
+              "@id": "dtmi:example:snee_eta;1",
+              "name": "snee_theta",
+              "schema": "date",
+              "@context": "dtmi:dtdl:context;3"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_xi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:snee_nu;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "snee_mu",
+            "response": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_phi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:snee_upsilon;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "snee_tau",
+            "response": [
+              {
+                "@id": "dtmi:example:snee_omicron;1",
+                "name": "snee_pi",
+                "schema": "uuid"
+              },
+              {
+                "@id": "dtmi:example:snee_rho;1",
+                "name": "snee_sigma",
+                "schema": "boolean"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_humpf;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:snee_um;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Command",
+            "name": "snee_wum",
+            "response": [
+              {
+                "@id": "dtmi:example:snee_chi;1",
+                "name": "snee_psi",
+                "schema": "byte"
+              },
+              {
+                "@id": "dtmi:example:snee_omega;1",
+                "name": "snee_yuzz",
+                "schema": "bytes"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyResponseTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyResponseTermAndDtmiV4.json
new file mode 100644
index 00000000..e674aefa
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyResponseTermAndDtmiV4.json
@@ -0,0 +1,53 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "spazz_spazz",
+          "response": {
+            "name": "spazz_floob",
+            "schema": "bytes"
+          },
+          "dtmi:dtdl:property:response;4": {
+            "name": "spazz_zatz",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "spazz_flunn",
+          "response": {
+            "name": "spazz_itch",
+            "schema": "dateTime"
+          },
+          "dtmi:dtdl:property:response;4": {
+            "name": "spazz_yekk",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandPropertyResponseTypeConformanceV4.json b/DTDL/v4/spec/Requirement-ClassCommandPropertyResponseTypeConformanceV4.json
new file mode 100644
index 00000000..c7cb21d7
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandPropertyResponseTypeConformanceV4.json
@@ -0,0 +1,732 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "snee_floob",
+          "response": {
+            "@id": "dtmi:example:snee_spazz;1",
+            "elementSchema": "date",
+            "@type": "Array"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "snee_flunn",
+          "response": {
+            "@id": "dtmi:example:snee_jogg;1",
+            "elementSchema": "dateTime",
+            "@type": "Array"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "snee_hi",
+          "response": {
+            "@id": "dtmi:example:snee_yekk;1",
+            "name": "snee_vroo",
+            "@type": "Command"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "quan_delta",
+          "response": {
+            "@id": "dtmi:example:quan_beta;1",
+            "name": "quan_gamma",
+            "@type": "Command"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "quan_theta",
+          "response": {
+            "@id": "dtmi:example:quan_zeta;1",
+            "name": "quan_eta",
+            "schema": "decimal",
+            "@type": "CommandRequest"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "quan_mu",
+          "response": {
+            "@id": "dtmi:example:quan_kappa;1",
+            "name": "quan_lambda",
+            "schema": "double",
+            "@type": "CommandRequest"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "quan_pi",
+          "response": {
+            "@id": "dtmi:example:quan_xi;1",
+            "name": "quan_omicron",
+            "schema": "duration",
+            "@type": "CommandResponse"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "quan_phi",
+          "response": {
+            "@id": "dtmi:example:quan_sigma;1",
+            "name": "quan_tau",
+            "schema": {
+              "@id": "dtmi:example:quan_upsilon;1",
+              "@type": "Interface"
+            },
+            "@type": "Component"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "quan_wum",
+          "response": {
+            "@id": "dtmi:example:quan_psi;1",
+            "name": "quan_omega",
+            "schema": {
+              "@id": "dtmi:example:quan_yuzz;1",
+              "@type": "Interface"
+            },
+            "@type": "Component"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "quan_fuddle",
+          "response": {
+            "@id": "dtmi:example:quan_humpf;1",
+            "valueSchema": "integer",
+            "@type": "Enum"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "quan_snee",
+          "response": {
+            "@id": "dtmi:example:quan_nuh;1",
+            "valueSchema": "integer",
+            "@type": "Enum"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "quan_floob",
+          "response": {
+            "@id": "dtmi:example:quan_thnad;1",
+            "enumValue": 1510,
+            "name": "quan_spazz",
+            "@type": "EnumValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "quan_itch",
+          "response": {
+            "@id": "dtmi:example:quan_jogg;1",
+            "enumValue": 1511,
+            "name": "quan_flunn",
+            "@type": "EnumValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "thnad_alpha",
+          "response": {
+            "@id": "dtmi:example:quan_vroo;1",
+            "name": "quan_hi",
+            "schema": "float",
+            "@type": "Field"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "thnad_epsilon",
+          "response": {
+            "@id": "dtmi:example:thnad_gamma;1",
+            "name": "thnad_delta",
+            "schema": "integer",
+            "@type": "Field"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "thnad_theta",
+          "response": {
+            "@id": "dtmi:example:thnad_eta;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "thnad_lambda",
+          "response": {
+            "@id": "dtmi:example:thnad_kappa;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "thnad_pi",
+          "response": {
+            "@id": "dtmi:example:thnad_nu;1",
+            "mapKey": {
+              "name": "thnad_xi",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "thnad_omicron",
+              "schema": "long"
+            },
+            "@type": "Map"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "thnad_phi",
+          "response": {
+            "@id": "dtmi:example:thnad_sigma;1",
+            "mapKey": {
+              "name": "thnad_tau",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "thnad_upsilon",
+              "schema": "short"
+            },
+            "@type": "Map"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "thnad_yuzz",
+          "response": {
+            "@id": "dtmi:example:thnad_psi;1",
+            "name": "thnad_omega",
+            "schema": "string",
+            "@type": "MapKey"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "thnad_fuddle",
+          "response": {
+            "@id": "dtmi:example:thnad_um;1",
+            "name": "thnad_humpf",
+            "schema": "string",
+            "@type": "MapKey"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "thnad_quan",
+          "response": {
+            "@id": "dtmi:example:thnad_nuh;1",
+            "name": "thnad_snee",
+            "schema": "string",
+            "@type": "MapValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "thnad_zatz",
+          "response": {
+            "@id": "dtmi:example:thnad_spazz;1",
+            "name": "thnad_floob",
+            "schema": "time",
+            "@type": "MapValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "thnad_itch",
+          "response": {
+            "@id": "dtmi:example:thnad_flunn;1",
+            "@type": "Object"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "thnad_hi",
+          "response": {
+            "@id": "dtmi:example:thnad_vroo;1",
+            "@type": "Object"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "spazz_delta",
+          "response": {
+            "@id": "dtmi:example:spazz_beta;1",
+            "name": "spazz_gamma",
+            "schema": "unsignedByte",
+            "@type": "Property"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "spazz_theta",
+          "response": {
+            "@id": "dtmi:example:spazz_zeta;1",
+            "name": "spazz_eta",
+            "schema": "unsignedInteger",
+            "@type": "Property"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "spazz_mu",
+          "response": {
+            "@id": "dtmi:example:spazz_kappa;1",
+            "name": "spazz_lambda",
+            "@type": "Relationship"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "spazz_pi",
+          "response": {
+            "@id": "dtmi:example:spazz_xi;1",
+            "name": "spazz_omicron",
+            "@type": "Relationship"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "spazz_upsilon",
+          "response": {
+            "@id": "dtmi:example:spazz_sigma;1",
+            "name": "spazz_tau",
+            "schema": "unsignedLong",
+            "@type": "Telemetry"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command",
+          "name": "spazz_omega",
+          "response": {
+            "@id": "dtmi:example:spazz_chi;1",
+            "name": "spazz_psi",
+            "schema": "unsignedShort",
+            "@type": "Telemetry"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestContextConformsV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestContextConformsV4.json
new file mode 100644
index 00000000..7b3a747d
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestContextConformsV4.json
@@ -0,0 +1,434 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_omicron;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:delta_xi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "delta_nu",
+            "request": {
+              "name": "delta_mu",
+              "schema": "double",
+              "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_tau;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:delta_sigma;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "delta_rho",
+            "request": {
+              "name": "delta_pi",
+              "schema": "duration",
+              "@context": []
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_psi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:delta_chi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "delta_phi",
+            "request": {
+              "name": "delta_upsilon",
+              "schema": "float",
+              "@context": [
+                "dtmi:dtdl:extension:quantitativeTypes;1"
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_um;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:delta_wum;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "delta_yuzz",
+            "request": {
+              "name": "delta_omega",
+              "schema": "integer",
+              "@context": null
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_nuh;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:delta_glikk;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "delta_fuddle",
+            "request": {
+              "name": "delta_humpf",
+              "schema": "long",
+              "@context": 626
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_spazz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:delta_thnad;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "delta_quan",
+            "request": {
+              "name": "delta_snee",
+              "schema": "short",
+              "@context": true
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_flunn;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:delta_jogg;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "delta_zatz",
+            "request": {
+              "name": "delta_floob",
+              "schema": "string",
+              "@context": [
+                null
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_hi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:delta_vroo;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "delta_yekk",
+            "request": {
+              "name": "delta_itch",
+              "schema": "time",
+              "@context": [
+                626
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_delta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:epsilon_gamma;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "epsilon_beta",
+            "request": {
+              "name": "epsilon_alpha",
+              "schema": "unsignedByte",
+              "@context": [
+                true
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_theta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:epsilon_eta;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "epsilon_zeta",
+            "request": {
+              "name": "epsilon_epsilon",
+              "schema": "unsignedInteger",
+              "@context": "dtmi:dtdl:extension:quantitativeTypes"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_mu;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:epsilon_lambda;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "epsilon_kappa",
+            "request": {
+              "name": "epsilon_iota",
+              "schema": "unsignedLong",
+              "@context": "http://dtdl/extension/quantitativeTypes/1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_pi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:epsilon_omicron;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "epsilon_xi",
+            "request": {
+              "name": "epsilon_nu",
+              "schema": "unsignedShort",
+              "@context": "quantitativeTypes;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_upsilon;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:epsilon_tau;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "epsilon_sigma",
+            "request": {
+              "name": "epsilon_rho",
+              "schema": "uuid",
+              "@context": {}
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_omega;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:epsilon_psi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "epsilon_chi",
+            "request": {
+              "name": "epsilon_phi",
+              "schema": "boolean",
+              "@context": {
+                "foo": "dtmi:foo:bar;1"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_humpf;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:epsilon_um;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "epsilon_wum",
+            "request": {
+              "name": "epsilon_yuzz",
+              "schema": "byte",
+              "@context": [
+                {}
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_snee;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:epsilon_nuh;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "epsilon_glikk",
+            "request": {
+              "name": "epsilon_fuddle",
+              "schema": "bytes",
+              "@context": [
+                {
+                  "foo": "dtmi:foo:bar;1"
+                }
+              ]
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestIdDuplicateV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestIdDuplicateV4.json
new file mode 100644
index 00000000..bd363993
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestIdDuplicateV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_nu;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:nu_nu;1",
+          "@type": "Interface",
+          "contents": {
+            "@id": "dtmi:example:nu_nu;1",
+            "@type": "Command",
+            "name": "nu_omicron",
+            "request": {
+              "@id": "dtmi:example:nu_nu;1",
+              "name": "nu_xi",
+              "schema": "unsignedLong"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_pi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:nu_pi;1",
+          "@type": "Interface",
+          "contents": {
+            "@id": "dtmi:example:nu_pi;1",
+            "@type": "Command",
+            "name": "nu_sigma",
+            "request": {
+              "@context": "dtmi:undefinedExtension:context;1",
+              "@id": "dtmi:example:nu_pi;1",
+              "name": "nu_rho",
+              "schema": "unsignedShort"
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestIdIsDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestIdIsDtmiV4.json
new file mode 100644
index 00000000..02642ff8
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestIdIsDtmiV4.json
@@ -0,0 +1,1240 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_chi",
+          "request": {
+            "@id": "dtmi:foo:bar;7",
+            "name": "theta_phi",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_yuzz",
+          "request": {
+            "@id": "dtmi:foo:bar;108675309",
+            "name": "theta_omega",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_humpf",
+          "request": {
+            "@id": "dtmi:foo:bar;999999999",
+            "name": "theta_um",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_nuh",
+          "request": {
+            "@id": "dtmi:foo;1",
+            "name": "theta_glikk",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_thnad",
+          "request": {
+            "@id": "dtmi:foo:bar",
+            "name": "theta_quan",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_zatz",
+          "request": {
+            "@id": "dtmi:foo:bar;3.14",
+            "name": "theta_floob",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_itch",
+          "request": {
+            "@id": "dtmi:foo:bar;3.141592",
+            "name": "theta_flunn",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_hi",
+          "request": {
+            "@id": null,
+            "name": "theta_vroo",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_gamma",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": null,
+            "name": "iota_beta",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_zeta",
+          "request": {
+            "@id": 626,
+            "name": "iota_epsilon",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_iota",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": 626,
+            "name": "iota_theta",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_mu",
+          "request": {
+            "@id": true,
+            "name": "iota_lambda",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_omicron",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": true,
+            "name": "iota_xi",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_sigma",
+          "request": {
+            "@id": {
+              "@value": "dtmi:apparently:valid:identifier;3"
+            },
+            "name": "iota_rho",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_phi",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": {
+              "@value": "dtmi:apparently:valid:identifier;3"
+            },
+            "name": "iota_upsilon",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_omega",
+          "request": {
+            "@id": "dtmi:foo:bar;0",
+            "name": "iota_psi",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_um",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;0",
+            "name": "iota_wum",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_glikk",
+          "request": {
+            "@id": "dtmi:foo:bar;0.0",
+            "name": "iota_fuddle",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_quan",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;0.0",
+            "name": "iota_snee",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_floob",
+          "request": {
+            "@id": "dtmi:foo:bar;1234567890",
+            "name": "iota_spazz",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_flunn",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;1234567890",
+            "name": "iota_jogg",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_vroo",
+          "request": {
+            "@id": "dtmi:foo:bar;1a",
+            "name": "iota_yekk",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_beta",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;1a",
+            "name": "kappa_alpha",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_epsilon",
+          "request": {
+            "@id": "dtmi:foo:bar;3.0",
+            "name": "kappa_delta",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_theta",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;3.0",
+            "name": "kappa_eta",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_lambda",
+          "request": {
+            "@id": "dtmi:foo:bar;3.1415926",
+            "name": "kappa_kappa",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_xi",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;3.1415926",
+            "name": "kappa_nu",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_rho",
+          "request": {
+            "@id": "dtmi:foo:bar;6.02",
+            "name": "kappa_pi",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_upsilon",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;6.02",
+            "name": "kappa_tau",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_psi",
+          "request": {
+            "@id": "dtmi:foo:bar;0.1",
+            "name": "kappa_chi",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_wum",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;0.1",
+            "name": "kappa_yuzz",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_fuddle",
+          "request": {
+            "@id": "dtmi:foo:bar;01",
+            "name": "kappa_humpf",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_snee",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;01",
+            "name": "kappa_nuh",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_spazz",
+          "request": {
+            "@id": "dtmi:foo:bar;",
+            "name": "kappa_thnad",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_jogg",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;",
+            "name": "kappa_zatz",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_yekk",
+          "request": {
+            "@id": "dtmi:test:invalidId_;1",
+            "name": "kappa_itch",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "lambda_alpha",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:test:invalidId_;1",
+            "name": "kappa_hi",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "lambda_delta",
+          "request": {
+            "@id": "dtmi:test:_invalidUserId;1",
+            "name": "lambda_gamma",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "lambda_eta",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:test:_invalidUserId;1",
+            "name": "lambda_zeta",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "lambda_kappa",
+          "request": {
+            "@id": "dtmi:test:1seg;1",
+            "name": "lambda_iota",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "lambda_nu",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:test:1seg;1",
+            "name": "lambda_mu",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "lambda_pi",
+          "request": {
+            "@id": "dtmi:foo:bar.baz;1",
+            "name": "lambda_omicron",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "lambda_tau",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar.baz;1",
+            "name": "lambda_sigma",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "lambda_chi",
+          "request": {
+            "@id": "dtmi:foo::bar;1",
+            "name": "lambda_phi",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "lambda_yuzz",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo::bar;1",
+            "name": "lambda_omega",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "lambda_humpf",
+          "request": {
+            "@id": "urn:foo:bar:1",
+            "name": "lambda_um",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "lambda_nuh",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "urn:foo:bar:1",
+            "name": "lambda_glikk",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "lambda_thnad",
+          "request": {
+            "@id": "http://foo/bar/baz",
+            "name": "lambda_quan",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "lambda_zatz",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "http://foo/bar/baz",
+            "name": "lambda_floob",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "lambda_itch",
+          "request": {
+            "@id": "dtmi:;1",
+            "name": "lambda_flunn",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "lambda_hi",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:;1",
+            "name": "lambda_vroo",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "mu_gamma",
+          "request": {
+            "@id": "dtmi:dtdl:example;1",
+            "name": "mu_beta",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "mu_zeta",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:dtdl:example;1",
+            "name": "mu_epsilon",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "mu_iota",
+          "request": {
+            "@id": "dtmi:standard:example;1",
+            "name": "mu_theta",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "mu_mu",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:standard:example;1",
+            "name": "mu_lambda",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestIdNotArrayV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestIdNotArrayV4.json
new file mode 100644
index 00000000..c456b64d
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestIdNotArrayV4.json
@@ -0,0 +1,345 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "mu_omicron",
+          "request": {
+            "@id": [
+              "dtmi:foo:bar;7"
+            ],
+            "name": "mu_xi",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "mu_sigma",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;7"
+            ],
+            "name": "mu_rho",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "mu_phi",
+          "request": {
+            "@id": [
+              "dtmi:foo:bar;108675309"
+            ],
+            "name": "mu_upsilon",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "mu_omega",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;108675309"
+            ],
+            "name": "mu_psi",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "mu_um",
+          "request": {
+            "@id": [
+              "dtmi:foo:bar;999999999"
+            ],
+            "name": "mu_wum",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "mu_glikk",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;999999999"
+            ],
+            "name": "mu_fuddle",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "mu_quan",
+          "request": {
+            "@id": [
+              "dtmi:foo;1"
+            ],
+            "name": "mu_snee",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "mu_floob",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo;1"
+            ],
+            "name": "mu_spazz",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "mu_flunn",
+          "request": {
+            "@id": [
+              "dtmi:foo:bar"
+            ],
+            "name": "mu_jogg",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "mu_vroo",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar"
+            ],
+            "name": "mu_yekk",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nu_beta",
+          "request": {
+            "@id": [
+              "dtmi:foo:bar;3.14"
+            ],
+            "name": "nu_alpha",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nu_epsilon",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;3.14"
+            ],
+            "name": "nu_delta",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nu_theta",
+          "request": {
+            "@id": [
+              "dtmi:foo:bar;3.141592"
+            ],
+            "name": "nu_eta",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nu_lambda",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;3.141592"
+            ],
+            "name": "nu_kappa",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestInvalidKeywordsV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestInvalidKeywordsV4.json
new file mode 100644
index 00000000..0a8c1028
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestInvalidKeywordsV4.json
@@ -0,0 +1,182 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_psi",
+          "request": {
+            "name": "chi_chi",
+            "schema": "float",
+            "@graph": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_wum",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "chi_yuzz",
+            "schema": "integer",
+            "@graph": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_fuddle",
+          "request": {
+            "name": "chi_humpf",
+            "schema": "long",
+            "@value": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_snee",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "chi_nuh",
+            "schema": "short",
+            "@value": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_spazz",
+          "request": {
+            "name": "chi_thnad",
+            "schema": "string",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_jogg",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "chi_zatz",
+            "schema": "time",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_yekk",
+          "request": {
+            "name": "chi_itch",
+            "schema": "unsignedByte",
+            "@foobar": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_alpha",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "chi_hi",
+            "schema": "unsignedInteger",
+            "@foobar": true
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyCommentStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyCommentStringLengthV4.json
new file mode 100644
index 00000000..d44f580a
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyCommentStringLengthV4.json
@@ -0,0 +1,69 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "xi_itch",
+          "request": {
+            "name": "xi_flunn",
+            "schema": "byte",
+            "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "xi_hi",
+          "request": {
+            "name": "xi_vroo",
+            "schema": "bytes",
+            "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omicron_gamma",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "omicron_beta",
+            "schema": "date",
+            "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyCommentStringV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyCommentStringV4.json
new file mode 100644
index 00000000..01c9070c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyCommentStringV4.json
@@ -0,0 +1,498 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nu_upsilon",
+          "request": {
+            "name": "nu_tau",
+            "schema": "uuid",
+            "comment": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nu_psi",
+          "request": {
+            "name": "nu_chi",
+            "schema": "boolean",
+            "comment": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nu_wum",
+          "request": {
+            "name": "nu_yuzz",
+            "schema": "byte",
+            "comment": {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nu_fuddle",
+          "request": {
+            "name": "nu_humpf",
+            "schema": "bytes",
+            "comment": [
+              {
+                "@value": "hello",
+                "@type": "xsd:string"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nu_snee",
+          "request": {
+            "name": "nu_nuh",
+            "schema": "date",
+            "comment": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nu_spazz",
+          "request": {
+            "name": "nu_thnad",
+            "schema": "dateTime",
+            "comment": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nu_jogg",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "nu_zatz",
+            "schema": "decimal",
+            "comment": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nu_yekk",
+          "request": {
+            "name": "nu_itch",
+            "schema": "double",
+            "comment": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "xi_alpha",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "nu_hi",
+            "schema": "duration",
+            "comment": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "xi_delta",
+          "request": {
+            "name": "xi_gamma",
+            "schema": "float",
+            "comment": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "xi_eta",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "xi_zeta",
+            "schema": "integer",
+            "comment": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "xi_kappa",
+          "request": {
+            "name": "xi_iota",
+            "schema": "long",
+            "comment": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "xi_nu",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "xi_mu",
+            "schema": "short",
+            "comment": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "xi_pi",
+          "request": {
+            "name": "xi_omicron",
+            "schema": "string",
+            "comment": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "xi_tau",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "xi_sigma",
+            "schema": "time",
+            "comment": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "xi_chi",
+          "request": {
+            "name": "xi_phi",
+            "schema": "unsignedByte",
+            "comment": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "xi_yuzz",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "xi_omega",
+            "schema": "unsignedInteger",
+            "comment": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "xi_humpf",
+          "request": {
+            "name": "xi_um",
+            "schema": "unsignedLong",
+            "comment": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "xi_nuh",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "xi_glikk",
+            "schema": "unsignedShort",
+            "comment": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "xi_thnad",
+          "request": {
+            "name": "xi_quan",
+            "schema": "uuid",
+            "comment": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "xi_zatz",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "xi_floob",
+            "schema": "boolean",
+            "comment": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyCommentTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyCommentTermAndDtmiV4.json
new file mode 100644
index 00000000..f31c9a9b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyCommentTermAndDtmiV4.json
@@ -0,0 +1,49 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omicron_upsilon",
+          "request": {
+            "comment": "omicron_rho",
+            "dtmi:dtdl:property:comment;4": "omicron_sigma",
+            "name": "omicron_tau",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omicron_yuzz",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "comment": "omicron_chi",
+            "dtmi:dtdl:property:comment;4": "omicron_psi",
+            "name": "omicron_omega",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyDescriptionLangStringV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyDescriptionLangStringV4.json
new file mode 100644
index 00000000..9c8ecaf4
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyDescriptionLangStringV4.json
@@ -0,0 +1,578 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omicron_humpf",
+          "request": {
+            "name": "omicron_um",
+            "schema": "integer",
+            "description": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omicron_nuh",
+          "request": {
+            "name": "omicron_glikk",
+            "schema": "long",
+            "description": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omicron_thnad",
+          "request": {
+            "name": "omicron_quan",
+            "schema": "short",
+            "description": {
+              "en": "hello"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omicron_zatz",
+          "request": {
+            "name": "omicron_floob",
+            "schema": "string",
+            "description": [
+              {
+                "@value": "hello",
+                "@language": "en"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omicron_itch",
+          "request": {
+            "name": "omicron_flunn",
+            "schema": "time",
+            "description": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omicron_hi",
+          "request": {
+            "name": "omicron_vroo",
+            "schema": "unsignedByte",
+            "description": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_gamma",
+          "request": {
+            "name": "pi_beta",
+            "schema": "unsignedInteger",
+            "description": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_zeta",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "pi_epsilon",
+            "schema": "unsignedLong",
+            "description": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_iota",
+          "request": {
+            "name": "pi_theta",
+            "schema": "unsignedShort",
+            "description": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_mu",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "pi_lambda",
+            "schema": "uuid",
+            "description": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_omicron",
+          "request": {
+            "name": "pi_xi",
+            "schema": "boolean",
+            "description": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_sigma",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "pi_rho",
+            "schema": "byte",
+            "description": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_phi",
+          "request": {
+            "name": "pi_upsilon",
+            "schema": "bytes",
+            "description": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_omega",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "pi_psi",
+            "schema": "date",
+            "description": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_um",
+          "request": {
+            "name": "pi_wum",
+            "schema": "dateTime",
+            "description": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_glikk",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "pi_fuddle",
+            "schema": "decimal",
+            "description": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_quan",
+          "request": {
+            "name": "pi_snee",
+            "schema": "double",
+            "description": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_floob",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "pi_spazz",
+            "schema": "duration",
+            "description": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_flunn",
+          "request": {
+            "name": "pi_jogg",
+            "schema": "float",
+            "description": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "pi_vroo",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "pi_yekk",
+            "schema": "integer",
+            "description": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "rho_beta",
+          "request": {
+            "name": "rho_alpha",
+            "schema": "long",
+            "description": {
+              "@value": "hello",
+              "@language": "en"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "rho_epsilon",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_delta",
+            "schema": "short",
+            "description": {
+              "@value": "hello",
+              "@language": "en"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "rho_theta",
+          "request": {
+            "name": "rho_eta",
+            "schema": "string",
+            "description": [
+              {
+                "en": "hello"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "rho_lambda",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_kappa",
+            "schema": "time",
+            "description": [
+              {
+                "en": "hello"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyDescriptionStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyDescriptionStringLengthV4.json
new file mode 100644
index 00000000..0078794f
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyDescriptionStringLengthV4.json
@@ -0,0 +1,69 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "rho_xi",
+          "request": {
+            "name": "rho_nu",
+            "schema": "unsignedByte",
+            "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "rho_rho",
+          "request": {
+            "name": "rho_pi",
+            "schema": "unsignedInteger",
+            "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "rho_upsilon",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_tau",
+            "schema": "unsignedLong",
+            "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyDescriptionTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyDescriptionTermAndDtmiV4.json
new file mode 100644
index 00000000..f286e457
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyDescriptionTermAndDtmiV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "rho_zatz",
+          "request": {
+            "description": [
+              "rho_thnad"
+            ],
+            "dtmi:dtdl:property:description;4": [
+              "rho_spazz"
+            ],
+            "name": "rho_floob",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "rho_vroo",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "description": [
+              "rho_flunn"
+            ],
+            "dtmi:dtdl:property:description;4": [
+              "rho_itch"
+            ],
+            "name": "rho_yekk",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyDisplayNameLangStringV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyDisplayNameLangStringV4.json
new file mode 100644
index 00000000..ce0d585a
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyDisplayNameLangStringV4.json
@@ -0,0 +1,578 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_beta",
+          "request": {
+            "name": "sigma_alpha",
+            "schema": "date",
+            "displayName": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_epsilon",
+          "request": {
+            "name": "sigma_delta",
+            "schema": "dateTime",
+            "displayName": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_theta",
+          "request": {
+            "name": "sigma_eta",
+            "schema": "decimal",
+            "displayName": {
+              "en": "hello"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_lambda",
+          "request": {
+            "name": "sigma_kappa",
+            "schema": "double",
+            "displayName": [
+              {
+                "@value": "hello",
+                "@language": "en"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_xi",
+          "request": {
+            "name": "sigma_nu",
+            "schema": "duration",
+            "displayName": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_rho",
+          "request": {
+            "name": "sigma_pi",
+            "schema": "float",
+            "displayName": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_upsilon",
+          "request": {
+            "name": "sigma_tau",
+            "schema": "integer",
+            "displayName": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_psi",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "sigma_chi",
+            "schema": "long",
+            "displayName": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_wum",
+          "request": {
+            "name": "sigma_yuzz",
+            "schema": "short",
+            "displayName": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_fuddle",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "sigma_humpf",
+            "schema": "string",
+            "displayName": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_snee",
+          "request": {
+            "name": "sigma_nuh",
+            "schema": "time",
+            "displayName": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_spazz",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "sigma_thnad",
+            "schema": "unsignedByte",
+            "displayName": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_jogg",
+          "request": {
+            "name": "sigma_zatz",
+            "schema": "unsignedInteger",
+            "displayName": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "sigma_yekk",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "sigma_itch",
+            "schema": "unsignedLong",
+            "displayName": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_alpha",
+          "request": {
+            "name": "sigma_hi",
+            "schema": "unsignedShort",
+            "displayName": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_delta",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "tau_gamma",
+            "schema": "uuid",
+            "displayName": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_eta",
+          "request": {
+            "name": "tau_zeta",
+            "schema": "boolean",
+            "displayName": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_kappa",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "tau_iota",
+            "schema": "byte",
+            "displayName": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_nu",
+          "request": {
+            "name": "tau_mu",
+            "schema": "bytes",
+            "displayName": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_pi",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "tau_omicron",
+            "schema": "date",
+            "displayName": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_tau",
+          "request": {
+            "name": "tau_sigma",
+            "schema": "dateTime",
+            "displayName": {
+              "@value": "hello",
+              "@language": "en"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_chi",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "tau_phi",
+            "schema": "decimal",
+            "displayName": {
+              "@value": "hello",
+              "@language": "en"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_yuzz",
+          "request": {
+            "name": "tau_omega",
+            "schema": "double",
+            "displayName": [
+              {
+                "en": "hello"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_humpf",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "tau_um",
+            "schema": "duration",
+            "displayName": [
+              {
+                "en": "hello"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyDisplayNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyDisplayNameStringLengthV4.json
new file mode 100644
index 00000000..d9afafc6
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyDisplayNameStringLengthV4.json
@@ -0,0 +1,69 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_nuh",
+          "request": {
+            "name": "tau_glikk",
+            "schema": "float",
+            "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_thnad",
+          "request": {
+            "name": "tau_quan",
+            "schema": "integer",
+            "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "tau_zatz",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "tau_floob",
+            "schema": "long",
+            "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyDisplayNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyDisplayNameTermAndDtmiV4.json
new file mode 100644
index 00000000..95725363
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyDisplayNameTermAndDtmiV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "upsilon_lambda",
+          "request": {
+            "displayName": [
+              "upsilon_theta"
+            ],
+            "dtmi:dtdl:property:displayName;4": [
+              "upsilon_iota"
+            ],
+            "name": "upsilon_kappa",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "upsilon_pi",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "displayName": [
+              "upsilon_nu"
+            ],
+            "dtmi:dtdl:property:displayName;4": [
+              "upsilon_xi"
+            ],
+            "name": "upsilon_omicron",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyFormallyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyFormallyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..bfa0f06f
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyFormallyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,92 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_pi",
+          "request": {
+            "name": "psi_omicron",
+            "schema": "byte",
+            "dtmi:foo:bar;1": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_tau",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "psi_sigma",
+            "schema": "bytes",
+            "dtmi:foo:bar;1": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_chi",
+          "request": {
+            "name": "psi_phi",
+            "schema": "date",
+            "boolean": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_yuzz",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "psi_omega",
+            "schema": "dateTime",
+            "boolean": null
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyFormallyUndefinedTermV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyFormallyUndefinedTermV4.json
new file mode 100644
index 00000000..50ec75ec
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyFormallyUndefinedTermV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_gamma",
+          "request": {
+            "name": "omega_beta",
+            "schema": "short",
+            "foobar": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_zeta",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "omega_epsilon",
+            "schema": "string",
+            "foobar": {}
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyInvalidDtmiV4.json
new file mode 100644
index 00000000..9c7e5e73
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyInvalidDtmiV4.json
@@ -0,0 +1,55 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_humpf",
+          "request": {
+            "@type": [
+              "CommandRequest",
+              "Foobar"
+            ],
+            "name": "psi_um",
+            "schema": "decimal",
+            "dtmi:foo//bar": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_nuh",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "CommandRequest",
+              "Foobar"
+            ],
+            "name": "psi_glikk",
+            "schema": "double",
+            "dtmi:foo//bar": 626
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNamePatternV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNamePatternV4.json
new file mode 100644
index 00000000..555f5925
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNamePatternV4.json
@@ -0,0 +1,537 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_chi",
+          "request": {
+            "schema": "unsignedByte",
+            "name": "EARTH"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_omega",
+          "request": {
+            "schema": "unsignedInteger",
+            "name": "Air"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_wum",
+          "request": {
+            "schema": "unsignedLong",
+            "name": "fire"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_humpf",
+          "request": {
+            "schema": "unsignedShort",
+            "name": "hello_world"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_glikk",
+          "request": {
+            "schema": "uuid",
+            "name": "Anarchy99"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_snee",
+          "request": {
+            "schema": "boolean",
+            "name": "23skidoo"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_thnad",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "byte",
+            "name": "23skidoo"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_floob",
+          "request": {
+            "schema": "bytes",
+            "name": "626"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_jogg",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "date",
+            "name": "626"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_itch",
+          "request": {
+            "schema": "dateTime",
+            "name": "goodbye-world"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_vroo",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "decimal",
+            "name": "goodbye-world"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_alpha",
+          "request": {
+            "schema": "double",
+            "name": "_haha"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_gamma",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "duration",
+            "name": "_haha"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_epsilon",
+          "request": {
+            "schema": "float",
+            "name": "toodaloo_"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_eta",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "integer",
+            "name": "toodaloo_"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_iota",
+          "request": {
+            "schema": "long",
+            "name": "pro:con"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_lambda",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "short",
+            "name": "pro:con"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_nu",
+          "request": {
+            "schema": "string",
+            "name": "mish/mash"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_omicron",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "time",
+            "name": "mish/mash"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_rho",
+          "request": {
+            "schema": "unsignedByte",
+            "name": "#tag"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_tau",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "unsignedInteger",
+            "name": "#tag"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_phi",
+          "request": {
+            "schema": "unsignedLong",
+            "name": "@tweet"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_psi",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "unsignedShort",
+            "name": "@tweet"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_yuzz",
+          "request": {
+            "schema": "uuid",
+            "name": "$money"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_um",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "boolean",
+            "name": "$money"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNameStringLengthV4.json
new file mode 100644
index 00000000..70eee675
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNameStringLengthV4.json
@@ -0,0 +1,66 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_pi",
+          "request": {
+            "schema": "short",
+            "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_sigma",
+          "request": {
+            "schema": "string",
+            "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_upsilon",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "time",
+            "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNameStringV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNameStringV4.json
new file mode 100644
index 00000000..623f05e2
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNameStringV4.json
@@ -0,0 +1,499 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_omicron",
+          "request": {
+            "schema": "float",
+            "name": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_rho",
+          "request": {
+            "schema": "integer",
+            "name": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_tau",
+          "request": {
+            "schema": "long",
+            "name": {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_phi",
+          "request": {
+            "schema": "short",
+            "name": [
+              {
+                "@value": "hello",
+                "@type": "xsd:string"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_psi",
+          "request": {
+            "schema": "string",
+            "name": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_yuzz",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "time",
+            "name": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_um",
+          "request": {
+            "schema": "unsignedByte",
+            "name": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_fuddle",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "unsignedInteger",
+            "name": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_nuh",
+          "request": {
+            "schema": "unsignedLong",
+            "name": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_quan",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "unsignedShort",
+            "name": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_spazz",
+          "request": {
+            "schema": "uuid",
+            "name": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_zatz",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "boolean",
+            "name": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_flunn",
+          "request": {
+            "schema": "byte",
+            "name": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_yekk",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "bytes",
+            "name": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_hi",
+          "request": {
+            "schema": "date",
+            "name": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_beta",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "dateTime",
+            "name": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_delta",
+          "request": {
+            "schema": "decimal",
+            "name": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_zeta",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "double",
+            "name": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_theta",
+          "request": {
+            "schema": "duration",
+            "name": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_kappa",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "float",
+            "name": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_mu",
+          "request": {
+            "schema": "integer",
+            "name": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_xi",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "long",
+            "name": []
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNameTermAndDtmiV4.json
new file mode 100644
index 00000000..501828ce
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNameTermAndDtmiV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_itch",
+          "request": {
+            "name": "flunn_jogg",
+            "dtmi:dtdl:property:name;4": "flunn_flunn",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "itch_alpha",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "flunn_vroo",
+            "dtmi:dtdl:property:name;4": "flunn_hi",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNotDtmiNorTermV4.json
new file mode 100644
index 00000000..0e8dfcb4
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNotDtmiNorTermV4.json
@@ -0,0 +1,55 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_thnad",
+          "request": {
+            "@type": [
+              "CommandRequest",
+              "Foobar"
+            ],
+            "name": "psi_quan",
+            "schema": "duration",
+            "http://foo.com/bar": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "psi_zatz",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "CommandRequest",
+              "Foobar"
+            ],
+            "name": "psi_floob",
+            "schema": "float",
+            "http://foo.com/bar": true
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNullableBooleanV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNullableBooleanV4.json
new file mode 100644
index 00000000..ff0dc5a0
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNullableBooleanV4.json
@@ -0,0 +1,596 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "upsilon_tau",
+          "request": {
+            "name": "upsilon_sigma",
+            "schema": "unsignedLong",
+            "nullable": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "upsilon_chi",
+          "request": {
+            "name": "upsilon_phi",
+            "schema": "unsignedShort",
+            "nullable": false
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "upsilon_yuzz",
+          "request": {
+            "name": "upsilon_omega",
+            "schema": "uuid",
+            "nullable": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "upsilon_humpf",
+          "request": {
+            "name": "upsilon_um",
+            "schema": "boolean",
+            "nullable": [
+              false
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "upsilon_nuh",
+          "request": {
+            "name": "upsilon_glikk",
+            "schema": "byte",
+            "nullable": {
+              "@value": true,
+              "@type": "xsd:boolean"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "upsilon_thnad",
+          "request": {
+            "name": "upsilon_quan",
+            "schema": "bytes",
+            "nullable": {
+              "@value": false,
+              "@type": "xsd:boolean"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "upsilon_zatz",
+          "request": {
+            "name": "upsilon_floob",
+            "schema": "date",
+            "nullable": [
+              {
+                "@value": true,
+                "@type": "xsd:boolean"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "upsilon_itch",
+          "request": {
+            "name": "upsilon_flunn",
+            "schema": "dateTime",
+            "nullable": [
+              {
+                "@value": false,
+                "@type": "xsd:boolean"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "upsilon_hi",
+          "request": {
+            "name": "upsilon_vroo",
+            "schema": "decimal",
+            "nullable": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "phi_gamma",
+          "request": {
+            "name": "phi_beta",
+            "schema": "double",
+            "nullable": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "phi_zeta",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "phi_epsilon",
+            "schema": "duration",
+            "nullable": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "phi_iota",
+          "request": {
+            "name": "phi_theta",
+            "schema": "float",
+            "nullable": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "phi_mu",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "phi_lambda",
+            "schema": "integer",
+            "nullable": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "phi_omicron",
+          "request": {
+            "name": "phi_xi",
+            "schema": "long",
+            "nullable": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "phi_sigma",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "phi_rho",
+            "schema": "short",
+            "nullable": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "phi_phi",
+          "request": {
+            "name": "phi_upsilon",
+            "schema": "string",
+            "nullable": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "phi_omega",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "phi_psi",
+            "schema": "time",
+            "nullable": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "phi_um",
+          "request": {
+            "name": "phi_wum",
+            "schema": "unsignedByte",
+            "nullable": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "phi_glikk",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "phi_fuddle",
+            "schema": "unsignedInteger",
+            "nullable": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "phi_quan",
+          "request": {
+            "name": "phi_snee",
+            "schema": "unsignedLong",
+            "nullable": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "phi_floob",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "phi_spazz",
+            "schema": "unsignedShort",
+            "nullable": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "phi_flunn",
+          "request": {
+            "name": "phi_jogg",
+            "schema": "uuid",
+            "nullable": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "phi_vroo",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "phi_yekk",
+            "schema": "boolean",
+            "nullable": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_beta",
+          "request": {
+            "name": "chi_alpha",
+            "schema": "byte",
+            "nullable": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_epsilon",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "chi_delta",
+            "schema": "bytes",
+            "nullable": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNullableTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNullableTermAndDtmiV4.json
new file mode 100644
index 00000000..7a777806
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertyNullableTermAndDtmiV4.json
@@ -0,0 +1,49 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_rho",
+          "request": {
+            "name": "chi_pi",
+            "nullable": true,
+            "dtmi:dtdl:property:nullable;4": false,
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "chi_upsilon",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "chi_tau",
+            "nullable": true,
+            "dtmi:dtdl:property:nullable;4": false,
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestPropertySchemaElementV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertySchemaElementV4.json
new file mode 100644
index 00000000..613bc33b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertySchemaElementV4.json
@@ -0,0 +1,861 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_zeta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:itch_epsilon;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "itch_delta",
+            "request": {
+              "name": "itch_gamma",
+              "schema": {
+                "@type": "Array",
+                "elementSchema": "double"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_kappa;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:itch_iota;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "itch_theta",
+            "request": {
+              "name": "itch_eta",
+              "schema": [
+                {
+                  "@type": "Array",
+                  "elementSchema": "duration"
+                }
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Array",
+          "elementSchema": "float"
+        },
+        "contents": {
+          "@type": "Command",
+          "name": "itch_nu",
+          "request": {
+            "name": "itch_mu",
+            "schema": "dtmi:ex:dependentRef;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Array",
+          "elementSchema": "integer"
+        },
+        "contents": {
+          "@type": "Command",
+          "name": "itch_pi",
+          "request": {
+            "name": "itch_omicron",
+            "schema": [
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_phi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:itch_upsilon;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "itch_tau",
+            "request": {
+              "name": "itch_sigma",
+              "schema": {
+                "@id": "dtmi:example:itch_rho;1",
+                "@type": "Array",
+                "elementSchema": "time",
+                "@context": "dtmi:dtdl:context;2"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_wum;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:itch_yuzz;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "itch_omega",
+            "request": {
+              "name": "itch_psi",
+              "schema": {
+                "@id": "dtmi:example:itch_chi;1",
+                "@type": "Array",
+                "elementSchema": "boolean",
+                "@context": "dtmi:dtdl:context;3"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Array",
+          "elementSchema": "time"
+        },
+        "contents": {
+          "@type": "Command",
+          "name": "itch_fuddle",
+          "request": {
+            "name": "itch_humpf",
+            "schema": [
+              {
+                "@type": "Array",
+                "elementSchema": "string"
+              },
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Array",
+          "elementSchema": "unsignedInteger"
+        },
+        "contents": {
+          "@type": "Command",
+          "name": "itch_snee",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "itch_nuh",
+            "schema": [
+              {
+                "@type": "Array",
+                "elementSchema": "unsignedByte"
+              },
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "itch_thnad",
+          "request": {
+            "name": "itch_quan",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "itch_zatz",
+          "request": {
+            "name": "itch_floob",
+            "schema": [
+              "bytes"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "itch_itch",
+          "request": {
+            "name": "itch_flunn",
+            "schema": "dtmi:dtdl:instance:Schema:bytes;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "itch_hi",
+          "request": {
+            "name": "itch_vroo",
+            "schema": [
+              "dtmi:dtdl:instance:Schema:bytes;4"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_gamma",
+          "request": {
+            "name": "yekk_beta",
+            "schema": "point"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_zeta",
+          "request": {
+            "name": "yekk_epsilon",
+            "schema": [
+              "point"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_iota",
+          "request": {
+            "name": "yekk_theta",
+            "schema": "dtmi:standard:schema:geospatial:point;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_mu",
+          "request": {
+            "name": "yekk_lambda",
+            "schema": [
+              "dtmi:standard:schema:geospatial:point;4"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_omicron",
+          "request": {
+            "name": "yekk_xi",
+            "schema": "Foobar"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_sigma",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "yekk_rho",
+            "schema": "Foobar"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_phi",
+          "request": {
+            "name": "yekk_upsilon",
+            "schema": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_omega",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "yekk_psi",
+            "schema": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_um",
+          "request": {
+            "name": "yekk_wum",
+            "schema": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_glikk",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "yekk_fuddle",
+            "schema": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_quan",
+          "request": {
+            "name": "yekk_snee",
+            "schema": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_floob",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "yekk_spazz",
+            "schema": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_flunn",
+          "request": {
+            "name": "yekk_jogg",
+            "schema": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_vroo",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "yekk_yekk",
+            "schema": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_beta",
+          "request": {
+            "name": "vroo_alpha",
+            "schema": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_epsilon",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "vroo_delta",
+            "schema": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_theta",
+          "request": {
+            "name": "vroo_eta",
+            "schema": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_lambda",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "vroo_kappa",
+            "schema": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_xi",
+          "request": {
+            "name": "vroo_nu",
+            "schema": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_rho",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "vroo_pi",
+            "schema": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_upsilon",
+          "request": {
+            "name": "vroo_tau",
+            "schema": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_psi",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "vroo_chi",
+            "schema": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_wum",
+          "request": {
+            "name": "vroo_yuzz",
+            "schema": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_fuddle",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "vroo_humpf",
+            "schema": []
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestPropertySchemaTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertySchemaTermAndDtmiV4.json
new file mode 100644
index 00000000..8d98999c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertySchemaTermAndDtmiV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_um",
+          "request": {
+            "name": "gamma_wum",
+            "schema": "unsignedByte",
+            "dtmi:dtdl:property:schema;4": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_glikk",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "gamma_fuddle",
+            "schema": "unsignedLong",
+            "dtmi:dtdl:property:schema;4": "unsignedShort"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestPropertySchemaTypeConformanceV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertySchemaTypeConformanceV4.json
new file mode 100644
index 00000000..c54a5a26
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestPropertySchemaTypeConformanceV4.json
@@ -0,0 +1,742 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_yekk",
+          "request": {
+            "name": "vroo_itch",
+            "schema": {
+              "@id": "dtmi:example:vroo_flunn;1",
+              "elementSchema": "unsignedLong",
+              "@type": "Array"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "hi_gamma",
+          "request": {
+            "name": "hi_beta",
+            "schema": {
+              "@id": "dtmi:example:vroo_hi;1",
+              "name": "hi_alpha",
+              "@type": "Command"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "hi_theta",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "hi_eta",
+            "schema": {
+              "@id": "dtmi:example:hi_epsilon;1",
+              "name": "hi_zeta",
+              "@type": "Command"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "hi_nu",
+          "request": {
+            "name": "hi_mu",
+            "schema": {
+              "@id": "dtmi:example:hi_kappa;1",
+              "name": "hi_lambda",
+              "schema": "unsignedShort",
+              "@type": "CommandRequest"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "hi_sigma",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "hi_rho",
+            "schema": {
+              "@id": "dtmi:example:hi_omicron;1",
+              "name": "hi_pi",
+              "schema": "uuid",
+              "@type": "CommandRequest"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "hi_psi",
+          "request": {
+            "name": "hi_chi",
+            "schema": {
+              "@id": "dtmi:example:hi_upsilon;1",
+              "name": "hi_phi",
+              "schema": "boolean",
+              "@type": "CommandResponse"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "hi_humpf",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "hi_um",
+            "schema": {
+              "@id": "dtmi:example:hi_yuzz;1",
+              "name": "hi_wum",
+              "schema": "byte",
+              "@type": "CommandResponse"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "hi_thnad",
+          "request": {
+            "name": "hi_quan",
+            "schema": {
+              "@id": "dtmi:example:hi_glikk;1",
+              "name": "hi_nuh",
+              "schema": {
+                "@id": "dtmi:example:hi_snee;1",
+                "@type": "Interface"
+              },
+              "@type": "Component"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "hi_itch",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "hi_flunn",
+            "schema": {
+              "@id": "dtmi:example:hi_floob;1",
+              "name": "hi_zatz",
+              "schema": {
+                "@id": "dtmi:example:hi_jogg;1",
+                "@type": "Interface"
+              },
+              "@type": "Component"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "alpha_alpha",
+          "request": {
+            "name": "hi_hi",
+            "schema": {
+              "@id": "dtmi:example:hi_vroo;1",
+              "valueSchema": "integer",
+              "@type": "Enum"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "alpha_zeta",
+          "request": {
+            "name": "alpha_epsilon",
+            "schema": {
+              "@id": "dtmi:example:alpha_gamma;1",
+              "enumValue": 1512,
+              "name": "alpha_delta",
+              "@type": "EnumValue"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "alpha_lambda",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "alpha_kappa",
+            "schema": {
+              "@id": "dtmi:example:alpha_theta;1",
+              "enumValue": 1513,
+              "name": "alpha_iota",
+              "@type": "EnumValue"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "alpha_pi",
+          "request": {
+            "name": "alpha_omicron",
+            "schema": {
+              "@id": "dtmi:example:alpha_nu;1",
+              "name": "alpha_xi",
+              "schema": "bytes",
+              "@type": "Field"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "alpha_phi",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "alpha_upsilon",
+            "schema": {
+              "@id": "dtmi:example:alpha_sigma;1",
+              "name": "alpha_tau",
+              "schema": "date",
+              "@type": "Field"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "alpha_yuzz",
+          "request": {
+            "name": "alpha_omega",
+            "schema": {
+              "@id": "dtmi:example:alpha_psi;1",
+              "@type": "Interface"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "alpha_fuddle",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "alpha_humpf",
+            "schema": {
+              "@id": "dtmi:example:alpha_um;1",
+              "@type": "Interface"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "alpha_spazz",
+          "request": {
+            "name": "alpha_thnad",
+            "schema": {
+              "@id": "dtmi:example:alpha_nuh;1",
+              "mapKey": {
+                "name": "alpha_snee",
+                "schema": "string"
+              },
+              "mapValue": {
+                "name": "alpha_quan",
+                "schema": "dateTime"
+              },
+              "@type": "Map"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "alpha_itch",
+          "request": {
+            "name": "alpha_flunn",
+            "schema": {
+              "@id": "dtmi:example:alpha_zatz;1",
+              "name": "alpha_jogg",
+              "schema": "string",
+              "@type": "MapKey"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "beta_beta",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "beta_alpha",
+            "schema": {
+              "@id": "dtmi:example:alpha_vroo;1",
+              "name": "alpha_hi",
+              "schema": "string",
+              "@type": "MapKey"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "beta_eta",
+          "request": {
+            "name": "beta_zeta",
+            "schema": {
+              "@id": "dtmi:example:beta_delta;1",
+              "name": "beta_epsilon",
+              "schema": "decimal",
+              "@type": "MapValue"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "beta_mu",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "beta_lambda",
+            "schema": {
+              "@id": "dtmi:example:beta_iota;1",
+              "name": "beta_kappa",
+              "schema": "double",
+              "@type": "MapValue"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "beta_pi",
+          "request": {
+            "name": "beta_omicron",
+            "schema": {
+              "@id": "dtmi:example:beta_xi;1",
+              "@type": "Object"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "beta_phi",
+          "request": {
+            "name": "beta_upsilon",
+            "schema": {
+              "@id": "dtmi:example:beta_sigma;1",
+              "name": "beta_tau",
+              "schema": "duration",
+              "@type": "Property"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "beta_wum",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "beta_yuzz",
+            "schema": {
+              "@id": "dtmi:example:beta_psi;1",
+              "name": "beta_omega",
+              "schema": "float",
+              "@type": "Property"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "beta_nuh",
+          "request": {
+            "name": "beta_glikk",
+            "schema": {
+              "@id": "dtmi:example:beta_humpf;1",
+              "name": "beta_fuddle",
+              "@type": "Relationship"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "beta_floob",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "beta_spazz",
+            "schema": {
+              "@id": "dtmi:example:beta_quan;1",
+              "name": "beta_thnad",
+              "@type": "Relationship"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "beta_yekk",
+          "request": {
+            "name": "beta_itch",
+            "schema": {
+              "@id": "dtmi:example:beta_jogg;1",
+              "name": "beta_flunn",
+              "schema": "integer",
+              "@type": "Telemetry"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_gamma",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "gamma_beta",
+            "schema": {
+              "@id": "dtmi:example:beta_hi;1",
+              "name": "gamma_alpha",
+              "schema": "long",
+              "@type": "Telemetry"
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestRequiredPropertiesV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestRequiredPropertiesV4.json
new file mode 100644
index 00000000..936214ad
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestRequiredPropertiesV4.json
@@ -0,0 +1,84 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_epsilon",
+          "request": {
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_eta",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_kappa",
+          "request": {
+            "name": "zatz_iota"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_nu",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zatz_mu"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestTypeIncludesInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestTypeIncludesInvalidDtmiV4.json
new file mode 100644
index 00000000..2216bb5e
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestTypeIncludesInvalidDtmiV4.json
@@ -0,0 +1,53 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_delta",
+          "request": {
+            "@type": [
+              "CommandRequest",
+              "dtmi:foo//bar"
+            ],
+            "name": "theta_gamma",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_eta",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "CommandRequest",
+              "dtmi:foo//bar"
+            ],
+            "name": "theta_zeta",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestTypeIncludesMaterialV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestTypeIncludesMaterialV4.json
new file mode 100644
index 00000000..3b0cff16
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestTypeIncludesMaterialV4.json
@@ -0,0 +1,188 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_flunn",
+          "request": {
+            "name": "zeta_jogg",
+            "schema": "boolean",
+            "@type": "CommandRequest"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_vroo",
+          "request": {
+            "name": "zeta_yekk",
+            "schema": "byte",
+            "@type": [
+              "CommandRequest"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_beta",
+          "request": {
+            "name": "eta_alpha",
+            "schema": "bytes",
+            "@type": "dtmi:dtdl:class:CommandRequest;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_epsilon",
+          "request": {
+            "name": "eta_delta",
+            "schema": "date",
+            "@type": [
+              "dtmi:dtdl:class:CommandRequest;4"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_theta",
+          "request": {
+            "name": "eta_eta",
+            "schema": "dateTime",
+            "@type": "Something"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_lambda",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "eta_kappa",
+            "schema": "decimal",
+            "@type": "Something"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_xi",
+          "request": {
+            "name": "eta_nu",
+            "schema": "double",
+            "@type": [
+              "Something"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_rho",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "eta_pi",
+            "schema": "duration",
+            "@type": [
+              "Something"
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestTypeIncludesNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestTypeIncludesNotDtmiNorTermV4.json
new file mode 100644
index 00000000..5a823a1e
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestTypeIncludesNotDtmiNorTermV4.json
@@ -0,0 +1,53 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_kappa",
+          "request": {
+            "@type": [
+              "CommandRequest",
+              "http://foo.com/bar"
+            ],
+            "name": "theta_iota",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_nu",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "CommandRequest",
+              "http://foo.com/bar"
+            ],
+            "name": "theta_mu",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequestTypeStringOrArrayV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequestTypeStringOrArrayV4.json
new file mode 100644
index 00000000..eabb189a
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequestTypeStringOrArrayV4.json
@@ -0,0 +1,378 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "epsilon_thnad",
+          "request": {
+            "name": "epsilon_quan",
+            "schema": "date",
+            "@type": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "epsilon_zatz",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "epsilon_floob",
+            "schema": "dateTime",
+            "@type": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "epsilon_itch",
+          "request": {
+            "name": "epsilon_flunn",
+            "schema": "decimal",
+            "@type": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "epsilon_hi",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "epsilon_vroo",
+            "schema": "double",
+            "@type": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_gamma",
+          "request": {
+            "name": "zeta_beta",
+            "schema": "duration",
+            "@type": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_zeta",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zeta_epsilon",
+            "schema": "float",
+            "@type": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_iota",
+          "request": {
+            "name": "zeta_theta",
+            "schema": "integer",
+            "@type": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_mu",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zeta_lambda",
+            "schema": "long",
+            "@type": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_omicron",
+          "request": {
+            "name": "zeta_xi",
+            "schema": "short",
+            "@type": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_sigma",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zeta_rho",
+            "schema": "string",
+            "@type": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_phi",
+          "request": {
+            "name": "zeta_upsilon",
+            "schema": "time",
+            "@type": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_omega",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zeta_psi",
+            "schema": "unsignedByte",
+            "@type": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_um",
+          "request": {
+            "name": "zeta_wum",
+            "schema": "unsignedInteger",
+            "@type": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_glikk",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zeta_fuddle",
+            "schema": "unsignedLong",
+            "@type": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_quan",
+          "request": {
+            "name": "zeta_snee",
+            "schema": "unsignedShort",
+            "@type": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_floob",
+          "request": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zeta_spazz",
+            "schema": "uuid",
+            "@type": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandRequiredPropertiesV4.json b/DTDL/v4/spec/Requirement-ClassCommandRequiredPropertiesV4.json
new file mode 100644
index 00000000..d248ed21
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandRequiredPropertiesV4.json
@@ -0,0 +1,68 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "eta_nu"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "eta_omicron"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Command"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponseContextConformsV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponseContextConformsV4.json
new file mode 100644
index 00000000..f5f90a2a
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponseContextConformsV4.json
@@ -0,0 +1,434 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_sigma;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:thnad_rho;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "thnad_pi",
+            "response": {
+              "name": "thnad_omicron",
+              "schema": "time",
+              "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_chi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:thnad_phi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "thnad_upsilon",
+            "response": {
+              "name": "thnad_tau",
+              "schema": "unsignedByte",
+              "@context": []
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_wum;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:thnad_yuzz;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "thnad_omega",
+            "response": {
+              "name": "thnad_psi",
+              "schema": "unsignedInteger",
+              "@context": [
+                "dtmi:dtdl:extension:quantitativeTypes;1"
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_glikk;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:thnad_fuddle;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "thnad_humpf",
+            "response": {
+              "name": "thnad_um",
+              "schema": "unsignedLong",
+              "@context": null
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_thnad;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:thnad_quan;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "thnad_snee",
+            "response": {
+              "name": "thnad_nuh",
+              "schema": "unsignedShort",
+              "@context": 626
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_jogg;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:thnad_zatz;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "thnad_floob",
+            "response": {
+              "name": "thnad_spazz",
+              "schema": "uuid",
+              "@context": true
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_vroo;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:thnad_yekk;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "thnad_itch",
+            "response": {
+              "name": "thnad_flunn",
+              "schema": "boolean",
+              "@context": [
+                null
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_gamma;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:spazz_beta;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "spazz_alpha",
+            "response": {
+              "name": "thnad_hi",
+              "schema": "byte",
+              "@context": [
+                626
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_eta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:spazz_zeta;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "spazz_epsilon",
+            "response": {
+              "name": "spazz_delta",
+              "schema": "bytes",
+              "@context": [
+                true
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_lambda;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:spazz_kappa;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "spazz_iota",
+            "response": {
+              "name": "spazz_theta",
+              "schema": "date",
+              "@context": "dtmi:dtdl:extension:quantitativeTypes"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_omicron;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:spazz_xi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "spazz_nu",
+            "response": {
+              "name": "spazz_mu",
+              "schema": "dateTime",
+              "@context": "http://dtdl/extension/quantitativeTypes/1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_tau;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:spazz_sigma;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "spazz_rho",
+            "response": {
+              "name": "spazz_pi",
+              "schema": "decimal",
+              "@context": "quantitativeTypes;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_psi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:spazz_chi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "spazz_phi",
+            "response": {
+              "name": "spazz_upsilon",
+              "schema": "double",
+              "@context": {}
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_um;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:spazz_wum;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "spazz_yuzz",
+            "response": {
+              "name": "spazz_omega",
+              "schema": "duration",
+              "@context": {
+                "foo": "dtmi:foo:bar;1"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_nuh;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:spazz_glikk;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "spazz_fuddle",
+            "response": {
+              "name": "spazz_humpf",
+              "schema": "float",
+              "@context": [
+                {}
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_spazz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:spazz_thnad;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "spazz_quan",
+            "response": {
+              "name": "spazz_snee",
+              "schema": "integer",
+              "@context": [
+                {
+                  "foo": "dtmi:foo:bar;1"
+                }
+              ]
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponseIdDuplicateV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponseIdDuplicateV4.json
new file mode 100644
index 00000000..4fe7ac91
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponseIdDuplicateV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_pi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:hi_pi;1",
+          "@type": "Interface",
+          "contents": {
+            "@id": "dtmi:example:hi_pi;1",
+            "@type": "Command",
+            "name": "hi_sigma",
+            "response": {
+              "@id": "dtmi:example:hi_pi;1",
+              "name": "hi_rho",
+              "schema": "dateTime"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_tau;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:hi_tau;1",
+          "@type": "Interface",
+          "contents": {
+            "@id": "dtmi:example:hi_tau;1",
+            "@type": "Command",
+            "name": "hi_phi",
+            "response": {
+              "@context": "dtmi:undefinedExtension:context;1",
+              "@id": "dtmi:example:hi_tau;1",
+              "name": "hi_upsilon",
+              "schema": "decimal"
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponseIdIsDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponseIdIsDtmiV4.json
new file mode 100644
index 00000000..5b6dde54
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponseIdIsDtmiV4.json
@@ -0,0 +1,1240 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_yuzz",
+          "response": {
+            "@id": "dtmi:foo:bar;7",
+            "name": "jogg_omega",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_humpf",
+          "response": {
+            "@id": "dtmi:foo:bar;108675309",
+            "name": "jogg_um",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_nuh",
+          "response": {
+            "@id": "dtmi:foo:bar;999999999",
+            "name": "jogg_glikk",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_thnad",
+          "response": {
+            "@id": "dtmi:foo;1",
+            "name": "jogg_quan",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_zatz",
+          "response": {
+            "@id": "dtmi:foo:bar",
+            "name": "jogg_floob",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_itch",
+          "response": {
+            "@id": "dtmi:foo:bar;3.14",
+            "name": "jogg_flunn",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_hi",
+          "response": {
+            "@id": "dtmi:foo:bar;3.141592",
+            "name": "jogg_vroo",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_gamma",
+          "response": {
+            "@id": null,
+            "name": "flunn_beta",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_zeta",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": null,
+            "name": "flunn_epsilon",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_iota",
+          "response": {
+            "@id": 626,
+            "name": "flunn_theta",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_mu",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": 626,
+            "name": "flunn_lambda",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_omicron",
+          "response": {
+            "@id": true,
+            "name": "flunn_xi",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_sigma",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": true,
+            "name": "flunn_rho",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_phi",
+          "response": {
+            "@id": {
+              "@value": "dtmi:apparently:valid:identifier;3"
+            },
+            "name": "flunn_upsilon",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_omega",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": {
+              "@value": "dtmi:apparently:valid:identifier;3"
+            },
+            "name": "flunn_psi",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_um",
+          "response": {
+            "@id": "dtmi:foo:bar;0",
+            "name": "flunn_wum",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_glikk",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;0",
+            "name": "flunn_fuddle",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_quan",
+          "response": {
+            "@id": "dtmi:foo:bar;0.0",
+            "name": "flunn_snee",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_floob",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;0.0",
+            "name": "flunn_spazz",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_flunn",
+          "response": {
+            "@id": "dtmi:foo:bar;1234567890",
+            "name": "flunn_jogg",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "flunn_vroo",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;1234567890",
+            "name": "flunn_yekk",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "itch_beta",
+          "response": {
+            "@id": "dtmi:foo:bar;1a",
+            "name": "itch_alpha",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "itch_epsilon",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;1a",
+            "name": "itch_delta",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "itch_theta",
+          "response": {
+            "@id": "dtmi:foo:bar;3.0",
+            "name": "itch_eta",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "itch_lambda",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;3.0",
+            "name": "itch_kappa",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "itch_xi",
+          "response": {
+            "@id": "dtmi:foo:bar;3.1415926",
+            "name": "itch_nu",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "itch_rho",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;3.1415926",
+            "name": "itch_pi",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "itch_upsilon",
+          "response": {
+            "@id": "dtmi:foo:bar;6.02",
+            "name": "itch_tau",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "itch_psi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;6.02",
+            "name": "itch_chi",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "itch_wum",
+          "response": {
+            "@id": "dtmi:foo:bar;0.1",
+            "name": "itch_yuzz",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "itch_fuddle",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;0.1",
+            "name": "itch_humpf",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "itch_snee",
+          "response": {
+            "@id": "dtmi:foo:bar;01",
+            "name": "itch_nuh",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "itch_spazz",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;01",
+            "name": "itch_thnad",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "itch_jogg",
+          "response": {
+            "@id": "dtmi:foo:bar;",
+            "name": "itch_zatz",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "itch_yekk",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;",
+            "name": "itch_itch",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_alpha",
+          "response": {
+            "@id": "dtmi:test:invalidId_;1",
+            "name": "itch_hi",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_delta",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:test:invalidId_;1",
+            "name": "yekk_gamma",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_eta",
+          "response": {
+            "@id": "dtmi:test:_invalidUserId;1",
+            "name": "yekk_zeta",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_kappa",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:test:_invalidUserId;1",
+            "name": "yekk_iota",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_nu",
+          "response": {
+            "@id": "dtmi:test:1seg;1",
+            "name": "yekk_mu",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_pi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:test:1seg;1",
+            "name": "yekk_omicron",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_tau",
+          "response": {
+            "@id": "dtmi:foo:bar.baz;1",
+            "name": "yekk_sigma",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_chi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar.baz;1",
+            "name": "yekk_phi",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_yuzz",
+          "response": {
+            "@id": "dtmi:foo::bar;1",
+            "name": "yekk_omega",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_humpf",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo::bar;1",
+            "name": "yekk_um",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_nuh",
+          "response": {
+            "@id": "urn:foo:bar:1",
+            "name": "yekk_glikk",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_thnad",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "urn:foo:bar:1",
+            "name": "yekk_quan",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_zatz",
+          "response": {
+            "@id": "http://foo/bar/baz",
+            "name": "yekk_floob",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_itch",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "http://foo/bar/baz",
+            "name": "yekk_flunn",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yekk_hi",
+          "response": {
+            "@id": "dtmi:;1",
+            "name": "yekk_vroo",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_gamma",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:;1",
+            "name": "vroo_beta",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_zeta",
+          "response": {
+            "@id": "dtmi:dtdl:example;1",
+            "name": "vroo_epsilon",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_iota",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:dtdl:example;1",
+            "name": "vroo_theta",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_mu",
+          "response": {
+            "@id": "dtmi:standard:example;1",
+            "name": "vroo_lambda",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_omicron",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:standard:example;1",
+            "name": "vroo_xi",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponseIdNotArrayV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponseIdNotArrayV4.json
new file mode 100644
index 00000000..a2bdb021
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponseIdNotArrayV4.json
@@ -0,0 +1,345 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_sigma",
+          "response": {
+            "@id": [
+              "dtmi:foo:bar;7"
+            ],
+            "name": "vroo_rho",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_phi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;7"
+            ],
+            "name": "vroo_upsilon",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_omega",
+          "response": {
+            "@id": [
+              "dtmi:foo:bar;108675309"
+            ],
+            "name": "vroo_psi",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_um",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;108675309"
+            ],
+            "name": "vroo_wum",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_glikk",
+          "response": {
+            "@id": [
+              "dtmi:foo:bar;999999999"
+            ],
+            "name": "vroo_fuddle",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_quan",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;999999999"
+            ],
+            "name": "vroo_snee",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_floob",
+          "response": {
+            "@id": [
+              "dtmi:foo;1"
+            ],
+            "name": "vroo_spazz",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_flunn",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo;1"
+            ],
+            "name": "vroo_jogg",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "vroo_vroo",
+          "response": {
+            "@id": [
+              "dtmi:foo:bar"
+            ],
+            "name": "vroo_yekk",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "hi_beta",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar"
+            ],
+            "name": "hi_alpha",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "hi_epsilon",
+          "response": {
+            "@id": [
+              "dtmi:foo:bar;3.14"
+            ],
+            "name": "hi_delta",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "hi_theta",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;3.14"
+            ],
+            "name": "hi_eta",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "hi_lambda",
+          "response": {
+            "@id": [
+              "dtmi:foo:bar;3.141592"
+            ],
+            "name": "hi_kappa",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "hi_xi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;3.141592"
+            ],
+            "name": "hi_nu",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponseInvalidKeywordsV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponseInvalidKeywordsV4.json
new file mode 100644
index 00000000..27c5f8f1
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponseInvalidKeywordsV4.json
@@ -0,0 +1,182 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_wum",
+          "response": {
+            "name": "iota_yuzz",
+            "schema": "unsignedInteger",
+            "@graph": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_fuddle",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "iota_humpf",
+            "schema": "unsignedLong",
+            "@graph": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_snee",
+          "response": {
+            "name": "iota_nuh",
+            "schema": "unsignedShort",
+            "@value": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_spazz",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "iota_thnad",
+            "schema": "uuid",
+            "@value": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_jogg",
+          "response": {
+            "name": "iota_zatz",
+            "schema": "boolean",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_yekk",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "iota_itch",
+            "schema": "byte",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_alpha",
+          "response": {
+            "name": "iota_hi",
+            "schema": "bytes",
+            "@foobar": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_delta",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "kappa_gamma",
+            "schema": "date",
+            "@foobar": true
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyCommentStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyCommentStringLengthV4.json
new file mode 100644
index 00000000..2bf12d47
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyCommentStringLengthV4.json
@@ -0,0 +1,69 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "alpha_hi",
+          "response": {
+            "name": "alpha_vroo",
+            "schema": "float",
+            "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "beta_gamma",
+          "response": {
+            "name": "beta_beta",
+            "schema": "integer",
+            "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "beta_zeta",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "beta_epsilon",
+            "schema": "long",
+            "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyCommentStringV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyCommentStringV4.json
new file mode 100644
index 00000000..5015e421
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyCommentStringV4.json
@@ -0,0 +1,498 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "hi_psi",
+          "response": {
+            "name": "hi_chi",
+            "schema": "double",
+            "comment": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "hi_wum",
+          "response": {
+            "name": "hi_yuzz",
+            "schema": "duration",
+            "comment": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "hi_fuddle",
+          "response": {
+            "name": "hi_humpf",
+            "schema": "float",
+            "comment": {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "hi_snee",
+          "response": {
+            "name": "hi_nuh",
+            "schema": "integer",
+            "comment": [
+              {
+                "@value": "hello",
+                "@type": "xsd:string"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "hi_spazz",
+          "response": {
+            "name": "hi_thnad",
+            "schema": "long",
+            "comment": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "hi_jogg",
+          "response": {
+            "name": "hi_zatz",
+            "schema": "short",
+            "comment": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "hi_yekk",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "hi_itch",
+            "schema": "string",
+            "comment": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "alpha_alpha",
+          "response": {
+            "name": "hi_hi",
+            "schema": "time",
+            "comment": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "alpha_delta",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "alpha_gamma",
+            "schema": "unsignedByte",
+            "comment": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "alpha_eta",
+          "response": {
+            "name": "alpha_zeta",
+            "schema": "unsignedInteger",
+            "comment": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "alpha_kappa",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "alpha_iota",
+            "schema": "unsignedLong",
+            "comment": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "alpha_nu",
+          "response": {
+            "name": "alpha_mu",
+            "schema": "unsignedShort",
+            "comment": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "alpha_pi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "alpha_omicron",
+            "schema": "uuid",
+            "comment": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "alpha_tau",
+          "response": {
+            "name": "alpha_sigma",
+            "schema": "boolean",
+            "comment": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "alpha_chi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "alpha_phi",
+            "schema": "byte",
+            "comment": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "alpha_yuzz",
+          "response": {
+            "name": "alpha_omega",
+            "schema": "bytes",
+            "comment": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "alpha_humpf",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "alpha_um",
+            "schema": "date",
+            "comment": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "alpha_nuh",
+          "response": {
+            "name": "alpha_glikk",
+            "schema": "dateTime",
+            "comment": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "alpha_thnad",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "alpha_quan",
+            "schema": "decimal",
+            "comment": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "alpha_zatz",
+          "response": {
+            "name": "alpha_floob",
+            "schema": "double",
+            "comment": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "alpha_itch",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "alpha_flunn",
+            "schema": "duration",
+            "comment": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyCommentTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyCommentTermAndDtmiV4.json
new file mode 100644
index 00000000..470b71db
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyCommentTermAndDtmiV4.json
@@ -0,0 +1,49 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "beta_psi",
+          "response": {
+            "comment": "beta_upsilon",
+            "dtmi:dtdl:property:comment;4": "beta_phi",
+            "name": "beta_chi",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "beta_humpf",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "comment": "beta_yuzz",
+            "dtmi:dtdl:property:comment;4": "beta_wum",
+            "name": "beta_um",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyDescriptionLangStringV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyDescriptionLangStringV4.json
new file mode 100644
index 00000000..87d2f794
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyDescriptionLangStringV4.json
@@ -0,0 +1,578 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "beta_nuh",
+          "response": {
+            "name": "beta_glikk",
+            "schema": "unsignedLong",
+            "description": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "beta_thnad",
+          "response": {
+            "name": "beta_quan",
+            "schema": "unsignedShort",
+            "description": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "beta_zatz",
+          "response": {
+            "name": "beta_floob",
+            "schema": "uuid",
+            "description": {
+              "en": "hello"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "beta_itch",
+          "response": {
+            "name": "beta_flunn",
+            "schema": "boolean",
+            "description": [
+              {
+                "@value": "hello",
+                "@language": "en"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "beta_hi",
+          "response": {
+            "name": "beta_vroo",
+            "schema": "byte",
+            "description": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_gamma",
+          "response": {
+            "name": "gamma_beta",
+            "schema": "bytes",
+            "description": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_zeta",
+          "response": {
+            "name": "gamma_epsilon",
+            "schema": "date",
+            "description": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_iota",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "gamma_theta",
+            "schema": "dateTime",
+            "description": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_mu",
+          "response": {
+            "name": "gamma_lambda",
+            "schema": "decimal",
+            "description": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_omicron",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "gamma_xi",
+            "schema": "double",
+            "description": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_sigma",
+          "response": {
+            "name": "gamma_rho",
+            "schema": "duration",
+            "description": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_phi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "gamma_upsilon",
+            "schema": "float",
+            "description": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_omega",
+          "response": {
+            "name": "gamma_psi",
+            "schema": "integer",
+            "description": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_um",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "gamma_wum",
+            "schema": "long",
+            "description": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_glikk",
+          "response": {
+            "name": "gamma_fuddle",
+            "schema": "short",
+            "description": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_quan",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "gamma_snee",
+            "schema": "string",
+            "description": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_floob",
+          "response": {
+            "name": "gamma_spazz",
+            "schema": "time",
+            "description": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_flunn",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "gamma_jogg",
+            "schema": "unsignedByte",
+            "description": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "gamma_vroo",
+          "response": {
+            "name": "gamma_yekk",
+            "schema": "unsignedInteger",
+            "description": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "delta_beta",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "delta_alpha",
+            "schema": "unsignedLong",
+            "description": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "delta_epsilon",
+          "response": {
+            "name": "delta_delta",
+            "schema": "unsignedShort",
+            "description": {
+              "@value": "hello",
+              "@language": "en"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "delta_theta",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "delta_eta",
+            "schema": "uuid",
+            "description": {
+              "@value": "hello",
+              "@language": "en"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "delta_lambda",
+          "response": {
+            "name": "delta_kappa",
+            "schema": "boolean",
+            "description": [
+              {
+                "en": "hello"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "delta_xi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "delta_nu",
+            "schema": "byte",
+            "description": [
+              {
+                "en": "hello"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyDescriptionStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyDescriptionStringLengthV4.json
new file mode 100644
index 00000000..cfad1650
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyDescriptionStringLengthV4.json
@@ -0,0 +1,69 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "delta_rho",
+          "response": {
+            "name": "delta_pi",
+            "schema": "bytes",
+            "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "delta_upsilon",
+          "response": {
+            "name": "delta_tau",
+            "schema": "date",
+            "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "delta_psi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "delta_chi",
+            "schema": "dateTime",
+            "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyDescriptionTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyDescriptionTermAndDtmiV4.json
new file mode 100644
index 00000000..6824ebd9
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyDescriptionTermAndDtmiV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "delta_itch",
+          "response": {
+            "description": [
+              "delta_zatz"
+            ],
+            "dtmi:dtdl:property:description;4": [
+              "delta_jogg"
+            ],
+            "name": "delta_flunn",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "epsilon_beta",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "description": [
+              "delta_vroo"
+            ],
+            "dtmi:dtdl:property:description;4": [
+              "delta_hi"
+            ],
+            "name": "epsilon_alpha",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyDisplayNameLangStringV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyDisplayNameLangStringV4.json
new file mode 100644
index 00000000..617327af
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyDisplayNameLangStringV4.json
@@ -0,0 +1,578 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "epsilon_epsilon",
+          "response": {
+            "name": "epsilon_delta",
+            "schema": "long",
+            "displayName": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "epsilon_theta",
+          "response": {
+            "name": "epsilon_eta",
+            "schema": "short",
+            "displayName": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "epsilon_lambda",
+          "response": {
+            "name": "epsilon_kappa",
+            "schema": "string",
+            "displayName": {
+              "en": "hello"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "epsilon_xi",
+          "response": {
+            "name": "epsilon_nu",
+            "schema": "time",
+            "displayName": [
+              {
+                "@value": "hello",
+                "@language": "en"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "epsilon_rho",
+          "response": {
+            "name": "epsilon_pi",
+            "schema": "unsignedByte",
+            "displayName": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "epsilon_upsilon",
+          "response": {
+            "name": "epsilon_tau",
+            "schema": "unsignedInteger",
+            "displayName": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "epsilon_psi",
+          "response": {
+            "name": "epsilon_chi",
+            "schema": "unsignedLong",
+            "displayName": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "epsilon_wum",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "epsilon_yuzz",
+            "schema": "unsignedShort",
+            "displayName": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "epsilon_fuddle",
+          "response": {
+            "name": "epsilon_humpf",
+            "schema": "uuid",
+            "displayName": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "epsilon_snee",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "epsilon_nuh",
+            "schema": "boolean",
+            "displayName": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "epsilon_spazz",
+          "response": {
+            "name": "epsilon_thnad",
+            "schema": "byte",
+            "displayName": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "epsilon_jogg",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "epsilon_zatz",
+            "schema": "bytes",
+            "displayName": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "epsilon_yekk",
+          "response": {
+            "name": "epsilon_itch",
+            "schema": "date",
+            "displayName": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_alpha",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "epsilon_hi",
+            "schema": "dateTime",
+            "displayName": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_delta",
+          "response": {
+            "name": "zeta_gamma",
+            "schema": "decimal",
+            "displayName": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_eta",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zeta_zeta",
+            "schema": "double",
+            "displayName": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_kappa",
+          "response": {
+            "name": "zeta_iota",
+            "schema": "duration",
+            "displayName": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_nu",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zeta_mu",
+            "schema": "float",
+            "displayName": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_pi",
+          "response": {
+            "name": "zeta_omicron",
+            "schema": "integer",
+            "displayName": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_tau",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zeta_sigma",
+            "schema": "long",
+            "displayName": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_chi",
+          "response": {
+            "name": "zeta_phi",
+            "schema": "short",
+            "displayName": {
+              "@value": "hello",
+              "@language": "en"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_yuzz",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zeta_omega",
+            "schema": "string",
+            "displayName": {
+              "@value": "hello",
+              "@language": "en"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_humpf",
+          "response": {
+            "name": "zeta_um",
+            "schema": "time",
+            "displayName": [
+              {
+                "en": "hello"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_nuh",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zeta_glikk",
+            "schema": "unsignedByte",
+            "displayName": [
+              {
+                "en": "hello"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyDisplayNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyDisplayNameStringLengthV4.json
new file mode 100644
index 00000000..1a1db6e0
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyDisplayNameStringLengthV4.json
@@ -0,0 +1,69 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_thnad",
+          "response": {
+            "name": "zeta_quan",
+            "schema": "unsignedInteger",
+            "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_zatz",
+          "response": {
+            "name": "zeta_floob",
+            "schema": "unsignedLong",
+            "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zeta_itch",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zeta_flunn",
+            "schema": "unsignedShort",
+            "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyDisplayNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyDisplayNameTermAndDtmiV4.json
new file mode 100644
index 00000000..3d62526d
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyDisplayNameTermAndDtmiV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_xi",
+          "response": {
+            "displayName": [
+              "eta_lambda"
+            ],
+            "dtmi:dtdl:property:displayName;4": [
+              "eta_mu"
+            ],
+            "name": "eta_nu",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_tau",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "displayName": [
+              "eta_pi"
+            ],
+            "dtmi:dtdl:property:displayName;4": [
+              "eta_rho"
+            ],
+            "name": "eta_sigma",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyFormallyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyFormallyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..fe1a0fdf
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyFormallyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,92 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_tau",
+          "response": {
+            "name": "kappa_sigma",
+            "schema": "float",
+            "dtmi:foo:bar;1": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_chi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "kappa_phi",
+            "schema": "integer",
+            "dtmi:foo:bar;1": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_yuzz",
+          "response": {
+            "name": "kappa_omega",
+            "schema": "long",
+            "boolean": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_humpf",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "kappa_um",
+            "schema": "short",
+            "boolean": null
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyFormallyUndefinedTermV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyFormallyUndefinedTermV4.json
new file mode 100644
index 00000000..9ae19edd
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyFormallyUndefinedTermV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "lambda_zeta",
+          "response": {
+            "name": "lambda_epsilon",
+            "schema": "uuid",
+            "foobar": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "lambda_iota",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "lambda_theta",
+            "schema": "boolean",
+            "foobar": {}
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyInvalidDtmiV4.json
new file mode 100644
index 00000000..5713a9c2
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyInvalidDtmiV4.json
@@ -0,0 +1,55 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_nuh",
+          "response": {
+            "@type": [
+              "CommandResponse",
+              "Foobar"
+            ],
+            "name": "kappa_glikk",
+            "schema": "string",
+            "dtmi:foo//bar": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_thnad",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "CommandResponse",
+              "Foobar"
+            ],
+            "name": "kappa_quan",
+            "schema": "time",
+            "dtmi:foo//bar": 626
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNamePatternV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNamePatternV4.json
new file mode 100644
index 00000000..3e10dae1
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNamePatternV4.json
@@ -0,0 +1,537 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_yuzz",
+          "response": {
+            "schema": "bytes",
+            "name": "EARTH"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_um",
+          "response": {
+            "schema": "date",
+            "name": "Air"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_fuddle",
+          "response": {
+            "schema": "dateTime",
+            "name": "fire"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_nuh",
+          "response": {
+            "schema": "decimal",
+            "name": "hello_world"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_quan",
+          "response": {
+            "schema": "double",
+            "name": "Anarchy99"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_spazz",
+          "response": {
+            "schema": "duration",
+            "name": "23skidoo"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_zatz",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "float",
+            "name": "23skidoo"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_flunn",
+          "response": {
+            "schema": "integer",
+            "name": "626"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_yekk",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "long",
+            "name": "626"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_hi",
+          "response": {
+            "schema": "short",
+            "name": "goodbye-world"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "wum_beta",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "string",
+            "name": "goodbye-world"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "wum_delta",
+          "response": {
+            "schema": "time",
+            "name": "_haha"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "wum_zeta",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "unsignedByte",
+            "name": "_haha"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "wum_theta",
+          "response": {
+            "schema": "unsignedInteger",
+            "name": "toodaloo_"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "wum_kappa",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "unsignedLong",
+            "name": "toodaloo_"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "wum_mu",
+          "response": {
+            "schema": "unsignedShort",
+            "name": "pro:con"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "wum_xi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "uuid",
+            "name": "pro:con"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "wum_pi",
+          "response": {
+            "schema": "boolean",
+            "name": "mish/mash"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "wum_sigma",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "byte",
+            "name": "mish/mash"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "wum_upsilon",
+          "response": {
+            "schema": "bytes",
+            "name": "#tag"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "wum_chi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "date",
+            "name": "#tag"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "wum_omega",
+          "response": {
+            "schema": "dateTime",
+            "name": "@tweet"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "wum_wum",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "decimal",
+            "name": "@tweet"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "wum_humpf",
+          "response": {
+            "schema": "double",
+            "name": "$money"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "wum_glikk",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "duration",
+            "name": "$money"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNameStringLengthV4.json
new file mode 100644
index 00000000..8a1f4eec
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNameStringLengthV4.json
@@ -0,0 +1,66 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_tau",
+          "response": {
+            "schema": "uuid",
+            "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_phi",
+          "response": {
+            "schema": "boolean",
+            "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_psi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "byte",
+            "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNameStringV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNameStringV4.json
new file mode 100644
index 00000000..b83ffe2f
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNameStringV4.json
@@ -0,0 +1,499 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_sigma",
+          "response": {
+            "schema": "unsignedInteger",
+            "name": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_upsilon",
+          "response": {
+            "schema": "unsignedLong",
+            "name": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_chi",
+          "response": {
+            "schema": "unsignedShort",
+            "name": {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_omega",
+          "response": {
+            "schema": "uuid",
+            "name": [
+              {
+                "@value": "hello",
+                "@type": "xsd:string"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_wum",
+          "response": {
+            "schema": "boolean",
+            "name": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_humpf",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "byte",
+            "name": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_glikk",
+          "response": {
+            "schema": "bytes",
+            "name": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_snee",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "date",
+            "name": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_thnad",
+          "response": {
+            "schema": "dateTime",
+            "name": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_floob",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "decimal",
+            "name": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_jogg",
+          "response": {
+            "schema": "double",
+            "name": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_itch",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "duration",
+            "name": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_vroo",
+          "response": {
+            "schema": "float",
+            "name": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_alpha",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "integer",
+            "name": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_gamma",
+          "response": {
+            "schema": "long",
+            "name": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_epsilon",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "short",
+            "name": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_eta",
+          "response": {
+            "schema": "string",
+            "name": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_iota",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "time",
+            "name": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_lambda",
+          "response": {
+            "schema": "unsignedByte",
+            "name": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_nu",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "unsignedInteger",
+            "name": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_omicron",
+          "response": {
+            "schema": "unsignedLong",
+            "name": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "yuzz_rho",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "unsignedShort",
+            "name": []
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNameTermAndDtmiV4.json
new file mode 100644
index 00000000..dde08e66
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNameTermAndDtmiV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "wum_hi",
+          "response": {
+            "name": "wum_yekk",
+            "dtmi:dtdl:property:name;4": "wum_vroo",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "um_delta",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "um_beta",
+            "dtmi:dtdl:property:name;4": "um_gamma",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNotDtmiNorTermV4.json
new file mode 100644
index 00000000..60f31b96
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNotDtmiNorTermV4.json
@@ -0,0 +1,55 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_zatz",
+          "response": {
+            "@type": [
+              "CommandResponse",
+              "Foobar"
+            ],
+            "name": "kappa_floob",
+            "schema": "unsignedByte",
+            "http://foo.com/bar": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "kappa_itch",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "CommandResponse",
+              "Foobar"
+            ],
+            "name": "kappa_flunn",
+            "schema": "unsignedInteger",
+            "http://foo.com/bar": true
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNullableBooleanV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNullableBooleanV4.json
new file mode 100644
index 00000000..6b043387
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNullableBooleanV4.json
@@ -0,0 +1,596 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_chi",
+          "response": {
+            "name": "eta_phi",
+            "schema": "dateTime",
+            "nullable": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_yuzz",
+          "response": {
+            "name": "eta_omega",
+            "schema": "decimal",
+            "nullable": false
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_humpf",
+          "response": {
+            "name": "eta_um",
+            "schema": "double",
+            "nullable": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_nuh",
+          "response": {
+            "name": "eta_glikk",
+            "schema": "duration",
+            "nullable": [
+              false
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_thnad",
+          "response": {
+            "name": "eta_quan",
+            "schema": "float",
+            "nullable": {
+              "@value": true,
+              "@type": "xsd:boolean"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_zatz",
+          "response": {
+            "name": "eta_floob",
+            "schema": "integer",
+            "nullable": {
+              "@value": false,
+              "@type": "xsd:boolean"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_itch",
+          "response": {
+            "name": "eta_flunn",
+            "schema": "long",
+            "nullable": [
+              {
+                "@value": true,
+                "@type": "xsd:boolean"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "eta_hi",
+          "response": {
+            "name": "eta_vroo",
+            "schema": "short",
+            "nullable": [
+              {
+                "@value": false,
+                "@type": "xsd:boolean"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_gamma",
+          "response": {
+            "name": "theta_beta",
+            "schema": "string",
+            "nullable": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_zeta",
+          "response": {
+            "name": "theta_epsilon",
+            "schema": "time",
+            "nullable": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_iota",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "theta_theta",
+            "schema": "unsignedByte",
+            "nullable": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_mu",
+          "response": {
+            "name": "theta_lambda",
+            "schema": "unsignedInteger",
+            "nullable": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_omicron",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "theta_xi",
+            "schema": "unsignedLong",
+            "nullable": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_sigma",
+          "response": {
+            "name": "theta_rho",
+            "schema": "unsignedShort",
+            "nullable": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_phi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "theta_upsilon",
+            "schema": "uuid",
+            "nullable": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_omega",
+          "response": {
+            "name": "theta_psi",
+            "schema": "boolean",
+            "nullable": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_um",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "theta_wum",
+            "schema": "byte",
+            "nullable": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_glikk",
+          "response": {
+            "name": "theta_fuddle",
+            "schema": "bytes",
+            "nullable": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_quan",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "theta_snee",
+            "schema": "date",
+            "nullable": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_floob",
+          "response": {
+            "name": "theta_spazz",
+            "schema": "dateTime",
+            "nullable": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_flunn",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "theta_jogg",
+            "schema": "decimal",
+            "nullable": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "theta_vroo",
+          "response": {
+            "name": "theta_yekk",
+            "schema": "double",
+            "nullable": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_beta",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "iota_alpha",
+            "schema": "duration",
+            "nullable": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_epsilon",
+          "response": {
+            "name": "iota_delta",
+            "schema": "float",
+            "nullable": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_theta",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "iota_eta",
+            "schema": "integer",
+            "nullable": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNullableTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNullableTermAndDtmiV4.json
new file mode 100644
index 00000000..07834866
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertyNullableTermAndDtmiV4.json
@@ -0,0 +1,49 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_upsilon",
+          "response": {
+            "name": "iota_tau",
+            "nullable": false,
+            "dtmi:dtdl:property:nullable;4": true,
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "iota_psi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "iota_chi",
+            "nullable": false,
+            "dtmi:dtdl:property:nullable;4": true,
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponsePropertySchemaElementV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertySchemaElementV4.json
new file mode 100644
index 00000000..876642b8
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertySchemaElementV4.json
@@ -0,0 +1,861 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_iota;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_theta;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "um_eta",
+            "response": {
+              "name": "um_zeta",
+              "schema": {
+                "@type": "Array",
+                "elementSchema": "time"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_nu;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_mu;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "um_lambda",
+            "response": {
+              "name": "um_kappa",
+              "schema": [
+                {
+                  "@type": "Array",
+                  "elementSchema": "unsignedByte"
+                }
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Array",
+          "elementSchema": "unsignedInteger"
+        },
+        "contents": {
+          "@type": "Command",
+          "name": "um_pi",
+          "response": {
+            "name": "um_omicron",
+            "schema": "dtmi:ex:dependentRef;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Array",
+          "elementSchema": "unsignedLong"
+        },
+        "contents": {
+          "@type": "Command",
+          "name": "um_tau",
+          "response": {
+            "name": "um_sigma",
+            "schema": [
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_omega;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_psi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "um_chi",
+            "response": {
+              "name": "um_phi",
+              "schema": {
+                "@id": "dtmi:example:um_upsilon;1",
+                "@type": "Array",
+                "elementSchema": "long",
+                "@context": "dtmi:dtdl:context;2"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_fuddle;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_humpf;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Command",
+            "name": "um_um",
+            "response": {
+              "name": "um_wum",
+              "schema": {
+                "@id": "dtmi:example:um_yuzz;1",
+                "@type": "Array",
+                "elementSchema": "string",
+                "@context": "dtmi:dtdl:context;3"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Array",
+          "elementSchema": "byte"
+        },
+        "contents": {
+          "@type": "Command",
+          "name": "um_snee",
+          "response": {
+            "name": "um_nuh",
+            "schema": [
+              {
+                "@type": "Array",
+                "elementSchema": "boolean"
+              },
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Array",
+          "elementSchema": "date"
+        },
+        "contents": {
+          "@type": "Command",
+          "name": "um_spazz",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "um_thnad",
+            "schema": [
+              {
+                "@type": "Array",
+                "elementSchema": "bytes"
+              },
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "um_zatz",
+          "response": {
+            "name": "um_floob",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "um_itch",
+          "response": {
+            "name": "um_flunn",
+            "schema": [
+              "dateTime"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "um_hi",
+          "response": {
+            "name": "um_vroo",
+            "schema": "dtmi:dtdl:instance:Schema:dateTime;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "humpf_gamma",
+          "response": {
+            "name": "humpf_beta",
+            "schema": [
+              "dtmi:dtdl:instance:Schema:dateTime;4"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "humpf_zeta",
+          "response": {
+            "name": "humpf_epsilon",
+            "schema": "point"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "humpf_iota",
+          "response": {
+            "name": "humpf_theta",
+            "schema": [
+              "point"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "humpf_mu",
+          "response": {
+            "name": "humpf_lambda",
+            "schema": "dtmi:standard:schema:geospatial:point;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "humpf_omicron",
+          "response": {
+            "name": "humpf_xi",
+            "schema": [
+              "dtmi:standard:schema:geospatial:point;4"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "humpf_sigma",
+          "response": {
+            "name": "humpf_rho",
+            "schema": "Foobar"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "humpf_phi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "humpf_upsilon",
+            "schema": "Foobar"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "humpf_omega",
+          "response": {
+            "name": "humpf_psi",
+            "schema": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "humpf_um",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "humpf_wum",
+            "schema": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "humpf_glikk",
+          "response": {
+            "name": "humpf_fuddle",
+            "schema": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "humpf_quan",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "humpf_snee",
+            "schema": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "humpf_floob",
+          "response": {
+            "name": "humpf_spazz",
+            "schema": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "humpf_flunn",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "humpf_jogg",
+            "schema": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "humpf_vroo",
+          "response": {
+            "name": "humpf_yekk",
+            "schema": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "fuddle_beta",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "fuddle_alpha",
+            "schema": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "fuddle_epsilon",
+          "response": {
+            "name": "fuddle_delta",
+            "schema": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "fuddle_theta",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "fuddle_eta",
+            "schema": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "fuddle_lambda",
+          "response": {
+            "name": "fuddle_kappa",
+            "schema": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "fuddle_xi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "fuddle_nu",
+            "schema": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "fuddle_rho",
+          "response": {
+            "name": "fuddle_pi",
+            "schema": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "fuddle_upsilon",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "fuddle_tau",
+            "schema": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "fuddle_psi",
+          "response": {
+            "name": "fuddle_chi",
+            "schema": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "fuddle_wum",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "fuddle_yuzz",
+            "schema": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "fuddle_fuddle",
+          "response": {
+            "name": "fuddle_humpf",
+            "schema": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "fuddle_snee",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "fuddle_nuh",
+            "schema": []
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponsePropertySchemaTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertySchemaTermAndDtmiV4.json
new file mode 100644
index 00000000..94e1c4e2
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertySchemaTermAndDtmiV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "quan_glikk",
+          "response": {
+            "name": "quan_fuddle",
+            "schema": "bytes",
+            "dtmi:dtdl:property:schema;4": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "quan_quan",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "quan_snee",
+            "schema": "dateTime",
+            "dtmi:dtdl:property:schema;4": "decimal"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponsePropertySchemaTypeConformanceV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertySchemaTypeConformanceV4.json
new file mode 100644
index 00000000..183ec563
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponsePropertySchemaTypeConformanceV4.json
@@ -0,0 +1,742 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "glikk_alpha",
+          "response": {
+            "name": "fuddle_hi",
+            "schema": {
+              "@id": "dtmi:example:fuddle_vroo;1",
+              "elementSchema": "dateTime",
+              "@type": "Array"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "glikk_zeta",
+          "response": {
+            "name": "glikk_epsilon",
+            "schema": {
+              "@id": "dtmi:example:glikk_gamma;1",
+              "name": "glikk_delta",
+              "@type": "Command"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "glikk_lambda",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "glikk_kappa",
+            "schema": {
+              "@id": "dtmi:example:glikk_theta;1",
+              "name": "glikk_iota",
+              "@type": "Command"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "glikk_pi",
+          "response": {
+            "name": "glikk_omicron",
+            "schema": {
+              "@id": "dtmi:example:glikk_nu;1",
+              "name": "glikk_xi",
+              "schema": "decimal",
+              "@type": "CommandRequest"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "glikk_phi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "glikk_upsilon",
+            "schema": {
+              "@id": "dtmi:example:glikk_sigma;1",
+              "name": "glikk_tau",
+              "schema": "double",
+              "@type": "CommandRequest"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "glikk_wum",
+          "response": {
+            "name": "glikk_yuzz",
+            "schema": {
+              "@id": "dtmi:example:glikk_psi;1",
+              "name": "glikk_omega",
+              "schema": "duration",
+              "@type": "CommandResponse"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "glikk_nuh",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "glikk_glikk",
+            "schema": {
+              "@id": "dtmi:example:glikk_humpf;1",
+              "name": "glikk_fuddle",
+              "schema": "float",
+              "@type": "CommandResponse"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "glikk_zatz",
+          "response": {
+            "name": "glikk_floob",
+            "schema": {
+              "@id": "dtmi:example:glikk_quan;1",
+              "name": "glikk_thnad",
+              "schema": {
+                "@id": "dtmi:example:glikk_spazz;1",
+                "@type": "Interface"
+              },
+              "@type": "Component"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "glikk_hi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "glikk_vroo",
+            "schema": {
+              "@id": "dtmi:example:glikk_flunn;1",
+              "name": "glikk_itch",
+              "schema": {
+                "@id": "dtmi:example:glikk_yekk;1",
+                "@type": "Interface"
+              },
+              "@type": "Component"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nuh_delta",
+          "response": {
+            "name": "nuh_gamma",
+            "schema": {
+              "@id": "dtmi:example:nuh_beta;1",
+              "valueSchema": "integer",
+              "@type": "Enum"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nuh_iota",
+          "response": {
+            "name": "nuh_theta",
+            "schema": {
+              "@id": "dtmi:example:nuh_zeta;1",
+              "enumValue": 1514,
+              "name": "nuh_eta",
+              "@type": "EnumValue"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nuh_xi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "nuh_nu",
+            "schema": {
+              "@id": "dtmi:example:nuh_lambda;1",
+              "enumValue": 1515,
+              "name": "nuh_mu",
+              "@type": "EnumValue"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nuh_tau",
+          "response": {
+            "name": "nuh_sigma",
+            "schema": {
+              "@id": "dtmi:example:nuh_pi;1",
+              "name": "nuh_rho",
+              "schema": "integer",
+              "@type": "Field"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nuh_omega",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "nuh_psi",
+            "schema": {
+              "@id": "dtmi:example:nuh_phi;1",
+              "name": "nuh_chi",
+              "schema": "long",
+              "@type": "Field"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nuh_humpf",
+          "response": {
+            "name": "nuh_um",
+            "schema": {
+              "@id": "dtmi:example:nuh_wum;1",
+              "@type": "Interface"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nuh_snee",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "nuh_nuh",
+            "schema": {
+              "@id": "dtmi:example:nuh_glikk;1",
+              "@type": "Interface"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nuh_jogg",
+          "response": {
+            "name": "nuh_zatz",
+            "schema": {
+              "@id": "dtmi:example:nuh_thnad;1",
+              "mapKey": {
+                "name": "nuh_spazz",
+                "schema": "string"
+              },
+              "mapValue": {
+                "name": "nuh_floob",
+                "schema": "short"
+              },
+              "@type": "Map"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "nuh_hi",
+          "response": {
+            "name": "nuh_vroo",
+            "schema": {
+              "@id": "dtmi:example:nuh_itch;1",
+              "name": "nuh_yekk",
+              "schema": "string",
+              "@type": "MapKey"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "snee_epsilon",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "snee_delta",
+            "schema": {
+              "@id": "dtmi:example:snee_beta;1",
+              "name": "snee_gamma",
+              "schema": "string",
+              "@type": "MapKey"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "snee_kappa",
+          "response": {
+            "name": "snee_iota",
+            "schema": {
+              "@id": "dtmi:example:snee_eta;1",
+              "name": "snee_theta",
+              "schema": "string",
+              "@type": "MapValue"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "snee_omicron",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "snee_xi",
+            "schema": {
+              "@id": "dtmi:example:snee_mu;1",
+              "name": "snee_nu",
+              "schema": "time",
+              "@type": "MapValue"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "snee_tau",
+          "response": {
+            "name": "snee_sigma",
+            "schema": {
+              "@id": "dtmi:example:snee_rho;1",
+              "@type": "Object"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "snee_omega",
+          "response": {
+            "name": "snee_psi",
+            "schema": {
+              "@id": "dtmi:example:snee_phi;1",
+              "name": "snee_chi",
+              "schema": "unsignedByte",
+              "@type": "Property"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "snee_fuddle",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "snee_humpf",
+            "schema": {
+              "@id": "dtmi:example:snee_wum;1",
+              "name": "snee_um",
+              "schema": "unsignedInteger",
+              "@type": "Property"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "snee_thnad",
+          "response": {
+            "name": "snee_quan",
+            "schema": {
+              "@id": "dtmi:example:snee_nuh;1",
+              "name": "snee_snee",
+              "@type": "Relationship"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "snee_flunn",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "snee_jogg",
+            "schema": {
+              "@id": "dtmi:example:snee_floob;1",
+              "name": "snee_zatz",
+              "@type": "Relationship"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "quan_alpha",
+          "response": {
+            "name": "snee_hi",
+            "schema": {
+              "@id": "dtmi:example:snee_yekk;1",
+              "name": "snee_vroo",
+              "schema": "unsignedLong",
+              "@type": "Telemetry"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "quan_zeta",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "quan_epsilon",
+            "schema": {
+              "@id": "dtmi:example:quan_gamma;1",
+              "name": "quan_delta",
+              "schema": "unsignedShort",
+              "@type": "Telemetry"
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponseRequiredPropertiesV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponseRequiredPropertiesV4.json
new file mode 100644
index 00000000..6af8c58e
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponseRequiredPropertiesV4.json
@@ -0,0 +1,84 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_theta",
+          "response": {
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_kappa",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_nu",
+          "response": {
+            "name": "omega_mu"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "omega_pi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "omega_omicron"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponseTypeIncludesInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponseTypeIncludesInvalidDtmiV4.json
new file mode 100644
index 00000000..3b2252f0
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponseTypeIncludesInvalidDtmiV4.json
@@ -0,0 +1,53 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_eta",
+          "response": {
+            "@type": [
+              "CommandResponse",
+              "dtmi:foo//bar"
+            ],
+            "name": "jogg_zeta",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_kappa",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "CommandResponse",
+              "dtmi:foo//bar"
+            ],
+            "name": "jogg_iota",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponseTypeIncludesMaterialV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponseTypeIncludesMaterialV4.json
new file mode 100644
index 00000000..e25d8e75
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponseTypeIncludesMaterialV4.json
@@ -0,0 +1,188 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "floob_vroo",
+          "response": {
+            "name": "floob_yekk",
+            "schema": "duration",
+            "@type": "CommandResponse"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_beta",
+          "response": {
+            "name": "zatz_alpha",
+            "schema": "float",
+            "@type": [
+              "CommandResponse"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_epsilon",
+          "response": {
+            "name": "zatz_delta",
+            "schema": "integer",
+            "@type": "dtmi:dtdl:class:CommandResponse;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_theta",
+          "response": {
+            "name": "zatz_eta",
+            "schema": "long",
+            "@type": [
+              "dtmi:dtdl:class:CommandResponse;4"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_lambda",
+          "response": {
+            "name": "zatz_kappa",
+            "schema": "short",
+            "@type": "Something"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_xi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zatz_nu",
+            "schema": "string",
+            "@type": "Something"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_rho",
+          "response": {
+            "name": "zatz_pi",
+            "schema": "time",
+            "@type": [
+              "Something"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "zatz_upsilon",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zatz_tau",
+            "schema": "unsignedByte",
+            "@type": [
+              "Something"
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponseTypeIncludesNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponseTypeIncludesNotDtmiNorTermV4.json
new file mode 100644
index 00000000..5927b147
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponseTypeIncludesNotDtmiNorTermV4.json
@@ -0,0 +1,53 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_nu",
+          "response": {
+            "@type": [
+              "CommandResponse",
+              "http://foo.com/bar"
+            ],
+            "name": "jogg_mu",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "jogg_pi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "CommandResponse",
+              "http://foo.com/bar"
+            ],
+            "name": "jogg_omicron",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandResponseTypeStringOrArrayV4.json b/DTDL/v4/spec/Requirement-ClassCommandResponseTypeStringOrArrayV4.json
new file mode 100644
index 00000000..53ace177
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandResponseTypeStringOrArrayV4.json
@@ -0,0 +1,378 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "spazz_zatz",
+          "response": {
+            "name": "spazz_floob",
+            "schema": "long",
+            "@type": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "spazz_itch",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "spazz_flunn",
+            "schema": "short",
+            "@type": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "spazz_hi",
+          "response": {
+            "name": "spazz_vroo",
+            "schema": "string",
+            "@type": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "floob_gamma",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "floob_beta",
+            "schema": "time",
+            "@type": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "floob_zeta",
+          "response": {
+            "name": "floob_epsilon",
+            "schema": "unsignedByte",
+            "@type": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "floob_iota",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "floob_theta",
+            "schema": "unsignedInteger",
+            "@type": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "floob_mu",
+          "response": {
+            "name": "floob_lambda",
+            "schema": "unsignedLong",
+            "@type": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "floob_omicron",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "floob_xi",
+            "schema": "unsignedShort",
+            "@type": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "floob_sigma",
+          "response": {
+            "name": "floob_rho",
+            "schema": "uuid",
+            "@type": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "floob_phi",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "floob_upsilon",
+            "schema": "boolean",
+            "@type": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "floob_omega",
+          "response": {
+            "name": "floob_psi",
+            "schema": "byte",
+            "@type": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "floob_um",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "floob_wum",
+            "schema": "bytes",
+            "@type": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "floob_glikk",
+          "response": {
+            "name": "floob_fuddle",
+            "schema": "date",
+            "@type": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "floob_quan",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "floob_snee",
+            "schema": "dateTime",
+            "@type": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "floob_floob",
+          "response": {
+            "name": "floob_spazz",
+            "schema": "decimal",
+            "@type": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Command",
+          "name": "floob_flunn",
+          "response": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "floob_jogg",
+            "schema": "double",
+            "@type": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandTypeIncludesInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassCommandTypeIncludesInvalidDtmiV4.json
new file mode 100644
index 00000000..cdc182e6
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandTypeIncludesInvalidDtmiV4.json
@@ -0,0 +1,43 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Command",
+            "dtmi:foo//bar"
+          ],
+          "name": "theta_vroo"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Command",
+            "dtmi:foo//bar"
+          ],
+          "name": "iota_alpha"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandTypeIncludesMaterialV4.json b/DTDL/v4/spec/Requirement-ClassCommandTypeIncludesMaterialV4.json
new file mode 100644
index 00000000..08fde830
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandTypeIncludesMaterialV4.json
@@ -0,0 +1,148 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "theta_theta",
+          "@type": "Command"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "theta_kappa",
+          "@type": [
+            "Command"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "theta_mu",
+          "@type": "dtmi:dtdl:class:Command;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "theta_xi",
+          "@type": [
+            "dtmi:dtdl:class:Command;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "theta_pi",
+          "@type": "Something"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "theta_sigma",
+          "@type": "Something"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "theta_upsilon",
+          "@type": [
+            "Something"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "theta_chi",
+          "@type": [
+            "Something"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandTypeIncludesNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassCommandTypeIncludesNotDtmiNorTermV4.json
new file mode 100644
index 00000000..4b49f020
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandTypeIncludesNotDtmiNorTermV4.json
@@ -0,0 +1,43 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Command",
+            "http://foo.com/bar"
+          ],
+          "name": "iota_gamma"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Command",
+            "http://foo.com/bar"
+          ],
+          "name": "iota_epsilon"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassCommandTypeStringOrArrayV4.json b/DTDL/v4/spec/Requirement-ClassCommandTypeStringOrArrayV4.json
new file mode 100644
index 00000000..6daaa00e
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassCommandTypeStringOrArrayV4.json
@@ -0,0 +1,298 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "eta_tau",
+          "@type": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "eta_phi",
+          "@type": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "eta_psi",
+          "@type": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "eta_yuzz",
+          "@type": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "eta_um",
+          "@type": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "eta_fuddle",
+          "@type": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "eta_nuh",
+          "@type": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "eta_quan",
+          "@type": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "eta_spazz",
+          "@type": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "eta_zatz",
+          "@type": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "eta_flunn",
+          "@type": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "eta_yekk",
+          "@type": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "eta_hi",
+          "@type": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "theta_beta",
+          "@type": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "theta_delta",
+          "@type": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "theta_zeta",
+          "@type": [
+            {}
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentContextConformsV4.json b/DTDL/v4/spec/Requirement-ClassComponentContextConformsV4.json
new file mode 100644
index 00000000..84115b52
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentContextConformsV4.json
@@ -0,0 +1,434 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_itch;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:phi_flunn;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "phi_zatz",
+            "schema": {
+              "@id": "dtmi:example:phi_jogg;1",
+              "@type": "Interface"
+            },
+            "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_alpha;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:phi_hi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "phi_yekk",
+            "schema": {
+              "@id": "dtmi:example:phi_vroo;1",
+              "@type": "Interface"
+            },
+            "@context": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_epsilon;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:chi_delta;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "chi_beta",
+            "schema": {
+              "@id": "dtmi:example:chi_gamma;1",
+              "@type": "Interface"
+            },
+            "@context": [
+              "dtmi:dtdl:extension:quantitativeTypes;1"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_iota;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:chi_theta;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "chi_zeta",
+            "schema": {
+              "@id": "dtmi:example:chi_eta;1",
+              "@type": "Interface"
+            },
+            "@context": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_nu;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:chi_mu;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "chi_kappa",
+            "schema": {
+              "@id": "dtmi:example:chi_lambda;1",
+              "@type": "Interface"
+            },
+            "@context": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_rho;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:chi_pi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "chi_xi",
+            "schema": {
+              "@id": "dtmi:example:chi_omicron;1",
+              "@type": "Interface"
+            },
+            "@context": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_phi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:chi_upsilon;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "chi_sigma",
+            "schema": {
+              "@id": "dtmi:example:chi_tau;1",
+              "@type": "Interface"
+            },
+            "@context": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_yuzz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:chi_omega;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "chi_chi",
+            "schema": {
+              "@id": "dtmi:example:chi_psi;1",
+              "@type": "Interface"
+            },
+            "@context": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_fuddle;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:chi_humpf;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "chi_wum",
+            "schema": {
+              "@id": "dtmi:example:chi_um;1",
+              "@type": "Interface"
+            },
+            "@context": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_quan;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:chi_snee;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "chi_glikk",
+            "schema": {
+              "@id": "dtmi:example:chi_nuh;1",
+              "@type": "Interface"
+            },
+            "@context": "dtmi:dtdl:extension:quantitativeTypes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_zatz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:chi_floob;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "chi_thnad",
+            "schema": {
+              "@id": "dtmi:example:chi_spazz;1",
+              "@type": "Interface"
+            },
+            "@context": "http://dtdl/extension/quantitativeTypes/1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_yekk;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:chi_itch;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "chi_jogg",
+            "schema": {
+              "@id": "dtmi:example:chi_flunn;1",
+              "@type": "Interface"
+            },
+            "@context": "quantitativeTypes;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_beta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:psi_alpha;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "chi_vroo",
+            "schema": {
+              "@id": "dtmi:example:chi_hi;1",
+              "@type": "Interface"
+            },
+            "@context": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_zeta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:psi_epsilon;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "psi_gamma",
+            "schema": {
+              "@id": "dtmi:example:psi_delta;1",
+              "@type": "Interface"
+            },
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_kappa;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:psi_iota;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "psi_eta",
+            "schema": {
+              "@id": "dtmi:example:psi_theta;1",
+              "@type": "Interface"
+            },
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_xi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:psi_nu;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "psi_lambda",
+            "schema": {
+              "@id": "dtmi:example:psi_mu;1",
+              "@type": "Interface"
+            },
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentIdDuplicateV4.json b/DTDL/v4/spec/Requirement-ClassComponentIdDuplicateV4.json
new file mode 100644
index 00000000..32f4fcd0
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentIdDuplicateV4.json
@@ -0,0 +1,55 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_eta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:humpf_eta;1",
+          "@type": "Interface",
+          "contents": {
+            "@id": "dtmi:example:humpf_eta;1",
+            "@type": "Component",
+            "name": "humpf_theta",
+            "schema": {
+              "@id": "dtmi:example:humpf_iota;1",
+              "@type": "Interface"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_kappa;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:humpf_kappa;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:example:humpf_kappa;1",
+            "@type": "Component",
+            "name": "humpf_lambda",
+            "schema": {
+              "@id": "dtmi:example:humpf_mu;1",
+              "@type": "Interface"
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentIdIsDtmiV4.json b/DTDL/v4/spec/Requirement-ClassComponentIdIsDtmiV4.json
new file mode 100644
index 00000000..93155889
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentIdIsDtmiV4.json
@@ -0,0 +1,1240 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;7",
+          "@type": "Component",
+          "name": "psi_omicron",
+          "schema": {
+            "@id": "dtmi:example:psi_pi;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;108675309",
+          "@type": "Component",
+          "name": "psi_sigma",
+          "schema": {
+            "@id": "dtmi:example:psi_tau;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;999999999",
+          "@type": "Component",
+          "name": "psi_phi",
+          "schema": {
+            "@id": "dtmi:example:psi_chi;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo;1",
+          "@type": "Component",
+          "name": "psi_omega",
+          "schema": {
+            "@id": "dtmi:example:psi_yuzz;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar",
+          "@type": "Component",
+          "name": "psi_um",
+          "schema": {
+            "@id": "dtmi:example:psi_humpf;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;3.14",
+          "@type": "Component",
+          "name": "psi_glikk",
+          "schema": {
+            "@id": "dtmi:example:psi_nuh;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;3.141592",
+          "@type": "Component",
+          "name": "psi_quan",
+          "schema": {
+            "@id": "dtmi:example:psi_thnad;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": null,
+          "@type": "Component",
+          "name": "psi_floob",
+          "schema": {
+            "@id": "dtmi:example:psi_zatz;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": null,
+          "@type": "Component",
+          "name": "psi_flunn",
+          "schema": {
+            "@id": "dtmi:example:psi_itch;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": 626,
+          "@type": "Component",
+          "name": "psi_vroo",
+          "schema": {
+            "@id": "dtmi:example:psi_hi;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": 626,
+          "@type": "Component",
+          "name": "omega_beta",
+          "schema": {
+            "@id": "dtmi:example:omega_gamma;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": true,
+          "@type": "Component",
+          "name": "omega_epsilon",
+          "schema": {
+            "@id": "dtmi:example:omega_zeta;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": true,
+          "@type": "Component",
+          "name": "omega_theta",
+          "schema": {
+            "@id": "dtmi:example:omega_iota;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": {
+            "@value": "dtmi:apparently:valid:identifier;3"
+          },
+          "@type": "Component",
+          "name": "omega_lambda",
+          "schema": {
+            "@id": "dtmi:example:omega_mu;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": {
+            "@value": "dtmi:apparently:valid:identifier;3"
+          },
+          "@type": "Component",
+          "name": "omega_xi",
+          "schema": {
+            "@id": "dtmi:example:omega_omicron;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;0",
+          "@type": "Component",
+          "name": "omega_rho",
+          "schema": {
+            "@id": "dtmi:example:omega_sigma;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0",
+          "@type": "Component",
+          "name": "omega_upsilon",
+          "schema": {
+            "@id": "dtmi:example:omega_phi;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;0.0",
+          "@type": "Component",
+          "name": "omega_psi",
+          "schema": {
+            "@id": "dtmi:example:omega_omega;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0.0",
+          "@type": "Component",
+          "name": "omega_wum",
+          "schema": {
+            "@id": "dtmi:example:omega_um;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;1234567890",
+          "@type": "Component",
+          "name": "omega_fuddle",
+          "schema": {
+            "@id": "dtmi:example:omega_glikk;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;1234567890",
+          "@type": "Component",
+          "name": "omega_snee",
+          "schema": {
+            "@id": "dtmi:example:omega_quan;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;1a",
+          "@type": "Component",
+          "name": "omega_spazz",
+          "schema": {
+            "@id": "dtmi:example:omega_floob;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;1a",
+          "@type": "Component",
+          "name": "omega_jogg",
+          "schema": {
+            "@id": "dtmi:example:omega_flunn;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;3.0",
+          "@type": "Component",
+          "name": "omega_yekk",
+          "schema": {
+            "@id": "dtmi:example:omega_vroo;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;3.0",
+          "@type": "Component",
+          "name": "yuzz_alpha",
+          "schema": {
+            "@id": "dtmi:example:yuzz_beta;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;3.1415926",
+          "@type": "Component",
+          "name": "yuzz_delta",
+          "schema": {
+            "@id": "dtmi:example:yuzz_epsilon;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;3.1415926",
+          "@type": "Component",
+          "name": "yuzz_eta",
+          "schema": {
+            "@id": "dtmi:example:yuzz_theta;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;6.02",
+          "@type": "Component",
+          "name": "yuzz_kappa",
+          "schema": {
+            "@id": "dtmi:example:yuzz_lambda;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;6.02",
+          "@type": "Component",
+          "name": "yuzz_nu",
+          "schema": {
+            "@id": "dtmi:example:yuzz_xi;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;0.1",
+          "@type": "Component",
+          "name": "yuzz_pi",
+          "schema": {
+            "@id": "dtmi:example:yuzz_rho;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0.1",
+          "@type": "Component",
+          "name": "yuzz_tau",
+          "schema": {
+            "@id": "dtmi:example:yuzz_upsilon;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;01",
+          "@type": "Component",
+          "name": "yuzz_chi",
+          "schema": {
+            "@id": "dtmi:example:yuzz_psi;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;01",
+          "@type": "Component",
+          "name": "yuzz_yuzz",
+          "schema": {
+            "@id": "dtmi:example:yuzz_wum;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;",
+          "@type": "Component",
+          "name": "yuzz_humpf",
+          "schema": {
+            "@id": "dtmi:example:yuzz_fuddle;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;",
+          "@type": "Component",
+          "name": "yuzz_nuh",
+          "schema": {
+            "@id": "dtmi:example:yuzz_snee;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:test:invalidId_;1",
+          "@type": "Component",
+          "name": "yuzz_thnad",
+          "schema": {
+            "@id": "dtmi:example:yuzz_spazz;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:invalidId_;1",
+          "@type": "Component",
+          "name": "yuzz_zatz",
+          "schema": {
+            "@id": "dtmi:example:yuzz_jogg;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:test:_invalidUserId;1",
+          "@type": "Component",
+          "name": "yuzz_itch",
+          "schema": {
+            "@id": "dtmi:example:yuzz_yekk;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:_invalidUserId;1",
+          "@type": "Component",
+          "name": "yuzz_hi",
+          "schema": {
+            "@id": "dtmi:example:wum_alpha;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:test:1seg;1",
+          "@type": "Component",
+          "name": "wum_gamma",
+          "schema": {
+            "@id": "dtmi:example:wum_delta;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:1seg;1",
+          "@type": "Component",
+          "name": "wum_zeta",
+          "schema": {
+            "@id": "dtmi:example:wum_eta;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar.baz;1",
+          "@type": "Component",
+          "name": "wum_iota",
+          "schema": {
+            "@id": "dtmi:example:wum_kappa;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar.baz;1",
+          "@type": "Component",
+          "name": "wum_mu",
+          "schema": {
+            "@id": "dtmi:example:wum_nu;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo::bar;1",
+          "@type": "Component",
+          "name": "wum_omicron",
+          "schema": {
+            "@id": "dtmi:example:wum_pi;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo::bar;1",
+          "@type": "Component",
+          "name": "wum_sigma",
+          "schema": {
+            "@id": "dtmi:example:wum_tau;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "urn:foo:bar:1",
+          "@type": "Component",
+          "name": "wum_phi",
+          "schema": {
+            "@id": "dtmi:example:wum_chi;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "urn:foo:bar:1",
+          "@type": "Component",
+          "name": "wum_omega",
+          "schema": {
+            "@id": "dtmi:example:wum_yuzz;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "http://foo/bar/baz",
+          "@type": "Component",
+          "name": "wum_um",
+          "schema": {
+            "@id": "dtmi:example:wum_humpf;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "http://foo/bar/baz",
+          "@type": "Component",
+          "name": "wum_glikk",
+          "schema": {
+            "@id": "dtmi:example:wum_nuh;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:;1",
+          "@type": "Component",
+          "name": "wum_quan",
+          "schema": {
+            "@id": "dtmi:example:wum_thnad;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:;1",
+          "@type": "Component",
+          "name": "wum_floob",
+          "schema": {
+            "@id": "dtmi:example:wum_zatz;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:dtdl:example;1",
+          "@type": "Component",
+          "name": "wum_flunn",
+          "schema": {
+            "@id": "dtmi:example:wum_itch;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:dtdl:example;1",
+          "@type": "Component",
+          "name": "wum_vroo",
+          "schema": {
+            "@id": "dtmi:example:wum_hi;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:standard:example;1",
+          "@type": "Component",
+          "name": "um_beta",
+          "schema": {
+            "@id": "dtmi:example:um_gamma;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:standard:example;1",
+          "@type": "Component",
+          "name": "um_epsilon",
+          "schema": {
+            "@id": "dtmi:example:um_zeta;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentIdNotArrayV4.json b/DTDL/v4/spec/Requirement-ClassComponentIdNotArrayV4.json
new file mode 100644
index 00000000..f82599f5
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentIdNotArrayV4.json
@@ -0,0 +1,345 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;7"
+          ],
+          "@type": "Component",
+          "name": "um_theta",
+          "schema": {
+            "@id": "dtmi:example:um_iota;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;7"
+          ],
+          "@type": "Component",
+          "name": "um_lambda",
+          "schema": {
+            "@id": "dtmi:example:um_mu;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;108675309"
+          ],
+          "@type": "Component",
+          "name": "um_xi",
+          "schema": {
+            "@id": "dtmi:example:um_omicron;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;108675309"
+          ],
+          "@type": "Component",
+          "name": "um_rho",
+          "schema": {
+            "@id": "dtmi:example:um_sigma;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;999999999"
+          ],
+          "@type": "Component",
+          "name": "um_upsilon",
+          "schema": {
+            "@id": "dtmi:example:um_phi;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;999999999"
+          ],
+          "@type": "Component",
+          "name": "um_psi",
+          "schema": {
+            "@id": "dtmi:example:um_omega;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo;1"
+          ],
+          "@type": "Component",
+          "name": "um_wum",
+          "schema": {
+            "@id": "dtmi:example:um_um;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo;1"
+          ],
+          "@type": "Component",
+          "name": "um_fuddle",
+          "schema": {
+            "@id": "dtmi:example:um_glikk;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar"
+          ],
+          "@type": "Component",
+          "name": "um_snee",
+          "schema": {
+            "@id": "dtmi:example:um_quan;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar"
+          ],
+          "@type": "Component",
+          "name": "um_spazz",
+          "schema": {
+            "@id": "dtmi:example:um_floob;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;3.14"
+          ],
+          "@type": "Component",
+          "name": "um_jogg",
+          "schema": {
+            "@id": "dtmi:example:um_flunn;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;3.14"
+          ],
+          "@type": "Component",
+          "name": "um_yekk",
+          "schema": {
+            "@id": "dtmi:example:um_vroo;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;3.141592"
+          ],
+          "@type": "Component",
+          "name": "humpf_alpha",
+          "schema": {
+            "@id": "dtmi:example:humpf_beta;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;3.141592"
+          ],
+          "@type": "Component",
+          "name": "humpf_delta",
+          "schema": {
+            "@id": "dtmi:example:humpf_epsilon;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentInvalidKeywordsV4.json b/DTDL/v4/spec/Requirement-ClassComponentInvalidKeywordsV4.json
new file mode 100644
index 00000000..f18fca80
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentInvalidKeywordsV4.json
@@ -0,0 +1,182 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "spazz_mu",
+          "schema": {
+            "@id": "dtmi:example:spazz_nu;1",
+            "@type": "Interface"
+          },
+          "@graph": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "spazz_omicron",
+          "schema": {
+            "@id": "dtmi:example:spazz_pi;1",
+            "@type": "Interface"
+          },
+          "@graph": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "spazz_sigma",
+          "schema": {
+            "@id": "dtmi:example:spazz_tau;1",
+            "@type": "Interface"
+          },
+          "@value": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "spazz_phi",
+          "schema": {
+            "@id": "dtmi:example:spazz_chi;1",
+            "@type": "Interface"
+          },
+          "@value": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "spazz_omega",
+          "schema": {
+            "@id": "dtmi:example:spazz_yuzz;1",
+            "@type": "Interface"
+          },
+          "@language": "en"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "spazz_um",
+          "schema": {
+            "@id": "dtmi:example:spazz_humpf;1",
+            "@type": "Interface"
+          },
+          "@language": "en"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "spazz_glikk",
+          "schema": {
+            "@id": "dtmi:example:spazz_nuh;1",
+            "@type": "Interface"
+          },
+          "@foobar": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "spazz_quan",
+          "schema": {
+            "@id": "dtmi:example:spazz_thnad;1",
+            "@type": "Interface"
+          },
+          "@foobar": true
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentPropertiesSchemaContentsExcludeComponentV4.json b/DTDL/v4/spec/Requirement-ClassComponentPropertiesSchemaContentsExcludeComponentV4.json
new file mode 100644
index 00000000..98c8c52a
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentPropertiesSchemaContentsExcludeComponentV4.json
@@ -0,0 +1,69 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_omicron;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:pi_xi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "pi_nu",
+            "schema": {
+              "@id": "dtmi:example:pi_mu;1",
+              "@type": "Interface",
+              "contents": {
+                "@type": "Component",
+                "name": "pi_kappa",
+                "schema": {
+                  "@id": "dtmi:example:pi_lambda;1",
+                  "@type": "Interface"
+                }
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_phi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:pi_upsilon;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Component",
+            "name": "pi_tau",
+            "schema": {
+              "@id": "dtmi:example:pi_sigma;1",
+              "@type": "Interface",
+              "contents": {
+                "@type": "Component",
+                "name": "pi_pi",
+                "schema": {
+                  "@id": "dtmi:example:pi_rho;1",
+                  "@type": "Interface"
+                }
+              }
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentPropertyCommentStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassComponentPropertyCommentStringLengthV4.json
new file mode 100644
index 00000000..4cb8a27b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentPropertyCommentStringLengthV4.json
@@ -0,0 +1,69 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "fuddle_quan",
+          "schema": {
+            "@id": "dtmi:example:fuddle_thnad;1",
+            "@type": "Interface"
+          },
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "fuddle_floob",
+          "schema": {
+            "@id": "dtmi:example:fuddle_zatz;1",
+            "@type": "Interface"
+          },
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "fuddle_flunn",
+          "schema": {
+            "@id": "dtmi:example:fuddle_itch;1",
+            "@type": "Interface"
+          },
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentPropertyCommentStringV4.json b/DTDL/v4/spec/Requirement-ClassComponentPropertyCommentStringV4.json
new file mode 100644
index 00000000..d402461e
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentPropertyCommentStringV4.json
@@ -0,0 +1,498 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "humpf_nu",
+          "schema": {
+            "@id": "dtmi:example:humpf_xi;1",
+            "@type": "Interface"
+          },
+          "comment": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "humpf_pi",
+          "schema": {
+            "@id": "dtmi:example:humpf_rho;1",
+            "@type": "Interface"
+          },
+          "comment": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "humpf_tau",
+          "schema": {
+            "@id": "dtmi:example:humpf_upsilon;1",
+            "@type": "Interface"
+          },
+          "comment": {
+            "@value": "hello",
+            "@type": "xsd:string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "humpf_chi",
+          "schema": {
+            "@id": "dtmi:example:humpf_psi;1",
+            "@type": "Interface"
+          },
+          "comment": [
+            {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "humpf_yuzz",
+          "schema": {
+            "@id": "dtmi:example:humpf_wum;1",
+            "@type": "Interface"
+          },
+          "comment": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "humpf_humpf",
+          "schema": {
+            "@id": "dtmi:example:humpf_fuddle;1",
+            "@type": "Interface"
+          },
+          "comment": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "humpf_nuh",
+          "schema": {
+            "@id": "dtmi:example:humpf_snee;1",
+            "@type": "Interface"
+          },
+          "comment": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "humpf_thnad",
+          "schema": {
+            "@id": "dtmi:example:humpf_spazz;1",
+            "@type": "Interface"
+          },
+          "comment": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "humpf_zatz",
+          "schema": {
+            "@id": "dtmi:example:humpf_jogg;1",
+            "@type": "Interface"
+          },
+          "comment": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "humpf_itch",
+          "schema": {
+            "@id": "dtmi:example:humpf_yekk;1",
+            "@type": "Interface"
+          },
+          "comment": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "humpf_hi",
+          "schema": {
+            "@id": "dtmi:example:fuddle_alpha;1",
+            "@type": "Interface"
+          },
+          "comment": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "fuddle_gamma",
+          "schema": {
+            "@id": "dtmi:example:fuddle_delta;1",
+            "@type": "Interface"
+          },
+          "comment": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "fuddle_zeta",
+          "schema": {
+            "@id": "dtmi:example:fuddle_eta;1",
+            "@type": "Interface"
+          },
+          "comment": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "fuddle_iota",
+          "schema": {
+            "@id": "dtmi:example:fuddle_kappa;1",
+            "@type": "Interface"
+          },
+          "comment": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "fuddle_mu",
+          "schema": {
+            "@id": "dtmi:example:fuddle_nu;1",
+            "@type": "Interface"
+          },
+          "comment": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "fuddle_omicron",
+          "schema": {
+            "@id": "dtmi:example:fuddle_pi;1",
+            "@type": "Interface"
+          },
+          "comment": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "fuddle_sigma",
+          "schema": {
+            "@id": "dtmi:example:fuddle_tau;1",
+            "@type": "Interface"
+          },
+          "comment": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "fuddle_phi",
+          "schema": {
+            "@id": "dtmi:example:fuddle_chi;1",
+            "@type": "Interface"
+          },
+          "comment": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "fuddle_omega",
+          "schema": {
+            "@id": "dtmi:example:fuddle_yuzz;1",
+            "@type": "Interface"
+          },
+          "comment": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "fuddle_um",
+          "schema": {
+            "@id": "dtmi:example:fuddle_humpf;1",
+            "@type": "Interface"
+          },
+          "comment": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "fuddle_glikk",
+          "schema": {
+            "@id": "dtmi:example:fuddle_nuh;1",
+            "@type": "Interface"
+          },
+          "comment": [
+            {}
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentPropertyCommentTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassComponentPropertyCommentTermAndDtmiV4.json
new file mode 100644
index 00000000..3bda1530
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentPropertyCommentTermAndDtmiV4.json
@@ -0,0 +1,49 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "comment": "glikk_lambda",
+          "dtmi:dtdl:property:comment;4": "glikk_mu",
+          "name": "glikk_nu",
+          "schema": {
+            "@id": "dtmi:example:glikk_xi;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "comment": "glikk_pi",
+          "dtmi:dtdl:property:comment;4": "glikk_rho",
+          "name": "glikk_sigma",
+          "schema": {
+            "@id": "dtmi:example:glikk_tau;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentPropertyDescriptionLangStringV4.json b/DTDL/v4/spec/Requirement-ClassComponentPropertyDescriptionLangStringV4.json
new file mode 100644
index 00000000..49f6b19f
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentPropertyDescriptionLangStringV4.json
@@ -0,0 +1,578 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "glikk_phi",
+          "schema": {
+            "@id": "dtmi:example:glikk_chi;1",
+            "@type": "Interface"
+          },
+          "description": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "glikk_omega",
+          "schema": {
+            "@id": "dtmi:example:glikk_yuzz;1",
+            "@type": "Interface"
+          },
+          "description": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "glikk_um",
+          "schema": {
+            "@id": "dtmi:example:glikk_humpf;1",
+            "@type": "Interface"
+          },
+          "description": {
+            "en": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "glikk_glikk",
+          "schema": {
+            "@id": "dtmi:example:glikk_nuh;1",
+            "@type": "Interface"
+          },
+          "description": [
+            {
+              "@value": "hello",
+              "@language": "en"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "glikk_quan",
+          "schema": {
+            "@id": "dtmi:example:glikk_thnad;1",
+            "@type": "Interface"
+          },
+          "description": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "glikk_floob",
+          "schema": {
+            "@id": "dtmi:example:glikk_zatz;1",
+            "@type": "Interface"
+          },
+          "description": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "glikk_flunn",
+          "schema": {
+            "@id": "dtmi:example:glikk_itch;1",
+            "@type": "Interface"
+          },
+          "description": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "glikk_vroo",
+          "schema": {
+            "@id": "dtmi:example:glikk_hi;1",
+            "@type": "Interface"
+          },
+          "description": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "nuh_beta",
+          "schema": {
+            "@id": "dtmi:example:nuh_gamma;1",
+            "@type": "Interface"
+          },
+          "description": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "nuh_epsilon",
+          "schema": {
+            "@id": "dtmi:example:nuh_zeta;1",
+            "@type": "Interface"
+          },
+          "description": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "nuh_theta",
+          "schema": {
+            "@id": "dtmi:example:nuh_iota;1",
+            "@type": "Interface"
+          },
+          "description": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "nuh_lambda",
+          "schema": {
+            "@id": "dtmi:example:nuh_mu;1",
+            "@type": "Interface"
+          },
+          "description": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "nuh_xi",
+          "schema": {
+            "@id": "dtmi:example:nuh_omicron;1",
+            "@type": "Interface"
+          },
+          "description": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "nuh_rho",
+          "schema": {
+            "@id": "dtmi:example:nuh_sigma;1",
+            "@type": "Interface"
+          },
+          "description": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "nuh_upsilon",
+          "schema": {
+            "@id": "dtmi:example:nuh_phi;1",
+            "@type": "Interface"
+          },
+          "description": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "nuh_psi",
+          "schema": {
+            "@id": "dtmi:example:nuh_omega;1",
+            "@type": "Interface"
+          },
+          "description": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "nuh_wum",
+          "schema": {
+            "@id": "dtmi:example:nuh_um;1",
+            "@type": "Interface"
+          },
+          "description": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "nuh_fuddle",
+          "schema": {
+            "@id": "dtmi:example:nuh_glikk;1",
+            "@type": "Interface"
+          },
+          "description": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "nuh_snee",
+          "schema": {
+            "@id": "dtmi:example:nuh_quan;1",
+            "@type": "Interface"
+          },
+          "description": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "nuh_spazz",
+          "schema": {
+            "@id": "dtmi:example:nuh_floob;1",
+            "@type": "Interface"
+          },
+          "description": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "nuh_jogg",
+          "schema": {
+            "@id": "dtmi:example:nuh_flunn;1",
+            "@type": "Interface"
+          },
+          "description": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "nuh_yekk",
+          "schema": {
+            "@id": "dtmi:example:nuh_vroo;1",
+            "@type": "Interface"
+          },
+          "description": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "snee_alpha",
+          "schema": {
+            "@id": "dtmi:example:snee_beta;1",
+            "@type": "Interface"
+          },
+          "description": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "snee_delta",
+          "schema": {
+            "@id": "dtmi:example:snee_epsilon;1",
+            "@type": "Interface"
+          },
+          "description": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentPropertyDescriptionStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassComponentPropertyDescriptionStringLengthV4.json
new file mode 100644
index 00000000..cc628809
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentPropertyDescriptionStringLengthV4.json
@@ -0,0 +1,69 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "snee_eta",
+          "schema": {
+            "@id": "dtmi:example:snee_theta;1",
+            "@type": "Interface"
+          },
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "snee_kappa",
+          "schema": {
+            "@id": "dtmi:example:snee_lambda;1",
+            "@type": "Interface"
+          },
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "snee_nu",
+          "schema": {
+            "@id": "dtmi:example:snee_xi;1",
+            "@type": "Interface"
+          },
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentPropertyDescriptionTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassComponentPropertyDescriptionTermAndDtmiV4.json
new file mode 100644
index 00000000..70faa892
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentPropertyDescriptionTermAndDtmiV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "description": [
+            "snee_humpf"
+          ],
+          "dtmi:dtdl:property:description;4": [
+            "snee_fuddle"
+          ],
+          "name": "snee_glikk",
+          "schema": {
+            "@id": "dtmi:example:snee_nuh;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "description": [
+            "snee_quan"
+          ],
+          "dtmi:dtdl:property:description;4": [
+            "snee_thnad"
+          ],
+          "name": "snee_spazz",
+          "schema": {
+            "@id": "dtmi:example:snee_floob;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentPropertyDisplayNameLangStringV4.json b/DTDL/v4/spec/Requirement-ClassComponentPropertyDisplayNameLangStringV4.json
new file mode 100644
index 00000000..03067d78
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentPropertyDisplayNameLangStringV4.json
@@ -0,0 +1,578 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "snee_jogg",
+          "schema": {
+            "@id": "dtmi:example:snee_flunn;1",
+            "@type": "Interface"
+          },
+          "displayName": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "snee_yekk",
+          "schema": {
+            "@id": "dtmi:example:snee_vroo;1",
+            "@type": "Interface"
+          },
+          "displayName": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "quan_alpha",
+          "schema": {
+            "@id": "dtmi:example:quan_beta;1",
+            "@type": "Interface"
+          },
+          "displayName": {
+            "en": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "quan_delta",
+          "schema": {
+            "@id": "dtmi:example:quan_epsilon;1",
+            "@type": "Interface"
+          },
+          "displayName": [
+            {
+              "@value": "hello",
+              "@language": "en"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "quan_eta",
+          "schema": {
+            "@id": "dtmi:example:quan_theta;1",
+            "@type": "Interface"
+          },
+          "displayName": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "quan_kappa",
+          "schema": {
+            "@id": "dtmi:example:quan_lambda;1",
+            "@type": "Interface"
+          },
+          "displayName": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "quan_nu",
+          "schema": {
+            "@id": "dtmi:example:quan_xi;1",
+            "@type": "Interface"
+          },
+          "displayName": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "quan_pi",
+          "schema": {
+            "@id": "dtmi:example:quan_rho;1",
+            "@type": "Interface"
+          },
+          "displayName": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "quan_tau",
+          "schema": {
+            "@id": "dtmi:example:quan_upsilon;1",
+            "@type": "Interface"
+          },
+          "displayName": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "quan_chi",
+          "schema": {
+            "@id": "dtmi:example:quan_psi;1",
+            "@type": "Interface"
+          },
+          "displayName": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "quan_yuzz",
+          "schema": {
+            "@id": "dtmi:example:quan_wum;1",
+            "@type": "Interface"
+          },
+          "displayName": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "quan_humpf",
+          "schema": {
+            "@id": "dtmi:example:quan_fuddle;1",
+            "@type": "Interface"
+          },
+          "displayName": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "quan_nuh",
+          "schema": {
+            "@id": "dtmi:example:quan_snee;1",
+            "@type": "Interface"
+          },
+          "displayName": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "quan_thnad",
+          "schema": {
+            "@id": "dtmi:example:quan_spazz;1",
+            "@type": "Interface"
+          },
+          "displayName": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "quan_zatz",
+          "schema": {
+            "@id": "dtmi:example:quan_jogg;1",
+            "@type": "Interface"
+          },
+          "displayName": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "quan_itch",
+          "schema": {
+            "@id": "dtmi:example:quan_yekk;1",
+            "@type": "Interface"
+          },
+          "displayName": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "quan_hi",
+          "schema": {
+            "@id": "dtmi:example:thnad_alpha;1",
+            "@type": "Interface"
+          },
+          "displayName": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "thnad_gamma",
+          "schema": {
+            "@id": "dtmi:example:thnad_delta;1",
+            "@type": "Interface"
+          },
+          "displayName": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "thnad_zeta",
+          "schema": {
+            "@id": "dtmi:example:thnad_eta;1",
+            "@type": "Interface"
+          },
+          "displayName": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "thnad_iota",
+          "schema": {
+            "@id": "dtmi:example:thnad_kappa;1",
+            "@type": "Interface"
+          },
+          "displayName": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "thnad_mu",
+          "schema": {
+            "@id": "dtmi:example:thnad_nu;1",
+            "@type": "Interface"
+          },
+          "displayName": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "thnad_omicron",
+          "schema": {
+            "@id": "dtmi:example:thnad_pi;1",
+            "@type": "Interface"
+          },
+          "displayName": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "thnad_sigma",
+          "schema": {
+            "@id": "dtmi:example:thnad_tau;1",
+            "@type": "Interface"
+          },
+          "displayName": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "thnad_phi",
+          "schema": {
+            "@id": "dtmi:example:thnad_chi;1",
+            "@type": "Interface"
+          },
+          "displayName": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentPropertyDisplayNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassComponentPropertyDisplayNameStringLengthV4.json
new file mode 100644
index 00000000..0a51a8a7
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentPropertyDisplayNameStringLengthV4.json
@@ -0,0 +1,69 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "thnad_omega",
+          "schema": {
+            "@id": "dtmi:example:thnad_yuzz;1",
+            "@type": "Interface"
+          },
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "thnad_um",
+          "schema": {
+            "@id": "dtmi:example:thnad_humpf;1",
+            "@type": "Interface"
+          },
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "thnad_glikk",
+          "schema": {
+            "@id": "dtmi:example:thnad_nuh;1",
+            "@type": "Interface"
+          },
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentPropertyDisplayNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassComponentPropertyDisplayNameTermAndDtmiV4.json
new file mode 100644
index 00000000..149bb73a
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentPropertyDisplayNameTermAndDtmiV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "displayName": [
+            "spazz_beta"
+          ],
+          "dtmi:dtdl:property:displayName;4": [
+            "spazz_gamma"
+          ],
+          "name": "spazz_delta",
+          "schema": {
+            "@id": "dtmi:example:spazz_epsilon;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "displayName": [
+            "spazz_eta"
+          ],
+          "dtmi:dtdl:property:displayName;4": [
+            "spazz_theta"
+          ],
+          "name": "spazz_iota",
+          "schema": {
+            "@id": "dtmi:example:spazz_kappa;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentPropertyFormallyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Requirement-ClassComponentPropertyFormallyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..8b80e97a
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentPropertyFormallyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,92 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "floob_epsilon",
+          "schema": {
+            "@id": "dtmi:example:floob_zeta;1",
+            "@type": "Interface"
+          },
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "floob_theta",
+          "schema": {
+            "@id": "dtmi:example:floob_iota;1",
+            "@type": "Interface"
+          },
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "floob_lambda",
+          "schema": {
+            "@id": "dtmi:example:floob_mu;1",
+            "@type": "Interface"
+          },
+          "boolean": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "floob_xi",
+          "schema": {
+            "@id": "dtmi:example:floob_omicron;1",
+            "@type": "Interface"
+          },
+          "boolean": null
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentPropertyFormallyUndefinedTermV4.json b/DTDL/v4/spec/Requirement-ClassComponentPropertyFormallyUndefinedTermV4.json
new file mode 100644
index 00000000..67a5d41d
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentPropertyFormallyUndefinedTermV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "floob_spazz",
+          "schema": {
+            "@id": "dtmi:example:floob_floob;1",
+            "@type": "Interface"
+          },
+          "foobar": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "floob_jogg",
+          "schema": {
+            "@id": "dtmi:example:floob_flunn;1",
+            "@type": "Interface"
+          },
+          "foobar": {}
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentPropertyInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassComponentPropertyInvalidDtmiV4.json
new file mode 100644
index 00000000..2d625492
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentPropertyInvalidDtmiV4.json
@@ -0,0 +1,53 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Component",
+            "Foobar"
+          ],
+          "name": "floob_rho",
+          "schema": {
+            "@id": "dtmi:example:floob_sigma;1",
+            "@type": "Interface"
+          },
+          "dtmi:foo//bar": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Component",
+            "Foobar"
+          ],
+          "name": "floob_upsilon",
+          "schema": {
+            "@id": "dtmi:example:floob_phi;1",
+            "@type": "Interface"
+          },
+          "dtmi:foo//bar": 626
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentPropertyNamePatternV4.json b/DTDL/v4/spec/Requirement-ClassComponentPropertyNamePatternV4.json
new file mode 100644
index 00000000..5c61d2e0
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentPropertyNamePatternV4.json
@@ -0,0 +1,537 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:omicron_upsilon;1",
+            "@type": "Interface"
+          },
+          "name": "EARTH"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:omicron_chi;1",
+            "@type": "Interface"
+          },
+          "name": "Air"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:omicron_omega;1",
+            "@type": "Interface"
+          },
+          "name": "fire"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:omicron_wum;1",
+            "@type": "Interface"
+          },
+          "name": "hello_world"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:omicron_humpf;1",
+            "@type": "Interface"
+          },
+          "name": "Anarchy99"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:omicron_glikk;1",
+            "@type": "Interface"
+          },
+          "name": "23skidoo"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:omicron_snee;1",
+            "@type": "Interface"
+          },
+          "name": "23skidoo"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:omicron_thnad;1",
+            "@type": "Interface"
+          },
+          "name": "626"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:omicron_floob;1",
+            "@type": "Interface"
+          },
+          "name": "626"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:omicron_jogg;1",
+            "@type": "Interface"
+          },
+          "name": "goodbye-world"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:omicron_itch;1",
+            "@type": "Interface"
+          },
+          "name": "goodbye-world"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:omicron_vroo;1",
+            "@type": "Interface"
+          },
+          "name": "_haha"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:pi_alpha;1",
+            "@type": "Interface"
+          },
+          "name": "_haha"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:pi_gamma;1",
+            "@type": "Interface"
+          },
+          "name": "toodaloo_"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:pi_epsilon;1",
+            "@type": "Interface"
+          },
+          "name": "toodaloo_"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:pi_eta;1",
+            "@type": "Interface"
+          },
+          "name": "pro:con"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:pi_iota;1",
+            "@type": "Interface"
+          },
+          "name": "pro:con"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:pi_lambda;1",
+            "@type": "Interface"
+          },
+          "name": "mish/mash"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:pi_nu;1",
+            "@type": "Interface"
+          },
+          "name": "mish/mash"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:pi_omicron;1",
+            "@type": "Interface"
+          },
+          "name": "#tag"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:pi_rho;1",
+            "@type": "Interface"
+          },
+          "name": "#tag"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:pi_tau;1",
+            "@type": "Interface"
+          },
+          "name": "@tweet"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:pi_phi;1",
+            "@type": "Interface"
+          },
+          "name": "@tweet"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:pi_psi;1",
+            "@type": "Interface"
+          },
+          "name": "$money"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:pi_yuzz;1",
+            "@type": "Interface"
+          },
+          "name": "$money"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentPropertyNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassComponentPropertyNameStringLengthV4.json
new file mode 100644
index 00000000..34a39c4f
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentPropertyNameStringLengthV4.json
@@ -0,0 +1,66 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:omicron_xi;1",
+            "@type": "Interface"
+          },
+          "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:omicron_pi;1",
+            "@type": "Interface"
+          },
+          "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:omicron_sigma;1",
+            "@type": "Interface"
+          },
+          "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentPropertyNameStringV4.json b/DTDL/v4/spec/Requirement-ClassComponentPropertyNameStringV4.json
new file mode 100644
index 00000000..65c3740e
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentPropertyNameStringV4.json
@@ -0,0 +1,499 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:xi_nu;1",
+            "@type": "Interface"
+          },
+          "name": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:xi_omicron;1",
+            "@type": "Interface"
+          },
+          "name": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:xi_rho;1",
+            "@type": "Interface"
+          },
+          "name": {
+            "@value": "hello",
+            "@type": "xsd:string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:xi_tau;1",
+            "@type": "Interface"
+          },
+          "name": [
+            {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:xi_phi;1",
+            "@type": "Interface"
+          },
+          "name": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:xi_psi;1",
+            "@type": "Interface"
+          },
+          "name": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:xi_yuzz;1",
+            "@type": "Interface"
+          },
+          "name": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:xi_um;1",
+            "@type": "Interface"
+          },
+          "name": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:xi_fuddle;1",
+            "@type": "Interface"
+          },
+          "name": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:xi_nuh;1",
+            "@type": "Interface"
+          },
+          "name": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:xi_quan;1",
+            "@type": "Interface"
+          },
+          "name": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:xi_spazz;1",
+            "@type": "Interface"
+          },
+          "name": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:xi_zatz;1",
+            "@type": "Interface"
+          },
+          "name": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:xi_flunn;1",
+            "@type": "Interface"
+          },
+          "name": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:xi_yekk;1",
+            "@type": "Interface"
+          },
+          "name": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:xi_hi;1",
+            "@type": "Interface"
+          },
+          "name": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:omicron_beta;1",
+            "@type": "Interface"
+          },
+          "name": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:omicron_delta;1",
+            "@type": "Interface"
+          },
+          "name": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:omicron_zeta;1",
+            "@type": "Interface"
+          },
+          "name": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:omicron_theta;1",
+            "@type": "Interface"
+          },
+          "name": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:omicron_kappa;1",
+            "@type": "Interface"
+          },
+          "name": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:omicron_mu;1",
+            "@type": "Interface"
+          },
+          "name": []
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentPropertyNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassComponentPropertyNameTermAndDtmiV4.json
new file mode 100644
index 00000000..3475ffc7
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentPropertyNameTermAndDtmiV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "rho_beta",
+          "dtmi:dtdl:property:name;4": "rho_gamma",
+          "schema": {
+            "@id": "dtmi:example:rho_delta;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "rho_zeta",
+          "dtmi:dtdl:property:name;4": "rho_eta",
+          "schema": {
+            "@id": "dtmi:example:rho_theta;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentPropertyNameUniqueAmongInterfaceContentsV4.json b/DTDL/v4/spec/Requirement-ClassComponentPropertyNameUniqueAmongInterfaceContentsV4.json
new file mode 100644
index 00000000..db6fd676
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentPropertyNameUniqueAmongInterfaceContentsV4.json
@@ -0,0 +1,98 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_fuddle;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Component",
+            "schema": {
+              "@id": "dtmi:example:pi_um;1",
+              "@type": "Interface"
+            },
+            "name": "delta_tau"
+          },
+          {
+            "@type": "Component",
+            "schema": {
+              "@id": "dtmi:example:pi_humpf;1",
+              "@type": "Interface"
+            },
+            "name": "delta_upsilon"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_snee;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Component",
+            "schema": {
+              "@id": "dtmi:example:pi_glikk;1",
+              "@type": "Interface"
+            },
+            "name": "delta_tau"
+          },
+          {
+            "@type": "Component",
+            "schema": {
+              "@id": "dtmi:example:pi_nuh;1",
+              "@type": "Interface"
+            },
+            "name": "delta_tau"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:pi_spazz;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Component",
+            "schema": {
+              "@id": "dtmi:example:pi_quan;1",
+              "@type": "Interface"
+            },
+            "name": "delta_tau"
+          },
+          {
+            "@type": "Component",
+            "schema": {
+              "@id": "dtmi:example:pi_thnad;1",
+              "@type": "Interface"
+            },
+            "name": "delta_tau"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentPropertyNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassComponentPropertyNotDtmiNorTermV4.json
new file mode 100644
index 00000000..50baac06
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentPropertyNotDtmiNorTermV4.json
@@ -0,0 +1,53 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Component",
+            "Foobar"
+          ],
+          "name": "floob_psi",
+          "schema": {
+            "@id": "dtmi:example:floob_omega;1",
+            "@type": "Interface"
+          },
+          "http://foo.com/bar": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Component",
+            "Foobar"
+          ],
+          "name": "floob_wum",
+          "schema": {
+            "@id": "dtmi:example:floob_um;1",
+            "@type": "Interface"
+          },
+          "http://foo.com/bar": true
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentPropertySchemaElementV4.json b/DTDL/v4/spec/Requirement-ClassComponentPropertySchemaElementV4.json
new file mode 100644
index 00000000..626f9bff
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentPropertySchemaElementV4.json
@@ -0,0 +1,274 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_nu;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:rho_mu;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "rho_lambda",
+            "schema": {
+              "@id": "dtmi:example:rho_kappa;1",
+              "@type": "Interface"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_rho;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:rho_pi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "rho_omicron",
+            "schema": [
+              {
+                "@id": "dtmi:example:rho_xi;1",
+                "@type": "Interface"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      [
+        {
+          "@context": "dtmi:dtdl:context;4",
+          "@id": "dtmi:example:rho_upsilon;1",
+          "@type": "Interface",
+          "extends": {
+            "@id": "dtmi:example:rho_tau;1",
+            "@type": "Interface",
+            "contents": {
+              "@type": "Component",
+              "name": "rho_sigma",
+              "schema": "dtmi:ex:dependentRef;1"
+            }
+          }
+        },
+        {
+          "@context": "dtmi:dtdl:context;4",
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Interface"
+        }
+      ]
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      [
+        {
+          "@context": "dtmi:dtdl:context;4",
+          "@id": "dtmi:example:rho_psi;1",
+          "@type": "Interface",
+          "extends": {
+            "@id": "dtmi:example:rho_chi;1",
+            "@type": "Interface",
+            "contents": {
+              "@type": "Component",
+              "name": "rho_phi",
+              "schema": [
+                "dtmi:ex:dependentRef;1"
+              ]
+            }
+          }
+        },
+        {
+          "@context": "dtmi:dtdl:context;4",
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Interface"
+        }
+      ]
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_um;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:rho_wum;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "rho_yuzz",
+            "schema": {
+              "@id": "dtmi:example:rho_omega;1",
+              "@type": "Interface",
+              "@context": "dtmi:dtdl:context;2"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_nuh;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:rho_glikk;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "rho_fuddle",
+            "schema": {
+              "@id": "dtmi:example:rho_humpf;1",
+              "@type": "Interface",
+              "@context": "dtmi:dtdl:context;3"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_thnad;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:rho_quan;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "rho_snee",
+            "schema": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_zatz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:rho_floob;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Component",
+            "name": "rho_spazz",
+            "schema": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_vroo;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:rho_yekk;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Component",
+            "name": "rho_itch",
+            "schema": [
+              {
+                "@id": "dtmi:example:rho_jogg;1",
+                "@type": "Interface"
+              },
+              {
+                "@id": "dtmi:example:rho_flunn;1",
+                "@type": "Interface"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_delta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:sigma_gamma;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Component",
+            "name": "sigma_beta",
+            "schema": [
+              {
+                "@id": "dtmi:example:rho_hi;1",
+                "@type": "Interface"
+              },
+              {
+                "@id": "dtmi:example:sigma_alpha;1",
+                "@type": "Interface"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentPropertySchemaTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassComponentPropertySchemaTermAndDtmiV4.json
new file mode 100644
index 00000000..0662efa6
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentPropertySchemaTermAndDtmiV4.json
@@ -0,0 +1,53 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "phi_mu",
+          "schema": {
+            "@id": "dtmi:example:phi_nu;1",
+            "@type": "Interface"
+          },
+          "dtmi:dtdl:property:schema;4": {
+            "@id": "dtmi:example:phi_xi;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "phi_pi",
+          "schema": {
+            "@id": "dtmi:example:phi_rho;1",
+            "@type": "Interface"
+          },
+          "dtmi:dtdl:property:schema;4": {
+            "@id": "dtmi:example:phi_sigma;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentPropertySchemaTypeConformanceV4.json b/DTDL/v4/spec/Requirement-ClassComponentPropertySchemaTypeConformanceV4.json
new file mode 100644
index 00000000..c8281496
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentPropertySchemaTypeConformanceV4.json
@@ -0,0 +1,734 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "sigma_mu",
+          "schema": {
+            "@id": "dtmi:example:sigma_lambda;1",
+            "elementSchema": "byte",
+            "@type": "Array"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "sigma_omicron",
+          "schema": {
+            "@id": "dtmi:example:sigma_xi;1",
+            "elementSchema": "bytes",
+            "@type": "Array"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "sigma_tau",
+          "schema": {
+            "@id": "dtmi:example:sigma_rho;1",
+            "name": "sigma_sigma",
+            "@type": "Command"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "sigma_psi",
+          "schema": {
+            "@id": "dtmi:example:sigma_phi;1",
+            "name": "sigma_chi",
+            "@type": "Command"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "sigma_um",
+          "schema": {
+            "@id": "dtmi:example:sigma_yuzz;1",
+            "name": "sigma_wum",
+            "schema": "date",
+            "@type": "CommandRequest"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "sigma_nuh",
+          "schema": {
+            "@id": "dtmi:example:sigma_fuddle;1",
+            "name": "sigma_glikk",
+            "schema": "dateTime",
+            "@type": "CommandRequest"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "sigma_spazz",
+          "schema": {
+            "@id": "dtmi:example:sigma_quan;1",
+            "name": "sigma_thnad",
+            "schema": "decimal",
+            "@type": "CommandResponse"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "sigma_flunn",
+          "schema": {
+            "@id": "dtmi:example:sigma_zatz;1",
+            "name": "sigma_jogg",
+            "schema": "double",
+            "@type": "CommandResponse"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "tau_alpha",
+          "schema": {
+            "@id": "dtmi:example:sigma_yekk;1",
+            "name": "sigma_vroo",
+            "schema": {
+              "@id": "dtmi:example:sigma_hi;1",
+              "@type": "Interface"
+            },
+            "@type": "Component"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "tau_zeta",
+          "schema": {
+            "@id": "dtmi:example:tau_gamma;1",
+            "name": "tau_delta",
+            "schema": {
+              "@id": "dtmi:example:tau_epsilon;1",
+              "@type": "Interface"
+            },
+            "@type": "Component"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "tau_iota",
+          "schema": {
+            "@id": "dtmi:example:tau_theta;1",
+            "valueSchema": "integer",
+            "@type": "Enum"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "tau_mu",
+          "schema": {
+            "@id": "dtmi:example:tau_lambda;1",
+            "valueSchema": "integer",
+            "@type": "Enum"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "tau_pi",
+          "schema": {
+            "@id": "dtmi:example:tau_xi;1",
+            "enumValue": 1516,
+            "name": "tau_omicron",
+            "@type": "EnumValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "tau_upsilon",
+          "schema": {
+            "@id": "dtmi:example:tau_sigma;1",
+            "enumValue": 1517,
+            "name": "tau_tau",
+            "@type": "EnumValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "tau_omega",
+          "schema": {
+            "@id": "dtmi:example:tau_chi;1",
+            "name": "tau_psi",
+            "schema": "duration",
+            "@type": "Field"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "tau_humpf",
+          "schema": {
+            "@id": "dtmi:example:tau_wum;1",
+            "name": "tau_um",
+            "schema": "float",
+            "@type": "Field"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "tau_nuh",
+          "schema": {
+            "@id": "dtmi:example:tau_glikk;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "tau_floob",
+          "schema": {
+            "@id": "dtmi:example:tau_quan;1",
+            "mapKey": {
+              "name": "tau_thnad",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "tau_spazz",
+              "schema": "integer"
+            },
+            "@type": "Map"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "tau_yekk",
+          "schema": {
+            "@id": "dtmi:example:tau_jogg;1",
+            "mapKey": {
+              "name": "tau_flunn",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "tau_itch",
+              "schema": "long"
+            },
+            "@type": "Map"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "upsilon_beta",
+          "schema": {
+            "@id": "dtmi:example:tau_hi;1",
+            "name": "upsilon_alpha",
+            "schema": "string",
+            "@type": "MapKey"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "upsilon_zeta",
+          "schema": {
+            "@id": "dtmi:example:upsilon_delta;1",
+            "name": "upsilon_epsilon",
+            "schema": "string",
+            "@type": "MapKey"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "upsilon_kappa",
+          "schema": {
+            "@id": "dtmi:example:upsilon_theta;1",
+            "name": "upsilon_iota",
+            "schema": "short",
+            "@type": "MapValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "upsilon_xi",
+          "schema": {
+            "@id": "dtmi:example:upsilon_mu;1",
+            "name": "upsilon_nu",
+            "schema": "string",
+            "@type": "MapValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "upsilon_rho",
+          "schema": {
+            "@id": "dtmi:example:upsilon_pi;1",
+            "@type": "Object"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "upsilon_upsilon",
+          "schema": {
+            "@id": "dtmi:example:upsilon_tau;1",
+            "@type": "Object"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "upsilon_omega",
+          "schema": {
+            "@id": "dtmi:example:upsilon_chi;1",
+            "name": "upsilon_psi",
+            "schema": "time",
+            "@type": "Property"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "upsilon_humpf",
+          "schema": {
+            "@id": "dtmi:example:upsilon_wum;1",
+            "name": "upsilon_um",
+            "schema": "unsignedByte",
+            "@type": "Property"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "upsilon_snee",
+          "schema": {
+            "@id": "dtmi:example:upsilon_glikk;1",
+            "name": "upsilon_nuh",
+            "@type": "Relationship"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "upsilon_floob",
+          "schema": {
+            "@id": "dtmi:example:upsilon_thnad;1",
+            "name": "upsilon_spazz",
+            "@type": "Relationship"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "upsilon_itch",
+          "schema": {
+            "@id": "dtmi:example:upsilon_jogg;1",
+            "name": "upsilon_flunn",
+            "schema": "unsignedInteger",
+            "@type": "Telemetry"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "phi_alpha",
+          "schema": {
+            "@id": "dtmi:example:upsilon_vroo;1",
+            "name": "upsilon_hi",
+            "schema": "unsignedLong",
+            "@type": "Telemetry"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentRequiredPropertiesV4.json b/DTDL/v4/spec/Requirement-ClassComponentRequiredPropertiesV4.json
new file mode 100644
index 00000000..f03805dc
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentRequiredPropertiesV4.json
@@ -0,0 +1,119 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "lambda_lambda",
+          "schema": {
+            "@id": "dtmi:example:lambda_mu;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "lambda_xi",
+          "schema": {
+            "@id": "dtmi:example:lambda_omicron;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:lambda_rho;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "schema": {
+            "@id": "dtmi:example:lambda_tau;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Component",
+          "name": "lambda_phi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Component",
+          "name": "lambda_psi"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentTypeIncludesInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassComponentTypeIncludesInvalidDtmiV4.json
new file mode 100644
index 00000000..429df1cb
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentTypeIncludesInvalidDtmiV4.json
@@ -0,0 +1,51 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Component",
+            "dtmi:foo//bar"
+          ],
+          "name": "nu_jogg",
+          "schema": {
+            "@id": "dtmi:example:nu_flunn;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Component",
+            "dtmi:foo//bar"
+          ],
+          "name": "nu_yekk",
+          "schema": {
+            "@id": "dtmi:example:nu_vroo;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentTypeIncludesMaterialV4.json b/DTDL/v4/spec/Requirement-ClassComponentTypeIncludesMaterialV4.json
new file mode 100644
index 00000000..7f874a0f
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentTypeIncludesMaterialV4.json
@@ -0,0 +1,180 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "mu_glikk",
+          "schema": {
+            "@id": "dtmi:example:mu_nuh;1",
+            "@type": "Interface"
+          },
+          "@type": "Component"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "mu_quan",
+          "schema": {
+            "@id": "dtmi:example:mu_thnad;1",
+            "@type": "Interface"
+          },
+          "@type": [
+            "Component"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "mu_floob",
+          "schema": {
+            "@id": "dtmi:example:mu_zatz;1",
+            "@type": "Interface"
+          },
+          "@type": "dtmi:dtdl:class:Component;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "mu_flunn",
+          "schema": {
+            "@id": "dtmi:example:mu_itch;1",
+            "@type": "Interface"
+          },
+          "@type": [
+            "dtmi:dtdl:class:Component;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "mu_vroo",
+          "schema": {
+            "@id": "dtmi:example:mu_hi;1",
+            "@type": "Interface"
+          },
+          "@type": "Something"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "nu_beta",
+          "schema": {
+            "@id": "dtmi:example:nu_gamma;1",
+            "@type": "Interface"
+          },
+          "@type": "Something"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "nu_epsilon",
+          "schema": {
+            "@id": "dtmi:example:nu_zeta;1",
+            "@type": "Interface"
+          },
+          "@type": [
+            "Something"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "nu_theta",
+          "schema": {
+            "@id": "dtmi:example:nu_iota;1",
+            "@type": "Interface"
+          },
+          "@type": [
+            "Something"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentTypeIncludesNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassComponentTypeIncludesNotDtmiNorTermV4.json
new file mode 100644
index 00000000..1e5d08a7
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentTypeIncludesNotDtmiNorTermV4.json
@@ -0,0 +1,51 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Component",
+            "http://foo.com/bar"
+          ],
+          "name": "xi_alpha",
+          "schema": {
+            "@id": "dtmi:example:xi_beta;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Component",
+            "http://foo.com/bar"
+          ],
+          "name": "xi_delta",
+          "schema": {
+            "@id": "dtmi:example:xi_epsilon;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassComponentTypeStringOrArrayV4.json b/DTDL/v4/spec/Requirement-ClassComponentTypeStringOrArrayV4.json
new file mode 100644
index 00000000..adcdb13e
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassComponentTypeStringOrArrayV4.json
@@ -0,0 +1,362 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_um;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "lambda_yuzz",
+          "schema": {
+            "@id": "dtmi:example:lambda_wum;1",
+            "@type": "Interface"
+          },
+          "@type": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "lambda_humpf",
+          "schema": {
+            "@id": "dtmi:example:lambda_fuddle;1",
+            "@type": "Interface"
+          },
+          "@type": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "lambda_nuh",
+          "schema": {
+            "@id": "dtmi:example:lambda_snee;1",
+            "@type": "Interface"
+          },
+          "@type": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "lambda_thnad",
+          "schema": {
+            "@id": "dtmi:example:lambda_spazz;1",
+            "@type": "Interface"
+          },
+          "@type": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "lambda_zatz",
+          "schema": {
+            "@id": "dtmi:example:lambda_jogg;1",
+            "@type": "Interface"
+          },
+          "@type": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "lambda_itch",
+          "schema": {
+            "@id": "dtmi:example:lambda_yekk;1",
+            "@type": "Interface"
+          },
+          "@type": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "lambda_hi",
+          "schema": {
+            "@id": "dtmi:example:mu_alpha;1",
+            "@type": "Interface"
+          },
+          "@type": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "mu_gamma",
+          "schema": {
+            "@id": "dtmi:example:mu_delta;1",
+            "@type": "Interface"
+          },
+          "@type": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "mu_zeta",
+          "schema": {
+            "@id": "dtmi:example:mu_eta;1",
+            "@type": "Interface"
+          },
+          "@type": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "mu_iota",
+          "schema": {
+            "@id": "dtmi:example:mu_kappa;1",
+            "@type": "Interface"
+          },
+          "@type": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "mu_mu",
+          "schema": {
+            "@id": "dtmi:example:mu_nu;1",
+            "@type": "Interface"
+          },
+          "@type": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "mu_omicron",
+          "schema": {
+            "@id": "dtmi:example:mu_pi;1",
+            "@type": "Interface"
+          },
+          "@type": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "mu_sigma",
+          "schema": {
+            "@id": "dtmi:example:mu_tau;1",
+            "@type": "Interface"
+          },
+          "@type": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "mu_phi",
+          "schema": {
+            "@id": "dtmi:example:mu_chi;1",
+            "@type": "Interface"
+          },
+          "@type": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "mu_omega",
+          "schema": {
+            "@id": "dtmi:example:mu_yuzz;1",
+            "@type": "Interface"
+          },
+          "@type": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "mu_um",
+          "schema": {
+            "@id": "dtmi:example:mu_humpf;1",
+            "@type": "Interface"
+          },
+          "@type": [
+            {}
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumContextConformsV4.json b/DTDL/v4/spec/Requirement-ClassEnumContextConformsV4.json
new file mode 100644
index 00000000..1d73c57e
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumContextConformsV4.json
@@ -0,0 +1,370 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_lambda",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_nu",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "@context": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_omicron",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "@context": [
+              "dtmi:dtdl:extension:quantitativeTypes;1"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_rho",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "@context": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_tau",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "@context": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_phi",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "@context": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_psi",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "@context": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_yuzz",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "@context": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_um",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "@context": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_fuddle",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "@context": "dtmi:dtdl:extension:quantitativeTypes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_nuh",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "@context": "http://dtdl/extension/quantitativeTypes/1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_quan",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "@context": "quantitativeTypes;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_spazz",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "@context": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_zatz",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_flunn",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_yekk",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumIdDuplicateV4.json b/DTDL/v4/spec/Requirement-ClassEnumIdDuplicateV4.json
new file mode 100644
index 00000000..4f26cd2e
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumIdDuplicateV4.json
@@ -0,0 +1,49 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:epsilon_snee;1",
+          "@type": "Property",
+          "name": "epsilon_quan",
+          "schema": {
+            "@id": "dtmi:example:epsilon_snee;1",
+            "@type": "Enum",
+            "valueSchema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:epsilon_thnad;1",
+          "@type": "Property",
+          "name": "epsilon_spazz",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:example:epsilon_thnad;1",
+            "@type": "Enum",
+            "valueSchema": "integer"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumIdIsDtmiV4.json b/DTDL/v4/spec/Requirement-ClassEnumIdIsDtmiV4.json
new file mode 100644
index 00000000..9b0cd1f3
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumIdIsDtmiV4.json
@@ -0,0 +1,1020 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;7",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;108675309",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;999999999",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;3.14",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;3.141592",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": null,
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": null,
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": 626,
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": 626,
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": true,
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": true,
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": {
+            "@value": "dtmi:apparently:valid:identifier;3"
+          },
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": {
+            "@value": "dtmi:apparently:valid:identifier;3"
+          },
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;0",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;0.0",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0.0",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;1234567890",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;1234567890",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;1a",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;1a",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;3.0",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;3.0",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;3.1415926",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;3.1415926",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;6.02",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;6.02",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;0.1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0.1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;01",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;01",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:test:invalidId_;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:invalidId_;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:test:_invalidUserId;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:_invalidUserId;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:test:1seg;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:1seg;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar.baz;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar.baz;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo::bar;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo::bar;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "urn:foo:bar:1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "urn:foo:bar:1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "http://foo/bar/baz",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "http://foo/bar/baz",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:dtdl:example;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:dtdl:example;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:standard:example;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:standard:example;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumIdNotArrayV4.json b/DTDL/v4/spec/Requirement-ClassEnumIdNotArrayV4.json
new file mode 100644
index 00000000..73462394
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumIdNotArrayV4.json
@@ -0,0 +1,289 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo:bar;7"
+          ],
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;7"
+          ],
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo:bar;108675309"
+          ],
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;108675309"
+          ],
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo:bar;999999999"
+          ],
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;999999999"
+          ],
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo;1"
+          ],
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo;1"
+          ],
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo:bar"
+          ],
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar"
+          ],
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo:bar;3.14"
+          ],
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;3.14"
+          ],
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo:bar;3.141592"
+          ],
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;3.141592"
+          ],
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumIdRequiredV4.json b/DTDL/v4/spec/Requirement-ClassEnumIdRequiredV4.json
new file mode 100644
index 00000000..0b357d29
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumIdRequiredV4.json
@@ -0,0 +1,76 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_hi",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_beta;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Enum",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumInvalidKeywordsV4.json b/DTDL/v4/spec/Requirement-ClassEnumInvalidKeywordsV4.json
new file mode 100644
index 00000000..32c4ec5c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumInvalidKeywordsV4.json
@@ -0,0 +1,158 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_zatz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "@graph": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:xi_flunn;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "@graph": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_yekk;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "@value": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:xi_hi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "@value": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_beta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "@language": "en"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:omicron_delta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "@language": "en"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_zeta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "@foobar": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:omicron_theta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "@foobar": true
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumPropertyCommentStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassEnumPropertyCommentStringLengthV4.json
new file mode 100644
index 00000000..e08cdc14
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumPropertyCommentStringLengthV4.json
@@ -0,0 +1,60 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_spazz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_zatz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zeta_flunn;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumPropertyCommentStringV4.json b/DTDL/v4/spec/Requirement-ClassEnumPropertyCommentStringV4.json
new file mode 100644
index 00000000..eb12529c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumPropertyCommentStringV4.json
@@ -0,0 +1,435 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_floob;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "comment": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_jogg;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "comment": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_itch;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "comment": {
+            "@value": "hello",
+            "@type": "xsd:string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_vroo;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "comment": [
+            {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_alpha;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "comment": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_gamma;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "comment": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zeta_epsilon;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "comment": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_eta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "comment": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zeta_iota;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "comment": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_lambda;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "comment": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zeta_nu;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "comment": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_omicron;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "comment": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zeta_rho;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "comment": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_tau;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "comment": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zeta_phi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "comment": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_psi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "comment": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zeta_yuzz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "comment": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_um;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "comment": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zeta_fuddle;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "comment": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_nuh;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "comment": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zeta_quan;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "comment": [
+            {}
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumPropertyCommentTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassEnumPropertyCommentTermAndDtmiV4.json
new file mode 100644
index 00000000..c77cbf6f
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumPropertyCommentTermAndDtmiV4.json
@@ -0,0 +1,43 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_eta;1",
+          "@type": "Enum",
+          "comment": "eta_theta",
+          "dtmi:dtdl:property:comment;4": "eta_iota",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:eta_lambda;1",
+          "@type": "Enum",
+          "comment": "eta_mu",
+          "dtmi:dtdl:property:comment;4": "eta_nu",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumPropertyDescriptionLangStringV4.json b/DTDL/v4/spec/Requirement-ClassEnumPropertyDescriptionLangStringV4.json
new file mode 100644
index 00000000..85fd2232
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumPropertyDescriptionLangStringV4.json
@@ -0,0 +1,506 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_omicron;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_rho;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_tau;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": {
+            "en": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_phi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": [
+            {
+              "@value": "hello",
+              "@language": "en"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_psi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_yuzz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_um;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:eta_fuddle;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_nuh;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:eta_quan;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_spazz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:eta_zatz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_flunn;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:eta_yekk;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_hi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:theta_beta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_delta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:theta_zeta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_theta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:theta_kappa;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_mu;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:theta_xi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_pi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:theta_sigma;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumPropertyDescriptionStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassEnumPropertyDescriptionStringLengthV4.json
new file mode 100644
index 00000000..5d718d14
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumPropertyDescriptionStringLengthV4.json
@@ -0,0 +1,60 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_upsilon;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_chi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:theta_omega;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumPropertyDescriptionTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassEnumPropertyDescriptionTermAndDtmiV4.json
new file mode 100644
index 00000000..62155586
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumPropertyDescriptionTermAndDtmiV4.json
@@ -0,0 +1,51 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_spazz;1",
+          "@type": "Enum",
+          "description": [
+            "theta_floob"
+          ],
+          "dtmi:dtdl:property:description;4": [
+            "theta_zatz"
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:theta_flunn;1",
+          "@type": "Enum",
+          "description": [
+            "theta_itch"
+          ],
+          "dtmi:dtdl:property:description;4": [
+            "theta_yekk"
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumPropertyDisplayNameLangStringV4.json b/DTDL/v4/spec/Requirement-ClassEnumPropertyDisplayNameLangStringV4.json
new file mode 100644
index 00000000..fd125211
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumPropertyDisplayNameLangStringV4.json
@@ -0,0 +1,506 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_hi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_beta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_delta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": {
+            "en": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_zeta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": [
+            {
+              "@value": "hello",
+              "@language": "en"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_theta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_kappa;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_mu;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:iota_xi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_pi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:iota_sigma;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_upsilon;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:iota_chi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_omega;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:iota_wum;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_humpf;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:iota_glikk;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_snee;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:iota_thnad;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_floob;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:iota_jogg;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_itch;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:iota_vroo;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_alpha;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:kappa_gamma;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumPropertyDisplayNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassEnumPropertyDisplayNameStringLengthV4.json
new file mode 100644
index 00000000..337db381
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumPropertyDisplayNameStringLengthV4.json
@@ -0,0 +1,60 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_epsilon;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_eta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:kappa_iota;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumPropertyDisplayNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassEnumPropertyDisplayNameTermAndDtmiV4.json
new file mode 100644
index 00000000..bd207447
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumPropertyDisplayNameTermAndDtmiV4.json
@@ -0,0 +1,51 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_upsilon;1",
+          "@type": "Enum",
+          "displayName": [
+            "kappa_phi"
+          ],
+          "dtmi:dtdl:property:displayName;4": [
+            "kappa_chi"
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:kappa_omega;1",
+          "@type": "Enum",
+          "displayName": [
+            "kappa_yuzz"
+          ],
+          "dtmi:dtdl:property:displayName;4": [
+            "kappa_wum"
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumPropertyEnumValuesElementV4.json b/DTDL/v4/spec/Requirement-ClassEnumPropertyEnumValuesElementV4.json
new file mode 100644
index 00000000..ed5afa21
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumPropertyEnumValuesElementV4.json
@@ -0,0 +1,287 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "kappa_glikk",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "@id": "dtmi:example:kappa_humpf;1",
+              "enumValue": 1518,
+              "name": "kappa_fuddle"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "kappa_thnad",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": [
+              {
+                "@id": "dtmi:example:kappa_snee;1",
+                "enumValue": 1519,
+                "name": "kappa_quan"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_zatz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:ex:dependentRef;1",
+            "enumValue": 1520,
+            "name": "kappa_floob"
+          }
+        },
+        "contents": {
+          "@type": "Property",
+          "name": "kappa_flunn",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": "dtmi:ex:dependentRef;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_yekk;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:ex:dependentRef;1",
+            "enumValue": 1521,
+            "name": "kappa_itch"
+          }
+        },
+        "contents": {
+          "@type": "Property",
+          "name": "kappa_hi",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": [
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "lambda_gamma",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "@id": "dtmi:example:lambda_alpha;1",
+              "enumValue": 1522,
+              "name": "lambda_beta",
+              "@context": "dtmi:dtdl:context;2"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "lambda_eta",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "@id": "dtmi:example:lambda_epsilon;1",
+              "enumValue": 1523,
+              "name": "lambda_zeta",
+              "@context": "dtmi:dtdl:context;2"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "lambda_lambda",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "@id": "dtmi:example:lambda_iota;1",
+              "enumValue": 1524,
+              "name": "lambda_kappa",
+              "@context": "dtmi:dtdl:context;3"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "lambda_omicron",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "@id": "dtmi:example:lambda_nu;1",
+              "enumValue": 1525,
+              "name": "lambda_xi",
+              "@context": "dtmi:dtdl:context;3"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "lambda_rho",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "lambda_psi",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": [
+              {
+                "@id": "dtmi:example:lambda_tau;1",
+                "enumValue": 1526,
+                "name": "lambda_upsilon"
+              },
+              {
+                "@id": "dtmi:example:lambda_phi;1",
+                "enumValue": 1527,
+                "name": "lambda_chi"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumPropertyEnumValuesTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassEnumPropertyEnumValuesTermAndDtmiV4.json
new file mode 100644
index 00000000..0177e510
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumPropertyEnumValuesTermAndDtmiV4.json
@@ -0,0 +1,63 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_fuddle;1",
+          "@type": "Enum",
+          "enumValues": [
+            {
+              "enumValue": 1532,
+              "name": "xi_glikk"
+            }
+          ],
+          "dtmi:dtdl:property:enumValues;4": [
+            {
+              "enumValue": 1533,
+              "name": "xi_nuh"
+            }
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:xi_quan;1",
+          "@type": "Enum",
+          "enumValues": [
+            {
+              "enumValue": 1534,
+              "name": "xi_thnad"
+            }
+          ],
+          "dtmi:dtdl:property:enumValues;4": [
+            {
+              "enumValue": 1535,
+              "name": "xi_spazz"
+            }
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumPropertyEnumValuesTypeConformanceV4.json b/DTDL/v4/spec/Requirement-ClassEnumPropertyEnumValuesTypeConformanceV4.json
new file mode 100644
index 00000000..4a202519
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumPropertyEnumValuesTypeConformanceV4.json
@@ -0,0 +1,763 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_glikk;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:lambda_fuddle;1",
+            "elementSchema": "unsignedShort",
+            "@type": "Array"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:lambda_quan;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:lambda_snee;1",
+            "elementSchema": "uuid",
+            "@type": "Array"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_zatz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:lambda_spazz;1",
+            "name": "lambda_floob",
+            "@type": "Command"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:lambda_yekk;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:lambda_flunn;1",
+            "name": "lambda_itch",
+            "@type": "Command"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_beta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:lambda_hi;1",
+            "name": "mu_alpha",
+            "schema": "boolean",
+            "@type": "CommandRequest"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:mu_zeta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:mu_delta;1",
+            "name": "mu_epsilon",
+            "schema": "byte",
+            "@type": "CommandRequest"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_kappa;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:mu_theta;1",
+            "name": "mu_iota",
+            "schema": "bytes",
+            "@type": "CommandResponse"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:mu_xi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:mu_mu;1",
+            "name": "mu_nu",
+            "schema": "date",
+            "@type": "CommandResponse"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_tau;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:mu_pi;1",
+            "name": "mu_rho",
+            "schema": {
+              "@id": "dtmi:example:mu_sigma;1",
+              "@type": "Interface"
+            },
+            "@type": "Component"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:mu_omega;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:mu_phi;1",
+            "name": "mu_chi",
+            "schema": {
+              "@id": "dtmi:example:mu_psi;1",
+              "@type": "Interface"
+            },
+            "@type": "Component"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_um;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:mu_wum;1",
+            "valueSchema": "integer",
+            "@type": "Enum"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:mu_glikk;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:mu_fuddle;1",
+            "valueSchema": "integer",
+            "@type": "Enum"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_thnad;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:mu_snee;1",
+            "enumValue": 1528,
+            "name": "mu_quan",
+            "@type": "EnumValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_jogg;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:mu_floob;1",
+            "name": "mu_zatz",
+            "schema": "dateTime",
+            "@type": "Field"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:mu_vroo;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:mu_itch;1",
+            "name": "mu_yekk",
+            "schema": "decimal",
+            "@type": "Field"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_beta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:nu_alpha;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:nu_epsilon;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:nu_delta;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_kappa;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:nu_eta;1",
+            "mapKey": {
+              "name": "nu_theta",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "nu_iota",
+              "schema": "double"
+            },
+            "@type": "Map"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:nu_omicron;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:nu_mu;1",
+            "mapKey": {
+              "name": "nu_nu",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "nu_xi",
+              "schema": "duration"
+            },
+            "@type": "Map"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_tau;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:nu_rho;1",
+            "name": "nu_sigma",
+            "schema": "string",
+            "@type": "MapKey"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:nu_psi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:nu_phi;1",
+            "name": "nu_chi",
+            "schema": "string",
+            "@type": "MapKey"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_um;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:nu_yuzz;1",
+            "name": "nu_wum",
+            "schema": "float",
+            "@type": "MapValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:nu_nuh;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:nu_fuddle;1",
+            "name": "nu_glikk",
+            "schema": "integer",
+            "@type": "MapValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_thnad;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:nu_quan;1",
+            "@type": "Object"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:nu_zatz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:nu_floob;1",
+            "@type": "Object"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_yekk;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:nu_flunn;1",
+            "name": "nu_itch",
+            "schema": "long",
+            "@type": "Property"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:xi_beta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:nu_hi;1",
+            "name": "xi_alpha",
+            "schema": "short",
+            "@type": "Property"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_zeta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:xi_delta;1",
+            "name": "xi_epsilon",
+            "@type": "Relationship"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:xi_kappa;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:xi_theta;1",
+            "name": "xi_iota",
+            "@type": "Relationship"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_xi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:xi_mu;1",
+            "name": "xi_nu",
+            "schema": "string",
+            "@type": "Telemetry"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:xi_sigma;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:example:xi_pi;1",
+            "name": "xi_rho",
+            "schema": "time",
+            "@type": "Telemetry"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumPropertyFormallyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Requirement-ClassEnumPropertyFormallyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..7ab0dee7
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumPropertyFormallyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,80 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_sigma;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:omicron_upsilon;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_chi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "boolean": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:omicron_omega;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "boolean": null
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumPropertyFormallyUndefinedTermV4.json b/DTDL/v4/spec/Requirement-ClassEnumPropertyFormallyUndefinedTermV4.json
new file mode 100644
index 00000000..61df9a7d
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumPropertyFormallyUndefinedTermV4.json
@@ -0,0 +1,41 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_jogg;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "foobar": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:omicron_itch;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "foobar": {}
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumPropertyInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassEnumPropertyInvalidDtmiV4.json
new file mode 100644
index 00000000..e441a588
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumPropertyInvalidDtmiV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_wum;1",
+          "@type": [
+            "Enum",
+            "Foobar"
+          ],
+          "valueSchema": "integer",
+          "dtmi:foo//bar": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:omicron_humpf;1",
+          "@type": [
+            "Enum",
+            "Foobar"
+          ],
+          "valueSchema": "integer",
+          "dtmi:foo//bar": 626
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumPropertyNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassEnumPropertyNotDtmiNorTermV4.json
new file mode 100644
index 00000000..121bc64c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumPropertyNotDtmiNorTermV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_glikk;1",
+          "@type": [
+            "Enum",
+            "Foobar"
+          ],
+          "valueSchema": "integer",
+          "http://foo.com/bar": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:omicron_snee;1",
+          "@type": [
+            "Enum",
+            "Foobar"
+          ],
+          "valueSchema": "integer",
+          "http://foo.com/bar": true
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumPropertyValueSchemaSpecificValuesV4.json b/DTDL/v4/spec/Requirement-ClassEnumPropertyValueSchemaSpecificValuesV4.json
new file mode 100644
index 00000000..577dd80d
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumPropertyValueSchemaSpecificValuesV4.json
@@ -0,0 +1,2561 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_vroo;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "jogg_yekk",
+            "enumValue": 17
+          },
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_beta;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "flunn_alpha",
+            "enumValue": 17
+          },
+          "valueSchema": [
+            "integer"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_epsilon;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "flunn_delta",
+            "enumValue": 17
+          },
+          "valueSchema": "dtmi:dtdl:instance:Schema:integer;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_theta;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "flunn_eta",
+            "enumValue": 17
+          },
+          "valueSchema": [
+            "dtmi:dtdl:instance:Schema:integer;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_lambda;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "flunn_kappa",
+            "enumValue": 17
+          },
+          "valueSchema": [
+            "integer",
+            "dtmi:dtdl:instance:Schema:integer;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_xi;1",
+          "@type": "Enum",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "flunn_nu",
+            "enumValue": 17
+          },
+          "valueSchema": [
+            "integer",
+            "dtmi:dtdl:instance:Schema:integer;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_rho;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "flunn_pi",
+            "enumValue": "delta_psi"
+          },
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_upsilon;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "flunn_tau",
+            "enumValue": "delta_psi"
+          },
+          "valueSchema": [
+            "string"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_psi;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "flunn_chi",
+            "enumValue": "delta_psi"
+          },
+          "valueSchema": "dtmi:dtdl:instance:Schema:string;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_wum;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "flunn_yuzz",
+            "enumValue": "delta_psi"
+          },
+          "valueSchema": [
+            "dtmi:dtdl:instance:Schema:string;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_fuddle;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "flunn_humpf",
+            "enumValue": "delta_psi"
+          },
+          "valueSchema": [
+            "string",
+            "dtmi:dtdl:instance:Schema:string;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_snee;1",
+          "@type": "Enum",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "flunn_nuh",
+            "enumValue": "delta_psi"
+          },
+          "valueSchema": [
+            "string",
+            "dtmi:dtdl:instance:Schema:string;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_thnad;1",
+          "@type": "Enum",
+          "valueSchema": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:flunn_floob;1",
+          "@type": "Enum",
+          "valueSchema": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_jogg;1",
+          "@type": "Enum",
+          "valueSchema": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:flunn_itch;1",
+          "@type": "Enum",
+          "valueSchema": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_vroo;1",
+          "@type": "Enum",
+          "valueSchema": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:itch_alpha;1",
+          "@type": "Enum",
+          "valueSchema": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_gamma;1",
+          "@type": "Enum",
+          "valueSchema": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:itch_epsilon;1",
+          "@type": "Enum",
+          "valueSchema": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_eta;1",
+          "@type": "Enum",
+          "valueSchema": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:itch_iota;1",
+          "@type": "Enum",
+          "valueSchema": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_lambda;1",
+          "@type": "Enum",
+          "valueSchema": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:itch_nu;1",
+          "@type": "Enum",
+          "valueSchema": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_omicron;1",
+          "@type": "Enum",
+          "valueSchema": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:itch_rho;1",
+          "@type": "Enum",
+          "valueSchema": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_tau;1",
+          "@type": "Enum",
+          "valueSchema": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:itch_phi;1",
+          "@type": "Enum",
+          "valueSchema": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_psi;1",
+          "@type": "Enum",
+          "valueSchema": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:itch_yuzz;1",
+          "@type": "Enum",
+          "valueSchema": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_um;1",
+          "@type": "Enum",
+          "valueSchema": "asynchronous"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:itch_fuddle;1",
+          "@type": "Enum",
+          "valueSchema": "asynchronous"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_nuh;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:CommandType:asynchronous;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:itch_quan;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:CommandType:asynchronous;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_spazz;1",
+          "@type": "Enum",
+          "valueSchema": "synchronous"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:itch_zatz;1",
+          "@type": "Enum",
+          "valueSchema": "synchronous"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_flunn;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:CommandType:synchronous;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:itch_yekk;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:CommandType:synchronous;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_hi;1",
+          "@type": "Enum",
+          "valueSchema": "boolean"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:yekk_beta;1",
+          "@type": "Enum",
+          "valueSchema": "boolean"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_delta;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:boolean;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:yekk_zeta;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:boolean;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_theta;1",
+          "@type": "Enum",
+          "valueSchema": "byte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:yekk_kappa;1",
+          "@type": "Enum",
+          "valueSchema": "byte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_mu;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:byte;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:yekk_xi;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:byte;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_pi;1",
+          "@type": "Enum",
+          "valueSchema": "bytes"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:yekk_sigma;1",
+          "@type": "Enum",
+          "valueSchema": "bytes"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_upsilon;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:bytes;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:yekk_chi;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:bytes;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_omega;1",
+          "@type": "Enum",
+          "valueSchema": "date"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:yekk_wum;1",
+          "@type": "Enum",
+          "valueSchema": "date"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_humpf;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:date;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:yekk_glikk;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:date;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_snee;1",
+          "@type": "Enum",
+          "valueSchema": "dateTime"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:yekk_thnad;1",
+          "@type": "Enum",
+          "valueSchema": "dateTime"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_floob;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:dateTime;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:yekk_jogg;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:dateTime;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_itch;1",
+          "@type": "Enum",
+          "valueSchema": "decimal"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:yekk_vroo;1",
+          "@type": "Enum",
+          "valueSchema": "decimal"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_alpha;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:decimal;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:vroo_gamma;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:decimal;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_epsilon;1",
+          "@type": "Enum",
+          "valueSchema": "double"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:vroo_eta;1",
+          "@type": "Enum",
+          "valueSchema": "double"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_iota;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:double;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:vroo_lambda;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:double;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_nu;1",
+          "@type": "Enum",
+          "valueSchema": "duration"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:vroo_omicron;1",
+          "@type": "Enum",
+          "valueSchema": "duration"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_rho;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:duration;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:vroo_tau;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:duration;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_phi;1",
+          "@type": "Enum",
+          "valueSchema": "float"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:vroo_psi;1",
+          "@type": "Enum",
+          "valueSchema": "float"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_yuzz;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:float;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:vroo_um;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:float;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_fuddle;1",
+          "@type": "Enum",
+          "valueSchema": "long"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:vroo_nuh;1",
+          "@type": "Enum",
+          "valueSchema": "long"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_quan;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:long;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:vroo_spazz;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:long;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_zatz;1",
+          "@type": "Enum",
+          "valueSchema": "short"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:vroo_flunn;1",
+          "@type": "Enum",
+          "valueSchema": "short"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_yekk;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:short;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:vroo_hi;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:short;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_beta;1",
+          "@type": "Enum",
+          "valueSchema": "time"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:hi_delta;1",
+          "@type": "Enum",
+          "valueSchema": "time"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_zeta;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:time;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:hi_theta;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:time;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_kappa;1",
+          "@type": "Enum",
+          "valueSchema": "unsignedByte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:hi_mu;1",
+          "@type": "Enum",
+          "valueSchema": "unsignedByte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_xi;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:unsignedByte;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:hi_pi;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:unsignedByte;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_sigma;1",
+          "@type": "Enum",
+          "valueSchema": "unsignedInteger"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:hi_upsilon;1",
+          "@type": "Enum",
+          "valueSchema": "unsignedInteger"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_chi;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:unsignedInteger;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:hi_omega;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:unsignedInteger;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_wum;1",
+          "@type": "Enum",
+          "valueSchema": "unsignedLong"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:hi_humpf;1",
+          "@type": "Enum",
+          "valueSchema": "unsignedLong"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_glikk;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:unsignedLong;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:hi_snee;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:unsignedLong;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_thnad;1",
+          "@type": "Enum",
+          "valueSchema": "unsignedShort"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:hi_floob;1",
+          "@type": "Enum",
+          "valueSchema": "unsignedShort"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_jogg;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:unsignedShort;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:hi_itch;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:unsignedShort;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_vroo;1",
+          "@type": "Enum",
+          "valueSchema": "uuid"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:alpha_alpha;1",
+          "@type": "Enum",
+          "valueSchema": "uuid"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_gamma;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:uuid;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:alpha_epsilon;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:dtdl:instance:Schema:uuid;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_eta;1",
+          "@type": "Enum",
+          "valueSchema": "lineString"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:alpha_iota;1",
+          "@type": "Enum",
+          "valueSchema": "lineString"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_lambda;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:standard:schema:geospatial:lineString;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:alpha_nu;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:standard:schema:geospatial:lineString;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_omicron;1",
+          "@type": "Enum",
+          "valueSchema": "multiLineString"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:alpha_rho;1",
+          "@type": "Enum",
+          "valueSchema": "multiLineString"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_tau;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:standard:schema:geospatial:multiLineString;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:alpha_phi;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:standard:schema:geospatial:multiLineString;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_psi;1",
+          "@type": "Enum",
+          "valueSchema": "multiPoint"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:alpha_yuzz;1",
+          "@type": "Enum",
+          "valueSchema": "multiPoint"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_um;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:standard:schema:geospatial:multiPoint;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:alpha_fuddle;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:standard:schema:geospatial:multiPoint;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_nuh;1",
+          "@type": "Enum",
+          "valueSchema": "multiPolygon"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:alpha_quan;1",
+          "@type": "Enum",
+          "valueSchema": "multiPolygon"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_spazz;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:standard:schema:geospatial:multiPolygon;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:alpha_zatz;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:standard:schema:geospatial:multiPolygon;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_flunn;1",
+          "@type": "Enum",
+          "valueSchema": "point"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:alpha_yekk;1",
+          "@type": "Enum",
+          "valueSchema": "point"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_hi;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:standard:schema:geospatial:point;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:beta_beta;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:standard:schema:geospatial:point;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_delta;1",
+          "@type": "Enum",
+          "valueSchema": "polygon"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:beta_zeta;1",
+          "@type": "Enum",
+          "valueSchema": "polygon"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_theta;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:standard:schema:geospatial:polygon;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:beta_kappa;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:standard:schema:geospatial:polygon;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_mu;1",
+          "@type": "Enum",
+          "valueSchema": "scaledDecimal"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:beta_xi;1",
+          "@type": "Enum",
+          "valueSchema": "scaledDecimal"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_pi;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:standard:schema:scaledDecimal;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:beta_sigma;1",
+          "@type": "Enum",
+          "valueSchema": "dtmi:standard:schema:scaledDecimal;4"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumPropertyValueSchemaTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassEnumPropertyValueSchemaTermAndDtmiV4.json
new file mode 100644
index 00000000..124bc9d2
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumPropertyValueSchemaTermAndDtmiV4.json
@@ -0,0 +1,41 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_jogg;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "dtmi:dtdl:property:valueSchema;4": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:beta_itch;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "dtmi:dtdl:property:valueSchema;4": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumRequiredPropertiesV4.json b/DTDL/v4/spec/Requirement-ClassEnumRequiredPropertiesV4.json
new file mode 100644
index 00000000..f4fc735e
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumRequiredPropertiesV4.json
@@ -0,0 +1,72 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_yekk;1",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:floob_hi;1",
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_beta;1",
+          "@type": "Enum"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zatz_delta;1",
+          "@type": "Enum"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumTypeIncludesInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassEnumTypeIncludesInvalidDtmiV4.json
new file mode 100644
index 00000000..3572fa16
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumTypeIncludesInvalidDtmiV4.json
@@ -0,0 +1,45 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_fuddle;1",
+          "@type": [
+            "Enum",
+            "dtmi:foo//bar"
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:jogg_nuh;1",
+          "@type": [
+            "Enum",
+            "dtmi:foo//bar"
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumTypeIncludesMaterialV4.json b/DTDL/v4/spec/Requirement-ClassEnumTypeIncludesMaterialV4.json
new file mode 100644
index 00000000..099c0ffc
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumTypeIncludesMaterialV4.json
@@ -0,0 +1,156 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_jogg;1",
+          "valueSchema": "integer",
+          "@type": "Enum"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_itch;1",
+          "valueSchema": "integer",
+          "@type": [
+            "Enum"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_vroo;1",
+          "valueSchema": "integer",
+          "@type": "dtmi:dtdl:class:Enum;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_alpha;1",
+          "valueSchema": "integer",
+          "@type": [
+            "dtmi:dtdl:class:Enum;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_gamma;1",
+          "valueSchema": "integer",
+          "@type": "Something"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:jogg_epsilon;1",
+          "valueSchema": "integer",
+          "@type": "Something"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_eta;1",
+          "valueSchema": "integer",
+          "@type": [
+            "Something"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:jogg_iota;1",
+          "valueSchema": "integer",
+          "@type": [
+            "Something"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumTypeIncludesNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassEnumTypeIncludesNotDtmiNorTermV4.json
new file mode 100644
index 00000000..38422e5b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumTypeIncludesNotDtmiNorTermV4.json
@@ -0,0 +1,45 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_quan;1",
+          "@type": [
+            "Enum",
+            "http://foo.com/bar"
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:jogg_spazz;1",
+          "@type": [
+            "Enum",
+            "http://foo.com/bar"
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumTypeStringOrArrayV4.json b/DTDL/v4/spec/Requirement-ClassEnumTypeStringOrArrayV4.json
new file mode 100644
index 00000000..5871cbea
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumTypeStringOrArrayV4.json
@@ -0,0 +1,314 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_zeta;1",
+          "valueSchema": "integer",
+          "@type": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zatz_theta;1",
+          "valueSchema": "integer",
+          "@type": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_kappa;1",
+          "valueSchema": "integer",
+          "@type": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zatz_mu;1",
+          "valueSchema": "integer",
+          "@type": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_xi;1",
+          "valueSchema": "integer",
+          "@type": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zatz_pi;1",
+          "valueSchema": "integer",
+          "@type": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_sigma;1",
+          "valueSchema": "integer",
+          "@type": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zatz_upsilon;1",
+          "valueSchema": "integer",
+          "@type": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_chi;1",
+          "valueSchema": "integer",
+          "@type": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zatz_omega;1",
+          "valueSchema": "integer",
+          "@type": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_wum;1",
+          "valueSchema": "integer",
+          "@type": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zatz_humpf;1",
+          "valueSchema": "integer",
+          "@type": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_glikk;1",
+          "valueSchema": "integer",
+          "@type": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zatz_snee;1",
+          "valueSchema": "integer",
+          "@type": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_thnad;1",
+          "valueSchema": "integer",
+          "@type": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:zatz_floob;1",
+          "valueSchema": "integer",
+          "@type": [
+            {}
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValueContextConformsV4.json b/DTDL/v4/spec/Requirement-ClassEnumValueContextConformsV4.json
new file mode 100644
index 00000000..1cb3c713
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValueContextConformsV4.json
@@ -0,0 +1,434 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "psi_phi",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "enumValue": 1612,
+              "name": "psi_upsilon",
+              "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "psi_omega",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "enumValue": 1613,
+              "name": "psi_psi",
+              "@context": []
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "psi_um",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "enumValue": 1614,
+              "name": "psi_wum",
+              "@context": [
+                "dtmi:dtdl:extension:quantitativeTypes;1"
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "psi_glikk",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "enumValue": 1615,
+              "name": "psi_fuddle",
+              "@context": null
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "psi_quan",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "enumValue": 1616,
+              "name": "psi_snee",
+              "@context": 626
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "psi_floob",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "enumValue": 1617,
+              "name": "psi_spazz",
+              "@context": true
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "psi_flunn",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "enumValue": 1618,
+              "name": "psi_jogg",
+              "@context": [
+                null
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "psi_vroo",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "enumValue": 1619,
+              "name": "psi_yekk",
+              "@context": [
+                626
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "omega_beta",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "enumValue": 1620,
+              "name": "omega_alpha",
+              "@context": [
+                true
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "omega_epsilon",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "enumValue": 1621,
+              "name": "omega_delta",
+              "@context": "dtmi:dtdl:extension:quantitativeTypes"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "omega_theta",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "enumValue": 1622,
+              "name": "omega_eta",
+              "@context": "http://dtdl/extension/quantitativeTypes/1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "omega_lambda",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "enumValue": 1623,
+              "name": "omega_kappa",
+              "@context": "quantitativeTypes;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "omega_xi",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "enumValue": 1624,
+              "name": "omega_nu",
+              "@context": {}
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "omega_rho",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "enumValue": 1625,
+              "name": "omega_pi",
+              "@context": {
+                "foo": "dtmi:foo:bar;1"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "omega_upsilon",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "enumValue": 1626,
+              "name": "omega_tau",
+              "@context": [
+                {}
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "omega_psi",
+          "schema": {
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "enumValue": 1627,
+              "name": "omega_chi",
+              "@context": [
+                {
+                  "foo": "dtmi:foo:bar;1"
+                }
+              ]
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValueIdDuplicateV4.json b/DTDL/v4/spec/Requirement-ClassEnumValueIdDuplicateV4.json
new file mode 100644
index 00000000..e7ddda0a
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValueIdDuplicateV4.json
@@ -0,0 +1,59 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:snee_epsilon;1",
+          "@type": "Property",
+          "name": "snee_eta",
+          "schema": {
+            "@id": "dtmi:example:snee_epsilon;1",
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "@id": "dtmi:example:snee_epsilon;1",
+              "enumValue": 1736,
+              "name": "snee_zeta"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:snee_theta;1",
+          "@type": "Property",
+          "name": "snee_kappa",
+          "schema": {
+            "@id": "dtmi:example:snee_theta;1",
+            "@type": "Enum",
+            "valueSchema": "integer",
+            "enumValues": {
+              "@context": "dtmi:undefinedExtension:context;1",
+              "@id": "dtmi:example:snee_theta;1",
+              "enumValue": 1737,
+              "name": "snee_iota"
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValueIdIsDtmiV4.json b/DTDL/v4/spec/Requirement-ClassEnumValueIdIsDtmiV4.json
new file mode 100644
index 00000000..9ecc13ca
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValueIdIsDtmiV4.json
@@ -0,0 +1,1295 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_xi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:foo:bar;7",
+            "enumValue": 1667,
+            "name": "um_nu"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_rho;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:foo:bar;108675309",
+            "enumValue": 1668,
+            "name": "um_pi"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_upsilon;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:foo:bar;999999999",
+            "enumValue": 1669,
+            "name": "um_tau"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_psi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:foo;1",
+            "enumValue": 1670,
+            "name": "um_chi"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_wum;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:foo:bar",
+            "enumValue": 1671,
+            "name": "um_yuzz"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_fuddle;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:foo:bar;3.14",
+            "enumValue": 1672,
+            "name": "um_humpf"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_snee;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:foo:bar;3.141592",
+            "enumValue": 1673,
+            "name": "um_nuh"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_spazz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": null,
+            "enumValue": 1674,
+            "name": "um_thnad"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_jogg;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": null,
+            "enumValue": 1675,
+            "name": "um_zatz"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_yekk;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": 626,
+            "enumValue": 1676,
+            "name": "um_itch"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_alpha;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": 626,
+            "enumValue": 1677,
+            "name": "um_hi"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_delta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": true,
+            "enumValue": 1678,
+            "name": "humpf_gamma"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_eta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": true,
+            "enumValue": 1679,
+            "name": "humpf_zeta"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_kappa;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": {
+              "@value": "dtmi:apparently:valid:identifier;3"
+            },
+            "enumValue": 1680,
+            "name": "humpf_iota"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_nu;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": {
+              "@value": "dtmi:apparently:valid:identifier;3"
+            },
+            "enumValue": 1681,
+            "name": "humpf_mu"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_pi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:foo:bar;0",
+            "enumValue": 1682,
+            "name": "humpf_omicron"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_tau;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;0",
+            "enumValue": 1683,
+            "name": "humpf_sigma"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_chi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:foo:bar;0.0",
+            "enumValue": 1684,
+            "name": "humpf_phi"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_yuzz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;0.0",
+            "enumValue": 1685,
+            "name": "humpf_omega"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_humpf;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:foo:bar;1234567890",
+            "enumValue": 1686,
+            "name": "humpf_um"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_nuh;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;1234567890",
+            "enumValue": 1687,
+            "name": "humpf_glikk"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_thnad;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:foo:bar;1a",
+            "enumValue": 1688,
+            "name": "humpf_quan"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_zatz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;1a",
+            "enumValue": 1689,
+            "name": "humpf_floob"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_itch;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:foo:bar;3.0",
+            "enumValue": 1690,
+            "name": "humpf_flunn"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_hi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;3.0",
+            "enumValue": 1691,
+            "name": "humpf_vroo"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_gamma;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:foo:bar;3.1415926",
+            "enumValue": 1692,
+            "name": "fuddle_beta"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_zeta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;3.1415926",
+            "enumValue": 1693,
+            "name": "fuddle_epsilon"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_iota;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:foo:bar;6.02",
+            "enumValue": 1694,
+            "name": "fuddle_theta"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_mu;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;6.02",
+            "enumValue": 1695,
+            "name": "fuddle_lambda"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_omicron;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:foo:bar;0.1",
+            "enumValue": 1696,
+            "name": "fuddle_xi"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_sigma;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;0.1",
+            "enumValue": 1697,
+            "name": "fuddle_rho"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_phi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:foo:bar;01",
+            "enumValue": 1698,
+            "name": "fuddle_upsilon"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_omega;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;01",
+            "enumValue": 1699,
+            "name": "fuddle_psi"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_um;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:foo:bar;",
+            "enumValue": 1700,
+            "name": "fuddle_wum"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_glikk;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;",
+            "enumValue": 1701,
+            "name": "fuddle_fuddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_quan;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:test:invalidId_;1",
+            "enumValue": 1702,
+            "name": "fuddle_snee"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_floob;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:test:invalidId_;1",
+            "enumValue": 1703,
+            "name": "fuddle_spazz"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_flunn;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:test:_invalidUserId;1",
+            "enumValue": 1704,
+            "name": "fuddle_jogg"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_vroo;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:test:_invalidUserId;1",
+            "enumValue": 1705,
+            "name": "fuddle_yekk"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_beta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:test:1seg;1",
+            "enumValue": 1706,
+            "name": "glikk_alpha"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_epsilon;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:test:1seg;1",
+            "enumValue": 1707,
+            "name": "glikk_delta"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_theta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:foo:bar.baz;1",
+            "enumValue": 1708,
+            "name": "glikk_eta"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_lambda;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar.baz;1",
+            "enumValue": 1709,
+            "name": "glikk_kappa"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_xi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:foo::bar;1",
+            "enumValue": 1710,
+            "name": "glikk_nu"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_rho;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo::bar;1",
+            "enumValue": 1711,
+            "name": "glikk_pi"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_upsilon;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "urn:foo:bar:1",
+            "enumValue": 1712,
+            "name": "glikk_tau"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_psi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "urn:foo:bar:1",
+            "enumValue": 1713,
+            "name": "glikk_chi"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_wum;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "http://foo/bar/baz",
+            "enumValue": 1714,
+            "name": "glikk_yuzz"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_fuddle;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "http://foo/bar/baz",
+            "enumValue": 1715,
+            "name": "glikk_humpf"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_snee;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:;1",
+            "enumValue": 1716,
+            "name": "glikk_nuh"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_spazz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:;1",
+            "enumValue": 1717,
+            "name": "glikk_thnad"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_jogg;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:dtdl:example;1",
+            "enumValue": 1718,
+            "name": "glikk_zatz"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_yekk;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:dtdl:example;1",
+            "enumValue": 1719,
+            "name": "glikk_itch"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_alpha;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": "dtmi:standard:example;1",
+            "enumValue": 1720,
+            "name": "glikk_hi"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_delta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:standard:example;1",
+            "enumValue": 1721,
+            "name": "nuh_gamma"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValueIdNotArrayV4.json b/DTDL/v4/spec/Requirement-ClassEnumValueIdNotArrayV4.json
new file mode 100644
index 00000000..daf0d9c4
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValueIdNotArrayV4.json
@@ -0,0 +1,359 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_eta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": [
+              "dtmi:foo:bar;7"
+            ],
+            "enumValue": 1722,
+            "name": "nuh_zeta"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_kappa;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;7"
+            ],
+            "enumValue": 1723,
+            "name": "nuh_iota"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_nu;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": [
+              "dtmi:foo:bar;108675309"
+            ],
+            "enumValue": 1724,
+            "name": "nuh_mu"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_pi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;108675309"
+            ],
+            "enumValue": 1725,
+            "name": "nuh_omicron"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_tau;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": [
+              "dtmi:foo:bar;999999999"
+            ],
+            "enumValue": 1726,
+            "name": "nuh_sigma"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_chi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;999999999"
+            ],
+            "enumValue": 1727,
+            "name": "nuh_phi"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_yuzz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": [
+              "dtmi:foo;1"
+            ],
+            "enumValue": 1728,
+            "name": "nuh_omega"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_humpf;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo;1"
+            ],
+            "enumValue": 1729,
+            "name": "nuh_um"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_nuh;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": [
+              "dtmi:foo:bar"
+            ],
+            "enumValue": 1730,
+            "name": "nuh_glikk"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_thnad;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar"
+            ],
+            "enumValue": 1731,
+            "name": "nuh_quan"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_zatz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": [
+              "dtmi:foo:bar;3.14"
+            ],
+            "enumValue": 1732,
+            "name": "nuh_floob"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_itch;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;3.14"
+            ],
+            "enumValue": 1733,
+            "name": "nuh_flunn"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_hi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@id": [
+              "dtmi:foo:bar;3.141592"
+            ],
+            "enumValue": 1734,
+            "name": "nuh_vroo"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_gamma;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;3.141592"
+            ],
+            "enumValue": 1735,
+            "name": "snee_beta"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValueInvalidKeywordsV4.json b/DTDL/v4/spec/Requirement-ClassEnumValueInvalidKeywordsV4.json
new file mode 100644
index 00000000..45f41aff
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValueInvalidKeywordsV4.json
@@ -0,0 +1,190 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_lambda;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1831,
+            "name": "flunn_kappa",
+            "@graph": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_xi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1832,
+            "name": "flunn_nu",
+            "@graph": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_rho;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1833,
+            "name": "flunn_pi",
+            "@value": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_upsilon;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1834,
+            "name": "flunn_tau",
+            "@value": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_psi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1835,
+            "name": "flunn_chi",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_wum;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1836,
+            "name": "flunn_yuzz",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_fuddle;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1837,
+            "name": "flunn_humpf",
+            "@foobar": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_snee;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1838,
+            "name": "flunn_nuh",
+            "@foobar": true
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValuePropertyCommentStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyCommentStringLengthV4.json
new file mode 100644
index 00000000..74be5546
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyCommentStringLengthV4.json
@@ -0,0 +1,72 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_snee;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1759,
+            "name": "quan_nuh",
+            "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_spazz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1760,
+            "name": "quan_thnad",
+            "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_jogg;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1761,
+            "name": "quan_zatz",
+            "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValuePropertyCommentStringV4.json b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyCommentStringV4.json
new file mode 100644
index 00000000..afcdf9ac
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyCommentStringV4.json
@@ -0,0 +1,519 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_mu;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1738,
+            "name": "snee_lambda",
+            "comment": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_omicron;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1739,
+            "name": "snee_xi",
+            "comment": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_sigma;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1740,
+            "name": "snee_rho",
+            "comment": {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_phi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1741,
+            "name": "snee_upsilon",
+            "comment": [
+              {
+                "@value": "hello",
+                "@type": "xsd:string"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_omega;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1742,
+            "name": "snee_psi",
+            "comment": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_um;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1743,
+            "name": "snee_wum",
+            "comment": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_glikk;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1744,
+            "name": "snee_fuddle",
+            "comment": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_quan;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1745,
+            "name": "snee_snee",
+            "comment": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_floob;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1746,
+            "name": "snee_spazz",
+            "comment": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_flunn;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1747,
+            "name": "snee_jogg",
+            "comment": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_vroo;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1748,
+            "name": "snee_yekk",
+            "comment": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_beta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1749,
+            "name": "quan_alpha",
+            "comment": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_epsilon;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1750,
+            "name": "quan_delta",
+            "comment": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_theta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1751,
+            "name": "quan_eta",
+            "comment": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_lambda;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1752,
+            "name": "quan_kappa",
+            "comment": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_xi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1753,
+            "name": "quan_nu",
+            "comment": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_rho;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1754,
+            "name": "quan_pi",
+            "comment": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_upsilon;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1755,
+            "name": "quan_tau",
+            "comment": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_psi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1756,
+            "name": "quan_chi",
+            "comment": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_wum;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1757,
+            "name": "quan_yuzz",
+            "comment": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_fuddle;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1758,
+            "name": "quan_humpf",
+            "comment": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValuePropertyCommentTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyCommentTermAndDtmiV4.json
new file mode 100644
index 00000000..bd90a1c9
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyCommentTermAndDtmiV4.json
@@ -0,0 +1,51 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_mu;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "comment": "thnad_iota",
+            "dtmi:dtdl:property:comment;4": "thnad_kappa",
+            "enumValue": 1765,
+            "name": "thnad_lambda"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_rho;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "comment": "thnad_xi",
+            "dtmi:dtdl:property:comment;4": "thnad_omicron",
+            "enumValue": 1766,
+            "name": "thnad_pi"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValuePropertyDescriptionLangStringV4.json b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyDescriptionLangStringV4.json
new file mode 100644
index 00000000..84cce2ad
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyDescriptionLangStringV4.json
@@ -0,0 +1,602 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_upsilon;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1767,
+            "name": "thnad_tau",
+            "description": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_psi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1768,
+            "name": "thnad_chi",
+            "description": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_wum;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1769,
+            "name": "thnad_yuzz",
+            "description": {
+              "en": "hello"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_fuddle;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1770,
+            "name": "thnad_humpf",
+            "description": [
+              {
+                "@value": "hello",
+                "@language": "en"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_snee;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1771,
+            "name": "thnad_nuh",
+            "description": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_spazz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1772,
+            "name": "thnad_thnad",
+            "description": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_jogg;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1773,
+            "name": "thnad_zatz",
+            "description": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_yekk;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1774,
+            "name": "thnad_itch",
+            "description": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_alpha;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1775,
+            "name": "thnad_hi",
+            "description": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_delta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1776,
+            "name": "spazz_gamma",
+            "description": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_eta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1777,
+            "name": "spazz_zeta",
+            "description": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_kappa;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1778,
+            "name": "spazz_iota",
+            "description": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_nu;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1779,
+            "name": "spazz_mu",
+            "description": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_pi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1780,
+            "name": "spazz_omicron",
+            "description": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_tau;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1781,
+            "name": "spazz_sigma",
+            "description": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_chi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1782,
+            "name": "spazz_phi",
+            "description": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_yuzz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1783,
+            "name": "spazz_omega",
+            "description": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_humpf;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1784,
+            "name": "spazz_um",
+            "description": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_nuh;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1785,
+            "name": "spazz_glikk",
+            "description": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_thnad;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1786,
+            "name": "spazz_quan",
+            "description": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_zatz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1787,
+            "name": "spazz_floob",
+            "description": {
+              "@value": "hello",
+              "@language": "en"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_itch;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1788,
+            "name": "spazz_flunn",
+            "description": {
+              "@value": "hello",
+              "@language": "en"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_hi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1789,
+            "name": "spazz_vroo",
+            "description": [
+              {
+                "en": "hello"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_gamma;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1790,
+            "name": "floob_beta",
+            "description": [
+              {
+                "en": "hello"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValuePropertyDescriptionStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyDescriptionStringLengthV4.json
new file mode 100644
index 00000000..243b9962
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyDescriptionStringLengthV4.json
@@ -0,0 +1,72 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_zeta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1791,
+            "name": "floob_epsilon",
+            "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_iota;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1792,
+            "name": "floob_theta",
+            "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_mu;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1793,
+            "name": "floob_lambda",
+            "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValuePropertyDescriptionTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyDescriptionTermAndDtmiV4.json
new file mode 100644
index 00000000..1583970a
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyDescriptionTermAndDtmiV4.json
@@ -0,0 +1,59 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_fuddle;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "description": [
+              "floob_wum"
+            ],
+            "dtmi:dtdl:property:description;4": [
+              "floob_um"
+            ],
+            "enumValue": 1797,
+            "name": "floob_humpf"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_thnad;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "description": [
+              "floob_nuh"
+            ],
+            "dtmi:dtdl:property:description;4": [
+              "floob_snee"
+            ],
+            "enumValue": 1798,
+            "name": "floob_quan"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValuePropertyDisplayNameLangStringV4.json b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyDisplayNameLangStringV4.json
new file mode 100644
index 00000000..9599f0b4
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyDisplayNameLangStringV4.json
@@ -0,0 +1,602 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_zatz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1799,
+            "name": "floob_floob",
+            "displayName": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_itch;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1800,
+            "name": "floob_flunn",
+            "displayName": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_hi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1801,
+            "name": "floob_vroo",
+            "displayName": {
+              "en": "hello"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_gamma;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1802,
+            "name": "zatz_beta",
+            "displayName": [
+              {
+                "@value": "hello",
+                "@language": "en"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_zeta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1803,
+            "name": "zatz_epsilon",
+            "displayName": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_iota;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1804,
+            "name": "zatz_theta",
+            "displayName": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_mu;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1805,
+            "name": "zatz_lambda",
+            "displayName": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_omicron;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1806,
+            "name": "zatz_xi",
+            "displayName": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_sigma;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1807,
+            "name": "zatz_rho",
+            "displayName": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_phi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1808,
+            "name": "zatz_upsilon",
+            "displayName": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_omega;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1809,
+            "name": "zatz_psi",
+            "displayName": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_um;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1810,
+            "name": "zatz_wum",
+            "displayName": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_glikk;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1811,
+            "name": "zatz_fuddle",
+            "displayName": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_quan;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1812,
+            "name": "zatz_snee",
+            "displayName": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_floob;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1813,
+            "name": "zatz_spazz",
+            "displayName": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_flunn;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1814,
+            "name": "zatz_jogg",
+            "displayName": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_vroo;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1815,
+            "name": "zatz_yekk",
+            "displayName": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_beta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1816,
+            "name": "jogg_alpha",
+            "displayName": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_epsilon;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1817,
+            "name": "jogg_delta",
+            "displayName": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_theta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1818,
+            "name": "jogg_eta",
+            "displayName": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_lambda;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1819,
+            "name": "jogg_kappa",
+            "displayName": {
+              "@value": "hello",
+              "@language": "en"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_xi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1820,
+            "name": "jogg_nu",
+            "displayName": {
+              "@value": "hello",
+              "@language": "en"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_rho;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1821,
+            "name": "jogg_pi",
+            "displayName": [
+              {
+                "en": "hello"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_upsilon;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1822,
+            "name": "jogg_tau",
+            "displayName": [
+              {
+                "en": "hello"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValuePropertyDisplayNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyDisplayNameStringLengthV4.json
new file mode 100644
index 00000000..07c95ff2
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyDisplayNameStringLengthV4.json
@@ -0,0 +1,72 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_psi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1823,
+            "name": "jogg_chi",
+            "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_wum;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1824,
+            "name": "jogg_yuzz",
+            "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_fuddle;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1825,
+            "name": "jogg_humpf",
+            "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValuePropertyDisplayNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyDisplayNameTermAndDtmiV4.json
new file mode 100644
index 00000000..779e1bae
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyDisplayNameTermAndDtmiV4.json
@@ -0,0 +1,59 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_gamma;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "displayName": [
+              "jogg_hi"
+            ],
+            "dtmi:dtdl:property:displayName;4": [
+              "flunn_alpha"
+            ],
+            "enumValue": 1829,
+            "name": "flunn_beta"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_theta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "displayName": [
+              "flunn_epsilon"
+            ],
+            "dtmi:dtdl:property:displayName;4": [
+              "flunn_zeta"
+            ],
+            "enumValue": 1830,
+            "name": "flunn_eta"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValuePropertyEnumValueIntegerV4.json b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyEnumValueIntegerV4.json
new file mode 100644
index 00000000..829ab469
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyEnumValueIntegerV4.json
@@ -0,0 +1,521 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_kappa;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "pi_iota",
+            "enumValue": 19
+          },
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_nu;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "pi_mu",
+            "enumValue": [
+              19
+            ]
+          },
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_pi;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "pi_omicron",
+            "enumValue": {
+              "@value": 19,
+              "@type": "xsd:integer"
+            }
+          },
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_tau;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "pi_sigma",
+            "enumValue": [
+              {
+                "@value": 19,
+                "@type": "xsd:integer"
+              }
+            ]
+          },
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_chi;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "pi_phi",
+            "enumValue": null
+          },
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_yuzz;1",
+          "@type": "Enum",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "pi_omega",
+            "enumValue": null
+          },
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_humpf;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "pi_um",
+            "enumValue": true
+          },
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_nuh;1",
+          "@type": "Enum",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "pi_glikk",
+            "enumValue": true
+          },
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_thnad;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "pi_quan",
+            "enumValue": "hello"
+          },
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_zatz;1",
+          "@type": "Enum",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "pi_floob",
+            "enumValue": "hello"
+          },
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_itch;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "pi_flunn",
+            "enumValue": [
+              null
+            ]
+          },
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_hi;1",
+          "@type": "Enum",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "pi_vroo",
+            "enumValue": [
+              null
+            ]
+          },
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_gamma;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "rho_beta",
+            "enumValue": [
+              true
+            ]
+          },
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_zeta;1",
+          "@type": "Enum",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_epsilon",
+            "enumValue": [
+              true
+            ]
+          },
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_iota;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "rho_theta",
+            "enumValue": [
+              "hello"
+            ]
+          },
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_mu;1",
+          "@type": "Enum",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_lambda",
+            "enumValue": [
+              "hello"
+            ]
+          },
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_omicron;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "rho_xi",
+            "enumValue": {}
+          },
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_sigma;1",
+          "@type": "Enum",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_rho",
+            "enumValue": {}
+          },
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_phi;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "rho_upsilon",
+            "enumValue": [
+              {}
+            ]
+          },
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_omega;1",
+          "@type": "Enum",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_psi",
+            "enumValue": [
+              {}
+            ]
+          },
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_um;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "rho_wum",
+            "enumValue": []
+          },
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_glikk;1",
+          "@type": "Enum",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_fuddle",
+            "enumValue": []
+          },
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValuePropertyEnumValueStringV4.json b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyEnumValueStringV4.json
new file mode 100644
index 00000000..1c2bdaf1
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyEnumValueStringV4.json
@@ -0,0 +1,521 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_quan;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "rho_snee",
+            "enumValue": "hello"
+          },
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_floob;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "rho_spazz",
+            "enumValue": [
+              "hello"
+            ]
+          },
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_flunn;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "rho_jogg",
+            "enumValue": {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          },
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_vroo;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "rho_yekk",
+            "enumValue": [
+              {
+                "@value": "hello",
+                "@type": "xsd:string"
+              }
+            ]
+          },
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_beta;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "sigma_alpha",
+            "enumValue": null
+          },
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_epsilon;1",
+          "@type": "Enum",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "sigma_delta",
+            "enumValue": null
+          },
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_theta;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "sigma_eta",
+            "enumValue": true
+          },
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_lambda;1",
+          "@type": "Enum",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "sigma_kappa",
+            "enumValue": true
+          },
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_xi;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "sigma_nu",
+            "enumValue": 626
+          },
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_rho;1",
+          "@type": "Enum",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "sigma_pi",
+            "enumValue": 626
+          },
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_upsilon;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "sigma_tau",
+            "enumValue": [
+              null
+            ]
+          },
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_psi;1",
+          "@type": "Enum",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "sigma_chi",
+            "enumValue": [
+              null
+            ]
+          },
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_wum;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "sigma_yuzz",
+            "enumValue": [
+              true
+            ]
+          },
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_fuddle;1",
+          "@type": "Enum",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "sigma_humpf",
+            "enumValue": [
+              true
+            ]
+          },
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_snee;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "sigma_nuh",
+            "enumValue": [
+              626
+            ]
+          },
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_spazz;1",
+          "@type": "Enum",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "sigma_thnad",
+            "enumValue": [
+              626
+            ]
+          },
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_jogg;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "sigma_zatz",
+            "enumValue": {}
+          },
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_yekk;1",
+          "@type": "Enum",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "sigma_itch",
+            "enumValue": {}
+          },
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_alpha;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "sigma_hi",
+            "enumValue": [
+              {}
+            ]
+          },
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_delta;1",
+          "@type": "Enum",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "tau_gamma",
+            "enumValue": [
+              {}
+            ]
+          },
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_eta;1",
+          "@type": "Enum",
+          "enumValues": {
+            "name": "tau_zeta",
+            "enumValue": []
+          },
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_kappa;1",
+          "@type": "Enum",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "tau_iota",
+            "enumValue": []
+          },
+          "valueSchema": "string"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValuePropertyEnumValueTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyEnumValueTermAndDtmiV4.json
new file mode 100644
index 00000000..7c8fb763
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyEnumValueTermAndDtmiV4.json
@@ -0,0 +1,49 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_gamma;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1541,
+            "dtmi:dtdl:property:enumValue;4": 1542,
+            "name": "upsilon_beta"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_zeta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1543,
+            "dtmi:dtdl:property:enumValue;4": 1544,
+            "name": "upsilon_epsilon"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValuePropertyEnumValueUniqueAmongEnumEnumValuesV4.json b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyEnumValueUniqueAmongEnumEnumValuesV4.json
new file mode 100644
index 00000000..4e83a7be
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyEnumValueUniqueAmongEnumEnumValuesV4.json
@@ -0,0 +1,172 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_xi;1",
+          "@type": "Enum",
+          "enumValues": [
+            {
+              "name": "tau_mu",
+              "enumValue": 20
+            },
+            {
+              "name": "tau_nu",
+              "enumValue": 21
+            }
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_sigma;1",
+          "@type": "Enum",
+          "enumValues": [
+            {
+              "name": "tau_pi",
+              "enumValue": 20
+            },
+            {
+              "name": "tau_rho",
+              "enumValue": 20
+            }
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:tau_chi;1",
+          "@type": "Enum",
+          "enumValues": [
+            {
+              "name": "tau_upsilon",
+              "enumValue": 20
+            },
+            {
+              "name": "tau_phi",
+              "enumValue": 20
+            }
+          ],
+          "valueSchema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_wum;1",
+          "@type": "Enum",
+          "enumValues": [
+            {
+              "name": "tau_omega",
+              "enumValue": "delta_um"
+            },
+            {
+              "name": "tau_yuzz",
+              "enumValue": "delta_humpf"
+            }
+          ],
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_glikk;1",
+          "@type": "Enum",
+          "enumValues": [
+            {
+              "name": "tau_humpf",
+              "enumValue": "delta_um"
+            },
+            {
+              "name": "tau_fuddle",
+              "enumValue": "delta_um"
+            }
+          ],
+          "valueSchema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:tau_thnad;1",
+          "@type": "Enum",
+          "enumValues": [
+            {
+              "name": "tau_snee",
+              "enumValue": "delta_um"
+            },
+            {
+              "name": "tau_quan",
+              "enumValue": "delta_um"
+            }
+          ],
+          "valueSchema": "string"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValuePropertyFormallyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyFormallyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..42bfb952
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyFormallyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,96 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_delta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1843,
+            "name": "itch_gamma",
+            "dtmi:foo:bar;1": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_eta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1844,
+            "name": "itch_zeta",
+            "dtmi:foo:bar;1": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_kappa;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1845,
+            "name": "itch_iota",
+            "boolean": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_nu;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1846,
+            "name": "itch_mu",
+            "boolean": null
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValuePropertyFormallyUndefinedTermV4.json b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyFormallyUndefinedTermV4.json
new file mode 100644
index 00000000..2113b8cf
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyFormallyUndefinedTermV4.json
@@ -0,0 +1,49 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_thnad;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1853,
+            "name": "itch_quan",
+            "foobar": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_zatz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1854,
+            "name": "itch_floob",
+            "foobar": {}
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValuePropertyInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyInvalidDtmiV4.json
new file mode 100644
index 00000000..3b6c9ddd
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyInvalidDtmiV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_pi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@type": [
+              "EnumValue",
+              "Foobar"
+            ],
+            "enumValue": 1847,
+            "name": "itch_omicron",
+            "dtmi:foo//bar": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_tau;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "EnumValue",
+              "Foobar"
+            ],
+            "enumValue": 1848,
+            "name": "itch_sigma",
+            "dtmi:foo//bar": 626
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValuePropertyNamePatternV4.json b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyNamePatternV4.json
new file mode 100644
index 00000000..147beba4
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyNamePatternV4.json
@@ -0,0 +1,562 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_omicron;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1570,
+            "name": "EARTH"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_rho;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1571,
+            "name": "Air"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_tau;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1572,
+            "name": "fire"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_phi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1573,
+            "name": "hello_world"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_psi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1574,
+            "name": "Anarchy99"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_yuzz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1575,
+            "name": "23skidoo"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_um;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1576,
+            "name": "23skidoo"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_fuddle;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1577,
+            "name": "626"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_nuh;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1578,
+            "name": "626"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_quan;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1579,
+            "name": "goodbye-world"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_spazz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1580,
+            "name": "goodbye-world"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_zatz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1581,
+            "name": "_haha"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_flunn;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1582,
+            "name": "_haha"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_yekk;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1583,
+            "name": "toodaloo_"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_hi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1584,
+            "name": "toodaloo_"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_beta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1585,
+            "name": "pro:con"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_delta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1586,
+            "name": "pro:con"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_zeta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1587,
+            "name": "mish/mash"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_theta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1588,
+            "name": "mish/mash"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_kappa;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1589,
+            "name": "#tag"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_mu;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1590,
+            "name": "#tag"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_xi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1591,
+            "name": "@tweet"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_pi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1592,
+            "name": "@tweet"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_sigma;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1593,
+            "name": "$money"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_upsilon;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1594,
+            "name": "$money"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValuePropertyNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyNameStringLengthV4.json
new file mode 100644
index 00000000..fe10c68e
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyNameStringLengthV4.json
@@ -0,0 +1,69 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_iota;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1567,
+            "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_lambda;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1568,
+            "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_nu;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1569,
+            "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValuePropertyNameStringV4.json b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyNameStringV4.json
new file mode 100644
index 00000000..07af1db8
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyNameStringV4.json
@@ -0,0 +1,521 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_theta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1545,
+            "name": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_kappa;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1546,
+            "name": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_mu;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1547,
+            "name": {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_xi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1548,
+            "name": [
+              {
+                "@value": "hello",
+                "@type": "xsd:string"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_pi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1549,
+            "name": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_sigma;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1550,
+            "name": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_upsilon;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1551,
+            "name": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_chi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1552,
+            "name": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_omega;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1553,
+            "name": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_wum;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1554,
+            "name": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_humpf;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1555,
+            "name": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_glikk;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1556,
+            "name": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_snee;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1557,
+            "name": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_thnad;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1558,
+            "name": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_floob;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1559,
+            "name": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_jogg;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1560,
+            "name": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_itch;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1561,
+            "name": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_vroo;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1562,
+            "name": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_alpha;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1563,
+            "name": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_gamma;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1564,
+            "name": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_epsilon;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1565,
+            "name": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_eta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1566,
+            "name": []
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValuePropertyNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyNameTermAndDtmiV4.json
new file mode 100644
index 00000000..6884617b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyNameTermAndDtmiV4.json
@@ -0,0 +1,49 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_flunn;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1604,
+            "name": "chi_zatz",
+            "dtmi:dtdl:property:name;4": "chi_jogg"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_hi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1605,
+            "name": "chi_yekk",
+            "dtmi:dtdl:property:name;4": "chi_vroo"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValuePropertyNameUniqueAmongEnumEnumValuesV4.json b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyNameUniqueAmongEnumEnumValuesV4.json
new file mode 100644
index 00000000..66fc1140
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyNameUniqueAmongEnumEnumValuesV4.json
@@ -0,0 +1,87 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_chi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": [
+            {
+              "enumValue": 1595,
+              "name": "delta_fuddle"
+            },
+            {
+              "enumValue": 1596,
+              "name": "delta_glikk"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_omega;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": [
+            {
+              "enumValue": 1597,
+              "name": "delta_fuddle"
+            },
+            {
+              "enumValue": 1598,
+              "name": "delta_fuddle"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:chi_wum;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": [
+            {
+              "enumValue": 1599,
+              "name": "delta_fuddle"
+            },
+            {
+              "enumValue": 1600,
+              "name": "delta_fuddle"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValuePropertyNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyNotDtmiNorTermV4.json
new file mode 100644
index 00000000..b3b5956c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValuePropertyNotDtmiNorTermV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_chi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@type": [
+              "EnumValue",
+              "Foobar"
+            ],
+            "enumValue": 1849,
+            "name": "itch_phi",
+            "http://foo.com/bar": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_yuzz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "EnumValue",
+              "Foobar"
+            ],
+            "enumValue": 1850,
+            "name": "itch_omega",
+            "http://foo.com/bar": true
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValueRequiredPropertiesV4.json b/DTDL/v4/spec/Requirement-ClassEnumValueRequiredPropertiesV4.json
new file mode 100644
index 00000000..aa975b6a
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValueRequiredPropertiesV4.json
@@ -0,0 +1,88 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_hi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "name": "omicron_vroo"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_gamma;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "pi_beta"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_epsilon;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1536
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_eta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1537
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValueTypeIncludesInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassEnumValueTypeIncludesInvalidDtmiV4.json
new file mode 100644
index 00000000..6453793e
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValueTypeIncludesInvalidDtmiV4.json
@@ -0,0 +1,55 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_flunn;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@type": [
+              "EnumValue",
+              "dtmi:foo//bar"
+            ],
+            "enumValue": 1661,
+            "name": "wum_jogg"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_vroo;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "EnumValue",
+              "dtmi:foo//bar"
+            ],
+            "enumValue": 1662,
+            "name": "wum_yekk"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValueTypeIncludesMaterialV4.json b/DTDL/v4/spec/Requirement-ClassEnumValueTypeIncludesMaterialV4.json
new file mode 100644
index 00000000..73b2cbcf
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValueTypeIncludesMaterialV4.json
@@ -0,0 +1,196 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_nuh;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1644,
+            "name": "yuzz_glikk",
+            "@type": "EnumValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_thnad;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1645,
+            "name": "yuzz_quan",
+            "@type": [
+              "EnumValue"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_zatz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1646,
+            "name": "yuzz_floob",
+            "@type": "dtmi:dtdl:class:EnumValue;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_itch;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1647,
+            "name": "yuzz_flunn",
+            "@type": [
+              "dtmi:dtdl:class:EnumValue;4"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_hi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1648,
+            "name": "yuzz_vroo",
+            "@type": "Something"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_gamma;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1649,
+            "name": "wum_beta",
+            "@type": "Something"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_zeta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1650,
+            "name": "wum_epsilon",
+            "@type": [
+              "Something"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_iota;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1651,
+            "name": "wum_theta",
+            "@type": [
+              "Something"
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValueTypeIncludesNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassEnumValueTypeIncludesNotDtmiNorTermV4.json
new file mode 100644
index 00000000..773f0d1f
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValueTypeIncludesNotDtmiNorTermV4.json
@@ -0,0 +1,55 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_beta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@type": [
+              "EnumValue",
+              "http://foo.com/bar"
+            ],
+            "enumValue": 1663,
+            "name": "um_alpha"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_epsilon;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "EnumValue",
+              "http://foo.com/bar"
+            ],
+            "enumValue": 1664,
+            "name": "um_delta"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassEnumValueTypeStringOrArrayV4.json b/DTDL/v4/spec/Requirement-ClassEnumValueTypeStringOrArrayV4.json
new file mode 100644
index 00000000..4b402b10
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassEnumValueTypeStringOrArrayV4.json
@@ -0,0 +1,394 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_wum;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1628,
+            "name": "omega_yuzz",
+            "@type": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_fuddle;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1629,
+            "name": "omega_humpf",
+            "@type": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_snee;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1630,
+            "name": "omega_nuh",
+            "@type": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_spazz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1631,
+            "name": "omega_thnad",
+            "@type": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_jogg;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1632,
+            "name": "omega_zatz",
+            "@type": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_yekk;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1633,
+            "name": "omega_itch",
+            "@type": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_alpha;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1634,
+            "name": "omega_hi",
+            "@type": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_delta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1635,
+            "name": "yuzz_gamma",
+            "@type": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_eta;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1636,
+            "name": "yuzz_zeta",
+            "@type": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_kappa;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1637,
+            "name": "yuzz_iota",
+            "@type": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_nu;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1638,
+            "name": "yuzz_mu",
+            "@type": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_pi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1639,
+            "name": "yuzz_omicron",
+            "@type": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_tau;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1640,
+            "name": "yuzz_sigma",
+            "@type": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_chi;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1641,
+            "name": "yuzz_phi",
+            "@type": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_yuzz;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "enumValue": 1642,
+            "name": "yuzz_omega",
+            "@type": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_humpf;1",
+          "@type": "Enum",
+          "valueSchema": "integer",
+          "enumValues": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "enumValue": 1643,
+            "name": "yuzz_um",
+            "@type": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldContextConformsV4.json b/DTDL/v4/spec/Requirement-ClassFieldContextConformsV4.json
new file mode 100644
index 00000000..d09a5ba4
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldContextConformsV4.json
@@ -0,0 +1,418 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "eta_vroo",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "eta_yekk",
+              "schema": "boolean",
+              "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_beta",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "theta_alpha",
+              "schema": "byte",
+              "@context": []
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_epsilon",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "theta_delta",
+              "schema": "bytes",
+              "@context": [
+                "dtmi:dtdl:extension:quantitativeTypes;1"
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_theta",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "theta_eta",
+              "schema": "date",
+              "@context": null
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_lambda",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "theta_kappa",
+              "schema": "dateTime",
+              "@context": 626
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_xi",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "theta_nu",
+              "schema": "decimal",
+              "@context": true
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_rho",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "theta_pi",
+              "schema": "double",
+              "@context": [
+                null
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_upsilon",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "theta_tau",
+              "schema": "duration",
+              "@context": [
+                626
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_psi",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "theta_chi",
+              "schema": "float",
+              "@context": [
+                true
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_wum",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "theta_yuzz",
+              "schema": "integer",
+              "@context": "dtmi:dtdl:extension:quantitativeTypes"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_fuddle",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "theta_humpf",
+              "schema": "long",
+              "@context": "http://dtdl/extension/quantitativeTypes/1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_snee",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "theta_nuh",
+              "schema": "short",
+              "@context": "quantitativeTypes;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_spazz",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "theta_thnad",
+              "schema": "string",
+              "@context": {}
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_jogg",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "theta_zatz",
+              "schema": "time",
+              "@context": {
+                "foo": "dtmi:foo:bar;1"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_yekk",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "theta_itch",
+              "schema": "unsignedByte",
+              "@context": [
+                {}
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "iota_alpha",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "theta_hi",
+              "schema": "unsignedInteger",
+              "@context": [
+                {
+                  "foo": "dtmi:foo:bar;1"
+                }
+              ]
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldIdDuplicateV4.json b/DTDL/v4/spec/Requirement-ClassFieldIdDuplicateV4.json
new file mode 100644
index 00000000..dcd1c307
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldIdDuplicateV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:pi_wum;1",
+          "@type": "Property",
+          "name": "pi_humpf",
+          "schema": {
+            "@id": "dtmi:example:pi_wum;1",
+            "@type": "Object",
+            "fields": {
+              "@id": "dtmi:example:pi_wum;1",
+              "name": "pi_um",
+              "schema": "long"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:pi_fuddle;1",
+          "@type": "Property",
+          "name": "pi_nuh",
+          "schema": {
+            "@id": "dtmi:example:pi_fuddle;1",
+            "@type": "Object",
+            "fields": {
+              "@context": "dtmi:undefinedExtension:context;1",
+              "@id": "dtmi:example:pi_fuddle;1",
+              "name": "pi_glikk",
+              "schema": "short"
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldIdIsDtmiV4.json b/DTDL/v4/spec/Requirement-ClassFieldIdIsDtmiV4.json
new file mode 100644
index 00000000..f014bfb5
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldIdIsDtmiV4.json
@@ -0,0 +1,1240 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_spazz;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:foo:bar;7",
+            "name": "lambda_thnad",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_jogg;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:foo:bar;108675309",
+            "name": "lambda_zatz",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_yekk;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:foo:bar;999999999",
+            "name": "lambda_itch",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_alpha;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:foo;1",
+            "name": "lambda_hi",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_delta;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:foo:bar",
+            "name": "mu_gamma",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_eta;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:foo:bar;3.14",
+            "name": "mu_zeta",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_kappa;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:foo:bar;3.141592",
+            "name": "mu_iota",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_nu;1",
+          "@type": "Object",
+          "fields": {
+            "@id": null,
+            "name": "mu_mu",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_pi;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": null,
+            "name": "mu_omicron",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_tau;1",
+          "@type": "Object",
+          "fields": {
+            "@id": 626,
+            "name": "mu_sigma",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_chi;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": 626,
+            "name": "mu_phi",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_yuzz;1",
+          "@type": "Object",
+          "fields": {
+            "@id": true,
+            "name": "mu_omega",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_humpf;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": true,
+            "name": "mu_um",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_nuh;1",
+          "@type": "Object",
+          "fields": {
+            "@id": {
+              "@value": "dtmi:apparently:valid:identifier;3"
+            },
+            "name": "mu_glikk",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_thnad;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": {
+              "@value": "dtmi:apparently:valid:identifier;3"
+            },
+            "name": "mu_quan",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_zatz;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:foo:bar;0",
+            "name": "mu_floob",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_itch;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;0",
+            "name": "mu_flunn",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_hi;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:foo:bar;0.0",
+            "name": "mu_vroo",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_gamma;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;0.0",
+            "name": "nu_beta",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_zeta;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:foo:bar;1234567890",
+            "name": "nu_epsilon",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_iota;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;1234567890",
+            "name": "nu_theta",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_mu;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:foo:bar;1a",
+            "name": "nu_lambda",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_omicron;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;1a",
+            "name": "nu_xi",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_sigma;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:foo:bar;3.0",
+            "name": "nu_rho",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_phi;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;3.0",
+            "name": "nu_upsilon",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_omega;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:foo:bar;3.1415926",
+            "name": "nu_psi",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_um;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;3.1415926",
+            "name": "nu_wum",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_glikk;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:foo:bar;6.02",
+            "name": "nu_fuddle",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_quan;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;6.02",
+            "name": "nu_snee",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_floob;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:foo:bar;0.1",
+            "name": "nu_spazz",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_flunn;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;0.1",
+            "name": "nu_jogg",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_vroo;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:foo:bar;01",
+            "name": "nu_yekk",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_beta;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;01",
+            "name": "xi_alpha",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_epsilon;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:foo:bar;",
+            "name": "xi_delta",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_theta;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;",
+            "name": "xi_eta",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_lambda;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:test:invalidId_;1",
+            "name": "xi_kappa",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_xi;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:test:invalidId_;1",
+            "name": "xi_nu",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_rho;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:test:_invalidUserId;1",
+            "name": "xi_pi",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_upsilon;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:test:_invalidUserId;1",
+            "name": "xi_tau",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_psi;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:test:1seg;1",
+            "name": "xi_chi",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_wum;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:test:1seg;1",
+            "name": "xi_yuzz",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_fuddle;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:foo:bar.baz;1",
+            "name": "xi_humpf",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_snee;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar.baz;1",
+            "name": "xi_nuh",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_spazz;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:foo::bar;1",
+            "name": "xi_thnad",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_jogg;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo::bar;1",
+            "name": "xi_zatz",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_yekk;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "urn:foo:bar:1",
+            "name": "xi_itch",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_alpha;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "urn:foo:bar:1",
+            "name": "xi_hi",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_delta;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "http://foo/bar/baz",
+            "name": "omicron_gamma",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_eta;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "http://foo/bar/baz",
+            "name": "omicron_zeta",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_kappa;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:;1",
+            "name": "omicron_iota",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_nu;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:;1",
+            "name": "omicron_mu",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_pi;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:dtdl:example;1",
+            "name": "omicron_omicron",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_tau;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:dtdl:example;1",
+            "name": "omicron_sigma",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_chi;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:standard:example;1",
+            "name": "omicron_phi",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_yuzz;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:standard:example;1",
+            "name": "omicron_omega",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldIdNotArrayV4.json b/DTDL/v4/spec/Requirement-ClassFieldIdNotArrayV4.json
new file mode 100644
index 00000000..cce622dd
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldIdNotArrayV4.json
@@ -0,0 +1,345 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_humpf;1",
+          "@type": "Object",
+          "fields": {
+            "@id": [
+              "dtmi:foo:bar;7"
+            ],
+            "name": "omicron_um",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_nuh;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;7"
+            ],
+            "name": "omicron_glikk",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_thnad;1",
+          "@type": "Object",
+          "fields": {
+            "@id": [
+              "dtmi:foo:bar;108675309"
+            ],
+            "name": "omicron_quan",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_zatz;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;108675309"
+            ],
+            "name": "omicron_floob",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_itch;1",
+          "@type": "Object",
+          "fields": {
+            "@id": [
+              "dtmi:foo:bar;999999999"
+            ],
+            "name": "omicron_flunn",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_hi;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;999999999"
+            ],
+            "name": "omicron_vroo",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_gamma;1",
+          "@type": "Object",
+          "fields": {
+            "@id": [
+              "dtmi:foo;1"
+            ],
+            "name": "pi_beta",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_zeta;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo;1"
+            ],
+            "name": "pi_epsilon",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_iota;1",
+          "@type": "Object",
+          "fields": {
+            "@id": [
+              "dtmi:foo:bar"
+            ],
+            "name": "pi_theta",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_mu;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar"
+            ],
+            "name": "pi_lambda",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_omicron;1",
+          "@type": "Object",
+          "fields": {
+            "@id": [
+              "dtmi:foo:bar;3.14"
+            ],
+            "name": "pi_xi",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_sigma;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;3.14"
+            ],
+            "name": "pi_rho",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_phi;1",
+          "@type": "Object",
+          "fields": {
+            "@id": [
+              "dtmi:foo:bar;3.141592"
+            ],
+            "name": "pi_upsilon",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_omega;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;3.141592"
+            ],
+            "name": "pi_psi",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldInvalidKeywordsV4.json b/DTDL/v4/spec/Requirement-ClassFieldInvalidKeywordsV4.json
new file mode 100644
index 00000000..f29922a2
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldInvalidKeywordsV4.json
@@ -0,0 +1,182 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_snee;1",
+          "@type": "Object",
+          "fields": {
+            "name": "psi_nuh",
+            "schema": "long",
+            "@graph": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_spazz;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "psi_thnad",
+            "schema": "short",
+            "@graph": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_jogg;1",
+          "@type": "Object",
+          "fields": {
+            "name": "psi_zatz",
+            "schema": "string",
+            "@value": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_yekk;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "psi_itch",
+            "schema": "time",
+            "@value": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_alpha;1",
+          "@type": "Object",
+          "fields": {
+            "name": "psi_hi",
+            "schema": "unsignedByte",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_delta;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "omega_gamma",
+            "schema": "unsignedInteger",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_eta;1",
+          "@type": "Object",
+          "fields": {
+            "name": "omega_zeta",
+            "schema": "unsignedLong",
+            "@foobar": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_kappa;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "omega_iota",
+            "schema": "unsignedShort",
+            "@foobar": true
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldPropertyCommentStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassFieldPropertyCommentStringLengthV4.json
new file mode 100644
index 00000000..5fbb4a55
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldPropertyCommentStringLengthV4.json
@@ -0,0 +1,69 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_kappa;1",
+          "@type": "Object",
+          "fields": {
+            "name": "sigma_iota",
+            "schema": "unsignedByte",
+            "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_nu;1",
+          "@type": "Object",
+          "fields": {
+            "name": "sigma_mu",
+            "schema": "unsignedInteger",
+            "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_pi;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "sigma_omicron",
+            "schema": "unsignedLong",
+            "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldPropertyCommentStringV4.json b/DTDL/v4/spec/Requirement-ClassFieldPropertyCommentStringV4.json
new file mode 100644
index 00000000..7d564710
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldPropertyCommentStringV4.json
@@ -0,0 +1,498 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_quan;1",
+          "@type": "Object",
+          "fields": {
+            "name": "pi_snee",
+            "schema": "string",
+            "comment": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_floob;1",
+          "@type": "Object",
+          "fields": {
+            "name": "pi_spazz",
+            "schema": "time",
+            "comment": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_flunn;1",
+          "@type": "Object",
+          "fields": {
+            "name": "pi_jogg",
+            "schema": "unsignedByte",
+            "comment": {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_vroo;1",
+          "@type": "Object",
+          "fields": {
+            "name": "pi_yekk",
+            "schema": "unsignedInteger",
+            "comment": [
+              {
+                "@value": "hello",
+                "@type": "xsd:string"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_beta;1",
+          "@type": "Object",
+          "fields": {
+            "name": "rho_alpha",
+            "schema": "unsignedLong",
+            "comment": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_epsilon;1",
+          "@type": "Object",
+          "fields": {
+            "name": "rho_delta",
+            "schema": "unsignedShort",
+            "comment": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_theta;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_eta",
+            "schema": "uuid",
+            "comment": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_lambda;1",
+          "@type": "Object",
+          "fields": {
+            "name": "rho_kappa",
+            "schema": "boolean",
+            "comment": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_xi;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_nu",
+            "schema": "byte",
+            "comment": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_rho;1",
+          "@type": "Object",
+          "fields": {
+            "name": "rho_pi",
+            "schema": "bytes",
+            "comment": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_upsilon;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_tau",
+            "schema": "date",
+            "comment": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_psi;1",
+          "@type": "Object",
+          "fields": {
+            "name": "rho_chi",
+            "schema": "dateTime",
+            "comment": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_wum;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_yuzz",
+            "schema": "decimal",
+            "comment": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_fuddle;1",
+          "@type": "Object",
+          "fields": {
+            "name": "rho_humpf",
+            "schema": "double",
+            "comment": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_snee;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_nuh",
+            "schema": "duration",
+            "comment": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_spazz;1",
+          "@type": "Object",
+          "fields": {
+            "name": "rho_thnad",
+            "schema": "float",
+            "comment": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_jogg;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_zatz",
+            "schema": "integer",
+            "comment": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_yekk;1",
+          "@type": "Object",
+          "fields": {
+            "name": "rho_itch",
+            "schema": "long",
+            "comment": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_alpha;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_hi",
+            "schema": "short",
+            "comment": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_delta;1",
+          "@type": "Object",
+          "fields": {
+            "name": "sigma_gamma",
+            "schema": "string",
+            "comment": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_eta;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "sigma_zeta",
+            "schema": "time",
+            "comment": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldPropertyCommentTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassFieldPropertyCommentTermAndDtmiV4.json
new file mode 100644
index 00000000..e890a3a2
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldPropertyCommentTermAndDtmiV4.json
@@ -0,0 +1,49 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_quan;1",
+          "@type": "Object",
+          "fields": {
+            "comment": "sigma_glikk",
+            "dtmi:dtdl:property:comment;4": "sigma_nuh",
+            "name": "sigma_snee",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_jogg;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "comment": "sigma_spazz",
+            "dtmi:dtdl:property:comment;4": "sigma_floob",
+            "name": "sigma_zatz",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldPropertyDescriptionLangStringV4.json b/DTDL/v4/spec/Requirement-ClassFieldPropertyDescriptionLangStringV4.json
new file mode 100644
index 00000000..78447224
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldPropertyDescriptionLangStringV4.json
@@ -0,0 +1,578 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_yekk;1",
+          "@type": "Object",
+          "fields": {
+            "name": "sigma_itch",
+            "schema": "date",
+            "description": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_alpha;1",
+          "@type": "Object",
+          "fields": {
+            "name": "sigma_hi",
+            "schema": "dateTime",
+            "description": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_delta;1",
+          "@type": "Object",
+          "fields": {
+            "name": "tau_gamma",
+            "schema": "decimal",
+            "description": {
+              "en": "hello"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_eta;1",
+          "@type": "Object",
+          "fields": {
+            "name": "tau_zeta",
+            "schema": "double",
+            "description": [
+              {
+                "@value": "hello",
+                "@language": "en"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_kappa;1",
+          "@type": "Object",
+          "fields": {
+            "name": "tau_iota",
+            "schema": "duration",
+            "description": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_nu;1",
+          "@type": "Object",
+          "fields": {
+            "name": "tau_mu",
+            "schema": "float",
+            "description": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_pi;1",
+          "@type": "Object",
+          "fields": {
+            "name": "tau_omicron",
+            "schema": "integer",
+            "description": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_tau;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "tau_sigma",
+            "schema": "long",
+            "description": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_chi;1",
+          "@type": "Object",
+          "fields": {
+            "name": "tau_phi",
+            "schema": "short",
+            "description": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_yuzz;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "tau_omega",
+            "schema": "string",
+            "description": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_humpf;1",
+          "@type": "Object",
+          "fields": {
+            "name": "tau_um",
+            "schema": "time",
+            "description": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_nuh;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "tau_glikk",
+            "schema": "unsignedByte",
+            "description": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_thnad;1",
+          "@type": "Object",
+          "fields": {
+            "name": "tau_quan",
+            "schema": "unsignedInteger",
+            "description": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_zatz;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "tau_floob",
+            "schema": "unsignedLong",
+            "description": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_itch;1",
+          "@type": "Object",
+          "fields": {
+            "name": "tau_flunn",
+            "schema": "unsignedShort",
+            "description": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_hi;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "tau_vroo",
+            "schema": "uuid",
+            "description": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_gamma;1",
+          "@type": "Object",
+          "fields": {
+            "name": "upsilon_beta",
+            "schema": "boolean",
+            "description": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_zeta;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "upsilon_epsilon",
+            "schema": "byte",
+            "description": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_iota;1",
+          "@type": "Object",
+          "fields": {
+            "name": "upsilon_theta",
+            "schema": "bytes",
+            "description": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_mu;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "upsilon_lambda",
+            "schema": "date",
+            "description": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_omicron;1",
+          "@type": "Object",
+          "fields": {
+            "name": "upsilon_xi",
+            "schema": "dateTime",
+            "description": {
+              "@value": "hello",
+              "@language": "en"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_sigma;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "upsilon_rho",
+            "schema": "decimal",
+            "description": {
+              "@value": "hello",
+              "@language": "en"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_phi;1",
+          "@type": "Object",
+          "fields": {
+            "name": "upsilon_upsilon",
+            "schema": "double",
+            "description": [
+              {
+                "en": "hello"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_omega;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "upsilon_psi",
+            "schema": "duration",
+            "description": [
+              {
+                "en": "hello"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldPropertyDescriptionStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassFieldPropertyDescriptionStringLengthV4.json
new file mode 100644
index 00000000..89f94c53
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldPropertyDescriptionStringLengthV4.json
@@ -0,0 +1,69 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_um;1",
+          "@type": "Object",
+          "fields": {
+            "name": "upsilon_wum",
+            "schema": "float",
+            "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_glikk;1",
+          "@type": "Object",
+          "fields": {
+            "name": "upsilon_fuddle",
+            "schema": "integer",
+            "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_quan;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "upsilon_snee",
+            "schema": "long",
+            "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldPropertyDescriptionTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassFieldPropertyDescriptionTermAndDtmiV4.json
new file mode 100644
index 00000000..667601a2
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldPropertyDescriptionTermAndDtmiV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_eta;1",
+          "@type": "Object",
+          "fields": {
+            "description": [
+              "phi_delta"
+            ],
+            "dtmi:dtdl:property:description;4": [
+              "phi_epsilon"
+            ],
+            "name": "phi_zeta",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_mu;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "description": [
+              "phi_iota"
+            ],
+            "dtmi:dtdl:property:description;4": [
+              "phi_kappa"
+            ],
+            "name": "phi_lambda",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldPropertyDisplayNameLangStringV4.json b/DTDL/v4/spec/Requirement-ClassFieldPropertyDisplayNameLangStringV4.json
new file mode 100644
index 00000000..5f5c7c97
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldPropertyDisplayNameLangStringV4.json
@@ -0,0 +1,578 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_omicron;1",
+          "@type": "Object",
+          "fields": {
+            "name": "phi_xi",
+            "schema": "unsignedLong",
+            "displayName": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_sigma;1",
+          "@type": "Object",
+          "fields": {
+            "name": "phi_rho",
+            "schema": "unsignedShort",
+            "displayName": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_phi;1",
+          "@type": "Object",
+          "fields": {
+            "name": "phi_upsilon",
+            "schema": "uuid",
+            "displayName": {
+              "en": "hello"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_omega;1",
+          "@type": "Object",
+          "fields": {
+            "name": "phi_psi",
+            "schema": "boolean",
+            "displayName": [
+              {
+                "@value": "hello",
+                "@language": "en"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_um;1",
+          "@type": "Object",
+          "fields": {
+            "name": "phi_wum",
+            "schema": "byte",
+            "displayName": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_glikk;1",
+          "@type": "Object",
+          "fields": {
+            "name": "phi_fuddle",
+            "schema": "bytes",
+            "displayName": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_quan;1",
+          "@type": "Object",
+          "fields": {
+            "name": "phi_snee",
+            "schema": "date",
+            "displayName": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_floob;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "phi_spazz",
+            "schema": "dateTime",
+            "displayName": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_flunn;1",
+          "@type": "Object",
+          "fields": {
+            "name": "phi_jogg",
+            "schema": "decimal",
+            "displayName": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_vroo;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "phi_yekk",
+            "schema": "double",
+            "displayName": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_beta;1",
+          "@type": "Object",
+          "fields": {
+            "name": "chi_alpha",
+            "schema": "duration",
+            "displayName": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_epsilon;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "chi_delta",
+            "schema": "float",
+            "displayName": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_theta;1",
+          "@type": "Object",
+          "fields": {
+            "name": "chi_eta",
+            "schema": "integer",
+            "displayName": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_lambda;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "chi_kappa",
+            "schema": "long",
+            "displayName": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_xi;1",
+          "@type": "Object",
+          "fields": {
+            "name": "chi_nu",
+            "schema": "short",
+            "displayName": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_rho;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "chi_pi",
+            "schema": "string",
+            "displayName": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_upsilon;1",
+          "@type": "Object",
+          "fields": {
+            "name": "chi_tau",
+            "schema": "time",
+            "displayName": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_psi;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "chi_chi",
+            "schema": "unsignedByte",
+            "displayName": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_wum;1",
+          "@type": "Object",
+          "fields": {
+            "name": "chi_yuzz",
+            "schema": "unsignedInteger",
+            "displayName": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_fuddle;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "chi_humpf",
+            "schema": "unsignedLong",
+            "displayName": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_snee;1",
+          "@type": "Object",
+          "fields": {
+            "name": "chi_nuh",
+            "schema": "unsignedShort",
+            "displayName": {
+              "@value": "hello",
+              "@language": "en"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_spazz;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "chi_thnad",
+            "schema": "uuid",
+            "displayName": {
+              "@value": "hello",
+              "@language": "en"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_jogg;1",
+          "@type": "Object",
+          "fields": {
+            "name": "chi_zatz",
+            "schema": "boolean",
+            "displayName": [
+              {
+                "en": "hello"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_yekk;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "chi_itch",
+            "schema": "byte",
+            "displayName": [
+              {
+                "en": "hello"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldPropertyDisplayNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassFieldPropertyDisplayNameStringLengthV4.json
new file mode 100644
index 00000000..50c7bc00
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldPropertyDisplayNameStringLengthV4.json
@@ -0,0 +1,69 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_alpha;1",
+          "@type": "Object",
+          "fields": {
+            "name": "chi_hi",
+            "schema": "bytes",
+            "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_delta;1",
+          "@type": "Object",
+          "fields": {
+            "name": "psi_gamma",
+            "schema": "date",
+            "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_eta;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "psi_zeta",
+            "schema": "dateTime",
+            "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldPropertyDisplayNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassFieldPropertyDisplayNameTermAndDtmiV4.json
new file mode 100644
index 00000000..3f17f7e3
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldPropertyDisplayNameTermAndDtmiV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_omega;1",
+          "@type": "Object",
+          "fields": {
+            "displayName": [
+              "psi_phi"
+            ],
+            "dtmi:dtdl:property:displayName;4": [
+              "psi_chi"
+            ],
+            "name": "psi_psi",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_fuddle;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "displayName": [
+              "psi_wum"
+            ],
+            "dtmi:dtdl:property:displayName;4": [
+              "psi_um"
+            ],
+            "name": "psi_humpf",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldPropertyFormallyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Requirement-ClassFieldPropertyFormallyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..d7bc4942
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldPropertyFormallyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,92 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_yuzz;1",
+          "@type": "Object",
+          "fields": {
+            "name": "omega_omega",
+            "schema": "date",
+            "dtmi:foo:bar;1": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_humpf;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "omega_um",
+            "schema": "dateTime",
+            "dtmi:foo:bar;1": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_nuh;1",
+          "@type": "Object",
+          "fields": {
+            "name": "omega_glikk",
+            "schema": "decimal",
+            "boolean": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_thnad;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "omega_quan",
+            "schema": "double",
+            "boolean": null
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldPropertyFormallyUndefinedTermV4.json b/DTDL/v4/spec/Requirement-ClassFieldPropertyFormallyUndefinedTermV4.json
new file mode 100644
index 00000000..7ecdd075
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldPropertyFormallyUndefinedTermV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_mu;1",
+          "@type": "Object",
+          "fields": {
+            "name": "yuzz_lambda",
+            "schema": "time",
+            "foobar": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_omicron;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "yuzz_xi",
+            "schema": "unsignedByte",
+            "foobar": {}
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldPropertyInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassFieldPropertyInvalidDtmiV4.json
new file mode 100644
index 00000000..d383a586
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldPropertyInvalidDtmiV4.json
@@ -0,0 +1,55 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_zatz;1",
+          "@type": "Object",
+          "fields": {
+            "@type": [
+              "Field",
+              "Foobar"
+            ],
+            "name": "omega_floob",
+            "schema": "duration",
+            "dtmi:foo//bar": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_itch;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "Field",
+              "Foobar"
+            ],
+            "name": "omega_flunn",
+            "schema": "float",
+            "dtmi:foo//bar": 626
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldPropertyNamePatternV4.json b/DTDL/v4/spec/Requirement-ClassFieldPropertyNamePatternV4.json
new file mode 100644
index 00000000..433b0477
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldPropertyNamePatternV4.json
@@ -0,0 +1,537 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_nu;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "date",
+            "name": "EARTH"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_omicron;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "dateTime",
+            "name": "Air"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_rho;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "decimal",
+            "name": "fire"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_tau;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "double",
+            "name": "hello_world"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_phi;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "duration",
+            "name": "Anarchy99"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_psi;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "float",
+            "name": "23skidoo"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_yuzz;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "integer",
+            "name": "23skidoo"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_um;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "long",
+            "name": "626"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_fuddle;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "short",
+            "name": "626"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_nuh;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "string",
+            "name": "goodbye-world"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_quan;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "time",
+            "name": "goodbye-world"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_spazz;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "unsignedByte",
+            "name": "_haha"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_zatz;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "unsignedInteger",
+            "name": "_haha"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_flunn;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "unsignedLong",
+            "name": "toodaloo_"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_yekk;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "unsignedShort",
+            "name": "toodaloo_"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_hi;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "uuid",
+            "name": "pro:con"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_beta;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "boolean",
+            "name": "pro:con"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_delta;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "byte",
+            "name": "mish/mash"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_zeta;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "bytes",
+            "name": "mish/mash"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_theta;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "date",
+            "name": "#tag"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_kappa;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "dateTime",
+            "name": "#tag"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_mu;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "decimal",
+            "name": "@tweet"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_xi;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "double",
+            "name": "@tweet"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_pi;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "duration",
+            "name": "$money"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_sigma;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "float",
+            "name": "$money"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldPropertyNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassFieldPropertyNameStringLengthV4.json
new file mode 100644
index 00000000..74785b7c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldPropertyNameStringLengthV4.json
@@ -0,0 +1,66 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_eta;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "boolean",
+            "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_iota;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "byte",
+            "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_lambda;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "bytes",
+            "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldPropertyNameStringV4.json b/DTDL/v4/spec/Requirement-ClassFieldPropertyNameStringV4.json
new file mode 100644
index 00000000..d94e8342
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldPropertyNameStringV4.json
@@ -0,0 +1,499 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_zeta;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "unsignedLong",
+            "name": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_theta;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "unsignedShort",
+            "name": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_kappa;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "uuid",
+            "name": {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_mu;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "boolean",
+            "name": [
+              {
+                "@value": "hello",
+                "@type": "xsd:string"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_xi;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "byte",
+            "name": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_pi;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "bytes",
+            "name": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_sigma;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "date",
+            "name": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_upsilon;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "dateTime",
+            "name": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_chi;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "decimal",
+            "name": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_omega;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "double",
+            "name": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_wum;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "duration",
+            "name": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_humpf;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "float",
+            "name": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_glikk;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "integer",
+            "name": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_snee;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "long",
+            "name": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_thnad;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "short",
+            "name": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_floob;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "string",
+            "name": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_jogg;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "time",
+            "name": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_itch;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "unsignedByte",
+            "name": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_vroo;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "unsignedInteger",
+            "name": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_alpha;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "unsignedLong",
+            "name": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_gamma;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "unsignedShort",
+            "name": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_epsilon;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "uuid",
+            "name": []
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldPropertyNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassFieldPropertyNameTermAndDtmiV4.json
new file mode 100644
index 00000000..82d43252
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldPropertyNameTermAndDtmiV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_zatz;1",
+          "@type": "Object",
+          "fields": {
+            "name": "hi_spazz",
+            "dtmi:dtdl:property:name;4": "hi_floob",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_yekk;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "hi_flunn",
+            "dtmi:dtdl:property:name;4": "hi_itch",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldPropertyNameUniqueAmongObjectFieldsV4.json b/DTDL/v4/spec/Requirement-ClassFieldPropertyNameUniqueAmongObjectFieldsV4.json
new file mode 100644
index 00000000..d79343f1
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldPropertyNameUniqueAmongObjectFieldsV4.json
@@ -0,0 +1,84 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_upsilon;1",
+          "@type": "Object",
+          "fields": [
+            {
+              "schema": "integer",
+              "name": "delta_thnad"
+            },
+            {
+              "schema": "long",
+              "name": "delta_spazz"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_chi;1",
+          "@type": "Object",
+          "fields": [
+            {
+              "schema": "short",
+              "name": "delta_thnad"
+            },
+            {
+              "schema": "string",
+              "name": "delta_thnad"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:hi_omega;1",
+          "@type": "Object",
+          "fields": [
+            {
+              "schema": "time",
+              "name": "delta_thnad"
+            },
+            {
+              "schema": "unsignedByte",
+              "name": "delta_thnad"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldPropertyNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassFieldPropertyNotDtmiNorTermV4.json
new file mode 100644
index 00000000..7f15c42b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldPropertyNotDtmiNorTermV4.json
@@ -0,0 +1,55 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_hi;1",
+          "@type": "Object",
+          "fields": {
+            "@type": [
+              "Field",
+              "Foobar"
+            ],
+            "name": "omega_vroo",
+            "schema": "integer",
+            "http://foo.com/bar": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_gamma;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "Field",
+              "Foobar"
+            ],
+            "name": "yuzz_beta",
+            "schema": "long",
+            "http://foo.com/bar": true
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldPropertySchemaElementV4.json b/DTDL/v4/spec/Requirement-ClassFieldPropertySchemaElementV4.json
new file mode 100644
index 00000000..5672138e
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldPropertySchemaElementV4.json
@@ -0,0 +1,869 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_alpha",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "hi_hi",
+              "schema": {
+                "@type": "Array",
+                "elementSchema": "byte"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_delta",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "alpha_gamma",
+              "schema": [
+                {
+                  "@type": "Array",
+                  "elementSchema": "bytes"
+                }
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Array",
+          "elementSchema": "date"
+        },
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_theta",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "alpha_eta",
+              "schema": "dtmi:ex:dependentRef;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Array",
+          "elementSchema": "dateTime"
+        },
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_lambda",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "alpha_kappa",
+              "schema": [
+                "dtmi:ex:dependentRef;1"
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_xi",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "alpha_nu",
+              "schema": {
+                "@id": "dtmi:example:alpha_mu;1",
+                "@type": "Array",
+                "elementSchema": "double",
+                "@context": "dtmi:dtdl:context;2"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_sigma",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "alpha_rho",
+              "schema": {
+                "@id": "dtmi:example:alpha_pi;1",
+                "@type": "Array",
+                "elementSchema": "duration",
+                "@context": "dtmi:dtdl:context;3"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Array",
+          "elementSchema": "float"
+        },
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_chi",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "alpha_phi",
+              "schema": [
+                {
+                  "@type": "Array",
+                  "elementSchema": "duration"
+                },
+                "dtmi:ex:dependentRef;1"
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Array",
+          "elementSchema": "long"
+        },
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_yuzz",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "@context": "dtmi:undefinedExtension:context;1",
+              "name": "alpha_omega",
+              "schema": [
+                {
+                  "@type": "Array",
+                  "elementSchema": "integer"
+                },
+                "dtmi:ex:dependentRef;1"
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_um;1",
+          "@type": "Object",
+          "fields": {
+            "name": "alpha_wum",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_glikk;1",
+          "@type": "Object",
+          "fields": {
+            "name": "alpha_fuddle",
+            "schema": [
+              "double"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_quan;1",
+          "@type": "Object",
+          "fields": {
+            "name": "alpha_snee",
+            "schema": "dtmi:dtdl:instance:Schema:double;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_floob;1",
+          "@type": "Object",
+          "fields": {
+            "name": "alpha_spazz",
+            "schema": [
+              "dtmi:dtdl:instance:Schema:double;4"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_flunn;1",
+          "@type": "Object",
+          "fields": {
+            "name": "alpha_jogg",
+            "schema": "point"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_vroo;1",
+          "@type": "Object",
+          "fields": {
+            "name": "alpha_yekk",
+            "schema": [
+              "point"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_beta;1",
+          "@type": "Object",
+          "fields": {
+            "name": "beta_alpha",
+            "schema": "dtmi:standard:schema:geospatial:point;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_epsilon;1",
+          "@type": "Object",
+          "fields": {
+            "name": "beta_delta",
+            "schema": [
+              "dtmi:standard:schema:geospatial:point;4"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_theta;1",
+          "@type": "Object",
+          "fields": {
+            "name": "beta_eta",
+            "schema": "Foobar"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_lambda;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "beta_kappa",
+            "schema": "Foobar"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_xi;1",
+          "@type": "Object",
+          "fields": {
+            "name": "beta_nu",
+            "schema": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_rho;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "beta_pi",
+            "schema": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_upsilon;1",
+          "@type": "Object",
+          "fields": {
+            "name": "beta_tau",
+            "schema": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_psi;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "beta_chi",
+            "schema": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_wum;1",
+          "@type": "Object",
+          "fields": {
+            "name": "beta_yuzz",
+            "schema": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_fuddle;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "beta_humpf",
+            "schema": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_snee;1",
+          "@type": "Object",
+          "fields": {
+            "name": "beta_nuh",
+            "schema": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_spazz;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "beta_thnad",
+            "schema": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_jogg;1",
+          "@type": "Object",
+          "fields": {
+            "name": "beta_zatz",
+            "schema": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_yekk;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "beta_itch",
+            "schema": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_alpha;1",
+          "@type": "Object",
+          "fields": {
+            "name": "beta_hi",
+            "schema": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_delta;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "gamma_gamma",
+            "schema": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_eta;1",
+          "@type": "Object",
+          "fields": {
+            "name": "gamma_zeta",
+            "schema": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_kappa;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "gamma_iota",
+            "schema": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_nu;1",
+          "@type": "Object",
+          "fields": {
+            "name": "gamma_mu",
+            "schema": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_pi;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "gamma_omicron",
+            "schema": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_tau;1",
+          "@type": "Object",
+          "fields": {
+            "name": "gamma_sigma",
+            "schema": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_chi;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "gamma_phi",
+            "schema": []
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldPropertySchemaTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassFieldPropertySchemaTermAndDtmiV4.json
new file mode 100644
index 00000000..2236c2f5
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldPropertySchemaTermAndDtmiV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_sigma;1",
+          "@type": "Object",
+          "fields": {
+            "name": "eta_rho",
+            "schema": "integer",
+            "dtmi:dtdl:property:schema;4": "long"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_phi;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "eta_upsilon",
+            "schema": "short",
+            "dtmi:dtdl:property:schema;4": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldPropertySchemaTypeConformanceV4.json b/DTDL/v4/spec/Requirement-ClassFieldPropertySchemaTypeConformanceV4.json
new file mode 100644
index 00000000..4b3aeb07
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldPropertySchemaTypeConformanceV4.json
@@ -0,0 +1,742 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_snee;1",
+          "@type": "Object",
+          "fields": {
+            "name": "gamma_nuh",
+            "schema": {
+              "@id": "dtmi:example:gamma_glikk;1",
+              "elementSchema": "short",
+              "@type": "Array"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_zatz;1",
+          "@type": "Object",
+          "fields": {
+            "name": "gamma_floob",
+            "schema": {
+              "@id": "dtmi:example:gamma_thnad;1",
+              "name": "gamma_spazz",
+              "@type": "Command"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_vroo;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "gamma_yekk",
+            "schema": {
+              "@id": "dtmi:example:gamma_flunn;1",
+              "name": "gamma_itch",
+              "@type": "Command"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_delta;1",
+          "@type": "Object",
+          "fields": {
+            "name": "delta_gamma",
+            "schema": {
+              "@id": "dtmi:example:delta_alpha;1",
+              "name": "delta_beta",
+              "schema": "string",
+              "@type": "CommandRequest"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_iota;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "delta_theta",
+            "schema": {
+              "@id": "dtmi:example:delta_zeta;1",
+              "name": "delta_eta",
+              "schema": "time",
+              "@type": "CommandRequest"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_xi;1",
+          "@type": "Object",
+          "fields": {
+            "name": "delta_nu",
+            "schema": {
+              "@id": "dtmi:example:delta_lambda;1",
+              "name": "delta_mu",
+              "schema": "unsignedByte",
+              "@type": "CommandResponse"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_tau;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "delta_sigma",
+            "schema": {
+              "@id": "dtmi:example:delta_pi;1",
+              "name": "delta_rho",
+              "schema": "unsignedInteger",
+              "@type": "CommandResponse"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_yuzz;1",
+          "@type": "Object",
+          "fields": {
+            "name": "delta_omega",
+            "schema": {
+              "@id": "dtmi:example:delta_phi;1",
+              "name": "delta_chi",
+              "schema": {
+                "@id": "dtmi:example:delta_psi;1",
+                "@type": "Interface"
+              },
+              "@type": "Component"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_nuh;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "delta_glikk",
+            "schema": {
+              "@id": "dtmi:example:delta_um;1",
+              "name": "delta_humpf",
+              "schema": {
+                "@id": "dtmi:example:delta_fuddle;1",
+                "@type": "Interface"
+              },
+              "@type": "Component"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_spazz;1",
+          "@type": "Object",
+          "fields": {
+            "name": "delta_thnad",
+            "schema": {
+              "@id": "dtmi:example:delta_quan;1",
+              "valueSchema": "integer",
+              "@type": "Enum"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_itch;1",
+          "@type": "Object",
+          "fields": {
+            "name": "delta_flunn",
+            "schema": {
+              "@id": "dtmi:example:delta_zatz;1",
+              "enumValue": 1855,
+              "name": "delta_jogg",
+              "@type": "EnumValue"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_beta;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "epsilon_alpha",
+            "schema": {
+              "@id": "dtmi:example:delta_vroo;1",
+              "enumValue": 1856,
+              "name": "delta_hi",
+              "@type": "EnumValue"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_eta;1",
+          "@type": "Object",
+          "fields": {
+            "name": "epsilon_zeta",
+            "schema": {
+              "@id": "dtmi:example:epsilon_delta;1",
+              "name": "epsilon_epsilon",
+              "schema": "unsignedLong",
+              "@type": "Field"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_mu;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "epsilon_lambda",
+            "schema": {
+              "@id": "dtmi:example:epsilon_iota;1",
+              "name": "epsilon_kappa",
+              "schema": "unsignedShort",
+              "@type": "Field"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_pi;1",
+          "@type": "Object",
+          "fields": {
+            "name": "epsilon_omicron",
+            "schema": {
+              "@id": "dtmi:example:epsilon_xi;1",
+              "@type": "Interface"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_upsilon;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "epsilon_tau",
+            "schema": {
+              "@id": "dtmi:example:epsilon_sigma;1",
+              "@type": "Interface"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_wum;1",
+          "@type": "Object",
+          "fields": {
+            "name": "epsilon_yuzz",
+            "schema": {
+              "@id": "dtmi:example:epsilon_chi;1",
+              "mapKey": {
+                "name": "epsilon_psi",
+                "schema": "string"
+              },
+              "mapValue": {
+                "name": "epsilon_omega",
+                "schema": "uuid"
+              },
+              "@type": "Map"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_nuh;1",
+          "@type": "Object",
+          "fields": {
+            "name": "epsilon_glikk",
+            "schema": {
+              "@id": "dtmi:example:epsilon_humpf;1",
+              "name": "epsilon_fuddle",
+              "schema": "string",
+              "@type": "MapKey"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_floob;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "epsilon_spazz",
+            "schema": {
+              "@id": "dtmi:example:epsilon_quan;1",
+              "name": "epsilon_thnad",
+              "schema": "string",
+              "@type": "MapKey"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_yekk;1",
+          "@type": "Object",
+          "fields": {
+            "name": "epsilon_itch",
+            "schema": {
+              "@id": "dtmi:example:epsilon_jogg;1",
+              "name": "epsilon_flunn",
+              "schema": "boolean",
+              "@type": "MapValue"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_gamma;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zeta_beta",
+            "schema": {
+              "@id": "dtmi:example:epsilon_hi;1",
+              "name": "zeta_alpha",
+              "schema": "byte",
+              "@type": "MapValue"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_eta;1",
+          "@type": "Object",
+          "fields": {
+            "name": "zeta_zeta",
+            "schema": {
+              "@id": "dtmi:example:zeta_epsilon;1",
+              "@type": "Object"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_mu;1",
+          "@type": "Object",
+          "fields": {
+            "name": "zeta_lambda",
+            "schema": {
+              "@id": "dtmi:example:zeta_iota;1",
+              "name": "zeta_kappa",
+              "schema": "bytes",
+              "@type": "Property"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_rho;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zeta_pi",
+            "schema": {
+              "@id": "dtmi:example:zeta_xi;1",
+              "name": "zeta_omicron",
+              "schema": "date",
+              "@type": "Property"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_chi;1",
+          "@type": "Object",
+          "fields": {
+            "name": "zeta_phi",
+            "schema": {
+              "@id": "dtmi:example:zeta_tau;1",
+              "name": "zeta_upsilon",
+              "@type": "Relationship"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_um;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zeta_wum",
+            "schema": {
+              "@id": "dtmi:example:zeta_omega;1",
+              "name": "zeta_yuzz",
+              "@type": "Relationship"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_snee;1",
+          "@type": "Object",
+          "fields": {
+            "name": "zeta_nuh",
+            "schema": {
+              "@id": "dtmi:example:zeta_fuddle;1",
+              "name": "zeta_glikk",
+              "schema": "dateTime",
+              "@type": "Telemetry"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_zatz;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zeta_floob",
+            "schema": {
+              "@id": "dtmi:example:zeta_thnad;1",
+              "name": "zeta_spazz",
+              "schema": "decimal",
+              "@type": "Telemetry"
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldRequiredPropertiesV4.json b/DTDL/v4/spec/Requirement-ClassFieldRequiredPropertiesV4.json
new file mode 100644
index 00000000..c5a3435a
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldRequiredPropertiesV4.json
@@ -0,0 +1,84 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_flunn;1",
+          "@type": "Object",
+          "fields": {
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_yekk;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_alpha;1",
+          "@type": "Object",
+          "fields": {
+            "name": "itch_hi"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_delta;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "yekk_gamma"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldTypeIncludesInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassFieldTypeIncludesInvalidDtmiV4.json
new file mode 100644
index 00000000..3da10086
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldTypeIncludesInvalidDtmiV4.json
@@ -0,0 +1,53 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_rho;1",
+          "@type": "Object",
+          "fields": {
+            "@type": [
+              "Field",
+              "dtmi:foo//bar"
+            ],
+            "name": "lambda_pi",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_upsilon;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "Field",
+              "dtmi:foo//bar"
+            ],
+            "name": "lambda_tau",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldTypeIncludesMaterialV4.json b/DTDL/v4/spec/Requirement-ClassFieldTypeIncludesMaterialV4.json
new file mode 100644
index 00000000..51181579
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldTypeIncludesMaterialV4.json
@@ -0,0 +1,188 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_iota;1",
+          "@type": "Object",
+          "fields": {
+            "name": "kappa_theta",
+            "schema": "time",
+            "@type": "Field"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_mu;1",
+          "@type": "Object",
+          "fields": {
+            "name": "kappa_lambda",
+            "schema": "unsignedByte",
+            "@type": [
+              "Field"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_omicron;1",
+          "@type": "Object",
+          "fields": {
+            "name": "kappa_xi",
+            "schema": "unsignedInteger",
+            "@type": "dtmi:dtdl:class:Field;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_sigma;1",
+          "@type": "Object",
+          "fields": {
+            "name": "kappa_rho",
+            "schema": "unsignedLong",
+            "@type": [
+              "dtmi:dtdl:class:Field;4"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_phi;1",
+          "@type": "Object",
+          "fields": {
+            "name": "kappa_upsilon",
+            "schema": "unsignedShort",
+            "@type": "Something"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_omega;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "kappa_psi",
+            "schema": "uuid",
+            "@type": "Something"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_um;1",
+          "@type": "Object",
+          "fields": {
+            "name": "kappa_wum",
+            "schema": "boolean",
+            "@type": [
+              "Something"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_glikk;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "kappa_fuddle",
+            "schema": "byte",
+            "@type": [
+              "Something"
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldTypeIncludesNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassFieldTypeIncludesNotDtmiNorTermV4.json
new file mode 100644
index 00000000..8290fa36
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldTypeIncludesNotDtmiNorTermV4.json
@@ -0,0 +1,53 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_psi;1",
+          "@type": "Object",
+          "fields": {
+            "@type": [
+              "Field",
+              "http://foo.com/bar"
+            ],
+            "name": "lambda_chi",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_wum;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "Field",
+              "http://foo.com/bar"
+            ],
+            "name": "lambda_yuzz",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassFieldTypeStringOrArrayV4.json b/DTDL/v4/spec/Requirement-ClassFieldTypeStringOrArrayV4.json
new file mode 100644
index 00000000..6932088c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassFieldTypeStringOrArrayV4.json
@@ -0,0 +1,378 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_delta;1",
+          "@type": "Object",
+          "fields": {
+            "name": "iota_gamma",
+            "schema": "unsignedLong",
+            "@type": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_eta;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "iota_zeta",
+            "schema": "unsignedShort",
+            "@type": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_kappa;1",
+          "@type": "Object",
+          "fields": {
+            "name": "iota_iota",
+            "schema": "uuid",
+            "@type": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_nu;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "iota_mu",
+            "schema": "boolean",
+            "@type": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_pi;1",
+          "@type": "Object",
+          "fields": {
+            "name": "iota_omicron",
+            "schema": "byte",
+            "@type": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_tau;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "iota_sigma",
+            "schema": "bytes",
+            "@type": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_chi;1",
+          "@type": "Object",
+          "fields": {
+            "name": "iota_phi",
+            "schema": "date",
+            "@type": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_yuzz;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "iota_omega",
+            "schema": "dateTime",
+            "@type": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_humpf;1",
+          "@type": "Object",
+          "fields": {
+            "name": "iota_um",
+            "schema": "decimal",
+            "@type": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_nuh;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "iota_glikk",
+            "schema": "double",
+            "@type": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_thnad;1",
+          "@type": "Object",
+          "fields": {
+            "name": "iota_quan",
+            "schema": "duration",
+            "@type": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_zatz;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "iota_floob",
+            "schema": "float",
+            "@type": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_itch;1",
+          "@type": "Object",
+          "fields": {
+            "name": "iota_flunn",
+            "schema": "integer",
+            "@type": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_hi;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "iota_vroo",
+            "schema": "long",
+            "@type": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_gamma;1",
+          "@type": "Object",
+          "fields": {
+            "name": "kappa_beta",
+            "schema": "short",
+            "@type": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_zeta;1",
+          "@type": "Object",
+          "fields": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "kappa_epsilon",
+            "schema": "string",
+            "@type": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfaceContextAtTopLevelV4.json b/DTDL/v4/spec/Requirement-ClassInterfaceContextAtTopLevelV4.json
new file mode 100644
index 00000000..60dc571b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfaceContextAtTopLevelV4.json
@@ -0,0 +1,31 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_humpf;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:wum_um;1",
+          "@type": "Interface"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@id": "dtmi:example:wum_fuddle;1",
+        "@type": "Interface"
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfaceContextConformsV4.json b/DTDL/v4/spec/Requirement-ClassInterfaceContextConformsV4.json
new file mode 100644
index 00000000..50c5701d
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfaceContextConformsV4.json
@@ -0,0 +1,306 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_floob;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:wum_spazz;1",
+          "@type": "Interface",
+          "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_jogg;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:wum_zatz;1",
+          "@type": "Interface",
+          "@context": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_itch;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:wum_flunn;1",
+          "@type": "Interface",
+          "@context": [
+            "dtmi:dtdl:extension:quantitativeTypes;1"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_vroo;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:wum_yekk;1",
+          "@type": "Interface",
+          "@context": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_alpha;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:wum_hi;1",
+          "@type": "Interface",
+          "@context": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_gamma;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_beta;1",
+          "@type": "Interface",
+          "@context": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_epsilon;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_delta;1",
+          "@type": "Interface",
+          "@context": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_eta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_zeta;1",
+          "@type": "Interface",
+          "@context": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_iota;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_theta;1",
+          "@type": "Interface",
+          "@context": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_lambda;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_kappa;1",
+          "@type": "Interface",
+          "@context": "dtmi:dtdl:extension:quantitativeTypes"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_nu;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_mu;1",
+          "@type": "Interface",
+          "@context": "http://dtdl/extension/quantitativeTypes/1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_omicron;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_xi;1",
+          "@type": "Interface",
+          "@context": "quantitativeTypes;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_rho;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_pi;1",
+          "@type": "Interface",
+          "@context": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_tau;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_sigma;1",
+          "@type": "Interface",
+          "@context": {
+            "foo": "dtmi:foo:bar;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_phi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_upsilon;1",
+          "@type": "Interface",
+          "@context": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_psi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:um_chi;1",
+          "@type": "Interface",
+          "@context": [
+            {
+              "foo": "dtmi:foo:bar;1"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfaceContextDtdlTopLevelV4.json b/DTDL/v4/spec/Requirement-ClassInterfaceContextDtdlTopLevelV4.json
new file mode 100644
index 00000000..388c6a9b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfaceContextDtdlTopLevelV4.json
@@ -0,0 +1,62 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@id": "dtmi:example:wum_glikk;1",
+        "@type": "Interface",
+        "@context": []
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@id": "dtmi:example:wum_nuh;1",
+        "@type": "Interface",
+        "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_quan;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:wum_snee;1",
+          "@type": "Interface",
+          "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@id": "dtmi:example:wum_thnad;1",
+        "@type": "Interface",
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:dtdl:extension:quantitativeTypes;1"
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfaceIdDuplicateV4.json b/DTDL/v4/spec/Requirement-ClassInterfaceIdDuplicateV4.json
new file mode 100644
index 00000000..6316a167
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfaceIdDuplicateV4.json
@@ -0,0 +1,37 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_rho;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:wum_rho;1",
+          "@type": "Interface"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_sigma;1",
+        "@type": "Interface",
+        "extends": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:wum_sigma;1",
+          "@type": "Interface"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfaceIdIsDtmiV4.json b/DTDL/v4/spec/Requirement-ClassInterfaceIdIsDtmiV4.json
new file mode 100644
index 00000000..ed8f286f
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfaceIdIsDtmiV4.json
@@ -0,0 +1,793 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:foo:bar;7",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:foo:bar;108675309",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:foo:bar;999999999",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:foo;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:foo:bar",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:foo:bar;3.14",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:foo:bar;3.141592",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": null,
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": null,
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": 626,
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": 626,
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": true,
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": true,
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": {
+          "@value": "dtmi:apparently:valid:identifier;3"
+        },
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": {
+          "@value": "dtmi:apparently:valid:identifier;3"
+        },
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:foo:bar;0",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:foo:bar;0",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:foo:bar;0.0",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:foo:bar;0.0",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:foo:bar;1234567890",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:foo:bar;1234567890",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:foo:bar;1a",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:foo:bar;1a",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:foo:bar;3.0",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:foo:bar;3.0",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:foo:bar;3.1415926",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:foo:bar;3.1415926",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:foo:bar;6.02",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:foo:bar;6.02",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:foo:bar;0.1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:foo:bar;0.1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:foo:bar;01",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:foo:bar;01",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:foo:bar;",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:foo:bar;",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:test:invalidId_;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:test:invalidId_;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:test:_invalidUserId;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:test:_invalidUserId;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:test:1seg;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:test:1seg;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:foo:bar.baz;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:foo:bar.baz;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:foo::bar;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:foo::bar;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "urn:foo:bar:1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "urn:foo:bar:1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "http://foo/bar/baz",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "http://foo/bar/baz",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:dtdl:example;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:dtdl:example;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:standard:example;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:standard:example;1",
+        "@type": "Interface"
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfaceIdLongV4.json b/DTDL/v4/spec/Requirement-ClassInterfaceIdLongV4.json
new file mode 100644
index 00000000..9fcc9d66
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfaceIdLongV4.json
@@ -0,0 +1,44 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:When:in:the:Course:of:human:events:it:becomes:necessary:for:one:people:to:dissolve:the:political:bands:which:have:connect;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:When:in:the:Course:of:human:events:it:becomes:necessary:for:one:people:to:dissolve:the:political:bands:which:have:connecte;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:When:in:the:Course:of:human:events:it:becomes:necessary:for:one:people:to:dissolve:the:political:bands:which:have:connecte;1",
+        "@type": "Interface"
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfaceIdNotArrayV4.json b/DTDL/v4/spec/Requirement-ClassInterfaceIdNotArrayV4.json
new file mode 100644
index 00000000..36e8af83
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfaceIdNotArrayV4.json
@@ -0,0 +1,233 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": [
+          "dtmi:foo:bar;7"
+        ],
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": [
+          "dtmi:foo:bar;7"
+        ],
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": [
+          "dtmi:foo:bar;108675309"
+        ],
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": [
+          "dtmi:foo:bar;108675309"
+        ],
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": [
+          "dtmi:foo:bar;999999999"
+        ],
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": [
+          "dtmi:foo:bar;999999999"
+        ],
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": [
+          "dtmi:foo;1"
+        ],
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": [
+          "dtmi:foo;1"
+        ],
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": [
+          "dtmi:foo:bar"
+        ],
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": [
+          "dtmi:foo:bar"
+        ],
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": [
+          "dtmi:foo:bar;3.14"
+        ],
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": [
+          "dtmi:foo:bar;3.14"
+        ],
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": [
+          "dtmi:foo:bar;3.141592"
+        ],
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": [
+          "dtmi:foo:bar;3.141592"
+        ],
+        "@type": "Interface"
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfaceInvalidKeywordsV4.json b/DTDL/v4/spec/Requirement-ClassInterfaceInvalidKeywordsV4.json
new file mode 100644
index 00000000..b33ea50a
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfaceInvalidKeywordsV4.json
@@ -0,0 +1,126 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_snee;1",
+        "@type": "Interface",
+        "@graph": {}
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:jogg_quan;1",
+        "@type": "Interface",
+        "@graph": {}
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_thnad;1",
+        "@type": "Interface",
+        "@value": 626
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:jogg_spazz;1",
+        "@type": "Interface",
+        "@value": 626
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_floob;1",
+        "@type": "Interface",
+        "@language": "en"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:jogg_zatz;1",
+        "@type": "Interface",
+        "@language": "en"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_jogg;1",
+        "@type": "Interface",
+        "@foobar": true
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:jogg_flunn;1",
+        "@type": "Interface",
+        "@foobar": true
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertiesExtendsMaxCountV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertiesExtendsMaxCountV4.json
new file mode 100644
index 00000000..d572a9db
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertiesExtendsMaxCountV4.json
@@ -0,0 +1,12346 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_xi;1",
+        "@type": "Interface",
+        "extends": [
+          {
+            "@id": "dtmi:example:pi_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_nu;1",
+            "@type": "Interface"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_theta;1",
+        "@type": "Interface",
+        "extends": [
+          {
+            "@id": "dtmi:example:itch_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:gamma_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:delta_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:epsilon_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zeta_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:eta_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:theta_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:iota_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:kappa_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:lambda_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:mu_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nu_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:xi_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omicron_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:pi_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:rho_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:sigma_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:tau_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:upsilon_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_eta;1",
+            "@type": "Interface"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:beta_beta;1",
+        "@type": "Interface",
+        "extends": [
+          {
+            "@id": "dtmi:example:phi_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:phi_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:chi_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:psi_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:omega_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yuzz_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:wum_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:um_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:humpf_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:fuddle_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:glikk_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:nuh_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:snee_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:quan_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:thnad_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:spazz_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:floob_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:zatz_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:jogg_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:flunn_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:itch_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:yekk_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:vroo_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:hi_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_alpha;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_beta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_gamma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_delta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_epsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_zeta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_eta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_theta;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_iota;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_kappa;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_lambda;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_mu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_nu;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_xi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_omicron;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_pi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_rho;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_sigma;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_tau;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_upsilon;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_phi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_chi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_psi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_omega;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_yuzz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_wum;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_um;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_humpf;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_fuddle;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_glikk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_nuh;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_snee;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_quan;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_thnad;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_spazz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_floob;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_zatz;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_jogg;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_flunn;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_itch;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_yekk;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_vroo;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:alpha_hi;1",
+            "@type": "Interface"
+          },
+          {
+            "@id": "dtmi:example:beta_alpha;1",
+            "@type": "Interface"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertiesExtendsMaxDepthV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertiesExtendsMaxDepthV4.json
new file mode 100644
index 00000000..10bcd4d7
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertiesExtendsMaxDepthV4.json
@@ -0,0 +1,194 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_omicron;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:beta_xi;1",
+          "@type": "Interface",
+          "extends": {
+            "@id": "dtmi:example:beta_nu;1",
+            "@type": "Interface",
+            "extends": {
+              "@id": "dtmi:example:beta_mu;1",
+              "@type": "Interface",
+              "extends": {
+                "@id": "dtmi:example:beta_lambda;1",
+                "@type": "Interface",
+                "extends": {
+                  "@id": "dtmi:example:beta_kappa;1",
+                  "@type": "Interface",
+                  "extends": {
+                    "@id": "dtmi:example:beta_iota;1",
+                    "@type": "Interface",
+                    "extends": {
+                      "@id": "dtmi:example:beta_theta;1",
+                      "@type": "Interface",
+                      "extends": {
+                        "@id": "dtmi:example:beta_eta;1",
+                        "@type": "Interface",
+                        "extends": {
+                          "@id": "dtmi:example:beta_zeta;1",
+                          "@type": "Interface",
+                          "extends": {
+                            "@id": "dtmi:example:beta_epsilon;1",
+                            "@type": "Interface",
+                            "extends": {
+                              "@id": "dtmi:example:beta_delta;1",
+                              "@type": "Interface",
+                              "extends": {
+                                "@id": "dtmi:example:beta_gamma;1",
+                                "@type": "Interface"
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_fuddle;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:beta_humpf;1",
+          "@type": "Interface",
+          "extends": {
+            "@id": "dtmi:example:beta_um;1",
+            "@type": "Interface",
+            "extends": {
+              "@id": "dtmi:example:beta_wum;1",
+              "@type": "Interface",
+              "extends": {
+                "@id": "dtmi:example:beta_yuzz;1",
+                "@type": "Interface",
+                "extends": {
+                  "@id": "dtmi:example:beta_omega;1",
+                  "@type": "Interface",
+                  "extends": {
+                    "@id": "dtmi:example:beta_psi;1",
+                    "@type": "Interface",
+                    "extends": {
+                      "@id": "dtmi:example:beta_chi;1",
+                      "@type": "Interface",
+                      "extends": {
+                        "@id": "dtmi:example:beta_phi;1",
+                        "@type": "Interface",
+                        "extends": {
+                          "@id": "dtmi:example:beta_upsilon;1",
+                          "@type": "Interface",
+                          "extends": {
+                            "@id": "dtmi:example:beta_tau;1",
+                            "@type": "Interface",
+                            "extends": {
+                              "@id": "dtmi:example:beta_sigma;1",
+                              "@type": "Interface",
+                              "extends": {
+                                "@id": "dtmi:example:beta_rho;1",
+                                "@type": "Interface",
+                                "extends": {
+                                  "@id": "dtmi:example:beta_pi;1",
+                                  "@type": "Interface"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_hi;1",
+        "@type": "Interface",
+        "extends": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:beta_vroo;1",
+          "@type": "Interface",
+          "extends": {
+            "@id": "dtmi:example:beta_yekk;1",
+            "@type": "Interface",
+            "extends": {
+              "@id": "dtmi:example:beta_itch;1",
+              "@type": "Interface",
+              "extends": {
+                "@id": "dtmi:example:beta_flunn;1",
+                "@type": "Interface",
+                "extends": {
+                  "@id": "dtmi:example:beta_jogg;1",
+                  "@type": "Interface",
+                  "extends": {
+                    "@id": "dtmi:example:beta_zatz;1",
+                    "@type": "Interface",
+                    "extends": {
+                      "@id": "dtmi:example:beta_floob;1",
+                      "@type": "Interface",
+                      "extends": {
+                        "@id": "dtmi:example:beta_spazz;1",
+                        "@type": "Interface",
+                        "extends": {
+                          "@id": "dtmi:example:beta_thnad;1",
+                          "@type": "Interface",
+                          "extends": {
+                            "@id": "dtmi:example:beta_quan;1",
+                            "@type": "Interface",
+                            "extends": {
+                              "@id": "dtmi:example:beta_snee;1",
+                              "@type": "Interface",
+                              "extends": {
+                                "@id": "dtmi:example:beta_nuh;1",
+                                "@type": "Interface",
+                                "extends": {
+                                  "@id": "dtmi:example:beta_glikk;1",
+                                  "@type": "Interface"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertiesExtendsSelfReferenceV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertiesExtendsSelfReferenceV4.json
new file mode 100644
index 00000000..04f46d16
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertiesExtendsSelfReferenceV4.json
@@ -0,0 +1,39 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_alpha;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:foo:epsilon_omega;1",
+          "@type": "Interface",
+          "extends": "dtmi:foo:epsilon_omega;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_beta;1",
+        "@type": "Interface",
+        "extends": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:epsilon_omega;1",
+          "@type": "Interface",
+          "extends": "dtmi:foo:epsilon_omega;1"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertyCommentStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertyCommentStringLengthV4.json
new file mode 100644
index 00000000..afc24ccc
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertyCommentStringLengthV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_beta;1",
+        "@type": "Interface",
+        "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_gamma;1",
+        "@type": "Interface",
+        "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:humpf_delta;1",
+        "@type": "Interface",
+        "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertyCommentStringV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertyCommentStringV4.json
new file mode 100644
index 00000000..c8aa638c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertyCommentStringV4.json
@@ -0,0 +1,346 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_omega;1",
+        "@type": "Interface",
+        "comment": "hello"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_yuzz;1",
+        "@type": "Interface",
+        "comment": [
+          "hello"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_wum;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": "xsd:string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_um;1",
+        "@type": "Interface",
+        "comment": [
+          {
+            "@value": "hello",
+            "@type": "xsd:string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_humpf;1",
+        "@type": "Interface",
+        "comment": []
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_fuddle;1",
+        "@type": "Interface",
+        "comment": null
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:um_glikk;1",
+        "@type": "Interface",
+        "comment": null
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_nuh;1",
+        "@type": "Interface",
+        "comment": true
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:um_snee;1",
+        "@type": "Interface",
+        "comment": true
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_quan;1",
+        "@type": "Interface",
+        "comment": 626
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:um_thnad;1",
+        "@type": "Interface",
+        "comment": 626
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_spazz;1",
+        "@type": "Interface",
+        "comment": [
+          null
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:um_floob;1",
+        "@type": "Interface",
+        "comment": [
+          null
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_zatz;1",
+        "@type": "Interface",
+        "comment": [
+          true
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:um_jogg;1",
+        "@type": "Interface",
+        "comment": [
+          true
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_flunn;1",
+        "@type": "Interface",
+        "comment": [
+          626
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:um_itch;1",
+        "@type": "Interface",
+        "comment": [
+          626
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_yekk;1",
+        "@type": "Interface",
+        "comment": {}
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:um_vroo;1",
+        "@type": "Interface",
+        "comment": {}
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_hi;1",
+        "@type": "Interface",
+        "comment": [
+          {}
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:humpf_alpha;1",
+        "@type": "Interface",
+        "comment": [
+          {}
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertyCommentTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertyCommentTermAndDtmiV4.json
new file mode 100644
index 00000000..a926d9f0
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertyCommentTermAndDtmiV4.json
@@ -0,0 +1,35 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_lambda;1",
+        "@type": "Interface",
+        "comment": "humpf_mu",
+        "dtmi:dtdl:property:comment;4": "humpf_nu"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:humpf_xi;1",
+        "@type": "Interface",
+        "comment": "humpf_omicron",
+        "dtmi:dtdl:property:comment;4": "humpf_pi"
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertyContentsElementV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertyContentsElementV4.json
new file mode 100644
index 00000000..10971221
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertyContentsElementV4.json
@@ -0,0 +1,145 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_upsilon;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:humpf_tau;1",
+          "@type": "Interface",
+          "contents": {
+            "@id": "dtmi:example:humpf_rho;1",
+            "@type": "Command",
+            "name": "humpf_sigma"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_omega;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:humpf_psi;1",
+          "@type": "Interface",
+          "contents": [
+            {
+              "@id": "dtmi:example:humpf_phi;1",
+              "@type": "Command",
+              "name": "humpf_chi"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_humpf;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:humpf_um;1",
+          "@type": "Interface",
+          "contents": {
+            "@id": "dtmi:example:humpf_yuzz;1",
+            "@type": "Command",
+            "name": "humpf_wum",
+            "@context": "dtmi:dtdl:context;2"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_snee;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:humpf_nuh;1",
+          "@type": "Interface",
+          "contents": {
+            "@id": "dtmi:example:humpf_fuddle;1",
+            "@type": "Command",
+            "name": "humpf_glikk",
+            "@context": "dtmi:dtdl:context;3"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_thnad;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:humpf_quan;1",
+          "@type": "Interface",
+          "contents": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_yekk;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:humpf_itch;1",
+          "@type": "Interface",
+          "contents": [
+            {
+              "@id": "dtmi:example:humpf_spazz;1",
+              "@type": "Command",
+              "name": "humpf_floob"
+            },
+            {
+              "@id": "dtmi:example:humpf_zatz;1",
+              "@type": "Component",
+              "name": "humpf_jogg",
+              "schema": {
+                "@id": "dtmi:example:humpf_flunn;1",
+                "@type": "Interface"
+              }
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertyContentsTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertyContentsTermAndDtmiV4.json
new file mode 100644
index 00000000..fa57de03
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertyContentsTermAndDtmiV4.json
@@ -0,0 +1,55 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_vroo;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Command",
+            "name": "glikk_hi"
+          }
+        ],
+        "dtmi:dtdl:property:contents;4": [
+          {
+            "@type": "Command",
+            "name": "nuh_alpha"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:nuh_beta;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Command",
+            "name": "nuh_gamma"
+          }
+        ],
+        "dtmi:dtdl:property:contents;4": [
+          {
+            "@type": "Command",
+            "name": "nuh_delta"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertyContentsTypeConformanceV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertyContentsTypeConformanceV4.json
new file mode 100644
index 00000000..52fe8c7e
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertyContentsTypeConformanceV4.json
@@ -0,0 +1,549 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:fuddle_gamma;1",
+          "elementSchema": "unsignedInteger",
+          "@type": "Array"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:fuddle_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:fuddle_epsilon;1",
+          "elementSchema": "unsignedLong",
+          "@type": "Array"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:fuddle_eta;1",
+          "name": "fuddle_theta",
+          "@type": "Command"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:fuddle_kappa;1",
+          "name": "fuddle_lambda",
+          "schema": "unsignedShort",
+          "@type": "CommandRequest"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:fuddle_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:fuddle_nu;1",
+          "name": "fuddle_xi",
+          "schema": "uuid",
+          "@type": "CommandRequest"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:fuddle_pi;1",
+          "name": "fuddle_rho",
+          "schema": "boolean",
+          "@type": "CommandResponse"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:fuddle_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:fuddle_tau;1",
+          "name": "fuddle_upsilon",
+          "schema": "byte",
+          "@type": "CommandResponse"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:fuddle_chi;1",
+          "name": "fuddle_psi",
+          "schema": {
+            "@id": "dtmi:example:fuddle_omega;1",
+            "@type": "Interface"
+          },
+          "@type": "Component"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:fuddle_wum;1",
+          "valueSchema": "integer",
+          "@type": "Enum"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:fuddle_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:fuddle_humpf;1",
+          "valueSchema": "integer",
+          "@type": "Enum"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:fuddle_glikk;1",
+          "enumValue": 1857,
+          "name": "fuddle_nuh",
+          "@type": "EnumValue"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:fuddle_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:fuddle_quan;1",
+          "enumValue": 1858,
+          "name": "fuddle_thnad",
+          "@type": "EnumValue"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:fuddle_floob;1",
+          "name": "fuddle_zatz",
+          "schema": "bytes",
+          "@type": "Field"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:fuddle_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:fuddle_flunn;1",
+          "name": "fuddle_itch",
+          "schema": "date",
+          "@type": "Field"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:fuddle_vroo;1",
+          "@type": "Interface"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:glikk_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:glikk_alpha;1",
+          "@type": "Interface"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:glikk_gamma;1",
+          "mapKey": {
+            "name": "glikk_delta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "glikk_epsilon",
+            "schema": "dateTime"
+          },
+          "@type": "Map"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:glikk_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:glikk_eta;1",
+          "mapKey": {
+            "name": "glikk_theta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "glikk_iota",
+            "schema": "decimal"
+          },
+          "@type": "Map"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:glikk_lambda;1",
+          "name": "glikk_mu",
+          "schema": "string",
+          "@type": "MapKey"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:glikk_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:glikk_xi;1",
+          "name": "glikk_omicron",
+          "schema": "string",
+          "@type": "MapKey"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:glikk_rho;1",
+          "name": "glikk_sigma",
+          "schema": "double",
+          "@type": "MapValue"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:glikk_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:glikk_upsilon;1",
+          "name": "glikk_phi",
+          "schema": "duration",
+          "@type": "MapValue"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:glikk_psi;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:glikk_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:glikk_yuzz;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:glikk_um;1",
+          "name": "glikk_humpf",
+          "schema": "float",
+          "@type": "Property"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:glikk_glikk;1",
+          "name": "glikk_nuh",
+          "@type": "Relationship"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:glikk_quan;1",
+          "name": "glikk_thnad",
+          "schema": "integer",
+          "@type": "Telemetry"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertyDescriptionLangStringV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertyDescriptionLangStringV4.json
new file mode 100644
index 00000000..30b58095
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertyDescriptionLangStringV4.json
@@ -0,0 +1,404 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_epsilon;1",
+        "@type": "Interface",
+        "description": "hello"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_zeta;1",
+        "@type": "Interface",
+        "description": [
+          "hello"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_eta;1",
+        "@type": "Interface",
+        "description": {
+          "en": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_theta;1",
+        "@type": "Interface",
+        "description": [
+          {
+            "@value": "hello",
+            "@language": "en"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_iota;1",
+        "@type": "Interface",
+        "description": {}
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_kappa;1",
+        "@type": "Interface",
+        "description": []
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_lambda;1",
+        "@type": "Interface",
+        "description": null
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:nuh_mu;1",
+        "@type": "Interface",
+        "description": null
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_nu;1",
+        "@type": "Interface",
+        "description": true
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:nuh_xi;1",
+        "@type": "Interface",
+        "description": true
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_omicron;1",
+        "@type": "Interface",
+        "description": 626
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:nuh_pi;1",
+        "@type": "Interface",
+        "description": 626
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_rho;1",
+        "@type": "Interface",
+        "description": [
+          null
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:nuh_sigma;1",
+        "@type": "Interface",
+        "description": [
+          null
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_tau;1",
+        "@type": "Interface",
+        "description": [
+          true
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:nuh_upsilon;1",
+        "@type": "Interface",
+        "description": [
+          true
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_phi;1",
+        "@type": "Interface",
+        "description": [
+          626
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:nuh_chi;1",
+        "@type": "Interface",
+        "description": [
+          626
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_psi;1",
+        "@type": "Interface",
+        "description": [
+          {}
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:nuh_omega;1",
+        "@type": "Interface",
+        "description": [
+          {}
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_yuzz;1",
+        "@type": "Interface",
+        "description": {
+          "@value": "hello",
+          "@language": "en"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:nuh_wum;1",
+        "@type": "Interface",
+        "description": {
+          "@value": "hello",
+          "@language": "en"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_um;1",
+        "@type": "Interface",
+        "description": [
+          {
+            "en": "hello"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:nuh_humpf;1",
+        "@type": "Interface",
+        "description": [
+          {
+            "en": "hello"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertyDescriptionStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertyDescriptionStringLengthV4.json
new file mode 100644
index 00000000..22c85afa
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertyDescriptionStringLengthV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_fuddle;1",
+        "@type": "Interface",
+        "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_glikk;1",
+        "@type": "Interface",
+        "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:nuh_nuh;1",
+        "@type": "Interface",
+        "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertyDescriptionTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertyDescriptionTermAndDtmiV4.json
new file mode 100644
index 00000000..3d58374e
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertyDescriptionTermAndDtmiV4.json
@@ -0,0 +1,43 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_jogg;1",
+        "@type": "Interface",
+        "description": [
+          "nuh_flunn"
+        ],
+        "dtmi:dtdl:property:description;4": [
+          "nuh_itch"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:nuh_yekk;1",
+        "@type": "Interface",
+        "description": [
+          "nuh_vroo"
+        ],
+        "dtmi:dtdl:property:description;4": [
+          "nuh_hi"
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertyDisplayNameLangStringV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertyDisplayNameLangStringV4.json
new file mode 100644
index 00000000..58a7d386
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertyDisplayNameLangStringV4.json
@@ -0,0 +1,404 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_alpha;1",
+        "@type": "Interface",
+        "displayName": "hello"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_beta;1",
+        "@type": "Interface",
+        "displayName": [
+          "hello"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_gamma;1",
+        "@type": "Interface",
+        "displayName": {
+          "en": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_delta;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello",
+            "@language": "en"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_epsilon;1",
+        "@type": "Interface",
+        "displayName": {}
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_zeta;1",
+        "@type": "Interface",
+        "displayName": []
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_eta;1",
+        "@type": "Interface",
+        "displayName": null
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:snee_theta;1",
+        "@type": "Interface",
+        "displayName": null
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_iota;1",
+        "@type": "Interface",
+        "displayName": true
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:snee_kappa;1",
+        "@type": "Interface",
+        "displayName": true
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_lambda;1",
+        "@type": "Interface",
+        "displayName": 626
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:snee_mu;1",
+        "@type": "Interface",
+        "displayName": 626
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_nu;1",
+        "@type": "Interface",
+        "displayName": [
+          null
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:snee_xi;1",
+        "@type": "Interface",
+        "displayName": [
+          null
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_omicron;1",
+        "@type": "Interface",
+        "displayName": [
+          true
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:snee_pi;1",
+        "@type": "Interface",
+        "displayName": [
+          true
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_rho;1",
+        "@type": "Interface",
+        "displayName": [
+          626
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:snee_sigma;1",
+        "@type": "Interface",
+        "displayName": [
+          626
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_tau;1",
+        "@type": "Interface",
+        "displayName": [
+          {}
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:snee_upsilon;1",
+        "@type": "Interface",
+        "displayName": [
+          {}
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_phi;1",
+        "@type": "Interface",
+        "displayName": {
+          "@value": "hello",
+          "@language": "en"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:snee_chi;1",
+        "@type": "Interface",
+        "displayName": {
+          "@value": "hello",
+          "@language": "en"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_psi;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "en": "hello"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:snee_omega;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "en": "hello"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertyDisplayNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertyDisplayNameStringLengthV4.json
new file mode 100644
index 00000000..520bab54
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertyDisplayNameStringLengthV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_yuzz;1",
+        "@type": "Interface",
+        "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_wum;1",
+        "@type": "Interface",
+        "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:snee_um;1",
+        "@type": "Interface",
+        "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertyDisplayNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertyDisplayNameTermAndDtmiV4.json
new file mode 100644
index 00000000..3925a5f6
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertyDisplayNameTermAndDtmiV4.json
@@ -0,0 +1,43 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_thnad;1",
+        "@type": "Interface",
+        "displayName": [
+          "snee_spazz"
+        ],
+        "dtmi:dtdl:property:displayName;4": [
+          "snee_floob"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:snee_zatz;1",
+        "@type": "Interface",
+        "displayName": [
+          "snee_jogg"
+        ],
+        "dtmi:dtdl:property:displayName;4": [
+          "snee_flunn"
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertyExtendsElementV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertyExtendsElementV4.json
new file mode 100644
index 00000000..d37168e1
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertyExtendsElementV4.json
@@ -0,0 +1,187 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_vroo;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:snee_yekk;1",
+          "@type": "Interface",
+          "extends": {
+            "@id": "dtmi:example:snee_itch;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_beta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:quan_alpha;1",
+          "@type": "Interface",
+          "extends": [
+            {
+              "@id": "dtmi:example:snee_hi;1",
+              "@type": "Interface"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      [
+        {
+          "@context": "dtmi:dtdl:context;4",
+          "@id": "dtmi:example:quan_delta;1",
+          "@type": "Interface",
+          "extends": {
+            "@id": "dtmi:example:quan_gamma;1",
+            "@type": "Interface",
+            "extends": "dtmi:ex:dependentRef;1"
+          }
+        },
+        {
+          "@context": "dtmi:dtdl:context;4",
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Interface"
+        }
+      ]
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      [
+        {
+          "@context": "dtmi:dtdl:context;4",
+          "@id": "dtmi:example:quan_zeta;1",
+          "@type": "Interface",
+          "extends": {
+            "@id": "dtmi:example:quan_epsilon;1",
+            "@type": "Interface",
+            "extends": [
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        },
+        {
+          "@context": "dtmi:dtdl:context;4",
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Interface"
+        }
+      ]
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_iota;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:quan_theta;1",
+          "@type": "Interface",
+          "extends": {
+            "@id": "dtmi:example:quan_eta;1",
+            "@type": "Interface",
+            "@context": "dtmi:dtdl:context;2"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_mu;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:quan_lambda;1",
+          "@type": "Interface",
+          "extends": {
+            "@id": "dtmi:example:quan_kappa;1",
+            "@type": "Interface",
+            "@context": "dtmi:dtdl:context;3"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_xi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:quan_nu;1",
+          "@type": "Interface",
+          "extends": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_sigma;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:quan_rho;1",
+          "@type": "Interface",
+          "extends": [
+            {
+              "@id": "dtmi:example:quan_omicron;1",
+              "@type": "Interface"
+            },
+            {
+              "@id": "dtmi:example:quan_pi;1",
+              "@type": "Interface"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertyExtendsTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertyExtendsTermAndDtmiV4.json
new file mode 100644
index 00000000..d28a789c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertyExtendsTermAndDtmiV4.json
@@ -0,0 +1,55 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_quan;1",
+        "@type": "Interface",
+        "extends": [
+          {
+            "@id": "dtmi:example:spazz_thnad;1",
+            "@type": "Interface"
+          }
+        ],
+        "dtmi:dtdl:property:extends;4": [
+          {
+            "@id": "dtmi:example:spazz_spazz;1",
+            "@type": "Interface"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:spazz_floob;1",
+        "@type": "Interface",
+        "extends": [
+          {
+            "@id": "dtmi:example:spazz_zatz;1",
+            "@type": "Interface"
+          }
+        ],
+        "dtmi:dtdl:property:extends;4": [
+          {
+            "@id": "dtmi:example:spazz_jogg;1",
+            "@type": "Interface"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertyExtendsTypeConformanceV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertyExtendsTypeConformanceV4.json
new file mode 100644
index 00000000..9205ba99
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertyExtendsTypeConformanceV4.json
@@ -0,0 +1,640 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_omega;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:quan_psi;1",
+          "elementSchema": "long",
+          "@type": "Array"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:quan_wum;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:quan_yuzz;1",
+          "elementSchema": "short",
+          "@type": "Array"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_fuddle;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:quan_um;1",
+          "name": "quan_humpf",
+          "@type": "Command"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:quan_snee;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:quan_glikk;1",
+          "name": "quan_nuh",
+          "@type": "Command"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_spazz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:quan_quan;1",
+          "name": "quan_thnad",
+          "schema": "string",
+          "@type": "CommandRequest"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:quan_jogg;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:quan_floob;1",
+          "name": "quan_zatz",
+          "schema": "time",
+          "@type": "CommandRequest"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_yekk;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:quan_flunn;1",
+          "name": "quan_itch",
+          "schema": "unsignedByte",
+          "@type": "CommandResponse"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:thnad_alpha;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:quan_vroo;1",
+          "name": "quan_hi",
+          "schema": "unsignedInteger",
+          "@type": "CommandResponse"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_epsilon;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:thnad_beta;1",
+          "name": "thnad_gamma",
+          "schema": {
+            "@id": "dtmi:example:thnad_delta;1",
+            "@type": "Interface"
+          },
+          "@type": "Component"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:thnad_iota;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:thnad_zeta;1",
+          "name": "thnad_eta",
+          "schema": {
+            "@id": "dtmi:example:thnad_theta;1",
+            "@type": "Interface"
+          },
+          "@type": "Component"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_lambda;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:thnad_kappa;1",
+          "valueSchema": "integer",
+          "@type": "Enum"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:thnad_nu;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:thnad_mu;1",
+          "valueSchema": "integer",
+          "@type": "Enum"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_pi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:thnad_xi;1",
+          "enumValue": 1859,
+          "name": "thnad_omicron",
+          "@type": "EnumValue"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:thnad_tau;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:thnad_rho;1",
+          "enumValue": 1860,
+          "name": "thnad_sigma",
+          "@type": "EnumValue"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_chi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:thnad_upsilon;1",
+          "name": "thnad_phi",
+          "schema": "unsignedLong",
+          "@type": "Field"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:thnad_yuzz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:thnad_psi;1",
+          "name": "thnad_omega",
+          "schema": "unsignedShort",
+          "@type": "Field"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_um;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:thnad_wum;1",
+          "@type": "Interface"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_nuh;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:thnad_humpf;1",
+          "mapKey": {
+            "name": "thnad_fuddle",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "thnad_glikk",
+            "schema": "uuid"
+          },
+          "@type": "Map"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:thnad_spazz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:thnad_snee;1",
+          "mapKey": {
+            "name": "thnad_quan",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "thnad_thnad",
+            "schema": "boolean"
+          },
+          "@type": "Map"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_jogg;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:thnad_floob;1",
+          "name": "thnad_zatz",
+          "schema": "string",
+          "@type": "MapKey"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:thnad_yekk;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:thnad_flunn;1",
+          "name": "thnad_itch",
+          "schema": "string",
+          "@type": "MapKey"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_alpha;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:thnad_vroo;1",
+          "name": "thnad_hi",
+          "schema": "byte",
+          "@type": "MapValue"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:spazz_delta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:spazz_beta;1",
+          "name": "spazz_gamma",
+          "schema": "bytes",
+          "@type": "MapValue"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_zeta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:spazz_epsilon;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:spazz_theta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:spazz_eta;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_lambda;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:spazz_iota;1",
+          "name": "spazz_kappa",
+          "schema": "date",
+          "@type": "Property"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:spazz_xi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:spazz_mu;1",
+          "name": "spazz_nu",
+          "schema": "dateTime",
+          "@type": "Property"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_rho;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:spazz_omicron;1",
+          "name": "spazz_pi",
+          "@type": "Relationship"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:spazz_upsilon;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:spazz_sigma;1",
+          "name": "spazz_tau",
+          "@type": "Relationship"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_psi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:spazz_phi;1",
+          "name": "spazz_chi",
+          "schema": "decimal",
+          "@type": "Telemetry"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:spazz_wum;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:spazz_omega;1",
+          "name": "spazz_yuzz",
+          "schema": "double",
+          "@type": "Telemetry"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertyFormallyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertyFormallyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..4c380c3d
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertyFormallyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,64 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_alpha;1",
+        "@type": "Interface",
+        "dtmi:foo:bar;1": 626
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:flunn_beta;1",
+        "@type": "Interface",
+        "dtmi:foo:bar;1": 626
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_gamma;1",
+        "@type": "Interface",
+        "boolean": null
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:flunn_delta;1",
+        "@type": "Interface",
+        "boolean": null
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertyFormallyUndefinedTermV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertyFormallyUndefinedTermV4.json
new file mode 100644
index 00000000..1db7ae5d
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertyFormallyUndefinedTermV4.json
@@ -0,0 +1,33 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_lambda;1",
+        "@type": "Interface",
+        "foobar": {}
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:flunn_mu;1",
+        "@type": "Interface",
+        "foobar": {}
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertyInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertyInvalidDtmiV4.json
new file mode 100644
index 00000000..f7244b11
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertyInvalidDtmiV4.json
@@ -0,0 +1,39 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_epsilon;1",
+        "@type": [
+          "Interface",
+          "Foobar"
+        ],
+        "dtmi:foo//bar": 626
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:flunn_zeta;1",
+        "@type": [
+          "Interface",
+          "Foobar"
+        ],
+        "dtmi:foo//bar": 626
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertyNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertyNotDtmiNorTermV4.json
new file mode 100644
index 00000000..f5c7f121
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertyNotDtmiNorTermV4.json
@@ -0,0 +1,39 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_eta;1",
+        "@type": [
+          "Interface",
+          "Foobar"
+        ],
+        "http://foo.com/bar": true
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:flunn_theta;1",
+        "@type": [
+          "Interface",
+          "Foobar"
+        ],
+        "http://foo.com/bar": true
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertySchemasElementV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertySchemasElementV4.json
new file mode 100644
index 00000000..da0eb191
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertySchemasElementV4.json
@@ -0,0 +1,189 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_yekk;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:spazz_itch;1",
+          "@type": "Interface",
+          "schemas": {
+            "@id": "dtmi:example:spazz_flunn;1",
+            "@type": "Array",
+            "elementSchema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_alpha;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:spazz_hi;1",
+          "@type": "Interface",
+          "schemas": [
+            {
+              "@id": "dtmi:example:spazz_vroo;1",
+              "@type": "Array",
+              "elementSchema": "float"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_delta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:floob_gamma;1",
+          "@type": "Interface",
+          "schemas": {
+            "@id": "dtmi:example:floob_beta;1",
+            "@type": "Array",
+            "elementSchema": "date",
+            "@context": "dtmi:dtdl:context;2"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_eta;1",
+        "@type": "Interface",
+        "extends": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:floob_zeta;1",
+          "@type": "Interface",
+          "schemas": {
+            "@id": "dtmi:example:floob_epsilon;1",
+            "@type": "Array",
+            "elementSchema": "dateTime",
+            "@context": "dtmi:dtdl:context;2"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_kappa;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:floob_iota;1",
+          "@type": "Interface",
+          "schemas": {
+            "@id": "dtmi:example:floob_theta;1",
+            "@type": "Array",
+            "elementSchema": "double",
+            "@context": "dtmi:dtdl:context;3"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_nu;1",
+        "@type": "Interface",
+        "extends": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:floob_mu;1",
+          "@type": "Interface",
+          "schemas": {
+            "@id": "dtmi:example:floob_lambda;1",
+            "@type": "Array",
+            "elementSchema": "duration",
+            "@context": "dtmi:dtdl:context;3"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_omicron;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:floob_xi;1",
+          "@type": "Interface",
+          "schemas": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_tau;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:floob_sigma;1",
+          "@type": "Interface",
+          "schemas": [
+            {
+              "@id": "dtmi:example:floob_pi;1",
+              "@type": "Array",
+              "elementSchema": "time"
+            },
+            {
+              "@id": "dtmi:example:floob_rho;1",
+              "@type": "Enum",
+              "valueSchema": "integer"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertySchemasTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertySchemasTermAndDtmiV4.json
new file mode 100644
index 00000000..96573ba6
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertySchemasTermAndDtmiV4.json
@@ -0,0 +1,59 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_wum;1",
+        "@type": "Interface",
+        "schemas": [
+          {
+            "@id": "dtmi:example:jogg_um;1",
+            "@type": "Array",
+            "elementSchema": "string"
+          }
+        ],
+        "dtmi:dtdl:property:schemas;4": [
+          {
+            "@id": "dtmi:example:jogg_humpf;1",
+            "@type": "Array",
+            "elementSchema": "time"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:jogg_fuddle;1",
+        "@type": "Interface",
+        "schemas": [
+          {
+            "@id": "dtmi:example:jogg_glikk;1",
+            "@type": "Array",
+            "elementSchema": "unsignedByte"
+          }
+        ],
+        "dtmi:dtdl:property:schemas;4": [
+          {
+            "@id": "dtmi:example:jogg_nuh;1",
+            "@type": "Array",
+            "elementSchema": "unsignedInteger"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfacePropertySchemasTypeConformanceV4.json b/DTDL/v4/spec/Requirement-ClassInterfacePropertySchemasTypeConformanceV4.json
new file mode 100644
index 00000000..3a1d85b0
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfacePropertySchemasTypeConformanceV4.json
@@ -0,0 +1,570 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_omega;1",
+          "elementSchema": "unsignedByte",
+          "@type": "Array"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_wum;1",
+          "name": "floob_um",
+          "@type": "Command"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:floob_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_fuddle;1",
+          "name": "floob_glikk",
+          "@type": "Command"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_snee;1",
+          "name": "floob_quan",
+          "schema": "unsignedInteger",
+          "@type": "CommandRequest"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:floob_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_spazz;1",
+          "name": "floob_floob",
+          "schema": "unsignedLong",
+          "@type": "CommandRequest"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_jogg;1",
+          "name": "floob_flunn",
+          "schema": "unsignedShort",
+          "@type": "CommandResponse"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:floob_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_yekk;1",
+          "name": "floob_vroo",
+          "schema": "uuid",
+          "@type": "CommandResponse"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_alpha;1",
+          "name": "zatz_beta",
+          "schema": {
+            "@id": "dtmi:example:zatz_gamma;1",
+            "@type": "Interface"
+          },
+          "@type": "Component"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:zatz_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_epsilon;1",
+          "name": "zatz_zeta",
+          "schema": {
+            "@id": "dtmi:example:zatz_eta;1",
+            "@type": "Interface"
+          },
+          "@type": "Component"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_iota;1",
+          "valueSchema": "integer",
+          "@type": "Enum"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_lambda;1",
+          "enumValue": 1861,
+          "name": "zatz_mu",
+          "@type": "EnumValue"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:zatz_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_xi;1",
+          "enumValue": 1862,
+          "name": "zatz_omicron",
+          "@type": "EnumValue"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_rho;1",
+          "name": "zatz_sigma",
+          "schema": "boolean",
+          "@type": "Field"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:zatz_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_upsilon;1",
+          "name": "zatz_phi",
+          "schema": "byte",
+          "@type": "Field"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_psi;1",
+          "@type": "Interface"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:zatz_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_yuzz;1",
+          "@type": "Interface"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_um;1",
+          "mapKey": {
+            "name": "zatz_humpf",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "zatz_fuddle",
+            "schema": "bytes"
+          },
+          "@type": "Map"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_nuh;1",
+          "name": "zatz_snee",
+          "schema": "string",
+          "@type": "MapKey"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:zatz_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_thnad;1",
+          "name": "zatz_spazz",
+          "schema": "string",
+          "@type": "MapKey"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_zatz;1",
+          "name": "zatz_jogg",
+          "schema": "date",
+          "@type": "MapValue"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:zatz_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_itch;1",
+          "name": "zatz_yekk",
+          "schema": "dateTime",
+          "@type": "MapValue"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_hi;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_beta;1",
+          "name": "jogg_gamma",
+          "schema": "decimal",
+          "@type": "Property"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:jogg_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_epsilon;1",
+          "name": "jogg_zeta",
+          "schema": "double",
+          "@type": "Property"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_theta;1",
+          "name": "jogg_iota",
+          "@type": "Relationship"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:jogg_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_lambda;1",
+          "name": "jogg_mu",
+          "@type": "Relationship"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_xi;1",
+          "name": "jogg_omicron",
+          "schema": "duration",
+          "@type": "Telemetry"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:jogg_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_rho;1",
+          "name": "jogg_sigma",
+          "schema": "float",
+          "@type": "Telemetry"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfaceRequiredPropertiesV4.json b/DTDL/v4/spec/Requirement-ClassInterfaceRequiredPropertiesV4.json
new file mode 100644
index 00000000..b81cda13
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfaceRequiredPropertiesV4.json
@@ -0,0 +1,62 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_rho;1"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:yuzz_sigma;1"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_tau;1",
+        "@type": "Interface",
+        "extends": {
+          "@type": "Interface"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_upsilon;1",
+        "@type": "Interface",
+        "extends": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Interface"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfaceTypeIncludesInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassInterfaceTypeIncludesInvalidDtmiV4.json
new file mode 100644
index 00000000..6908fc6c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfaceTypeIncludesInvalidDtmiV4.json
@@ -0,0 +1,37 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_lambda;1",
+        "@type": [
+          "Interface",
+          "dtmi:foo//bar"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:wum_mu;1",
+        "@type": [
+          "Interface",
+          "dtmi:foo//bar"
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfaceTypeIncludesMaterialV4.json b/DTDL/v4/spec/Requirement-ClassInterfaceTypeIncludesMaterialV4.json
new file mode 100644
index 00000000..d1cef83b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfaceTypeIncludesMaterialV4.json
@@ -0,0 +1,120 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_zatz;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_jogg;1",
+        "@type": [
+          "Interface"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_flunn;1",
+        "@type": "dtmi:dtdl:class:Interface;4"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_itch;1",
+        "@type": [
+          "dtmi:dtdl:class:Interface;4"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_yekk;1",
+        "@type": "Something"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:yuzz_vroo;1",
+        "@type": "Something"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_hi;1",
+        "@type": [
+          "Something"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:wum_alpha;1",
+        "@type": [
+          "Something"
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfaceTypeIncludesNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassInterfaceTypeIncludesNotDtmiNorTermV4.json
new file mode 100644
index 00000000..154fe639
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfaceTypeIncludesNotDtmiNorTermV4.json
@@ -0,0 +1,37 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_nu;1",
+        "@type": [
+          "Interface",
+          "http://foo.com/bar"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:wum_xi;1",
+        "@type": [
+          "Interface",
+          "http://foo.com/bar"
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassInterfaceTypeStringOrArrayV4.json b/DTDL/v4/spec/Requirement-ClassInterfaceTypeStringOrArrayV4.json
new file mode 100644
index 00000000..3523f16c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassInterfaceTypeStringOrArrayV4.json
@@ -0,0 +1,250 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_phi;1",
+        "@type": 626
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:yuzz_chi;1",
+        "@type": 626
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_psi;1",
+        "@type": null
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:yuzz_omega;1",
+        "@type": null
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_yuzz;1",
+        "@type": true
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:yuzz_wum;1",
+        "@type": true
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_um;1",
+        "@type": {}
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:yuzz_humpf;1",
+        "@type": {}
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_fuddle;1",
+        "@type": [
+          626
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:yuzz_glikk;1",
+        "@type": [
+          626
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_nuh;1",
+        "@type": [
+          null
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:yuzz_snee;1",
+        "@type": [
+          null
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_quan;1",
+        "@type": [
+          true
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:yuzz_thnad;1",
+        "@type": [
+          true
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_spazz;1",
+        "@type": [
+          {}
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:yuzz_floob;1",
+        "@type": [
+          {}
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapContextConformsV4.json b/DTDL/v4/spec/Requirement-ClassMapContextConformsV4.json
new file mode 100644
index 00000000..ac48791d
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapContextConformsV4.json
@@ -0,0 +1,482 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "mu_epsilon",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "mu_gamma",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "mu_delta",
+              "schema": "unsignedByte"
+            },
+            "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "mu_iota",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "mu_eta",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "mu_theta",
+              "schema": "unsignedInteger"
+            },
+            "@context": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "mu_nu",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "mu_lambda",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "mu_mu",
+              "schema": "unsignedLong"
+            },
+            "@context": [
+              "dtmi:dtdl:extension:quantitativeTypes;1"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "mu_rho",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "mu_omicron",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "mu_pi",
+              "schema": "unsignedShort"
+            },
+            "@context": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "mu_phi",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "mu_tau",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "mu_upsilon",
+              "schema": "uuid"
+            },
+            "@context": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "mu_yuzz",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "mu_psi",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "mu_omega",
+              "schema": "boolean"
+            },
+            "@context": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "mu_fuddle",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "mu_um",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "mu_humpf",
+              "schema": "byte"
+            },
+            "@context": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "mu_quan",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "mu_nuh",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "mu_snee",
+              "schema": "bytes"
+            },
+            "@context": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "mu_zatz",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "mu_spazz",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "mu_floob",
+              "schema": "date"
+            },
+            "@context": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "mu_yekk",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "mu_flunn",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "mu_itch",
+              "schema": "dateTime"
+            },
+            "@context": "dtmi:dtdl:extension:quantitativeTypes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "nu_beta",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "mu_hi",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "nu_alpha",
+              "schema": "decimal"
+            },
+            "@context": "http://dtdl/extension/quantitativeTypes/1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "nu_zeta",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "nu_delta",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "nu_epsilon",
+              "schema": "double"
+            },
+            "@context": "quantitativeTypes;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "nu_kappa",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "nu_theta",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "nu_iota",
+              "schema": "duration"
+            },
+            "@context": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "nu_xi",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "nu_mu",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "nu_nu",
+              "schema": "float"
+            },
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "nu_sigma",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "nu_pi",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "nu_rho",
+              "schema": "integer"
+            },
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "nu_chi",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "nu_upsilon",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "nu_phi",
+              "schema": "long"
+            },
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapIdDuplicateV4.json b/DTDL/v4/spec/Requirement-ClassMapIdDuplicateV4.json
new file mode 100644
index 00000000..b0d06642
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapIdDuplicateV4.json
@@ -0,0 +1,63 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:sigma_glikk;1",
+          "@type": "Property",
+          "name": "sigma_quan",
+          "schema": {
+            "@id": "dtmi:example:sigma_glikk;1",
+            "@type": "Map",
+            "mapKey": {
+              "name": "sigma_nuh",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "sigma_snee",
+              "schema": "float"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:sigma_thnad;1",
+          "@type": "Property",
+          "name": "sigma_zatz",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:example:sigma_thnad;1",
+            "@type": "Map",
+            "mapKey": {
+              "name": "sigma_spazz",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "sigma_floob",
+              "schema": "integer"
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapIdIsDtmiV4.json b/DTDL/v4/spec/Requirement-ClassMapIdIsDtmiV4.json
new file mode 100644
index 00000000..c868e800
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapIdIsDtmiV4.json
@@ -0,0 +1,1405 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;7",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nu_jogg",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "nu_flunn",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;108675309",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nu_yekk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "nu_vroo",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;999999999",
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_alpha",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "xi_beta",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_delta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "xi_epsilon",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar",
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_eta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "xi_theta",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;3.14",
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_kappa",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "xi_lambda",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;3.141592",
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_nu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "xi_xi",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": null,
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_pi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "xi_rho",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": null,
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_tau",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "xi_upsilon",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": 626,
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_chi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "xi_psi",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": 626,
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_yuzz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "xi_wum",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": true,
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_humpf",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "xi_fuddle",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": true,
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_nuh",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "xi_snee",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": {
+            "@value": "dtmi:apparently:valid:identifier;3"
+          },
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_thnad",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "xi_spazz",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": {
+            "@value": "dtmi:apparently:valid:identifier;3"
+          },
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_zatz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "xi_jogg",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;0",
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_itch",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "xi_yekk",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0",
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_hi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omicron_alpha",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;0.0",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omicron_gamma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omicron_delta",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0.0",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omicron_zeta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omicron_eta",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;1234567890",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omicron_iota",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omicron_kappa",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;1234567890",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omicron_mu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omicron_nu",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;1a",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omicron_omicron",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omicron_pi",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;1a",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omicron_sigma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omicron_tau",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;3.0",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omicron_phi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omicron_chi",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;3.0",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omicron_omega",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omicron_yuzz",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;3.1415926",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omicron_um",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omicron_humpf",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;3.1415926",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omicron_glikk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omicron_nuh",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;6.02",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omicron_quan",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omicron_thnad",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;6.02",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omicron_floob",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omicron_zatz",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;0.1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omicron_flunn",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omicron_itch",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0.1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omicron_vroo",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omicron_hi",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;01",
+          "@type": "Map",
+          "mapKey": {
+            "name": "pi_beta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "pi_gamma",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;01",
+          "@type": "Map",
+          "mapKey": {
+            "name": "pi_epsilon",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "pi_zeta",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;",
+          "@type": "Map",
+          "mapKey": {
+            "name": "pi_theta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "pi_iota",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;",
+          "@type": "Map",
+          "mapKey": {
+            "name": "pi_lambda",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "pi_mu",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:test:invalidId_;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "pi_xi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "pi_omicron",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:invalidId_;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "pi_rho",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "pi_sigma",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:test:_invalidUserId;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "pi_upsilon",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "pi_phi",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:_invalidUserId;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "pi_psi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "pi_omega",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:test:1seg;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "pi_wum",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "pi_um",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:1seg;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "pi_fuddle",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "pi_glikk",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar.baz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "pi_snee",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "pi_quan",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar.baz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "pi_spazz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "pi_floob",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo::bar;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "pi_jogg",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "pi_flunn",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo::bar;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "pi_yekk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "pi_vroo",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "urn:foo:bar:1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_alpha",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "rho_beta",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "urn:foo:bar:1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_delta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "rho_epsilon",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "http://foo/bar/baz",
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_eta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "rho_theta",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "http://foo/bar/baz",
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_kappa",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "rho_lambda",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_nu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "rho_xi",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_pi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "rho_rho",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:dtdl:example;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_tau",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "rho_upsilon",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:dtdl:example;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_chi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "rho_psi",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:standard:example;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_yuzz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "rho_wum",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:standard:example;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_humpf",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "rho_fuddle",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapIdNotArrayV4.json b/DTDL/v4/spec/Requirement-ClassMapIdNotArrayV4.json
new file mode 100644
index 00000000..d0021b95
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapIdNotArrayV4.json
@@ -0,0 +1,387 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo:bar;7"
+          ],
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_nuh",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "rho_snee",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;7"
+          ],
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_thnad",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "rho_spazz",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo:bar;108675309"
+          ],
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_zatz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "rho_jogg",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;108675309"
+          ],
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_itch",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "rho_yekk",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo:bar;999999999"
+          ],
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_hi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "sigma_alpha",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;999999999"
+          ],
+          "@type": "Map",
+          "mapKey": {
+            "name": "sigma_gamma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "sigma_delta",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo;1"
+          ],
+          "@type": "Map",
+          "mapKey": {
+            "name": "sigma_zeta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "sigma_eta",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo;1"
+          ],
+          "@type": "Map",
+          "mapKey": {
+            "name": "sigma_iota",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "sigma_kappa",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo:bar"
+          ],
+          "@type": "Map",
+          "mapKey": {
+            "name": "sigma_mu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "sigma_nu",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar"
+          ],
+          "@type": "Map",
+          "mapKey": {
+            "name": "sigma_omicron",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "sigma_pi",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo:bar;3.14"
+          ],
+          "@type": "Map",
+          "mapKey": {
+            "name": "sigma_sigma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "sigma_tau",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;3.14"
+          ],
+          "@type": "Map",
+          "mapKey": {
+            "name": "sigma_phi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "sigma_chi",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo:bar;3.141592"
+          ],
+          "@type": "Map",
+          "mapKey": {
+            "name": "sigma_omega",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "sigma_yuzz",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;3.141592"
+          ],
+          "@type": "Map",
+          "mapKey": {
+            "name": "sigma_um",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "sigma_humpf",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapIdRequiredV4.json b/DTDL/v4/spec/Requirement-ClassMapIdRequiredV4.json
new file mode 100644
index 00000000..92a7057e
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapIdRequiredV4.json
@@ -0,0 +1,104 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "nu_wum",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "nu_omega",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "nu_yuzz",
+              "schema": "short"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_humpf;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nu_fuddle",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "nu_glikk",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@type": "Map",
+          "mapKey": {
+            "name": "nu_snee",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "nu_quan",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nu_spazz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "nu_floob",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapInvalidKeywordsV4.json b/DTDL/v4/spec/Requirement-ClassMapInvalidKeywordsV4.json
new file mode 100644
index 00000000..441ba9e4
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapInvalidKeywordsV4.json
@@ -0,0 +1,214 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_alpha;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "humpf_beta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "humpf_gamma",
+            "schema": "float"
+          },
+          "@graph": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:humpf_epsilon;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "humpf_zeta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "humpf_eta",
+            "schema": "integer"
+          },
+          "@graph": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_iota;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "humpf_kappa",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "humpf_lambda",
+            "schema": "long"
+          },
+          "@value": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:humpf_nu;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "humpf_xi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "humpf_omicron",
+            "schema": "short"
+          },
+          "@value": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_rho;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "humpf_sigma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "humpf_tau",
+            "schema": "string"
+          },
+          "@language": "en"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:humpf_phi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "humpf_chi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "humpf_psi",
+            "schema": "time"
+          },
+          "@language": "en"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_yuzz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "humpf_wum",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "humpf_um",
+            "schema": "unsignedByte"
+          },
+          "@foobar": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:humpf_fuddle;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "humpf_glikk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "humpf_nuh",
+            "schema": "unsignedInteger"
+          },
+          "@foobar": true
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyContextConformsV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyContextConformsV4.json
new file mode 100644
index 00000000..42bac779
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyContextConformsV4.json
@@ -0,0 +1,482 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "epsilon_epsilon",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "epsilon_delta",
+              "schema": "float"
+            },
+            "mapKey": {
+              "name": "epsilon_gamma",
+              "schema": "string",
+              "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "epsilon_iota",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "epsilon_theta",
+              "schema": "integer"
+            },
+            "mapKey": {
+              "name": "epsilon_eta",
+              "schema": "string",
+              "@context": []
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "epsilon_nu",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "epsilon_mu",
+              "schema": "long"
+            },
+            "mapKey": {
+              "name": "epsilon_lambda",
+              "schema": "string",
+              "@context": [
+                "dtmi:dtdl:extension:quantitativeTypes;1"
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "epsilon_rho",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "epsilon_pi",
+              "schema": "short"
+            },
+            "mapKey": {
+              "name": "epsilon_omicron",
+              "schema": "string",
+              "@context": null
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "epsilon_phi",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "epsilon_upsilon",
+              "schema": "string"
+            },
+            "mapKey": {
+              "name": "epsilon_tau",
+              "schema": "string",
+              "@context": 626
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "epsilon_yuzz",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "epsilon_omega",
+              "schema": "time"
+            },
+            "mapKey": {
+              "name": "epsilon_psi",
+              "schema": "string",
+              "@context": true
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "epsilon_fuddle",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "epsilon_humpf",
+              "schema": "unsignedByte"
+            },
+            "mapKey": {
+              "name": "epsilon_um",
+              "schema": "string",
+              "@context": [
+                null
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "epsilon_quan",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "epsilon_snee",
+              "schema": "unsignedInteger"
+            },
+            "mapKey": {
+              "name": "epsilon_nuh",
+              "schema": "string",
+              "@context": [
+                626
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "epsilon_zatz",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "epsilon_floob",
+              "schema": "unsignedLong"
+            },
+            "mapKey": {
+              "name": "epsilon_spazz",
+              "schema": "string",
+              "@context": [
+                true
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "epsilon_yekk",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "epsilon_itch",
+              "schema": "unsignedShort"
+            },
+            "mapKey": {
+              "name": "epsilon_flunn",
+              "schema": "string",
+              "@context": "dtmi:dtdl:extension:quantitativeTypes"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "zeta_beta",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "zeta_alpha",
+              "schema": "uuid"
+            },
+            "mapKey": {
+              "name": "epsilon_hi",
+              "schema": "string",
+              "@context": "http://dtdl/extension/quantitativeTypes/1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "zeta_zeta",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "zeta_epsilon",
+              "schema": "boolean"
+            },
+            "mapKey": {
+              "name": "zeta_delta",
+              "schema": "string",
+              "@context": "quantitativeTypes;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "zeta_kappa",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "zeta_iota",
+              "schema": "byte"
+            },
+            "mapKey": {
+              "name": "zeta_theta",
+              "schema": "string",
+              "@context": {}
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "zeta_xi",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "zeta_nu",
+              "schema": "bytes"
+            },
+            "mapKey": {
+              "name": "zeta_mu",
+              "schema": "string",
+              "@context": {
+                "foo": "dtmi:foo:bar;1"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "zeta_sigma",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "zeta_rho",
+              "schema": "date"
+            },
+            "mapKey": {
+              "name": "zeta_pi",
+              "schema": "string",
+              "@context": [
+                {}
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "zeta_chi",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "zeta_phi",
+              "schema": "dateTime"
+            },
+            "mapKey": {
+              "name": "zeta_upsilon",
+              "schema": "string",
+              "@context": [
+                {
+                  "foo": "dtmi:foo:bar;1"
+                }
+              ]
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyIdDuplicateV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyIdDuplicateV4.json
new file mode 100644
index 00000000..6bcc2241
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyIdDuplicateV4.json
@@ -0,0 +1,65 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:pi_wum;1",
+          "@type": "Property",
+          "name": "pi_fuddle",
+          "schema": {
+            "@id": "dtmi:example:pi_wum;1",
+            "@type": "Map",
+            "mapValue": {
+              "name": "pi_humpf",
+              "schema": "uuid"
+            },
+            "mapKey": {
+              "@id": "dtmi:example:pi_wum;1",
+              "name": "pi_um",
+              "schema": "string"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:pi_glikk;1",
+          "@type": "Property",
+          "name": "pi_quan",
+          "schema": {
+            "@id": "dtmi:example:pi_glikk;1",
+            "@type": "Map",
+            "mapValue": {
+              "name": "pi_snee",
+              "schema": "boolean"
+            },
+            "mapKey": {
+              "@context": "dtmi:undefinedExtension:context;1",
+              "@id": "dtmi:example:pi_glikk;1",
+              "name": "pi_nuh",
+              "schema": "string"
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyIdIsDtmiV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyIdIsDtmiV4.json
new file mode 100644
index 00000000..fe5700f1
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyIdIsDtmiV4.json
@@ -0,0 +1,1460 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_iota;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "kappa_kappa",
+            "schema": "double"
+          },
+          "mapKey": {
+            "@id": "dtmi:foo:bar;7",
+            "name": "kappa_theta",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_nu;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "kappa_xi",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "@id": "dtmi:foo:bar;108675309",
+            "name": "kappa_mu",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_rho;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "kappa_sigma",
+            "schema": "float"
+          },
+          "mapKey": {
+            "@id": "dtmi:foo:bar;999999999",
+            "name": "kappa_pi",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_phi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "kappa_chi",
+            "schema": "integer"
+          },
+          "mapKey": {
+            "@id": "dtmi:foo;1",
+            "name": "kappa_upsilon",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_yuzz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "kappa_wum",
+            "schema": "long"
+          },
+          "mapKey": {
+            "@id": "dtmi:foo:bar",
+            "name": "kappa_omega",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_fuddle;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "kappa_glikk",
+            "schema": "short"
+          },
+          "mapKey": {
+            "@id": "dtmi:foo:bar;3.14",
+            "name": "kappa_humpf",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_quan;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "kappa_thnad",
+            "schema": "string"
+          },
+          "mapKey": {
+            "@id": "dtmi:foo:bar;3.141592",
+            "name": "kappa_snee",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_zatz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "kappa_jogg",
+            "schema": "time"
+          },
+          "mapKey": {
+            "@id": null,
+            "name": "kappa_floob",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_yekk;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "kappa_vroo",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": null,
+            "name": "kappa_itch",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_beta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "lambda_gamma",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "@id": 626,
+            "name": "lambda_alpha",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_zeta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "lambda_eta",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": 626,
+            "name": "lambda_epsilon",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_kappa;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "lambda_lambda",
+            "schema": "unsignedShort"
+          },
+          "mapKey": {
+            "@id": true,
+            "name": "lambda_iota",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_xi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "lambda_omicron",
+            "schema": "uuid"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": true,
+            "name": "lambda_nu",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_sigma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "lambda_tau",
+            "schema": "boolean"
+          },
+          "mapKey": {
+            "@id": {
+              "@value": "dtmi:apparently:valid:identifier;3"
+            },
+            "name": "lambda_rho",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_chi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "lambda_psi",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": {
+              "@value": "dtmi:apparently:valid:identifier;3"
+            },
+            "name": "lambda_phi",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_wum;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "lambda_um",
+            "schema": "bytes"
+          },
+          "mapKey": {
+            "@id": "dtmi:foo:bar;0",
+            "name": "lambda_yuzz",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_glikk;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "lambda_nuh",
+            "schema": "date"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;0",
+            "name": "lambda_fuddle",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_thnad;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "lambda_spazz",
+            "schema": "dateTime"
+          },
+          "mapKey": {
+            "@id": "dtmi:foo:bar;0.0",
+            "name": "lambda_quan",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_jogg;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "lambda_flunn",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;0.0",
+            "name": "lambda_zatz",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_vroo;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "lambda_hi",
+            "schema": "double"
+          },
+          "mapKey": {
+            "@id": "dtmi:foo:bar;1234567890",
+            "name": "lambda_yekk",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_gamma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "mu_delta",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;1234567890",
+            "name": "mu_beta",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_eta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "mu_theta",
+            "schema": "float"
+          },
+          "mapKey": {
+            "@id": "dtmi:foo:bar;1a",
+            "name": "mu_zeta",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_lambda;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "mu_mu",
+            "schema": "integer"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;1a",
+            "name": "mu_kappa",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_omicron;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "mu_pi",
+            "schema": "long"
+          },
+          "mapKey": {
+            "@id": "dtmi:foo:bar;3.0",
+            "name": "mu_xi",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_tau;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "mu_upsilon",
+            "schema": "short"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;3.0",
+            "name": "mu_sigma",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_psi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "mu_omega",
+            "schema": "string"
+          },
+          "mapKey": {
+            "@id": "dtmi:foo:bar;3.1415926",
+            "name": "mu_chi",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_um;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "mu_humpf",
+            "schema": "time"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;3.1415926",
+            "name": "mu_wum",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_nuh;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "mu_snee",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "@id": "dtmi:foo:bar;6.02",
+            "name": "mu_glikk",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_spazz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "mu_floob",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;6.02",
+            "name": "mu_thnad",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_flunn;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "mu_itch",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "@id": "dtmi:foo:bar;0.1",
+            "name": "mu_jogg",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_hi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nu_alpha",
+            "schema": "unsignedShort"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;0.1",
+            "name": "mu_vroo",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_delta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nu_epsilon",
+            "schema": "uuid"
+          },
+          "mapKey": {
+            "@id": "dtmi:foo:bar;01",
+            "name": "nu_gamma",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_theta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nu_iota",
+            "schema": "boolean"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;01",
+            "name": "nu_eta",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_mu;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nu_nu",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "@id": "dtmi:foo:bar;",
+            "name": "nu_lambda",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_pi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nu_rho",
+            "schema": "bytes"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;",
+            "name": "nu_omicron",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_upsilon;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nu_phi",
+            "schema": "date"
+          },
+          "mapKey": {
+            "@id": "dtmi:test:invalidId_;1",
+            "name": "nu_tau",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_omega;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nu_yuzz",
+            "schema": "dateTime"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:test:invalidId_;1",
+            "name": "nu_psi",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_humpf;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nu_fuddle",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "@id": "dtmi:test:_invalidUserId;1",
+            "name": "nu_um",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_snee;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nu_quan",
+            "schema": "double"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:test:_invalidUserId;1",
+            "name": "nu_nuh",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_floob;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nu_zatz",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "@id": "dtmi:test:1seg;1",
+            "name": "nu_spazz",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_itch;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nu_yekk",
+            "schema": "float"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:test:1seg;1",
+            "name": "nu_flunn",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_alpha;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "xi_beta",
+            "schema": "integer"
+          },
+          "mapKey": {
+            "@id": "dtmi:foo:bar.baz;1",
+            "name": "nu_hi",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_epsilon;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "xi_zeta",
+            "schema": "long"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar.baz;1",
+            "name": "xi_delta",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_iota;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "xi_kappa",
+            "schema": "short"
+          },
+          "mapKey": {
+            "@id": "dtmi:foo::bar;1",
+            "name": "xi_theta",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_nu;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "xi_xi",
+            "schema": "string"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo::bar;1",
+            "name": "xi_mu",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_rho;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "xi_sigma",
+            "schema": "time"
+          },
+          "mapKey": {
+            "@id": "urn:foo:bar:1",
+            "name": "xi_pi",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_phi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "xi_chi",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "urn:foo:bar:1",
+            "name": "xi_upsilon",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_yuzz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "xi_wum",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "@id": "http://foo/bar/baz",
+            "name": "xi_omega",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_fuddle;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "xi_glikk",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "http://foo/bar/baz",
+            "name": "xi_humpf",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_quan;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "xi_thnad",
+            "schema": "unsignedShort"
+          },
+          "mapKey": {
+            "@id": "dtmi:;1",
+            "name": "xi_snee",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_zatz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "xi_jogg",
+            "schema": "uuid"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:;1",
+            "name": "xi_floob",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_yekk;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "xi_vroo",
+            "schema": "boolean"
+          },
+          "mapKey": {
+            "@id": "dtmi:dtdl:example;1",
+            "name": "xi_itch",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_beta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "omicron_gamma",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:dtdl:example;1",
+            "name": "omicron_alpha",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_zeta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "omicron_eta",
+            "schema": "bytes"
+          },
+          "mapKey": {
+            "@id": "dtmi:standard:example;1",
+            "name": "omicron_epsilon",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_kappa;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "omicron_lambda",
+            "schema": "date"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:standard:example;1",
+            "name": "omicron_iota",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyIdNotArrayV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyIdNotArrayV4.json
new file mode 100644
index 00000000..7debea5f
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyIdNotArrayV4.json
@@ -0,0 +1,401 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_xi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "omicron_omicron",
+            "schema": "dateTime"
+          },
+          "mapKey": {
+            "@id": [
+              "dtmi:foo:bar;7"
+            ],
+            "name": "omicron_nu",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_sigma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "omicron_tau",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;7"
+            ],
+            "name": "omicron_rho",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_chi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "omicron_psi",
+            "schema": "double"
+          },
+          "mapKey": {
+            "@id": [
+              "dtmi:foo:bar;108675309"
+            ],
+            "name": "omicron_phi",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_wum;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "omicron_um",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;108675309"
+            ],
+            "name": "omicron_yuzz",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_glikk;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "omicron_nuh",
+            "schema": "float"
+          },
+          "mapKey": {
+            "@id": [
+              "dtmi:foo:bar;999999999"
+            ],
+            "name": "omicron_fuddle",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_thnad;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "omicron_spazz",
+            "schema": "integer"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;999999999"
+            ],
+            "name": "omicron_quan",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_jogg;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "omicron_flunn",
+            "schema": "long"
+          },
+          "mapKey": {
+            "@id": [
+              "dtmi:foo;1"
+            ],
+            "name": "omicron_zatz",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_vroo;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "omicron_hi",
+            "schema": "short"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo;1"
+            ],
+            "name": "omicron_yekk",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_gamma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "pi_delta",
+            "schema": "string"
+          },
+          "mapKey": {
+            "@id": [
+              "dtmi:foo:bar"
+            ],
+            "name": "pi_beta",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_eta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "pi_theta",
+            "schema": "time"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar"
+            ],
+            "name": "pi_zeta",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_lambda;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "pi_mu",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "@id": [
+              "dtmi:foo:bar;3.14"
+            ],
+            "name": "pi_kappa",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_omicron;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "pi_pi",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;3.14"
+            ],
+            "name": "pi_xi",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_tau;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "pi_upsilon",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "@id": [
+              "dtmi:foo:bar;3.141592"
+            ],
+            "name": "pi_sigma",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_psi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "pi_omega",
+            "schema": "unsignedShort"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;3.141592"
+            ],
+            "name": "pi_chi",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyInvalidKeywordsV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyInvalidKeywordsV4.json
new file mode 100644
index 00000000..a6c0f7f2
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyInvalidKeywordsV4.json
@@ -0,0 +1,214 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_yekk;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "yuzz_vroo",
+            "schema": "uuid"
+          },
+          "mapKey": {
+            "name": "yuzz_itch",
+            "schema": "string",
+            "@graph": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_beta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "wum_gamma",
+            "schema": "boolean"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "wum_alpha",
+            "schema": "string",
+            "@graph": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_zeta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "wum_eta",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "name": "wum_epsilon",
+            "schema": "string",
+            "@value": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_kappa;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "wum_lambda",
+            "schema": "bytes"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "wum_iota",
+            "schema": "string",
+            "@value": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_xi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "wum_omicron",
+            "schema": "date"
+          },
+          "mapKey": {
+            "name": "wum_nu",
+            "schema": "string",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_sigma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "wum_tau",
+            "schema": "dateTime"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "wum_rho",
+            "schema": "string",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_chi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "wum_psi",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "name": "wum_phi",
+            "schema": "string",
+            "@foobar": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_wum;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "wum_um",
+            "schema": "double"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "wum_yuzz",
+            "schema": "string",
+            "@foobar": true
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyPropertyCommentStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyCommentStringLengthV4.json
new file mode 100644
index 00000000..96d42495
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyCommentStringLengthV4.json
@@ -0,0 +1,81 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_quan;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "sigma_thnad",
+            "schema": "date"
+          },
+          "mapKey": {
+            "name": "sigma_snee",
+            "schema": "string",
+            "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_zatz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "sigma_jogg",
+            "schema": "dateTime"
+          },
+          "mapKey": {
+            "name": "sigma_floob",
+            "schema": "string",
+            "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_yekk;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "sigma_vroo",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "sigma_itch",
+            "schema": "string",
+            "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyPropertyCommentStringV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyCommentStringV4.json
new file mode 100644
index 00000000..d597c607
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyCommentStringV4.json
@@ -0,0 +1,582 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_spazz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "pi_floob",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "name": "pi_thnad",
+            "schema": "string",
+            "comment": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_flunn;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "pi_itch",
+            "schema": "bytes"
+          },
+          "mapKey": {
+            "name": "pi_jogg",
+            "schema": "string",
+            "comment": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_hi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "rho_alpha",
+            "schema": "date"
+          },
+          "mapKey": {
+            "name": "pi_vroo",
+            "schema": "string",
+            "comment": {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_delta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "rho_epsilon",
+            "schema": "dateTime"
+          },
+          "mapKey": {
+            "name": "rho_gamma",
+            "schema": "string",
+            "comment": [
+              {
+                "@value": "hello",
+                "@type": "xsd:string"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_theta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "rho_iota",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "name": "rho_eta",
+            "schema": "string",
+            "comment": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_mu;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "rho_nu",
+            "schema": "double"
+          },
+          "mapKey": {
+            "name": "rho_lambda",
+            "schema": "string",
+            "comment": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_pi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "rho_rho",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_omicron",
+            "schema": "string",
+            "comment": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_upsilon;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "rho_phi",
+            "schema": "float"
+          },
+          "mapKey": {
+            "name": "rho_tau",
+            "schema": "string",
+            "comment": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_omega;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "rho_yuzz",
+            "schema": "integer"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_psi",
+            "schema": "string",
+            "comment": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_humpf;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "rho_fuddle",
+            "schema": "long"
+          },
+          "mapKey": {
+            "name": "rho_um",
+            "schema": "string",
+            "comment": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_snee;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "rho_quan",
+            "schema": "short"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_nuh",
+            "schema": "string",
+            "comment": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_floob;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "rho_zatz",
+            "schema": "string"
+          },
+          "mapKey": {
+            "name": "rho_spazz",
+            "schema": "string",
+            "comment": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_itch;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "rho_yekk",
+            "schema": "time"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_flunn",
+            "schema": "string",
+            "comment": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_alpha;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "sigma_beta",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "name": "rho_hi",
+            "schema": "string",
+            "comment": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_epsilon;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "sigma_zeta",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "sigma_delta",
+            "schema": "string",
+            "comment": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_iota;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "sigma_kappa",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "name": "sigma_theta",
+            "schema": "string",
+            "comment": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_nu;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "sigma_xi",
+            "schema": "unsignedShort"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "sigma_mu",
+            "schema": "string",
+            "comment": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_rho;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "sigma_sigma",
+            "schema": "uuid"
+          },
+          "mapKey": {
+            "name": "sigma_pi",
+            "schema": "string",
+            "comment": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_phi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "sigma_chi",
+            "schema": "boolean"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "sigma_upsilon",
+            "schema": "string",
+            "comment": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_yuzz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "sigma_wum",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "name": "sigma_omega",
+            "schema": "string",
+            "comment": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_fuddle;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "sigma_glikk",
+            "schema": "bytes"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "sigma_humpf",
+            "schema": "string",
+            "comment": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyPropertyCommentTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyCommentTermAndDtmiV4.json
new file mode 100644
index 00000000..0d4af203
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyCommentTermAndDtmiV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_tau;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "tau_upsilon",
+            "schema": "integer"
+          },
+          "mapKey": {
+            "comment": "tau_pi",
+            "dtmi:dtdl:property:comment;4": "tau_rho",
+            "name": "tau_sigma",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_yuzz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "tau_wum",
+            "schema": "long"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "comment": "tau_chi",
+            "dtmi:dtdl:property:comment;4": "tau_psi",
+            "name": "tau_omega",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyPropertyDescriptionLangStringV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyDescriptionLangStringV4.json
new file mode 100644
index 00000000..812f4e49
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyDescriptionLangStringV4.json
@@ -0,0 +1,674 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_fuddle;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "tau_glikk",
+            "schema": "short"
+          },
+          "mapKey": {
+            "name": "tau_humpf",
+            "schema": "string",
+            "description": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_quan;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "tau_thnad",
+            "schema": "string"
+          },
+          "mapKey": {
+            "name": "tau_snee",
+            "schema": "string",
+            "description": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_zatz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "tau_jogg",
+            "schema": "time"
+          },
+          "mapKey": {
+            "name": "tau_floob",
+            "schema": "string",
+            "description": {
+              "en": "hello"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_yekk;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "tau_vroo",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "name": "tau_itch",
+            "schema": "string",
+            "description": [
+              {
+                "@value": "hello",
+                "@language": "en"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_beta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "upsilon_gamma",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "name": "upsilon_alpha",
+            "schema": "string",
+            "description": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_zeta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "upsilon_eta",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "name": "upsilon_epsilon",
+            "schema": "string",
+            "description": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_kappa;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "upsilon_lambda",
+            "schema": "unsignedShort"
+          },
+          "mapKey": {
+            "name": "upsilon_iota",
+            "schema": "string",
+            "description": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_xi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "upsilon_omicron",
+            "schema": "uuid"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "upsilon_nu",
+            "schema": "string",
+            "description": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_sigma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "upsilon_tau",
+            "schema": "boolean"
+          },
+          "mapKey": {
+            "name": "upsilon_rho",
+            "schema": "string",
+            "description": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_chi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "upsilon_psi",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "upsilon_phi",
+            "schema": "string",
+            "description": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_wum;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "upsilon_um",
+            "schema": "bytes"
+          },
+          "mapKey": {
+            "name": "upsilon_yuzz",
+            "schema": "string",
+            "description": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_glikk;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "upsilon_nuh",
+            "schema": "date"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "upsilon_fuddle",
+            "schema": "string",
+            "description": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_thnad;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "upsilon_spazz",
+            "schema": "dateTime"
+          },
+          "mapKey": {
+            "name": "upsilon_quan",
+            "schema": "string",
+            "description": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_jogg;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "upsilon_flunn",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "upsilon_zatz",
+            "schema": "string",
+            "description": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_vroo;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "upsilon_hi",
+            "schema": "double"
+          },
+          "mapKey": {
+            "name": "upsilon_yekk",
+            "schema": "string",
+            "description": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_gamma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "phi_delta",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "phi_beta",
+            "schema": "string",
+            "description": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_eta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "phi_theta",
+            "schema": "float"
+          },
+          "mapKey": {
+            "name": "phi_zeta",
+            "schema": "string",
+            "description": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_lambda;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "phi_mu",
+            "schema": "integer"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "phi_kappa",
+            "schema": "string",
+            "description": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_omicron;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "phi_pi",
+            "schema": "long"
+          },
+          "mapKey": {
+            "name": "phi_xi",
+            "schema": "string",
+            "description": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_tau;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "phi_upsilon",
+            "schema": "short"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "phi_sigma",
+            "schema": "string",
+            "description": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_psi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "phi_omega",
+            "schema": "string"
+          },
+          "mapKey": {
+            "name": "phi_chi",
+            "schema": "string",
+            "description": {
+              "@value": "hello",
+              "@language": "en"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_um;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "phi_humpf",
+            "schema": "time"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "phi_wum",
+            "schema": "string",
+            "description": {
+              "@value": "hello",
+              "@language": "en"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_nuh;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "phi_snee",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "name": "phi_glikk",
+            "schema": "string",
+            "description": [
+              {
+                "en": "hello"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_spazz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "phi_floob",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "phi_thnad",
+            "schema": "string",
+            "description": [
+              {
+                "en": "hello"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyPropertyDescriptionStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyDescriptionStringLengthV4.json
new file mode 100644
index 00000000..d6ea73c2
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyDescriptionStringLengthV4.json
@@ -0,0 +1,81 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_flunn;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "phi_itch",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "name": "phi_jogg",
+            "schema": "string",
+            "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_hi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "chi_alpha",
+            "schema": "unsignedShort"
+          },
+          "mapKey": {
+            "name": "phi_vroo",
+            "schema": "string",
+            "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_delta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "chi_epsilon",
+            "schema": "uuid"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "chi_gamma",
+            "schema": "string",
+            "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyPropertyDescriptionTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyDescriptionTermAndDtmiV4.json
new file mode 100644
index 00000000..a7bd82d9
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyDescriptionTermAndDtmiV4.json
@@ -0,0 +1,65 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_yuzz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "chi_wum",
+            "schema": "date"
+          },
+          "mapKey": {
+            "description": [
+              "chi_chi"
+            ],
+            "dtmi:dtdl:property:description;4": [
+              "chi_psi"
+            ],
+            "name": "chi_omega",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_nuh;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "chi_snee",
+            "schema": "dateTime"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "description": [
+              "chi_humpf"
+            ],
+            "dtmi:dtdl:property:description;4": [
+              "chi_fuddle"
+            ],
+            "name": "chi_glikk",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyPropertyDisplayNameLangStringV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyDisplayNameLangStringV4.json
new file mode 100644
index 00000000..0d36aae8
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyDisplayNameLangStringV4.json
@@ -0,0 +1,674 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_spazz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "chi_floob",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "name": "chi_thnad",
+            "schema": "string",
+            "displayName": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_flunn;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "chi_itch",
+            "schema": "double"
+          },
+          "mapKey": {
+            "name": "chi_jogg",
+            "schema": "string",
+            "displayName": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_hi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "psi_alpha",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "name": "chi_vroo",
+            "schema": "string",
+            "displayName": {
+              "en": "hello"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_delta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "psi_epsilon",
+            "schema": "float"
+          },
+          "mapKey": {
+            "name": "psi_gamma",
+            "schema": "string",
+            "displayName": [
+              {
+                "@value": "hello",
+                "@language": "en"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_theta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "psi_iota",
+            "schema": "integer"
+          },
+          "mapKey": {
+            "name": "psi_eta",
+            "schema": "string",
+            "displayName": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_mu;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "psi_nu",
+            "schema": "long"
+          },
+          "mapKey": {
+            "name": "psi_lambda",
+            "schema": "string",
+            "displayName": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_pi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "psi_rho",
+            "schema": "short"
+          },
+          "mapKey": {
+            "name": "psi_omicron",
+            "schema": "string",
+            "displayName": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_upsilon;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "psi_phi",
+            "schema": "string"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "psi_tau",
+            "schema": "string",
+            "displayName": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_omega;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "psi_yuzz",
+            "schema": "time"
+          },
+          "mapKey": {
+            "name": "psi_psi",
+            "schema": "string",
+            "displayName": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_humpf;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "psi_fuddle",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "psi_um",
+            "schema": "string",
+            "displayName": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_snee;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "psi_quan",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "name": "psi_nuh",
+            "schema": "string",
+            "displayName": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_floob;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "psi_zatz",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "psi_spazz",
+            "schema": "string",
+            "displayName": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_itch;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "psi_yekk",
+            "schema": "unsignedShort"
+          },
+          "mapKey": {
+            "name": "psi_flunn",
+            "schema": "string",
+            "displayName": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_alpha;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "omega_beta",
+            "schema": "uuid"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "psi_hi",
+            "schema": "string",
+            "displayName": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_epsilon;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "omega_zeta",
+            "schema": "boolean"
+          },
+          "mapKey": {
+            "name": "omega_delta",
+            "schema": "string",
+            "displayName": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_iota;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "omega_kappa",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "omega_theta",
+            "schema": "string",
+            "displayName": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_nu;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "omega_xi",
+            "schema": "bytes"
+          },
+          "mapKey": {
+            "name": "omega_mu",
+            "schema": "string",
+            "displayName": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_rho;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "omega_sigma",
+            "schema": "date"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "omega_pi",
+            "schema": "string",
+            "displayName": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_phi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "omega_chi",
+            "schema": "dateTime"
+          },
+          "mapKey": {
+            "name": "omega_upsilon",
+            "schema": "string",
+            "displayName": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_yuzz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "omega_wum",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "omega_omega",
+            "schema": "string",
+            "displayName": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_fuddle;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "omega_glikk",
+            "schema": "double"
+          },
+          "mapKey": {
+            "name": "omega_humpf",
+            "schema": "string",
+            "displayName": {
+              "@value": "hello",
+              "@language": "en"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_quan;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "omega_thnad",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "omega_snee",
+            "schema": "string",
+            "displayName": {
+              "@value": "hello",
+              "@language": "en"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_zatz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "omega_jogg",
+            "schema": "float"
+          },
+          "mapKey": {
+            "name": "omega_floob",
+            "schema": "string",
+            "displayName": [
+              {
+                "en": "hello"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_yekk;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "omega_vroo",
+            "schema": "integer"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "omega_itch",
+            "schema": "string",
+            "displayName": [
+              {
+                "en": "hello"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyPropertyDisplayNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyDisplayNameStringLengthV4.json
new file mode 100644
index 00000000..6034d6d9
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyDisplayNameStringLengthV4.json
@@ -0,0 +1,81 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_beta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "yuzz_gamma",
+            "schema": "long"
+          },
+          "mapKey": {
+            "name": "yuzz_alpha",
+            "schema": "string",
+            "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_zeta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "yuzz_eta",
+            "schema": "short"
+          },
+          "mapKey": {
+            "name": "yuzz_epsilon",
+            "schema": "string",
+            "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_kappa;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "yuzz_lambda",
+            "schema": "string"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "yuzz_iota",
+            "schema": "string",
+            "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyPropertyDisplayNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyDisplayNameTermAndDtmiV4.json
new file mode 100644
index 00000000..47c1c0e4
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyDisplayNameTermAndDtmiV4.json
@@ -0,0 +1,65 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_nuh;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "yuzz_snee",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "displayName": [
+              "yuzz_humpf"
+            ],
+            "dtmi:dtdl:property:displayName;4": [
+              "yuzz_fuddle"
+            ],
+            "name": "yuzz_glikk",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_zatz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "yuzz_jogg",
+            "schema": "unsignedShort"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "displayName": [
+              "yuzz_thnad"
+            ],
+            "dtmi:dtdl:property:displayName;4": [
+              "yuzz_spazz"
+            ],
+            "name": "yuzz_floob",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyPropertyFormallyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyFormallyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..c6dda79b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyFormallyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,108 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_gamma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "um_delta",
+            "schema": "short"
+          },
+          "mapKey": {
+            "name": "um_beta",
+            "schema": "string",
+            "dtmi:foo:bar;1": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_eta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "um_theta",
+            "schema": "string"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "um_zeta",
+            "schema": "string",
+            "dtmi:foo:bar;1": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_lambda;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "um_mu",
+            "schema": "time"
+          },
+          "mapKey": {
+            "name": "um_kappa",
+            "schema": "string",
+            "boolean": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_omicron;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "um_pi",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "um_xi",
+            "schema": "string",
+            "boolean": null
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyPropertyFormallyUndefinedTermV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyFormallyUndefinedTermV4.json
new file mode 100644
index 00000000..a0474ad2
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyFormallyUndefinedTermV4.json
@@ -0,0 +1,55 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_hi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "humpf_alpha",
+            "schema": "bytes"
+          },
+          "mapKey": {
+            "name": "um_vroo",
+            "schema": "string",
+            "foobar": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_delta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "humpf_epsilon",
+            "schema": "date"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "humpf_gamma",
+            "schema": "string",
+            "foobar": {}
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyPropertyInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyInvalidDtmiV4.json
new file mode 100644
index 00000000..652e75c3
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyInvalidDtmiV4.json
@@ -0,0 +1,63 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_tau;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "um_upsilon",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "@type": [
+              "MapKey",
+              "Foobar"
+            ],
+            "name": "um_sigma",
+            "schema": "string",
+            "dtmi:foo//bar": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_psi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "um_omega",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "MapKey",
+              "Foobar"
+            ],
+            "name": "um_chi",
+            "schema": "string",
+            "dtmi:foo//bar": 626
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyPropertyNamePatternV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyNamePatternV4.json
new file mode 100644
index 00000000..d4657b19
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyNamePatternV4.json
@@ -0,0 +1,637 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_xi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "snee_omicron",
+            "schema": "dateTime"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": "EARTH"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_rho;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "snee_sigma",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": "Air"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_upsilon;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "snee_phi",
+            "schema": "double"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": "fire"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_psi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "snee_omega",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": "hello_world"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_wum;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "snee_um",
+            "schema": "float"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": "Anarchy99"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_fuddle;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "snee_glikk",
+            "schema": "integer"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": "23skidoo"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_snee;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "snee_quan",
+            "schema": "long"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "string",
+            "name": "23skidoo"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_spazz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "snee_floob",
+            "schema": "short"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": "626"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_jogg;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "snee_flunn",
+            "schema": "string"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "string",
+            "name": "626"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_yekk;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "snee_vroo",
+            "schema": "time"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": "goodbye-world"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_alpha;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "quan_beta",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "string",
+            "name": "goodbye-world"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_delta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "quan_epsilon",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": "_haha"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_eta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "quan_theta",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "string",
+            "name": "_haha"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_kappa;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "quan_lambda",
+            "schema": "unsignedShort"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": "toodaloo_"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_nu;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "quan_xi",
+            "schema": "uuid"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "string",
+            "name": "toodaloo_"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_pi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "quan_rho",
+            "schema": "boolean"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": "pro:con"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_tau;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "quan_upsilon",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "string",
+            "name": "pro:con"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_chi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "quan_psi",
+            "schema": "bytes"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": "mish/mash"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_yuzz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "quan_wum",
+            "schema": "date"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "string",
+            "name": "mish/mash"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_humpf;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "quan_fuddle",
+            "schema": "dateTime"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": "#tag"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_nuh;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "quan_snee",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "string",
+            "name": "#tag"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_thnad;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "quan_spazz",
+            "schema": "double"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": "@tweet"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_zatz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "quan_jogg",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "string",
+            "name": "@tweet"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_itch;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "quan_yekk",
+            "schema": "float"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": "$money"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_hi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "thnad_alpha",
+            "schema": "integer"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "string",
+            "name": "$money"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyPropertyNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyNameStringLengthV4.json
new file mode 100644
index 00000000..12d35ae2
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyNameStringLengthV4.json
@@ -0,0 +1,78 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_epsilon;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "snee_zeta",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_theta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "snee_iota",
+            "schema": "bytes"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_lambda;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "snee_mu",
+            "schema": "date"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "string",
+            "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyPropertyNameStringV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyNameStringV4.json
new file mode 100644
index 00000000..71c7accd
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyNameStringV4.json
@@ -0,0 +1,587 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_yuzz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "glikk_wum",
+            "schema": "unsignedShort"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_humpf;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "glikk_fuddle",
+            "schema": "uuid"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_nuh;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "glikk_snee",
+            "schema": "boolean"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_thnad;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "glikk_spazz",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": [
+              {
+                "@value": "hello",
+                "@type": "xsd:string"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_zatz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "glikk_jogg",
+            "schema": "bytes"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_itch;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "glikk_yekk",
+            "schema": "date"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "string",
+            "name": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_hi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nuh_alpha",
+            "schema": "dateTime"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_gamma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nuh_delta",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "string",
+            "name": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_zeta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nuh_eta",
+            "schema": "double"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_iota;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nuh_kappa",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "string",
+            "name": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_mu;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nuh_nu",
+            "schema": "float"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_omicron;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nuh_pi",
+            "schema": "integer"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "string",
+            "name": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_sigma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nuh_tau",
+            "schema": "long"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_phi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nuh_chi",
+            "schema": "short"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "string",
+            "name": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_omega;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nuh_yuzz",
+            "schema": "string"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_um;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nuh_humpf",
+            "schema": "time"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "string",
+            "name": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_glikk;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nuh_nuh",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_quan;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nuh_thnad",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "string",
+            "name": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_floob;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nuh_zatz",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_flunn;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nuh_itch",
+            "schema": "unsignedShort"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "string",
+            "name": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_vroo;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "nuh_hi",
+            "schema": "uuid"
+          },
+          "mapKey": {
+            "schema": "string",
+            "name": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_beta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "snee_gamma",
+            "schema": "boolean"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "string",
+            "name": []
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyPropertyNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyNameTermAndDtmiV4.json
new file mode 100644
index 00000000..34b11f10
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyNameTermAndDtmiV4.json
@@ -0,0 +1,55 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_rho;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "thnad_sigma",
+            "schema": "time"
+          },
+          "mapKey": {
+            "name": "thnad_omicron",
+            "dtmi:dtdl:property:name;4": "thnad_pi",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_chi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "thnad_psi",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "thnad_upsilon",
+            "dtmi:dtdl:property:name;4": "thnad_phi",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyPropertyNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyNotDtmiNorTermV4.json
new file mode 100644
index 00000000..ace4f88f
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyPropertyNotDtmiNorTermV4.json
@@ -0,0 +1,63 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_um;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "um_humpf",
+            "schema": "unsignedShort"
+          },
+          "mapKey": {
+            "@type": [
+              "MapKey",
+              "Foobar"
+            ],
+            "name": "um_wum",
+            "schema": "string",
+            "http://foo.com/bar": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_nuh;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "um_snee",
+            "schema": "uuid"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "MapKey",
+              "Foobar"
+            ],
+            "name": "um_glikk",
+            "schema": "string",
+            "http://foo.com/bar": true
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyPropertySchemaSpecificValuesV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyPropertySchemaSpecificValuesV4.json
new file mode 100644
index 00000000..a14eb0e6
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyPropertySchemaSpecificValuesV4.json
@@ -0,0 +1,3392 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_wum;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "thnad_um",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "name": "thnad_yuzz",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_glikk;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "thnad_nuh",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "name": "thnad_fuddle",
+            "schema": [
+              "string"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_thnad;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "thnad_spazz",
+            "schema": "unsignedShort"
+          },
+          "mapKey": {
+            "name": "thnad_quan",
+            "schema": "dtmi:dtdl:instance:Schema:string;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_jogg;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "thnad_flunn",
+            "schema": "uuid"
+          },
+          "mapKey": {
+            "name": "thnad_zatz",
+            "schema": [
+              "dtmi:dtdl:instance:Schema:string;4"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_vroo;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "thnad_hi",
+            "schema": "boolean"
+          },
+          "mapKey": {
+            "name": "thnad_yekk",
+            "schema": [
+              "string",
+              "dtmi:dtdl:instance:Schema:string;4"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_gamma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "spazz_delta",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "spazz_beta",
+            "schema": [
+              "string",
+              "dtmi:dtdl:instance:Schema:string;4"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_eta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "spazz_theta",
+            "schema": "bytes"
+          },
+          "mapKey": {
+            "name": "spazz_zeta",
+            "schema": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_lambda;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "spazz_mu",
+            "schema": "date"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "spazz_kappa",
+            "schema": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_omicron;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "spazz_pi",
+            "schema": "dateTime"
+          },
+          "mapKey": {
+            "name": "spazz_xi",
+            "schema": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_tau;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "spazz_upsilon",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "spazz_sigma",
+            "schema": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_psi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "spazz_omega",
+            "schema": "double"
+          },
+          "mapKey": {
+            "name": "spazz_chi",
+            "schema": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_um;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "spazz_humpf",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "spazz_wum",
+            "schema": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_nuh;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "spazz_snee",
+            "schema": "float"
+          },
+          "mapKey": {
+            "name": "spazz_glikk",
+            "schema": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_spazz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "spazz_floob",
+            "schema": "integer"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "spazz_thnad",
+            "schema": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_flunn;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "spazz_itch",
+            "schema": "long"
+          },
+          "mapKey": {
+            "name": "spazz_jogg",
+            "schema": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_hi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "floob_alpha",
+            "schema": "short"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "spazz_vroo",
+            "schema": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_delta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "floob_epsilon",
+            "schema": "string"
+          },
+          "mapKey": {
+            "name": "floob_gamma",
+            "schema": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_theta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "floob_iota",
+            "schema": "time"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "floob_eta",
+            "schema": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_mu;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "floob_nu",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "name": "floob_lambda",
+            "schema": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_pi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "floob_rho",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "floob_omicron",
+            "schema": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_upsilon;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "floob_phi",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "name": "floob_tau",
+            "schema": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_omega;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "floob_yuzz",
+            "schema": "unsignedShort"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "floob_psi",
+            "schema": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_humpf;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "floob_fuddle",
+            "schema": "uuid"
+          },
+          "mapKey": {
+            "name": "floob_um",
+            "schema": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_snee;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "floob_quan",
+            "schema": "boolean"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "floob_nuh",
+            "schema": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_floob;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "floob_zatz",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "name": "floob_spazz",
+            "schema": "asynchronous"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_itch;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "floob_yekk",
+            "schema": "bytes"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "floob_flunn",
+            "schema": "asynchronous"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_alpha;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "zatz_beta",
+            "schema": "date"
+          },
+          "mapKey": {
+            "name": "floob_hi",
+            "schema": "dtmi:dtdl:instance:CommandType:asynchronous;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_epsilon;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "zatz_zeta",
+            "schema": "dateTime"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zatz_delta",
+            "schema": "dtmi:dtdl:instance:CommandType:asynchronous;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_iota;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "zatz_kappa",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "name": "zatz_theta",
+            "schema": "synchronous"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_nu;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "zatz_xi",
+            "schema": "double"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zatz_mu",
+            "schema": "synchronous"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_rho;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "zatz_sigma",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "name": "zatz_pi",
+            "schema": "dtmi:dtdl:instance:CommandType:synchronous;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_phi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "zatz_chi",
+            "schema": "float"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zatz_upsilon",
+            "schema": "dtmi:dtdl:instance:CommandType:synchronous;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_yuzz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "zatz_wum",
+            "schema": "integer"
+          },
+          "mapKey": {
+            "name": "zatz_omega",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_fuddle;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "zatz_glikk",
+            "schema": "long"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zatz_humpf",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_quan;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "zatz_thnad",
+            "schema": "short"
+          },
+          "mapKey": {
+            "name": "zatz_snee",
+            "schema": "dtmi:dtdl:instance:Schema:boolean;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_zatz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "zatz_jogg",
+            "schema": "string"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zatz_floob",
+            "schema": "dtmi:dtdl:instance:Schema:boolean;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_yekk;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "zatz_vroo",
+            "schema": "time"
+          },
+          "mapKey": {
+            "name": "zatz_itch",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_beta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "jogg_gamma",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "jogg_alpha",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_zeta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "jogg_eta",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "name": "jogg_epsilon",
+            "schema": "dtmi:dtdl:instance:Schema:byte;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_kappa;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "jogg_lambda",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "jogg_iota",
+            "schema": "dtmi:dtdl:instance:Schema:byte;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_xi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "jogg_omicron",
+            "schema": "unsignedShort"
+          },
+          "mapKey": {
+            "name": "jogg_nu",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_sigma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "jogg_tau",
+            "schema": "uuid"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "jogg_rho",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_chi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "jogg_psi",
+            "schema": "boolean"
+          },
+          "mapKey": {
+            "name": "jogg_phi",
+            "schema": "dtmi:dtdl:instance:Schema:bytes;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_wum;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "jogg_um",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "jogg_yuzz",
+            "schema": "dtmi:dtdl:instance:Schema:bytes;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_glikk;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "jogg_nuh",
+            "schema": "bytes"
+          },
+          "mapKey": {
+            "name": "jogg_fuddle",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_thnad;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "jogg_spazz",
+            "schema": "date"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "jogg_quan",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_jogg;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "jogg_flunn",
+            "schema": "dateTime"
+          },
+          "mapKey": {
+            "name": "jogg_zatz",
+            "schema": "dtmi:dtdl:instance:Schema:date;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_vroo;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "jogg_hi",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "jogg_yekk",
+            "schema": "dtmi:dtdl:instance:Schema:date;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_gamma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "flunn_delta",
+            "schema": "double"
+          },
+          "mapKey": {
+            "name": "flunn_beta",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_eta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "flunn_theta",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "flunn_zeta",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_lambda;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "flunn_mu",
+            "schema": "float"
+          },
+          "mapKey": {
+            "name": "flunn_kappa",
+            "schema": "dtmi:dtdl:instance:Schema:dateTime;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_omicron;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "flunn_pi",
+            "schema": "integer"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "flunn_xi",
+            "schema": "dtmi:dtdl:instance:Schema:dateTime;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_tau;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "flunn_upsilon",
+            "schema": "long"
+          },
+          "mapKey": {
+            "name": "flunn_sigma",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_psi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "flunn_omega",
+            "schema": "short"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "flunn_chi",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_um;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "flunn_humpf",
+            "schema": "string"
+          },
+          "mapKey": {
+            "name": "flunn_wum",
+            "schema": "dtmi:dtdl:instance:Schema:decimal;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_nuh;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "flunn_snee",
+            "schema": "time"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "flunn_glikk",
+            "schema": "dtmi:dtdl:instance:Schema:decimal;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_spazz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "flunn_floob",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "name": "flunn_thnad",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_flunn;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "flunn_itch",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "flunn_jogg",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_hi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "itch_alpha",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "name": "flunn_vroo",
+            "schema": "dtmi:dtdl:instance:Schema:double;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_delta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "itch_epsilon",
+            "schema": "unsignedShort"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "itch_gamma",
+            "schema": "dtmi:dtdl:instance:Schema:double;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_theta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "itch_iota",
+            "schema": "uuid"
+          },
+          "mapKey": {
+            "name": "itch_eta",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_mu;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "itch_nu",
+            "schema": "boolean"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "itch_lambda",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_pi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "itch_rho",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "name": "itch_omicron",
+            "schema": "dtmi:dtdl:instance:Schema:duration;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_upsilon;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "itch_phi",
+            "schema": "bytes"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "itch_tau",
+            "schema": "dtmi:dtdl:instance:Schema:duration;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_omega;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "itch_yuzz",
+            "schema": "date"
+          },
+          "mapKey": {
+            "name": "itch_psi",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_humpf;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "itch_fuddle",
+            "schema": "dateTime"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "itch_um",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_snee;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "itch_quan",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "name": "itch_nuh",
+            "schema": "dtmi:dtdl:instance:Schema:float;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_floob;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "itch_zatz",
+            "schema": "double"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "itch_spazz",
+            "schema": "dtmi:dtdl:instance:Schema:float;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_itch;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "itch_yekk",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "name": "itch_flunn",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_alpha;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "yekk_beta",
+            "schema": "float"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "itch_hi",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_epsilon;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "yekk_zeta",
+            "schema": "integer"
+          },
+          "mapKey": {
+            "name": "yekk_delta",
+            "schema": "dtmi:dtdl:instance:Schema:integer;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_iota;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "yekk_kappa",
+            "schema": "long"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "yekk_theta",
+            "schema": "dtmi:dtdl:instance:Schema:integer;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_nu;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "yekk_xi",
+            "schema": "short"
+          },
+          "mapKey": {
+            "name": "yekk_mu",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_rho;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "yekk_sigma",
+            "schema": "string"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "yekk_pi",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_phi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "yekk_chi",
+            "schema": "time"
+          },
+          "mapKey": {
+            "name": "yekk_upsilon",
+            "schema": "dtmi:dtdl:instance:Schema:long;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_yuzz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "yekk_wum",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "yekk_omega",
+            "schema": "dtmi:dtdl:instance:Schema:long;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_fuddle;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "yekk_glikk",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "name": "yekk_humpf",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_quan;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "yekk_thnad",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "yekk_snee",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_zatz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "yekk_jogg",
+            "schema": "unsignedShort"
+          },
+          "mapKey": {
+            "name": "yekk_floob",
+            "schema": "dtmi:dtdl:instance:Schema:short;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_yekk;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "yekk_vroo",
+            "schema": "uuid"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "yekk_itch",
+            "schema": "dtmi:dtdl:instance:Schema:short;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_beta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "vroo_gamma",
+            "schema": "boolean"
+          },
+          "mapKey": {
+            "name": "vroo_alpha",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_zeta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "vroo_eta",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "vroo_epsilon",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_kappa;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "vroo_lambda",
+            "schema": "bytes"
+          },
+          "mapKey": {
+            "name": "vroo_iota",
+            "schema": "dtmi:dtdl:instance:Schema:time;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_xi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "vroo_omicron",
+            "schema": "date"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "vroo_nu",
+            "schema": "dtmi:dtdl:instance:Schema:time;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_sigma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "vroo_tau",
+            "schema": "dateTime"
+          },
+          "mapKey": {
+            "name": "vroo_rho",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_chi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "vroo_psi",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "vroo_phi",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_wum;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "vroo_um",
+            "schema": "double"
+          },
+          "mapKey": {
+            "name": "vroo_yuzz",
+            "schema": "dtmi:dtdl:instance:Schema:unsignedByte;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_glikk;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "vroo_nuh",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "vroo_fuddle",
+            "schema": "dtmi:dtdl:instance:Schema:unsignedByte;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_thnad;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "vroo_spazz",
+            "schema": "float"
+          },
+          "mapKey": {
+            "name": "vroo_quan",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_jogg;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "vroo_flunn",
+            "schema": "integer"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "vroo_zatz",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_vroo;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "vroo_hi",
+            "schema": "long"
+          },
+          "mapKey": {
+            "name": "vroo_yekk",
+            "schema": "dtmi:dtdl:instance:Schema:unsignedInteger;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_gamma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "hi_delta",
+            "schema": "short"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "hi_beta",
+            "schema": "dtmi:dtdl:instance:Schema:unsignedInteger;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_eta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "hi_theta",
+            "schema": "string"
+          },
+          "mapKey": {
+            "name": "hi_zeta",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_lambda;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "hi_mu",
+            "schema": "time"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "hi_kappa",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_omicron;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "hi_pi",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "name": "hi_xi",
+            "schema": "dtmi:dtdl:instance:Schema:unsignedLong;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_tau;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "hi_upsilon",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "hi_sigma",
+            "schema": "dtmi:dtdl:instance:Schema:unsignedLong;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_psi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "hi_omega",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "name": "hi_chi",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_um;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "hi_humpf",
+            "schema": "unsignedShort"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "hi_wum",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_nuh;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "hi_snee",
+            "schema": "uuid"
+          },
+          "mapKey": {
+            "name": "hi_glikk",
+            "schema": "dtmi:dtdl:instance:Schema:unsignedShort;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_spazz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "hi_floob",
+            "schema": "boolean"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "hi_thnad",
+            "schema": "dtmi:dtdl:instance:Schema:unsignedShort;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_flunn;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "hi_itch",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "name": "hi_jogg",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_hi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "alpha_alpha",
+            "schema": "bytes"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "hi_vroo",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_delta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "alpha_epsilon",
+            "schema": "date"
+          },
+          "mapKey": {
+            "name": "alpha_gamma",
+            "schema": "dtmi:dtdl:instance:Schema:uuid;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_theta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "alpha_iota",
+            "schema": "dateTime"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "alpha_eta",
+            "schema": "dtmi:dtdl:instance:Schema:uuid;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_mu;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "alpha_nu",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "name": "alpha_lambda",
+            "schema": "lineString"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_pi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "alpha_rho",
+            "schema": "double"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "alpha_omicron",
+            "schema": "lineString"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_upsilon;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "alpha_phi",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "name": "alpha_tau",
+            "schema": "dtmi:standard:schema:geospatial:lineString;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_omega;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "alpha_yuzz",
+            "schema": "float"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "alpha_psi",
+            "schema": "dtmi:standard:schema:geospatial:lineString;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_humpf;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "alpha_fuddle",
+            "schema": "integer"
+          },
+          "mapKey": {
+            "name": "alpha_um",
+            "schema": "multiLineString"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_snee;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "alpha_quan",
+            "schema": "long"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "alpha_nuh",
+            "schema": "multiLineString"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_floob;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "alpha_zatz",
+            "schema": "short"
+          },
+          "mapKey": {
+            "name": "alpha_spazz",
+            "schema": "dtmi:standard:schema:geospatial:multiLineString;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_itch;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "alpha_yekk",
+            "schema": "string"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "alpha_flunn",
+            "schema": "dtmi:standard:schema:geospatial:multiLineString;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_alpha;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "beta_beta",
+            "schema": "time"
+          },
+          "mapKey": {
+            "name": "alpha_hi",
+            "schema": "multiPoint"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_epsilon;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "beta_zeta",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "beta_delta",
+            "schema": "multiPoint"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_iota;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "beta_kappa",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "name": "beta_theta",
+            "schema": "dtmi:standard:schema:geospatial:multiPoint;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_nu;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "beta_xi",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "beta_mu",
+            "schema": "dtmi:standard:schema:geospatial:multiPoint;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_rho;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "beta_sigma",
+            "schema": "unsignedShort"
+          },
+          "mapKey": {
+            "name": "beta_pi",
+            "schema": "multiPolygon"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_phi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "beta_chi",
+            "schema": "uuid"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "beta_upsilon",
+            "schema": "multiPolygon"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_yuzz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "beta_wum",
+            "schema": "boolean"
+          },
+          "mapKey": {
+            "name": "beta_omega",
+            "schema": "dtmi:standard:schema:geospatial:multiPolygon;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_fuddle;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "beta_glikk",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "beta_humpf",
+            "schema": "dtmi:standard:schema:geospatial:multiPolygon;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_quan;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "beta_thnad",
+            "schema": "bytes"
+          },
+          "mapKey": {
+            "name": "beta_snee",
+            "schema": "point"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_zatz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "beta_jogg",
+            "schema": "date"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "beta_floob",
+            "schema": "point"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_yekk;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "beta_vroo",
+            "schema": "dateTime"
+          },
+          "mapKey": {
+            "name": "beta_itch",
+            "schema": "dtmi:standard:schema:geospatial:point;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_beta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "gamma_gamma",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "gamma_alpha",
+            "schema": "dtmi:standard:schema:geospatial:point;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_zeta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "gamma_eta",
+            "schema": "double"
+          },
+          "mapKey": {
+            "name": "gamma_epsilon",
+            "schema": "polygon"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_kappa;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "gamma_lambda",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "gamma_iota",
+            "schema": "polygon"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_xi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "gamma_omicron",
+            "schema": "float"
+          },
+          "mapKey": {
+            "name": "gamma_nu",
+            "schema": "dtmi:standard:schema:geospatial:polygon;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_sigma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "gamma_tau",
+            "schema": "integer"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "gamma_rho",
+            "schema": "dtmi:standard:schema:geospatial:polygon;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_chi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "gamma_psi",
+            "schema": "long"
+          },
+          "mapKey": {
+            "name": "gamma_phi",
+            "schema": "scaledDecimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_wum;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "gamma_um",
+            "schema": "short"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "gamma_yuzz",
+            "schema": "scaledDecimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_glikk;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "gamma_nuh",
+            "schema": "string"
+          },
+          "mapKey": {
+            "name": "gamma_fuddle",
+            "schema": "dtmi:standard:schema:scaledDecimal;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_thnad;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "gamma_spazz",
+            "schema": "time"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "gamma_quan",
+            "schema": "dtmi:standard:schema:scaledDecimal;4"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyPropertySchemaTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyPropertySchemaTermAndDtmiV4.json
new file mode 100644
index 00000000..cf276202
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyPropertySchemaTermAndDtmiV4.json
@@ -0,0 +1,55 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_omicron;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "delta_pi",
+            "schema": "boolean"
+          },
+          "mapKey": {
+            "name": "delta_xi",
+            "schema": "string",
+            "dtmi:dtdl:property:schema;4": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_tau;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "delta_upsilon",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "delta_sigma",
+            "schema": "string",
+            "dtmi:dtdl:property:schema;4": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyRequiredPropertiesV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyRequiredPropertiesV4.json
new file mode 100644
index 00000000..81d92029
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyRequiredPropertiesV4.json
@@ -0,0 +1,100 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_lambda;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "glikk_mu",
+            "schema": "time"
+          },
+          "mapKey": {
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_xi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "glikk_omicron",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_sigma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "glikk_tau",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "name": "glikk_rho"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_chi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "glikk_psi",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "glikk_phi"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyTypeIncludesInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyTypeIncludesInvalidDtmiV4.json
new file mode 100644
index 00000000..52b5759c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyTypeIncludesInvalidDtmiV4.json
@@ -0,0 +1,61 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_humpf;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "iota_fuddle",
+            "schema": "boolean"
+          },
+          "mapKey": {
+            "@type": [
+              "MapKey",
+              "dtmi:foo//bar"
+            ],
+            "name": "iota_um",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_snee;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "iota_quan",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "MapKey",
+              "dtmi:foo//bar"
+            ],
+            "name": "iota_nuh",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyTypeIncludesMaterialV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyTypeIncludesMaterialV4.json
new file mode 100644
index 00000000..c09255c2
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyTypeIncludesMaterialV4.json
@@ -0,0 +1,220 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_gamma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "theta_delta",
+            "schema": "bytes"
+          },
+          "mapKey": {
+            "name": "theta_beta",
+            "schema": "string",
+            "@type": "MapKey"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_eta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "theta_theta",
+            "schema": "date"
+          },
+          "mapKey": {
+            "name": "theta_zeta",
+            "schema": "string",
+            "@type": [
+              "MapKey"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_lambda;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "theta_mu",
+            "schema": "dateTime"
+          },
+          "mapKey": {
+            "name": "theta_kappa",
+            "schema": "string",
+            "@type": "dtmi:dtdl:class:MapKey;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_omicron;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "theta_pi",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "name": "theta_xi",
+            "schema": "string",
+            "@type": [
+              "dtmi:dtdl:class:MapKey;4"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_tau;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "theta_upsilon",
+            "schema": "double"
+          },
+          "mapKey": {
+            "name": "theta_sigma",
+            "schema": "string",
+            "@type": "Something"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_psi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "theta_omega",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "theta_chi",
+            "schema": "string",
+            "@type": "Something"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_um;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "theta_humpf",
+            "schema": "float"
+          },
+          "mapKey": {
+            "name": "theta_wum",
+            "schema": "string",
+            "@type": [
+              "Something"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_nuh;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "theta_snee",
+            "schema": "integer"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "theta_glikk",
+            "schema": "string",
+            "@type": [
+              "Something"
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyTypeIncludesNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyTypeIncludesNotDtmiNorTermV4.json
new file mode 100644
index 00000000..735ae841
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyTypeIncludesNotDtmiNorTermV4.json
@@ -0,0 +1,61 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_floob;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "iota_zatz",
+            "schema": "bytes"
+          },
+          "mapKey": {
+            "@type": [
+              "MapKey",
+              "http://foo.com/bar"
+            ],
+            "name": "iota_spazz",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_itch;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "iota_yekk",
+            "schema": "date"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "MapKey",
+              "http://foo.com/bar"
+            ],
+            "name": "iota_flunn",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapKeyTypeStringOrArrayV4.json b/DTDL/v4/spec/Requirement-ClassMapKeyTypeStringOrArrayV4.json
new file mode 100644
index 00000000..714c4e5a
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapKeyTypeStringOrArrayV4.json
@@ -0,0 +1,442 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_yuzz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "zeta_wum",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "name": "zeta_omega",
+            "schema": "string",
+            "@type": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_fuddle;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "zeta_glikk",
+            "schema": "double"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zeta_humpf",
+            "schema": "string",
+            "@type": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_quan;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "zeta_thnad",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "name": "zeta_snee",
+            "schema": "string",
+            "@type": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_zatz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "zeta_jogg",
+            "schema": "float"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zeta_floob",
+            "schema": "string",
+            "@type": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_yekk;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "zeta_vroo",
+            "schema": "integer"
+          },
+          "mapKey": {
+            "name": "zeta_itch",
+            "schema": "string",
+            "@type": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_beta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "eta_gamma",
+            "schema": "long"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "eta_alpha",
+            "schema": "string",
+            "@type": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_zeta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "eta_eta",
+            "schema": "short"
+          },
+          "mapKey": {
+            "name": "eta_epsilon",
+            "schema": "string",
+            "@type": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_kappa;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "eta_lambda",
+            "schema": "string"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "eta_iota",
+            "schema": "string",
+            "@type": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_xi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "eta_omicron",
+            "schema": "time"
+          },
+          "mapKey": {
+            "name": "eta_nu",
+            "schema": "string",
+            "@type": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_sigma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "eta_tau",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "eta_rho",
+            "schema": "string",
+            "@type": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_chi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "eta_psi",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "name": "eta_phi",
+            "schema": "string",
+            "@type": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_wum;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "eta_um",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "eta_yuzz",
+            "schema": "string",
+            "@type": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_glikk;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "eta_nuh",
+            "schema": "unsignedShort"
+          },
+          "mapKey": {
+            "name": "eta_fuddle",
+            "schema": "string",
+            "@type": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_thnad;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "eta_spazz",
+            "schema": "uuid"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "eta_quan",
+            "schema": "string",
+            "@type": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_jogg;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "eta_flunn",
+            "schema": "boolean"
+          },
+          "mapKey": {
+            "name": "eta_zatz",
+            "schema": "string",
+            "@type": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_vroo;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "eta_hi",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "eta_yekk",
+            "schema": "string",
+            "@type": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapPropertiesElementSchemaSchemaMaxDepthV4.json b/DTDL/v4/spec/Requirement-ClassMapPropertiesElementSchemaSchemaMaxDepthV4.json
new file mode 100644
index 00000000..b3b9b824
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapPropertiesElementSchemaSchemaMaxDepthV4.json
@@ -0,0 +1,317 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_tau",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "gamma_sigma",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "gamma_rho",
+              "schema": {
+                "@type": "Map",
+                "mapKey": {
+                  "name": "gamma_pi",
+                  "schema": "string"
+                },
+                "mapValue": {
+                  "name": "gamma_omicron",
+                  "schema": {
+                    "@type": "Map",
+                    "mapKey": {
+                      "name": "gamma_xi",
+                      "schema": "string"
+                    },
+                    "mapValue": {
+                      "name": "gamma_nu",
+                      "schema": {
+                        "@type": "Map",
+                        "mapKey": {
+                          "name": "gamma_mu",
+                          "schema": "string"
+                        },
+                        "mapValue": {
+                          "name": "gamma_lambda",
+                          "schema": {
+                            "@type": "Map",
+                            "mapKey": {
+                              "name": "gamma_kappa",
+                              "schema": "string"
+                            },
+                            "mapValue": {
+                              "name": "gamma_iota",
+                              "schema": {
+                                "@type": "Map",
+                                "mapKey": {
+                                  "name": "gamma_theta",
+                                  "schema": "string"
+                                },
+                                "mapValue": {
+                                  "name": "gamma_eta",
+                                  "schema": {
+                                    "@type": "Map",
+                                    "mapKey": {
+                                      "name": "gamma_zeta",
+                                      "schema": "string"
+                                    },
+                                    "mapValue": {
+                                      "name": "gamma_epsilon",
+                                      "schema": {
+                                        "@type": "Map",
+                                        "mapKey": {
+                                          "name": "gamma_gamma",
+                                          "schema": "string"
+                                        },
+                                        "mapValue": {
+                                          "name": "gamma_delta",
+                                          "schema": "date"
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "gamma_flunn",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "gamma_jogg",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "gamma_zatz",
+              "schema": {
+                "@type": "Map",
+                "mapKey": {
+                  "name": "gamma_floob",
+                  "schema": "string"
+                },
+                "mapValue": {
+                  "name": "gamma_spazz",
+                  "schema": {
+                    "@type": "Map",
+                    "mapKey": {
+                      "name": "gamma_thnad",
+                      "schema": "string"
+                    },
+                    "mapValue": {
+                      "name": "gamma_quan",
+                      "schema": {
+                        "@type": "Map",
+                        "mapKey": {
+                          "name": "gamma_snee",
+                          "schema": "string"
+                        },
+                        "mapValue": {
+                          "name": "gamma_nuh",
+                          "schema": {
+                            "@type": "Map",
+                            "mapKey": {
+                              "name": "gamma_glikk",
+                              "schema": "string"
+                            },
+                            "mapValue": {
+                              "name": "gamma_fuddle",
+                              "schema": {
+                                "@type": "Map",
+                                "mapKey": {
+                                  "name": "gamma_humpf",
+                                  "schema": "string"
+                                },
+                                "mapValue": {
+                                  "name": "gamma_um",
+                                  "schema": {
+                                    "@type": "Map",
+                                    "mapKey": {
+                                      "name": "gamma_wum",
+                                      "schema": "string"
+                                    },
+                                    "mapValue": {
+                                      "name": "gamma_yuzz",
+                                      "schema": {
+                                        "@type": "Map",
+                                        "mapKey": {
+                                          "name": "gamma_omega",
+                                          "schema": "string"
+                                        },
+                                        "mapValue": {
+                                          "name": "gamma_psi",
+                                          "schema": {
+                                            "@type": "Map",
+                                            "mapKey": {
+                                              "name": "gamma_phi",
+                                              "schema": "string"
+                                            },
+                                            "mapValue": {
+                                              "name": "gamma_chi",
+                                              "schema": "dateTime"
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "delta_pi",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Map",
+            "mapKey": {
+              "name": "delta_omicron",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "delta_xi",
+              "schema": {
+                "@type": "Map",
+                "mapKey": {
+                  "name": "delta_nu",
+                  "schema": "string"
+                },
+                "mapValue": {
+                  "name": "delta_mu",
+                  "schema": {
+                    "@type": "Map",
+                    "mapKey": {
+                      "name": "delta_lambda",
+                      "schema": "string"
+                    },
+                    "mapValue": {
+                      "name": "delta_kappa",
+                      "schema": {
+                        "@type": "Map",
+                        "mapKey": {
+                          "name": "delta_iota",
+                          "schema": "string"
+                        },
+                        "mapValue": {
+                          "name": "delta_theta",
+                          "schema": {
+                            "@type": "Map",
+                            "mapKey": {
+                              "name": "delta_eta",
+                              "schema": "string"
+                            },
+                            "mapValue": {
+                              "name": "delta_zeta",
+                              "schema": {
+                                "@type": "Map",
+                                "mapKey": {
+                                  "name": "delta_epsilon",
+                                  "schema": "string"
+                                },
+                                "mapValue": {
+                                  "name": "delta_delta",
+                                  "schema": {
+                                    "@type": "Map",
+                                    "mapKey": {
+                                      "name": "delta_gamma",
+                                      "schema": "string"
+                                    },
+                                    "mapValue": {
+                                      "name": "delta_beta",
+                                      "schema": {
+                                        "@type": "Map",
+                                        "mapKey": {
+                                          "name": "delta_alpha",
+                                          "schema": "string"
+                                        },
+                                        "mapValue": {
+                                          "name": "gamma_hi",
+                                          "schema": {
+                                            "@type": "Map",
+                                            "mapKey": {
+                                              "name": "gamma_yekk",
+                                              "schema": "string"
+                                            },
+                                            "mapValue": {
+                                              "name": "gamma_vroo",
+                                              "schema": "decimal"
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapPropertyCommentStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassMapPropertyCommentStringLengthV4.json
new file mode 100644
index 00000000..ac61708d
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapPropertyCommentStringLengthV4.json
@@ -0,0 +1,81 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_floob;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "upsilon_zatz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "upsilon_jogg",
+            "schema": "string"
+          },
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_itch;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "upsilon_yekk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "upsilon_vroo",
+            "schema": "time"
+          },
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:phi_alpha;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "phi_beta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "phi_gamma",
+            "schema": "unsignedByte"
+          },
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapPropertyCommentStringV4.json b/DTDL/v4/spec/Requirement-ClassMapPropertyCommentStringV4.json
new file mode 100644
index 00000000..0c221833
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapPropertyCommentStringV4.json
@@ -0,0 +1,582 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_jogg;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "sigma_flunn",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "sigma_itch",
+            "schema": "long"
+          },
+          "comment": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_vroo;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "sigma_hi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "tau_alpha",
+            "schema": "short"
+          },
+          "comment": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_gamma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "tau_delta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "tau_epsilon",
+            "schema": "string"
+          },
+          "comment": {
+            "@value": "hello",
+            "@type": "xsd:string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_eta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "tau_theta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "tau_iota",
+            "schema": "time"
+          },
+          "comment": [
+            {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_lambda;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "tau_mu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "tau_nu",
+            "schema": "unsignedByte"
+          },
+          "comment": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_omicron;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "tau_pi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "tau_rho",
+            "schema": "unsignedInteger"
+          },
+          "comment": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:tau_tau;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "tau_upsilon",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "tau_phi",
+            "schema": "unsignedLong"
+          },
+          "comment": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_psi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "tau_omega",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "tau_yuzz",
+            "schema": "unsignedShort"
+          },
+          "comment": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:tau_um;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "tau_humpf",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "tau_fuddle",
+            "schema": "uuid"
+          },
+          "comment": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_nuh;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "tau_snee",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "tau_quan",
+            "schema": "boolean"
+          },
+          "comment": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:tau_spazz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "tau_floob",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "tau_zatz",
+            "schema": "byte"
+          },
+          "comment": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_flunn;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "tau_itch",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "tau_yekk",
+            "schema": "bytes"
+          },
+          "comment": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:tau_hi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "upsilon_alpha",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "upsilon_beta",
+            "schema": "date"
+          },
+          "comment": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_delta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "upsilon_epsilon",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "upsilon_zeta",
+            "schema": "dateTime"
+          },
+          "comment": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:upsilon_theta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "upsilon_iota",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "upsilon_kappa",
+            "schema": "decimal"
+          },
+          "comment": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_mu;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "upsilon_nu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "upsilon_xi",
+            "schema": "double"
+          },
+          "comment": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:upsilon_pi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "upsilon_rho",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "upsilon_sigma",
+            "schema": "duration"
+          },
+          "comment": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_upsilon;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "upsilon_phi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "upsilon_chi",
+            "schema": "float"
+          },
+          "comment": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:upsilon_omega;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "upsilon_yuzz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "upsilon_wum",
+            "schema": "integer"
+          },
+          "comment": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_humpf;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "upsilon_fuddle",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "upsilon_glikk",
+            "schema": "long"
+          },
+          "comment": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:upsilon_snee;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "upsilon_quan",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "upsilon_thnad",
+            "schema": "short"
+          },
+          "comment": [
+            {}
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapPropertyCommentTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassMapPropertyCommentTermAndDtmiV4.json
new file mode 100644
index 00000000..5baf1ed7
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapPropertyCommentTermAndDtmiV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_upsilon;1",
+          "@type": "Map",
+          "comment": "phi_phi",
+          "dtmi:dtdl:property:comment;4": "phi_chi",
+          "mapKey": {
+            "name": "phi_psi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "phi_omega",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:phi_wum;1",
+          "@type": "Map",
+          "comment": "phi_um",
+          "dtmi:dtdl:property:comment;4": "phi_humpf",
+          "mapKey": {
+            "name": "phi_fuddle",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "phi_glikk",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapPropertyDescriptionLangStringV4.json b/DTDL/v4/spec/Requirement-ClassMapPropertyDescriptionLangStringV4.json
new file mode 100644
index 00000000..3d2da99b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapPropertyDescriptionLangStringV4.json
@@ -0,0 +1,674 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_snee;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "phi_quan",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "phi_thnad",
+            "schema": "byte"
+          },
+          "description": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_floob;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "phi_zatz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "phi_jogg",
+            "schema": "bytes"
+          },
+          "description": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_itch;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "phi_yekk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "phi_vroo",
+            "schema": "date"
+          },
+          "description": {
+            "en": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_alpha;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "chi_beta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "chi_gamma",
+            "schema": "dateTime"
+          },
+          "description": [
+            {
+              "@value": "hello",
+              "@language": "en"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_epsilon;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "chi_zeta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "chi_eta",
+            "schema": "decimal"
+          },
+          "description": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_iota;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "chi_kappa",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "chi_lambda",
+            "schema": "double"
+          },
+          "description": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_nu;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "chi_xi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "chi_omicron",
+            "schema": "duration"
+          },
+          "description": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:chi_rho;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "chi_sigma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "chi_tau",
+            "schema": "float"
+          },
+          "description": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_phi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "chi_chi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "chi_psi",
+            "schema": "integer"
+          },
+          "description": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:chi_yuzz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "chi_wum",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "chi_um",
+            "schema": "long"
+          },
+          "description": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_fuddle;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "chi_glikk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "chi_nuh",
+            "schema": "short"
+          },
+          "description": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:chi_quan;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "chi_thnad",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "chi_spazz",
+            "schema": "string"
+          },
+          "description": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_zatz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "chi_jogg",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "chi_flunn",
+            "schema": "time"
+          },
+          "description": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:chi_yekk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "chi_vroo",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "chi_hi",
+            "schema": "unsignedByte"
+          },
+          "description": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_beta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "psi_gamma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "psi_delta",
+            "schema": "unsignedInteger"
+          },
+          "description": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:psi_zeta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "psi_eta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "psi_theta",
+            "schema": "unsignedLong"
+          },
+          "description": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_kappa;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "psi_lambda",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "psi_mu",
+            "schema": "unsignedShort"
+          },
+          "description": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:psi_xi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "psi_omicron",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "psi_pi",
+            "schema": "uuid"
+          },
+          "description": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_sigma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "psi_tau",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "psi_upsilon",
+            "schema": "boolean"
+          },
+          "description": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:psi_chi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "psi_psi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "psi_omega",
+            "schema": "byte"
+          },
+          "description": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_wum;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "psi_um",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "psi_humpf",
+            "schema": "bytes"
+          },
+          "description": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:psi_glikk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "psi_nuh",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "psi_snee",
+            "schema": "date"
+          },
+          "description": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_thnad;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "psi_spazz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "psi_floob",
+            "schema": "dateTime"
+          },
+          "description": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:psi_jogg;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "psi_flunn",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "psi_itch",
+            "schema": "decimal"
+          },
+          "description": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapPropertyDescriptionStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassMapPropertyDescriptionStringLengthV4.json
new file mode 100644
index 00000000..c35a0379
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapPropertyDescriptionStringLengthV4.json
@@ -0,0 +1,81 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_vroo;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "psi_hi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omega_alpha",
+            "schema": "double"
+          },
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_gamma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omega_delta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omega_epsilon",
+            "schema": "duration"
+          },
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:omega_eta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omega_theta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omega_iota",
+            "schema": "float"
+          },
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapPropertyDescriptionTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassMapPropertyDescriptionTermAndDtmiV4.json
new file mode 100644
index 00000000..f0975d4a
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapPropertyDescriptionTermAndDtmiV4.json
@@ -0,0 +1,65 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_wum;1",
+          "@type": "Map",
+          "description": [
+            "omega_um"
+          ],
+          "dtmi:dtdl:property:description;4": [
+            "omega_humpf"
+          ],
+          "mapKey": {
+            "name": "omega_fuddle",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omega_glikk",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:omega_snee;1",
+          "@type": "Map",
+          "description": [
+            "omega_quan"
+          ],
+          "dtmi:dtdl:property:description;4": [
+            "omega_thnad"
+          ],
+          "mapKey": {
+            "name": "omega_spazz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omega_floob",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapPropertyDisplayNameLangStringV4.json b/DTDL/v4/spec/Requirement-ClassMapPropertyDisplayNameLangStringV4.json
new file mode 100644
index 00000000..ad26d94b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapPropertyDisplayNameLangStringV4.json
@@ -0,0 +1,674 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_jogg;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omega_flunn",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omega_itch",
+            "schema": "unsignedByte"
+          },
+          "displayName": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_vroo;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omega_hi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yuzz_alpha",
+            "schema": "unsignedInteger"
+          },
+          "displayName": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_gamma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "yuzz_delta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yuzz_epsilon",
+            "schema": "unsignedLong"
+          },
+          "displayName": {
+            "en": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_eta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "yuzz_theta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yuzz_iota",
+            "schema": "unsignedShort"
+          },
+          "displayName": [
+            {
+              "@value": "hello",
+              "@language": "en"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_lambda;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "yuzz_mu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yuzz_nu",
+            "schema": "uuid"
+          },
+          "displayName": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_omicron;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "yuzz_pi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yuzz_rho",
+            "schema": "boolean"
+          },
+          "displayName": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_tau;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "yuzz_upsilon",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yuzz_phi",
+            "schema": "byte"
+          },
+          "displayName": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:yuzz_psi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "yuzz_omega",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yuzz_yuzz",
+            "schema": "bytes"
+          },
+          "displayName": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_um;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "yuzz_humpf",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yuzz_fuddle",
+            "schema": "date"
+          },
+          "displayName": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:yuzz_nuh;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "yuzz_snee",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yuzz_quan",
+            "schema": "dateTime"
+          },
+          "displayName": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_spazz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "yuzz_floob",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yuzz_zatz",
+            "schema": "decimal"
+          },
+          "displayName": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:yuzz_flunn;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "yuzz_itch",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yuzz_yekk",
+            "schema": "double"
+          },
+          "displayName": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yuzz_hi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "wum_alpha",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "wum_beta",
+            "schema": "duration"
+          },
+          "displayName": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:wum_delta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "wum_epsilon",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "wum_zeta",
+            "schema": "float"
+          },
+          "displayName": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_theta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "wum_iota",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "wum_kappa",
+            "schema": "integer"
+          },
+          "displayName": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:wum_mu;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "wum_nu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "wum_xi",
+            "schema": "long"
+          },
+          "displayName": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_pi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "wum_rho",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "wum_sigma",
+            "schema": "short"
+          },
+          "displayName": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:wum_upsilon;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "wum_phi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "wum_chi",
+            "schema": "string"
+          },
+          "displayName": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_omega;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "wum_yuzz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "wum_wum",
+            "schema": "time"
+          },
+          "displayName": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:wum_humpf;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "wum_fuddle",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "wum_glikk",
+            "schema": "unsignedByte"
+          },
+          "displayName": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_snee;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "wum_quan",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "wum_thnad",
+            "schema": "unsignedInteger"
+          },
+          "displayName": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:wum_floob;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "wum_zatz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "wum_jogg",
+            "schema": "unsignedLong"
+          },
+          "displayName": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_itch;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "wum_yekk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "wum_vroo",
+            "schema": "unsignedShort"
+          },
+          "displayName": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:um_alpha;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "um_beta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "um_gamma",
+            "schema": "uuid"
+          },
+          "displayName": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapPropertyDisplayNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassMapPropertyDisplayNameStringLengthV4.json
new file mode 100644
index 00000000..86c9914c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapPropertyDisplayNameStringLengthV4.json
@@ -0,0 +1,81 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_epsilon;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "um_zeta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "um_eta",
+            "schema": "boolean"
+          },
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_iota;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "um_kappa",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "um_lambda",
+            "schema": "byte"
+          },
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:um_nu;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "um_xi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "um_omicron",
+            "schema": "bytes"
+          },
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapPropertyDisplayNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassMapPropertyDisplayNameTermAndDtmiV4.json
new file mode 100644
index 00000000..cb135777
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapPropertyDisplayNameTermAndDtmiV4.json
@@ -0,0 +1,65 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_snee;1",
+          "@type": "Map",
+          "displayName": [
+            "um_quan"
+          ],
+          "dtmi:dtdl:property:displayName;4": [
+            "um_thnad"
+          ],
+          "mapKey": {
+            "name": "um_spazz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "um_floob",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:um_jogg;1",
+          "@type": "Map",
+          "displayName": [
+            "um_flunn"
+          ],
+          "dtmi:dtdl:property:displayName;4": [
+            "um_itch"
+          ],
+          "mapKey": {
+            "name": "um_yekk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "um_vroo",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapPropertyFormallyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Requirement-ClassMapPropertyFormallyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..48250119
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapPropertyFormallyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,108 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_zeta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "fuddle_eta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "fuddle_theta",
+            "schema": "byte"
+          },
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:fuddle_kappa;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "fuddle_lambda",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "fuddle_mu",
+            "schema": "bytes"
+          },
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_xi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "fuddle_omicron",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "fuddle_pi",
+            "schema": "date"
+          },
+          "boolean": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:fuddle_sigma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "fuddle_tau",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "fuddle_upsilon",
+            "schema": "dateTime"
+          },
+          "boolean": null
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapPropertyFormallyUndefinedTermV4.json b/DTDL/v4/spec/Requirement-ClassMapPropertyFormallyUndefinedTermV4.json
new file mode 100644
index 00000000..54a8dc19
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapPropertyFormallyUndefinedTermV4.json
@@ -0,0 +1,55 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_gamma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "glikk_delta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "glikk_epsilon",
+            "schema": "short"
+          },
+          "foobar": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:glikk_eta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "glikk_theta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "glikk_iota",
+            "schema": "string"
+          },
+          "foobar": {}
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapPropertyInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassMapPropertyInvalidDtmiV4.json
new file mode 100644
index 00000000..ee5c571c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapPropertyInvalidDtmiV4.json
@@ -0,0 +1,61 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_chi;1",
+          "@type": [
+            "Map",
+            "Foobar"
+          ],
+          "mapKey": {
+            "name": "fuddle_psi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "fuddle_omega",
+            "schema": "decimal"
+          },
+          "dtmi:foo//bar": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:fuddle_wum;1",
+          "@type": [
+            "Map",
+            "Foobar"
+          ],
+          "mapKey": {
+            "name": "fuddle_um",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "fuddle_humpf",
+            "schema": "double"
+          },
+          "dtmi:foo//bar": 626
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapPropertyMapKeyElementV4.json b/DTDL/v4/spec/Requirement-ClassMapPropertyMapKeyElementV4.json
new file mode 100644
index 00000000..6117e0e1
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapPropertyMapKeyElementV4.json
@@ -0,0 +1,386 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "hi_upsilon",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "hi_tau",
+              "schema": "bytes"
+            },
+            "mapKey": {
+              "@id": "dtmi:example:hi_rho;1",
+              "name": "hi_sigma",
+              "schema": "string"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "hi_yuzz",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "hi_omega",
+              "schema": "date"
+            },
+            "mapKey": [
+              {
+                "@id": "dtmi:example:hi_chi;1",
+                "name": "hi_psi",
+                "schema": "string"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_humpf;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "hi_fuddle",
+            "schema": "dateTime"
+          },
+          "mapKey": {
+            "@id": "dtmi:ex:dependentRef;1",
+            "name": "hi_um",
+            "schema": "string"
+          }
+        },
+        "contents": {
+          "@type": "Property",
+          "name": "hi_snee",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "hi_nuh",
+              "schema": "decimal"
+            },
+            "mapKey": "dtmi:ex:dependentRef;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_thnad;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "hi_spazz",
+            "schema": "double"
+          },
+          "mapKey": {
+            "@id": "dtmi:ex:dependentRef;1",
+            "name": "hi_quan",
+            "schema": "string"
+          }
+        },
+        "contents": {
+          "@type": "Property",
+          "name": "hi_jogg",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "hi_zatz",
+              "schema": "duration"
+            },
+            "mapKey": [
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "hi_vroo",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "hi_yekk",
+              "schema": "float"
+            },
+            "mapKey": {
+              "@id": "dtmi:example:hi_flunn;1",
+              "name": "hi_itch",
+              "schema": "string",
+              "@context": "dtmi:dtdl:context;2"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_delta",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Map",
+            "mapValue": {
+              "name": "alpha_gamma",
+              "schema": "integer"
+            },
+            "mapKey": {
+              "@id": "dtmi:example:alpha_alpha;1",
+              "name": "alpha_beta",
+              "schema": "string",
+              "@context": "dtmi:dtdl:context;2"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_iota",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "alpha_theta",
+              "schema": "long"
+            },
+            "mapKey": {
+              "@id": "dtmi:example:alpha_zeta;1",
+              "name": "alpha_eta",
+              "schema": "string",
+              "@context": "dtmi:dtdl:context;3"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_xi",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Map",
+            "mapValue": {
+              "name": "alpha_nu",
+              "schema": "short"
+            },
+            "mapKey": {
+              "@id": "dtmi:example:alpha_lambda;1",
+              "name": "alpha_mu",
+              "schema": "string",
+              "@context": "dtmi:dtdl:context;3"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_rho",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "alpha_pi",
+              "schema": "string"
+            },
+            "mapKey": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_upsilon",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Map",
+            "mapValue": {
+              "name": "alpha_tau",
+              "schema": "time"
+            },
+            "mapKey": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_um",
+          "schema": {
+            "@type": "Map",
+            "mapValue": {
+              "name": "alpha_wum",
+              "schema": "unsignedByte"
+            },
+            "mapKey": [
+              {
+                "@id": "dtmi:example:alpha_chi;1",
+                "name": "alpha_psi",
+                "schema": "string"
+              },
+              {
+                "@id": "dtmi:example:alpha_omega;1",
+                "name": "alpha_yuzz",
+                "schema": "string"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_thnad",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Map",
+            "mapValue": {
+              "name": "alpha_quan",
+              "schema": "unsignedInteger"
+            },
+            "mapKey": [
+              {
+                "@id": "dtmi:example:alpha_fuddle;1",
+                "name": "alpha_glikk",
+                "schema": "string"
+              },
+              {
+                "@id": "dtmi:example:alpha_nuh;1",
+                "name": "alpha_snee",
+                "schema": "string"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapPropertyMapKeyTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassMapPropertyMapKeyTermAndDtmiV4.json
new file mode 100644
index 00000000..02557330
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapPropertyMapKeyTermAndDtmiV4.json
@@ -0,0 +1,61 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_quan;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "epsilon_thnad",
+            "schema": "string"
+          },
+          "dtmi:dtdl:property:mapKey;4": {
+            "name": "epsilon_spazz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "epsilon_floob",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:epsilon_jogg;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "epsilon_flunn",
+            "schema": "string"
+          },
+          "dtmi:dtdl:property:mapKey;4": {
+            "name": "epsilon_itch",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "epsilon_yekk",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapPropertyMapKeyTypeConformanceV4.json b/DTDL/v4/spec/Requirement-ClassMapPropertyMapKeyTypeConformanceV4.json
new file mode 100644
index 00000000..04f8ed17
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapPropertyMapKeyTypeConformanceV4.json
@@ -0,0 +1,856 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_hi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "beta_alpha",
+            "schema": "boolean"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:alpha_vroo;1",
+            "elementSchema": "uuid",
+            "@type": "Array"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:beta_delta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "beta_epsilon",
+            "schema": "bytes"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:beta_gamma;1",
+            "elementSchema": "byte",
+            "@type": "Array"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_iota;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "beta_kappa",
+            "schema": "date"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:beta_eta;1",
+            "name": "beta_theta",
+            "@type": "Command"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:beta_xi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "beta_omicron",
+            "schema": "dateTime"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:beta_mu;1",
+            "name": "beta_nu",
+            "@type": "Command"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_tau;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "beta_upsilon",
+            "schema": "double"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:beta_rho;1",
+            "name": "beta_sigma",
+            "schema": "decimal",
+            "@type": "CommandRequest"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:beta_omega;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "beta_yuzz",
+            "schema": "float"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:beta_chi;1",
+            "name": "beta_psi",
+            "schema": "duration",
+            "@type": "CommandRequest"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_fuddle;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "beta_glikk",
+            "schema": "long"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:beta_um;1",
+            "name": "beta_humpf",
+            "schema": "integer",
+            "@type": "CommandResponse"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:beta_thnad;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "beta_spazz",
+            "schema": "string"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:beta_snee;1",
+            "name": "beta_quan",
+            "schema": "short",
+            "@type": "CommandResponse"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_itch;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "beta_yekk",
+            "schema": "time"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:beta_zatz;1",
+            "name": "beta_jogg",
+            "schema": {
+              "@id": "dtmi:example:beta_flunn;1",
+              "@type": "Interface"
+            },
+            "@type": "Component"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:gamma_gamma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "gamma_delta",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:beta_hi;1",
+            "name": "gamma_alpha",
+            "schema": {
+              "@id": "dtmi:example:gamma_beta;1",
+              "@type": "Interface"
+            },
+            "@type": "Component"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_eta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "gamma_theta",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:gamma_zeta;1",
+            "valueSchema": "integer",
+            "@type": "Enum"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:gamma_lambda;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "gamma_mu",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:gamma_kappa;1",
+            "valueSchema": "integer",
+            "@type": "Enum"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_pi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "gamma_rho",
+            "schema": "unsignedShort"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:gamma_xi;1",
+            "enumValue": 1863,
+            "name": "gamma_omicron",
+            "@type": "EnumValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:gamma_phi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "gamma_chi",
+            "schema": "uuid"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:gamma_tau;1",
+            "enumValue": 1864,
+            "name": "gamma_upsilon",
+            "@type": "EnumValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_wum;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "gamma_um",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:gamma_omega;1",
+            "name": "gamma_yuzz",
+            "schema": "boolean",
+            "@type": "Field"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:gamma_nuh;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "gamma_snee",
+            "schema": "date"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:gamma_fuddle;1",
+            "name": "gamma_glikk",
+            "schema": "bytes",
+            "@type": "Field"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_spazz;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "gamma_floob",
+            "schema": "dateTime"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:gamma_thnad;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:gamma_flunn;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "gamma_itch",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:gamma_jogg;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_beta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "delta_gamma",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:gamma_vroo;1",
+            "mapKey": {
+              "name": "gamma_hi",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "delta_alpha",
+              "schema": "double"
+            },
+            "@type": "Map"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:delta_theta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "delta_iota",
+            "schema": "integer"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:delta_epsilon;1",
+            "mapKey": {
+              "name": "delta_zeta",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "delta_eta",
+              "schema": "float"
+            },
+            "@type": "Map"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_nu;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "delta_xi",
+            "schema": "long"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:delta_lambda;1",
+            "name": "delta_mu",
+            "schema": "string",
+            "@type": "MapKey"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_sigma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "delta_tau",
+            "schema": "string"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:delta_pi;1",
+            "name": "delta_rho",
+            "schema": "short",
+            "@type": "MapValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:delta_psi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "delta_omega",
+            "schema": "unsignedByte"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:delta_phi;1",
+            "name": "delta_chi",
+            "schema": "time",
+            "@type": "MapValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_um;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "delta_humpf",
+            "schema": "unsignedInteger"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:delta_wum;1",
+            "@type": "Object"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:delta_nuh;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "delta_snee",
+            "schema": "unsignedLong"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:delta_glikk;1",
+            "@type": "Object"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_floob;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "delta_zatz",
+            "schema": "uuid"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:delta_thnad;1",
+            "name": "delta_spazz",
+            "schema": "unsignedShort",
+            "@type": "Property"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:delta_yekk;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "delta_vroo",
+            "schema": "byte"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:delta_flunn;1",
+            "name": "delta_itch",
+            "schema": "boolean",
+            "@type": "Property"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_gamma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "epsilon_delta",
+            "schema": "bytes"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:epsilon_alpha;1",
+            "name": "epsilon_beta",
+            "@type": "Relationship"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:epsilon_theta;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "epsilon_iota",
+            "schema": "date"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:epsilon_zeta;1",
+            "name": "epsilon_eta",
+            "@type": "Relationship"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_nu;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "epsilon_xi",
+            "schema": "decimal"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:epsilon_lambda;1",
+            "name": "epsilon_mu",
+            "schema": "dateTime",
+            "@type": "Telemetry"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:epsilon_sigma;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "epsilon_tau",
+            "schema": "duration"
+          },
+          "mapKey": {
+            "@id": "dtmi:example:epsilon_pi;1",
+            "name": "epsilon_rho",
+            "schema": "double",
+            "@type": "Telemetry"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapPropertyMapValueElementV4.json b/DTDL/v4/spec/Requirement-ClassMapPropertyMapValueElementV4.json
new file mode 100644
index 00000000..0fbed680
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapPropertyMapValueElementV4.json
@@ -0,0 +1,386 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "zeta_gamma",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "zeta_beta",
+              "schema": "string"
+            },
+            "mapValue": {
+              "@id": "dtmi:example:epsilon_hi;1",
+              "name": "zeta_alpha",
+              "schema": "time"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "zeta_theta",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "zeta_eta",
+              "schema": "string"
+            },
+            "mapValue": [
+              {
+                "@id": "dtmi:example:zeta_epsilon;1",
+                "name": "zeta_zeta",
+                "schema": "unsignedByte"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_lambda;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "zeta_mu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:ex:dependentRef;1",
+            "name": "zeta_kappa",
+            "schema": "unsignedInteger"
+          }
+        },
+        "contents": {
+          "@type": "Property",
+          "name": "zeta_omicron",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "zeta_xi",
+              "schema": "string"
+            },
+            "mapValue": "dtmi:ex:dependentRef;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_rho;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "zeta_sigma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:ex:dependentRef;1",
+            "name": "zeta_pi",
+            "schema": "unsignedLong"
+          }
+        },
+        "contents": {
+          "@type": "Property",
+          "name": "zeta_phi",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "zeta_upsilon",
+              "schema": "string"
+            },
+            "mapValue": [
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "zeta_yuzz",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "zeta_omega",
+              "schema": "string"
+            },
+            "mapValue": {
+              "@id": "dtmi:example:zeta_chi;1",
+              "name": "zeta_psi",
+              "schema": "dateTime",
+              "@context": "dtmi:dtdl:context;2"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "zeta_glikk",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Map",
+            "mapKey": {
+              "name": "zeta_fuddle",
+              "schema": "string"
+            },
+            "mapValue": {
+              "@id": "dtmi:example:zeta_um;1",
+              "name": "zeta_humpf",
+              "schema": "double",
+              "@context": "dtmi:dtdl:context;2"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "zeta_spazz",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "zeta_thnad",
+              "schema": "string"
+            },
+            "mapValue": {
+              "@id": "dtmi:example:zeta_snee;1",
+              "name": "zeta_quan",
+              "schema": "duration",
+              "@context": "dtmi:dtdl:context;3"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "zeta_itch",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Map",
+            "mapKey": {
+              "name": "zeta_flunn",
+              "schema": "string"
+            },
+            "mapValue": {
+              "@id": "dtmi:example:zeta_zatz;1",
+              "name": "zeta_jogg",
+              "schema": "float",
+              "@context": "dtmi:dtdl:context;3"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "zeta_hi",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "zeta_vroo",
+              "schema": "string"
+            },
+            "mapValue": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "eta_gamma",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Map",
+            "mapKey": {
+              "name": "eta_beta",
+              "schema": "string"
+            },
+            "mapValue": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "eta_kappa",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "eta_iota",
+              "schema": "string"
+            },
+            "mapValue": [
+              {
+                "@id": "dtmi:example:eta_epsilon;1",
+                "name": "eta_zeta",
+                "schema": "bytes"
+              },
+              {
+                "@id": "dtmi:example:eta_eta;1",
+                "name": "eta_theta",
+                "schema": "date"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "eta_rho",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Map",
+            "mapKey": {
+              "name": "eta_pi",
+              "schema": "string"
+            },
+            "mapValue": [
+              {
+                "@id": "dtmi:example:eta_mu;1",
+                "name": "eta_nu",
+                "schema": "dateTime"
+              },
+              {
+                "@id": "dtmi:example:eta_xi;1",
+                "name": "eta_omicron",
+                "schema": "decimal"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapPropertyMapValueTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassMapPropertyMapValueTermAndDtmiV4.json
new file mode 100644
index 00000000..14d35d42
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapPropertyMapValueTermAndDtmiV4.json
@@ -0,0 +1,61 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_pi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "lambda_rho",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "lambda_sigma",
+            "schema": "decimal"
+          },
+          "dtmi:dtdl:property:mapValue;4": {
+            "name": "lambda_tau",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:lambda_phi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "lambda_chi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "lambda_psi",
+            "schema": "duration"
+          },
+          "dtmi:dtdl:property:mapValue;4": {
+            "name": "lambda_omega",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapPropertyMapValueTypeConformanceV4.json b/DTDL/v4/spec/Requirement-ClassMapPropertyMapValueTypeConformanceV4.json
new file mode 100644
index 00000000..41aa8d8c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapPropertyMapValueTypeConformanceV4.json
@@ -0,0 +1,856 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_wum;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "eta_um",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:eta_yuzz;1",
+            "elementSchema": "double",
+            "@type": "Array"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:eta_glikk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "eta_nuh",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:eta_fuddle;1",
+            "elementSchema": "duration",
+            "@type": "Array"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_spazz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "eta_floob",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:eta_quan;1",
+            "name": "eta_thnad",
+            "@type": "Command"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:eta_itch;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "eta_yekk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:eta_jogg;1",
+            "name": "eta_flunn",
+            "@type": "Command"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_beta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "theta_gamma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:eta_hi;1",
+            "name": "theta_alpha",
+            "schema": "float",
+            "@type": "CommandRequest"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:theta_eta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "theta_theta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:theta_epsilon;1",
+            "name": "theta_zeta",
+            "schema": "integer",
+            "@type": "CommandRequest"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_mu;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "theta_nu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:theta_kappa;1",
+            "name": "theta_lambda",
+            "schema": "long",
+            "@type": "CommandResponse"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:theta_rho;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "theta_sigma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:theta_omicron;1",
+            "name": "theta_pi",
+            "schema": "short",
+            "@type": "CommandResponse"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_psi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "theta_omega",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:theta_upsilon;1",
+            "name": "theta_phi",
+            "schema": {
+              "@id": "dtmi:example:theta_chi;1",
+              "@type": "Interface"
+            },
+            "@type": "Component"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:theta_fuddle;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "theta_glikk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:theta_wum;1",
+            "name": "theta_um",
+            "schema": {
+              "@id": "dtmi:example:theta_humpf;1",
+              "@type": "Interface"
+            },
+            "@type": "Component"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_quan;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "theta_thnad",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:theta_snee;1",
+            "valueSchema": "integer",
+            "@type": "Enum"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:theta_zatz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "theta_jogg",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:theta_floob;1",
+            "valueSchema": "integer",
+            "@type": "Enum"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_vroo;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "theta_hi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:theta_itch;1",
+            "enumValue": 1865,
+            "name": "theta_yekk",
+            "@type": "EnumValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:iota_delta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "iota_epsilon",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:iota_beta;1",
+            "enumValue": 1866,
+            "name": "iota_gamma",
+            "@type": "EnumValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_iota;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "iota_kappa",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:iota_eta;1",
+            "name": "iota_theta",
+            "schema": "string",
+            "@type": "Field"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:iota_xi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "iota_omicron",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:iota_mu;1",
+            "name": "iota_nu",
+            "schema": "time",
+            "@type": "Field"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_sigma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "iota_tau",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:iota_rho;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:iota_chi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "iota_psi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:iota_phi;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_humpf;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "iota_fuddle",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:iota_yuzz;1",
+            "mapKey": {
+              "name": "iota_wum",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "iota_um",
+              "schema": "unsignedByte"
+            },
+            "@type": "Map"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:iota_thnad;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "iota_spazz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:iota_nuh;1",
+            "mapKey": {
+              "name": "iota_snee",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "iota_quan",
+              "schema": "unsignedInteger"
+            },
+            "@type": "Map"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_flunn;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "iota_itch",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:iota_zatz;1",
+            "name": "iota_jogg",
+            "schema": "string",
+            "@type": "MapKey"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:kappa_alpha;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "kappa_beta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:iota_vroo;1",
+            "name": "iota_hi",
+            "schema": "string",
+            "@type": "MapKey"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_zeta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "kappa_eta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:kappa_delta;1",
+            "name": "kappa_epsilon",
+            "schema": "unsignedLong",
+            "@type": "MapValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_kappa;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "kappa_lambda",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:kappa_iota;1",
+            "@type": "Object"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:kappa_xi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "kappa_omicron",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:kappa_nu;1",
+            "@type": "Object"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_tau;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "kappa_upsilon",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:kappa_rho;1",
+            "name": "kappa_sigma",
+            "schema": "unsignedShort",
+            "@type": "Property"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:kappa_omega;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "kappa_yuzz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:kappa_chi;1",
+            "name": "kappa_psi",
+            "schema": "uuid",
+            "@type": "Property"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_fuddle;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "kappa_glikk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:kappa_um;1",
+            "name": "kappa_humpf",
+            "@type": "Relationship"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:kappa_thnad;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "kappa_spazz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:kappa_snee;1",
+            "name": "kappa_quan",
+            "@type": "Relationship"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_flunn;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "kappa_itch",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:kappa_zatz;1",
+            "name": "kappa_jogg",
+            "schema": "boolean",
+            "@type": "Telemetry"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:lambda_alpha;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "lambda_beta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:example:kappa_vroo;1",
+            "name": "kappa_hi",
+            "schema": "byte",
+            "@type": "Telemetry"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapPropertyNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassMapPropertyNotDtmiNorTermV4.json
new file mode 100644
index 00000000..c49041b9
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapPropertyNotDtmiNorTermV4.json
@@ -0,0 +1,61 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_glikk;1",
+          "@type": [
+            "Map",
+            "Foobar"
+          ],
+          "mapKey": {
+            "name": "fuddle_nuh",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "fuddle_snee",
+            "schema": "duration"
+          },
+          "http://foo.com/bar": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:fuddle_thnad;1",
+          "@type": [
+            "Map",
+            "Foobar"
+          ],
+          "mapKey": {
+            "name": "fuddle_spazz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "fuddle_floob",
+            "schema": "float"
+          },
+          "http://foo.com/bar": true
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapRequiredPropertiesV4.json b/DTDL/v4/spec/Requirement-ClassMapRequiredPropertiesV4.json
new file mode 100644
index 00000000..a23100ad
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapRequiredPropertiesV4.json
@@ -0,0 +1,137 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_nu;1",
+          "mapKey": {
+            "name": "flunn_xi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "flunn_omicron",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:flunn_rho;1",
+          "mapKey": {
+            "name": "flunn_sigma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "flunn_tau",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_phi;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "flunn_chi",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:flunn_omega;1",
+          "@type": "Map",
+          "mapValue": {
+            "name": "flunn_yuzz",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_um;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "flunn_humpf",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:flunn_glikk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "flunn_nuh",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapTypeIncludesInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassMapTypeIncludesInvalidDtmiV4.json
new file mode 100644
index 00000000..e36489c6
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapTypeIncludesInvalidDtmiV4.json
@@ -0,0 +1,59 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_floob;1",
+          "@type": [
+            "Map",
+            "dtmi:foo//bar"
+          ],
+          "mapKey": {
+            "name": "vroo_zatz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "vroo_jogg",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:vroo_itch;1",
+          "@type": [
+            "Map",
+            "dtmi:foo//bar"
+          ],
+          "mapKey": {
+            "name": "vroo_yekk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "vroo_vroo",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapTypeIncludesMaterialV4.json b/DTDL/v4/spec/Requirement-ClassMapTypeIncludesMaterialV4.json
new file mode 100644
index 00000000..03b63fb0
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapTypeIncludesMaterialV4.json
@@ -0,0 +1,212 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_lambda;1",
+          "mapKey": {
+            "name": "yekk_mu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yekk_nu",
+            "schema": "unsignedShort"
+          },
+          "@type": "Map"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_omicron;1",
+          "mapKey": {
+            "name": "yekk_pi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yekk_rho",
+            "schema": "uuid"
+          },
+          "@type": [
+            "Map"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_tau;1",
+          "mapKey": {
+            "name": "yekk_upsilon",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yekk_phi",
+            "schema": "boolean"
+          },
+          "@type": "dtmi:dtdl:class:Map;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_psi;1",
+          "mapKey": {
+            "name": "yekk_omega",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yekk_yuzz",
+            "schema": "byte"
+          },
+          "@type": [
+            "dtmi:dtdl:class:Map;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_um;1",
+          "mapKey": {
+            "name": "yekk_humpf",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yekk_fuddle",
+            "schema": "bytes"
+          },
+          "@type": "Something"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:yekk_nuh;1",
+          "mapKey": {
+            "name": "yekk_snee",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yekk_quan",
+            "schema": "date"
+          },
+          "@type": "Something"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_spazz;1",
+          "mapKey": {
+            "name": "yekk_floob",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yekk_zatz",
+            "schema": "dateTime"
+          },
+          "@type": [
+            "Something"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:yekk_flunn;1",
+          "mapKey": {
+            "name": "yekk_itch",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yekk_yekk",
+            "schema": "decimal"
+          },
+          "@type": [
+            "Something"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapTypeIncludesNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassMapTypeIncludesNotDtmiNorTermV4.json
new file mode 100644
index 00000000..909d5fbb
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapTypeIncludesNotDtmiNorTermV4.json
@@ -0,0 +1,59 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_alpha;1",
+          "@type": [
+            "Map",
+            "http://foo.com/bar"
+          ],
+          "mapKey": {
+            "name": "hi_beta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "hi_gamma",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:hi_epsilon;1",
+          "@type": [
+            "Map",
+            "http://foo.com/bar"
+          ],
+          "mapKey": {
+            "name": "hi_zeta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "hi_eta",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapTypeStringOrArrayV4.json b/DTDL/v4/spec/Requirement-ClassMapTypeStringOrArrayV4.json
new file mode 100644
index 00000000..a5e0a3f8
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapTypeStringOrArrayV4.json
@@ -0,0 +1,426 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_quan;1",
+          "mapKey": {
+            "name": "flunn_thnad",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "flunn_spazz",
+            "schema": "byte"
+          },
+          "@type": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:flunn_zatz;1",
+          "mapKey": {
+            "name": "flunn_jogg",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "flunn_flunn",
+            "schema": "bytes"
+          },
+          "@type": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_yekk;1",
+          "mapKey": {
+            "name": "flunn_vroo",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "flunn_hi",
+            "schema": "date"
+          },
+          "@type": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:itch_beta;1",
+          "mapKey": {
+            "name": "itch_gamma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "itch_delta",
+            "schema": "dateTime"
+          },
+          "@type": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_zeta;1",
+          "mapKey": {
+            "name": "itch_eta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "itch_theta",
+            "schema": "decimal"
+          },
+          "@type": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:itch_kappa;1",
+          "mapKey": {
+            "name": "itch_lambda",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "itch_mu",
+            "schema": "double"
+          },
+          "@type": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_xi;1",
+          "mapKey": {
+            "name": "itch_omicron",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "itch_pi",
+            "schema": "duration"
+          },
+          "@type": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:itch_sigma;1",
+          "mapKey": {
+            "name": "itch_tau",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "itch_upsilon",
+            "schema": "float"
+          },
+          "@type": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_chi;1",
+          "mapKey": {
+            "name": "itch_psi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "itch_omega",
+            "schema": "integer"
+          },
+          "@type": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:itch_wum;1",
+          "mapKey": {
+            "name": "itch_um",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "itch_humpf",
+            "schema": "long"
+          },
+          "@type": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_glikk;1",
+          "mapKey": {
+            "name": "itch_nuh",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "itch_snee",
+            "schema": "short"
+          },
+          "@type": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:itch_thnad;1",
+          "mapKey": {
+            "name": "itch_spazz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "itch_floob",
+            "schema": "string"
+          },
+          "@type": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_jogg;1",
+          "mapKey": {
+            "name": "itch_flunn",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "itch_itch",
+            "schema": "time"
+          },
+          "@type": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:itch_vroo;1",
+          "mapKey": {
+            "name": "itch_hi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yekk_alpha",
+            "schema": "unsignedByte"
+          },
+          "@type": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:yekk_gamma;1",
+          "mapKey": {
+            "name": "yekk_delta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yekk_epsilon",
+            "schema": "unsignedInteger"
+          },
+          "@type": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:yekk_eta;1",
+          "mapKey": {
+            "name": "yekk_theta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "yekk_iota",
+            "schema": "unsignedLong"
+          },
+          "@type": [
+            {}
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValueContextConformsV4.json b/DTDL/v4/spec/Requirement-ClassMapValueContextConformsV4.json
new file mode 100644
index 00000000..ad246158
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValueContextConformsV4.json
@@ -0,0 +1,482 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "yekk_pi",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "yekk_omicron",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "yekk_xi",
+              "schema": "date",
+              "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "yekk_upsilon",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "yekk_tau",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "yekk_sigma",
+              "schema": "dateTime",
+              "@context": []
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "yekk_omega",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "yekk_psi",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "yekk_chi",
+              "schema": "decimal",
+              "@context": [
+                "dtmi:dtdl:extension:quantitativeTypes;1"
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "yekk_humpf",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "yekk_um",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "yekk_wum",
+              "schema": "double",
+              "@context": null
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "yekk_snee",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "yekk_nuh",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "yekk_glikk",
+              "schema": "duration",
+              "@context": 626
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "yekk_floob",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "yekk_spazz",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "yekk_thnad",
+              "schema": "float",
+              "@context": true
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "yekk_itch",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "yekk_flunn",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "yekk_jogg",
+              "schema": "integer",
+              "@context": [
+                null
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_alpha",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "yekk_hi",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "yekk_vroo",
+              "schema": "long",
+              "@context": [
+                626
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_epsilon",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "vroo_delta",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "vroo_gamma",
+              "schema": "short",
+              "@context": [
+                true
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_iota",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "vroo_theta",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "vroo_eta",
+              "schema": "string",
+              "@context": "dtmi:dtdl:extension:quantitativeTypes"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_nu",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "vroo_mu",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "vroo_lambda",
+              "schema": "time",
+              "@context": "http://dtdl/extension/quantitativeTypes/1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_rho",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "vroo_pi",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "vroo_omicron",
+              "schema": "unsignedByte",
+              "@context": "quantitativeTypes;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_phi",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "vroo_upsilon",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "vroo_tau",
+              "schema": "unsignedInteger",
+              "@context": {}
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_yuzz",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "vroo_omega",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "vroo_psi",
+              "schema": "unsignedLong",
+              "@context": {
+                "foo": "dtmi:foo:bar;1"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_fuddle",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "vroo_humpf",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "vroo_um",
+              "schema": "unsignedShort",
+              "@context": [
+                {}
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_quan",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "vroo_snee",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "vroo_nuh",
+              "schema": "uuid",
+              "@context": [
+                {
+                  "foo": "dtmi:foo:bar;1"
+                }
+              ]
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValueIdDuplicateV4.json b/DTDL/v4/spec/Requirement-ClassMapValueIdDuplicateV4.json
new file mode 100644
index 00000000..4e2f08e2
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValueIdDuplicateV4.json
@@ -0,0 +1,65 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:iota_zatz;1",
+          "@type": "Property",
+          "name": "iota_itch",
+          "schema": {
+            "@id": "dtmi:example:iota_zatz;1",
+            "@type": "Map",
+            "mapKey": {
+              "name": "iota_flunn",
+              "schema": "string"
+            },
+            "mapValue": {
+              "@id": "dtmi:example:iota_zatz;1",
+              "name": "iota_jogg",
+              "schema": "time"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:iota_yekk;1",
+          "@type": "Property",
+          "name": "kappa_alpha",
+          "schema": {
+            "@id": "dtmi:example:iota_yekk;1",
+            "@type": "Map",
+            "mapKey": {
+              "name": "iota_hi",
+              "schema": "string"
+            },
+            "mapValue": {
+              "@context": "dtmi:undefinedExtension:context;1",
+              "@id": "dtmi:example:iota_yekk;1",
+              "name": "iota_vroo",
+              "schema": "unsignedByte"
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValueIdIsDtmiV4.json b/DTDL/v4/spec/Requirement-ClassMapValueIdIsDtmiV4.json
new file mode 100644
index 00000000..4bd186d9
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValueIdIsDtmiV4.json
@@ -0,0 +1,1460 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_upsilon;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "gamma_phi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:foo:bar;7",
+            "name": "gamma_tau",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_omega;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "gamma_yuzz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:foo:bar;108675309",
+            "name": "gamma_psi",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_humpf;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "gamma_fuddle",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:foo:bar;999999999",
+            "name": "gamma_um",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_snee;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "gamma_quan",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:foo;1",
+            "name": "gamma_nuh",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_floob;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "gamma_zatz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:foo:bar",
+            "name": "gamma_spazz",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_itch;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "gamma_yekk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:foo:bar;3.14",
+            "name": "gamma_flunn",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_alpha;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "delta_beta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:foo:bar;3.141592",
+            "name": "gamma_hi",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_epsilon;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "delta_zeta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": null,
+            "name": "delta_delta",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_iota;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "delta_kappa",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": null,
+            "name": "delta_theta",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_nu;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "delta_xi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": 626,
+            "name": "delta_mu",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_rho;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "delta_sigma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": 626,
+            "name": "delta_pi",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_phi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "delta_chi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": true,
+            "name": "delta_upsilon",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_yuzz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "delta_wum",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": true,
+            "name": "delta_omega",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_fuddle;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "delta_glikk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": {
+              "@value": "dtmi:apparently:valid:identifier;3"
+            },
+            "name": "delta_humpf",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_quan;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "delta_thnad",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": {
+              "@value": "dtmi:apparently:valid:identifier;3"
+            },
+            "name": "delta_snee",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_zatz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "delta_jogg",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:foo:bar;0",
+            "name": "delta_floob",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:delta_yekk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "delta_vroo",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;0",
+            "name": "delta_itch",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_beta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "epsilon_gamma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:foo:bar;0.0",
+            "name": "epsilon_alpha",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_zeta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "epsilon_eta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;0.0",
+            "name": "epsilon_epsilon",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_kappa;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "epsilon_lambda",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:foo:bar;1234567890",
+            "name": "epsilon_iota",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_xi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "epsilon_omicron",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;1234567890",
+            "name": "epsilon_nu",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_sigma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "epsilon_tau",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:foo:bar;1a",
+            "name": "epsilon_rho",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_chi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "epsilon_psi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;1a",
+            "name": "epsilon_phi",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_wum;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "epsilon_um",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:foo:bar;3.0",
+            "name": "epsilon_yuzz",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_glikk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "epsilon_nuh",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;3.0",
+            "name": "epsilon_fuddle",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_thnad;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "epsilon_spazz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:foo:bar;3.1415926",
+            "name": "epsilon_quan",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_jogg;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "epsilon_flunn",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;3.1415926",
+            "name": "epsilon_zatz",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:epsilon_vroo;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "epsilon_hi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:foo:bar;6.02",
+            "name": "epsilon_yekk",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_gamma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "zeta_delta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;6.02",
+            "name": "zeta_beta",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_eta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "zeta_theta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:foo:bar;0.1",
+            "name": "zeta_zeta",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_lambda;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "zeta_mu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;0.1",
+            "name": "zeta_kappa",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_omicron;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "zeta_pi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:foo:bar;01",
+            "name": "zeta_xi",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_tau;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "zeta_upsilon",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;01",
+            "name": "zeta_sigma",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_psi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "zeta_omega",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:foo:bar;",
+            "name": "zeta_chi",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_um;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "zeta_humpf",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar;",
+            "name": "zeta_wum",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_nuh;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "zeta_snee",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:test:invalidId_;1",
+            "name": "zeta_glikk",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_spazz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "zeta_floob",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:test:invalidId_;1",
+            "name": "zeta_thnad",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_flunn;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "zeta_itch",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:test:_invalidUserId;1",
+            "name": "zeta_jogg",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zeta_hi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "eta_alpha",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:test:_invalidUserId;1",
+            "name": "zeta_vroo",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_delta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "eta_epsilon",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:test:1seg;1",
+            "name": "eta_gamma",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_theta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "eta_iota",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:test:1seg;1",
+            "name": "eta_eta",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_mu;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "eta_nu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:foo:bar.baz;1",
+            "name": "eta_lambda",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_pi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "eta_rho",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo:bar.baz;1",
+            "name": "eta_omicron",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_upsilon;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "eta_phi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:foo::bar;1",
+            "name": "eta_tau",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_omega;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "eta_yuzz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:foo::bar;1",
+            "name": "eta_psi",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_humpf;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "eta_fuddle",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "urn:foo:bar:1",
+            "name": "eta_um",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_snee;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "eta_quan",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "urn:foo:bar:1",
+            "name": "eta_nuh",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_floob;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "eta_zatz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "http://foo/bar/baz",
+            "name": "eta_spazz",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:eta_itch;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "eta_yekk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "http://foo/bar/baz",
+            "name": "eta_flunn",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_alpha;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "theta_beta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:;1",
+            "name": "eta_hi",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_epsilon;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "theta_zeta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:;1",
+            "name": "theta_delta",
+            "schema": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_iota;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "theta_kappa",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:dtdl:example;1",
+            "name": "theta_theta",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_nu;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "theta_xi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:dtdl:example;1",
+            "name": "theta_mu",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_rho;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "theta_sigma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": "dtmi:standard:example;1",
+            "name": "theta_pi",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_phi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "theta_chi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:standard:example;1",
+            "name": "theta_upsilon",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValueIdNotArrayV4.json b/DTDL/v4/spec/Requirement-ClassMapValueIdNotArrayV4.json
new file mode 100644
index 00000000..989010b3
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValueIdNotArrayV4.json
@@ -0,0 +1,401 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_yuzz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "theta_wum",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": [
+              "dtmi:foo:bar;7"
+            ],
+            "name": "theta_omega",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_fuddle;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "theta_glikk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;7"
+            ],
+            "name": "theta_humpf",
+            "schema": "boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_quan;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "theta_thnad",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": [
+              "dtmi:foo:bar;108675309"
+            ],
+            "name": "theta_snee",
+            "schema": "byte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_zatz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "theta_jogg",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;108675309"
+            ],
+            "name": "theta_floob",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:theta_yekk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "theta_vroo",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": [
+              "dtmi:foo:bar;999999999"
+            ],
+            "name": "theta_itch",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_beta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "iota_gamma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;999999999"
+            ],
+            "name": "iota_alpha",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_zeta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "iota_eta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": [
+              "dtmi:foo;1"
+            ],
+            "name": "iota_epsilon",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_kappa;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "iota_lambda",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo;1"
+            ],
+            "name": "iota_iota",
+            "schema": "double"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_xi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "iota_omicron",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": [
+              "dtmi:foo:bar"
+            ],
+            "name": "iota_nu",
+            "schema": "duration"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_sigma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "iota_tau",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar"
+            ],
+            "name": "iota_rho",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_chi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "iota_psi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": [
+              "dtmi:foo:bar;3.14"
+            ],
+            "name": "iota_phi",
+            "schema": "integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_wum;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "iota_um",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;3.14"
+            ],
+            "name": "iota_yuzz",
+            "schema": "long"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_glikk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "iota_nuh",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@id": [
+              "dtmi:foo:bar;3.141592"
+            ],
+            "name": "iota_fuddle",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:iota_thnad;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "iota_spazz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": [
+              "dtmi:foo:bar;3.141592"
+            ],
+            "name": "iota_quan",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValueInvalidKeywordsV4.json b/DTDL/v4/spec/Requirement-ClassMapValueInvalidKeywordsV4.json
new file mode 100644
index 00000000..b8c5eb45
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValueInvalidKeywordsV4.json
@@ -0,0 +1,214 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_iota;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "tau_kappa",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "tau_theta",
+            "schema": "time",
+            "@graph": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_nu;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "tau_xi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "tau_mu",
+            "schema": "unsignedByte",
+            "@graph": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_rho;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "tau_sigma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "tau_pi",
+            "schema": "unsignedInteger",
+            "@value": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_phi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "tau_chi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "tau_upsilon",
+            "schema": "unsignedLong",
+            "@value": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_yuzz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "tau_wum",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "tau_omega",
+            "schema": "unsignedShort",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_fuddle;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "tau_glikk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "tau_humpf",
+            "schema": "uuid",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_quan;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "tau_thnad",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "tau_snee",
+            "schema": "boolean",
+            "@foobar": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_zatz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "tau_jogg",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "tau_floob",
+            "schema": "byte",
+            "@foobar": true
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValuePropertyCommentStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassMapValuePropertyCommentStringLengthV4.json
new file mode 100644
index 00000000..e0ea93c1
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValuePropertyCommentStringLengthV4.json
@@ -0,0 +1,81 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_alpha;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "mu_beta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "lambda_hi",
+            "schema": "unsignedShort",
+            "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_epsilon;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "mu_zeta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "mu_delta",
+            "schema": "uuid",
+            "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_iota;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "mu_kappa",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "mu_theta",
+            "schema": "boolean",
+            "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValuePropertyCommentStringV4.json b/DTDL/v4/spec/Requirement-ClassMapValuePropertyCommentStringV4.json
new file mode 100644
index 00000000..526cf5c6
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValuePropertyCommentStringV4.json
@@ -0,0 +1,582 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_gamma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "kappa_delta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "kappa_beta",
+            "schema": "unsignedInteger",
+            "comment": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_eta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "kappa_theta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "kappa_zeta",
+            "schema": "unsignedLong",
+            "comment": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_lambda;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "kappa_mu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "kappa_kappa",
+            "schema": "unsignedShort",
+            "comment": {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_omicron;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "kappa_pi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "kappa_xi",
+            "schema": "uuid",
+            "comment": [
+              {
+                "@value": "hello",
+                "@type": "xsd:string"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_tau;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "kappa_upsilon",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "kappa_sigma",
+            "schema": "boolean",
+            "comment": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_psi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "kappa_omega",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "kappa_chi",
+            "schema": "byte",
+            "comment": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_um;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "kappa_humpf",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "kappa_wum",
+            "schema": "bytes",
+            "comment": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_nuh;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "kappa_snee",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "kappa_glikk",
+            "schema": "date",
+            "comment": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_spazz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "kappa_floob",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "kappa_thnad",
+            "schema": "dateTime",
+            "comment": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_flunn;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "kappa_itch",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "kappa_jogg",
+            "schema": "decimal",
+            "comment": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:kappa_hi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "lambda_alpha",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "kappa_vroo",
+            "schema": "double",
+            "comment": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_delta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "lambda_epsilon",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "lambda_gamma",
+            "schema": "duration",
+            "comment": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_theta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "lambda_iota",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "lambda_eta",
+            "schema": "float",
+            "comment": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_mu;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "lambda_nu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "lambda_lambda",
+            "schema": "integer",
+            "comment": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_pi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "lambda_rho",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "lambda_omicron",
+            "schema": "long",
+            "comment": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_upsilon;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "lambda_phi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "lambda_tau",
+            "schema": "short",
+            "comment": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_omega;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "lambda_yuzz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "lambda_psi",
+            "schema": "string",
+            "comment": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_humpf;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "lambda_fuddle",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "lambda_um",
+            "schema": "time",
+            "comment": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_snee;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "lambda_quan",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "lambda_nuh",
+            "schema": "unsignedByte",
+            "comment": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_floob;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "lambda_zatz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "lambda_spazz",
+            "schema": "unsignedInteger",
+            "comment": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:lambda_itch;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "lambda_yekk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "lambda_flunn",
+            "schema": "unsignedLong",
+            "comment": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValuePropertyCommentTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassMapValuePropertyCommentTermAndDtmiV4.json
new file mode 100644
index 00000000..e8dd1203
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValuePropertyCommentTermAndDtmiV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_glikk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "mu_nuh",
+            "schema": "string"
+          },
+          "mapValue": {
+            "comment": "mu_um",
+            "dtmi:dtdl:property:comment;4": "mu_humpf",
+            "name": "mu_fuddle",
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_floob;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "mu_zatz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "comment": "mu_quan",
+            "dtmi:dtdl:property:comment;4": "mu_thnad",
+            "name": "mu_spazz",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValuePropertyDescriptionLangStringV4.json b/DTDL/v4/spec/Requirement-ClassMapValuePropertyDescriptionLangStringV4.json
new file mode 100644
index 00000000..d70482b3
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValuePropertyDescriptionLangStringV4.json
@@ -0,0 +1,674 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:mu_itch;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "mu_yekk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "mu_flunn",
+            "schema": "double",
+            "description": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_alpha;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nu_beta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "mu_hi",
+            "schema": "duration",
+            "description": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_epsilon;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nu_zeta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "nu_delta",
+            "schema": "float",
+            "description": {
+              "en": "hello"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_iota;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nu_kappa",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "nu_theta",
+            "schema": "integer",
+            "description": [
+              {
+                "@value": "hello",
+                "@language": "en"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_nu;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nu_xi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "nu_mu",
+            "schema": "long",
+            "description": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_rho;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nu_sigma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "nu_pi",
+            "schema": "short",
+            "description": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_phi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nu_chi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "nu_upsilon",
+            "schema": "string",
+            "description": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_yuzz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nu_wum",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "nu_omega",
+            "schema": "time",
+            "description": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_fuddle;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nu_glikk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "nu_humpf",
+            "schema": "unsignedByte",
+            "description": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_quan;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nu_thnad",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "nu_snee",
+            "schema": "unsignedInteger",
+            "description": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_zatz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nu_jogg",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "nu_floob",
+            "schema": "unsignedLong",
+            "description": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nu_yekk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nu_vroo",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "nu_itch",
+            "schema": "unsignedShort",
+            "description": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_beta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_gamma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "xi_alpha",
+            "schema": "uuid",
+            "description": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_zeta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_eta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "xi_epsilon",
+            "schema": "boolean",
+            "description": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_kappa;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_lambda",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "xi_iota",
+            "schema": "byte",
+            "description": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_xi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_omicron",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "xi_nu",
+            "schema": "bytes",
+            "description": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_sigma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_tau",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "xi_rho",
+            "schema": "date",
+            "description": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_chi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_psi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "xi_phi",
+            "schema": "dateTime",
+            "description": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_wum;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_um",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "xi_yuzz",
+            "schema": "decimal",
+            "description": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_glikk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_nuh",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "xi_fuddle",
+            "schema": "double",
+            "description": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_thnad;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_spazz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "xi_quan",
+            "schema": "duration",
+            "description": {
+              "@value": "hello",
+              "@language": "en"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_jogg;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_flunn",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "xi_zatz",
+            "schema": "float",
+            "description": {
+              "@value": "hello",
+              "@language": "en"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:xi_vroo;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "xi_hi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "xi_yekk",
+            "schema": "integer",
+            "description": [
+              {
+                "en": "hello"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_gamma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omicron_delta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "omicron_beta",
+            "schema": "long",
+            "description": [
+              {
+                "en": "hello"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValuePropertyDescriptionStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassMapValuePropertyDescriptionStringLengthV4.json
new file mode 100644
index 00000000..e8228358
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValuePropertyDescriptionStringLengthV4.json
@@ -0,0 +1,81 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_eta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omicron_theta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omicron_zeta",
+            "schema": "short",
+            "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_lambda;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omicron_mu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "omicron_kappa",
+            "schema": "string",
+            "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_omicron;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omicron_pi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "omicron_xi",
+            "schema": "time",
+            "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValuePropertyDescriptionTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassMapValuePropertyDescriptionTermAndDtmiV4.json
new file mode 100644
index 00000000..4f12932e
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValuePropertyDescriptionTermAndDtmiV4.json
@@ -0,0 +1,65 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_floob;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omicron_zatz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "description": [
+              "omicron_quan"
+            ],
+            "dtmi:dtdl:property:description;4": [
+              "omicron_thnad"
+            ],
+            "name": "omicron_spazz",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omicron_vroo;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "omicron_hi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "description": [
+              "omicron_flunn"
+            ],
+            "dtmi:dtdl:property:description;4": [
+              "omicron_itch"
+            ],
+            "name": "omicron_yekk",
+            "schema": "uuid"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValuePropertyDisplayNameLangStringV4.json b/DTDL/v4/spec/Requirement-ClassMapValuePropertyDisplayNameLangStringV4.json
new file mode 100644
index 00000000..09bcfeb8
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValuePropertyDisplayNameLangStringV4.json
@@ -0,0 +1,674 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_gamma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "pi_delta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "pi_beta",
+            "schema": "boolean",
+            "displayName": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_eta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "pi_theta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "pi_zeta",
+            "schema": "byte",
+            "displayName": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_lambda;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "pi_mu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "pi_kappa",
+            "schema": "bytes",
+            "displayName": {
+              "en": "hello"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_omicron;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "pi_pi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "pi_xi",
+            "schema": "date",
+            "displayName": [
+              {
+                "@value": "hello",
+                "@language": "en"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_tau;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "pi_upsilon",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "pi_sigma",
+            "schema": "dateTime",
+            "displayName": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_psi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "pi_omega",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "pi_chi",
+            "schema": "decimal",
+            "displayName": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_um;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "pi_humpf",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "pi_wum",
+            "schema": "double",
+            "displayName": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_nuh;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "pi_snee",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "pi_glikk",
+            "schema": "duration",
+            "displayName": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_spazz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "pi_floob",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "pi_thnad",
+            "schema": "float",
+            "displayName": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_flunn;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "pi_itch",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "pi_jogg",
+            "schema": "integer",
+            "displayName": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:pi_hi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_alpha",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "pi_vroo",
+            "schema": "long",
+            "displayName": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_delta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_epsilon",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_gamma",
+            "schema": "short",
+            "displayName": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_theta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_iota",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "rho_eta",
+            "schema": "string",
+            "displayName": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_mu;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_nu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_lambda",
+            "schema": "time",
+            "displayName": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_pi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_rho",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "rho_omicron",
+            "schema": "unsignedByte",
+            "displayName": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_upsilon;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_phi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_tau",
+            "schema": "unsignedInteger",
+            "displayName": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_omega;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_yuzz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "rho_psi",
+            "schema": "unsignedLong",
+            "displayName": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_humpf;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_fuddle",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_um",
+            "schema": "unsignedShort",
+            "displayName": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_snee;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_quan",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "rho_nuh",
+            "schema": "uuid",
+            "displayName": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_floob;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_zatz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_spazz",
+            "schema": "boolean",
+            "displayName": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:rho_itch;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "rho_yekk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "rho_flunn",
+            "schema": "byte",
+            "displayName": {
+              "@value": "hello",
+              "@language": "en"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_alpha;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "sigma_beta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "rho_hi",
+            "schema": "bytes",
+            "displayName": {
+              "@value": "hello",
+              "@language": "en"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_epsilon;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "sigma_zeta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "sigma_delta",
+            "schema": "date",
+            "displayName": [
+              {
+                "en": "hello"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_iota;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "sigma_kappa",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "sigma_theta",
+            "schema": "dateTime",
+            "displayName": [
+              {
+                "en": "hello"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValuePropertyDisplayNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassMapValuePropertyDisplayNameStringLengthV4.json
new file mode 100644
index 00000000..4d7b8b8b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValuePropertyDisplayNameStringLengthV4.json
@@ -0,0 +1,81 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_nu;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "sigma_xi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "sigma_mu",
+            "schema": "decimal",
+            "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_rho;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "sigma_sigma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "sigma_pi",
+            "schema": "double",
+            "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_phi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "sigma_chi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "sigma_upsilon",
+            "schema": "duration",
+            "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValuePropertyDisplayNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassMapValuePropertyDisplayNameTermAndDtmiV4.json
new file mode 100644
index 00000000..f3354416
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValuePropertyDisplayNameTermAndDtmiV4.json
@@ -0,0 +1,65 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:sigma_vroo;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "sigma_hi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "displayName": [
+              "sigma_flunn"
+            ],
+            "dtmi:dtdl:property:displayName;4": [
+              "sigma_itch"
+            ],
+            "name": "sigma_yekk",
+            "schema": "short"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:tau_epsilon;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "tau_zeta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "displayName": [
+              "tau_beta"
+            ],
+            "dtmi:dtdl:property:displayName;4": [
+              "tau_gamma"
+            ],
+            "name": "tau_delta",
+            "schema": "string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValuePropertyFormallyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Requirement-ClassMapValuePropertyFormallyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..6f59a6de
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValuePropertyFormallyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,108 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_xi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "upsilon_omicron",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "upsilon_nu",
+            "schema": "double",
+            "dtmi:foo:bar;1": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_sigma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "upsilon_tau",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "upsilon_rho",
+            "schema": "duration",
+            "dtmi:foo:bar;1": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_chi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "upsilon_psi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "upsilon_phi",
+            "schema": "float",
+            "boolean": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_wum;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "upsilon_um",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "upsilon_yuzz",
+            "schema": "integer",
+            "boolean": null
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValuePropertyFormallyUndefinedTermV4.json b/DTDL/v4/spec/Requirement-ClassMapValuePropertyFormallyUndefinedTermV4.json
new file mode 100644
index 00000000..c25d6f0a
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValuePropertyFormallyUndefinedTermV4.json
@@ -0,0 +1,55 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_lambda;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "phi_mu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "phi_kappa",
+            "schema": "unsignedLong",
+            "foobar": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_omicron;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "phi_pi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "phi_xi",
+            "schema": "unsignedShort",
+            "foobar": {}
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValuePropertyInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassMapValuePropertyInvalidDtmiV4.json
new file mode 100644
index 00000000..3e1df6c9
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValuePropertyInvalidDtmiV4.json
@@ -0,0 +1,63 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_glikk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "upsilon_nuh",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@type": [
+              "MapValue",
+              "Foobar"
+            ],
+            "name": "upsilon_fuddle",
+            "schema": "long",
+            "dtmi:foo//bar": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_thnad;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "upsilon_spazz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "MapValue",
+              "Foobar"
+            ],
+            "name": "upsilon_quan",
+            "schema": "short",
+            "dtmi:foo//bar": 626
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValuePropertyNamePatternV4.json b/DTDL/v4/spec/Requirement-ClassMapValuePropertyNamePatternV4.json
new file mode 100644
index 00000000..218ba336
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValuePropertyNamePatternV4.json
@@ -0,0 +1,637 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_kappa;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "glikk_lambda",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "string",
+            "name": "EARTH"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_nu;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "glikk_xi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "time",
+            "name": "Air"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_pi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "glikk_rho",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "unsignedByte",
+            "name": "fire"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_tau;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "glikk_upsilon",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "unsignedInteger",
+            "name": "hello_world"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_chi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "glikk_psi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "unsignedLong",
+            "name": "Anarchy99"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_yuzz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "glikk_wum",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "unsignedShort",
+            "name": "23skidoo"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_humpf;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "glikk_fuddle",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "uuid",
+            "name": "23skidoo"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_nuh;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "glikk_snee",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "boolean",
+            "name": "626"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_thnad;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "glikk_spazz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "byte",
+            "name": "626"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_zatz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "glikk_jogg",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "bytes",
+            "name": "goodbye-world"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_itch;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "glikk_yekk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "date",
+            "name": "goodbye-world"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_hi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nuh_alpha",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "dateTime",
+            "name": "_haha"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_gamma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nuh_delta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "decimal",
+            "name": "_haha"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_zeta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nuh_eta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "double",
+            "name": "toodaloo_"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_iota;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nuh_kappa",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "duration",
+            "name": "toodaloo_"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_mu;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nuh_nu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "float",
+            "name": "pro:con"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_omicron;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nuh_pi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "integer",
+            "name": "pro:con"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_sigma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nuh_tau",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "long",
+            "name": "mish/mash"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_phi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nuh_chi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "short",
+            "name": "mish/mash"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_omega;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nuh_yuzz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "string",
+            "name": "#tag"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_um;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nuh_humpf",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "time",
+            "name": "#tag"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_glikk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nuh_nuh",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "unsignedByte",
+            "name": "@tweet"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_quan;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nuh_thnad",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "unsignedInteger",
+            "name": "@tweet"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_floob;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nuh_zatz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "unsignedLong",
+            "name": "$money"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_flunn;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "nuh_itch",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "unsignedShort",
+            "name": "$money"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValuePropertyNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassMapValuePropertyNameStringLengthV4.json
new file mode 100644
index 00000000..6001f7f2
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValuePropertyNameStringLengthV4.json
@@ -0,0 +1,78 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_alpha;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "glikk_beta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "integer",
+            "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_delta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "glikk_epsilon",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "long",
+            "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_eta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "glikk_theta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "short",
+            "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValuePropertyNameStringV4.json b/DTDL/v4/spec/Requirement-ClassMapValuePropertyNameStringV4.json
new file mode 100644
index 00000000..e84c2348
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValuePropertyNameStringV4.json
@@ -0,0 +1,587 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_phi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "humpf_chi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "double",
+            "name": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_omega;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "humpf_yuzz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "duration",
+            "name": [
+              "hello"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_um;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "humpf_humpf",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "float",
+            "name": {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_glikk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "humpf_nuh",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "integer",
+            "name": [
+              {
+                "@value": "hello",
+                "@type": "xsd:string"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_quan;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "humpf_thnad",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "long",
+            "name": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_floob;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "humpf_zatz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "short",
+            "name": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_flunn;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "humpf_itch",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "string",
+            "name": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_vroo;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "humpf_hi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "time",
+            "name": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_beta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "fuddle_gamma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "unsignedByte",
+            "name": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_epsilon;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "fuddle_zeta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "unsignedInteger",
+            "name": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_theta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "fuddle_iota",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "unsignedLong",
+            "name": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_lambda;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "fuddle_mu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "unsignedShort",
+            "name": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_xi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "fuddle_omicron",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "uuid",
+            "name": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_rho;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "fuddle_sigma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "boolean",
+            "name": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_upsilon;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "fuddle_phi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "byte",
+            "name": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_psi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "fuddle_omega",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "bytes",
+            "name": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_wum;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "fuddle_um",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "date",
+            "name": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_fuddle;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "fuddle_glikk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "dateTime",
+            "name": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_snee;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "fuddle_quan",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "decimal",
+            "name": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_spazz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "fuddle_floob",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "double",
+            "name": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_jogg;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "fuddle_flunn",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "duration",
+            "name": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_yekk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "fuddle_vroo",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "float",
+            "name": []
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValuePropertyNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassMapValuePropertyNameTermAndDtmiV4.json
new file mode 100644
index 00000000..d91ab85e
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValuePropertyNameTermAndDtmiV4.json
@@ -0,0 +1,55 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_nu;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "snee_xi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "snee_lambda",
+            "dtmi:dtdl:property:name;4": "snee_mu",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_sigma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "snee_tau",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "snee_pi",
+            "dtmi:dtdl:property:name;4": "snee_rho",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValuePropertyNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassMapValuePropertyNotDtmiNorTermV4.json
new file mode 100644
index 00000000..80f44983
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValuePropertyNotDtmiNorTermV4.json
@@ -0,0 +1,63 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_jogg;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "upsilon_flunn",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@type": [
+              "MapValue",
+              "Foobar"
+            ],
+            "name": "upsilon_zatz",
+            "schema": "string",
+            "http://foo.com/bar": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:upsilon_vroo;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "upsilon_hi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "MapValue",
+              "Foobar"
+            ],
+            "name": "upsilon_yekk",
+            "schema": "time",
+            "http://foo.com/bar": true
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValuePropertySchemaElementV4.json b/DTDL/v4/spec/Requirement-ClassMapValuePropertySchemaElementV4.json
new file mode 100644
index 00000000..b4cc9623
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValuePropertySchemaElementV4.json
@@ -0,0 +1,1013 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "snee_psi",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "snee_chi",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "snee_phi",
+              "schema": {
+                "@type": "Array",
+                "elementSchema": "dateTime"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "snee_um",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "snee_wum",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "snee_yuzz",
+              "schema": [
+                {
+                  "@type": "Array",
+                  "elementSchema": "decimal"
+                }
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Array",
+          "elementSchema": "double"
+        },
+        "contents": {
+          "@type": "Property",
+          "name": "snee_snee",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "snee_nuh",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "snee_glikk",
+              "schema": "dtmi:ex:dependentRef;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Array",
+          "elementSchema": "duration"
+        },
+        "contents": {
+          "@type": "Property",
+          "name": "snee_floob",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "snee_spazz",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "snee_thnad",
+              "schema": [
+                "dtmi:ex:dependentRef;1"
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "snee_itch",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "snee_flunn",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "snee_jogg",
+              "schema": {
+                "@id": "dtmi:example:snee_zatz;1",
+                "@type": "Array",
+                "elementSchema": "double",
+                "@context": "dtmi:dtdl:context;2"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "quan_beta",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "quan_alpha",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "snee_hi",
+              "schema": {
+                "@id": "dtmi:example:snee_vroo;1",
+                "@type": "Array",
+                "elementSchema": "duration",
+                "@context": "dtmi:dtdl:context;3"
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Array",
+          "elementSchema": "short"
+        },
+        "contents": {
+          "@type": "Property",
+          "name": "quan_eta",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "quan_zeta",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "quan_epsilon",
+              "schema": [
+                {
+                  "@type": "Array",
+                  "elementSchema": "long"
+                },
+                "dtmi:ex:dependentRef;1"
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Array",
+          "elementSchema": "time"
+        },
+        "contents": {
+          "@type": "Property",
+          "name": "quan_lambda",
+          "schema": {
+            "@type": "Map",
+            "mapKey": {
+              "name": "quan_kappa",
+              "schema": "string"
+            },
+            "mapValue": {
+              "@context": "dtmi:undefinedExtension:context;1",
+              "name": "quan_iota",
+              "schema": [
+                {
+                  "@type": "Array",
+                  "elementSchema": "string"
+                },
+                "dtmi:ex:dependentRef;1"
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_nu;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "quan_xi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "quan_mu",
+            "schema": "float"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_rho;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "quan_sigma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "quan_pi",
+            "schema": [
+              "float"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_phi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "quan_chi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "quan_upsilon",
+            "schema": "dtmi:dtdl:instance:Schema:float;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_yuzz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "quan_wum",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "quan_omega",
+            "schema": [
+              "dtmi:dtdl:instance:Schema:float;4"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_fuddle;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "quan_glikk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "quan_humpf",
+            "schema": "point"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_quan;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "quan_thnad",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "quan_snee",
+            "schema": [
+              "point"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_zatz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "quan_jogg",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "quan_floob",
+            "schema": "dtmi:standard:schema:geospatial:point;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_yekk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "quan_vroo",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "quan_itch",
+            "schema": [
+              "dtmi:standard:schema:geospatial:point;4"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_beta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "thnad_gamma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "thnad_alpha",
+            "schema": "Foobar"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_zeta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "thnad_eta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "thnad_epsilon",
+            "schema": "Foobar"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_kappa;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "thnad_lambda",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "thnad_iota",
+            "schema": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_xi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "thnad_omicron",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "thnad_nu",
+            "schema": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_sigma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "thnad_tau",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "thnad_rho",
+            "schema": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_chi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "thnad_psi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "thnad_phi",
+            "schema": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_wum;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "thnad_um",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "thnad_yuzz",
+            "schema": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_glikk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "thnad_nuh",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "thnad_fuddle",
+            "schema": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_thnad;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "thnad_spazz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "thnad_quan",
+            "schema": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_jogg;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "thnad_flunn",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "thnad_zatz",
+            "schema": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_vroo;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "thnad_hi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "thnad_yekk",
+            "schema": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_gamma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "spazz_delta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "spazz_beta",
+            "schema": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_eta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "spazz_theta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "spazz_zeta",
+            "schema": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_lambda;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "spazz_mu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "spazz_kappa",
+            "schema": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_omicron;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "spazz_pi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "spazz_xi",
+            "schema": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_tau;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "spazz_upsilon",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "spazz_sigma",
+            "schema": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_psi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "spazz_omega",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "spazz_chi",
+            "schema": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_um;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "spazz_humpf",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "spazz_wum",
+            "schema": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_nuh;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "spazz_snee",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "spazz_glikk",
+            "schema": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_spazz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "spazz_floob",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "spazz_thnad",
+            "schema": []
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValuePropertySchemaTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassMapValuePropertySchemaTermAndDtmiV4.json
new file mode 100644
index 00000000..632ab39b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValuePropertySchemaTermAndDtmiV4.json
@@ -0,0 +1,55 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_wum;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "itch_um",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "itch_yuzz",
+            "schema": "string",
+            "dtmi:dtdl:property:schema;4": "time"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:itch_glikk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "itch_nuh",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "itch_fuddle",
+            "schema": "unsignedByte",
+            "dtmi:dtdl:property:schema;4": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValuePropertySchemaTypeConformanceV4.json b/DTDL/v4/spec/Requirement-ClassMapValuePropertySchemaTypeConformanceV4.json
new file mode 100644
index 00000000..37fb1892
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValuePropertySchemaTypeConformanceV4.json
@@ -0,0 +1,854 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_epsilon;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "floob_zeta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "floob_delta",
+            "schema": {
+              "@id": "dtmi:example:floob_gamma;1",
+              "elementSchema": "unsignedByte",
+              "@type": "Array"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_lambda;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "floob_mu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "floob_kappa",
+            "schema": {
+              "@id": "dtmi:example:floob_theta;1",
+              "name": "floob_iota",
+              "@type": "Command"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_rho;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "floob_sigma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "floob_pi",
+            "schema": {
+              "@id": "dtmi:example:floob_xi;1",
+              "name": "floob_omicron",
+              "@type": "Command"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_psi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "floob_omega",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "floob_chi",
+            "schema": {
+              "@id": "dtmi:example:floob_upsilon;1",
+              "name": "floob_phi",
+              "schema": "unsignedInteger",
+              "@type": "CommandRequest"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_fuddle;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "floob_glikk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "floob_humpf",
+            "schema": {
+              "@id": "dtmi:example:floob_wum;1",
+              "name": "floob_um",
+              "schema": "unsignedLong",
+              "@type": "CommandRequest"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_spazz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "floob_floob",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "floob_thnad",
+            "schema": {
+              "@id": "dtmi:example:floob_snee;1",
+              "name": "floob_quan",
+              "schema": "unsignedShort",
+              "@type": "CommandResponse"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_yekk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "floob_vroo",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "floob_itch",
+            "schema": {
+              "@id": "dtmi:example:floob_jogg;1",
+              "name": "floob_flunn",
+              "schema": "uuid",
+              "@type": "CommandResponse"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_epsilon;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "zatz_zeta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "zatz_delta",
+            "schema": {
+              "@id": "dtmi:example:zatz_alpha;1",
+              "name": "zatz_beta",
+              "schema": {
+                "@id": "dtmi:example:zatz_gamma;1",
+                "@type": "Interface"
+              },
+              "@type": "Component"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_mu;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "zatz_nu",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zatz_lambda",
+            "schema": {
+              "@id": "dtmi:example:zatz_theta;1",
+              "name": "zatz_iota",
+              "schema": {
+                "@id": "dtmi:example:zatz_kappa;1",
+                "@type": "Interface"
+              },
+              "@type": "Component"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_rho;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "zatz_sigma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "zatz_pi",
+            "schema": {
+              "@id": "dtmi:example:zatz_omicron;1",
+              "valueSchema": "integer",
+              "@type": "Enum"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_psi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "zatz_omega",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "zatz_chi",
+            "schema": {
+              "@id": "dtmi:example:zatz_upsilon;1",
+              "enumValue": 1867,
+              "name": "zatz_phi",
+              "@type": "EnumValue"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_fuddle;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "zatz_glikk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zatz_humpf",
+            "schema": {
+              "@id": "dtmi:example:zatz_wum;1",
+              "enumValue": 1868,
+              "name": "zatz_um",
+              "@type": "EnumValue"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_spazz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "zatz_floob",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "zatz_thnad",
+            "schema": {
+              "@id": "dtmi:example:zatz_snee;1",
+              "name": "zatz_quan",
+              "schema": "boolean",
+              "@type": "Field"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:zatz_yekk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "zatz_vroo",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "zatz_itch",
+            "schema": {
+              "@id": "dtmi:example:zatz_jogg;1",
+              "name": "zatz_flunn",
+              "schema": "byte",
+              "@type": "Field"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_gamma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "jogg_delta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "jogg_beta",
+            "schema": {
+              "@id": "dtmi:example:jogg_alpha;1",
+              "@type": "Interface"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_theta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "jogg_iota",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "jogg_eta",
+            "schema": {
+              "@id": "dtmi:example:jogg_zeta;1",
+              "@type": "Interface"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_omicron;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "jogg_pi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "jogg_xi",
+            "schema": {
+              "@id": "dtmi:example:jogg_lambda;1",
+              "mapKey": {
+                "name": "jogg_mu",
+                "schema": "string"
+              },
+              "mapValue": {
+                "name": "jogg_nu",
+                "schema": "bytes"
+              },
+              "@type": "Map"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_phi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "jogg_chi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "jogg_upsilon",
+            "schema": {
+              "@id": "dtmi:example:jogg_sigma;1",
+              "name": "jogg_tau",
+              "schema": "string",
+              "@type": "MapKey"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_um;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "jogg_humpf",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "jogg_wum",
+            "schema": {
+              "@id": "dtmi:example:jogg_omega;1",
+              "name": "jogg_yuzz",
+              "schema": "string",
+              "@type": "MapKey"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_quan;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "jogg_thnad",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "jogg_snee",
+            "schema": {
+              "@id": "dtmi:example:jogg_glikk;1",
+              "name": "jogg_nuh",
+              "schema": "date",
+              "@type": "MapValue"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:jogg_flunn;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "jogg_itch",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "jogg_jogg",
+            "schema": {
+              "@id": "dtmi:example:jogg_floob;1",
+              "name": "jogg_zatz",
+              "schema": "dateTime",
+              "@type": "MapValue"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_alpha;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "flunn_beta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "jogg_hi",
+            "schema": {
+              "@id": "dtmi:example:jogg_vroo;1",
+              "@type": "Object"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_eta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "flunn_theta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "flunn_zeta",
+            "schema": {
+              "@id": "dtmi:example:flunn_delta;1",
+              "name": "flunn_epsilon",
+              "schema": "decimal",
+              "@type": "Property"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_nu;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "flunn_xi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "flunn_mu",
+            "schema": {
+              "@id": "dtmi:example:flunn_kappa;1",
+              "name": "flunn_lambda",
+              "schema": "double",
+              "@type": "Property"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_tau;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "flunn_upsilon",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "flunn_sigma",
+            "schema": {
+              "@id": "dtmi:example:flunn_pi;1",
+              "name": "flunn_rho",
+              "@type": "Relationship"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_yuzz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "flunn_wum",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "flunn_omega",
+            "schema": {
+              "@id": "dtmi:example:flunn_chi;1",
+              "name": "flunn_psi",
+              "@type": "Relationship"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_nuh;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "flunn_snee",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "flunn_glikk",
+            "schema": {
+              "@id": "dtmi:example:flunn_humpf;1",
+              "name": "flunn_fuddle",
+              "schema": "duration",
+              "@type": "Telemetry"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:flunn_zatz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "flunn_jogg",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "flunn_floob",
+            "schema": {
+              "@id": "dtmi:example:flunn_thnad;1",
+              "name": "flunn_spazz",
+              "schema": "float",
+              "@type": "Telemetry"
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValueRequiredPropertiesV4.json b/DTDL/v4/spec/Requirement-ClassMapValueRequiredPropertiesV4.json
new file mode 100644
index 00000000..9959cdf7
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValueRequiredPropertiesV4.json
@@ -0,0 +1,100 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_eta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "humpf_theta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "schema": "dateTime"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_kappa;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "humpf_lambda",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "schema": "decimal"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_xi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "humpf_omicron",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "humpf_nu"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_sigma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "humpf_tau",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "humpf_rho"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValueTypeIncludesInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassMapValueTypeIncludesInvalidDtmiV4.json
new file mode 100644
index 00000000..cf3f4c64
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValueTypeIncludesInvalidDtmiV4.json
@@ -0,0 +1,61 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_flunn;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "beta_itch",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@type": [
+              "MapValue",
+              "dtmi:foo//bar"
+            ],
+            "name": "beta_jogg",
+            "schema": "unsignedByte"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:beta_hi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "gamma_alpha",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "MapValue",
+              "dtmi:foo//bar"
+            ],
+            "name": "beta_vroo",
+            "schema": "unsignedInteger"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValueTypeIncludesMaterialV4.json b/DTDL/v4/spec/Requirement-ClassMapValueTypeIncludesMaterialV4.json
new file mode 100644
index 00000000..0ef1a3c9
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValueTypeIncludesMaterialV4.json
@@ -0,0 +1,220 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_xi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "alpha_omicron",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "alpha_nu",
+            "schema": "unsignedLong",
+            "@type": "MapValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_sigma;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "alpha_tau",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "alpha_rho",
+            "schema": "unsignedShort",
+            "@type": [
+              "MapValue"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_chi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "alpha_psi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "alpha_phi",
+            "schema": "uuid",
+            "@type": "dtmi:dtdl:class:MapValue;4"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_wum;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "alpha_um",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "alpha_yuzz",
+            "schema": "boolean",
+            "@type": [
+              "dtmi:dtdl:class:MapValue;4"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_glikk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "alpha_nuh",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "alpha_fuddle",
+            "schema": "byte",
+            "@type": "Something"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_thnad;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "alpha_spazz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "alpha_quan",
+            "schema": "bytes",
+            "@type": "Something"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_jogg;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "alpha_flunn",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "alpha_zatz",
+            "schema": "date",
+            "@type": [
+              "Something"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_vroo;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "alpha_hi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "alpha_yekk",
+            "schema": "dateTime",
+            "@type": [
+              "Something"
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValueTypeIncludesNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassMapValueTypeIncludesNotDtmiNorTermV4.json
new file mode 100644
index 00000000..8dde1210
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValueTypeIncludesNotDtmiNorTermV4.json
@@ -0,0 +1,61 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_delta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "gamma_epsilon",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@type": [
+              "MapValue",
+              "http://foo.com/bar"
+            ],
+            "name": "gamma_gamma",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:gamma_theta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "gamma_iota",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": [
+              "MapValue",
+              "http://foo.com/bar"
+            ],
+            "name": "gamma_eta",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassMapValueTypeStringOrArrayV4.json b/DTDL/v4/spec/Requirement-ClassMapValueTypeStringOrArrayV4.json
new file mode 100644
index 00000000..307a9396
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassMapValueTypeStringOrArrayV4.json
@@ -0,0 +1,442 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_floob;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "vroo_zatz",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "vroo_spazz",
+            "schema": "boolean",
+            "@type": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:vroo_itch;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "vroo_yekk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "vroo_flunn",
+            "schema": "byte",
+            "@type": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_alpha;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "hi_beta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "vroo_hi",
+            "schema": "bytes",
+            "@type": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_epsilon;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "hi_zeta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "hi_delta",
+            "schema": "date",
+            "@type": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_iota;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "hi_kappa",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "hi_theta",
+            "schema": "dateTime",
+            "@type": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_nu;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "hi_xi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "hi_mu",
+            "schema": "decimal",
+            "@type": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_rho;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "hi_sigma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "hi_pi",
+            "schema": "double",
+            "@type": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_phi;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "hi_chi",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "hi_upsilon",
+            "schema": "duration",
+            "@type": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_yuzz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "hi_wum",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "hi_omega",
+            "schema": "float",
+            "@type": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_fuddle;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "hi_glikk",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "hi_humpf",
+            "schema": "integer",
+            "@type": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_quan;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "hi_thnad",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "hi_snee",
+            "schema": "long",
+            "@type": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_zatz;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "hi_jogg",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "hi_floob",
+            "schema": "short",
+            "@type": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:hi_yekk;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "hi_vroo",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "hi_itch",
+            "schema": "string",
+            "@type": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_beta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "alpha_gamma",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "alpha_alpha",
+            "schema": "time",
+            "@type": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_zeta;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "alpha_eta",
+            "schema": "string"
+          },
+          "mapValue": {
+            "name": "alpha_epsilon",
+            "schema": "unsignedByte",
+            "@type": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:alpha_kappa;1",
+          "@type": "Map",
+          "mapKey": {
+            "name": "alpha_lambda",
+            "schema": "string"
+          },
+          "mapValue": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "name": "alpha_iota",
+            "schema": "unsignedInteger",
+            "@type": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectContextConformsV4.json b/DTDL/v4/spec/Requirement-ClassObjectContextConformsV4.json
new file mode 100644
index 00000000..336b5bac
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectContextConformsV4.json
@@ -0,0 +1,354 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "psi_wum",
+          "schema": {
+            "@type": "Object",
+            "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "psi_humpf",
+          "schema": {
+            "@type": "Object",
+            "@context": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "psi_glikk",
+          "schema": {
+            "@type": "Object",
+            "@context": [
+              "dtmi:dtdl:extension:quantitativeTypes;1"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "psi_snee",
+          "schema": {
+            "@type": "Object",
+            "@context": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "psi_thnad",
+          "schema": {
+            "@type": "Object",
+            "@context": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "psi_floob",
+          "schema": {
+            "@type": "Object",
+            "@context": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "psi_jogg",
+          "schema": {
+            "@type": "Object",
+            "@context": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "psi_itch",
+          "schema": {
+            "@type": "Object",
+            "@context": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "psi_vroo",
+          "schema": {
+            "@type": "Object",
+            "@context": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "omega_alpha",
+          "schema": {
+            "@type": "Object",
+            "@context": "dtmi:dtdl:extension:quantitativeTypes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "omega_gamma",
+          "schema": {
+            "@type": "Object",
+            "@context": "http://dtdl/extension/quantitativeTypes/1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "omega_epsilon",
+          "schema": {
+            "@type": "Object",
+            "@context": "quantitativeTypes;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "omega_eta",
+          "schema": {
+            "@type": "Object",
+            "@context": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "omega_iota",
+          "schema": {
+            "@type": "Object",
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "omega_lambda",
+          "schema": {
+            "@type": "Object",
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "omega_nu",
+          "schema": {
+            "@type": "Object",
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectIdDuplicateV4.json b/DTDL/v4/spec/Requirement-ClassObjectIdDuplicateV4.json
new file mode 100644
index 00000000..4a2fd249
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectIdDuplicateV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:wum_delta;1",
+          "@type": "Property",
+          "name": "wum_epsilon",
+          "schema": {
+            "@id": "dtmi:example:wum_delta;1",
+            "@type": "Object"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:example:wum_zeta;1",
+          "@type": "Property",
+          "name": "wum_eta",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:example:wum_zeta;1",
+            "@type": "Object"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectIdIsDtmiV4.json b/DTDL/v4/spec/Requirement-ClassObjectIdIsDtmiV4.json
new file mode 100644
index 00000000..b907a6f0
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectIdIsDtmiV4.json
@@ -0,0 +1,965 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;7",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;108675309",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;999999999",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;3.14",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;3.141592",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": null,
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": null,
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": 626,
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": 626,
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": true,
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": true,
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": {
+            "@value": "dtmi:apparently:valid:identifier;3"
+          },
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": {
+            "@value": "dtmi:apparently:valid:identifier;3"
+          },
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;0",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;0.0",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0.0",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;1234567890",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;1234567890",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;1a",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;1a",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;3.0",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;3.0",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;3.1415926",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;3.1415926",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;6.02",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;6.02",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;0.1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0.1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;01",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;01",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar;",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:test:invalidId_;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:invalidId_;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:test:_invalidUserId;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:_invalidUserId;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:test:1seg;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:1seg;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo:bar.baz;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar.baz;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:foo::bar;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo::bar;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "urn:foo:bar:1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "urn:foo:bar:1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "http://foo/bar/baz",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "http://foo/bar/baz",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:dtdl:example;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:dtdl:example;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:standard:example;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:standard:example;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectIdNotArrayV4.json b/DTDL/v4/spec/Requirement-ClassObjectIdNotArrayV4.json
new file mode 100644
index 00000000..e498a151
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectIdNotArrayV4.json
@@ -0,0 +1,275 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo:bar;7"
+          ],
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;7"
+          ],
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo:bar;108675309"
+          ],
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;108675309"
+          ],
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo:bar;999999999"
+          ],
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;999999999"
+          ],
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo;1"
+          ],
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo;1"
+          ],
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo:bar"
+          ],
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar"
+          ],
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo:bar;3.14"
+          ],
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;3.14"
+          ],
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": [
+            "dtmi:foo:bar;3.141592"
+          ],
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;3.141592"
+          ],
+          "@type": "Object"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectIdRequiredV4.json b/DTDL/v4/spec/Requirement-ClassObjectIdRequiredV4.json
new file mode 100644
index 00000000..3c32f3ee
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectIdRequiredV4.json
@@ -0,0 +1,72 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "omega_omicron",
+          "schema": {
+            "@type": "Object"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:omega_rho;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectInvalidKeywordsV4.json b/DTDL/v4/spec/Requirement-ClassObjectInvalidKeywordsV4.json
new file mode 100644
index 00000000..07782f96
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectInvalidKeywordsV4.json
@@ -0,0 +1,150 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_iota;1",
+          "@type": "Object",
+          "@graph": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:spazz_lambda;1",
+          "@type": "Object",
+          "@graph": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_nu;1",
+          "@type": "Object",
+          "@value": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:spazz_omicron;1",
+          "@type": "Object",
+          "@value": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_rho;1",
+          "@type": "Object",
+          "@language": "en"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:spazz_tau;1",
+          "@type": "Object",
+          "@language": "en"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_phi;1",
+          "@type": "Object",
+          "@foobar": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:spazz_psi;1",
+          "@type": "Object",
+          "@foobar": true
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectPropertiesElementSchemaSchemaMaxDepthV4.json b/DTDL/v4/spec/Requirement-ClassObjectPropertiesElementSchemaSchemaMaxDepthV4.json
new file mode 100644
index 00000000..3c89951c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectPropertiesElementSchemaSchemaMaxDepthV4.json
@@ -0,0 +1,219 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "delta_glikk",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "delta_fuddle",
+              "schema": {
+                "@type": "Object",
+                "fields": {
+                  "name": "delta_humpf",
+                  "schema": {
+                    "@type": "Object",
+                    "fields": {
+                      "name": "delta_um",
+                      "schema": {
+                        "@type": "Object",
+                        "fields": {
+                          "name": "delta_wum",
+                          "schema": {
+                            "@type": "Object",
+                            "fields": {
+                              "name": "delta_yuzz",
+                              "schema": {
+                                "@type": "Object",
+                                "fields": {
+                                  "name": "delta_omega",
+                                  "schema": {
+                                    "@type": "Object",
+                                    "fields": {
+                                      "name": "delta_psi",
+                                      "schema": {
+                                        "@type": "Object",
+                                        "fields": [
+                                          {
+                                            "name": "delta_chi",
+                                            "schema": "double"
+                                          }
+                                        ]
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "delta_yekk",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "name": "delta_itch",
+              "schema": {
+                "@type": "Object",
+                "fields": {
+                  "name": "delta_flunn",
+                  "schema": {
+                    "@type": "Object",
+                    "fields": {
+                      "name": "delta_jogg",
+                      "schema": {
+                        "@type": "Object",
+                        "fields": {
+                          "name": "delta_zatz",
+                          "schema": {
+                            "@type": "Object",
+                            "fields": {
+                              "name": "delta_floob",
+                              "schema": {
+                                "@type": "Object",
+                                "fields": {
+                                  "name": "delta_spazz",
+                                  "schema": {
+                                    "@type": "Object",
+                                    "fields": {
+                                      "name": "delta_thnad",
+                                      "schema": {
+                                        "@type": "Object",
+                                        "fields": {
+                                          "name": "delta_quan",
+                                          "schema": {
+                                            "@type": "Object",
+                                            "fields": [
+                                              {
+                                                "name": "delta_snee",
+                                                "schema": "duration"
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "epsilon_iota",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Object",
+            "fields": {
+              "name": "epsilon_theta",
+              "schema": {
+                "@type": "Object",
+                "fields": {
+                  "name": "epsilon_eta",
+                  "schema": {
+                    "@type": "Object",
+                    "fields": {
+                      "name": "epsilon_zeta",
+                      "schema": {
+                        "@type": "Object",
+                        "fields": {
+                          "name": "epsilon_epsilon",
+                          "schema": {
+                            "@type": "Object",
+                            "fields": {
+                              "name": "epsilon_delta",
+                              "schema": {
+                                "@type": "Object",
+                                "fields": {
+                                  "name": "epsilon_gamma",
+                                  "schema": {
+                                    "@type": "Object",
+                                    "fields": {
+                                      "name": "epsilon_beta",
+                                      "schema": {
+                                        "@type": "Object",
+                                        "fields": {
+                                          "name": "epsilon_alpha",
+                                          "schema": {
+                                            "@type": "Object",
+                                            "fields": [
+                                              {
+                                                "name": "delta_hi",
+                                                "schema": "float"
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectPropertyCommentStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassObjectPropertyCommentStringLengthV4.json
new file mode 100644
index 00000000..21acf054
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectPropertyCommentStringLengthV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_eta;1",
+          "@type": "Object",
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_iota;1",
+          "@type": "Object",
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:um_lambda;1",
+          "@type": "Object",
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectPropertyCommentStringV4.json b/DTDL/v4/spec/Requirement-ClassObjectPropertyCommentStringV4.json
new file mode 100644
index 00000000..03f45b5b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectPropertyCommentStringV4.json
@@ -0,0 +1,414 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_theta;1",
+          "@type": "Object",
+          "comment": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_kappa;1",
+          "@type": "Object",
+          "comment": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_mu;1",
+          "@type": "Object",
+          "comment": {
+            "@value": "hello",
+            "@type": "xsd:string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_xi;1",
+          "@type": "Object",
+          "comment": [
+            {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_pi;1",
+          "@type": "Object",
+          "comment": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_sigma;1",
+          "@type": "Object",
+          "comment": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:wum_upsilon;1",
+          "@type": "Object",
+          "comment": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_chi;1",
+          "@type": "Object",
+          "comment": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:wum_omega;1",
+          "@type": "Object",
+          "comment": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_wum;1",
+          "@type": "Object",
+          "comment": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:wum_humpf;1",
+          "@type": "Object",
+          "comment": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_glikk;1",
+          "@type": "Object",
+          "comment": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:wum_snee;1",
+          "@type": "Object",
+          "comment": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_thnad;1",
+          "@type": "Object",
+          "comment": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:wum_floob;1",
+          "@type": "Object",
+          "comment": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_jogg;1",
+          "@type": "Object",
+          "comment": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:wum_itch;1",
+          "@type": "Object",
+          "comment": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:wum_vroo;1",
+          "@type": "Object",
+          "comment": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:um_alpha;1",
+          "@type": "Object",
+          "comment": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_gamma;1",
+          "@type": "Object",
+          "comment": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:um_epsilon;1",
+          "@type": "Object",
+          "comment": [
+            {}
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectPropertyCommentTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassObjectPropertyCommentTermAndDtmiV4.json
new file mode 100644
index 00000000..a29d4320
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectPropertyCommentTermAndDtmiV4.json
@@ -0,0 +1,41 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_chi;1",
+          "@type": "Object",
+          "comment": "um_psi",
+          "dtmi:dtdl:property:comment;4": "um_omega"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:um_wum;1",
+          "@type": "Object",
+          "comment": "um_um",
+          "dtmi:dtdl:property:comment;4": "um_humpf"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectPropertyDescriptionLangStringV4.json b/DTDL/v4/spec/Requirement-ClassObjectPropertyDescriptionLangStringV4.json
new file mode 100644
index 00000000..cb85f6dd
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectPropertyDescriptionLangStringV4.json
@@ -0,0 +1,482 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_glikk;1",
+          "@type": "Object",
+          "description": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_snee;1",
+          "@type": "Object",
+          "description": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_thnad;1",
+          "@type": "Object",
+          "description": {
+            "en": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_floob;1",
+          "@type": "Object",
+          "description": [
+            {
+              "@value": "hello",
+              "@language": "en"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_jogg;1",
+          "@type": "Object",
+          "description": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_itch;1",
+          "@type": "Object",
+          "description": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:um_vroo;1",
+          "@type": "Object",
+          "description": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:humpf_alpha;1",
+          "@type": "Object",
+          "description": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_gamma;1",
+          "@type": "Object",
+          "description": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:humpf_epsilon;1",
+          "@type": "Object",
+          "description": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_eta;1",
+          "@type": "Object",
+          "description": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:humpf_iota;1",
+          "@type": "Object",
+          "description": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_lambda;1",
+          "@type": "Object",
+          "description": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:humpf_nu;1",
+          "@type": "Object",
+          "description": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_omicron;1",
+          "@type": "Object",
+          "description": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:humpf_rho;1",
+          "@type": "Object",
+          "description": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_tau;1",
+          "@type": "Object",
+          "description": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:humpf_phi;1",
+          "@type": "Object",
+          "description": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_psi;1",
+          "@type": "Object",
+          "description": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:humpf_yuzz;1",
+          "@type": "Object",
+          "description": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_um;1",
+          "@type": "Object",
+          "description": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:humpf_fuddle;1",
+          "@type": "Object",
+          "description": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_nuh;1",
+          "@type": "Object",
+          "description": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:humpf_quan;1",
+          "@type": "Object",
+          "description": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectPropertyDescriptionStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassObjectPropertyDescriptionStringLengthV4.json
new file mode 100644
index 00000000..077494e4
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectPropertyDescriptionStringLengthV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_spazz;1",
+          "@type": "Object",
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:humpf_zatz;1",
+          "@type": "Object",
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:humpf_flunn;1",
+          "@type": "Object",
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectPropertyDescriptionTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassObjectPropertyDescriptionTermAndDtmiV4.json
new file mode 100644
index 00000000..cc44404e
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectPropertyDescriptionTermAndDtmiV4.json
@@ -0,0 +1,49 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_eta;1",
+          "@type": "Object",
+          "description": [
+            "fuddle_theta"
+          ],
+          "dtmi:dtdl:property:description;4": [
+            "fuddle_iota"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:fuddle_lambda;1",
+          "@type": "Object",
+          "description": [
+            "fuddle_mu"
+          ],
+          "dtmi:dtdl:property:description;4": [
+            "fuddle_nu"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectPropertyDisplayNameLangStringV4.json b/DTDL/v4/spec/Requirement-ClassObjectPropertyDisplayNameLangStringV4.json
new file mode 100644
index 00000000..45ecc5c2
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectPropertyDisplayNameLangStringV4.json
@@ -0,0 +1,482 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_omicron;1",
+          "@type": "Object",
+          "displayName": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_rho;1",
+          "@type": "Object",
+          "displayName": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_tau;1",
+          "@type": "Object",
+          "displayName": {
+            "en": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_phi;1",
+          "@type": "Object",
+          "displayName": [
+            {
+              "@value": "hello",
+              "@language": "en"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_psi;1",
+          "@type": "Object",
+          "displayName": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_yuzz;1",
+          "@type": "Object",
+          "displayName": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_humpf;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_um;1",
+          "@type": "Object",
+          "displayName": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:fuddle_fuddle;1",
+          "@type": "Object",
+          "displayName": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_snee;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_nuh;1",
+          "@type": "Object",
+          "displayName": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:fuddle_quan;1",
+          "@type": "Object",
+          "displayName": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_spazz;1",
+          "@type": "Object",
+          "displayName": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:fuddle_zatz;1",
+          "@type": "Object",
+          "displayName": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_flunn;1",
+          "@type": "Object",
+          "displayName": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:fuddle_yekk;1",
+          "@type": "Object",
+          "displayName": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:fuddle_hi;1",
+          "@type": "Object",
+          "displayName": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:glikk_beta;1",
+          "@type": "Object",
+          "displayName": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_delta;1",
+          "@type": "Object",
+          "displayName": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:glikk_zeta;1",
+          "@type": "Object",
+          "displayName": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_theta;1",
+          "@type": "Object",
+          "displayName": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:glikk_kappa;1",
+          "@type": "Object",
+          "displayName": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_mu;1",
+          "@type": "Object",
+          "displayName": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:glikk_xi;1",
+          "@type": "Object",
+          "displayName": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_rho;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_pi;1",
+          "@type": "Object",
+          "displayName": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:glikk_sigma;1",
+          "@type": "Object",
+          "displayName": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectPropertyDisplayNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassObjectPropertyDisplayNameStringLengthV4.json
new file mode 100644
index 00000000..320402d1
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectPropertyDisplayNameStringLengthV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_upsilon;1",
+          "@type": "Object",
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_chi;1",
+          "@type": "Object",
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:glikk_omega;1",
+          "@type": "Object",
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectPropertyDisplayNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassObjectPropertyDisplayNameTermAndDtmiV4.json
new file mode 100644
index 00000000..35a373a2
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectPropertyDisplayNameTermAndDtmiV4.json
@@ -0,0 +1,49 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:glikk_spazz;1",
+          "@type": "Object",
+          "displayName": [
+            "glikk_floob"
+          ],
+          "dtmi:dtdl:property:displayName;4": [
+            "glikk_zatz"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:glikk_flunn;1",
+          "@type": "Object",
+          "displayName": [
+            "glikk_itch"
+          ],
+          "dtmi:dtdl:property:displayName;4": [
+            "glikk_yekk"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectPropertyFieldsElementV4.json b/DTDL/v4/spec/Requirement-ClassObjectPropertyFieldsElementV4.json
new file mode 100644
index 00000000..aaee6048
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectPropertyFieldsElementV4.json
@@ -0,0 +1,275 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "nuh_beta",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "@id": "dtmi:example:glikk_hi;1",
+              "name": "nuh_alpha",
+              "schema": "uuid"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "nuh_zeta",
+          "schema": {
+            "@type": "Object",
+            "fields": [
+              {
+                "@id": "dtmi:example:nuh_delta;1",
+                "name": "nuh_epsilon",
+                "schema": "boolean"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_iota;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:ex:dependentRef;1",
+            "name": "nuh_theta",
+            "schema": "byte"
+          }
+        },
+        "contents": {
+          "@type": "Property",
+          "name": "nuh_lambda",
+          "schema": {
+            "@type": "Object",
+            "fields": "dtmi:ex:dependentRef;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:nuh_nu;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:ex:dependentRef;1",
+            "name": "nuh_mu",
+            "schema": "bytes"
+          }
+        },
+        "contents": {
+          "@type": "Property",
+          "name": "nuh_omicron",
+          "schema": {
+            "@type": "Object",
+            "fields": [
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "nuh_sigma",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "@id": "dtmi:example:nuh_pi;1",
+              "name": "nuh_rho",
+              "schema": "double",
+              "@context": "dtmi:dtdl:context;2"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "nuh_chi",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Object",
+            "fields": {
+              "@id": "dtmi:example:nuh_upsilon;1",
+              "name": "nuh_phi",
+              "schema": "duration",
+              "@context": "dtmi:dtdl:context;2"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "nuh_wum",
+          "schema": {
+            "@type": "Object",
+            "fields": {
+              "@id": "dtmi:example:nuh_omega;1",
+              "name": "nuh_yuzz",
+              "schema": "float",
+              "@context": "dtmi:dtdl:context;3"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "nuh_glikk",
+          "schema": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@type": "Object",
+            "fields": {
+              "@id": "dtmi:example:nuh_humpf;1",
+              "name": "nuh_fuddle",
+              "schema": "integer",
+              "@context": "dtmi:dtdl:context;3"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "nuh_snee",
+          "schema": {
+            "@type": "Object",
+            "fields": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "nuh_jogg",
+          "schema": {
+            "@type": "Object",
+            "fields": [
+              {
+                "@id": "dtmi:example:nuh_thnad;1",
+                "name": "nuh_spazz",
+                "schema": "duration"
+              },
+              {
+                "@id": "dtmi:example:nuh_floob;1",
+                "name": "nuh_zatz",
+                "schema": "float"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectPropertyFieldsTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassObjectPropertyFieldsTermAndDtmiV4.json
new file mode 100644
index 00000000..778e6f58
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectPropertyFieldsTermAndDtmiV4.json
@@ -0,0 +1,61 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_alpha;1",
+          "@type": "Object",
+          "fields": [
+            {
+              "name": "spazz_beta",
+              "schema": "float"
+            }
+          ],
+          "dtmi:dtdl:property:fields;4": [
+            {
+              "name": "spazz_gamma",
+              "schema": "integer"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:spazz_epsilon;1",
+          "@type": "Object",
+          "fields": [
+            {
+              "name": "spazz_zeta",
+              "schema": "long"
+            }
+          ],
+          "dtmi:dtdl:property:fields;4": [
+            {
+              "name": "spazz_eta",
+              "schema": "short"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectPropertyFieldsTypeConformanceV4.json b/DTDL/v4/spec/Requirement-ClassObjectPropertyFieldsTypeConformanceV4.json
new file mode 100644
index 00000000..07de1440
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectPropertyFieldsTypeConformanceV4.json
@@ -0,0 +1,732 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_beta;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:snee_alpha;1",
+            "elementSchema": "integer",
+            "@type": "Array"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:snee_epsilon;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:snee_delta;1",
+            "elementSchema": "long",
+            "@type": "Array"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_iota;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:snee_eta;1",
+            "name": "snee_theta",
+            "@type": "Command"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:snee_nu;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:snee_lambda;1",
+            "name": "snee_mu",
+            "@type": "Command"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_rho;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:snee_omicron;1",
+            "name": "snee_pi",
+            "schema": "short",
+            "@type": "CommandRequest"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:snee_phi;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:snee_tau;1",
+            "name": "snee_upsilon",
+            "schema": "string",
+            "@type": "CommandRequest"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_yuzz;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:snee_psi;1",
+            "name": "snee_omega",
+            "schema": "time",
+            "@type": "CommandResponse"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:snee_fuddle;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:snee_um;1",
+            "name": "snee_humpf",
+            "schema": "unsignedByte",
+            "@type": "CommandResponse"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_thnad;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:snee_nuh;1",
+            "name": "snee_snee",
+            "schema": {
+              "@id": "dtmi:example:snee_quan;1",
+              "@type": "Interface"
+            },
+            "@type": "Component"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:snee_flunn;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:snee_floob;1",
+            "name": "snee_zatz",
+            "schema": {
+              "@id": "dtmi:example:snee_jogg;1",
+              "@type": "Interface"
+            },
+            "@type": "Component"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:snee_vroo;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:snee_yekk;1",
+            "valueSchema": "integer",
+            "@type": "Enum"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:quan_beta;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:quan_alpha;1",
+            "valueSchema": "integer",
+            "@type": "Enum"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_zeta;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:quan_delta;1",
+            "enumValue": 1869,
+            "name": "quan_epsilon",
+            "@type": "EnumValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:quan_kappa;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:quan_theta;1",
+            "enumValue": 1870,
+            "name": "quan_iota",
+            "@type": "EnumValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_omicron;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_xi;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:quan_mu;1",
+            "name": "quan_nu",
+            "schema": "unsignedInteger",
+            "@type": "Field"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_rho;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:quan_pi;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:quan_upsilon;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:quan_tau;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_yuzz;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:quan_chi;1",
+            "mapKey": {
+              "name": "quan_psi",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "quan_omega",
+              "schema": "unsignedLong"
+            },
+            "@type": "Map"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:quan_glikk;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:quan_um;1",
+            "mapKey": {
+              "name": "quan_humpf",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "quan_fuddle",
+              "schema": "unsignedShort"
+            },
+            "@type": "Map"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_thnad;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:quan_snee;1",
+            "name": "quan_quan",
+            "schema": "string",
+            "@type": "MapKey"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:quan_jogg;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:quan_floob;1",
+            "name": "quan_zatz",
+            "schema": "string",
+            "@type": "MapKey"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:quan_vroo;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:quan_itch;1",
+            "name": "quan_yekk",
+            "schema": "uuid",
+            "@type": "MapValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:thnad_gamma;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:thnad_alpha;1",
+            "name": "thnad_beta",
+            "schema": "boolean",
+            "@type": "MapValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_zeta;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:thnad_epsilon;1",
+            "@type": "Object"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:thnad_iota;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:thnad_theta;1",
+            "@type": "Object"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_nu;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:thnad_lambda;1",
+            "name": "thnad_mu",
+            "schema": "byte",
+            "@type": "Property"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:thnad_rho;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:thnad_omicron;1",
+            "name": "thnad_pi",
+            "schema": "bytes",
+            "@type": "Property"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_phi;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:thnad_tau;1",
+            "name": "thnad_upsilon",
+            "@type": "Relationship"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:thnad_yuzz;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:thnad_psi;1",
+            "name": "thnad_omega",
+            "@type": "Relationship"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_glikk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:thnad_fuddle;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:thnad_um;1",
+            "name": "thnad_humpf",
+            "schema": "date",
+            "@type": "Telemetry"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:thnad_quan;1",
+          "@type": "Object",
+          "fields": {
+            "@id": "dtmi:example:thnad_nuh;1",
+            "name": "thnad_snee",
+            "schema": "dateTime",
+            "@type": "Telemetry"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectPropertyFormallyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Requirement-ClassObjectPropertyFormallyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..b462c414
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectPropertyFormallyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,76 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_thnad;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_quan;1",
+          "@type": "Object",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_floob;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:spazz_spazz;1",
+          "@type": "Object",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_jogg;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_zatz;1",
+          "@type": "Object",
+          "boolean": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_itch;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:spazz_flunn;1",
+          "@type": "Object",
+          "boolean": null
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectPropertyFormallyUndefinedTermV4.json b/DTDL/v4/spec/Requirement-ClassObjectPropertyFormallyUndefinedTermV4.json
new file mode 100644
index 00000000..d50f51f8
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectPropertyFormallyUndefinedTermV4.json
@@ -0,0 +1,39 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_lambda;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_kappa;1",
+          "@type": "Object",
+          "foobar": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_nu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:floob_mu;1",
+          "@type": "Object",
+          "foobar": {}
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectPropertyInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassObjectPropertyInvalidDtmiV4.json
new file mode 100644
index 00000000..ac74667d
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectPropertyInvalidDtmiV4.json
@@ -0,0 +1,45 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_vroo;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:spazz_yekk;1",
+          "@type": [
+            "Object",
+            "Foobar"
+          ],
+          "dtmi:foo//bar": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_alpha;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:spazz_hi;1",
+          "@type": [
+            "Object",
+            "Foobar"
+          ],
+          "dtmi:foo//bar": 626
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectPropertyNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassObjectPropertyNotDtmiNorTermV4.json
new file mode 100644
index 00000000..1126794c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectPropertyNotDtmiNorTermV4.json
@@ -0,0 +1,45 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:floob_beta;1",
+          "@type": [
+            "Object",
+            "Foobar"
+          ],
+          "http://foo.com/bar": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:floob_delta;1",
+          "@type": [
+            "Object",
+            "Foobar"
+          ],
+          "http://foo.com/bar": true
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectRequiredPropertiesV4.json b/DTDL/v4/spec/Requirement-ClassObjectRequiredPropertiesV4.json
new file mode 100644
index 00000000..ec01ac30
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectRequiredPropertiesV4.json
@@ -0,0 +1,35 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_sigma;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:phi_upsilon;1"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectTypeIncludesInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassObjectTypeIncludesInvalidDtmiV4.json
new file mode 100644
index 00000000..b9fca097
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectTypeIncludesInvalidDtmiV4.json
@@ -0,0 +1,43 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_gamma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_beta;1",
+          "@type": [
+            "Object",
+            "dtmi:foo//bar"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_epsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:psi_delta;1",
+          "@type": [
+            "Object",
+            "dtmi:foo//bar"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectTypeIncludesMaterialV4.json b/DTDL/v4/spec/Requirement-ClassObjectTypeIncludesMaterialV4.json
new file mode 100644
index 00000000..018b9071
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectTypeIncludesMaterialV4.json
@@ -0,0 +1,148 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_mu;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_lambda;1",
+          "@type": "Object"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_xi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_nu;1",
+          "@type": [
+            "Object"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_pi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_omicron;1",
+          "@type": "dtmi:dtdl:class:Object;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_sigma;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_rho;1",
+          "@type": [
+            "dtmi:dtdl:class:Object;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_upsilon;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_tau;1",
+          "@type": "Something"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_chi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:chi_phi;1",
+          "@type": "Something"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_omega;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_psi;1",
+          "@type": [
+            "Something"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_wum;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:chi_yuzz;1",
+          "@type": [
+            "Something"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectTypeIncludesNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassObjectTypeIncludesNotDtmiNorTermV4.json
new file mode 100644
index 00000000..c8022e29
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectTypeIncludesNotDtmiNorTermV4.json
@@ -0,0 +1,43 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:psi_zeta;1",
+          "@type": [
+            "Object",
+            "http://foo.com/bar"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:psi_theta;1",
+          "@type": [
+            "Object",
+            "http://foo.com/bar"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassObjectTypeStringOrArrayV4.json b/DTDL/v4/spec/Requirement-ClassObjectTypeStringOrArrayV4.json
new file mode 100644
index 00000000..7e28779d
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassObjectTypeStringOrArrayV4.json
@@ -0,0 +1,298 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_psi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_chi;1",
+          "@type": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_yuzz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:phi_omega;1",
+          "@type": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_wum;1",
+          "@type": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:phi_humpf;1",
+          "@type": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_nuh;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_glikk;1",
+          "@type": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_quan;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:phi_snee;1",
+          "@type": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_spazz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_thnad;1",
+          "@type": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_zatz;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:phi_floob;1",
+          "@type": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_jogg;1",
+          "@type": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:phi_itch;1",
+          "@type": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_hi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:phi_vroo;1",
+          "@type": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_beta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:chi_alpha;1",
+          "@type": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_delta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_gamma;1",
+          "@type": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_zeta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:chi_epsilon;1",
+          "@type": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_theta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:example:chi_eta;1",
+          "@type": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_kappa;1",
+        "@type": "Interface",
+        "schemas": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:example:chi_iota;1",
+          "@type": [
+            {}
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyContextConformsV4.json b/DTDL/v4/spec/Requirement-ClassPropertyContextConformsV4.json
new file mode 100644
index 00000000..fe4ccd57
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyContextConformsV4.json
@@ -0,0 +1,386 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_xi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:beta_nu;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "beta_mu",
+            "schema": "duration",
+            "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_rho;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:beta_pi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "beta_omicron",
+            "schema": "float",
+            "@context": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_upsilon;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:beta_tau;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "beta_sigma",
+            "schema": "integer",
+            "@context": [
+              "dtmi:dtdl:extension:quantitativeTypes;1"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_psi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:beta_chi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "beta_phi",
+            "schema": "long",
+            "@context": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_wum;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:beta_yuzz;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "beta_omega",
+            "schema": "short",
+            "@context": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_fuddle;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:beta_humpf;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "beta_um",
+            "schema": "string",
+            "@context": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_snee;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:beta_nuh;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "beta_glikk",
+            "schema": "time",
+            "@context": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_spazz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:beta_thnad;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "beta_quan",
+            "schema": "unsignedByte",
+            "@context": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_jogg;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:beta_zatz;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "beta_floob",
+            "schema": "unsignedInteger",
+            "@context": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_yekk;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:beta_itch;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "beta_flunn",
+            "schema": "unsignedLong",
+            "@context": "dtmi:dtdl:extension:quantitativeTypes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_alpha;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:beta_hi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "beta_vroo",
+            "schema": "unsignedShort",
+            "@context": "http://dtdl/extension/quantitativeTypes/1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_delta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:gamma_gamma;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "gamma_beta",
+            "schema": "uuid",
+            "@context": "quantitativeTypes;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_eta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:gamma_zeta;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "gamma_epsilon",
+            "schema": "boolean",
+            "@context": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_kappa;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:gamma_iota;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "gamma_theta",
+            "schema": "byte",
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_nu;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:gamma_mu;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "gamma_lambda",
+            "schema": "bytes",
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_pi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:gamma_omicron;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "gamma_xi",
+            "schema": "date",
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyIdDuplicateV4.json b/DTDL/v4/spec/Requirement-ClassPropertyIdDuplicateV4.json
new file mode 100644
index 00000000..571b99ad
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyIdDuplicateV4.json
@@ -0,0 +1,49 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_wum;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:zeta_wum;1",
+          "@type": "Interface",
+          "contents": {
+            "@id": "dtmi:example:zeta_wum;1",
+            "@type": "Property",
+            "name": "zeta_um",
+            "schema": "unsignedLong"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_humpf;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:zeta_humpf;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:example:zeta_humpf;1",
+            "@type": "Property",
+            "name": "zeta_fuddle",
+            "schema": "unsignedShort"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyIdIsDtmiV4.json b/DTDL/v4/spec/Requirement-ClassPropertyIdIsDtmiV4.json
new file mode 100644
index 00000000..2c04a180
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyIdIsDtmiV4.json
@@ -0,0 +1,1075 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;7",
+          "@type": "Property",
+          "name": "gamma_rho",
+          "schema": "dateTime"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;108675309",
+          "@type": "Property",
+          "name": "gamma_tau",
+          "schema": "decimal"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;999999999",
+          "@type": "Property",
+          "name": "gamma_phi",
+          "schema": "double"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo;1",
+          "@type": "Property",
+          "name": "gamma_psi",
+          "schema": "duration"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar",
+          "@type": "Property",
+          "name": "gamma_yuzz",
+          "schema": "float"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;3.14",
+          "@type": "Property",
+          "name": "gamma_um",
+          "schema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;3.141592",
+          "@type": "Property",
+          "name": "gamma_fuddle",
+          "schema": "long"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": null,
+          "@type": "Property",
+          "name": "gamma_nuh",
+          "schema": "short"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": null,
+          "@type": "Property",
+          "name": "gamma_quan",
+          "schema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": 626,
+          "@type": "Property",
+          "name": "gamma_spazz",
+          "schema": "time"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": 626,
+          "@type": "Property",
+          "name": "gamma_zatz",
+          "schema": "unsignedByte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": true,
+          "@type": "Property",
+          "name": "gamma_flunn",
+          "schema": "unsignedInteger"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": true,
+          "@type": "Property",
+          "name": "gamma_yekk",
+          "schema": "unsignedLong"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": {
+            "@value": "dtmi:apparently:valid:identifier;3"
+          },
+          "@type": "Property",
+          "name": "gamma_hi",
+          "schema": "unsignedShort"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": {
+            "@value": "dtmi:apparently:valid:identifier;3"
+          },
+          "@type": "Property",
+          "name": "delta_beta",
+          "schema": "uuid"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;0",
+          "@type": "Property",
+          "name": "delta_delta",
+          "schema": "boolean"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0",
+          "@type": "Property",
+          "name": "delta_zeta",
+          "schema": "byte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;0.0",
+          "@type": "Property",
+          "name": "delta_theta",
+          "schema": "bytes"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0.0",
+          "@type": "Property",
+          "name": "delta_kappa",
+          "schema": "date"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;1234567890",
+          "@type": "Property",
+          "name": "delta_mu",
+          "schema": "dateTime"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;1234567890",
+          "@type": "Property",
+          "name": "delta_xi",
+          "schema": "decimal"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;1a",
+          "@type": "Property",
+          "name": "delta_pi",
+          "schema": "double"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;1a",
+          "@type": "Property",
+          "name": "delta_sigma",
+          "schema": "duration"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;3.0",
+          "@type": "Property",
+          "name": "delta_upsilon",
+          "schema": "float"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;3.0",
+          "@type": "Property",
+          "name": "delta_chi",
+          "schema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;3.1415926",
+          "@type": "Property",
+          "name": "delta_omega",
+          "schema": "long"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;3.1415926",
+          "@type": "Property",
+          "name": "delta_wum",
+          "schema": "short"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;6.02",
+          "@type": "Property",
+          "name": "delta_humpf",
+          "schema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;6.02",
+          "@type": "Property",
+          "name": "delta_glikk",
+          "schema": "time"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;0.1",
+          "@type": "Property",
+          "name": "delta_snee",
+          "schema": "unsignedByte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0.1",
+          "@type": "Property",
+          "name": "delta_thnad",
+          "schema": "unsignedInteger"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;01",
+          "@type": "Property",
+          "name": "delta_floob",
+          "schema": "unsignedLong"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;01",
+          "@type": "Property",
+          "name": "delta_jogg",
+          "schema": "unsignedShort"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;",
+          "@type": "Property",
+          "name": "delta_itch",
+          "schema": "uuid"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;",
+          "@type": "Property",
+          "name": "delta_vroo",
+          "schema": "boolean"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:test:invalidId_;1",
+          "@type": "Property",
+          "name": "epsilon_alpha",
+          "schema": "byte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:invalidId_;1",
+          "@type": "Property",
+          "name": "epsilon_gamma",
+          "schema": "bytes"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:test:_invalidUserId;1",
+          "@type": "Property",
+          "name": "epsilon_epsilon",
+          "schema": "date"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:_invalidUserId;1",
+          "@type": "Property",
+          "name": "epsilon_eta",
+          "schema": "dateTime"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:test:1seg;1",
+          "@type": "Property",
+          "name": "epsilon_iota",
+          "schema": "decimal"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:1seg;1",
+          "@type": "Property",
+          "name": "epsilon_lambda",
+          "schema": "double"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar.baz;1",
+          "@type": "Property",
+          "name": "epsilon_nu",
+          "schema": "duration"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar.baz;1",
+          "@type": "Property",
+          "name": "epsilon_omicron",
+          "schema": "float"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo::bar;1",
+          "@type": "Property",
+          "name": "epsilon_rho",
+          "schema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo::bar;1",
+          "@type": "Property",
+          "name": "epsilon_tau",
+          "schema": "long"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "urn:foo:bar:1",
+          "@type": "Property",
+          "name": "epsilon_phi",
+          "schema": "short"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "urn:foo:bar:1",
+          "@type": "Property",
+          "name": "epsilon_psi",
+          "schema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "http://foo/bar/baz",
+          "@type": "Property",
+          "name": "epsilon_yuzz",
+          "schema": "time"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "http://foo/bar/baz",
+          "@type": "Property",
+          "name": "epsilon_um",
+          "schema": "unsignedByte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:;1",
+          "@type": "Property",
+          "name": "epsilon_fuddle",
+          "schema": "unsignedInteger"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:;1",
+          "@type": "Property",
+          "name": "epsilon_nuh",
+          "schema": "unsignedLong"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:dtdl:example;1",
+          "@type": "Property",
+          "name": "epsilon_quan",
+          "schema": "unsignedShort"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:dtdl:example;1",
+          "@type": "Property",
+          "name": "epsilon_spazz",
+          "schema": "uuid"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:standard:example;1",
+          "@type": "Property",
+          "name": "epsilon_zatz",
+          "schema": "boolean"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:standard:example;1",
+          "@type": "Property",
+          "name": "epsilon_flunn",
+          "schema": "byte"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyIdNotArrayV4.json b/DTDL/v4/spec/Requirement-ClassPropertyIdNotArrayV4.json
new file mode 100644
index 00000000..85ece066
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyIdNotArrayV4.json
@@ -0,0 +1,303 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;7"
+          ],
+          "@type": "Property",
+          "name": "epsilon_yekk",
+          "schema": "bytes"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;7"
+          ],
+          "@type": "Property",
+          "name": "epsilon_hi",
+          "schema": "date"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;108675309"
+          ],
+          "@type": "Property",
+          "name": "zeta_beta",
+          "schema": "dateTime"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;108675309"
+          ],
+          "@type": "Property",
+          "name": "zeta_delta",
+          "schema": "decimal"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;999999999"
+          ],
+          "@type": "Property",
+          "name": "zeta_zeta",
+          "schema": "double"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;999999999"
+          ],
+          "@type": "Property",
+          "name": "zeta_theta",
+          "schema": "duration"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo;1"
+          ],
+          "@type": "Property",
+          "name": "zeta_kappa",
+          "schema": "float"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo;1"
+          ],
+          "@type": "Property",
+          "name": "zeta_mu",
+          "schema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar"
+          ],
+          "@type": "Property",
+          "name": "zeta_xi",
+          "schema": "long"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar"
+          ],
+          "@type": "Property",
+          "name": "zeta_pi",
+          "schema": "short"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;3.14"
+          ],
+          "@type": "Property",
+          "name": "zeta_sigma",
+          "schema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;3.14"
+          ],
+          "@type": "Property",
+          "name": "zeta_upsilon",
+          "schema": "time"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;3.141592"
+          ],
+          "@type": "Property",
+          "name": "zeta_chi",
+          "schema": "unsignedByte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;3.141592"
+          ],
+          "@type": "Property",
+          "name": "zeta_omega",
+          "schema": "unsignedInteger"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyInvalidKeywordsV4.json b/DTDL/v4/spec/Requirement-ClassPropertyInvalidKeywordsV4.json
new file mode 100644
index 00000000..55401f81
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyInvalidKeywordsV4.json
@@ -0,0 +1,158 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "mu_flunn",
+          "schema": "float",
+          "@graph": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "mu_yekk",
+          "schema": "integer",
+          "@graph": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "mu_hi",
+          "schema": "long",
+          "@value": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "nu_beta",
+          "schema": "short",
+          "@value": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "nu_delta",
+          "schema": "string",
+          "@language": "en"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "nu_zeta",
+          "schema": "time",
+          "@language": "en"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "nu_theta",
+          "schema": "unsignedByte",
+          "@foobar": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "nu_kappa",
+          "schema": "unsignedInteger",
+          "@foobar": true
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyPropertyCommentStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassPropertyPropertyCommentStringLengthV4.json
new file mode 100644
index 00000000..0d75fde0
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyPropertyCommentStringLengthV4.json
@@ -0,0 +1,60 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "eta_fuddle",
+          "schema": "byte",
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "eta_nuh",
+          "schema": "bytes",
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "eta_quan",
+          "schema": "date",
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyPropertyCommentStringV4.json b/DTDL/v4/spec/Requirement-ClassPropertyPropertyCommentStringV4.json
new file mode 100644
index 00000000..3c153ace
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyPropertyCommentStringV4.json
@@ -0,0 +1,435 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "zeta_glikk",
+          "schema": "uuid",
+          "comment": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "zeta_snee",
+          "schema": "boolean",
+          "comment": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "zeta_thnad",
+          "schema": "byte",
+          "comment": {
+            "@value": "hello",
+            "@type": "xsd:string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "zeta_floob",
+          "schema": "bytes",
+          "comment": [
+            {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "zeta_jogg",
+          "schema": "date",
+          "comment": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "zeta_itch",
+          "schema": "dateTime",
+          "comment": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "zeta_vroo",
+          "schema": "decimal",
+          "comment": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "eta_alpha",
+          "schema": "double",
+          "comment": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "eta_gamma",
+          "schema": "duration",
+          "comment": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "eta_epsilon",
+          "schema": "float",
+          "comment": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "eta_eta",
+          "schema": "integer",
+          "comment": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "eta_iota",
+          "schema": "long",
+          "comment": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "eta_lambda",
+          "schema": "short",
+          "comment": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "eta_nu",
+          "schema": "string",
+          "comment": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "eta_omicron",
+          "schema": "time",
+          "comment": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "eta_rho",
+          "schema": "unsignedByte",
+          "comment": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "eta_tau",
+          "schema": "unsignedInteger",
+          "comment": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "eta_phi",
+          "schema": "unsignedLong",
+          "comment": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "eta_psi",
+          "schema": "unsignedShort",
+          "comment": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "eta_yuzz",
+          "schema": "uuid",
+          "comment": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "eta_um",
+          "schema": "boolean",
+          "comment": [
+            {}
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyPropertyCommentTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassPropertyPropertyCommentTermAndDtmiV4.json
new file mode 100644
index 00000000..dcd3ee2f
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyPropertyCommentTermAndDtmiV4.json
@@ -0,0 +1,43 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "comment": "theta_alpha",
+          "dtmi:dtdl:property:comment;4": "theta_beta",
+          "name": "theta_gamma",
+          "schema": "duration"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "comment": "theta_epsilon",
+          "dtmi:dtdl:property:comment;4": "theta_zeta",
+          "name": "theta_eta",
+          "schema": "float"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyPropertyDescriptionLangStringV4.json b/DTDL/v4/spec/Requirement-ClassPropertyPropertyDescriptionLangStringV4.json
new file mode 100644
index 00000000..f22c4e5b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyPropertyDescriptionLangStringV4.json
@@ -0,0 +1,506 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_iota",
+          "schema": "integer",
+          "description": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_lambda",
+          "schema": "long",
+          "description": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_nu",
+          "schema": "short",
+          "description": {
+            "en": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_omicron",
+          "schema": "string",
+          "description": [
+            {
+              "@value": "hello",
+              "@language": "en"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_rho",
+          "schema": "time",
+          "description": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_tau",
+          "schema": "unsignedByte",
+          "description": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_phi",
+          "schema": "unsignedInteger",
+          "description": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "theta_psi",
+          "schema": "unsignedLong",
+          "description": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_yuzz",
+          "schema": "unsignedShort",
+          "description": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "theta_um",
+          "schema": "uuid",
+          "description": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_fuddle",
+          "schema": "boolean",
+          "description": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "theta_nuh",
+          "schema": "byte",
+          "description": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_quan",
+          "schema": "bytes",
+          "description": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "theta_spazz",
+          "schema": "date",
+          "description": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_zatz",
+          "schema": "dateTime",
+          "description": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "theta_flunn",
+          "schema": "decimal",
+          "description": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "theta_yekk",
+          "schema": "double",
+          "description": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "theta_hi",
+          "schema": "duration",
+          "description": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "iota_beta",
+          "schema": "float",
+          "description": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "iota_delta",
+          "schema": "integer",
+          "description": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "iota_zeta",
+          "schema": "long",
+          "description": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "iota_theta",
+          "schema": "short",
+          "description": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "iota_kappa",
+          "schema": "string",
+          "description": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "iota_mu",
+          "schema": "time",
+          "description": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyPropertyDescriptionStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassPropertyPropertyDescriptionStringLengthV4.json
new file mode 100644
index 00000000..949bca42
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyPropertyDescriptionStringLengthV4.json
@@ -0,0 +1,60 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "iota_xi",
+          "schema": "unsignedByte",
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "iota_pi",
+          "schema": "unsignedInteger",
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "iota_sigma",
+          "schema": "unsignedLong",
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyPropertyDescriptionTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassPropertyPropertyDescriptionTermAndDtmiV4.json
new file mode 100644
index 00000000..facef12a
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyPropertyDescriptionTermAndDtmiV4.json
@@ -0,0 +1,51 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "description": [
+            "iota_fuddle"
+          ],
+          "dtmi:dtdl:property:description;4": [
+            "iota_glikk"
+          ],
+          "name": "iota_nuh",
+          "schema": "byte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "description": [
+            "iota_quan"
+          ],
+          "dtmi:dtdl:property:description;4": [
+            "iota_thnad"
+          ],
+          "name": "iota_spazz",
+          "schema": "bytes"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyPropertyDisplayNameLangStringV4.json b/DTDL/v4/spec/Requirement-ClassPropertyPropertyDisplayNameLangStringV4.json
new file mode 100644
index 00000000..358a225d
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyPropertyDisplayNameLangStringV4.json
@@ -0,0 +1,506 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "iota_zatz",
+          "schema": "date",
+          "displayName": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "iota_flunn",
+          "schema": "dateTime",
+          "displayName": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "iota_yekk",
+          "schema": "decimal",
+          "displayName": {
+            "en": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "iota_hi",
+          "schema": "double",
+          "displayName": [
+            {
+              "@value": "hello",
+              "@language": "en"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "kappa_beta",
+          "schema": "duration",
+          "displayName": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "kappa_delta",
+          "schema": "float",
+          "displayName": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "kappa_zeta",
+          "schema": "integer",
+          "displayName": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "kappa_theta",
+          "schema": "long",
+          "displayName": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "kappa_kappa",
+          "schema": "short",
+          "displayName": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "kappa_mu",
+          "schema": "string",
+          "displayName": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "kappa_xi",
+          "schema": "time",
+          "displayName": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "kappa_pi",
+          "schema": "unsignedByte",
+          "displayName": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "kappa_sigma",
+          "schema": "unsignedInteger",
+          "displayName": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "kappa_upsilon",
+          "schema": "unsignedLong",
+          "displayName": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "kappa_chi",
+          "schema": "unsignedShort",
+          "displayName": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "kappa_omega",
+          "schema": "uuid",
+          "displayName": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "kappa_wum",
+          "schema": "boolean",
+          "displayName": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "kappa_humpf",
+          "schema": "byte",
+          "displayName": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "kappa_glikk",
+          "schema": "bytes",
+          "displayName": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "kappa_snee",
+          "schema": "date",
+          "displayName": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "kappa_thnad",
+          "schema": "dateTime",
+          "displayName": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "kappa_floob",
+          "schema": "decimal",
+          "displayName": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "kappa_jogg",
+          "schema": "double",
+          "displayName": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "kappa_itch",
+          "schema": "duration",
+          "displayName": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyPropertyDisplayNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassPropertyPropertyDisplayNameStringLengthV4.json
new file mode 100644
index 00000000..cc07382b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyPropertyDisplayNameStringLengthV4.json
@@ -0,0 +1,60 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "kappa_vroo",
+          "schema": "float",
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "lambda_alpha",
+          "schema": "integer",
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "lambda_gamma",
+          "schema": "long",
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyPropertyDisplayNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassPropertyPropertyDisplayNameTermAndDtmiV4.json
new file mode 100644
index 00000000..7524b5db
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyPropertyDisplayNameTermAndDtmiV4.json
@@ -0,0 +1,51 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "displayName": [
+            "lambda_xi"
+          ],
+          "dtmi:dtdl:property:displayName;4": [
+            "lambda_omicron"
+          ],
+          "name": "lambda_pi",
+          "schema": "unsignedByte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "displayName": [
+            "lambda_sigma"
+          ],
+          "dtmi:dtdl:property:displayName;4": [
+            "lambda_tau"
+          ],
+          "name": "lambda_upsilon",
+          "schema": "unsignedInteger"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyPropertyFormallyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Requirement-ClassPropertyPropertyFormallyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..b33742d3
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyPropertyFormallyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,80 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "nu_upsilon",
+          "schema": "byte",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "nu_chi",
+          "schema": "bytes",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "nu_omega",
+          "schema": "date",
+          "boolean": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "nu_wum",
+          "schema": "dateTime",
+          "boolean": null
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyPropertyFormallyUndefinedTermV4.json b/DTDL/v4/spec/Requirement-ClassPropertyPropertyFormallyUndefinedTermV4.json
new file mode 100644
index 00000000..9d43a069
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyPropertyFormallyUndefinedTermV4.json
@@ -0,0 +1,41 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "nu_itch",
+          "schema": "short",
+          "foobar": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "nu_vroo",
+          "schema": "string",
+          "foobar": {}
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyPropertyInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassPropertyPropertyInvalidDtmiV4.json
new file mode 100644
index 00000000..856bd27a
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyPropertyInvalidDtmiV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Property",
+            "Foobar"
+          ],
+          "name": "nu_humpf",
+          "schema": "decimal",
+          "dtmi:foo//bar": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Property",
+            "Foobar"
+          ],
+          "name": "nu_glikk",
+          "schema": "double",
+          "dtmi:foo//bar": 626
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyPropertyNamePatternV4.json b/DTDL/v4/spec/Requirement-ClassPropertyPropertyNamePatternV4.json
new file mode 100644
index 00000000..3ae03e0c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyPropertyNamePatternV4.json
@@ -0,0 +1,462 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "dateTime",
+          "name": "EARTH"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "decimal",
+          "name": "Air"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "double",
+          "name": "fire"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "duration",
+          "name": "hello_world"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "float",
+          "name": "Anarchy99"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "integer",
+          "name": "23skidoo"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "schema": "long",
+          "name": "23skidoo"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "short",
+          "name": "626"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "schema": "string",
+          "name": "626"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "time",
+          "name": "goodbye-world"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "schema": "unsignedByte",
+          "name": "goodbye-world"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "unsignedInteger",
+          "name": "_haha"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "schema": "unsignedLong",
+          "name": "_haha"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "unsignedShort",
+          "name": "toodaloo_"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "schema": "uuid",
+          "name": "toodaloo_"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "boolean",
+          "name": "pro:con"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "schema": "byte",
+          "name": "pro:con"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "bytes",
+          "name": "mish/mash"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "schema": "date",
+          "name": "mish/mash"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "dateTime",
+          "name": "#tag"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "schema": "decimal",
+          "name": "#tag"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "double",
+          "name": "@tweet"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "schema": "duration",
+          "name": "@tweet"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "float",
+          "name": "$money"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "schema": "integer",
+          "name": "$money"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyPropertyNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassPropertyPropertyNameStringLengthV4.json
new file mode 100644
index 00000000..732fc2af
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyPropertyNameStringLengthV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "byte",
+          "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "bytes",
+          "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "schema": "date",
+          "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyPropertyNameStringV4.json b/DTDL/v4/spec/Requirement-ClassPropertyPropertyNameStringV4.json
new file mode 100644
index 00000000..80456114
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyPropertyNameStringV4.json
@@ -0,0 +1,433 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "unsignedShort",
+          "name": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "uuid",
+          "name": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "boolean",
+          "name": {
+            "@value": "hello",
+            "@type": "xsd:string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "byte",
+          "name": [
+            {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "bytes",
+          "name": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "schema": "date",
+          "name": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "dateTime",
+          "name": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "schema": "decimal",
+          "name": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "double",
+          "name": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "schema": "duration",
+          "name": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "float",
+          "name": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "schema": "integer",
+          "name": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "long",
+          "name": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "schema": "short",
+          "name": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "string",
+          "name": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "schema": "time",
+          "name": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "unsignedByte",
+          "name": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "schema": "unsignedInteger",
+          "name": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "unsignedLong",
+          "name": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "schema": "unsignedShort",
+          "name": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "uuid",
+          "name": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "schema": "boolean",
+          "name": []
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyPropertyNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassPropertyPropertyNameTermAndDtmiV4.json
new file mode 100644
index 00000000..30bf197d
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyPropertyNameTermAndDtmiV4.json
@@ -0,0 +1,41 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "flunn_jogg",
+          "dtmi:dtdl:property:name;4": "flunn_flunn",
+          "schema": "double"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "flunn_yekk",
+          "dtmi:dtdl:property:name;4": "flunn_vroo",
+          "schema": "duration"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyPropertyNameUniqueAmongInterfaceContentsV4.json b/DTDL/v4/spec/Requirement-ClassPropertyPropertyNameUniqueAmongInterfaceContentsV4.json
new file mode 100644
index 00000000..a40735d7
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyPropertyNameUniqueAmongInterfaceContentsV4.json
@@ -0,0 +1,80 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_psi;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "schema": "long",
+            "name": "epsilon_kappa"
+          },
+          {
+            "@type": "Property",
+            "schema": "short",
+            "name": "epsilon_lambda"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_omega;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "schema": "string",
+            "name": "epsilon_kappa"
+          },
+          {
+            "@type": "Property",
+            "schema": "time",
+            "name": "epsilon_kappa"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:flunn_yuzz;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "schema": "unsignedByte",
+            "name": "epsilon_kappa"
+          },
+          {
+            "@type": "Property",
+            "schema": "unsignedInteger",
+            "name": "epsilon_kappa"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyPropertyNameUniqueAmongRelationshipPropertiesV4.json b/DTDL/v4/spec/Requirement-ClassPropertyPropertyNameUniqueAmongRelationshipPropertiesV4.json
new file mode 100644
index 00000000..396d7496
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyPropertyNameUniqueAmongRelationshipPropertiesV4.json
@@ -0,0 +1,90 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "flunn_wum",
+          "properties": [
+            {
+              "@type": "Property",
+              "schema": "unsignedLong",
+              "name": "epsilon_mu"
+            },
+            {
+              "@type": "Property",
+              "schema": "unsignedShort",
+              "name": "epsilon_nu"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "flunn_humpf",
+          "properties": [
+            {
+              "@type": "Property",
+              "schema": "uuid",
+              "name": "epsilon_mu"
+            },
+            {
+              "@type": "Property",
+              "schema": "boolean",
+              "name": "epsilon_mu"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "flunn_glikk",
+          "properties": [
+            {
+              "@type": "Property",
+              "schema": "byte",
+              "name": "epsilon_mu"
+            },
+            {
+              "@type": "Property",
+              "schema": "bytes",
+              "name": "epsilon_mu"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyPropertyNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassPropertyPropertyNotDtmiNorTermV4.json
new file mode 100644
index 00000000..f2441d7c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyPropertyNotDtmiNorTermV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Property",
+            "Foobar"
+          ],
+          "name": "nu_snee",
+          "schema": "duration",
+          "http://foo.com/bar": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Property",
+            "Foobar"
+          ],
+          "name": "nu_thnad",
+          "schema": "float",
+          "http://foo.com/bar": true
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyPropertySchemaElementV4.json b/DTDL/v4/spec/Requirement-ClassPropertyPropertySchemaElementV4.json
new file mode 100644
index 00000000..ed8f325c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyPropertySchemaElementV4.json
@@ -0,0 +1,753 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_gamma;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:itch_beta;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "itch_alpha",
+            "schema": {
+              "@type": "Array",
+              "elementSchema": "float"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_zeta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:itch_epsilon;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "itch_delta",
+            "schema": [
+              {
+                "@type": "Array",
+                "elementSchema": "integer"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_eta;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Array",
+          "elementSchema": "long"
+        },
+        "contents": {
+          "@type": "Property",
+          "name": "itch_theta",
+          "schema": "dtmi:ex:dependentRef;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_iota;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Array",
+          "elementSchema": "short"
+        },
+        "contents": {
+          "@type": "Property",
+          "name": "itch_kappa",
+          "schema": [
+            "dtmi:ex:dependentRef;1"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_xi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:itch_nu;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "itch_mu",
+            "schema": {
+              "@id": "dtmi:example:itch_lambda;1",
+              "@type": "Array",
+              "elementSchema": "float",
+              "@context": "dtmi:dtdl:context;2"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_sigma;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:itch_rho;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Property",
+            "name": "itch_pi",
+            "schema": {
+              "@id": "dtmi:example:itch_omicron;1",
+              "@type": "Array",
+              "elementSchema": "integer",
+              "@context": "dtmi:dtdl:context;3"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_tau;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Array",
+          "elementSchema": "unsignedInteger"
+        },
+        "contents": {
+          "@type": "Property",
+          "name": "itch_upsilon",
+          "schema": [
+            {
+              "@type": "Array",
+              "elementSchema": "unsignedByte"
+            },
+            "dtmi:ex:dependentRef;1"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_phi;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Array",
+          "elementSchema": "unsignedShort"
+        },
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "itch_chi",
+          "schema": [
+            {
+              "@type": "Array",
+              "elementSchema": "unsignedLong"
+            },
+            "dtmi:ex:dependentRef;1"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "itch_psi",
+          "schema": "long"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "itch_yuzz",
+          "schema": [
+            "long"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "itch_um",
+          "schema": "dtmi:dtdl:instance:Schema:long;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "itch_fuddle",
+          "schema": [
+            "dtmi:dtdl:instance:Schema:long;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "itch_nuh",
+          "schema": "point"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "itch_quan",
+          "schema": [
+            "point"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "itch_spazz",
+          "schema": "dtmi:standard:schema:geospatial:point;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "itch_zatz",
+          "schema": [
+            "dtmi:standard:schema:geospatial:point;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "itch_flunn",
+          "schema": "Foobar"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "itch_yekk",
+          "schema": "Foobar"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "itch_hi",
+          "schema": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "yekk_beta",
+          "schema": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "yekk_delta",
+          "schema": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "yekk_zeta",
+          "schema": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "yekk_theta",
+          "schema": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "yekk_kappa",
+          "schema": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "yekk_mu",
+          "schema": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "yekk_xi",
+          "schema": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "yekk_pi",
+          "schema": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "yekk_sigma",
+          "schema": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "yekk_upsilon",
+          "schema": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "yekk_chi",
+          "schema": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "yekk_omega",
+          "schema": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "yekk_wum",
+          "schema": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "yekk_humpf",
+          "schema": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "yekk_glikk",
+          "schema": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "yekk_snee",
+          "schema": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "yekk_thnad",
+          "schema": []
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyPropertySchemaTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassPropertyPropertySchemaTermAndDtmiV4.json
new file mode 100644
index 00000000..315afa0d
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyPropertySchemaTermAndDtmiV4.json
@@ -0,0 +1,41 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_zatz",
+          "schema": "unsignedLong",
+          "dtmi:dtdl:property:schema;4": "unsignedShort"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "alpha_flunn",
+          "schema": "uuid",
+          "dtmi:dtdl:property:schema;4": "boolean"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyPropertySchemaTypeConformanceV4.json b/DTDL/v4/spec/Requirement-ClassPropertyPropertySchemaTypeConformanceV4.json
new file mode 100644
index 00000000..3d7a0e70
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyPropertySchemaTypeConformanceV4.json
@@ -0,0 +1,658 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "yekk_hi",
+          "schema": {
+            "@id": "dtmi:example:yekk_vroo;1",
+            "elementSchema": "uuid",
+            "@type": "Array"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_delta",
+          "schema": {
+            "@id": "dtmi:example:vroo_beta;1",
+            "name": "vroo_gamma",
+            "@type": "Command"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "vroo_theta",
+          "schema": {
+            "@id": "dtmi:example:vroo_zeta;1",
+            "name": "vroo_eta",
+            "@type": "Command"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_mu",
+          "schema": {
+            "@id": "dtmi:example:vroo_kappa;1",
+            "name": "vroo_lambda",
+            "schema": "boolean",
+            "@type": "CommandRequest"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "vroo_pi",
+          "schema": {
+            "@id": "dtmi:example:vroo_xi;1",
+            "name": "vroo_omicron",
+            "schema": "byte",
+            "@type": "CommandRequest"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_upsilon",
+          "schema": {
+            "@id": "dtmi:example:vroo_sigma;1",
+            "name": "vroo_tau",
+            "schema": "bytes",
+            "@type": "CommandResponse"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "vroo_omega",
+          "schema": {
+            "@id": "dtmi:example:vroo_chi;1",
+            "name": "vroo_psi",
+            "schema": "date",
+            "@type": "CommandResponse"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_fuddle",
+          "schema": {
+            "@id": "dtmi:example:vroo_wum;1",
+            "name": "vroo_um",
+            "schema": {
+              "@id": "dtmi:example:vroo_humpf;1",
+              "@type": "Interface"
+            },
+            "@type": "Component"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "vroo_thnad",
+          "schema": {
+            "@id": "dtmi:example:vroo_nuh;1",
+            "name": "vroo_snee",
+            "schema": {
+              "@id": "dtmi:example:vroo_quan;1",
+              "@type": "Interface"
+            },
+            "@type": "Component"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_zatz",
+          "schema": {
+            "@id": "dtmi:example:vroo_floob;1",
+            "valueSchema": "integer",
+            "@type": "Enum"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "vroo_yekk",
+          "schema": {
+            "@id": "dtmi:example:vroo_flunn;1",
+            "enumValue": 1871,
+            "name": "vroo_itch",
+            "@type": "EnumValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "hi_beta",
+          "schema": {
+            "@id": "dtmi:example:vroo_hi;1",
+            "enumValue": 1872,
+            "name": "hi_alpha",
+            "@type": "EnumValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "hi_zeta",
+          "schema": {
+            "@id": "dtmi:example:hi_delta;1",
+            "name": "hi_epsilon",
+            "schema": "dateTime",
+            "@type": "Field"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "hi_kappa",
+          "schema": {
+            "@id": "dtmi:example:hi_theta;1",
+            "name": "hi_iota",
+            "schema": "decimal",
+            "@type": "Field"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "hi_nu",
+          "schema": {
+            "@id": "dtmi:example:hi_mu;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "hi_pi",
+          "schema": {
+            "@id": "dtmi:example:hi_omicron;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "hi_phi",
+          "schema": {
+            "@id": "dtmi:example:hi_sigma;1",
+            "mapKey": {
+              "name": "hi_tau",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "hi_upsilon",
+              "schema": "double"
+            },
+            "@type": "Map"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "hi_yuzz",
+          "schema": {
+            "@id": "dtmi:example:hi_psi;1",
+            "name": "hi_omega",
+            "schema": "string",
+            "@type": "MapKey"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "hi_fuddle",
+          "schema": {
+            "@id": "dtmi:example:hi_um;1",
+            "name": "hi_humpf",
+            "schema": "string",
+            "@type": "MapKey"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "hi_quan",
+          "schema": {
+            "@id": "dtmi:example:hi_nuh;1",
+            "name": "hi_snee",
+            "schema": "duration",
+            "@type": "MapValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "hi_zatz",
+          "schema": {
+            "@id": "dtmi:example:hi_spazz;1",
+            "name": "hi_floob",
+            "schema": "float",
+            "@type": "MapValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "hi_itch",
+          "schema": {
+            "@id": "dtmi:example:hi_flunn;1",
+            "@type": "Object"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_alpha",
+          "schema": {
+            "@id": "dtmi:example:hi_vroo;1",
+            "name": "hi_hi",
+            "schema": "integer",
+            "@type": "Property"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "alpha_epsilon",
+          "schema": {
+            "@id": "dtmi:example:alpha_gamma;1",
+            "name": "alpha_delta",
+            "schema": "long",
+            "@type": "Property"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_iota",
+          "schema": {
+            "@id": "dtmi:example:alpha_eta;1",
+            "name": "alpha_theta",
+            "@type": "Relationship"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "alpha_nu",
+          "schema": {
+            "@id": "dtmi:example:alpha_lambda;1",
+            "name": "alpha_mu",
+            "@type": "Relationship"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "alpha_rho",
+          "schema": {
+            "@id": "dtmi:example:alpha_omicron;1",
+            "name": "alpha_pi",
+            "schema": "short",
+            "@type": "Telemetry"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "alpha_phi",
+          "schema": {
+            "@id": "dtmi:example:alpha_tau;1",
+            "name": "alpha_upsilon",
+            "schema": "string",
+            "@type": "Telemetry"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyPropertyWritableBooleanV4.json b/DTDL/v4/spec/Requirement-ClassPropertyPropertyWritableBooleanV4.json
new file mode 100644
index 00000000..6afeb972
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyPropertyWritableBooleanV4.json
@@ -0,0 +1,521 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "lambda_chi",
+          "schema": "unsignedLong",
+          "writable": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "lambda_omega",
+          "schema": "unsignedShort",
+          "writable": false
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "lambda_wum",
+          "schema": "uuid",
+          "writable": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "lambda_humpf",
+          "schema": "boolean",
+          "writable": [
+            false
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "lambda_glikk",
+          "schema": "byte",
+          "writable": {
+            "@value": true,
+            "@type": "xsd:boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "lambda_snee",
+          "schema": "bytes",
+          "writable": {
+            "@value": false,
+            "@type": "xsd:boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "lambda_thnad",
+          "schema": "date",
+          "writable": [
+            {
+              "@value": true,
+              "@type": "xsd:boolean"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "lambda_floob",
+          "schema": "dateTime",
+          "writable": [
+            {
+              "@value": false,
+              "@type": "xsd:boolean"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "lambda_jogg",
+          "schema": "decimal",
+          "writable": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "lambda_itch",
+          "schema": "double",
+          "writable": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "lambda_vroo",
+          "schema": "duration",
+          "writable": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "mu_alpha",
+          "schema": "float",
+          "writable": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "mu_gamma",
+          "schema": "integer",
+          "writable": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "mu_epsilon",
+          "schema": "long",
+          "writable": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "mu_eta",
+          "schema": "short",
+          "writable": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "mu_iota",
+          "schema": "string",
+          "writable": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "mu_lambda",
+          "schema": "time",
+          "writable": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "mu_nu",
+          "schema": "unsignedByte",
+          "writable": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "mu_omicron",
+          "schema": "unsignedInteger",
+          "writable": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "mu_rho",
+          "schema": "unsignedLong",
+          "writable": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "mu_tau",
+          "schema": "unsignedShort",
+          "writable": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "mu_phi",
+          "schema": "uuid",
+          "writable": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "mu_psi",
+          "schema": "boolean",
+          "writable": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "mu_yuzz",
+          "schema": "byte",
+          "writable": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "mu_um",
+          "schema": "bytes",
+          "writable": [
+            {}
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyPropertyWritableTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassPropertyPropertyWritableTermAndDtmiV4.json
new file mode 100644
index 00000000..2457b889
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyPropertyWritableTermAndDtmiV4.json
@@ -0,0 +1,43 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "mu_spazz",
+          "schema": "double",
+          "writable": true,
+          "dtmi:dtdl:property:writable;4": false
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "mu_zatz",
+          "schema": "duration",
+          "writable": true,
+          "dtmi:dtdl:property:writable;4": false
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyRequiredPropertiesV4.json b/DTDL/v4/spec/Requirement-ClassPropertyRequiredPropertiesV4.json
new file mode 100644
index 00000000..aaf30982
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyRequiredPropertiesV4.json
@@ -0,0 +1,107 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "floob_xi",
+          "schema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "floob_pi",
+          "schema": "time"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "schema": "unsignedByte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "schema": "unsignedInteger"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Property",
+          "name": "floob_upsilon"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Property",
+          "name": "floob_chi"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyTypeIncludesInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassPropertyTypeIncludesInvalidDtmiV4.json
new file mode 100644
index 00000000..b867f130
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyTypeIncludesInvalidDtmiV4.json
@@ -0,0 +1,45 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Property",
+            "dtmi:foo//bar"
+          ],
+          "name": "jogg_delta",
+          "schema": "short"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Property",
+            "dtmi:foo//bar"
+          ],
+          "name": "jogg_zeta",
+          "schema": "string"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyTypeIncludesMaterialV4.json b/DTDL/v4/spec/Requirement-ClassPropertyTypeIncludesMaterialV4.json
new file mode 100644
index 00000000..0f76d715
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyTypeIncludesMaterialV4.json
@@ -0,0 +1,156 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "zatz_nu",
+          "schema": "time",
+          "@type": "Property"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "zatz_omicron",
+          "schema": "unsignedByte",
+          "@type": [
+            "Property"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "zatz_rho",
+          "schema": "unsignedInteger",
+          "@type": "dtmi:dtdl:class:Property;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "zatz_tau",
+          "schema": "unsignedLong",
+          "@type": [
+            "dtmi:dtdl:class:Property;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "zatz_phi",
+          "schema": "unsignedShort",
+          "@type": "Something"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "zatz_psi",
+          "schema": "uuid",
+          "@type": "Something"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "zatz_yuzz",
+          "schema": "boolean",
+          "@type": [
+            "Something"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "zatz_um",
+          "schema": "byte",
+          "@type": [
+            "Something"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyTypeIncludesNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassPropertyTypeIncludesNotDtmiNorTermV4.json
new file mode 100644
index 00000000..c7d78d51
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyTypeIncludesNotDtmiNorTermV4.json
@@ -0,0 +1,45 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Property",
+            "http://foo.com/bar"
+          ],
+          "name": "jogg_theta",
+          "schema": "time"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Property",
+            "http://foo.com/bar"
+          ],
+          "name": "jogg_kappa",
+          "schema": "unsignedByte"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassPropertyTypeStringOrArrayV4.json b/DTDL/v4/spec/Requirement-ClassPropertyTypeStringOrArrayV4.json
new file mode 100644
index 00000000..c47f34e2
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassPropertyTypeStringOrArrayV4.json
@@ -0,0 +1,314 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "floob_omega",
+          "schema": "unsignedLong",
+          "@type": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "floob_wum",
+          "schema": "unsignedShort",
+          "@type": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "floob_humpf",
+          "schema": "uuid",
+          "@type": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "floob_glikk",
+          "schema": "boolean",
+          "@type": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "floob_snee",
+          "schema": "byte",
+          "@type": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "floob_thnad",
+          "schema": "bytes",
+          "@type": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "floob_floob",
+          "schema": "date",
+          "@type": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "floob_jogg",
+          "schema": "dateTime",
+          "@type": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "floob_itch",
+          "schema": "decimal",
+          "@type": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "floob_vroo",
+          "schema": "double",
+          "@type": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "zatz_alpha",
+          "schema": "duration",
+          "@type": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "zatz_gamma",
+          "schema": "float",
+          "@type": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "zatz_epsilon",
+          "schema": "integer",
+          "@type": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "zatz_eta",
+          "schema": "long",
+          "@type": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "zatz_iota",
+          "schema": "short",
+          "@type": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "zatz_lambda",
+          "schema": "string",
+          "@type": [
+            {}
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipContextConformsV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipContextConformsV4.json
new file mode 100644
index 00000000..bfeffeb4
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipContextConformsV4.json
@@ -0,0 +1,370 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_beta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:sigma_alpha;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "rho_hi",
+            "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_epsilon;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:sigma_delta;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "sigma_gamma",
+            "@context": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_theta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:sigma_eta;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "sigma_zeta",
+            "@context": [
+              "dtmi:dtdl:extension:quantitativeTypes;1"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_lambda;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:sigma_kappa;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "sigma_iota",
+            "@context": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_xi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:sigma_nu;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "sigma_mu",
+            "@context": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_rho;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:sigma_pi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "sigma_omicron",
+            "@context": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_upsilon;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:sigma_tau;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "sigma_sigma",
+            "@context": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_psi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:sigma_chi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "sigma_phi",
+            "@context": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_wum;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:sigma_yuzz;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "sigma_omega",
+            "@context": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_fuddle;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:sigma_humpf;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "sigma_um",
+            "@context": "dtmi:dtdl:extension:quantitativeTypes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_snee;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:sigma_nuh;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "sigma_glikk",
+            "@context": "http://dtdl/extension/quantitativeTypes/1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_spazz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:sigma_thnad;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "sigma_quan",
+            "@context": "quantitativeTypes;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_jogg;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:sigma_zatz;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "sigma_floob",
+            "@context": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:sigma_yekk;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:sigma_itch;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "sigma_flunn",
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_alpha;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:sigma_hi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "sigma_vroo",
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_delta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:tau_gamma;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "tau_beta",
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipIdDuplicateV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipIdDuplicateV4.json
new file mode 100644
index 00000000..7e106e02
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipIdDuplicateV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_xi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:chi_xi;1",
+          "@type": "Interface",
+          "contents": {
+            "@id": "dtmi:example:chi_xi;1",
+            "@type": "Relationship",
+            "name": "chi_omicron"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_pi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:chi_pi;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:example:chi_pi;1",
+            "@type": "Relationship",
+            "name": "chi_rho"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipIdIsDtmiV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipIdIsDtmiV4.json
new file mode 100644
index 00000000..f1660033
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipIdIsDtmiV4.json
@@ -0,0 +1,1020 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;7",
+          "@type": "Relationship",
+          "name": "tau_epsilon"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;108675309",
+          "@type": "Relationship",
+          "name": "tau_eta"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;999999999",
+          "@type": "Relationship",
+          "name": "tau_iota"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo;1",
+          "@type": "Relationship",
+          "name": "tau_lambda"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar",
+          "@type": "Relationship",
+          "name": "tau_nu"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;3.14",
+          "@type": "Relationship",
+          "name": "tau_omicron"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;3.141592",
+          "@type": "Relationship",
+          "name": "tau_rho"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": null,
+          "@type": "Relationship",
+          "name": "tau_tau"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": null,
+          "@type": "Relationship",
+          "name": "tau_phi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": 626,
+          "@type": "Relationship",
+          "name": "tau_psi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": 626,
+          "@type": "Relationship",
+          "name": "tau_yuzz"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": true,
+          "@type": "Relationship",
+          "name": "tau_um"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": true,
+          "@type": "Relationship",
+          "name": "tau_fuddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": {
+            "@value": "dtmi:apparently:valid:identifier;3"
+          },
+          "@type": "Relationship",
+          "name": "tau_nuh"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": {
+            "@value": "dtmi:apparently:valid:identifier;3"
+          },
+          "@type": "Relationship",
+          "name": "tau_quan"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;0",
+          "@type": "Relationship",
+          "name": "tau_spazz"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0",
+          "@type": "Relationship",
+          "name": "tau_zatz"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;0.0",
+          "@type": "Relationship",
+          "name": "tau_flunn"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:tau_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0.0",
+          "@type": "Relationship",
+          "name": "tau_yekk"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;1234567890",
+          "@type": "Relationship",
+          "name": "tau_hi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;1234567890",
+          "@type": "Relationship",
+          "name": "upsilon_beta"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;1a",
+          "@type": "Relationship",
+          "name": "upsilon_delta"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;1a",
+          "@type": "Relationship",
+          "name": "upsilon_zeta"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;3.0",
+          "@type": "Relationship",
+          "name": "upsilon_theta"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;3.0",
+          "@type": "Relationship",
+          "name": "upsilon_kappa"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;3.1415926",
+          "@type": "Relationship",
+          "name": "upsilon_mu"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;3.1415926",
+          "@type": "Relationship",
+          "name": "upsilon_xi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;6.02",
+          "@type": "Relationship",
+          "name": "upsilon_pi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;6.02",
+          "@type": "Relationship",
+          "name": "upsilon_sigma"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;0.1",
+          "@type": "Relationship",
+          "name": "upsilon_upsilon"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0.1",
+          "@type": "Relationship",
+          "name": "upsilon_chi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;01",
+          "@type": "Relationship",
+          "name": "upsilon_omega"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;01",
+          "@type": "Relationship",
+          "name": "upsilon_wum"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;",
+          "@type": "Relationship",
+          "name": "upsilon_humpf"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;",
+          "@type": "Relationship",
+          "name": "upsilon_glikk"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:test:invalidId_;1",
+          "@type": "Relationship",
+          "name": "upsilon_snee"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:invalidId_;1",
+          "@type": "Relationship",
+          "name": "upsilon_thnad"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:test:_invalidUserId;1",
+          "@type": "Relationship",
+          "name": "upsilon_floob"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:_invalidUserId;1",
+          "@type": "Relationship",
+          "name": "upsilon_jogg"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:test:1seg;1",
+          "@type": "Relationship",
+          "name": "upsilon_itch"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:upsilon_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:1seg;1",
+          "@type": "Relationship",
+          "name": "upsilon_vroo"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar.baz;1",
+          "@type": "Relationship",
+          "name": "phi_alpha"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar.baz;1",
+          "@type": "Relationship",
+          "name": "phi_gamma"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo::bar;1",
+          "@type": "Relationship",
+          "name": "phi_epsilon"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo::bar;1",
+          "@type": "Relationship",
+          "name": "phi_eta"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "urn:foo:bar:1",
+          "@type": "Relationship",
+          "name": "phi_iota"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "urn:foo:bar:1",
+          "@type": "Relationship",
+          "name": "phi_lambda"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "http://foo/bar/baz",
+          "@type": "Relationship",
+          "name": "phi_nu"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "http://foo/bar/baz",
+          "@type": "Relationship",
+          "name": "phi_omicron"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:;1",
+          "@type": "Relationship",
+          "name": "phi_rho"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:;1",
+          "@type": "Relationship",
+          "name": "phi_tau"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:dtdl:example;1",
+          "@type": "Relationship",
+          "name": "phi_phi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:dtdl:example;1",
+          "@type": "Relationship",
+          "name": "phi_psi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:standard:example;1",
+          "@type": "Relationship",
+          "name": "phi_yuzz"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:standard:example;1",
+          "@type": "Relationship",
+          "name": "phi_um"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipIdNotArrayV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipIdNotArrayV4.json
new file mode 100644
index 00000000..9423f3b9
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipIdNotArrayV4.json
@@ -0,0 +1,289 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;7"
+          ],
+          "@type": "Relationship",
+          "name": "phi_fuddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;7"
+          ],
+          "@type": "Relationship",
+          "name": "phi_nuh"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;108675309"
+          ],
+          "@type": "Relationship",
+          "name": "phi_quan"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;108675309"
+          ],
+          "@type": "Relationship",
+          "name": "phi_spazz"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;999999999"
+          ],
+          "@type": "Relationship",
+          "name": "phi_zatz"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;999999999"
+          ],
+          "@type": "Relationship",
+          "name": "phi_flunn"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:phi_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo;1"
+          ],
+          "@type": "Relationship",
+          "name": "phi_yekk"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo;1"
+          ],
+          "@type": "Relationship",
+          "name": "phi_hi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar"
+          ],
+          "@type": "Relationship",
+          "name": "chi_beta"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar"
+          ],
+          "@type": "Relationship",
+          "name": "chi_delta"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;3.14"
+          ],
+          "@type": "Relationship",
+          "name": "chi_zeta"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;3.14"
+          ],
+          "@type": "Relationship",
+          "name": "chi_theta"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;3.141592"
+          ],
+          "@type": "Relationship",
+          "name": "chi_kappa"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;3.141592"
+          ],
+          "@type": "Relationship",
+          "name": "chi_mu"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipInvalidKeywordsV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipInvalidKeywordsV4.json
new file mode 100644
index 00000000..e50f3272
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipInvalidKeywordsV4.json
@@ -0,0 +1,150 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "jogg_spazz",
+          "@graph": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "jogg_zatz",
+          "@graph": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "jogg_flunn",
+          "@value": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "jogg_yekk",
+          "@value": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "jogg_hi",
+          "@language": "en"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "flunn_beta",
+          "@language": "en"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "flunn_delta",
+          "@foobar": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "flunn_zeta",
+          "@foobar": true
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyCommentStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyCommentStringLengthV4.json
new file mode 100644
index 00000000..74fe43e7
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyCommentStringLengthV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "psi_rho",
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "psi_tau",
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "psi_phi",
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyCommentStringV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyCommentStringV4.json
new file mode 100644
index 00000000..ecd14a60
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyCommentStringV4.json
@@ -0,0 +1,414 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "chi_sigma",
+          "comment": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "chi_upsilon",
+          "comment": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "chi_chi",
+          "comment": {
+            "@value": "hello",
+            "@type": "xsd:string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "chi_omega",
+          "comment": [
+            {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "chi_wum",
+          "comment": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "chi_humpf",
+          "comment": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "chi_glikk",
+          "comment": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "chi_snee",
+          "comment": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "chi_thnad",
+          "comment": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "chi_floob",
+          "comment": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "chi_jogg",
+          "comment": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "chi_itch",
+          "comment": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:chi_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "chi_vroo",
+          "comment": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "psi_alpha",
+          "comment": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "psi_gamma",
+          "comment": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "psi_epsilon",
+          "comment": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "psi_eta",
+          "comment": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "psi_iota",
+          "comment": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "psi_lambda",
+          "comment": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "psi_nu",
+          "comment": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "psi_omicron",
+          "comment": [
+            {}
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyCommentTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyCommentTermAndDtmiV4.json
new file mode 100644
index 00000000..cfef839c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyCommentTermAndDtmiV4.json
@@ -0,0 +1,41 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "comment": "psi_snee",
+          "dtmi:dtdl:property:comment;4": "psi_quan",
+          "name": "psi_thnad"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "comment": "psi_floob",
+          "dtmi:dtdl:property:comment;4": "psi_zatz",
+          "name": "psi_jogg"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyDescriptionLangStringV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyDescriptionLangStringV4.json
new file mode 100644
index 00000000..8731760b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyDescriptionLangStringV4.json
@@ -0,0 +1,482 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "psi_itch",
+          "description": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:psi_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "psi_vroo",
+          "description": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "omega_alpha",
+          "description": {
+            "en": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "omega_gamma",
+          "description": [
+            {
+              "@value": "hello",
+              "@language": "en"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "omega_epsilon",
+          "description": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "omega_eta",
+          "description": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "omega_iota",
+          "description": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "omega_lambda",
+          "description": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "omega_nu",
+          "description": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "omega_omicron",
+          "description": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "omega_rho",
+          "description": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "omega_tau",
+          "description": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "omega_phi",
+          "description": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "omega_psi",
+          "description": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "omega_yuzz",
+          "description": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "omega_um",
+          "description": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "omega_fuddle",
+          "description": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "omega_nuh",
+          "description": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "omega_quan",
+          "description": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "omega_spazz",
+          "description": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "omega_zatz",
+          "description": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "omega_flunn",
+          "description": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omega_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "omega_yekk",
+          "description": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "omega_hi",
+          "description": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyDescriptionStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyDescriptionStringLengthV4.json
new file mode 100644
index 00000000..a24f4179
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyDescriptionStringLengthV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "yuzz_beta",
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "yuzz_delta",
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "yuzz_zeta",
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyDescriptionTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyDescriptionTermAndDtmiV4.json
new file mode 100644
index 00000000..06bda026
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyDescriptionTermAndDtmiV4.json
@@ -0,0 +1,49 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "description": [
+            "yuzz_rho"
+          ],
+          "dtmi:dtdl:property:description;4": [
+            "yuzz_sigma"
+          ],
+          "name": "yuzz_tau"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "description": [
+            "yuzz_phi"
+          ],
+          "dtmi:dtdl:property:description;4": [
+            "yuzz_chi"
+          ],
+          "name": "yuzz_psi"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyDisplayNameLangStringV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyDisplayNameLangStringV4.json
new file mode 100644
index 00000000..8c7e9a3d
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyDisplayNameLangStringV4.json
@@ -0,0 +1,482 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "yuzz_yuzz",
+          "displayName": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "yuzz_um",
+          "displayName": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "yuzz_fuddle",
+          "displayName": {
+            "en": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "yuzz_nuh",
+          "displayName": [
+            {
+              "@value": "hello",
+              "@language": "en"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "yuzz_quan",
+          "displayName": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "yuzz_spazz",
+          "displayName": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "yuzz_zatz",
+          "displayName": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "yuzz_flunn",
+          "displayName": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yuzz_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "yuzz_yekk",
+          "displayName": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "yuzz_hi",
+          "displayName": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "wum_beta",
+          "displayName": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "wum_delta",
+          "displayName": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "wum_zeta",
+          "displayName": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "wum_theta",
+          "displayName": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "wum_kappa",
+          "displayName": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "wum_mu",
+          "displayName": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "wum_xi",
+          "displayName": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "wum_pi",
+          "displayName": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "wum_sigma",
+          "displayName": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "wum_upsilon",
+          "displayName": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "wum_chi",
+          "displayName": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "wum_omega",
+          "displayName": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "wum_wum",
+          "displayName": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "wum_humpf",
+          "displayName": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyDisplayNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyDisplayNameStringLengthV4.json
new file mode 100644
index 00000000..cda2485b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyDisplayNameStringLengthV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "wum_glikk",
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "wum_snee",
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:wum_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "wum_thnad",
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyDisplayNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyDisplayNameTermAndDtmiV4.json
new file mode 100644
index 00000000..58979864
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyDisplayNameTermAndDtmiV4.json
@@ -0,0 +1,49 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "displayName": [
+            "um_beta"
+          ],
+          "dtmi:dtdl:property:displayName;4": [
+            "um_gamma"
+          ],
+          "name": "um_delta"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "displayName": [
+            "um_zeta"
+          ],
+          "dtmi:dtdl:property:displayName;4": [
+            "um_eta"
+          ],
+          "name": "um_theta"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyFormallyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyFormallyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..bbf2aa55
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyFormallyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,76 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "flunn_pi",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "flunn_sigma",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "flunn_upsilon",
+          "boolean": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "flunn_chi",
+          "boolean": null
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyFormallyUndefinedTermV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyFormallyUndefinedTermV4.json
new file mode 100644
index 00000000..f64867f9
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyFormallyUndefinedTermV4.json
@@ -0,0 +1,39 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "flunn_floob",
+          "foobar": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "flunn_jogg",
+          "foobar": {}
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyInvalidDtmiV4.json
new file mode 100644
index 00000000..5f3c2c16
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyInvalidDtmiV4.json
@@ -0,0 +1,45 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Relationship",
+            "Foobar"
+          ],
+          "name": "flunn_omega",
+          "dtmi:foo//bar": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Relationship",
+            "Foobar"
+          ],
+          "name": "flunn_wum",
+          "dtmi:foo//bar": 626
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityIntegerV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityIntegerV4.json
new file mode 100644
index 00000000..80b57edf
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityIntegerV4.json
@@ -0,0 +1,414 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "um_kappa",
+          "maxMultiplicity": 22
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "um_mu",
+          "maxMultiplicity": [
+            22
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "um_xi",
+          "maxMultiplicity": {
+            "@value": 22,
+            "@type": "xsd:integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "um_pi",
+          "maxMultiplicity": [
+            {
+              "@value": 22,
+              "@type": "xsd:integer"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "um_sigma",
+          "maxMultiplicity": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "um_upsilon",
+          "maxMultiplicity": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "um_chi",
+          "maxMultiplicity": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "um_omega",
+          "maxMultiplicity": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "um_wum",
+          "maxMultiplicity": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "um_humpf",
+          "maxMultiplicity": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "um_glikk",
+          "maxMultiplicity": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "um_snee",
+          "maxMultiplicity": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "um_thnad",
+          "maxMultiplicity": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "um_floob",
+          "maxMultiplicity": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "um_jogg",
+          "maxMultiplicity": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "um_itch",
+          "maxMultiplicity": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:um_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "um_vroo",
+          "maxMultiplicity": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "humpf_alpha",
+          "maxMultiplicity": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "humpf_gamma",
+          "maxMultiplicity": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "humpf_epsilon",
+          "maxMultiplicity": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "humpf_eta",
+          "maxMultiplicity": [
+            {}
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityMinValueV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityMinValueV4.json
new file mode 100644
index 00000000..829e0f21
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityMinValueV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "humpf_iota",
+          "maxMultiplicity": 1
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "humpf_lambda",
+          "maxMultiplicity": 0
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "humpf_nu",
+          "maxMultiplicity": 0
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityTermAndDtmiV4.json
new file mode 100644
index 00000000..49d417a0
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyMaxMultiplicityTermAndDtmiV4.json
@@ -0,0 +1,41 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "maxMultiplicity": 1876,
+          "dtmi:dtdl:property:maxMultiplicity;4": 1877,
+          "name": "humpf_phi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "maxMultiplicity": 1878,
+          "dtmi:dtdl:property:maxMultiplicity;4": 1879,
+          "name": "humpf_psi"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyMinMultiplicityExactValueV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyMinMultiplicityExactValueV4.json
new file mode 100644
index 00000000..83489cdc
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyMinMultiplicityExactValueV4.json
@@ -0,0 +1,94 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "fuddle_omega",
+          "minMultiplicity": 0
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "fuddle_wum",
+          "minMultiplicity": -1
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "fuddle_humpf",
+          "minMultiplicity": -1
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "fuddle_glikk",
+          "minMultiplicity": 1
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "fuddle_snee",
+          "minMultiplicity": 1
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyMinMultiplicityIntegerV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyMinMultiplicityIntegerV4.json
new file mode 100644
index 00000000..07b05dee
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyMinMultiplicityIntegerV4.json
@@ -0,0 +1,414 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "humpf_yuzz",
+          "minMultiplicity": 0
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "humpf_um",
+          "minMultiplicity": [
+            0
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "humpf_fuddle",
+          "minMultiplicity": {
+            "@value": 0,
+            "@type": "xsd:integer"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "humpf_nuh",
+          "minMultiplicity": [
+            {
+              "@value": 0,
+              "@type": "xsd:integer"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "humpf_quan",
+          "minMultiplicity": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "humpf_spazz",
+          "minMultiplicity": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "humpf_zatz",
+          "minMultiplicity": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "humpf_flunn",
+          "minMultiplicity": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:humpf_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "humpf_yekk",
+          "minMultiplicity": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "humpf_hi",
+          "minMultiplicity": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "fuddle_beta",
+          "minMultiplicity": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "fuddle_delta",
+          "minMultiplicity": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "fuddle_zeta",
+          "minMultiplicity": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "fuddle_theta",
+          "minMultiplicity": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "fuddle_kappa",
+          "minMultiplicity": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "fuddle_mu",
+          "minMultiplicity": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "fuddle_xi",
+          "minMultiplicity": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "fuddle_pi",
+          "minMultiplicity": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "fuddle_sigma",
+          "minMultiplicity": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "fuddle_upsilon",
+          "minMultiplicity": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "fuddle_chi",
+          "minMultiplicity": [
+            {}
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyMinMultiplicityTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyMinMultiplicityTermAndDtmiV4.json
new file mode 100644
index 00000000..060c84e1
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyMinMultiplicityTermAndDtmiV4.json
@@ -0,0 +1,41 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "minMultiplicity": 0,
+          "dtmi:dtdl:property:minMultiplicity;4": 0,
+          "name": "fuddle_itch"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:fuddle_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "minMultiplicity": 0,
+          "dtmi:dtdl:property:minMultiplicity;4": 0,
+          "name": "fuddle_vroo"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyNamePatternV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyNamePatternV4.json
new file mode 100644
index 00000000..841ce063
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyNamePatternV4.json
@@ -0,0 +1,437 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "EARTH"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "Air"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "fire"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "hello_world"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "Anarchy99"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "23skidoo"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "23skidoo"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "626"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "626"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "goodbye-world"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "goodbye-world"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "_haha"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "_haha"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "toodaloo_"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "toodaloo_"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "pro:con"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "pro:con"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "mish/mash"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "mish/mash"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "#tag"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "#tag"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "@tweet"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "@tweet"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "$money"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "$money"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyNameStringLengthV4.json
new file mode 100644
index 00000000..b53d141b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyNameStringLengthV4.json
@@ -0,0 +1,54 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyNameStringV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyNameStringV4.json
new file mode 100644
index 00000000..ad2f3075
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyNameStringV4.json
@@ -0,0 +1,411 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": {
+            "@value": "hello",
+            "@type": "xsd:string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": [
+            {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": []
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyNameTermAndDtmiV4.json
new file mode 100644
index 00000000..c9d209b4
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyNameTermAndDtmiV4.json
@@ -0,0 +1,39 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "rho_omicron",
+          "dtmi:dtdl:property:name;4": "rho_pi"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "rho_sigma",
+          "dtmi:dtdl:property:name;4": "rho_tau"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyNameUniqueAmongInterfaceContentsV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyNameUniqueAmongInterfaceContentsV4.json
new file mode 100644
index 00000000..2646c05b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyNameUniqueAmongInterfaceContentsV4.json
@@ -0,0 +1,74 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_zeta;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "epsilon_pi"
+          },
+          {
+            "@type": "Relationship",
+            "name": "epsilon_rho"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:rho_eta;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "epsilon_pi"
+          },
+          {
+            "@type": "Relationship",
+            "name": "epsilon_pi"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:rho_theta;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "epsilon_pi"
+          },
+          {
+            "@type": "Relationship",
+            "name": "epsilon_pi"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyNotDtmiNorTermV4.json
new file mode 100644
index 00000000..c5499a11
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyNotDtmiNorTermV4.json
@@ -0,0 +1,45 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Relationship",
+            "Foobar"
+          ],
+          "name": "flunn_humpf",
+          "http://foo.com/bar": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Relationship",
+            "Foobar"
+          ],
+          "name": "flunn_glikk",
+          "http://foo.com/bar": true
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyPropertiesElementV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyPropertiesElementV4.json
new file mode 100644
index 00000000..70b59138
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyPropertiesElementV4.json
@@ -0,0 +1,225 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_epsilon;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:glikk_delta;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "glikk_gamma",
+            "properties": {
+              "@id": "dtmi:example:glikk_alpha;1",
+              "@type": "Property",
+              "name": "glikk_beta",
+              "schema": "time"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_kappa;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:glikk_iota;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "glikk_theta",
+            "properties": [
+              {
+                "@id": "dtmi:example:glikk_zeta;1",
+                "@type": "Property",
+                "name": "glikk_eta",
+                "schema": "unsignedByte"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_mu;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@id": "dtmi:ex:dependentRef;1",
+            "@type": "Property",
+            "name": "glikk_lambda",
+            "schema": "unsignedInteger"
+          },
+          {
+            "@type": "Relationship",
+            "name": "glikk_nu",
+            "properties": "dtmi:ex:dependentRef;1"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_omicron;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@id": "dtmi:ex:dependentRef;1",
+            "@type": "Property",
+            "name": "glikk_xi",
+            "schema": "unsignedLong"
+          },
+          {
+            "@type": "Relationship",
+            "name": "glikk_pi",
+            "properties": [
+              "dtmi:ex:dependentRef;1"
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_phi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:glikk_upsilon;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "glikk_tau",
+            "properties": {
+              "@id": "dtmi:example:glikk_rho;1",
+              "@type": "Property",
+              "name": "glikk_sigma",
+              "schema": "integer",
+              "@context": "dtmi:dtdl:context;2"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_wum;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:glikk_yuzz;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "glikk_omega",
+            "properties": {
+              "@id": "dtmi:example:glikk_chi;1",
+              "@type": "Property",
+              "name": "glikk_psi",
+              "schema": "long",
+              "@context": "dtmi:dtdl:context;3"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_fuddle;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:glikk_humpf;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "glikk_um",
+            "properties": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:glikk_floob;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:glikk_spazz;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Relationship",
+            "name": "glikk_thnad",
+            "properties": [
+              {
+                "@id": "dtmi:example:glikk_glikk;1",
+                "@type": "Property",
+                "name": "glikk_nuh",
+                "schema": "boolean"
+              },
+              {
+                "@id": "dtmi:example:glikk_snee;1",
+                "@type": "Property",
+                "name": "glikk_quan",
+                "schema": "byte"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyPropertiesTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyPropertiesTermAndDtmiV4.json
new file mode 100644
index 00000000..8b75f924
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyPropertiesTermAndDtmiV4.json
@@ -0,0 +1,65 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "quan_hi",
+          "properties": [
+            {
+              "@type": "Property",
+              "name": "thnad_alpha",
+              "schema": "byte"
+            }
+          ],
+          "dtmi:dtdl:property:properties;4": [
+            {
+              "@type": "Property",
+              "name": "thnad_beta",
+              "schema": "bytes"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "thnad_delta",
+          "properties": [
+            {
+              "@type": "Property",
+              "name": "thnad_epsilon",
+              "schema": "date"
+            }
+          ],
+          "dtmi:dtdl:property:properties;4": [
+            {
+              "@type": "Property",
+              "name": "thnad_zeta",
+              "schema": "dateTime"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyPropertiesTypeConformanceV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyPropertiesTypeConformanceV4.json
new file mode 100644
index 00000000..6db37b2b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyPropertiesTypeConformanceV4.json
@@ -0,0 +1,732 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "nuh_alpha",
+          "properties": {
+            "@id": "dtmi:example:glikk_hi;1",
+            "elementSchema": "bytes",
+            "@type": "Array"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "nuh_delta",
+          "properties": {
+            "@id": "dtmi:example:nuh_gamma;1",
+            "elementSchema": "date",
+            "@type": "Array"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "nuh_theta",
+          "properties": {
+            "@id": "dtmi:example:nuh_zeta;1",
+            "name": "nuh_eta",
+            "@type": "Command"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "nuh_mu",
+          "properties": {
+            "@id": "dtmi:example:nuh_kappa;1",
+            "name": "nuh_lambda",
+            "@type": "Command"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "nuh_pi",
+          "properties": {
+            "@id": "dtmi:example:nuh_xi;1",
+            "name": "nuh_omicron",
+            "schema": "dateTime",
+            "@type": "CommandRequest"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "nuh_upsilon",
+          "properties": {
+            "@id": "dtmi:example:nuh_sigma;1",
+            "name": "nuh_tau",
+            "schema": "decimal",
+            "@type": "CommandRequest"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "nuh_omega",
+          "properties": {
+            "@id": "dtmi:example:nuh_chi;1",
+            "name": "nuh_psi",
+            "schema": "double",
+            "@type": "CommandResponse"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "nuh_humpf",
+          "properties": {
+            "@id": "dtmi:example:nuh_wum;1",
+            "name": "nuh_um",
+            "schema": "duration",
+            "@type": "CommandResponse"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "nuh_quan",
+          "properties": {
+            "@id": "dtmi:example:nuh_glikk;1",
+            "name": "nuh_nuh",
+            "schema": {
+              "@id": "dtmi:example:nuh_snee;1",
+              "@type": "Interface"
+            },
+            "@type": "Component"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "nuh_jogg",
+          "properties": {
+            "@id": "dtmi:example:nuh_spazz;1",
+            "name": "nuh_floob",
+            "schema": {
+              "@id": "dtmi:example:nuh_zatz;1",
+              "@type": "Interface"
+            },
+            "@type": "Component"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nuh_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "nuh_yekk",
+          "properties": {
+            "@id": "dtmi:example:nuh_itch;1",
+            "valueSchema": "integer",
+            "@type": "Enum"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "snee_alpha",
+          "properties": {
+            "@id": "dtmi:example:nuh_hi;1",
+            "valueSchema": "integer",
+            "@type": "Enum"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "snee_epsilon",
+          "properties": {
+            "@id": "dtmi:example:snee_gamma;1",
+            "enumValue": 1887,
+            "name": "snee_delta",
+            "@type": "EnumValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "snee_iota",
+          "properties": {
+            "@id": "dtmi:example:snee_eta;1",
+            "enumValue": 1888,
+            "name": "snee_theta",
+            "@type": "EnumValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "snee_nu",
+          "properties": {
+            "@id": "dtmi:example:snee_lambda;1",
+            "name": "snee_mu",
+            "schema": "float",
+            "@type": "Field"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "snee_rho",
+          "properties": {
+            "@id": "dtmi:example:snee_omicron;1",
+            "name": "snee_pi",
+            "schema": "integer",
+            "@type": "Field"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "snee_upsilon",
+          "properties": {
+            "@id": "dtmi:example:snee_tau;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "snee_psi",
+          "properties": {
+            "@id": "dtmi:example:snee_chi;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "snee_humpf",
+          "properties": {
+            "@id": "dtmi:example:snee_yuzz;1",
+            "mapKey": {
+              "name": "snee_wum",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "snee_um",
+              "schema": "long"
+            },
+            "@type": "Map"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "snee_quan",
+          "properties": {
+            "@id": "dtmi:example:snee_glikk;1",
+            "mapKey": {
+              "name": "snee_nuh",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "snee_snee",
+              "schema": "short"
+            },
+            "@type": "Map"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "snee_zatz",
+          "properties": {
+            "@id": "dtmi:example:snee_spazz;1",
+            "name": "snee_floob",
+            "schema": "string",
+            "@type": "MapKey"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:snee_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "snee_yekk",
+          "properties": {
+            "@id": "dtmi:example:snee_flunn;1",
+            "name": "snee_itch",
+            "schema": "string",
+            "@type": "MapKey"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "quan_beta",
+          "properties": {
+            "@id": "dtmi:example:snee_hi;1",
+            "name": "quan_alpha",
+            "schema": "string",
+            "@type": "MapValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "quan_zeta",
+          "properties": {
+            "@id": "dtmi:example:quan_delta;1",
+            "name": "quan_epsilon",
+            "schema": "time",
+            "@type": "MapValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "quan_iota",
+          "properties": {
+            "@id": "dtmi:example:quan_theta;1",
+            "@type": "Object"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "quan_mu",
+          "properties": {
+            "@id": "dtmi:example:quan_lambda;1",
+            "@type": "Object"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "quan_pi",
+          "properties": {
+            "@id": "dtmi:example:quan_xi;1",
+            "name": "quan_omicron",
+            "schema": "unsignedByte",
+            "@type": "Property"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "quan_upsilon",
+          "properties": {
+            "@id": "dtmi:example:quan_sigma;1",
+            "name": "quan_tau",
+            "@type": "Relationship"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "quan_omega",
+          "properties": {
+            "@id": "dtmi:example:quan_chi;1",
+            "name": "quan_psi",
+            "@type": "Relationship"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "quan_humpf",
+          "properties": {
+            "@id": "dtmi:example:quan_wum;1",
+            "name": "quan_um",
+            "schema": "unsignedInteger",
+            "@type": "Telemetry"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:quan_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "quan_snee",
+          "properties": {
+            "@id": "dtmi:example:quan_glikk;1",
+            "name": "quan_nuh",
+            "schema": "unsignedLong",
+            "@type": "Telemetry"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyTargetIsDtmiV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyTargetIsDtmiV4.json
new file mode 100644
index 00000000..50e88f87
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyTargetIsDtmiV4.json
@@ -0,0 +1,1147 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "thnad_theta",
+          "target": "dtmi:foo:bar;7"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "thnad_kappa",
+          "target": [
+            "dtmi:foo:bar;7"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "thnad_mu",
+          "target": "dtmi:foo:bar;108675309"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "thnad_xi",
+          "target": [
+            "dtmi:foo:bar;108675309"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "thnad_pi",
+          "target": "dtmi:foo:bar;999999999"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "thnad_sigma",
+          "target": [
+            "dtmi:foo:bar;999999999"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "thnad_upsilon",
+          "target": "dtmi:foo;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "thnad_chi",
+          "target": [
+            "dtmi:foo;1"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "thnad_omega",
+          "target": "dtmi:foo:bar"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "thnad_wum",
+          "target": [
+            "dtmi:foo:bar"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "thnad_humpf",
+          "target": "dtmi:foo:bar;3.14"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "thnad_glikk",
+          "target": [
+            "dtmi:foo:bar;3.14"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "thnad_snee",
+          "target": "dtmi:foo:bar;3.141592"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "thnad_thnad",
+          "target": [
+            "dtmi:foo:bar;3.141592"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "thnad_floob",
+          "target": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "thnad_jogg",
+          "target": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "thnad_itch",
+          "target": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:thnad_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "thnad_vroo",
+          "target": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "spazz_alpha",
+          "target": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "spazz_gamma",
+          "target": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "spazz_epsilon",
+          "target": {
+            "@value": "dtmi:apparently:valid:identifier;3"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "spazz_eta",
+          "target": {
+            "@value": "dtmi:apparently:valid:identifier;3"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "spazz_iota",
+          "target": "dtmi:foo:bar;0"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "spazz_lambda",
+          "target": "dtmi:foo:bar;0"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "spazz_nu",
+          "target": "dtmi:foo:bar;0.0"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "spazz_omicron",
+          "target": "dtmi:foo:bar;0.0"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "spazz_rho",
+          "target": "dtmi:foo:bar;1234567890"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "spazz_tau",
+          "target": "dtmi:foo:bar;1234567890"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "spazz_phi",
+          "target": "dtmi:foo:bar;1a"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "spazz_psi",
+          "target": "dtmi:foo:bar;1a"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "spazz_yuzz",
+          "target": "dtmi:foo:bar;3.0"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "spazz_um",
+          "target": "dtmi:foo:bar;3.0"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "spazz_fuddle",
+          "target": "dtmi:foo:bar;3.1415926"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "spazz_nuh",
+          "target": "dtmi:foo:bar;3.1415926"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "spazz_quan",
+          "target": "dtmi:foo:bar;6.02"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "spazz_spazz",
+          "target": "dtmi:foo:bar;6.02"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "spazz_zatz",
+          "target": "dtmi:foo:bar;0.1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "spazz_flunn",
+          "target": "dtmi:foo:bar;0.1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:spazz_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "spazz_yekk",
+          "target": "dtmi:foo:bar;01"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "spazz_hi",
+          "target": "dtmi:foo:bar;01"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "floob_beta",
+          "target": "dtmi:foo:bar;"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "floob_delta",
+          "target": "dtmi:foo:bar;"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "floob_zeta",
+          "target": "dtmi:test:invalidId_;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "floob_theta",
+          "target": "dtmi:test:invalidId_;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "floob_kappa",
+          "target": "dtmi:test:_invalidUserId;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "floob_mu",
+          "target": "dtmi:test:_invalidUserId;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "floob_xi",
+          "target": "dtmi:test:1seg;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "floob_pi",
+          "target": "dtmi:test:1seg;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "floob_sigma",
+          "target": "dtmi:foo:bar.baz;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "floob_upsilon",
+          "target": "dtmi:foo:bar.baz;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "floob_chi",
+          "target": "dtmi:foo::bar;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "floob_omega",
+          "target": "dtmi:foo::bar;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "floob_wum",
+          "target": "urn:foo:bar:1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "floob_humpf",
+          "target": "urn:foo:bar:1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "floob_glikk",
+          "target": "http://foo/bar/baz"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "floob_snee",
+          "target": "http://foo/bar/baz"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "floob_thnad",
+          "target": "dtmi:;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "floob_floob",
+          "target": "dtmi:;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "floob_jogg",
+          "target": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "floob_itch",
+          "target": [
+            "dtmi:foo:bar;7",
+            "dtmi:foo:bar;108675309"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:floob_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "floob_vroo",
+          "target": [
+            "dtmi:foo:bar;7",
+            "dtmi:foo:bar;108675309"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyTargetTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyTargetTermAndDtmiV4.json
new file mode 100644
index 00000000..daaf6f24
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyTargetTermAndDtmiV4.json
@@ -0,0 +1,41 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "zatz_kappa",
+          "target": "dtmi:example:zatz_lambda;1",
+          "dtmi:dtdl:property:target;4": "dtmi:example:zatz_mu;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "zatz_xi",
+          "target": "dtmi:example:zatz_omicron;1",
+          "dtmi:dtdl:property:target;4": "dtmi:example:zatz_pi;1"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyWritableBooleanV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyWritableBooleanV4.json
new file mode 100644
index 00000000..30f7586a
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyWritableBooleanV4.json
@@ -0,0 +1,496 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "zatz_sigma",
+          "writable": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "zatz_upsilon",
+          "writable": false
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "zatz_chi",
+          "writable": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "zatz_omega",
+          "writable": [
+            false
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "zatz_wum",
+          "writable": {
+            "@value": true,
+            "@type": "xsd:boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "zatz_humpf",
+          "writable": {
+            "@value": false,
+            "@type": "xsd:boolean"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "zatz_glikk",
+          "writable": [
+            {
+              "@value": true,
+              "@type": "xsd:boolean"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "zatz_snee",
+          "writable": [
+            {
+              "@value": false,
+              "@type": "xsd:boolean"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "zatz_thnad",
+          "writable": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "zatz_floob",
+          "writable": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "zatz_jogg",
+          "writable": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "zatz_itch",
+          "writable": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zatz_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "zatz_vroo",
+          "writable": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "jogg_alpha",
+          "writable": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "jogg_gamma",
+          "writable": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "jogg_epsilon",
+          "writable": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "jogg_eta",
+          "writable": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "jogg_iota",
+          "writable": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "jogg_lambda",
+          "writable": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "jogg_nu",
+          "writable": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "jogg_omicron",
+          "writable": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "jogg_rho",
+          "writable": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "jogg_tau",
+          "writable": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "jogg_phi",
+          "writable": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "jogg_psi",
+          "writable": [
+            {}
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipPropertyWritableTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyWritableTermAndDtmiV4.json
new file mode 100644
index 00000000..a5f211e7
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipPropertyWritableTermAndDtmiV4.json
@@ -0,0 +1,41 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship",
+          "name": "jogg_nuh",
+          "writable": false,
+          "dtmi:dtdl:property:writable;4": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:jogg_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship",
+          "name": "jogg_quan",
+          "writable": false,
+          "dtmi:dtdl:property:writable;4": true
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipRequiredPropertiesV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipRequiredPropertiesV4.json
new file mode 100644
index 00000000..40560bd1
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipRequiredPropertiesV4.json
@@ -0,0 +1,68 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "xi_alpha"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "xi_gamma"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Relationship"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Relationship"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipTypeIncludesInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipTypeIncludesInvalidDtmiV4.json
new file mode 100644
index 00000000..95b729af
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipTypeIncludesInvalidDtmiV4.json
@@ -0,0 +1,43 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Relationship",
+            "dtmi:foo//bar"
+          ],
+          "name": "omicron_glikk"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Relationship",
+            "dtmi:foo//bar"
+          ],
+          "name": "omicron_snee"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipTypeIncludesMaterialV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipTypeIncludesMaterialV4.json
new file mode 100644
index 00000000..f19a37cb
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipTypeIncludesMaterialV4.json
@@ -0,0 +1,148 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "xi_flunn",
+          "@type": "Relationship"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "xi_yekk",
+          "@type": [
+            "Relationship"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "xi_hi",
+          "@type": "dtmi:dtdl:class:Relationship;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "omicron_beta",
+          "@type": [
+            "dtmi:dtdl:class:Relationship;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "omicron_delta",
+          "@type": "Something"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "omicron_zeta",
+          "@type": "Something"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "omicron_theta",
+          "@type": [
+            "Something"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "omicron_kappa",
+          "@type": [
+            "Something"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipTypeIncludesNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipTypeIncludesNotDtmiNorTermV4.json
new file mode 100644
index 00000000..3979c9fc
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipTypeIncludesNotDtmiNorTermV4.json
@@ -0,0 +1,43 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Relationship",
+            "http://foo.com/bar"
+          ],
+          "name": "omicron_thnad"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Relationship",
+            "http://foo.com/bar"
+          ],
+          "name": "omicron_floob"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassRelationshipTypeStringOrArrayV4.json b/DTDL/v4/spec/Requirement-ClassRelationshipTypeStringOrArrayV4.json
new file mode 100644
index 00000000..014a4504
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassRelationshipTypeStringOrArrayV4.json
@@ -0,0 +1,298 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "xi_eta",
+          "@type": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "xi_iota",
+          "@type": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "xi_lambda",
+          "@type": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "xi_nu",
+          "@type": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "xi_omicron",
+          "@type": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "xi_rho",
+          "@type": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "xi_tau",
+          "@type": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "xi_phi",
+          "@type": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "xi_psi",
+          "@type": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "xi_yuzz",
+          "@type": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "xi_um",
+          "@type": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "xi_fuddle",
+          "@type": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "xi_nuh",
+          "@type": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "xi_quan",
+          "@type": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "xi_spazz",
+          "@type": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "xi_zatz",
+          "@type": [
+            {}
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryContextConformsV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryContextConformsV4.json
new file mode 100644
index 00000000..68c67797
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryContextConformsV4.json
@@ -0,0 +1,386 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_snee;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:epsilon_nuh;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "epsilon_glikk",
+            "schema": "string",
+            "@context": "dtmi:dtdl:extension:quantitativeTypes;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_spazz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:epsilon_thnad;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "epsilon_quan",
+            "schema": "time",
+            "@context": []
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_jogg;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:epsilon_zatz;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "epsilon_floob",
+            "schema": "unsignedByte",
+            "@context": [
+              "dtmi:dtdl:extension:quantitativeTypes;1"
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_yekk;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:epsilon_itch;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "epsilon_flunn",
+            "schema": "unsignedInteger",
+            "@context": null
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_alpha;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:epsilon_hi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "epsilon_vroo",
+            "schema": "unsignedLong",
+            "@context": 626
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_delta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:zeta_gamma;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "zeta_beta",
+            "schema": "unsignedShort",
+            "@context": true
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_eta;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:zeta_zeta;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "zeta_epsilon",
+            "schema": "uuid",
+            "@context": [
+              null
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_kappa;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:zeta_iota;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "zeta_theta",
+            "schema": "boolean",
+            "@context": [
+              626
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_nu;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:zeta_mu;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "zeta_lambda",
+            "schema": "byte",
+            "@context": [
+              true
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_pi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:zeta_omicron;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "zeta_xi",
+            "schema": "bytes",
+            "@context": "dtmi:dtdl:extension:quantitativeTypes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_tau;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:zeta_sigma;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "zeta_rho",
+            "schema": "date",
+            "@context": "http://dtdl/extension/quantitativeTypes/1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_chi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:zeta_phi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "zeta_upsilon",
+            "schema": "dateTime",
+            "@context": "quantitativeTypes;1"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_yuzz;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:zeta_omega;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "zeta_psi",
+            "schema": "decimal",
+            "@context": {}
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_humpf;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:zeta_um;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "zeta_wum",
+            "schema": "double",
+            "@context": {
+              "foo": "dtmi:foo:bar;1"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_nuh;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:zeta_glikk;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "zeta_fuddle",
+            "schema": "duration",
+            "@context": [
+              {}
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_thnad;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:zeta_quan;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "zeta_snee",
+            "schema": "float",
+            "@context": [
+              {
+                "foo": "dtmi:foo:bar;1"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryIdDuplicateV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryIdDuplicateV4.json
new file mode 100644
index 00000000..cdf20656
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryIdDuplicateV4.json
@@ -0,0 +1,49 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_alpha;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:kappa_alpha;1",
+          "@type": "Interface",
+          "contents": {
+            "@id": "dtmi:example:kappa_alpha;1",
+            "@type": "Telemetry",
+            "name": "kappa_beta",
+            "schema": "bytes"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_gamma;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:kappa_gamma;1",
+          "@type": "Interface",
+          "contents": {
+            "@context": "dtmi:undefinedExtension:context;1",
+            "@id": "dtmi:example:kappa_gamma;1",
+            "@type": "Telemetry",
+            "name": "kappa_delta",
+            "schema": "date"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryIdIsDtmiV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryIdIsDtmiV4.json
new file mode 100644
index 00000000..305c2b4c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryIdIsDtmiV4.json
@@ -0,0 +1,1075 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;7",
+          "@type": "Telemetry",
+          "name": "zeta_spazz",
+          "schema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;108675309",
+          "@type": "Telemetry",
+          "name": "zeta_zatz",
+          "schema": "long"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;999999999",
+          "@type": "Telemetry",
+          "name": "zeta_flunn",
+          "schema": "short"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:zeta_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo;1",
+          "@type": "Telemetry",
+          "name": "zeta_yekk",
+          "schema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar",
+          "@type": "Telemetry",
+          "name": "zeta_hi",
+          "schema": "time"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;3.14",
+          "@type": "Telemetry",
+          "name": "eta_beta",
+          "schema": "unsignedByte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;3.141592",
+          "@type": "Telemetry",
+          "name": "eta_delta",
+          "schema": "unsignedInteger"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": null,
+          "@type": "Telemetry",
+          "name": "eta_zeta",
+          "schema": "unsignedLong"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": null,
+          "@type": "Telemetry",
+          "name": "eta_theta",
+          "schema": "unsignedShort"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": 626,
+          "@type": "Telemetry",
+          "name": "eta_kappa",
+          "schema": "uuid"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": 626,
+          "@type": "Telemetry",
+          "name": "eta_mu",
+          "schema": "boolean"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": true,
+          "@type": "Telemetry",
+          "name": "eta_xi",
+          "schema": "byte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": true,
+          "@type": "Telemetry",
+          "name": "eta_pi",
+          "schema": "bytes"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": {
+            "@value": "dtmi:apparently:valid:identifier;3"
+          },
+          "@type": "Telemetry",
+          "name": "eta_sigma",
+          "schema": "date"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": {
+            "@value": "dtmi:apparently:valid:identifier;3"
+          },
+          "@type": "Telemetry",
+          "name": "eta_upsilon",
+          "schema": "dateTime"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;0",
+          "@type": "Telemetry",
+          "name": "eta_chi",
+          "schema": "decimal"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0",
+          "@type": "Telemetry",
+          "name": "eta_omega",
+          "schema": "double"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;0.0",
+          "@type": "Telemetry",
+          "name": "eta_wum",
+          "schema": "duration"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0.0",
+          "@type": "Telemetry",
+          "name": "eta_humpf",
+          "schema": "float"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;1234567890",
+          "@type": "Telemetry",
+          "name": "eta_glikk",
+          "schema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;1234567890",
+          "@type": "Telemetry",
+          "name": "eta_snee",
+          "schema": "long"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;1a",
+          "@type": "Telemetry",
+          "name": "eta_thnad",
+          "schema": "short"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;1a",
+          "@type": "Telemetry",
+          "name": "eta_floob",
+          "schema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;3.0",
+          "@type": "Telemetry",
+          "name": "eta_jogg",
+          "schema": "time"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;3.0",
+          "@type": "Telemetry",
+          "name": "eta_itch",
+          "schema": "unsignedByte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:eta_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;3.1415926",
+          "@type": "Telemetry",
+          "name": "eta_vroo",
+          "schema": "unsignedInteger"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;3.1415926",
+          "@type": "Telemetry",
+          "name": "theta_alpha",
+          "schema": "unsignedLong"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;6.02",
+          "@type": "Telemetry",
+          "name": "theta_gamma",
+          "schema": "unsignedShort"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;6.02",
+          "@type": "Telemetry",
+          "name": "theta_epsilon",
+          "schema": "uuid"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;0.1",
+          "@type": "Telemetry",
+          "name": "theta_eta",
+          "schema": "boolean"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;0.1",
+          "@type": "Telemetry",
+          "name": "theta_iota",
+          "schema": "byte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;01",
+          "@type": "Telemetry",
+          "name": "theta_lambda",
+          "schema": "bytes"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;01",
+          "@type": "Telemetry",
+          "name": "theta_nu",
+          "schema": "date"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar;",
+          "@type": "Telemetry",
+          "name": "theta_omicron",
+          "schema": "dateTime"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar;",
+          "@type": "Telemetry",
+          "name": "theta_rho",
+          "schema": "decimal"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:test:invalidId_;1",
+          "@type": "Telemetry",
+          "name": "theta_tau",
+          "schema": "double"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:invalidId_;1",
+          "@type": "Telemetry",
+          "name": "theta_phi",
+          "schema": "duration"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:test:_invalidUserId;1",
+          "@type": "Telemetry",
+          "name": "theta_psi",
+          "schema": "float"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:_invalidUserId;1",
+          "@type": "Telemetry",
+          "name": "theta_yuzz",
+          "schema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:test:1seg;1",
+          "@type": "Telemetry",
+          "name": "theta_um",
+          "schema": "long"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:test:1seg;1",
+          "@type": "Telemetry",
+          "name": "theta_fuddle",
+          "schema": "short"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo:bar.baz;1",
+          "@type": "Telemetry",
+          "name": "theta_nuh",
+          "schema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo:bar.baz;1",
+          "@type": "Telemetry",
+          "name": "theta_quan",
+          "schema": "time"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:foo::bar;1",
+          "@type": "Telemetry",
+          "name": "theta_spazz",
+          "schema": "unsignedByte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:foo::bar;1",
+          "@type": "Telemetry",
+          "name": "theta_zatz",
+          "schema": "unsignedInteger"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "urn:foo:bar:1",
+          "@type": "Telemetry",
+          "name": "theta_flunn",
+          "schema": "unsignedLong"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:theta_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "urn:foo:bar:1",
+          "@type": "Telemetry",
+          "name": "theta_yekk",
+          "schema": "unsignedShort"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "http://foo/bar/baz",
+          "@type": "Telemetry",
+          "name": "theta_hi",
+          "schema": "uuid"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "http://foo/bar/baz",
+          "@type": "Telemetry",
+          "name": "iota_beta",
+          "schema": "boolean"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:;1",
+          "@type": "Telemetry",
+          "name": "iota_delta",
+          "schema": "byte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:;1",
+          "@type": "Telemetry",
+          "name": "iota_zeta",
+          "schema": "bytes"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:dtdl:example;1",
+          "@type": "Telemetry",
+          "name": "iota_theta",
+          "schema": "date"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:dtdl:example;1",
+          "@type": "Telemetry",
+          "name": "iota_kappa",
+          "schema": "dateTime"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": "dtmi:standard:example;1",
+          "@type": "Telemetry",
+          "name": "iota_mu",
+          "schema": "decimal"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": "dtmi:standard:example;1",
+          "@type": "Telemetry",
+          "name": "iota_xi",
+          "schema": "double"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryIdNotArrayV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryIdNotArrayV4.json
new file mode 100644
index 00000000..42f752bd
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryIdNotArrayV4.json
@@ -0,0 +1,303 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;7"
+          ],
+          "@type": "Telemetry",
+          "name": "iota_pi",
+          "schema": "duration"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;7"
+          ],
+          "@type": "Telemetry",
+          "name": "iota_sigma",
+          "schema": "float"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;108675309"
+          ],
+          "@type": "Telemetry",
+          "name": "iota_upsilon",
+          "schema": "integer"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;108675309"
+          ],
+          "@type": "Telemetry",
+          "name": "iota_chi",
+          "schema": "long"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;999999999"
+          ],
+          "@type": "Telemetry",
+          "name": "iota_omega",
+          "schema": "short"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;999999999"
+          ],
+          "@type": "Telemetry",
+          "name": "iota_wum",
+          "schema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo;1"
+          ],
+          "@type": "Telemetry",
+          "name": "iota_humpf",
+          "schema": "time"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo;1"
+          ],
+          "@type": "Telemetry",
+          "name": "iota_glikk",
+          "schema": "unsignedByte"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar"
+          ],
+          "@type": "Telemetry",
+          "name": "iota_snee",
+          "schema": "unsignedInteger"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar"
+          ],
+          "@type": "Telemetry",
+          "name": "iota_thnad",
+          "schema": "unsignedLong"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;3.14"
+          ],
+          "@type": "Telemetry",
+          "name": "iota_floob",
+          "schema": "unsignedShort"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;3.14"
+          ],
+          "@type": "Telemetry",
+          "name": "iota_jogg",
+          "schema": "uuid"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@id": [
+            "dtmi:foo:bar;3.141592"
+          ],
+          "@type": "Telemetry",
+          "name": "iota_itch",
+          "schema": "boolean"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:iota_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@id": [
+            "dtmi:foo:bar;3.141592"
+          ],
+          "@type": "Telemetry",
+          "name": "iota_vroo",
+          "schema": "byte"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryInvalidKeywordsV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryInvalidKeywordsV4.json
new file mode 100644
index 00000000..d6ca3d5c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryInvalidKeywordsV4.json
@@ -0,0 +1,158 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "xi_itch",
+          "schema": "bytes",
+          "@graph": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "xi_vroo",
+          "schema": "date",
+          "@graph": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "omicron_alpha",
+          "schema": "dateTime",
+          "@value": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "omicron_gamma",
+          "schema": "decimal",
+          "@value": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "omicron_epsilon",
+          "schema": "double",
+          "@language": "en"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "omicron_eta",
+          "schema": "duration",
+          "@language": "en"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "omicron_iota",
+          "schema": "float",
+          "@foobar": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "omicron_lambda",
+          "schema": "integer",
+          "@foobar": true
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryPropertyCommentStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyCommentStringLengthV4.json
new file mode 100644
index 00000000..262ae3d2
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyCommentStringLengthV4.json
@@ -0,0 +1,60 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "lambda_delta",
+          "schema": "double",
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "lambda_zeta",
+          "schema": "duration",
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "lambda_theta",
+          "schema": "float",
+          "comment": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryPropertyCommentStringV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyCommentStringV4.json
new file mode 100644
index 00000000..4f56643f
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyCommentStringV4.json
@@ -0,0 +1,435 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "kappa_epsilon",
+          "schema": "dateTime",
+          "comment": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "kappa_eta",
+          "schema": "decimal",
+          "comment": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "kappa_iota",
+          "schema": "double",
+          "comment": {
+            "@value": "hello",
+            "@type": "xsd:string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "kappa_lambda",
+          "schema": "duration",
+          "comment": [
+            {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "kappa_nu",
+          "schema": "float",
+          "comment": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "kappa_omicron",
+          "schema": "integer",
+          "comment": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "kappa_rho",
+          "schema": "long",
+          "comment": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "kappa_tau",
+          "schema": "short",
+          "comment": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "kappa_phi",
+          "schema": "string",
+          "comment": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "kappa_psi",
+          "schema": "time",
+          "comment": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "kappa_yuzz",
+          "schema": "unsignedByte",
+          "comment": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "kappa_um",
+          "schema": "unsignedInteger",
+          "comment": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "kappa_fuddle",
+          "schema": "unsignedLong",
+          "comment": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "kappa_nuh",
+          "schema": "unsignedShort",
+          "comment": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "kappa_quan",
+          "schema": "uuid",
+          "comment": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "kappa_spazz",
+          "schema": "boolean",
+          "comment": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "kappa_zatz",
+          "schema": "byte",
+          "comment": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "kappa_flunn",
+          "schema": "bytes",
+          "comment": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:kappa_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "kappa_yekk",
+          "schema": "date",
+          "comment": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "kappa_hi",
+          "schema": "dateTime",
+          "comment": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "lambda_beta",
+          "schema": "decimal",
+          "comment": [
+            {}
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryPropertyCommentTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyCommentTermAndDtmiV4.json
new file mode 100644
index 00000000..45c8383b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyCommentTermAndDtmiV4.json
@@ -0,0 +1,43 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "comment": "lambda_tau",
+          "dtmi:dtdl:property:comment;4": "lambda_upsilon",
+          "name": "lambda_phi",
+          "schema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "comment": "lambda_psi",
+          "dtmi:dtdl:property:comment;4": "lambda_omega",
+          "name": "lambda_yuzz",
+          "schema": "time"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryPropertyDescriptionLangStringV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyDescriptionLangStringV4.json
new file mode 100644
index 00000000..6dc9021d
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyDescriptionLangStringV4.json
@@ -0,0 +1,506 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "lambda_um",
+          "schema": "unsignedByte",
+          "description": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "lambda_fuddle",
+          "schema": "unsignedInteger",
+          "description": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "lambda_nuh",
+          "schema": "unsignedLong",
+          "description": {
+            "en": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "lambda_quan",
+          "schema": "unsignedShort",
+          "description": [
+            {
+              "@value": "hello",
+              "@language": "en"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "lambda_spazz",
+          "schema": "uuid",
+          "description": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "lambda_zatz",
+          "schema": "boolean",
+          "description": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "lambda_flunn",
+          "schema": "byte",
+          "description": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:lambda_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "lambda_yekk",
+          "schema": "bytes",
+          "description": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "lambda_hi",
+          "schema": "date",
+          "description": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "mu_beta",
+          "schema": "dateTime",
+          "description": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "mu_delta",
+          "schema": "decimal",
+          "description": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "mu_zeta",
+          "schema": "double",
+          "description": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "mu_theta",
+          "schema": "duration",
+          "description": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "mu_kappa",
+          "schema": "float",
+          "description": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "mu_mu",
+          "schema": "integer",
+          "description": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "mu_xi",
+          "schema": "long",
+          "description": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "mu_pi",
+          "schema": "short",
+          "description": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "mu_sigma",
+          "schema": "string",
+          "description": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "mu_upsilon",
+          "schema": "time",
+          "description": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "mu_chi",
+          "schema": "unsignedByte",
+          "description": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "mu_omega",
+          "schema": "unsignedInteger",
+          "description": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "mu_wum",
+          "schema": "unsignedLong",
+          "description": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "mu_humpf",
+          "schema": "unsignedShort",
+          "description": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "mu_glikk",
+          "schema": "uuid",
+          "description": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryPropertyDescriptionStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyDescriptionStringLengthV4.json
new file mode 100644
index 00000000..28cb8d55
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyDescriptionStringLengthV4.json
@@ -0,0 +1,60 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "mu_snee",
+          "schema": "boolean",
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "mu_thnad",
+          "schema": "byte",
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:mu_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "mu_floob",
+          "schema": "bytes",
+          "description": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryPropertyDescriptionTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyDescriptionTermAndDtmiV4.json
new file mode 100644
index 00000000..075c4bed
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyDescriptionTermAndDtmiV4.json
@@ -0,0 +1,51 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "description": [
+            "nu_delta"
+          ],
+          "dtmi:dtdl:property:description;4": [
+            "nu_epsilon"
+          ],
+          "name": "nu_zeta",
+          "schema": "double"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "description": [
+            "nu_theta"
+          ],
+          "dtmi:dtdl:property:description;4": [
+            "nu_iota"
+          ],
+          "name": "nu_kappa",
+          "schema": "duration"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryPropertyDisplayNameLangStringV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyDisplayNameLangStringV4.json
new file mode 100644
index 00000000..d3e4dbc3
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyDisplayNameLangStringV4.json
@@ -0,0 +1,506 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "nu_mu",
+          "schema": "float",
+          "displayName": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "nu_xi",
+          "schema": "integer",
+          "displayName": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "nu_pi",
+          "schema": "long",
+          "displayName": {
+            "en": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "nu_sigma",
+          "schema": "short",
+          "displayName": [
+            {
+              "@value": "hello",
+              "@language": "en"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "nu_upsilon",
+          "schema": "string",
+          "displayName": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "nu_chi",
+          "schema": "time",
+          "displayName": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "nu_omega",
+          "schema": "unsignedByte",
+          "displayName": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "nu_wum",
+          "schema": "unsignedInteger",
+          "displayName": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "nu_humpf",
+          "schema": "unsignedLong",
+          "displayName": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "nu_glikk",
+          "schema": "unsignedShort",
+          "displayName": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "nu_snee",
+          "schema": "uuid",
+          "displayName": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "nu_thnad",
+          "schema": "boolean",
+          "displayName": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "nu_floob",
+          "schema": "byte",
+          "displayName": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "nu_jogg",
+          "schema": "bytes",
+          "displayName": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "nu_itch",
+          "schema": "date",
+          "displayName": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:nu_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "nu_vroo",
+          "schema": "dateTime",
+          "displayName": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "xi_alpha",
+          "schema": "decimal",
+          "displayName": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "xi_gamma",
+          "schema": "double",
+          "displayName": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "xi_epsilon",
+          "schema": "duration",
+          "displayName": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "xi_eta",
+          "schema": "float",
+          "displayName": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "xi_iota",
+          "schema": "integer",
+          "displayName": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "xi_lambda",
+          "schema": "long",
+          "displayName": {
+            "@value": "hello",
+            "@language": "en"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "xi_nu",
+          "schema": "short",
+          "displayName": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "xi_omicron",
+          "schema": "string",
+          "displayName": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryPropertyDisplayNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyDisplayNameStringLengthV4.json
new file mode 100644
index 00000000..0b8f003b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyDisplayNameStringLengthV4.json
@@ -0,0 +1,60 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "xi_rho",
+          "schema": "time",
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "xi_tau",
+          "schema": "unsignedByte",
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "xi_phi",
+          "schema": "unsignedInteger",
+          "displayName": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryPropertyDisplayNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyDisplayNameTermAndDtmiV4.json
new file mode 100644
index 00000000..94f50c48
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyDisplayNameTermAndDtmiV4.json
@@ -0,0 +1,51 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "displayName": [
+            "xi_snee"
+          ],
+          "dtmi:dtdl:property:displayName;4": [
+            "xi_quan"
+          ],
+          "name": "xi_thnad",
+          "schema": "boolean"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:xi_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "displayName": [
+            "xi_floob"
+          ],
+          "dtmi:dtdl:property:displayName;4": [
+            "xi_zatz"
+          ],
+          "name": "xi_jogg",
+          "schema": "byte"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryPropertyFormallyIrrelevantDtmiOrTermV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyFormallyIrrelevantDtmiOrTermV4.json
new file mode 100644
index 00000000..e6bc60bd
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyFormallyIrrelevantDtmiOrTermV4.json
@@ -0,0 +1,80 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "omicron_phi",
+          "schema": "unsignedByte",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "omicron_psi",
+          "schema": "unsignedInteger",
+          "dtmi:foo:bar;1": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "omicron_yuzz",
+          "schema": "unsignedLong",
+          "boolean": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "omicron_um",
+          "schema": "unsignedShort",
+          "boolean": null
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryPropertyFormallyUndefinedTermV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyFormallyUndefinedTermV4.json
new file mode 100644
index 00000000..d1f242ce
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyFormallyUndefinedTermV4.json
@@ -0,0 +1,41 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "omicron_yekk",
+          "schema": "decimal",
+          "foobar": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:pi_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "omicron_hi",
+          "schema": "double",
+          "foobar": {}
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryPropertyInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyInvalidDtmiV4.json
new file mode 100644
index 00000000..7070d0f4
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyInvalidDtmiV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Telemetry",
+            "Foobar"
+          ],
+          "name": "omicron_fuddle",
+          "schema": "uuid",
+          "dtmi:foo//bar": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Telemetry",
+            "Foobar"
+          ],
+          "name": "omicron_nuh",
+          "schema": "boolean",
+          "dtmi:foo//bar": 626
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryPropertyNamePatternV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyNamePatternV4.json
new file mode 100644
index 00000000..4613f0b2
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyNamePatternV4.json
@@ -0,0 +1,462 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "unsignedLong",
+          "name": "EARTH"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "unsignedShort",
+          "name": "Air"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "uuid",
+          "name": "fire"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "boolean",
+          "name": "hello_world"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "byte",
+          "name": "Anarchy99"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "bytes",
+          "name": "23skidoo"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "schema": "date",
+          "name": "23skidoo"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "dateTime",
+          "name": "626"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "schema": "decimal",
+          "name": "626"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "double",
+          "name": "goodbye-world"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "schema": "duration",
+          "name": "goodbye-world"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "float",
+          "name": "_haha"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "schema": "integer",
+          "name": "_haha"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "long",
+          "name": "toodaloo_"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "schema": "short",
+          "name": "toodaloo_"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "string",
+          "name": "pro:con"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "schema": "time",
+          "name": "pro:con"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "unsignedByte",
+          "name": "mish/mash"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "schema": "unsignedInteger",
+          "name": "mish/mash"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "unsignedLong",
+          "name": "#tag"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "schema": "unsignedShort",
+          "name": "#tag"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "uuid",
+          "name": "@tweet"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "schema": "boolean",
+          "name": "@tweet"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "byte",
+          "name": "$money"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "schema": "bytes",
+          "name": "$money"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryPropertyNameStringLengthV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyNameStringLengthV4.json
new file mode 100644
index 00000000..b518a59e
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyNameStringLengthV4.json
@@ -0,0 +1,57 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "time",
+          "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddl"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "unsignedByte",
+          "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "schema": "unsignedInteger",
+          "name": "SupercalifragilisticexpialidociousEvenThoughTheSoundOfItIsSomethingQuiteAtrociousIfYouSayItLoudEnoughYouWillAlwaysSoundPrecociousSupercalifragilisticexpialidociousUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddleUmDiddleAyUmDiddleDiddleDiddle"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryPropertyNameStringV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyNameStringV4.json
new file mode 100644
index 00000000..a4253ddd
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyNameStringV4.json
@@ -0,0 +1,433 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "long",
+          "name": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "short",
+          "name": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "string",
+          "name": {
+            "@value": "hello",
+            "@type": "xsd:string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "time",
+          "name": [
+            {
+              "@value": "hello",
+              "@type": "xsd:string"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "unsignedByte",
+          "name": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "schema": "unsignedInteger",
+          "name": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "unsignedLong",
+          "name": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "schema": "unsignedShort",
+          "name": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "uuid",
+          "name": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "schema": "boolean",
+          "name": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "byte",
+          "name": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "schema": "bytes",
+          "name": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "date",
+          "name": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "schema": "dateTime",
+          "name": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "decimal",
+          "name": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "schema": "double",
+          "name": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "duration",
+          "name": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "schema": "float",
+          "name": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "integer",
+          "name": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "schema": "long",
+          "name": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "short",
+          "name": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:vroo_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "schema": "string",
+          "name": []
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryPropertyNameTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyNameTermAndDtmiV4.json
new file mode 100644
index 00000000..2f9b0791
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyNameTermAndDtmiV4.json
@@ -0,0 +1,41 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "hi_omicron",
+          "dtmi:dtdl:property:name;4": "hi_pi",
+          "schema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "hi_sigma",
+          "dtmi:dtdl:property:name;4": "hi_tau",
+          "schema": "time"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryPropertyNameUniqueAmongInterfaceContentsV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyNameUniqueAmongInterfaceContentsV4.json
new file mode 100644
index 00000000..a5f34bb0
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyNameUniqueAmongInterfaceContentsV4.json
@@ -0,0 +1,80 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_zeta;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Telemetry",
+            "schema": "date",
+            "name": "epsilon_upsilon"
+          },
+          {
+            "@type": "Telemetry",
+            "schema": "dateTime",
+            "name": "epsilon_phi"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_eta;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Telemetry",
+            "schema": "decimal",
+            "name": "epsilon_upsilon"
+          },
+          {
+            "@type": "Telemetry",
+            "schema": "double",
+            "name": "epsilon_upsilon"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:example:hi_theta;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Telemetry",
+            "schema": "duration",
+            "name": "epsilon_upsilon"
+          },
+          {
+            "@type": "Telemetry",
+            "schema": "float",
+            "name": "epsilon_upsilon"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryPropertyNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyNotDtmiNorTermV4.json
new file mode 100644
index 00000000..2834000c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryPropertyNotDtmiNorTermV4.json
@@ -0,0 +1,47 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Telemetry",
+            "Foobar"
+          ],
+          "name": "omicron_quan",
+          "schema": "byte",
+          "http://foo.com/bar": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:omicron_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Telemetry",
+            "Foobar"
+          ],
+          "name": "omicron_spazz",
+          "schema": "bytes",
+          "http://foo.com/bar": true
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryPropertySchemaElementV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryPropertySchemaElementV4.json
new file mode 100644
index 00000000..b5eb82b5
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryPropertySchemaElementV4.json
@@ -0,0 +1,753 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_psi;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:hi_chi;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "hi_phi",
+            "schema": {
+              "@type": "Array",
+              "elementSchema": "unsignedByte"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_wum;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:hi_yuzz;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "hi_omega",
+            "schema": [
+              {
+                "@type": "Array",
+                "elementSchema": "unsignedInteger"
+              }
+            ]
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_um;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Array",
+          "elementSchema": "unsignedLong"
+        },
+        "contents": {
+          "@type": "Telemetry",
+          "name": "hi_humpf",
+          "schema": "dtmi:ex:dependentRef;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_fuddle;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Array",
+          "elementSchema": "unsignedShort"
+        },
+        "contents": {
+          "@type": "Telemetry",
+          "name": "hi_glikk",
+          "schema": [
+            "dtmi:ex:dependentRef;1"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_thnad;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:hi_quan;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "hi_snee",
+            "schema": {
+              "@id": "dtmi:example:hi_nuh;1",
+              "@type": "Array",
+              "elementSchema": "boolean",
+              "@context": "dtmi:dtdl:context;2"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_jogg;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:example:hi_zatz;1",
+          "@type": "Interface",
+          "contents": {
+            "@type": "Telemetry",
+            "name": "hi_floob",
+            "schema": {
+              "@id": "dtmi:example:hi_spazz;1",
+              "@type": "Array",
+              "elementSchema": "date",
+              "@context": "dtmi:dtdl:context;3"
+            }
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_flunn;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Array",
+          "elementSchema": "bytes"
+        },
+        "contents": {
+          "@type": "Telemetry",
+          "name": "hi_itch",
+          "schema": [
+            {
+              "@type": "Array",
+              "elementSchema": "byte"
+            },
+            "dtmi:ex:dependentRef;1"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:hi_yekk;1",
+        "@type": "Interface",
+        "schemas": {
+          "@id": "dtmi:ex:dependentRef;1",
+          "@type": "Array",
+          "elementSchema": "dateTime"
+        },
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "hi_vroo",
+          "schema": [
+            {
+              "@type": "Array",
+              "elementSchema": "date"
+            },
+            "dtmi:ex:dependentRef;1"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "hi_hi",
+          "schema": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "alpha_beta",
+          "schema": [
+            "string"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "alpha_delta",
+          "schema": "dtmi:dtdl:instance:Schema:string;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "alpha_zeta",
+          "schema": [
+            "dtmi:dtdl:instance:Schema:string;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "alpha_theta",
+          "schema": "point"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "alpha_kappa",
+          "schema": [
+            "point"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_nu;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "alpha_mu",
+          "schema": "dtmi:standard:schema:geospatial:point;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "alpha_xi",
+          "schema": [
+            "dtmi:standard:schema:geospatial:point;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "alpha_pi",
+          "schema": "Foobar"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "alpha_sigma",
+          "schema": "Foobar"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "alpha_upsilon",
+          "schema": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "alpha_chi",
+          "schema": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "alpha_omega",
+          "schema": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "alpha_wum",
+          "schema": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "alpha_humpf",
+          "schema": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "alpha_glikk",
+          "schema": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "alpha_snee",
+          "schema": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "alpha_thnad",
+          "schema": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "alpha_floob",
+          "schema": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_flunn;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "alpha_jogg",
+          "schema": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "alpha_itch",
+          "schema": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:alpha_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "alpha_vroo",
+          "schema": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "beta_alpha",
+          "schema": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "beta_gamma",
+          "schema": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "beta_epsilon",
+          "schema": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "beta_eta",
+          "schema": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "beta_iota",
+          "schema": []
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "beta_lambda",
+          "schema": []
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryPropertySchemaTermAndDtmiV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryPropertySchemaTermAndDtmiV4.json
new file mode 100644
index 00000000..202da2a1
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryPropertySchemaTermAndDtmiV4.json
@@ -0,0 +1,41 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "epsilon_xi",
+          "schema": "date",
+          "dtmi:dtdl:property:schema;4": "dateTime"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:epsilon_rho;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "epsilon_pi",
+          "schema": "decimal",
+          "dtmi:dtdl:property:schema;4": "double"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryPropertySchemaTypeConformanceV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryPropertySchemaTypeConformanceV4.json
new file mode 100644
index 00000000..e5fb8daf
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryPropertySchemaTypeConformanceV4.json
@@ -0,0 +1,658 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_phi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "beta_upsilon",
+          "schema": {
+            "@id": "dtmi:example:beta_tau;1",
+            "elementSchema": "decimal",
+            "@type": "Array"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_yuzz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "beta_omega",
+          "schema": {
+            "@id": "dtmi:example:beta_chi;1",
+            "name": "beta_psi",
+            "@type": "Command"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_fuddle;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "beta_humpf",
+          "schema": {
+            "@id": "dtmi:example:beta_wum;1",
+            "name": "beta_um",
+            "@type": "Command"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "beta_snee",
+          "schema": {
+            "@id": "dtmi:example:beta_glikk;1",
+            "name": "beta_nuh",
+            "schema": "double",
+            "@type": "CommandRequest"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "beta_floob",
+          "schema": {
+            "@id": "dtmi:example:beta_thnad;1",
+            "name": "beta_spazz",
+            "schema": "duration",
+            "@type": "CommandRequest"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:beta_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "beta_itch",
+          "schema": {
+            "@id": "dtmi:example:beta_jogg;1",
+            "name": "beta_flunn",
+            "schema": "float",
+            "@type": "CommandResponse"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "gamma_alpha",
+          "schema": {
+            "@id": "dtmi:example:beta_vroo;1",
+            "name": "beta_hi",
+            "schema": "integer",
+            "@type": "CommandResponse"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "gamma_zeta",
+          "schema": {
+            "@id": "dtmi:example:gamma_gamma;1",
+            "name": "gamma_delta",
+            "schema": {
+              "@id": "dtmi:example:gamma_epsilon;1",
+              "@type": "Interface"
+            },
+            "@type": "Component"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "gamma_lambda",
+          "schema": {
+            "@id": "dtmi:example:gamma_theta;1",
+            "name": "gamma_iota",
+            "schema": {
+              "@id": "dtmi:example:gamma_kappa;1",
+              "@type": "Interface"
+            },
+            "@type": "Component"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "gamma_xi",
+          "schema": {
+            "@id": "dtmi:example:gamma_nu;1",
+            "valueSchema": "integer",
+            "@type": "Enum"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_tau;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "gamma_sigma",
+          "schema": {
+            "@id": "dtmi:example:gamma_pi;1",
+            "enumValue": 1889,
+            "name": "gamma_rho",
+            "@type": "EnumValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_psi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "gamma_chi",
+          "schema": {
+            "@id": "dtmi:example:gamma_upsilon;1",
+            "enumValue": 1890,
+            "name": "gamma_phi",
+            "@type": "EnumValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_um;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "gamma_wum",
+          "schema": {
+            "@id": "dtmi:example:gamma_omega;1",
+            "name": "gamma_yuzz",
+            "schema": "long",
+            "@type": "Field"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "gamma_glikk",
+          "schema": {
+            "@id": "dtmi:example:gamma_humpf;1",
+            "name": "gamma_fuddle",
+            "schema": "short",
+            "@type": "Field"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "gamma_quan",
+          "schema": {
+            "@id": "dtmi:example:gamma_snee;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "gamma_floob",
+          "schema": {
+            "@id": "dtmi:example:gamma_spazz;1",
+            "@type": "Interface"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:gamma_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "gamma_yekk",
+          "schema": {
+            "@id": "dtmi:example:gamma_jogg;1",
+            "mapKey": {
+              "name": "gamma_flunn",
+              "schema": "string"
+            },
+            "mapValue": {
+              "name": "gamma_itch",
+              "schema": "string"
+            },
+            "@type": "Map"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "delta_beta",
+          "schema": {
+            "@id": "dtmi:example:gamma_hi;1",
+            "name": "delta_alpha",
+            "schema": "string",
+            "@type": "MapKey"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "delta_zeta",
+          "schema": {
+            "@id": "dtmi:example:delta_delta;1",
+            "name": "delta_epsilon",
+            "schema": "string",
+            "@type": "MapKey"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "delta_kappa",
+          "schema": {
+            "@id": "dtmi:example:delta_theta;1",
+            "name": "delta_iota",
+            "schema": "time",
+            "@type": "MapValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_omicron;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "delta_xi",
+          "schema": {
+            "@id": "dtmi:example:delta_mu;1",
+            "name": "delta_nu",
+            "schema": "unsignedByte",
+            "@type": "MapValue"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "delta_rho",
+          "schema": {
+            "@id": "dtmi:example:delta_pi;1",
+            "@type": "Object"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "delta_phi",
+          "schema": {
+            "@id": "dtmi:example:delta_tau;1",
+            "name": "delta_upsilon",
+            "schema": "unsignedInteger",
+            "@type": "Property"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "delta_yuzz",
+          "schema": {
+            "@id": "dtmi:example:delta_psi;1",
+            "name": "delta_omega",
+            "schema": "unsignedLong",
+            "@type": "Property"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "delta_fuddle",
+          "schema": {
+            "@id": "dtmi:example:delta_um;1",
+            "name": "delta_humpf",
+            "@type": "Relationship"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "delta_quan",
+          "schema": {
+            "@id": "dtmi:example:delta_nuh;1",
+            "name": "delta_snee",
+            "@type": "Relationship"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "delta_zatz",
+          "schema": {
+            "@id": "dtmi:example:delta_spazz;1",
+            "name": "delta_floob",
+            "schema": "unsignedShort",
+            "@type": "Telemetry"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:delta_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "delta_yekk",
+          "schema": {
+            "@id": "dtmi:example:delta_flunn;1",
+            "name": "delta_itch",
+            "schema": "uuid",
+            "@type": "Telemetry"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryRequiredPropertiesV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryRequiredPropertiesV4.json
new file mode 100644
index 00000000..d0431327
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryRequiredPropertiesV4.json
@@ -0,0 +1,107 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_yekk;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "flunn_itch",
+          "schema": "decimal"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:flunn_hi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "flunn_vroo",
+          "schema": "double"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "schema": "duration"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_beta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "schema": "float"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_delta;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": "Telemetry",
+          "name": "itch_gamma"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_zeta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": "Telemetry",
+          "name": "itch_epsilon"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryTypeIncludesInvalidDtmiV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryTypeIncludesInvalidDtmiV4.json
new file mode 100644
index 00000000..e1bf8262
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryTypeIncludesInvalidDtmiV4.json
@@ -0,0 +1,45 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_nuh;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Telemetry",
+            "dtmi:foo//bar"
+          ],
+          "name": "yekk_glikk",
+          "schema": "dateTime"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_quan;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Telemetry",
+            "dtmi:foo//bar"
+          ],
+          "name": "yekk_snee",
+          "schema": "decimal"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryTypeIncludesMaterialV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryTypeIncludesMaterialV4.json
new file mode 100644
index 00000000..2217f03b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryTypeIncludesMaterialV4.json
@@ -0,0 +1,156 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_itch;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "itch_flunn",
+          "schema": "double",
+          "@type": "Telemetry"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_vroo;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "itch_yekk",
+          "schema": "duration",
+          "@type": [
+            "Telemetry"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_alpha;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "itch_hi",
+          "schema": "float",
+          "@type": "dtmi:dtdl:class:Telemetry;4"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_gamma;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "yekk_beta",
+          "schema": "integer",
+          "@type": [
+            "dtmi:dtdl:class:Telemetry;4"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_epsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "yekk_delta",
+          "schema": "long",
+          "@type": "Something"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_eta;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "yekk_zeta",
+          "schema": "short",
+          "@type": "Something"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_iota;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "yekk_theta",
+          "schema": "string",
+          "@type": [
+            "Something"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_lambda;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "yekk_kappa",
+          "schema": "time",
+          "@type": [
+            "Something"
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryTypeIncludesNotDtmiNorTermV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryTypeIncludesNotDtmiNorTermV4.json
new file mode 100644
index 00000000..7f5bb0f8
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryTypeIncludesNotDtmiNorTermV4.json
@@ -0,0 +1,45 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_spazz;1",
+        "@type": "Interface",
+        "contents": {
+          "@type": [
+            "Telemetry",
+            "http://foo.com/bar"
+          ],
+          "name": "yekk_thnad",
+          "schema": "double"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:yekk_zatz;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "@type": [
+            "Telemetry",
+            "http://foo.com/bar"
+          ],
+          "name": "yekk_floob",
+          "schema": "duration"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ClassTelemetryTypeStringOrArrayV4.json b/DTDL/v4/spec/Requirement-ClassTelemetryTypeStringOrArrayV4.json
new file mode 100644
index 00000000..e0c98482
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ClassTelemetryTypeStringOrArrayV4.json
@@ -0,0 +1,314 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_theta;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "itch_eta",
+          "schema": "integer",
+          "@type": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_kappa;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "itch_iota",
+          "schema": "long",
+          "@type": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_mu;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "itch_lambda",
+          "schema": "short",
+          "@type": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_xi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "itch_nu",
+          "schema": "string",
+          "@type": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_pi;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "itch_omicron",
+          "schema": "time",
+          "@type": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_sigma;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "itch_rho",
+          "schema": "unsignedByte",
+          "@type": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_upsilon;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "itch_tau",
+          "schema": "unsignedInteger",
+          "@type": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_chi;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "itch_phi",
+          "schema": "unsignedLong",
+          "@type": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_omega;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "itch_psi",
+          "schema": "unsignedShort",
+          "@type": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_wum;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "itch_yuzz",
+          "schema": "uuid",
+          "@type": [
+            626
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_humpf;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "itch_um",
+          "schema": "boolean",
+          "@type": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_glikk;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "itch_fuddle",
+          "schema": "byte",
+          "@type": [
+            null
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_snee;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "itch_nuh",
+          "schema": "bytes",
+          "@type": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_thnad;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "itch_quan",
+          "schema": "date",
+          "@type": [
+            true
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_floob;1",
+        "@type": "Interface",
+        "contents": {
+          "name": "itch_spazz",
+          "schema": "dateTime",
+          "@type": [
+            {}
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:example:itch_jogg;1",
+        "@type": "Interface",
+        "contents": {
+          "@context": "dtmi:undefinedExtension:context;1",
+          "name": "itch_zatz",
+          "schema": "decimal",
+          "@type": [
+            {}
+          ]
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ContextArrayAllStringsV4.json b/DTDL/v4/spec/Requirement-ContextArrayAllStringsV4.json
new file mode 100644
index 00000000..6c7348ba
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ContextArrayAllStringsV4.json
@@ -0,0 +1,231 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": [
+              "dtmi:dtdl:extension:quantitativeTypes;1"
+            ],
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": [
+              626
+            ],
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": [
+              626
+            ],
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": [
+              null
+            ],
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": [
+              null
+            ],
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": [
+              true
+            ],
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": [
+              true
+            ],
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": [
+              {}
+            ],
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": [
+              {}
+            ],
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ContextDtdlPrecedesOrOnlyV4.json b/DTDL/v4/spec/Requirement-ContextDtdlPrecedesOrOnlyV4.json
new file mode 100644
index 00000000..b27f92b2
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ContextDtdlPrecedesOrOnlyV4.json
@@ -0,0 +1,99 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:dtdl:extension:quantitativeTypes;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:extension:quantitativeTypes;1",
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:extension:quantitativeTypes;1",
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:arbitrary:context;1",
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:arbitrary:context;1",
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ContextDtmiWithVersionQuantV4.json b/DTDL/v4/spec/Requirement-ContextDtmiWithVersionQuantV4.json
new file mode 100644
index 00000000..be88a01c
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ContextDtmiWithVersionQuantV4.json
@@ -0,0 +1,166 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": "dtmi:dtdl:extension:quantitativeTypes;1",
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": "dtmi:dtdl:extension:quantitativeTypes",
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": "dtmi:dtdl:extension:quantitativeTypes",
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": "http://dtdl/extension/quantitativeTypes/1",
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": "http://dtdl/extension/quantitativeTypes/1",
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": "quantitativeTypes;1",
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": "quantitativeTypes;1",
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ContextStringOrArrayQuantV4.json b/DTDL/v4/spec/Requirement-ContextStringOrArrayQuantV4.json
new file mode 100644
index 00000000..39d8b1a3
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ContextStringOrArrayQuantV4.json
@@ -0,0 +1,261 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": "dtmi:dtdl:extension:quantitativeTypes;1",
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": [],
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": [
+              "dtmi:dtdl:extension:quantitativeTypes;1"
+            ],
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": 626,
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": 626,
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": null,
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": null,
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": true,
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": true,
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": {},
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@context": {},
+            "@type": "Telemetry",
+            "name": "thing",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-CoreLimitsFollowsLimitlessV4.json b/DTDL/v4/spec/Requirement-CoreLimitsFollowsLimitlessV4.json
new file mode 100644
index 00000000..d9d4b98a
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-CoreLimitsFollowsLimitlessV4.json
@@ -0,0 +1,140 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4#limitless",
+          "dtmi:dtdl:context;4#limits"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:dtdl:context;4#limits"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:dtdl:context;4#limits"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4#limitless",
+          "dtmi:dtdl:extension:quantitativeTypes;1",
+          "dtmi:dtdl:context;4#limits"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4#limitless",
+          "dtmi:dtdl:extension:quantitativeTypes;1",
+          "dtmi:dtdl:context;4#limits"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4#limits"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4#limits"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4#limits",
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4#limits",
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-DependencyReferenceableV4.json b/DTDL/v4/spec/Requirement-DependencyReferenceableV4.json
new file mode 100644
index 00000000..7d1353fa
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-DependencyReferenceableV4.json
@@ -0,0 +1,143 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      [
+        {
+          "@context": [
+            "dtmi:dtdl:context;4"
+          ],
+          "@id": "dtmi:ex:id;1",
+          "@type": "Interface",
+          "extends": "dtmi:ex:id;2"
+        },
+        {
+          "@context": [
+            "dtmi:dtdl:context;4"
+          ],
+          "@id": "dtmi:ex:id;2",
+          "@type": "Interface"
+        }
+      ]
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      [
+        {
+          "@context": [
+            "dtmi:dtdl:context;4"
+          ],
+          "@id": "dtmi:ex:id;1",
+          "@type": "Interface",
+          "extends": "dtmi:ex:id;3"
+        },
+        {
+          "@context": [
+            "dtmi:dtdl:context;4"
+          ],
+          "@id": "dtmi:ex:id;2",
+          "@type": "Interface",
+          "extends": {
+            "@id": "dtmi:ex:id;3",
+            "@type": "Interface"
+          }
+        }
+      ]
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      [
+        {
+          "@context": [
+            "dtmi:dtdl:context;4"
+          ],
+          "@id": "dtmi:ex:id;1",
+          "@type": "Interface",
+          "contents": "dtmi:ex:id;3"
+        },
+        {
+          "@context": [
+            "dtmi:dtdl:context;4"
+          ],
+          "@id": "dtmi:ex:id;2",
+          "@type": "Interface",
+          "contents": {
+            "@id": "dtmi:ex:id;3",
+            "@type": "Telemetry",
+            "name": "foo",
+            "schema": "string"
+          }
+        }
+      ]
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      [
+        {
+          "@context": [
+            "dtmi:dtdl:context;4",
+            "dtmi:undefinedExtension:context;1"
+          ],
+          "@id": "dtmi:ex:id;1",
+          "@type": "Interface",
+          "contents": "dtmi:ex:id;3"
+        },
+        {
+          "@context": [
+            "dtmi:dtdl:context;4",
+            "dtmi:undefinedExtension:context;1"
+          ],
+          "@id": "dtmi:ex:id;2",
+          "@type": "Interface",
+          "contents": {
+            "@id": "dtmi:ex:id;3",
+            "@type": "Telemetry",
+            "name": "foo",
+            "schema": "string"
+          }
+        }
+      ]
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      [
+        {
+          "@context": [
+            "dtmi:dtdl:context;4"
+          ],
+          "@id": "dtmi:ex:id;2",
+          "@type": "Interface",
+          "contents": {
+            "@id": "dtmi:ex:id;3",
+            "@type": "Telemetry",
+            "name": "foo",
+            "schema": "string"
+          }
+        }
+      ]
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-DtmiIsStringV4.json b/DTDL/v4/spec/Requirement-DtmiIsStringV4.json
new file mode 100644
index 00000000..33ad7254
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-DtmiIsStringV4.json
@@ -0,0 +1,208 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:some:valid:identifier;3"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": 626
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": 626
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": true
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": true
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": {
+              "@value": "dtmi:apparently:valid:identifier;3"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": {
+              "@value": "dtmi:apparently:valid:identifier;3"
+            }
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-DtmiRegexV4.json b/DTDL/v4/spec/Requirement-DtmiRegexV4.json
new file mode 100644
index 00000000..11e80068
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-DtmiRegexV4.json
@@ -0,0 +1,966 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;7"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;108675309"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;999999999"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo;1"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;0"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;0"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;0.0"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;0.0"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;1234567890"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;1234567890"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;1a"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;1a"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;3.0"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;3.0"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;3.1415926"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;3.1415926"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;6.02"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;6.02"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;0.1"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;0.1"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;01"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;01"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:test:invalidId_;1"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:test:invalidId_;1"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:test:_invalidUserId;1"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:test:_invalidUserId;1"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:test:1seg;1"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:test:1seg;1"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar.baz;1"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar.baz;1"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo::bar;1"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo::bar;1"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "urn:foo:bar:1"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "urn:foo:bar:1"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "http://foo/bar/baz"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "http://foo/bar/baz"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:;1"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:;1"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;3.14"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "target": "dtmi:foo:bar;3.141592"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-DtmiReservedPrefixesV4.json b/DTDL/v4/spec/Requirement-DtmiReservedPrefixesV4.json
new file mode 100644
index 00000000..1ae6f5d6
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-DtmiReservedPrefixesV4.json
@@ -0,0 +1,60 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:dtdl:example;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:dtdl:example;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4",
+        "@id": "dtmi:standard:example;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:standard:example;1",
+        "@type": "Interface"
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-ExtensionLimitsFollowsLimitlessV4.json b/DTDL/v4/spec/Requirement-ExtensionLimitsFollowsLimitlessV4.json
new file mode 100644
index 00000000..b76e44e1
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-ExtensionLimitsFollowsLimitlessV4.json
@@ -0,0 +1 @@
+[]
diff --git a/DTDL/v4/spec/Requirement-LimitlessContextFollowedByLimitsV4.json b/DTDL/v4/spec/Requirement-LimitlessContextFollowedByLimitsV4.json
new file mode 100644
index 00000000..f249fdd9
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-LimitlessContextFollowedByLimitsV4.json
@@ -0,0 +1,124 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4#limitless",
+          "dtmi:dtdl:context;4#limits"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4#limitless",
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4#limitless",
+          "dtmi:dtdl:extension:quantitativeTypes;1",
+          "dtmi:dtdl:context;4#limits"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4#limitless",
+          "dtmi:dtdl:extension:quantitativeTypes;1",
+          "dtmi:dtdl:context;4#limits"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4#limitless"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4#limitless"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4#limitless",
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:context;4#limitless",
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-LimitlessContextPrecedesV4.json b/DTDL/v4/spec/Requirement-LimitlessContextPrecedesV4.json
new file mode 100644
index 00000000..fc0c69e6
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-LimitlessContextPrecedesV4.json
@@ -0,0 +1,103 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4#limitless",
+          "dtmi:dtdl:context;4#limits"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4#limitless",
+          "dtmi:dtdl:context;4#limits",
+          "dtmi:dtdl:extension:quantitativeTypes;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:extension:quantitativeTypes;1",
+          "dtmi:dtdl:context;4#limitless",
+          "dtmi:dtdl:context;4#limits"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:extension:quantitativeTypes;1",
+          "dtmi:dtdl:context;4#limitless",
+          "dtmi:dtdl:context;4#limits"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:arbitrary:context;1",
+          "dtmi:dtdl:context;4#limitless",
+          "dtmi:dtdl:context;4#limits"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:arbitrary:context;1",
+          "dtmi:dtdl:context;4#limitless",
+          "dtmi:dtdl:context;4#limits"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-LocalizableStringArrayElementHasValueV4.json b/DTDL/v4/spec/Requirement-LocalizableStringArrayElementHasValueV4.json
new file mode 100644
index 00000000..008c3c53
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-LocalizableStringArrayElementHasValueV4.json
@@ -0,0 +1,59 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {}
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {}
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-LocalizableStringArrayElementLanguageValueRegexV4.json b/DTDL/v4/spec/Requirement-LocalizableStringArrayElementLanguageValueRegexV4.json
new file mode 100644
index 00000000..6ae158bf
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-LocalizableStringArrayElementLanguageValueRegexV4.json
@@ -0,0 +1,150 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "foo",
+            "@language": "de"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "foo",
+            "@language": "zh-Hant"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "foo",
+            "@language": "zh-TW"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "foo",
+            "@language": "fr-155"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "foo",
+            "@language": "sr-Latn-RS"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "foo",
+            "@language": "English"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "foo",
+            "@language": "English"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-LocalizableStringArrayElementLanguageValueUniqueV4.json b/DTDL/v4/spec/Requirement-LocalizableStringArrayElementLanguageValueUniqueV4.json
new file mode 100644
index 00000000..e458223f
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-LocalizableStringArrayElementLanguageValueUniqueV4.json
@@ -0,0 +1,154 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "foo",
+            "@language": "de"
+          },
+          {
+            "@value": "foo",
+            "@language": "es"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "foo",
+            "@language": "de"
+          },
+          {
+            "@value": "bar",
+            "@language": "es"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "foo",
+            "@language": "de"
+          },
+          {
+            "@value": "foo",
+            "@language": "de"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "foo",
+            "@language": "de"
+          },
+          {
+            "@value": "foo",
+            "@language": "de"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "foo",
+            "@language": "de"
+          },
+          {
+            "@value": "bar",
+            "@language": "de"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "foo",
+            "@language": "de"
+          },
+          {
+            "@value": "bar",
+            "@language": "de"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-LocalizableStringArrayElementOnlyKeywordsV4.json b/DTDL/v4/spec/Requirement-LocalizableStringArrayElementOnlyKeywordsV4.json
new file mode 100644
index 00000000..a429d386
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-LocalizableStringArrayElementOnlyKeywordsV4.json
@@ -0,0 +1,43 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "en": "hello"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "en": "hello"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-LocalizableStringArrayElementOnlyValueAndLanguageV4.json b/DTDL/v4/spec/Requirement-LocalizableStringArrayElementOnlyValueAndLanguageV4.json
new file mode 100644
index 00000000..eb95d977
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-LocalizableStringArrayElementOnlyValueAndLanguageV4.json
@@ -0,0 +1,248 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello",
+            "@language": "de"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello",
+            "@language": "de",
+            "@id": "dtmi:ex:id;2"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello",
+            "@language": "de",
+            "@id": "dtmi:ex:id;2"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello",
+            "@language": "de",
+            "@context": "dtmi:ex:context;1"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello",
+            "@language": "de",
+            "@context": "dtmi:ex:context;1"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello",
+            "@language": "de",
+            "@graph": {}
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello",
+            "@language": "de",
+            "@graph": {}
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello",
+            "@language": "de",
+            "@type": "rdf:langString"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello",
+            "@language": "de",
+            "@type": "rdf:langString"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello",
+            "@language": "de",
+            "@keyword": "goodbye"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello",
+            "@language": "de",
+            "@keyword": "goodbye"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-LocalizableStringArrayElementStringOrObjectV4.json b/DTDL/v4/spec/Requirement-LocalizableStringArrayElementStringOrObjectV4.json
new file mode 100644
index 00000000..f8c1eb56
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-LocalizableStringArrayElementStringOrObjectV4.json
@@ -0,0 +1,151 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          "hello"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          626
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          626
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          null
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          null
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          true
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          true
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-LocalizableStringArrayElementValueStringV4.json b/DTDL/v4/spec/Requirement-LocalizableStringArrayElementValueStringV4.json
new file mode 100644
index 00000000..d1decdbc
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-LocalizableStringArrayElementValueStringV4.json
@@ -0,0 +1,235 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": [
+              "hello"
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": [
+              "hello"
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": {
+          "@value": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": {
+          "@value": [
+            {
+              "en": "hello"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": 626
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": 626
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": true
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": true
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-LocalizableStringArrayOnlyOneDefaultV4.json b/DTDL/v4/spec/Requirement-LocalizableStringArrayOnlyOneDefaultV4.json
new file mode 100644
index 00000000..25dd4bc0
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-LocalizableStringArrayOnlyOneDefaultV4.json
@@ -0,0 +1,406 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          "hello"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello",
+            "@language": "en"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          "hello",
+          {
+            "@value": "hola",
+            "@language": "es"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello"
+          },
+          {
+            "@value": "hola",
+            "@language": "es"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello",
+            "@language": "en"
+          },
+          {
+            "@value": "hola",
+            "@language": "es"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          "hello",
+          "hi"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          "hello",
+          "hi"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello"
+          },
+          "hi"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello"
+          },
+          "hi"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello",
+            "@language": "en"
+          },
+          "hi"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello",
+            "@language": "en"
+          },
+          "hi"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello"
+          },
+          {
+            "@value": "hi"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello"
+          },
+          {
+            "@value": "hi"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello",
+            "@language": "en"
+          },
+          {
+            "@value": "hi"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello",
+            "@language": "en"
+          },
+          {
+            "@value": "hi"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello",
+            "@language": "en"
+          },
+          {
+            "@value": "hi",
+            "@language": "en"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": [
+          {
+            "@value": "hello",
+            "@language": "en"
+          },
+          {
+            "@value": "hi",
+            "@language": "en"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-LocalizableStringObjectMemberNameRegexV4.json b/DTDL/v4/spec/Requirement-LocalizableStringObjectMemberNameRegexV4.json
new file mode 100644
index 00000000..ad6e68bc
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-LocalizableStringObjectMemberNameRegexV4.json
@@ -0,0 +1,129 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": {
+          "de": "foo"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": {
+          "zh-Hant": "foo"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": {
+          "zh-TW": "foo"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": {
+          "fr-155": "foo"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": {
+          "sr-Latn-RS": "foo"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": {
+          "English": "foo"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": {
+          "English": "foo"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-LocalizableStringObjectMemberValueStringV4.json b/DTDL/v4/spec/Requirement-LocalizableStringObjectMemberValueStringV4.json
new file mode 100644
index 00000000..7e6d8663
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-LocalizableStringObjectMemberValueStringV4.json
@@ -0,0 +1,213 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": {
+          "en-US": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": {
+          "en-US": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": {
+          "en-US": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": {
+          "en-US": {
+            "en": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": {
+          "en-US": {
+            "en": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": {
+          "en-US": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": {
+          "en-US": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": {
+          "en-US": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": {
+          "en-US": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": {
+          "en-US": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": {
+          "en-US": true
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-LocalizableStringOrArrayOrObjectV4.json b/DTDL/v4/spec/Requirement-LocalizableStringOrArrayOrObjectV4.json
new file mode 100644
index 00000000..9c68a2af
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-LocalizableStringOrArrayOrObjectV4.json
@@ -0,0 +1,149 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": "hello"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": []
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": {}
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": 626
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": 626
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": null
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": null
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": true
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "displayName": true
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-NoPathToSelfV4.json b/DTDL/v4/spec/Requirement-NoPathToSelfV4.json
new file mode 100644
index 00000000..8f3d1dac
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-NoPathToSelfV4.json
@@ -0,0 +1,174 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "extends": "dtmi:ex:id;1"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "extends": "dtmi:ex:id;1"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:ex:id;2",
+          "@type": "Interface"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      [
+        {
+          "@context": [
+            "dtmi:dtdl:context;4"
+          ],
+          "@id": "dtmi:ex:id;1",
+          "@type": "Interface",
+          "extends": "dtmi:ex:id;2"
+        },
+        {
+          "@context": [
+            "dtmi:dtdl:context;4"
+          ],
+          "@id": "dtmi:ex:id;2",
+          "@type": "Interface"
+        }
+      ]
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:ex:id;2",
+          "@type": "Interface",
+          "extends": "dtmi:ex:id;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "extends": {
+          "@id": "dtmi:ex:id;2",
+          "@type": "Interface",
+          "extends": "dtmi:ex:id;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      [
+        {
+          "@context": [
+            "dtmi:dtdl:context;4"
+          ],
+          "@id": "dtmi:ex:id;1",
+          "@type": "Interface",
+          "extends": "dtmi:ex:id;2"
+        },
+        {
+          "@context": [
+            "dtmi:dtdl:context;4"
+          ],
+          "@id": "dtmi:ex:id;2",
+          "@type": "Interface",
+          "extends": "dtmi:ex:id;1"
+        }
+      ]
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      [
+        {
+          "@context": [
+            "dtmi:dtdl:context;4",
+            "dtmi:undefinedExtension:context;1"
+          ],
+          "@id": "dtmi:ex:id;1",
+          "@type": "Interface",
+          "extends": "dtmi:ex:id;2"
+        },
+        {
+          "@context": [
+            "dtmi:dtdl:context;4",
+            "dtmi:undefinedExtension:context;1"
+          ],
+          "@id": "dtmi:ex:id;2",
+          "@type": "Interface",
+          "extends": "dtmi:ex:id;1"
+        }
+      ]
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-RepresentationalBooleanHasValueV4.json b/DTDL/v4/spec/Requirement-RepresentationalBooleanHasValueV4.json
new file mode 100644
index 00000000..968dbe7a
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-RepresentationalBooleanHasValueV4.json
@@ -0,0 +1,74 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {}
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {}
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-RepresentationalBooleanOnlyKeywordsV4.json b/DTDL/v4/spec/Requirement-RepresentationalBooleanOnlyKeywordsV4.json
new file mode 100644
index 00000000..7669e323
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-RepresentationalBooleanOnlyKeywordsV4.json
@@ -0,0 +1,53 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "value": true
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "value": true
+            }
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-RepresentationalBooleanOnlyValueAndTypeV4.json b/DTDL/v4/spec/Requirement-RepresentationalBooleanOnlyValueAndTypeV4.json
new file mode 100644
index 00000000..a4691d55
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-RepresentationalBooleanOnlyValueAndTypeV4.json
@@ -0,0 +1,303 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": "xsd:boolean"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": "xsd:boolean",
+              "@id": "dtmi:ex:id;2"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": "xsd:boolean",
+              "@id": "dtmi:ex:id;2"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": "xsd:boolean",
+              "@context": "dtmi:ex:context;1"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": "xsd:boolean",
+              "@context": "dtmi:ex:context;1"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": "xsd:boolean",
+              "@graph": {}
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": "xsd:boolean",
+              "@graph": {}
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": "xsd:boolean",
+              "@language": "en"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": "xsd:boolean",
+              "@language": "en"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": "xsd:boolean",
+              "@keyword": "goodbye"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": "xsd:boolean",
+              "@keyword": "goodbye"
+            }
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-RepresentationalBooleanOrObjectV4.json b/DTDL/v4/spec/Requirement-RepresentationalBooleanOrObjectV4.json
new file mode 100644
index 00000000..975012a4
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-RepresentationalBooleanOrObjectV4.json
@@ -0,0 +1,396 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": true
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": [
+              true
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": [
+              {
+                "@value": true
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": "foo"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": "foo"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": [
+              "foo"
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": [
+              "foo"
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": [
+              null
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": [
+              null
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": 626
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": 626
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": [
+              626
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": [
+              626
+            ]
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-RepresentationalBooleanTypeBooleanV4.json b/DTDL/v4/spec/Requirement-RepresentationalBooleanTypeBooleanV4.json
new file mode 100644
index 00000000..48a51f6e
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-RepresentationalBooleanTypeBooleanV4.json
@@ -0,0 +1,438 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": "xsd:boolean"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": "http://www.w3.org/2001/XMLSchema#boolean"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": [
+                "xsd:boolean"
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": [
+                "http://www.w3.org/2001/XMLSchema#boolean"
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": [
+                "xsd:boolean",
+                "http://www.w3.org/2001/XMLSchema#boolean"
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": [
+                "xsd:boolean",
+                "http://www.w3.org/2001/XMLSchema#boolean"
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": "boolean"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": "boolean"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": 626
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": 626
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": null
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": null
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": true
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": true
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": {
+                "@value": "xsd:boolean"
+              }
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true,
+              "@type": {
+                "@value": "xsd:boolean"
+              }
+            }
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-RepresentationalBooleanValueBooleanV4.json b/DTDL/v4/spec/Requirement-RepresentationalBooleanValueBooleanV4.json
new file mode 100644
index 00000000..4f150eaa
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-RepresentationalBooleanValueBooleanV4.json
@@ -0,0 +1,290 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": true
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": [
+                true
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": [
+                true
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": {
+                "value": true
+              }
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": {
+                "value": true
+              }
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": "foo"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": "foo"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": null
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": null
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": 626
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Property",
+            "name": "foo",
+            "schema": "string",
+            "writable": {
+              "@value": 626
+            }
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-RepresentationalIntegerHasValueV4.json b/DTDL/v4/spec/Requirement-RepresentationalIntegerHasValueV4.json
new file mode 100644
index 00000000..95e51718
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-RepresentationalIntegerHasValueV4.json
@@ -0,0 +1,71 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {}
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {}
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-RepresentationalIntegerOnlyKeywordsV4.json b/DTDL/v4/spec/Requirement-RepresentationalIntegerOnlyKeywordsV4.json
new file mode 100644
index 00000000..dc7e8783
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-RepresentationalIntegerOnlyKeywordsV4.json
@@ -0,0 +1,51 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "value": 3
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "value": 3
+            }
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-RepresentationalIntegerOnlyValueAndTypeV4.json b/DTDL/v4/spec/Requirement-RepresentationalIntegerOnlyValueAndTypeV4.json
new file mode 100644
index 00000000..6cd8853f
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-RepresentationalIntegerOnlyValueAndTypeV4.json
@@ -0,0 +1,292 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": "xsd:integer"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": "xsd:integer",
+              "@id": "dtmi:ex:id;2"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": "xsd:integer",
+              "@id": "dtmi:ex:id;2"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": "xsd:integer",
+              "@context": "dtmi:ex:context;1"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": "xsd:integer",
+              "@context": "dtmi:ex:context;1"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": "xsd:integer",
+              "@graph": {}
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": "xsd:integer",
+              "@graph": {}
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": "xsd:integer",
+              "@language": "en"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": "xsd:integer",
+              "@language": "en"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": "xsd:integer",
+              "@keyword": "goodbye"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": "xsd:integer",
+              "@keyword": "goodbye"
+            }
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-RepresentationalIntegerOrObjectV4.json b/DTDL/v4/spec/Requirement-RepresentationalIntegerOrObjectV4.json
new file mode 100644
index 00000000..33e9a920
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-RepresentationalIntegerOrObjectV4.json
@@ -0,0 +1,380 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": 3
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": [
+              3
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": [
+              {
+                "@value": 3
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": "foo"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": "foo"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": [
+              "foo"
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": [
+              "foo"
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": [
+              null
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": [
+              null
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": true
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": true
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": [
+              true
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": [
+              true
+            ]
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-RepresentationalIntegerTypeIntegerV4.json b/DTDL/v4/spec/Requirement-RepresentationalIntegerTypeIntegerV4.json
new file mode 100644
index 00000000..055203b6
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-RepresentationalIntegerTypeIntegerV4.json
@@ -0,0 +1,422 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": "xsd:integer"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": [
+                "xsd:integer"
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": [
+                "http://www.w3.org/2001/XMLSchema#integer"
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": [
+                "xsd:integer",
+                "http://www.w3.org/2001/XMLSchema#integer"
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": [
+                "xsd:integer",
+                "http://www.w3.org/2001/XMLSchema#integer"
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": "integer"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": "integer"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": 626
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": 626
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": null
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": null
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": true
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": true
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": {
+                "@value": "xsd:integer"
+              }
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3,
+              "@type": {
+                "@value": "xsd:integer"
+              }
+            }
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-RepresentationalIntegerValueIntegerV4.json b/DTDL/v4/spec/Requirement-RepresentationalIntegerValueIntegerV4.json
new file mode 100644
index 00000000..6bf56fc3
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-RepresentationalIntegerValueIntegerV4.json
@@ -0,0 +1,279 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": 3
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": [
+                3
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": [
+                3
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": {
+                "value": 3
+              }
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": {
+                "value": 3
+              }
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": "foo"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": "foo"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": null
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": null
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": true
+            }
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@type": "Relationship",
+            "name": "foo",
+            "maxMultiplicity": {
+              "@value": true
+            }
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-RepresentationalStringHasValueV4.json b/DTDL/v4/spec/Requirement-RepresentationalStringHasValueV4.json
new file mode 100644
index 00000000..8d0b7571
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-RepresentationalStringHasValueV4.json
@@ -0,0 +1,53 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {}
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {}
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-RepresentationalStringOnlyKeywordsV4.json b/DTDL/v4/spec/Requirement-RepresentationalStringOnlyKeywordsV4.json
new file mode 100644
index 00000000..7de7385b
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-RepresentationalStringOnlyKeywordsV4.json
@@ -0,0 +1,39 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "en": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "en": "hello"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-RepresentationalStringOnlyValueAndTypeV4.json b/DTDL/v4/spec/Requirement-RepresentationalStringOnlyValueAndTypeV4.json
new file mode 100644
index 00000000..5fe13cbd
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-RepresentationalStringOnlyValueAndTypeV4.json
@@ -0,0 +1,226 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": "xsd:string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": "xsd:string",
+          "@id": "dtmi:ex:id;2"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": "xsd:string",
+          "@id": "dtmi:ex:id;2"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": "xsd:string",
+          "@context": "dtmi:ex:context;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": "xsd:string",
+          "@context": "dtmi:ex:context;1"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": "xsd:string",
+          "@graph": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": "xsd:string",
+          "@graph": {}
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": "xsd:string",
+          "@language": "en"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": "xsd:string",
+          "@language": "en"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": "xsd:string",
+          "@keyword": "goodbye"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": "xsd:string",
+          "@keyword": "goodbye"
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-RepresentationalStringOrObjectV4.json b/DTDL/v4/spec/Requirement-RepresentationalStringOrObjectV4.json
new file mode 100644
index 00000000..71f643b3
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-RepresentationalStringOrObjectV4.json
@@ -0,0 +1,284 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": "hello"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": [
+          "hello"
+        ]
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": [
+          {
+            "@value": "hello"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": 626
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": 626
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": [
+          626
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": [
+          626
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": null
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": null
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": [
+          null
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": [
+          null
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": true
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": true
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": [
+          true
+        ]
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": [
+          true
+        ]
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-RepresentationalStringTypeStringV4.json b/DTDL/v4/spec/Requirement-RepresentationalStringTypeStringV4.json
new file mode 100644
index 00000000..bcac0698
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-RepresentationalStringTypeStringV4.json
@@ -0,0 +1,326 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": "xsd:string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": [
+            "xsd:string"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": [
+            "http://www.w3.org/2001/XMLSchema#string"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": [
+            "xsd:string",
+            "http://www.w3.org/2001/XMLSchema#string"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": [
+            "xsd:string",
+            "http://www.w3.org/2001/XMLSchema#string"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": "string"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": {
+            "@value": "xsd:string"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello",
+          "@type": {
+            "@value": "xsd:string"
+          }
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-RepresentationalStringValueStringV4.json b/DTDL/v4/spec/Requirement-RepresentationalStringValueStringV4.json
new file mode 100644
index 00000000..3117fcb9
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-RepresentationalStringValueStringV4.json
@@ -0,0 +1,213 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": "hello"
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": [
+            "hello"
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": {
+            "en": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": {
+            "en": "hello"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": 626
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": null
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": true
+        }
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface",
+        "comment": {
+          "@value": true
+        }
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-RootArrayOrObjV4.json b/DTDL/v4/spec/Requirement-RootArrayOrObjV4.json
new file mode 100644
index 00000000..e923bbe7
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-RootArrayOrObjV4.json
@@ -0,0 +1,218 @@
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      [
+        {
+          "@context": [
+            "dtmi:dtdl:context;4"
+          ],
+          "@id": "dtmi:ex:id;1",
+          "@type": "Interface"
+        }
+      ]
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      [
+        {
+          "@context": [
+            "dtmi:dtdl:context;4"
+          ],
+          "@id": "dtmi:ex:id;1",
+          "@type": "Interface"
+        },
+        {
+          "@context": [
+            "dtmi:dtdl:context;4"
+          ],
+          "@id": "dtmi:ex:id;2",
+          "@type": "Interface"
+        }
+      ]
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      626
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      626
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      null
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      null
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      "hello"
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      "hello"
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      true
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      true
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      [
+        626
+      ]
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      [
+        626
+      ]
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      [
+        null
+      ]
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      [
+        null
+      ]
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      [
+        "hello"
+      ]
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      [
+        "hello"
+      ]
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      [
+        true
+      ]
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      [
+        true
+      ]
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-TopLevelDtdlContextOrLimitlessV4.json b/DTDL/v4/spec/Requirement-TopLevelDtdlContextOrLimitlessV4.json
new file mode 100644
index 00000000..a06e928a
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-TopLevelDtdlContextOrLimitlessV4.json
@@ -0,0 +1,119 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:iotcentral:context;2"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:iotcentral:context;2",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:extension:quantitativeTypes;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:extension:quantitativeTypes;1",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4#limitless",
+          "dtmi:dtdl:context;4#limits"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-TopLevelRootableV4.json b/DTDL/v4/spec/Requirement-TopLevelRootableV4.json
new file mode 100644
index 00000000..6a772ae7
--- /dev/null
+++ b/DTDL/v4/spec/Requirement-TopLevelRootableV4.json
@@ -0,0 +1,60 @@
+[
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Telemetry",
+        "name": "foo",
+        "schema": "string"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:undefinedExtension:context;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Telemetry",
+        "name": "foo",
+        "schema": "string"
+      }
+    ]
+  },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4"
+        ],
+        "@id": "dtmi:ex:id;2",
+        "@type": "Interface",
+        "contents": [
+          {
+            "@id": "dtmi:ex:id;1",
+            "@type": "Telemetry",
+            "name": "foo",
+            "schema": "string"
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/README.md b/README.md
index eaa24697..85319e78 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@ DTDL has evolved over time, resulting in the next versions:
 |v1-preview|[dtdlv1.md](./DTDL/v1-preview/dtdlv1.md)|Out of support|
 |v2|[DTDL.v2.md](./DTDL/v2/DTDL.v2.md)|Supported in ADT, IoTCentral and IoT Plug and Play|
 |v3|[DTDL.v3.md](./DTDL/v3/DTDL.v3.md)|Supported in ADT and IoT Plug and Play|
+|v4|[DTDL.v4.md](./DTDL/v4/DTDL.v4.md)||
 
 
 ## :point_right: A Simple Example

From a74c57209c80e1ef2dfddf224fc84e21e13ccd2d Mon Sep 17 00:00:00 2001
From: Auto Gen <johndo@microsoft.com>
Date: Thu, 31 Oct 2024 12:40:37 -0700
Subject: [PATCH 2/5] Split serviceGroupId into separate telem and cmd props

---
 DTDL/v4/DTDL.mqtt.v2.md                       |  9 ++++----
 ...DL.FeatureExtension.mqtt.v2.RDF-SHACL.json | 22 +++++++++++++++++--
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/DTDL/v4/DTDL.mqtt.v2.md b/DTDL/v4/DTDL.mqtt.v2.md
index d862e19d..54f60ab9 100644
--- a/DTDL/v4/DTDL.mqtt.v2.md
+++ b/DTDL/v4/DTDL.mqtt.v2.md
@@ -18,10 +18,11 @@ The chart below lists the additional properties that may be part of an element t
 
 | Property | Required | Data type | Limits | Description |
 | --- | --- | --- | --- | --- |
+| `cmdServiceGroupId` | optional | *string* | non-empty string of printable ASCII characters not including space, ", +, #, {, }, or / | The service group ID for subscribing to Command topics when shared subscriptions are wanted. |
 | `commandTopic` | optional | *string* | slash-separated sequence of character-restricted labels and/or brace-enclosed tokens | MQTT topic pattern on which a Command request is published. |
 | `payloadFormat` | required | *string* |  | The format to use when serializing an instance to an MQTT payload. |
-| `serviceGroupId` | optional | *string* | non-empty string of printable ASCII characters not including space, ", +, #, {, }, or / | The service group ID for subscribing to Command topics when shared subscriptions are wanted. |
 | `telemetryTopic` | optional | *string* | slash-separated sequence of character-restricted labels and/or brace-enclosed tokens | MQTT topic pattern on which a Telemetry or a collection of Telemetries is published. |
+| `telemServiceGroupId` | optional | *string* | non-empty string of printable ASCII characters not including space, ", +, #, {, }, or / | The service group ID for subscribing to Telemetry topics when shared subscriptions are wanted. |
 
 When an Interface in a model is co-typed Mqtt, values of the above properties indicate the serialization format and MQTT topic pattern used for any instance of Interface contents when conveyed via an MQTT message.
 
@@ -331,7 +332,7 @@ The following example is not valid becuse the `schema` of the request is "string
 
 * [DTDL v4](./DTDL.v4.md) is now supported.
 * The [Transparent](#transparent-adjunct-type) adjunct type has been added.
-* The "serviceGroupId" property has been added to to the [Mqtt](#mqtt-adjunct-type) adjunct type.
+* The "telemServiceGroupId" and "cmdServiceGroupId" properties have been added to to the [Mqtt](#mqtt-adjunct-type) adjunct type.
 
 ## Feature versions
 
@@ -339,6 +340,6 @@ The chart below lists the versions of the Mqtt extension that are currently avai
 
 | Extension | Context | DTDL versions |
 | --- | --- | --- |
-| [MQTT v1](../v3/DTDL.mqtt.v1.md) | dtmi:dtdl:extension:mqtt;1 | [3](../v3/DTDL.v3.md) |
-| [MQTT v2](./DTDL.mqtt.v2.md) | dtmi:dtdl:extension:mqtt;2 | [3](../v3/DTDL.v3.md), [4](./DTDL.v4.md) |
+| [MQTT v1](./DTDL.mqtt.v1.md) | dtmi:dtdl:extension:mqtt;1 | [3](./DTDL.v3.md) |
+| [MQTT v2](./DTDL.mqtt.v2.md) | dtmi:dtdl:extension:mqtt;2 | [3](./DTDL.v3.md), [4](./DTDL.v4.md) |
 
diff --git a/DTDL/v4/metamodel/DTDL.FeatureExtension.mqtt.v2.RDF-SHACL.json b/DTDL/v4/metamodel/DTDL.FeatureExtension.mqtt.v2.RDF-SHACL.json
index bf02e4da..da1243d9 100644
--- a/DTDL/v4/metamodel/DTDL.FeatureExtension.mqtt.v2.RDF-SHACL.json
+++ b/DTDL/v4/metamodel/DTDL.FeatureExtension.mqtt.v2.RDF-SHACL.json
@@ -36,7 +36,12 @@
           "rdfs:domain": "Mqtt"
         },
         {
-          "@id": "dtmi:dtdl:extension:mqtt:v2:Mqtt:serviceGroupId",
+          "@id": "dtmi:dtdl:extension:mqtt:v2:Mqtt:telemServiceGroupId",
+          "@type": "rdf:Property",
+          "rdfs:domain": "Mqtt"
+        },
+        {
+          "@id": "dtmi:dtdl:extension:mqtt:v2:Mqtt:cmdServiceGroupId",
           "@type": "rdf:Property",
           "rdfs:domain": "Mqtt"
         }
@@ -79,7 +84,20 @@
           }
         },
         {
-          "sh:path": "serviceGroupId",
+          "sh:path": "telemServiceGroupId",
+          "sh:maxCount": 1,
+          "sh:datatype": "xsd:string",
+          "sh:nodeKind": "sh:Literal",
+          "sh:pattern": "^[!$-*,-.0-z|~]+$",
+          "dtmm:patternDesc": {
+            "en-US": "non-empty string of printable ASCII characters not including space, \", +, #, {, }, or /"
+          },
+          "dtmm:description": {
+            "en-US": "The service group ID for subscribing to Telemetry topics when shared subscriptions are wanted."
+          }
+        },
+        {
+          "sh:path": "cmdServiceGroupId",
           "sh:maxCount": 1,
           "sh:datatype": "xsd:string",
           "sh:nodeKind": "sh:Literal",

From 1ab19f8ffb9f025dda55140484e99dfc4f702270 Mon Sep 17 00:00:00 2001
From: Auto Gen <johndo@microsoft.com>
Date: Tue, 10 Dec 2024 12:32:19 -0800
Subject: [PATCH 3/5] restore Onvif limit extension and update limit values

---
 DTDL/v4/DTDL.Extensions.md                    |   5 +-
 DTDL/v4/DTDL.mqtt.v2.md                       |   4 +-
 DTDL/v4/DTDL.onvif.v1.md                      | 229 ++++++++++++++++++
 DTDL/v4/DTDL.v4.md                            |   1 +
 ...DTDL.FeatureExtension.mqtt.v2.context.json |   3 +-
 ...TDL.LimitExtension.onvif.v1.RDF-SHACL.json |  84 +++++++
 ...ent-ExtensionLimitsFollowsLimitlessV4.json | 168 ++++++++++++-
 ...nt-LimitlessContextFollowedByLimitsV4.json |  19 ++
 8 files changed, 507 insertions(+), 6 deletions(-)
 create mode 100644 DTDL/v4/DTDL.onvif.v1.md
 create mode 100644 DTDL/v4/metamodel/DTDL.LimitExtension.onvif.v1.RDF-SHACL.json

diff --git a/DTDL/v4/DTDL.Extensions.md b/DTDL/v4/DTDL.Extensions.md
index be32ad03..7a2d9a4d 100644
--- a/DTDL/v4/DTDL.Extensions.md
+++ b/DTDL/v4/DTDL.Extensions.md
@@ -84,7 +84,7 @@ Conseqently, an additional context for the QuantitativeTypes extension is also s
 Limit extensions do not add new adjunct types to a DTDL model.
 Instead, a limit extension defines increased values for one or more numerical limits on DTDL property values.
 For example, in [DTDL v4](./DTDL.v4.md), the maximum depth of nested [complex schemas](./DTDL.v4.md#complex-schema) is 8 levels.
-A limit extension could increase this maximum depth to some value greater than 8.
+The [Onvif](./DTDL.onvif.v1.md) limit extension increases this maximum depth to 24 levels.
 
 Although extensions can add definitions to the DTDL language, they cannot remove any core language definitions.
 Therefore, for a model to use a limit extension, the model must include only the portion of the core language definitions that do not define any limits.
@@ -94,7 +94,7 @@ This is done by using a DTDL context specifier with a fragment that indicates th
 {
   "@context": [
     "dtmi:dtdl:context;4#limitless",
-    "dtmi:dtdl:limits:hypothetical;1"
+    "dtmi:dtdl:limits:onvif;1"
   ],
   "@id": "dtmi:com:example:Sampler;1",
   "@type": "Interface",
@@ -147,6 +147,7 @@ The chart below lists the limit extensions that are currently available.
 
 | Extension | Description | DTDL versions |
 | --- | --- | --- |
+| [Onvif v1](./DTDL.onvif.v1.md) | Increased limits that support translating ONVIF WSDL definitions into DTDL. | [4](./DTDL.v4.md) |
 
 ## Service and tool support of language extensions
 
diff --git a/DTDL/v4/DTDL.mqtt.v2.md b/DTDL/v4/DTDL.mqtt.v2.md
index 54f60ab9..c16a542e 100644
--- a/DTDL/v4/DTDL.mqtt.v2.md
+++ b/DTDL/v4/DTDL.mqtt.v2.md
@@ -340,6 +340,6 @@ The chart below lists the versions of the Mqtt extension that are currently avai
 
 | Extension | Context | DTDL versions |
 | --- | --- | --- |
-| [MQTT v1](./DTDL.mqtt.v1.md) | dtmi:dtdl:extension:mqtt;1 | [3](./DTDL.v3.md) |
-| [MQTT v2](./DTDL.mqtt.v2.md) | dtmi:dtdl:extension:mqtt;2 | [3](./DTDL.v3.md), [4](./DTDL.v4.md) |
+| [MQTT v1](../v3/DTDL.mqtt.v1.md) | dtmi:dtdl:extension:mqtt;1 | [3](../v3/DTDL.v3.md) |
+| [MQTT v2](./DTDL.mqtt.v2.md) | dtmi:dtdl:extension:mqtt;2 | [3](../v3/DTDL.v3.md), [4](./DTDL.v4.md) |
 
diff --git a/DTDL/v4/DTDL.onvif.v1.md b/DTDL/v4/DTDL.onvif.v1.md
new file mode 100644
index 00000000..7b6a947b
--- /dev/null
+++ b/DTDL/v4/DTDL.onvif.v1.md
@@ -0,0 +1,229 @@
+# Onvif extension
+
+The DTDL Onvif extension facilitates the translation of [ONVIF WSDL definitions](https://www.onvif.org/profiles/specifications/) into DTDL.
+The request and response schemas defined in the ONVIF specification are deeply nested.
+The higher limits provided by the Onvif extension permit the direct translation of WSDL definitions without the need for flattening.
+In addition, the increased length limit on values of the DTDL "description" property permits directly copying WSDL descriptions without the need for abridging or summarizing.
+
+## Revised global limits
+
+## Revised property limits
+
+The following tables itemize the types and properties whose limits are increased by the extension.
+
+### Array
+
+| Property | Description | Standard limits | Onvif limits |
+| --- | --- | --- | --- |
+| `description` | A localizable description for display. | max 512 characters | max 4096 characters |
+| `elementSchema` | The data type of each element in the Array, which is an instance of Schema. | max depth of 8 levels | max depth of 24 levels |
+
+### Command
+
+| Property | Description | Standard limits | Onvif limits |
+| --- | --- | --- | --- |
+| `description` | A localizable description for display. | max 512 characters | max 4096 characters |
+
+### CommandRequest
+
+| Property | Description | Standard limits | Onvif limits |
+| --- | --- | --- | --- |
+| `description` | A localizable description for display. | max 512 characters | max 4096 characters |
+
+### CommandResponse
+
+| Property | Description | Standard limits | Onvif limits |
+| --- | --- | --- | --- |
+| `description` | A localizable description for display. | max 512 characters | max 4096 characters |
+
+### Component
+
+| Property | Description | Standard limits | Onvif limits |
+| --- | --- | --- | --- |
+| `description` | A localizable description for display. | max 512 characters | max 4096 characters |
+
+### Enum
+
+| Property | Description | Standard limits | Onvif limits |
+| --- | --- | --- | --- |
+| `description` | A localizable description for display. | max 512 characters | max 4096 characters |
+
+### EnumValue
+
+| Property | Description | Standard limits | Onvif limits |
+| --- | --- | --- | --- |
+| `description` | A localizable description for display. | max 512 characters | max 4096 characters |
+
+### Field
+
+| Property | Description | Standard limits | Onvif limits |
+| --- | --- | --- | --- |
+| `description` | A localizable description for display. | max 512 characters | max 4096 characters |
+| `schema` | The data type of the element, which is an instance of Schema. | max depth of 8 levels when Field is the value of Object `fields` | max depth of 24 levels when Field is the value of Object `fields` |
+
+### Interface
+
+| Property | Description | Standard limits | Onvif limits |
+| --- | --- | --- | --- |
+| `description` | A localizable description for display. | max 512 characters | max 4096 characters |
+
+### Map
+
+| Property | Description | Standard limits | Onvif limits |
+| --- | --- | --- | --- |
+| `description` | A localizable description for display. | max 512 characters | max 4096 characters |
+
+### MapKey
+
+| Property | Description | Standard limits | Onvif limits |
+| --- | --- | --- | --- |
+| `description` | A localizable description for display. | max 512 characters | max 4096 characters |
+
+### MapValue
+
+| Property | Description | Standard limits | Onvif limits |
+| --- | --- | --- | --- |
+| `description` | A localizable description for display. | max 512 characters | max 4096 characters |
+| `schema` | The data type of the element, which is an instance of Schema. | max depth of 8 levels when MapValue is the value of Map `mapValue` | max depth of 24 levels when MapValue is the value of Map `mapValue` |
+
+### Object
+
+| Property | Description | Standard limits | Onvif limits |
+| --- | --- | --- | --- |
+| `description` | A localizable description for display. | max 512 characters | max 4096 characters |
+
+### Property
+
+| Property | Description | Standard limits | Onvif limits |
+| --- | --- | --- | --- |
+| `description` | A localizable description for display. | max 512 characters | max 4096 characters |
+
+### Relationship
+
+| Property | Description | Standard limits | Onvif limits |
+| --- | --- | --- | --- |
+| `description` | A localizable description for display. | max 512 characters | max 4096 characters |
+
+### Telemetry
+
+| Property | Description | Standard limits | Onvif limits |
+| --- | --- | --- | --- |
+| `description` | A localizable description for display. | max 512 characters | max 4096 characters |
+
+## Onvif examples
+
+The following example is a highly abridged excerpt from a translation of the ONVIF standard into DTDL.
+This model is valid despite having a nested schema whose depth exceeds the standard DTDL limit.
+
+```json
+{
+  "@context": [
+    "dtmi:dtdl:context;4#limitless",
+    "dtmi:dtdl:limits:onvif;1"
+  ],
+  "@id": "dtmi:onvif:media;1",
+  "@type": "Interface",
+  "schemas": [
+    {
+      "@id": "dtmi:onvif:media:GetProfilesResponse;1",
+      "@type": "Object",
+      "fields": [
+        {
+          "name": "Profiles",
+          "description": "List of profiles",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "dtmi:onvif:media:Profile;1"
+          }
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:onvif:media:Profile;1",
+      "@type": "Object",
+      "fields": [
+        {
+          "name": "MetadataConfiguration",
+          "description": "Optional configuration of the metadata stream.",
+          "schema": "dtmi:onvif:media:MetadataConfiguration;1"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:onvif:media:MetadataConfiguration;1",
+      "@type": "Object",
+      "fields": [
+        {
+          "name": "AnalyticsEngineConfiguration",
+          "schema": "dtmi:onvif:media:AnalyticsEngineConfiguration;1"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:onvif:media:AnalyticsEngineConfiguration;1",
+      "@type": "Object",
+      "fields": [
+        {
+          "name": "AnalyticsModule",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "dtmi:onvif:media:Config;1"
+          }
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:onvif:media:Config;1",
+      "@type": "Object",
+      "fields": [
+        {
+          "name": "Parameters",
+          "description": "List of configuration parameters as defined in the corresponding description.",
+          "schema": "dtmi:onvif:media:ItemList;1"
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:onvif:media:ItemList;1",
+      "@type": "Object",
+      "fields": [
+        {
+          "name": "SimpleItem",
+          "description": "Value name pair as defined by the corresponding description.",
+          "schema": {
+            "@type": "Array",
+            "elementSchema": "dtmi:onvif:media:SimpleItem;1"
+          }
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:onvif:media:SimpleItem;1",
+      "@type": "Object",
+      "fields": [
+        {
+          "name": "Name",
+          "description": "Item name.",
+          "schema": "string"
+        },
+        {
+          "name": "Value",
+          "description": "Item value. The type is defined in the corresponding description.",
+          "schema": "string"
+        }
+      ]
+    }
+  ],
+  "contents": [
+    {
+      "@type": "Command",
+      "name": "GetProfiles",
+      "response": {
+        "name": "GetProfilesResponse",
+        "schema": "dtmi:onvif:media:GetProfilesResponse;1"
+      }
+    }
+  ]
+}
+```
+
diff --git a/DTDL/v4/DTDL.v4.md b/DTDL/v4/DTDL.v4.md
index fd228fe7..c5273afd 100644
--- a/DTDL/v4/DTDL.v4.md
+++ b/DTDL/v4/DTDL.v4.md
@@ -1041,6 +1041,7 @@ The chart below lists the language extensions that are currently available for u
 | [Overriding v2](./DTDL.overriding.v2.md) | feature | Override a model property with an instance value. |
 | [MQTT v2](./DTDL.mqtt.v2.md) | feature | Specify Interface properties to facilitate communication via the MQTT pub/sub protocol. |
 | [Requirement v1](./DTDL.requirement.v1.md) | feature | Selectively designate one or more fields in an Object as required. |
+| [Onvif v1](./DTDL.onvif.v1.md) | limits | Increased limits that support translating ONVIF WSDL definitions into DTDL. |
 
 ## Changes from Version 3
 
diff --git a/DTDL/v4/context/DTDL.FeatureExtension.mqtt.v2.context.json b/DTDL/v4/context/DTDL.FeatureExtension.mqtt.v2.context.json
index 8da6186a..48c71057 100644
--- a/DTDL/v4/context/DTDL.FeatureExtension.mqtt.v2.context.json
+++ b/DTDL/v4/context/DTDL.FeatureExtension.mqtt.v2.context.json
@@ -8,7 +8,8 @@
   "telemetryTopic": { "@id": "dtmi:dtdl:extension:mqtt:v2:Mqtt:telemetryTopic" },
   "commandTopic": { "@id": "dtmi:dtdl:extension:mqtt:v2:Mqtt:commandTopic" },
   "payloadFormat": { "@id": "dtmi:dtdl:extension:mqtt:v2:Mqtt:payloadFormat" },
-  "serviceGroupId": { "@id": "dtmi:dtdl:extension:mqtt:v2:Mqtt:serviceGroupId" },
+  "telemServiceGroupId": { "@id": "dtmi:dtdl:extension:mqtt:v2:Mqtt:telemServiceGroupId" },
+  "cmdServiceGroupId": { "@id": "dtmi:dtdl:extension:mqtt:v2:Mqtt:cmdServiceGroupId" },
 
   "ttl": { "@id": "dtmi:dtdl:extension:mqtt:v2:Cacheable:ttl" },
 
diff --git a/DTDL/v4/metamodel/DTDL.LimitExtension.onvif.v1.RDF-SHACL.json b/DTDL/v4/metamodel/DTDL.LimitExtension.onvif.v1.RDF-SHACL.json
new file mode 100644
index 00000000..95ac0f40
--- /dev/null
+++ b/DTDL/v4/metamodel/DTDL.LimitExtension.onvif.v1.RDF-SHACL.json
@@ -0,0 +1,84 @@
+{
+  "@context": [
+    "dtmi:dtdl:context;4",
+    "dtmi:dtdl:limits:onvif;1"
+  ],
+  "@graph": [
+    {
+      "@id": "dtmi:dtdl:limits:onvif:v1:documentation",
+      "@type": [ "dtmm:Documentation" ],
+      "dtmm:description": {
+        "en-US": "Increased limits that support translating ONVIF WSDL definitions into DTDL."
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:restriction:global;4",
+      "@type": [ "dtmm:Global" ],
+      "dtmm:dtdlVersion": 4,
+      "dtmm:identifier": {
+        "sh:maxLength": 512
+      },
+      "dtmm:partition": {
+        "dtmm:maxBytes": 1048576
+      }
+    },
+    {
+      "@id": "dtmi:dtdl:class:Entity;4",
+      "sh:property": [
+        {
+          "sh:path": "displayName",
+          "sh:maxLength": 512
+        },
+        {
+          "sh:path": "description",
+          "sh:maxLength": 4096
+        },
+        {
+          "sh:path": "comment",
+          "sh:maxLength": 512
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:class:ComplexSchema;4",
+      "dtmm:descendants": [
+        {
+          "dtmm:properties": [
+            "elementSchema",
+            "schema"
+          ],
+          "dtmm:maxDepth": 24
+        }
+      ]
+    },
+    {
+      "@id": "dtmi:dtdl:class:Interface;4",
+      "dtmm:identifier": {
+        "sh:maxLength": 256
+      },
+      "dtmm:descendants": [
+        {
+          "dtmm:properties": [ "extends" ],
+          "dtmm:narrow": true,
+          "dtmm:maxCount": 1024,
+          "dtmm:maxDepth": 12
+        },
+        {
+          "dtmm:properties": [
+            "contents",
+            "fields",
+            "enumValues",
+            "request",
+            "response",
+            "properties",
+            "schema",
+            "elementSchema",
+            "mapValue"
+          ],
+          "dtmm:narrow": true,
+          "dtmm:maxCount": 100000
+        }
+      ]
+    }
+  ]
+}
diff --git a/DTDL/v4/spec/Requirement-ExtensionLimitsFollowsLimitlessV4.json b/DTDL/v4/spec/Requirement-ExtensionLimitsFollowsLimitlessV4.json
index b76e44e1..1edb53c6 100644
--- a/DTDL/v4/spec/Requirement-ExtensionLimitsFollowsLimitlessV4.json
+++ b/DTDL/v4/spec/Requirement-ExtensionLimitsFollowsLimitlessV4.json
@@ -1 +1,167 @@
-[]
+[
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "acceptableLimits": [
+      "dtmi:dtdl:limits:onvif"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4#limitless",
+          "dtmi:dtdl:limits:onvif;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "acceptableLimits": [
+      "dtmi:dtdl:limits:onvif"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:dtdl:limits:onvif;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "acceptableLimits": [
+      "dtmi:dtdl:limits:onvif"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4",
+          "dtmi:dtdl:limits:onvif;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "acceptableLimits": [
+      "dtmi:dtdl:limits:onvif"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4#limitless",
+          "dtmi:dtdl:extension:quantitativeTypes;1",
+          "dtmi:dtdl:limits:onvif;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "acceptableLimits": [
+      "dtmi:dtdl:limits:onvif"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4#limitless",
+          "dtmi:dtdl:extension:quantitativeTypes;1",
+          "dtmi:dtdl:limits:onvif;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "acceptableLimits": [
+      "dtmi:dtdl:limits:onvif"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:limits:onvif;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "acceptableLimits": [
+      "dtmi:dtdl:limits:onvif"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:limits:onvif;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "acceptableLimits": [
+      "dtmi:dtdl:limits:onvif"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:limits:onvif;1",
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
+  {
+    "valid": false,
+    "options": [
+      "AllowUndefinedExtensions"
+    ],
+    "acceptableLimits": [
+      "dtmi:dtdl:limits:onvif"
+    ],
+    "input": [
+      {
+        "@context": "dtmi:dtdl:limits:onvif;1",
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  }
+]
diff --git a/DTDL/v4/spec/Requirement-LimitlessContextFollowedByLimitsV4.json b/DTDL/v4/spec/Requirement-LimitlessContextFollowedByLimitsV4.json
index f249fdd9..c340f856 100644
--- a/DTDL/v4/spec/Requirement-LimitlessContextFollowedByLimitsV4.json
+++ b/DTDL/v4/spec/Requirement-LimitlessContextFollowedByLimitsV4.json
@@ -31,6 +31,25 @@
       }
     ]
   },
+  {
+    "valid": true,
+    "options": [
+      "DisallowUndefinedExtensions"
+    ],
+    "acceptableLimits": [
+      "dtmi:dtdl:limits:onvif"
+    ],
+    "input": [
+      {
+        "@context": [
+          "dtmi:dtdl:context;4#limitless",
+          "dtmi:dtdl:limits:onvif;1"
+        ],
+        "@id": "dtmi:ex:id;1",
+        "@type": "Interface"
+      }
+    ]
+  },
   {
     "valid": false,
     "options": [

From 8bb7b52d8d7b4dd3202277d8902218b4976b9fb9 Mon Sep 17 00:00:00 2001
From: Auto Gen <johndo@microsoft.com>
Date: Thu, 12 Dec 2024 09:45:19 -0800
Subject: [PATCH 4/5] update README files

---
 DTMI/README.md | 40 +++++++++++++++++++++++++++++++---------
 README.md      |  3 +--
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/DTMI/README.md b/DTMI/README.md
index f2134714..aeb0a8ce 100644
--- a/DTMI/README.md
+++ b/DTMI/README.md
@@ -15,15 +15,16 @@ This document describes the syntax of the Digital Twin Modeling Identifier (DTMI
 
 ## DTMI syntax
 
-A DTMI has three components: scheme, path, and version.
-Scheme and path are separated by a colon (*:*), while path and version are separated by a semicolon (*;*).
+A DTMI has up to four components: scheme, path, version, and fragment.
+Scheme and path are separated by a colon (*:*), path and version are separated by a semicolon (*;*), and fragment is separated by a hash mark (#).
 The format looks like this:
 
-`<scheme> : <path> ; <version>`
+`<scheme> : <path> ; <version> # <fragment>`
 
 The scheme is the string literal "dtmi" in lowercase.
 The path is a sequence of one or more segments, separated by colons.
 The version is a numeric value.
+The fragment is a string that follows the same rules as path segments described next.
 
 Each path segment is a non-empty string containing only letters, digits, and underscores.
 The first character may not be a digit, and the last character may not be an underscore.
@@ -31,7 +32,7 @@ Segments are thus representable as identifiers in all common programming languag
 
 Segments are partitioned into user segments and system segments.
 If a segment begins with an underscore, it is a system segment; if it begins with a letter, it is a user segment.
-If a DTMI contains at least one system segment, it is a system DTMI; otherwise, it is a user DTMI.
+If a DTMI contains at least one system segment or a system fragment, it is a system DTMI; otherwise, it is a user DTMI.
 
 The version (and the preceding semicolon) may be omitted entirely.
 If present, the version is either a one-part (integer) value or a two-part (major.minor) value.
@@ -43,6 +44,10 @@ The length of the minor part of a two-part version is limited to six digits, bec
 The minor part of a two-part version may not start with a zero, so there is no ambiguity regarding whether version 1.1 matches version 1.01 since the latter is invalid.
 This restriction includes as a special case that the minor part may not be zero, so there is no ambiguity regarding whether version 1 matches version 1.0 since the latter is invalid.
 
+The fragment (and the preceding hash mark) may be omitted entirely.
+In most usage contexts, fragments MUST be omitted.
+When present, a fragment narrows the DTMI's reference to a subset of the resource that is identifed by the fragmentless DTMI.
+
 Here is an example of a valid DTMI:
 
 `dtmi:foo_bar:_16:baz33:qux;12`
@@ -50,6 +55,7 @@ Here is an example of a valid DTMI:
 The path contains four segments: *foo_bar*, *_16*, *baz33*, and *qux*.
 One of the segments (*_16*) is a system segment, and therefore the identifier is a system DTMI.
 The version is 12.
+There is no fragment.
 
 Equivalence of DTMIs is case-sensitive.
 
@@ -76,6 +82,7 @@ Such additional restrictions may include, but are not limited to:
 * a smaller limit on identifier length
 * requirement for the presence of a version component
 * requirement for the absence of a version component
+* requirement for the absence of a fragment
 * restrictions on version syntax, such as disallowed two-part versions
 * disallowance of system DTMIs
 * reservations of identifiers with specific path prefixes
@@ -87,18 +94,19 @@ Such restrictions may apply to all identifiers used in the artifact or standard,
 The following regular expression can be used to assess whether a string satisfies the DTMI syntax for user identifiers (modulo the 2048-character length restriction, which must be checked separately):
 
 ```regex
-^dtmi:[A-Za-z](?:[A-Za-z0-9_]*[A-Za-z0-9])?(?::[A-Za-z](?:[A-Za-z0-9_]*[A-Za-z0-9])?)*(?:;[1-9][0-9]{0,8}(?:\.[1-9][0-9]{0,5})?)?$
+^dtmi:[A-Za-z](?:[A-Za-z0-9_]*[A-Za-z0-9])?(?::[A-Za-z](?:[A-Za-z0-9_]*[A-Za-z0-9])?)*(?:;[1-9][0-9]{0,8}(?:\.[1-9][0-9]{0,5})?)?(?:#(?:[A-Za-z](?:[A-Za-z0-9_]*[A-Za-z0-9])?)?)?$
 ```
 
 The following regular expression can be used to assess whether a string satisfies the full DTMI syntax, including both user and system identifiers (modulo the 4096-character length restriction, which must be checked separately):
 
 ```regex
-^dtmi:(?:_+[A-Za-z0-9]|[A-Za-z])(?:[A-Za-z0-9_]*[A-Za-z0-9])?(?::(?:_+[A-Za-z0-9]|[A-Za-z])(?:[A-Za-z0-9_]*[A-Za-z0-9])?)*(?:;[1-9][0-9]{0,8}(?:\.[1-9][0-9]{0,5})?)?$
+^dtmi:(?:_+[A-Za-z0-9]|[A-Za-z])(?:[A-Za-z0-9_]*[A-Za-z0-9])?(?::(?:_+[A-Za-z0-9]|[A-Za-z])(?:[A-Za-z0-9_]*[A-Za-z0-9])?)*(?:;[1-9][0-9]{0,8}(?:\.[1-9][0-9]{0,5})?)?(?:#(?:(?:_+[A-Za-z0-9]|[A-Za-z])(?:[A-Za-z0-9_]*[A-Za-z0-9])?)?)?$
 ```
 
 ## Validation code in C
 
 Because C does not support regular expressions, and because C is often used in environments for which a minimal footprint is critical, following is a reference implementation of a C function that performs DTMI syntax validation on a null-terminated `id` string.
+This code will not validate a DTMI that has a fragment.
 
 * The bool `sysok` parameter indicates whether to accept identifiers in the section of DTMI space reserved for system use.
 * The bool `part2ok` parameter indicates whether to accept identifiers with 2-part versions.
@@ -189,9 +197,10 @@ bool checkdtmi(const char* id, bool sysok, bool part2ok, bool reqver)
 According to IETF [RFC 7595, Guidelines and Registration Procedures for URI Schemes](https://tools.ietf.org/html/rfc7595), the syntax of all new URI schemes must be defined using the specification format of IETF [RFC 5234, Augmented BNF for Syntax Specifications: ABNF](https://tools.ietf.org/html/rfc5234).  Following is an ABNF specification for the format of DTMIs:
 
 ```ABNF
-dtmi =            "dtmi" ":" dtpath [ ";" dtver ]
+dtmi =            "dtmi" ":" dtpath [ ";" dtver ] [ "#" dtfrag ]
 dtpath =          dtseg *(":" dtseg)
 dtseg =           dtuserseg / dssysseg
+dtfrag =          dtseg
 dtuserseg =       ALPHA [ *(ALPHA / DIGIT / "_") (ALPHA / DIGIT) ]
 dtsysseg =        "_" *(ALPHA / DIGIT / "_") (ALPHA / DIGIT)
 dtver =           digitnz 0*8DIGIT [ "." digitnz 0*5DIGIT ]
@@ -199,17 +208,18 @@ digitnz =         %x31-39
                   ; 1-9
 ```
 
-A DTMI is formally defined as a "dtmi" scheme identifier, a colon, and a Digital Twin path, optionally followed by a semicolon and a Digital Twin version:
+A DTMI is formally defined as a "dtmi" scheme identifier, a colon, and a Digital Twin path, optionally followed by a semicolon and a Digital Twin version, optionally followed by a hash mark and a Digital Twin fragment:
 
 * A Digital Twin path is a sequence of one or more Digital Twin segments, separated by colons.
   * A Digital Twin segment is either a user segment or a system segment.
     * A user segment has a leading letter optionally followed by a series of letters, digits, or underscores followed by terminal letter or digit.
     * A system segment has a leading underscore followed by a series of zero or more letters, digits, or underscores followed by terminal letter or digit.
 * A Digital Twin version is a non-zero digit followed by zero to eight digits, optionally followed by a decimal point, a non-zero digit, and zero to five digits.
+* A Digital Twin fragment has the same syntax as a Digital Twin segment
 
 ## URI compatibility
 
-IETF [RFC 3986, Uniform Resource Identifier (URI): Generic Syntax](https://tools.ietf.org/html/rfc3986) states "URI scheme specifications must define their own syntax so that all strings matching their scheme-specific syntax will also match the `<absolute-URI>` grammar."  Following is a specialization of `<absolute-URI>` grammar that includes the full DTMI syntax:
+IETF [RFC 3986, Uniform Resource Identifier (URI): Generic Syntax](https://tools.ietf.org/html/rfc3986) states "URI scheme specifications must define their own syntax so that all strings matching their scheme-specific syntax will also match the `<absolute-URI>` grammar."  Following is a specialization of `<absolute-URI>` grammar that includes the full syntax for fragmentless DTMIs:
 
 ```ABNF
 absolute-URI =    scheme ":" hier-part
@@ -221,3 +231,15 @@ pchar =           ALPHA / DIGIT / "_" / ":" / ";" / "."
 ```
 
 The most critical aspect of `<absolute-URI>` grammar is a set of five ABNF productions for the `<hier-part>` non-terminal, only one of which matches a given URI reference.  For the DTMI scheme, the matching non-terminal is `<path-rootless>`.
+
+Following is a specialization of `<URI>` grammar that includes the full DTMI syntax permitting fragments:
+
+```ABNF
+URI =             scheme ":" hier-part [ "?" query ] [ "#" fragment ]
+scheme =          "dtmi"
+hier-part =       path-rootless
+path-rootless =   segment-nz
+segment-nz =      1*pchar
+fragment =        *pchar
+pchar =           ALPHA / DIGIT / "_" / ":" / ";" / "."
+```
diff --git a/README.md b/README.md
index 85319e78..4bbbd701 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,7 @@ DTDL has evolved over time, resulting in the next versions:
 |v1-preview|[dtdlv1.md](./DTDL/v1-preview/dtdlv1.md)|Out of support|
 |v2|[DTDL.v2.md](./DTDL/v2/DTDL.v2.md)|Supported in ADT, IoTCentral and IoT Plug and Play|
 |v3|[DTDL.v3.md](./DTDL/v3/DTDL.v3.md)|Supported in ADT and IoT Plug and Play|
-|v4|[DTDL.v4.md](./DTDL/v4/DTDL.v4.md)||
-
+|v4|[DTDL.v4.md](./DTDL/v4/DTDL.v4.md)|Supported in Azure IoT Operations|
 
 ## :point_right: A Simple Example
 

From 7033bec66b570a5c9bfa14a9191d306f2bb3ae3f Mon Sep 17 00:00:00 2001
From: Auto Gen <johndo@microsoft.com>
Date: Thu, 12 Dec 2024 09:51:19 -0800
Subject: [PATCH 5/5] bump version in top-level README example

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4bbbd701..e479c9b8 100644
--- a/README.md
+++ b/README.md
@@ -22,8 +22,8 @@ The next interface describes a thermostat reporting temperature as degreeCelsius
 ```json
 {
   "@context": [
-    "dtmi:dtdl:context;3",
-    "dtmi:dtdl:extension:quantitativeTypes;1"
+    "dtmi:dtdl:context;4",
+    "dtmi:dtdl:extension:quantitativeTypes;2"
   ],
   "@id": "dtmi:com:example:Thermostat;1",
   "@type": "Interface",